diff options
| author | Minteck <contact@minteck.org> | 2023-02-23 14:20:13 +0100 |
|---|---|---|
| committer | Minteck <contact@minteck.org> | 2023-02-23 14:20:13 +0100 |
| commit | 8cc1f13c17fa2fb5a4410542d39e650e02945634 (patch) | |
| tree | e3f668e635253310b97fb379d71318dc96d1dd2d /includes/travelling.inc | |
| parent | 6563d542af0930ebb6b2f9b71f2b7538d7467665 (diff) | |
| download | pluralconnect-8cc1f13c17fa2fb5a4410542d39e650e02945634.tar.gz pluralconnect-8cc1f13c17fa2fb5a4410542d39e650e02945634.tar.bz2 pluralconnect-8cc1f13c17fa2fb5a4410542d39e650e02945634.zip | |
Updated 27 files, added assets/uploads/pt-twilightsparkle.png and deleted 3 files (automated)
Diffstat (limited to 'includes/travelling.inc')
| -rw-r--r-- | includes/travelling.inc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/includes/travelling.inc b/includes/travelling.inc index 18bf22e..4487956 100644 --- a/includes/travelling.inc +++ b/includes/travelling.inc @@ -1,12 +1,15 @@ <?php +$app = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/app.json"), true); $travelling = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/travelling/travelling.json"), true); $json_cloudburst = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/ynmuc/members.json"), true); $json_raindrops = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/gdapd/members.json"), true); +$json_other = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/other/members.json"), true); if (!isset($json_cloudburst)) $json_cloudburst = []; if (!isset($json_raindrops)) $json_raindrops = []; +if (!isset($json_other)) $json_other = []; $members = [...array_map(function ($i) { $i["_system"] = "ynmuc"; @@ -14,7 +17,10 @@ $members = [...array_map(function ($i) { }, $json_cloudburst), ...array_map(function ($i) { $i["_system"] = "gdapd"; return $i; -}, $json_raindrops)]; +}, $json_raindrops), ...array_map(function ($i) use ($app) { + $i["_system"] = $app["other"]["id"]; + return $i; +}, $json_other)]; foreach ($members as $member) { if (!isset($travelling[$member["id"]])) { |