@@ -105,9 +105,9 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
@@ -42,24 +42,24 @@ |
||
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>"; |
@@ -374,7 +374,7 @@ |
||
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); |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | */ |
27 | 27 | ?> |
28 | 28 | <?php |
29 | -require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php"; |
|
29 | +require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php"; |
|
30 | 30 | |
31 | 31 | $auth = new \web\lib\admin\Authentication(); |
32 | 32 | $deco = new \web\lib\admin\PageDecoration(); |
@@ -70,13 +70,13 @@ discard block |
||
70 | 70 | ?> |
71 | 71 | </h1> |
72 | 72 | <div class='infobox'> |
73 | - <h2><?php $tablecaption = sprintf(_("%s Properties"),$uiElements->nomenclatureFed); echo $tablecaption?></h2> |
|
73 | + <h2><?php $tablecaption = sprintf(_("%s Properties"), $uiElements->nomenclatureFed); echo $tablecaption?></h2> |
|
74 | 74 | <table> |
75 | - <caption><?php echo $tablecaption;?></caption> |
|
75 | + <caption><?php echo $tablecaption; ?></caption> |
|
76 | 76 | <tr> |
77 | - <th class="wai-invisible" scope="col"><?php echo _("Property Type");?></th> |
|
78 | - <th class="wai-invisible" scope="col"><?php echo _("Language if applicable");?></th> |
|
79 | - <th class="wai-invisible" scope="col"><?php echo _("Property Value");?></th> |
|
77 | + <th class="wai-invisible" scope="col"><?php echo _("Property Type"); ?></th> |
|
78 | + <th class="wai-invisible" scope="col"><?php echo _("Language if applicable"); ?></th> |
|
79 | + <th class="wai-invisible" scope="col"><?php echo _("Property Value"); ?></th> |
|
80 | 80 | </tr> |
81 | 81 | <tr> |
82 | 82 | <td><?php echo _("Country:"); ?></td> |
@@ -87,11 +87,11 @@ discard block |
||
87 | 87 | </table> |
88 | 88 | </div> |
89 | 89 | <?php |
90 | - echo "<form enctype='multipart/form-data' action='edit_federation_result.php?fed_id=$my_fed->tld" . "' method='post' accept-charset='UTF-8'> |
|
91 | - <input type='hidden' name='MAX_FILE_SIZE' value='" . \config\Master::MAX_UPLOAD_SIZE . "'>"; |
|
90 | + echo "<form enctype='multipart/form-data' action='edit_federation_result.php?fed_id=$my_fed->tld"."' method='post' accept-charset='UTF-8'> |
|
91 | + <input type='hidden' name='MAX_FILE_SIZE' value='" . \config\Master::MAX_UPLOAD_SIZE."'>"; |
|
92 | 92 | ?> |
93 | 93 | <fieldset class="option_container"> |
94 | - <legend><strong><?php echo sprintf(_("%s Properties"),$uiElements->nomenclatureFed); ?></strong></legend> |
|
94 | + <legend><strong><?php echo sprintf(_("%s Properties"), $uiElements->nomenclatureFed); ?></strong></legend> |
|
95 | 95 | <?php |
96 | 96 | $optionDisplay = new \web\lib\admin\OptionDisplay($fed_options, \core\Options::LEVEL_FED); |
97 | 97 | echo $optionDisplay->prefilledOptionTable("fed", $my_fed->tld); |
@@ -101,10 +101,10 @@ discard block |
||
101 | 101 | <?php |
102 | 102 | echo "<div>"; |
103 | 103 | if ($editMode === 'fullaccess') { |
104 | - echo "<button type='submit' name='submitbutton' value='" . web\lib\common\FormElements::BUTTON_SAVE . "'>" . _("Save data") . "</button>"; |
|
104 | + echo "<button type='submit' name='submitbutton' value='".web\lib\common\FormElements::BUTTON_SAVE."'>"._("Save data")."</button>"; |
|
105 | 105 | $discardLabel = _("Discard changes"); |
106 | 106 | } else { |
107 | 107 | $discardLabel = _("Return"); |
108 | 108 | } |
109 | - echo "<button type='button' class='delete' name='abortbutton' value='abort' onclick='javascript:window.location = \"overview_federation.php?fed_id=$fedPost\"'>" . $discardLabel . "</button></div></form>"; |
|
109 | + echo "<button type='button' class='delete' name='abortbutton' value='abort' onclick='javascript:window.location = \"overview_federation.php?fed_id=$fedPost\"'>".$discardLabel."</button></div></form>"; |
|
110 | 110 | echo $deco->footer(); |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | private function inputValidationError($customtext) |
41 | 41 | { |
42 | 42 | \core\common\Entity::intoThePotatoes(); |
43 | - $retval = "<p>" . _("Input validation error: ") . $customtext . "</p>"; |
|
43 | + $retval = "<p>"._("Input validation error: ").$customtext."</p>"; |
|
44 | 44 | \core\common\Entity::outOfThePotatoes(); |
45 | 45 | return $retval; |
46 | 46 | } |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | $postFed = $fedIdentifiers[$correctIndex]; |
98 | 98 | $temp = new \core\Federation($postFed); |
99 | 99 | if ($owner === NULL) { |
100 | - return [$temp,'readonly']; |
|
100 | + return [$temp, 'readonly']; |
|
101 | 101 | } |
102 | 102 | $user = new \core\User($owner); |
103 | 103 | foreach ($temp->listFederationAdmins() as $oneowner) { |
@@ -105,9 +105,9 @@ discard block |
||
105 | 105 | return [$temp, 'fullaccess']; |
106 | 106 | } |
107 | 107 | } |
108 | - if ($user->isSuperadmin()|| $user->isSupport()) { |
|
108 | + if ($user->isSuperadmin() || $user->isSupport()) { |
|
109 | 109 | $this->loggerInstance->debug(4, "You are the superadmin/support\n"); |
110 | - return [$temp,'readonly']; |
|
110 | + return [$temp, 'readonly']; |
|
111 | 111 | } |
112 | 112 | throw new Exception($this->inputValidationError(sprintf("User is not %s administrator!", \core\common\Entity::$nomenclature_fed))); |
113 | 113 | } |
@@ -168,18 +168,18 @@ discard block |
||
168 | 168 | } |
169 | 169 | if ($user->isFederationAdmin($temp->federation)) { |
170 | 170 | $this->loggerInstance->debug(4, "You are fed admin for this IdP\n"); |
171 | - return [$temp,'readonly']; |
|
171 | + return [$temp, 'readonly']; |
|
172 | 172 | } |
173 | 173 | if ($user->isSuperadmin() || $user->isSupport()) { |
174 | 174 | $this->loggerInstance->debug(4, "You are the superadmin/support\n"); |
175 | - return [$temp,'readonly']; |
|
175 | + return [$temp, 'readonly']; |
|
176 | 176 | } |
177 | 177 | throw new Exception($this->inputValidationError("This IdP identifier is not accessible!")); |
178 | 178 | } |
179 | 179 | if ($claimedFedBinding !== NULL && strtoupper($temp->federation) != strtoupper($claimedFedBinding->tld)) { |
180 | 180 | throw new Exception($this->inputValidationError("This IdP does not belong to the claimed federation!")); |
181 | 181 | } |
182 | - return [$temp,'nouser']; |
|
182 | + return [$temp, 'nouser']; |
|
183 | 183 | } |
184 | 184 | |
185 | 185 | /** |
@@ -621,7 +621,7 @@ discard block |
||
621 | 621 | try { |
622 | 622 | $image->readImageBlob($binary); |
623 | 623 | } catch (\ImagickException $exception) { |
624 | - echo "Error" . $exception->getMessage(); |
|
624 | + echo "Error".$exception->getMessage(); |
|
625 | 625 | return FALSE; |
626 | 626 | } |
627 | 627 | // image survived the sanity check |
@@ -8,7 +8,7 @@ discard block |
||
8 | 8 | * License: see the web/copyright.php file in the file structure |
9 | 9 | * ****************************************************************************** |
10 | 10 | */ |
11 | -require_once dirname(dirname(__FILE__)) . "/config/_config.php"; |
|
11 | +require_once dirname(dirname(__FILE__))."/config/_config.php"; |
|
12 | 12 | |
13 | 13 | /** |
14 | 14 | * The sctipt will be called from crontab |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | } |
29 | 29 | |
30 | 30 | |
31 | -while ( $row = mysqli_fetch_object(/** @scrutinizer ignore-type */ $allOpenRoamingProfiles)) { |
|
31 | +while ($row = mysqli_fetch_object(/** @scrutinizer ignore-type */ $allOpenRoamingProfiles)) { |
|
32 | 32 | $profileId = $row->profile_id; |
33 | 33 | $profile = \core\ProfileFactory::instantiate($profileId); |
34 | 34 | $res = $profile->openroamingRedinessTest(); |
@@ -24,7 +24,7 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 | } |
@@ -62,24 +62,24 @@ discard block |
||
62 | 62 | case "EXTERNAL": |
63 | 63 | case "FRONTEND": |
64 | 64 | case "DIAGNOSTICS": |
65 | - if (!isset(self::${"instance" . $theDb})) { |
|
65 | + if (!isset(self::${"instance".$theDb})) { |
|
66 | 66 | $class = __CLASS__; |
67 | - self::${"instance" . $theDb} = new $class($database); |
|
68 | - DBConnection::${"instance" . $theDb}->databaseInstance = $theDb; |
|
67 | + self::${"instance".$theDb} = new $class($database); |
|
68 | + DBConnection::${"instance".$theDb}->databaseInstance = $theDb; |
|
69 | 69 | } |
70 | - return self::${"instance" . $theDb}; |
|
70 | + return self::${"instance".$theDb}; |
|
71 | 71 | case "RADIUS": |
72 | - if (!isset(self::${"instance" . $theDb})) { |
|
72 | + if (!isset(self::${"instance".$theDb})) { |
|
73 | 73 | $class = __CLASS__; |
74 | 74 | foreach (\config\ConfAssistant::DB as $name => $oneRadiusAuthDb) { |
75 | 75 | $theInstance = new $class($name); |
76 | - self::${"instance" . $theDb}[] = $theInstance; |
|
76 | + self::${"instance".$theDb}[] = $theInstance; |
|
77 | 77 | $theInstance->databaseInstance = $theDb; |
78 | 78 | } |
79 | 79 | } |
80 | - return self::${"instance" . $theDb}; |
|
80 | + return self::${"instance".$theDb}; |
|
81 | 81 | default: |
82 | - throw new Exception("This type of database (" . strtoupper($database) . ") is not known!"); |
|
82 | + throw new Exception("This type of database (".strtoupper($database).") is not known!"); |
|
83 | 83 | } |
84 | 84 | } |
85 | 85 | |
@@ -121,18 +121,18 @@ discard block |
||
121 | 121 | } |
122 | 122 | } |
123 | 123 | // log exact query to debug log, if log level is at 5 |
124 | - $this->loggerInstance->debug(5, "DB ATTEMPT: ".$this->databaseInstance .": " . $querystring . "\n"); |
|
124 | + $this->loggerInstance->debug(5, "DB ATTEMPT: ".$this->databaseInstance.": ".$querystring."\n"); |
|
125 | 125 | if ($types !== NULL) { |
126 | - $this->loggerInstance->debug(5, "Argument type sequence: $types, parameters are: " . /** @scrutinizer ignore-type */ print_r($arguments, true)); |
|
126 | + $this->loggerInstance->debug(5, "Argument type sequence: $types, parameters are: "./** @scrutinizer ignore-type */ print_r($arguments, true)); |
|
127 | 127 | } |
128 | 128 | |
129 | 129 | if ($this->connection->connect_error) { |
130 | - throw new Exception("ERROR: Cannot send query to $this->databaseInstance database (no connection, error number" . $this->connection->connect_error . ")!"); |
|
130 | + throw new Exception("ERROR: Cannot send query to $this->databaseInstance database (no connection, error number".$this->connection->connect_error.")!"); |
|
131 | 131 | } |
132 | 132 | if ($types === NULL) { |
133 | 133 | $result = $this->connection->query($querystring); |
134 | 134 | if ($result === FALSE) { |
135 | - throw new Exception("DB: Unable to execute simple statement! Error was --> " . $this->connection->error . " <--"); |
|
135 | + throw new Exception("DB: Unable to execute simple statement! Error was --> ".$this->connection->error." <--"); |
|
136 | 136 | } |
137 | 137 | } else { |
138 | 138 | // fancy! prepared statement with dedicated argument list |
@@ -148,7 +148,7 @@ discard block |
||
148 | 148 | } |
149 | 149 | $prepResult = $statementObject->prepare($querystring); |
150 | 150 | if ($prepResult === FALSE) { |
151 | - throw new Exception("DB: Unable to prepare statement! Statement was --> $querystring <--, error was --> " . $statementObject->error . " <--."); |
|
151 | + throw new Exception("DB: Unable to prepare statement! Statement was --> $querystring <--, error was --> ".$statementObject->error." <--."); |
|
152 | 152 | } |
153 | 153 | $this->preparedStatements[$querystring] = $statementObject; |
154 | 154 | } |
@@ -161,11 +161,11 @@ discard block |
||
161 | 161 | array_unshift($localArray, $types); |
162 | 162 | $retval = call_user_func_array([$statementObject, "bind_param"], $localArray); |
163 | 163 | if ($retval === FALSE) { |
164 | - throw new Exception("DB: Unable to bind parameters to prepared statement! Argument array was --> " . var_export($localArray, TRUE) . " <--. Error was --> " . $statementObject->error . " <--"); |
|
164 | + throw new Exception("DB: Unable to bind parameters to prepared statement! Argument array was --> ".var_export($localArray, TRUE)." <--. Error was --> ".$statementObject->error." <--"); |
|
165 | 165 | } |
166 | 166 | $result = $statementObject->execute(); |
167 | 167 | if ($result === FALSE) { |
168 | - throw new Exception("DB: Unable to execute prepared statement! Error was --> " . $statementObject->error . " <--"); |
|
168 | + throw new Exception("DB: Unable to execute prepared statement! Error was --> ".$statementObject->error." <--"); |
|
169 | 169 | } |
170 | 170 | $selectResult = $statementObject->get_result(); |
171 | 171 | if ($selectResult !== FALSE) { |
@@ -175,14 +175,14 @@ discard block |
||
175 | 175 | |
176 | 176 | // all cases where $result could be FALSE have been caught earlier |
177 | 177 | if ($this->connection->errno) { |
178 | - throw new Exception("ERROR: Cannot execute query in $this->databaseInstance database - (hopefully escaped) query was '$querystring', errno was " . $this->connection->errno . "!"); |
|
178 | + throw new Exception("ERROR: Cannot execute query in $this->databaseInstance database - (hopefully escaped) query was '$querystring', errno was ".$this->connection->errno."!"); |
|
179 | 179 | } |
180 | 180 | |
181 | 181 | |
182 | 182 | if ($isMoreThanSelect || \config\Master::DEBUG_LEVEL == 5) { |
183 | - $this->loggerInstance->writeSQLAudit("[DB: " . strtoupper($this->databaseInstance) . "] " . $querystring); |
|
183 | + $this->loggerInstance->writeSQLAudit("[DB: ".strtoupper($this->databaseInstance)."] ".$querystring); |
|
184 | 184 | if ($types !== NULL) { |
185 | - $this->loggerInstance->writeSQLAudit("Argument type sequence: $types, parameters are: " . /** @scrutinizer ignore-type */ print_r($arguments, true)); |
|
185 | + $this->loggerInstance->writeSQLAudit("Argument type sequence: $types, parameters are: "./** @scrutinizer ignore-type */ print_r($arguments, true)); |
|
186 | 186 | } |
187 | 187 | } |
188 | 188 | return $result; |
@@ -280,13 +280,13 @@ discard block |
||
280 | 280 | if (isset(\config\Master::DB[$databaseCapitalised])) { |
281 | 281 | $this->connection = new \mysqli(\config\Master::DB[$databaseCapitalised]['host'], \config\Master::DB[$databaseCapitalised]['user'], \config\Master::DB[$databaseCapitalised]['pass'], \config\Master::DB[$databaseCapitalised]['db']); |
282 | 282 | if ($this->connection->connect_error) { |
283 | - throw new Exception("ERROR: Unable to connect to $database database! This is a fatal error, giving up (error number " . $this->connection->connect_errno . ")."); |
|
283 | + throw new Exception("ERROR: Unable to connect to $database database! This is a fatal error, giving up (error number ".$this->connection->connect_errno.")."); |
|
284 | 284 | } |
285 | 285 | $this->readOnly = \config\Master::DB[$databaseCapitalised]['readonly']; |
286 | 286 | } else { // one of the RADIUS DBs |
287 | 287 | $this->connection = new \mysqli(\config\ConfAssistant::DB[$databaseCapitalised]['host'], \config\ConfAssistant::DB[$databaseCapitalised]['user'], \config\ConfAssistant::DB[$databaseCapitalised]['pass'], \config\ConfAssistant::DB[$databaseCapitalised]['db']); |
288 | 288 | if ($this->connection->connect_error) { |
289 | - throw new Exception("ERROR: Unable to connect to $database database! This is a fatal error, giving up (error number " . $this->connection->connect_errno . ")."); |
|
289 | + throw new Exception("ERROR: Unable to connect to $database database! This is a fatal error, giving up (error number ".$this->connection->connect_errno.")."); |
|
290 | 290 | } |
291 | 291 | $this->readOnly = \config\ConfAssistant::DB[$databaseCapitalised]['readonly']; |
292 | 292 | } |
@@ -19,7 +19,7 @@ discard block |
||
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 |
||
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 |
||
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 |