From 89c563801372dca0a12adbf6b40a2437270d33c1 Mon Sep 17 00:00:00 2001 From: Tom Reijnders Date: Fri, 19 May 2023 21:36:53 +0200 Subject: [PATCH] Fix running on PHP 5.x (replace [] by array() --- modules/site/edithtml.php | 14 +++++++------- modules/xerte/edithtml.php | 14 +++++++------- oai-pmh/management/categories.php | 4 ++-- oai-pmh/management/educational.php | 4 ++-- oai-pmh/oai.php | 2 +- oai-pmh/xerteobjects.php | 18 +++++++++--------- website_code/php/display_library.php | 8 ++++---- website_code/php/management/add_member.php | 2 +- .../php/management/management_library.php | 8 ++++---- .../php/properties/properties_library.php | 8 ++++---- 10 files changed, 41 insertions(+), 41 deletions(-) diff --git a/modules/site/edithtml.php b/modules/site/edithtml.php index 7ad538ecca..30efc6afbf 100644 --- a/modules/site/edithtml.php +++ b/modules/site/edithtml.php @@ -27,7 +27,7 @@ function get_children ($parent_id, $lookup, $column, $type) { // children - $children = []; + $children = array(); //we are at a leaf level if (empty($lookup[$parent_id]['children'])){ return $children; @@ -175,9 +175,9 @@ function output_editor_code($row_edit, $xerte_toolkits_site, $read_status, $vers */ $sql = "select category_id, category_name, parent_id from {$xerte_toolkits_site->database_table_prefix}syndicationcategories"; $categories = db_query($sql); - $lookup = []; + $lookup = array(); foreach ($categories as $node){ - $node['children'] = []; + $node['children'] = array(); $lookup = $lookup + [$node['category_id'] => $node]; } foreach ($lookup as $node){ @@ -186,7 +186,7 @@ function output_editor_code($row_edit, $xerte_toolkits_site, $read_status, $vers } } - $parsed_categories = []; + $parsed_categories = array(); foreach ($lookup as $value){ //find all tree origins if ($value['parent_id'] == null) { @@ -202,9 +202,9 @@ function output_editor_code($row_edit, $xerte_toolkits_site, $read_status, $vers $sql = "select educationlevel_id, educationlevel_name, parent_id from {$xerte_toolkits_site->database_table_prefix}educationlevel order by parent_id asc"; $educationlevels = db_query($sql); - $lookup = []; + $lookup = array(); foreach ($educationlevels as $node){ - $node['children'] = []; + $node['children'] = array(); $lookup = $lookup + [$node['educationlevel_id'] => $node]; } foreach ($lookup as $node){ @@ -213,7 +213,7 @@ function output_editor_code($row_edit, $xerte_toolkits_site, $read_status, $vers } } - $parsed_educationlevels = []; + $parsed_educationlevels = array(); foreach ($lookup as $value){ //find all tree origins if ($value['parent_id'] == null) { diff --git a/modules/xerte/edithtml.php b/modules/xerte/edithtml.php index 9c22ab9bc1..f7e91e2648 100644 --- a/modules/xerte/edithtml.php +++ b/modules/xerte/edithtml.php @@ -28,7 +28,7 @@ function get_children ($parent_id, $lookup, $column, $type) { // children - $children = []; + $children = array(); //we are at a leaf level if (empty($lookup[$parent_id]['children'])){ return $children; @@ -198,9 +198,9 @@ function output_editor_code($row_edit, $xerte_toolkits_site, $read_status, $vers */ $sql = "select category_id, category_name, parent_id from {$xerte_toolkits_site->database_table_prefix}syndicationcategories"; $categories = db_query($sql); - $lookup = []; + $lookup = array(); foreach ($categories as $node){ - $node['children'] = []; + $node['children'] = array(); $lookup = $lookup + [$node['category_id'] => $node]; } foreach ($lookup as $node){ @@ -209,7 +209,7 @@ function output_editor_code($row_edit, $xerte_toolkits_site, $read_status, $vers } } - $parsed_categories = []; + $parsed_categories = array(); foreach ($lookup as $value){ //find all tree origins if ($value['parent_id'] == null) { @@ -225,9 +225,9 @@ function output_editor_code($row_edit, $xerte_toolkits_site, $read_status, $vers $sql = "select educationlevel_id, educationlevel_name, parent_id from {$xerte_toolkits_site->database_table_prefix}educationlevel order by parent_id asc"; $educationlevels = db_query($sql); - $lookup = []; + $lookup = array(); foreach ($educationlevels as $node){ - $node['children'] = []; + $node['children'] = array(); $lookup = $lookup + [$node['educationlevel_id'] => $node]; } foreach ($lookup as $node){ @@ -236,7 +236,7 @@ function output_editor_code($row_edit, $xerte_toolkits_site, $read_status, $vers } } - $parsed_educationlevels = []; + $parsed_educationlevels = array(); foreach ($lookup as $value){ //find all tree origins if ($value['parent_id'] == null) { diff --git a/oai-pmh/management/categories.php b/oai-pmh/management/categories.php index 2253212e83..c8e955542f 100644 --- a/oai-pmh/management/categories.php +++ b/oai-pmh/management/categories.php @@ -8,7 +8,7 @@ if ($argc > 1) { clearCategoryTable(); createCategoryTable(); - $lookup = []; + $lookup = array(); for ($args = 1; $args < $argc; $args++) { $xmlfile = $argv[$args]; @@ -20,7 +20,7 @@ $relations = $xml->xpath("//vdex:relationship"); foreach ($nodes as $node) { - $row = []; + $row = array(); $ns = $node->getNamespaces(); $c = $node->children($ns['vdex']); $row[label] = (string)$c->caption->langstring; diff --git a/oai-pmh/management/educational.php b/oai-pmh/management/educational.php index 33f2caace4..15596ea9a5 100644 --- a/oai-pmh/management/educational.php +++ b/oai-pmh/management/educational.php @@ -16,10 +16,10 @@ $nodes = $xml->xpath('//vdex:term'); $relations = $xml->xpath("//vdex:relationship"); - $lookup = []; + $lookup = array(); foreach ($nodes as $node) { - $row = []; + $row = array(); $c = $node->children($ns['vdex']); $row['label'] = (string)$c->caption->langstring; $row['ID'] = (string)$c->termIdentifier; diff --git a/oai-pmh/oai.php b/oai-pmh/oai.php index 327956db6d..17058af652 100644 --- a/oai-pmh/oai.php +++ b/oai-pmh/oai.php @@ -240,7 +240,7 @@ function getTemplates($metadataPrefix,$from,$until) { $q = "select template_id, status, timestamp from {$xerte_toolkits_site->database_table_prefix}oai_publish where audith_id IN (SELECT max(audith_id) from {$xerte_toolkits_site->database_table_prefix}oai_publish group by template_id)"; $publish_status = db_query($q); } - $temp_added = []; + $temp_added = array(); for($i=0;$idomain = []; - $xerteMetaObj->domainId = []; - $xerteMetaObj->domainSource = []; + $response = array(); + $xerteMetaObj->domain = array(); + $xerteMetaObj->domainId = array(); + $xerteMetaObj->domainSource = array(); $q = "select * from {$xerte_toolkits_site->database_table_prefix}oai_categories where label=?"; // query oai_categories foreach ($cat as $value){ $params = array($value); $response[] = db_query_one($q, $params); } - $parents = []; + $parents = array(); foreach ($response as $data){ if ($data !== false and $data !== null) { $xerteMetaObj->domain[] = $data["label"]; @@ -153,16 +153,16 @@ function get_meta_data($template_id, $creator_user_name="", $template_type_name= if (isset($xml['metaEducation'])) { // query oai-education $edu = explode("|", (string)$xml["metaEducation"]); - $response = []; - $xerteMetaObj->level = []; - $xerteMetaObj->levelId = []; + $response = array(); + $xerteMetaObj->level = array(); + $xerteMetaObj->levelId = array(); $q = "select * from {$xerte_toolkits_site->database_table_prefix}oai_education where label=?"; foreach ($edu as $value){ $params = array($value); $response[] = db_query_one($q, $params); } - $parents = []; + $parents = array(); foreach ($response as $data){ if ($data !== false and $data !== null) { $xerteMetaObj->level[] = $data["label"]; diff --git a/website_code/php/display_library.php b/website_code/php/display_library.php index 0cf5b1d7d0..0ceb97ca48 100644 --- a/website_code/php/display_library.php +++ b/website_code/php/display_library.php @@ -736,7 +736,7 @@ function get_workspace_contents($folder_id, $tree_id, $sort_type, $copy_only=fal //remove double items - $uniqueItems = []; + $uniqueItems = array(); foreach ($items as $item => $value){ /*if(!in_array($value, $uniqueItems)){ $uniqueItems[$item] = $value; @@ -936,7 +936,7 @@ function get_workspace_folders($folder_id, $tree_id, $sort_type, $copy_only=fals _debug("Error in get_workspace_folders: " . $error_msg); } - $sharedFolders = []; + $sharedFolders = array(); foreach ($query_response as $index => $folder){ if(intval($folder['nrshared']) > 1){ array_push($sharedFolders, $folder["folder_id"]); @@ -960,7 +960,7 @@ function get_workspace_folders($folder_id, $tree_id, $sort_type, $copy_only=fals } /*$query = "SELECT * FROM folderdetails where"; - $params = []; + $params = array(); foreach ($query_response as $folder){ if(intval($folder['nrshared']) > 1){ @@ -1148,7 +1148,7 @@ function get_users_projects($sort_type, $copy_only=false) $workspace->nodes[$item->id] = $item; //$items = get_folder_contents($item->xot_id, $item->id, $sort_type, $copy_only, "_top"); $items = get_workspace_contents($item->xot_id, $item->id, $sort_type, $copy_only,"_top"); - $sharedItems = []; + $sharedItems = array(); if ($items) { $workspace->items = array_merge($workspace->items, $items); foreach($items as $item) diff --git a/website_code/php/management/add_member.php b/website_code/php/management/add_member.php index 0695114a45..21e411e80d 100644 --- a/website_code/php/management/add_member.php +++ b/website_code/php/management/add_member.php @@ -58,7 +58,7 @@ function add_members_to_group($login_ids, $group_id){ $query = "SELECT * FROM {$prefix}user_group_members WHERE group_id=? AND login_id in (" . $logins . ")"; $exists = db_query($query, $params); - $existing_arr = []; + $existing_arr = array(); foreach($exists as $row){ array_push($existing_arr, $row['login_id']); } diff --git a/website_code/php/management/management_library.php b/website_code/php/management/management_library.php index f43c7d7802..e6ee10f950 100644 --- a/website_code/php/management/management_library.php +++ b/website_code/php/management/management_library.php @@ -30,12 +30,12 @@ function category_list(){ $query_response = db_query($query); //build tree - $tree = []; + $tree = array(); foreach ($query_response as $data){ if (!is_null($data) or $data !== false) { $child[id] = $data["category_id"]; $child[name] = $data["category_name"]; - $child[children] = []; + $child[children] = array(); if (is_null($data["parent_id"])) { $tree[$child["id"]] = $child; } else { @@ -82,12 +82,12 @@ function educationlevel_list(){ $query_response = db_query($query); //build tree - $tree = []; + $tree = array(); foreach ($query_response as $data){ if (!is_null($data) or $data !== false) { $child[id] = $data["educationlevel_id"]; $child[name] = $data["educationlevel_name"]; - $child[children] = []; + $child[children] = array(); if (is_null($data["parent_id"])) { $tree[$child["id"]] = $child; } else { diff --git a/website_code/php/properties/properties_library.php b/website_code/php/properties/properties_library.php index 2d2a125d38..034b90c76a 100644 --- a/website_code/php/properties/properties_library.php +++ b/website_code/php/properties/properties_library.php @@ -854,8 +854,8 @@ function sharing_info($template_id) $sql = "SELECT * FROM {$xerte_toolkits_site->database_table_prefix}folderrights where folder_id = ?"; $query_folders = db_query($sql, array($query_folder_id[0]["folder"])); - $related_folders = []; - $params = []; + $related_folders = array(); + $params = array(); array_push($related_folders, $query_folders[0]); if(!empty($related_folders)){ @@ -1197,8 +1197,8 @@ function folder_sharing_info($folder_id) $sql = "SELECT * FROM {$xerte_toolkits_site->database_table_prefix}folderrights where folder_id = ?"; $query_folders = db_query($sql, array($query_folder_id["folder_id"])); - $related_folders = []; - $params = []; + $related_folders = array(); + $params = array(); array_push($related_folders, $query_folders[0]); if(!empty($related_folders)){