Test Setup Failed
Push — master ( b7b0b8...d70ae7 )
by Tomasz
10:36
created
web/lib/admin/OptionParser.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
                     if ($cert['full_details']['type'] == 'server') {
94 94
                         $reason = _("%s - server certificate (<a href='%s'>more info</a>)");
95 95
                         $fail = true;
96
-                    } elseif($cert['basicconstraints_set'] === 0) {
96
+                    } elseif ($cert['basicconstraints_set'] === 0) {
97 97
                         $reason = _("%s - missing required CA extensions (<a href='%s'>more info</a>)");
98 98
                         $fail = true;
99 99
                     }    
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
                 $optionClass = \core\Options::instance();
123 123
                 $optionProps = $optionClass->optionType($optiontype);
124 124
                 $allowedValues = explode(',', substr($optionProps["flags"], 7));
125
-                if (in_array($incomingBinary,$allowedValues))  {
125
+                if (in_array($incomingBinary, $allowedValues)) {
126 126
                     return ['result'=>TRUE, 'details'=>''];
127 127
                 }
128 128
                 return ['result'=>FALSE, 'details'=>''];
@@ -368,14 +368,14 @@  discard block
 block discarded – undo
368 368
                 case \core\Options::TYPECODE_TEXT:
369 369
                 case \core\Options::TYPECODE_COORDINATES:
370 370
                 case \core\Options::TYPECODE_INTEGER:
371
-                    $varName = $listOfEntries["$objId-" . self::VALIDATOR_FUNCTIONS[$optioninfo['type']]['field']];
371
+                    $varName = $listOfEntries["$objId-".self::VALIDATOR_FUNCTIONS[$optioninfo['type']]['field']];
372 372
                     if (!empty($varName)) {
373 373
                         $content = call_user_func_array([$this->validator, self::VALIDATOR_FUNCTIONS[$optioninfo['type']]['function']], array_merge([$varName], self::VALIDATOR_FUNCTIONS[$optioninfo['type']]['extraarg']));
374 374
                         break;
375 375
                     }
376 376
                     continue 2;
377 377
                 case \core\Options::TYPECODE_BOOLEAN:
378
-                    $varName = $listOfEntries["$objId-" . \core\Options::TYPECODE_BOOLEAN];
378
+                    $varName = $listOfEntries["$objId-".\core\Options::TYPECODE_BOOLEAN];
379 379
                     if (!empty($varName)) {
380 380
                         $contentValid = $this->validator->boolean($varName);
381 381
                         if ($contentValid) {
@@ -388,7 +388,7 @@  discard block
 block discarded – undo
388 388
                     }
389 389
                     continue 2;
390 390
                 case \core\Options::TYPECODE_STRING:
391
-                    $previsionalContent = $listOfEntries["$objId-" . \core\Options::TYPECODE_STRING];
391
+                    $previsionalContent = $listOfEntries["$objId-".\core\Options::TYPECODE_STRING];
392 392
                     if (!empty(trim($previsionalContent))) {
393 393
                         $content = $this->furtherStringChecks($objValue, $previsionalContent, $bad);
394 394
                         if ($content === FALSE) {
@@ -399,7 +399,7 @@  discard block
 block discarded – undo
399 399
                     continue 2;
400 400
                     
401 401
                 case \core\Options::TYPECODE_ENUM_OPENROAMING:
402
-                    $previsionalContent = $listOfEntries["$objId-" . \core\Options::TYPECODE_ENUM_OPENROAMING];
402
+                    $previsionalContent = $listOfEntries["$objId-".\core\Options::TYPECODE_ENUM_OPENROAMING];
403 403
                     if (!empty($previsionalContent)) {
404 404
                         $content = $this->furtherStringChecks($objValue, $previsionalContent, $bad);
405 405
                         if ($content === FALSE) {
@@ -410,15 +410,15 @@  discard block
 block discarded – undo
410 410
                     continue 2;    
411 411
                 case \core\Options::TYPECODE_FILE:
412 412
                     // this is either actually an uploaded file, or a reference to a DB entry of a previously uploaded file
413
-                    $reference = $listOfEntries["$objId-" . \core\Options::TYPECODE_STRING];
413
+                    $reference = $listOfEntries["$objId-".\core\Options::TYPECODE_STRING];
414 414
                     if (!empty($reference)) { // was already in, by ROWID reference, extract
415 415
                         // ROWID means it's a multi-line string (simple strings are inline in the form; so allow whitespace)
416 416
                         $content = $this->validator->string(urldecode($reference), TRUE);
417 417
                         break;
418 418
                     }
419
-                    $fileName = $listOfEntries["$objId-" . \core\Options::TYPECODE_FILE] ?? "";
419
+                    $fileName = $listOfEntries["$objId-".\core\Options::TYPECODE_FILE] ?? "";
420 420
                     if ($fileName != "") { // let's do the download
421
-                        $rawContent = \core\common\OutsideComm::downloadFile("file:///" . $fileName);
421
+                        $rawContent = \core\common\OutsideComm::downloadFile("file:///".$fileName);
422 422
                         $sanity = $this->checkUploadSanity($objValue, $rawContent);
423 423
                         if ($rawContent === FALSE || !$sanity['result']) {
424 424
                             $bad[] = ['type'=>$objValue, 'details'=>$sanity['details']];
@@ -429,7 +429,7 @@  discard block
 block discarded – undo
429 429
                     }
430 430
                     continue 2;
431 431
                 default:
432
-                    throw new Exception("Internal Error: Unknown option type " . $objValue . "!");
432
+                    throw new Exception("Internal Error: Unknown option type ".$objValue."!");
433 433
             }
434 434
             // lang can be NULL here, if it's not a multilang attribute, or a ROWID reference. Never mind that.
435 435
             $retval[] = ["$objValue" => ["lang" => $languageFlag, "content" => $content]];
Please login to merge, or discard this patch.
core/common/Entity.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
     public function __construct()
111 111
     {
112 112
         $this->loggerInstance = new Logging();
113
-        $this->loggerInstance->debug(4, "--- BEGIN constructing class " . get_class($this) . " .\n");
113
+        $this->loggerInstance->debug(4, "--- BEGIN constructing class ".get_class($this)." .\n");
114 114
         $this->languageInstance = new Language();
115 115
         Entity::intoThePotatoes("core");
116 116
         // some config elements are displayable. We need some dummies to 
@@ -129,13 +129,13 @@  discard block
 block discarded – undo
129 129
         $dummy_organisation2a = _("organization");
130 130
         $dummy_organisation3 = _("entity");
131 131
         // and do something useless with the strings so that there's no "unused" complaint
132
-        if (strlen($dummy_NRO . $dummy_idp1 . $dummy_idp2 . $dummy_idp3 . $dummy_hotspot1 . $dummy_hotspot2 . $dummy_hotspot3 . $dummy_organisation1 . $dummy_organisation2 . $dummy_organisation2a . $dummy_organisation3) < 0) {
132
+        if (strlen($dummy_NRO.$dummy_idp1.$dummy_idp2.$dummy_idp3.$dummy_hotspot1.$dummy_hotspot2.$dummy_hotspot3.$dummy_organisation1.$dummy_organisation2.$dummy_organisation2a.$dummy_organisation3) < 0) {
133 133
             throw new Exception("Strings are usually not shorter than 0 characters. We've encountered a string blackhole.");
134 134
         }
135
-        $xyzVariableFed = \config\ConfAssistant::CONSORTIUM['nomenclature_federation'] . "";
136
-        $xyzVariableIdP = \config\ConfAssistant::CONSORTIUM['nomenclature_idp'] . "";
137
-        $xyzVariableHotspot = \config\ConfAssistant::CONSORTIUM['nomenclature_hotspot'] . "";
138
-        $xyzVariableParticipant = \config\ConfAssistant::CONSORTIUM['nomenclature_participant'] . "";
135
+        $xyzVariableFed = \config\ConfAssistant::CONSORTIUM['nomenclature_federation']."";
136
+        $xyzVariableIdP = \config\ConfAssistant::CONSORTIUM['nomenclature_idp']."";
137
+        $xyzVariableHotspot = \config\ConfAssistant::CONSORTIUM['nomenclature_hotspot']."";
138
+        $xyzVariableParticipant = \config\ConfAssistant::CONSORTIUM['nomenclature_participant']."";
139 139
         Entity::$nomenclature_fed = _($xyzVariableFed);
140 140
         Entity::$nomenclature_idp = _($xyzVariableIdP);
141 141
         Entity::$nomenclature_hotspot = _($xyzVariableHotspot);
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
      */
152 152
     public function __destruct()
153 153
     {
154
-        (new Logging())->debug(5, "--- KILL Destructing class " . get_class($this) . " .\n");
154
+        (new Logging())->debug(5, "--- KILL Destructing class ".get_class($this)." .\n");
155 155
     }
156 156
 
157 157
     /**
@@ -184,7 +184,7 @@  discard block
 block discarded – undo
184 184
     public static function createTemporaryDirectory($purpose = 'installer', $failIsFatal = 1)
185 185
     {
186 186
         $loggerInstance = new Logging();
187
-        $name = md5(time() . rand());
187
+        $name = md5(time().rand());
188 188
         $path = ROOT;
189 189
         switch ($purpose) {
190 190
             case 'silverbullet':
@@ -202,7 +202,7 @@  discard block
 block discarded – undo
202 202
             default:
203 203
                 throw new Exception("unable to create temporary directory due to unknown purpose: $purpose\n");
204 204
         }
205
-        $tmpDir = $path . '/' . $name;
205
+        $tmpDir = $path.'/'.$name;
206 206
         $loggerInstance->debug(4, "temp dir: $purpose : $tmpDir\n");
207 207
         if (!mkdir($tmpDir, 0700, true)) {
208 208
             if ($failIsFatal) {
@@ -223,7 +223,7 @@  discard block
 block discarded – undo
223 223
      */
224 224
     public static function rrmdir($dir)
225 225
     {
226
-        foreach (glob($dir . '/*') as $file) {
226
+        foreach (glob($dir.'/*') as $file) {
227 227
             if (is_dir($file)) {
228 228
                 Entity::rrmdir($file);
229 229
             } else {
@@ -249,12 +249,12 @@  discard block
 block discarded – undo
249 249
         }
250 250
         // these substr() are guaranteed to yield actual string data, as the
251 251
         // base string is an MD5 hash - has sufficient length
252
-        $uuid = /** @scrutinizer ignore-type */ substr($chars, 0, 8) . '-';
253
-        $uuid .= /** @scrutinizer ignore-type */ substr($chars, 8, 4) . '-';
254
-        $uuid .= /** @scrutinizer ignore-type */ substr($chars, 12, 4) . '-';
255
-        $uuid .= /** @scrutinizer ignore-type */ substr($chars, 16, 4) . '-';
252
+        $uuid = /** @scrutinizer ignore-type */ substr($chars, 0, 8).'-';
253
+        $uuid .= /** @scrutinizer ignore-type */ substr($chars, 8, 4).'-';
254
+        $uuid .= /** @scrutinizer ignore-type */ substr($chars, 12, 4).'-';
255
+        $uuid .= /** @scrutinizer ignore-type */ substr($chars, 16, 4).'-';
256 256
         $uuid .= /** @scrutinizer ignore-type */ substr($chars, 20, 12);
257
-        return $prefix . $uuid;
257
+        return $prefix.$uuid;
258 258
     }
259 259
 
260 260
     /**
@@ -295,7 +295,7 @@  discard block
 block discarded – undo
295 295
         for ($i = count($trace); $i--; $i > 0) {
296 296
             if (isset($trace[$i - 1]['class']) && preg_match('/Entity/', $trace[$i - 1]['class'])) {
297 297
                 if ($showTrace) {
298
-                    echo "FOUND caller: " . /** @scrutinizer ignore-type */ print_r($trace[$i], true) . " - class is " . $trace[$i]['class'];
298
+                    echo "FOUND caller: "./** @scrutinizer ignore-type */ print_r($trace[$i], true)." - class is ".$trace[$i]['class'];
299 299
                 }
300 300
                 $caller = $trace[$i];
301 301
                 break;
@@ -305,8 +305,8 @@  discard block
 block discarded – undo
305 305
         // otherwise, on the filename relative to ROOT
306 306
         $myName = $caller['class'] ?? substr($caller['file'], strlen(ROOT));
307 307
         if ($showTrace === TRUE) {
308
-            echo "<pre>" . /** @scrutinizer ignore-type */ print_r($trace, true) . "</pre>";
309
-            echo "CLASS = " . $myName . "<br/>";
308
+            echo "<pre>"./** @scrutinizer ignore-type */ print_r($trace, true)."</pre>";
309
+            echo "CLASS = ".$myName."<br/>";
310 310
         }
311 311
         if (preg_match("/diag/", $myName) == 1) {
312 312
             $ret = "diagnostics";
@@ -340,11 +340,11 @@  discard block
 block discarded – undo
340 340
         if ($catalogue === NULL) {
341 341
             $theCatalogue = Entity::determineOwnCatalogue($trace);
342 342
             textdomain($theCatalogue);
343
-            bindtextdomain($theCatalogue, ROOT . "/translation/");
343
+            bindtextdomain($theCatalogue, ROOT."/translation/");
344 344
             bind_textdomain_codeset($theCatalogue, "UTF-8");
345 345
         } else {
346 346
             textdomain($catalogue);
347
-            bindtextdomain($catalogue, ROOT . "/translation/");
347
+            bindtextdomain($catalogue, ROOT."/translation/");
348 348
             bind_textdomain_codeset($catalogue, "UTF-8");
349 349
         }
350 350
     }
Please login to merge, or discard this patch.
core/ProfileRADIUS.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -105,9 +105,9 @@  discard block
 block discarded – undo
105 105
 
106 106
         $attributesLowLevel = array_merge($this->deviceLevelAttributes, $this->eapLevelAttributes);
107 107
 
108
-        $this->loggerInstance->debug(5, "Device-Level Attributes: " . /** @scrutinizer ignore-type */ print_r($this->deviceLevelAttributes, true));
109
-        $this->loggerInstance->debug(5, "EAP-Level Attributes: " . /** @scrutinizer ignore-type */ print_r($this->eapLevelAttributes, true));
110
-        $this->loggerInstance->debug(5, "All low-Level Attributes: " . /** @scrutinizer ignore-type */ print_r($attributesLowLevel, true));
108
+        $this->loggerInstance->debug(5, "Device-Level Attributes: "./** @scrutinizer ignore-type */ print_r($this->deviceLevelAttributes, true));
109
+        $this->loggerInstance->debug(5, "EAP-Level Attributes: "./** @scrutinizer ignore-type */ print_r($this->eapLevelAttributes, true));
110
+        $this->loggerInstance->debug(5, "All low-Level Attributes: "./** @scrutinizer ignore-type */ print_r($attributesLowLevel, true));
111 111
 
112 112
         // now fetch and merge profile-level attributes if not already set on deeper level
113 113
 
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
             }
138 138
         }
139 139
 
140
-        $this->loggerInstance->debug(5, "Merged Attributes: " . /** @scrutinizer ignore-type */ print_r($attributesLowLevel, true));
140
+        $this->loggerInstance->debug(5, "Merged Attributes: "./** @scrutinizer ignore-type */ print_r($attributesLowLevel, true));
141 141
 
142 142
         // now, fetch and merge IdP-wide attributes
143 143
 
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
         // add the internal attribute to that effect
153 153
         
154 154
         if (isset($this->attributes['media:openroaming_always'])) {
155
-            $this->attributes = array_merge($this->attributes, $this->addInternalAttributes([ "internal:openroaming" => TRUE ] ));
155
+            $this->attributes = array_merge($this->attributes, $this->addInternalAttributes(["internal:openroaming" => TRUE]));
156 156
         }
157 157
         
158 158
         $this->loggerInstance->debug(4, "--- END Constructing new Profile object ... ---\n");
@@ -200,7 +200,7 @@  discard block
 block discarded – undo
200 200
                 "row_id" => $attributeQuery->row_id,
201 201
                 "flag" => $optinfo['flag'],
202 202
                 "device" => ($devicesOrEAPMethods == "DEVICES" ? $attributeQuery->deviceormethod : NULL),
203
-                "eapmethod" => ($devicesOrEAPMethods == "DEVICES" ? 0 : (new \core\common\EAP($attributeQuery->deviceormethod))->getArrayRep() )];
203
+                "eapmethod" => ($devicesOrEAPMethods == "DEVICES" ? 0 : (new \core\common\EAP($attributeQuery->deviceormethod))->getArrayRep())];
204 204
         }
205 205
         return $temparray;
206 206
     }
@@ -309,7 +309,7 @@  discard block
 block discarded – undo
309 309
      */
310 310
     public function setAnonymousIDSupport($shallwe)
311 311
     {
312
-        $this->databaseHandle->exec("UPDATE profile SET use_anon_outer = " . ($shallwe === true ? "1" : "0") . " WHERE profile_id = $this->identifier");
312
+        $this->databaseHandle->exec("UPDATE profile SET use_anon_outer = ".($shallwe === true ? "1" : "0")." WHERE profile_id = $this->identifier");
313 313
     }
314 314
 
315 315
     /** Toggle special username for realm checks
@@ -319,7 +319,7 @@  discard block
 block discarded – undo
319 319
      * @return void
320 320
      */
321 321
     public function setRealmCheckUser($shallwe, $localpart = NULL) {
322
-        $this->databaseHandle->exec("UPDATE profile SET checkuser_outer = " . ($shallwe === true ? "1" : "0") . " WHERE profile_id = $this->identifier");
322
+        $this->databaseHandle->exec("UPDATE profile SET checkuser_outer = ".($shallwe === true ? "1" : "0")." WHERE profile_id = $this->identifier");
323 323
         if ($localpart !== NULL) {
324 324
             $this->databaseHandle->exec("UPDATE profile SET checkuser_value = ? WHERE profile_id = $this->identifier", "s", $localpart);
325 325
         }
@@ -334,8 +334,8 @@  discard block
 block discarded – undo
334 334
      */
335 335
     public function setInputVerificationPreference($verify, $hint)
336 336
     {
337
-        $this->databaseHandle->exec("UPDATE profile SET verify_userinput_suffix = " . ($verify === true ? "1" : "0") .
338
-                ", hint_userinput_suffix = " . ($hint === true ? "1" : "0") .
337
+        $this->databaseHandle->exec("UPDATE profile SET verify_userinput_suffix = ".($verify === true ? "1" : "0").
338
+                ", hint_userinput_suffix = ".($hint === true ? "1" : "0").
339 339
                 " WHERE profile_id = $this->identifier");
340 340
     }
341 341
 
Please login to merge, or discard this patch.
web/user/about_cat.inc.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -42,24 +42,24 @@
 block discarded – undo
42 42
         \config\ConfAssistant::CONSORTIUM['display_name'], 
43 43
         \config\Master::APPEARANCE['productname'], 
44 44
         \config\Master::APPEARANCE['productname']);
45
-$out .= "<p>" . sprintf(_("<span class='edu_cat'>%s</span> currently supports the following devices and EAP type combinations:"), \config\Master::APPEARANCE['productname']) . "</p>";
46
-$out .= "<table><tr><th>" . _("Device Group") . "</th><th>" . _("Device") . "</th>";
45
+$out .= "<p>".sprintf(_("<span class='edu_cat'>%s</span> currently supports the following devices and EAP type combinations:"), \config\Master::APPEARANCE['productname'])."</p>";
46
+$out .= "<table><tr><th>"._("Device Group")."</th><th>"._("Device")."</th>";
47 47
 foreach (\core\common\EAP::listKnownEAPTypes() as $oneeap) {
48
-    $out .= "<th style='min-width: 80px;'>" . $oneeap->getPrintableRep() . "</th>";
48
+    $out .= "<th style='min-width: 80px;'>".$oneeap->getPrintableRep()."</th>";
49 49
 }
50 50
 $out .= "</tr>";
51 51
 foreach (\devices\Devices::listDevices() as $index => $onedevice) {
52 52
     if (isset($onedevice['options'])) {
53
-        if ((isset($onedevice['options']['hidden']) && ( $onedevice['options']['hidden'] == 1 || $onedevice['options']['hidden'] == 2 ))|| (isset($onedevice['options']['redirect']) && ($onedevice['options']['redirect'] == 1))) {
53
+        if ((isset($onedevice['options']['hidden']) && ($onedevice['options']['hidden'] == 1 || $onedevice['options']['hidden'] == 2)) || (isset($onedevice['options']['redirect']) && ($onedevice['options']['redirect'] == 1))) {
54 54
             continue;
55 55
         }
56 56
     }
57
-    $vendor = (new \web\lib\user\Skinjob())->findResourceUrl("IMAGES", "vendorlogo/" . $onedevice['group'] . ".png");
57
+    $vendor = (new \web\lib\user\Skinjob())->findResourceUrl("IMAGES", "vendorlogo/".$onedevice['group'].".png");
58 58
     $vendorImg = "";
59 59
     if ($vendor !== FALSE) {
60 60
         $vendorImg = "<img src='$vendor' alt='logo'>";
61 61
     }
62
-    $out .= "<tr><td class='vendor'>$vendorImg</td><td>" . $onedevice['display'] . "</td>";
62
+    $out .= "<tr><td class='vendor'>$vendorImg</td><td>".$onedevice['display']."</td>";
63 63
     $device_instance = new \core\DeviceFactory($index);
64 64
     foreach (\core\common\EAP::listKnownEAPTypes() as $oneeap) {
65 65
         $out .= "<td>";
Please login to merge, or discard this patch.
web/diag/radius_tests.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -374,7 +374,7 @@
 block discarded – undo
374 374
         throw new Exception("Unknown test requested: default case reached!");
375 375
 }
376 376
 $returnarray['datetime'] = date("Y-m-d H:i:s");
377
-if ($token!= '' && is_dir($jsonDir.'/'.$token)) {
377
+if ($token != '' && is_dir($jsonDir.'/'.$token)) {
378 378
     @mkdir($jsonDir.'/'.$token, 0777, true);
379 379
 }
380 380
 $json_data = json_encode($returnarray);
Please login to merge, or discard this patch.
utils/update_monitor_copy.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
  * update the local copy
25 25
  */
26 26
 
27
-require_once dirname(dirname(__FILE__)) . "/config/_config.php";
27
+require_once dirname(dirname(__FILE__))."/config/_config.php";
28 28
 setlocale(LC_CTYPE, "en_US.UTF-8");
29 29
 
30 30
 class updateFromMonitor {
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
         $tmp_table = 'tmp_'.$table_name;
114 114
         if ($this->tablesource[$table_name] == 'eduroam') {
115 115
             $this->db_local->select_db('monitor_copy');
116
-        } elseif($this->tablesource[$table_name] == 'eduroamv2') {
116
+        } elseif ($this->tablesource[$table_name] == 'eduroamv2') {
117 117
             $this->db_local->select_db('eduroamv2');
118 118
         }
119 119
         $this->db_local->query("CREATE TEMPORARY TABLE $tmp_table SELECT * FROM $table LIMIT 0");
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
         $this->db->query("SET NAMES 'utf8'");
123 123
         $this->db_local->query("SET NAMES 'utf8mb4'");
124 124
         $result = $this->db->query("SELECT * FROM $table");
125
-        $queryFields = implode(',', array_column($this->fields[$table_name],0));
125
+        $queryFields = implode(',', array_column($this->fields[$table_name], 0));
126 126
         while ($row = $result->fetch_assoc()) {
127 127
             $v = [];
128 128
             foreach ($this->fields[$table_name] as $field) {
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
140 140
                     }
141 141
                 }
142 142
             }
143
-            $queryValues = implode(',',$v);
143
+            $queryValues = implode(',', $v);
144 144
             $query = "INSERT INTO $tmp_table (".$queryFields.") VALUES (".$queryValues.")";
145 145
             $this->db_local->query($query);
146 146
         }
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
         $tmp_table = 'tmp_'.$table_name;
153 153
         if ($this->tablesource[$table_name] == 'eduroam') {
154 154
                 $this->db_local->select_db('monitor_copy');
155
-        } elseif($this->tablesource[$table_name] == 'eduroamv2') {
155
+        } elseif ($this->tablesource[$table_name] == 'eduroamv2') {
156 156
                 $this->db_local->select_db('eduroamv2');
157 157
         }
158 158
         $this->db_local->query("SET NAMES 'utf8mb4'");
@@ -161,9 +161,9 @@  discard block
 block discarded – undo
161 161
     }
162 162
 
163 163
     private function escape($inp) {
164
-        $out=str_replace('\\','\\\\',$inp);
165
-        $out=str_replace('"','\"',$out);
166
-        $out=str_replace('?','\?',$out);
164
+        $out = str_replace('\\', '\\\\', $inp);
165
+        $out = str_replace('"', '\"', $out);
166
+        $out = str_replace('?', '\?', $out);
167 167
         $out = 'convert(cast(convert("'.$out.'" using latin1) as binary) using utf8)';
168 168
         return($out);
169 169
     }
Please login to merge, or discard this patch.
web/diag/diag.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
  *          <base_url>/copyright.php after deploying the software
20 20
  */
21 21
 
22
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
22
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
23 23
 $admin = filter_input(INPUT_GET, 'admin', FILTER_VALIDATE_INT);
24 24
 $sp = filter_input(INPUT_GET, 'sp', FILTER_VALIDATE_INT);
25 25
 $givenRealm = htmlspecialchars(strip_tags(filter_input(INPUT_GET, 'realm')));
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
             unset($q_el[$idx]);
36 36
             $q_r = preg_replace("/\?.*/", "", $_SERVER['REQUEST_URI']);
37 37
             if (count($q_el)) {
38
-                $q_r = $q_r . '?' . implode('&', $q_el);
38
+                $q_r = $q_r.'?'.implode('&', $q_el);
39 39
             }
40 40
             $_SERVER['REQUEST_URI'] = $q_r;
41 41
         }
@@ -44,11 +44,11 @@  discard block
 block discarded – undo
44 44
     $auth->authenticate();
45 45
 }
46 46
 if (isset($_SESSION['admin_diag_auth'])) {
47
-   $admin =  1;
47
+   $admin = 1;
48 48
    unset($_SESSION['admin_diag_auth']);
49 49
 }
50 50
 $Gui = new \web\lib\user\Gui();
51 51
 $skinObject = new \web\lib\user\Skinjob($_REQUEST['skin'] ?? $_SESSION['skin'] ?? $fedskin[0] ?? \config\Master::APPEARANCE['skins'][0]);
52
-require "../skins/" . $skinObject->skin . "/diag/diag.php";
52
+require "../skins/".$skinObject->skin."/diag/diag.php";
53 53
 
54 54
 
Please login to merge, or discard this patch.
web/diag/magicTelepath.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -19,10 +19,10 @@
 block discarded – undo
19 19
  *          <base_url>/copyright.php after deploying the software
20 20
  */
21 21
 
22
-require_once dirname(dirname(__DIR__)) . "/config/_config.php";
22
+require_once dirname(dirname(__DIR__))."/config/_config.php";
23 23
 $realm = htmlspecialchars(strip_tags(filter_input(INPUT_GET, 'realm')));
24
-$visited = htmlspecialchars(strip_tags(filter_input(INPUT_GET,'visited')));
25
-$nro = htmlspecialchars(strip_tags(filter_input(INPUT_GET,'nro')));
24
+$visited = htmlspecialchars(strip_tags(filter_input(INPUT_GET, 'visited')));
25
+$nro = htmlspecialchars(strip_tags(filter_input(INPUT_GET, 'nro')));
26 26
 \core\CAT::sessionStart();
27 27
 $languageObject = new core\common\Language();
28 28
 $languageObject->setTextDomain("diagonstics");
Please login to merge, or discard this patch.
web/diag/testTelepath.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
  *          <base_url>/copyright.php after deploying the software
20 20
  */
21 21
 
22
-require_once dirname(dirname(__DIR__)) . "/config/_config.php";
22
+require_once dirname(dirname(__DIR__))."/config/_config.php";
23 23
 
24 24
 $therealm = htmlspecialchars(strip_tags(filter_input(INPUT_GET, 'realm')));
25 25
 $thevisited = htmlspecialchars(strip_tags(filter_input(INPUT_GET, 'visited')));
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
     $validator = new \web\lib\common\InputValidation();
36 36
     
37 37
     echo "<pre>";
38
-    echo "Testing " . $validatedRealm . " in " . $validator->string($thevisited);
38
+    echo "Testing ".$validatedRealm." in ".$validator->string($thevisited);
39 39
     print_r($telepath->magic());
40 40
     echo "</pre>";
41 41
 }
42 42
\ No newline at end of file
Please login to merge, or discard this patch.