GEANT / CAT

utils/Update_eduroamDB1_2/update_monitor_copy.php

Spacing +9 added lines, -9 removed lines

@@ -24,7 +24,7 @@ 
  * update the local copy
  */
 
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
 setlocale(LC_CTYPE, "en_US.UTF-8");
 require 'config.php';
 
@@ -113,7 +113,7 @@ 
         $this->db_ext->query("SET NAMES 'utf8'");
         $this->db_local->query("SET NAMES 'utf8mb4'");
         $result = $this->db_ext->query("SELECT * FROM $table");
-        $queryFields = implode(',', array_column($this->fields[$db][$table_name],0));
+        $queryFields = implode(',', array_column($this->fields[$db][$table_name], 0));
         while ($row = $result->fetch_assoc()) {
             $v = [];
             foreach ($this->fields[$db][$table_name] as $field) {
@@ -131,7 +131,7 @@ 
                     }
                 }
             }
-            $queryValues = implode(',',$v);
+            $queryValues = implode(',', $v);
             $query = "INSERT INTO $tmpTable (".$queryFields.") VALUES (".$queryValues.")";
             $this->db_local->query($query);
         }
@@ -153,9 +153,9 @@ 
             $realms = explode(',', $row[1]);
             foreach ($contacts as $contact) {
                 foreach ($realms as $realm) {
-                    $email = empty($contact['mail']) ? 'NULL' :'"'.$contact['mail'].'"';
-                    $name = empty($contact['name']) ? 'NULL' :'"'.$contact['name'].'"';
-                    $phone = empty($contact['phone']) ? 'NULL' :'"'.$contact['phone'].'"';
+                    $email = empty($contact['mail']) ? 'NULL' : '"'.$contact['mail'].'"';
+                    $name = empty($contact['name']) ? 'NULL' : '"'.$contact['name'].'"';
+                    $phone = empty($contact['phone']) ? 'NULL' : '"'.$contact['phone'].'"';
                     $id = $db == 'eduroam' ? $row[2] : '"'.$row[2].'"';
                     $query = "INSERT INTO tmp_institution_admins (name, email, phone, inst_realm, $instid)"
                             . ' VALUES ('.$name.','.$email.','.$phone.',"'.$realm.'",'.$id.')';
@@ -175,9 +175,9 @@ 
     }
 
     private function escape($inp) {
-        $out=str_replace('\\','\\\\',$inp);
-        $out=str_replace('"','\"',$out);
-        $out=str_replace('?','\?',$out);
+        $out = str_replace('\\', '\\\\', $inp);
+        $out = str_replace('"', '\"', $out);
+        $out = str_replace('?', '\?', $out);
         $out = 'convert(cast(convert("'.$out.'" using latin1) as binary) using utf8)';
         return($out);
     }

utils/Update_eduroamDB1_2/config.php

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 $databases = [
     'eduroam' => "eduroam1_1_tmp", // this is the local copy of eduroam (v1) database created by update_monitor_copy.php
     'eduroamv2' => "eduroam2_1_tmp", // this is the local copy of eduroam (v2) database created by update_monitor_copy.php
-    'cat' => "cat_twoln_214_test2",  // this is the curent production CAT database where we need to put in new identifiers
+    'cat' => "cat_twoln_214_test2", // this is the curent production CAT database where we need to put in new identifiers
     'eduroam_new' => "monitor_copy2_test_xxx" // this is the resulting monitor_copy database containing all data required by CAT it must exist but tables will be created by the sript
 ];
 

utils/Update_eduroamDB1_2/clean_databases.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
 setlocale(LC_CTYPE, "en_US.UTF-8");
 require 'config.php';
 

utils/Update_eduroamDB1_2/sync_databases.php

Spacing +2 added lines, -2 removed lines

@@ -8,7 +8,7 @@ 
  * 
  */
 
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
 setlocale(LC_CTYPE, "en_US.UTF-8");
 require 'config.php';
 
@@ -130,7 +130,7 @@ 
 
 // add CAT ids to view_active_institution2
 print "add CAT ids to view_active_institution2\n";
-$q ="update view_active_institution2 join view_active_institution1
+$q = "update view_active_institution2 join view_active_institution1
         on view_active_institution2.instid1=view_active_institution1.id_institution
         set view_active_institution2.cat_sync_id=view_active_institution1.cat_sync_id";
 $result = $db_local->query($q);