Passed
Push — release_2_1 ( 034c0d...75d945 )
by Tomasz
10:23
created
core/IdP.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -115,12 +115,12 @@  discard block
 block discarded – undo
115 115
         $this->name = $this->languageInstance->getLocalisedValue($this->getAttributes('general:instname'));
116 116
         $eligibility = $this->eligibility();
117 117
         if (in_array(IdP::ELIGIBILITY_IDP, $eligibility) && in_array(IdP::ELIGIBILITY_SP, $eligibility)) {
118
-            $eligType = IdP::TYPE_IDPSP . "";
118
+            $eligType = IdP::TYPE_IDPSP."";
119 119
             $this->type = $eligType;
120 120
         } elseif (in_array(IdP::ELIGIBILITY_IDP, $eligibility)) {
121
-            $eligType = IdP::TYPE_IDP . "";
121
+            $eligType = IdP::TYPE_IDP."";
122 122
         } else {
123
-            $eligType = IdP::TYPE_SP . "";
123
+            $eligType = IdP::TYPE_SP."";
124 124
         }
125 125
         $this->type = $eligType;
126 126
         $this->loggerInstance->debug(4, "--- END Constructing new IdP object ... ---\n");
@@ -134,7 +134,7 @@  discard block
 block discarded – undo
134 134
      */
135 135
     public function listProfiles(bool $activeOnly = FALSE)
136 136
     {
137
-        $query = "SELECT profile_id FROM profile WHERE inst_id = $this->identifier" . ($activeOnly ? " AND showtime = 1" : "");
137
+        $query = "SELECT profile_id FROM profile WHERE inst_id = $this->identifier".($activeOnly ? " AND showtime = 1" : "");
138 138
         $allProfiles = $this->databaseHandle->exec($query);
139 139
         $returnarray = [];
140 140
         // SELECT -> resource, not boolean
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
144 144
             $returnarray[] = $oneProfile;
145 145
         }
146 146
 
147
-        $this->loggerInstance->debug(4, "listProfiles: " . /** @scrutinizer ignore-type */ print_r($returnarray, true));
147
+        $this->loggerInstance->debug(4, "listProfiles: "./** @scrutinizer ignore-type */ print_r($returnarray, true));
148 148
         return $returnarray;
149 149
     }
150 150
 
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
156 156
      */
157 157
     public function listDeployments(bool $activeOnly = FALSE)
158 158
     {
159
-        $query = "SELECT deployment_id FROM deployment WHERE inst_id = $this->identifier" . ($activeOnly ? " AND status = " . AbstractDeployment::ACTIVE : "");
159
+        $query = "SELECT deployment_id FROM deployment WHERE inst_id = $this->identifier".($activeOnly ? " AND status = ".AbstractDeployment::ACTIVE : "");
160 160
         $allDeployments = $this->databaseHandle->exec($query);
161 161
         $returnarray = [];
162 162
         // SELECT -> resource, not boolean
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
             $returnarray[] = new DeploymentManaged($this, $deploymentQuery->deployment_id);
165 165
         }
166 166
 
167
-        $this->loggerInstance->debug(4, "listDeployments: " . /** @scrutinizer ignore-type */ print_r($returnarray, true));
167
+        $this->loggerInstance->debug(4, "listDeployments: "./** @scrutinizer ignore-type */ print_r($returnarray, true));
168 168
         return $returnarray;
169 169
     }
170 170
 
@@ -190,7 +190,7 @@  discard block
 block discarded – undo
190 190
         $redirectProfileIds = [];
191 191
         $allProfileLevels = $this->databaseHandle->exec("SELECT profile_id, sufficient_config + showtime AS maxlevel FROM profile WHERE inst_id = $this->identifier ORDER BY maxlevel DESC");
192 192
         // SELECT yields a resource, not a boolean
193
-        if ($allProfileLevels->num_rows == 0 ) {
193
+        if ($allProfileLevels->num_rows == 0) {
194 194
             return self::PROFILES_INCOMPLETE;
195 195
         }
196 196
         $allProfilesArray = $allProfileLevels->fetch_all(MYSQLI_ASSOC);
@@ -218,7 +218,7 @@  discard block
 block discarded – undo
218 218
         $allProfiles = $this->databaseHandle->exec("SELECT MIN(openroaming) AS maxlevel FROM profile WHERE inst_id = $this->identifier");
219 219
         // SELECT yields a resource, not a boolean
220 220
         while ($res = mysqli_fetch_object(/** @scrutinizer ignore-type */ $allProfiles)) {
221
-            return (is_numeric($res->maxlevel) ? (int)$res->maxlevel : AbstractProfile::OVERALL_OPENROAMING_LEVEL_NO ); // insts without profiles should get a "NO"
221
+            return (is_numeric($res->maxlevel) ? (int) $res->maxlevel : AbstractProfile::OVERALL_OPENROAMING_LEVEL_NO); // insts without profiles should get a "NO"
222 222
         }
223 223
         return AbstractProfile::OVERALL_OPENROAMING_LEVEL_NO;
224 224
     }
@@ -352,7 +352,7 @@  discard block
 block discarded – undo
352 352
                 case AbstractProfile::PROFILETYPE_SILVERBULLET:
353 353
                     $theProfile = new ProfileSilverbullet($identifier, $this);
354 354
                     $theProfile->addSupportedEapMethod(new \core\common\EAP(\core\common\EAP::EAPTYPE_SILVERBULLET), 1);
355
-                    $theProfile->setRealm($this->identifier . "-" . $theProfile->identifier . "." . strtolower($this->federation) . strtolower(\config\ConfAssistant::SILVERBULLET['realm_suffix']));
355
+                    $theProfile->setRealm($this->identifier."-".$theProfile->identifier.".".strtolower($this->federation).strtolower(\config\ConfAssistant::SILVERBULLET['realm_suffix']));
356 356
                     return $theProfile;
357 357
                 default:
358 358
                     throw new Exception("This type of profile is unknown and can not be added.");
@@ -495,7 +495,7 @@  discard block
 block discarded – undo
495 495
     public function getExternalDBId()
496 496
     {
497 497
         if (\config\ConfAssistant::CONSORTIUM['name'] == "eduroam" && isset(\config\ConfAssistant::CONSORTIUM['deployment-voodoo']) && \config\ConfAssistant::CONSORTIUM['deployment-voodoo'] == "Operations Team") { // SW: APPROVED
498
-            $idQuery = $this->databaseHandle->exec("SELECT external_db_id FROM institution WHERE inst_id = $this->identifier AND external_db_syncstate = " . self::EXTERNAL_DB_SYNCSTATE_SYNCED);
498
+            $idQuery = $this->databaseHandle->exec("SELECT external_db_id FROM institution WHERE inst_id = $this->identifier AND external_db_syncstate = ".self::EXTERNAL_DB_SYNCSTATE_SYNCED);
499 499
             // SELECT -> it's a resource, not a boolean
500 500
             if (mysqli_num_rows(/** @scrutinizer ignore-type */ $idQuery) == 0) {
501 501
                 return FALSE;
@@ -561,16 +561,16 @@  discard block
 block discarded – undo
561 561
         }
562 562
         foreach ($baseline as $lang => $value) {
563 563
             if (!key_exists($lang, $newvalues)) {
564
-                $retval[IdP::INSTNAME_CHANGED] .= "#[Language " . strtoupper($lang) . "] DELETED";
564
+                $retval[IdP::INSTNAME_CHANGED] .= "#[Language ".strtoupper($lang)."] DELETED";
565 565
             } else {
566 566
                 if ($value != $newvalues[$lang]) {
567
-                    $retval[IdP::INSTNAME_CHANGED] .= "#[Language " . strtoupper($lang) . "] CHANGED from '" . $baseline[$lang] . "' to '" . $newvalues[$lang] . "'";
567
+                    $retval[IdP::INSTNAME_CHANGED] .= "#[Language ".strtoupper($lang)."] CHANGED from '".$baseline[$lang]."' to '".$newvalues[$lang]."'";
568 568
                 }
569 569
             }
570 570
         }
571 571
         foreach ($newvalues as $lang => $value) {
572 572
             if (!key_exists($lang, $baseline)) {
573
-                $retval[IdP::INSTNAME_CHANGED] .= "#[Language " . strtoupper($lang) . "] ADDED as '" . $value . "'";
573
+                $retval[IdP::INSTNAME_CHANGED] .= "#[Language ".strtoupper($lang)."] ADDED as '".$value."'";
574 574
             }
575 575
         }
576 576
         return $retval;
Please login to merge, or discard this patch.
web/admin/overview_org.php 1 patch
Spacing   +51 added lines, -51 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
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
 function displaySilverbulletPropertyWidget(&$theProfile, $readonly, &$uiElements) {
32 32
     ?>
@@ -43,14 +43,14 @@  discard block
 block discarded – undo
43 43
                 <ul style='margin:1px'>
44 44
                     <?php
45 45
                     foreach ($completeness as $missing_attrib) {
46
-                        echo "<li>" . $uiElements->displayName($missing_attrib) . "</li>";
46
+                        echo "<li>".$uiElements->displayName($missing_attrib)."</li>";
47 47
                     }
48 48
                     ?>
49 49
                 </ul>
50 50
             </div>
51 51
             <?php
52 52
         } else {
53
-            echo sprintf(_("You can create up to %d users."), $maxusers[0]['value']) . "<br/>" . sprintf(_("Their credentials will carry the name <strong>%s</strong>."), $theProfile->realm);
53
+            echo sprintf(_("You can create up to %d users."), $maxusers[0]['value'])."<br/>".sprintf(_("Their credentials will carry the name <strong>%s</strong>."), $theProfile->realm);
54 54
         }
55 55
         ?>
56 56
         <br/>
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
         if ($readonly === FALSE) {
60 60
             ?>
61 61
             <form action='edit_silverbullet.php?inst_id=<?php echo $theProfile->institution; ?>&amp;profile_id=<?php echo $theProfile->identifier; ?>' method='POST'>
62
-                <button <?php echo ( is_array($completeness) ? "disabled" : "" ); ?> type='submit' name='sb_action' value='sb_edit'><?php echo _("Manage User Base"); ?></button>
62
+                <button <?php echo (is_array($completeness) ? "disabled" : ""); ?> type='submit' name='sb_action' value='sb_edit'><?php echo _("Manage User Base"); ?></button>
63 63
             </form>
64 64
             <?php
65 65
         }
@@ -95,21 +95,21 @@  discard block
 block discarded – undo
95 95
                 $has_overrides = TRUE;
96 96
             }
97 97
         }
98
-        $buffer_eaptypediv = "<div style='margin-bottom:40px; float:left;'>" . _("<strong>EAP Types</strong> (in order of preference):") . "<br/>";
98
+        $buffer_eaptypediv = "<div style='margin-bottom:40px; float:left;'>"._("<strong>EAP Types</strong> (in order of preference):")."<br/>";
99 99
         $typelist = $theProfile->getEapMethodsinOrderOfPreference();
100 100
         $allcomplete = TRUE;
101 101
         foreach ($typelist as $eaptype) {
102 102
             $buffer_eaptypediv .= $eaptype->getPrintableRep();
103 103
             $completeness = $theProfile->isEapTypeDefinitionComplete($eaptype);
104 104
             if ($completeness === true) {
105
-                $buffer_eaptypediv .= " <div class='acceptable'>" . _("OK") . "</div>";
105
+                $buffer_eaptypediv .= " <div class='acceptable'>"._("OK")."</div>";
106 106
             } else {
107 107
                 $buffer_eaptypediv .= " <div class='notacceptable'>";
108 108
                 $buffer_eaptypediv .= _("Information needed!");
109 109
                 if (is_array($completeness)) {
110 110
                     $buffer_eaptypediv .= "<ul style='margin:1px'>";
111 111
                     foreach ($completeness as $missing_attrib) {
112
-                        $buffer_eaptypediv .= "<li>" . $uiElements->displayName($missing_attrib) . "</li>";
112
+                        $buffer_eaptypediv .= "<li>".$uiElements->displayName($missing_attrib)."</li>";
113 113
                     }
114 114
                     $buffer_eaptypediv .= "</ul>";
115 115
                 }
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
             foreach ($attribs as $attrib) {
122 122
                 if ($attrib['level'] == \core\Options::LEVEL_METHOD && !preg_match("/^internal:/", $attrib['name']) && !$justOnce) {
123 123
                     $justOnce = TRUE;
124
-                    $buffer_eaptypediv .= "<img src='../resources/images/icons/Tabler/square-rounded-letter-e-blue.svg' alt='" . _("Options on EAP Method/Device level are in effect.") . "'>";
124
+                    $buffer_eaptypediv .= "<img src='../resources/images/icons/Tabler/square-rounded-letter-e-blue.svg' alt='"._("Options on EAP Method/Device level are in effect.")."'>";
125 125
                 }
126 126
             }
127 127
             $buffer_eaptypediv .= "<br/>";
@@ -147,21 +147,21 @@  discard block
 block discarded – undo
147 147
         if ($theProfile->isRedirected()) {
148 148
             $iconData = $uiElements->iconData('PROFILES_REDIRECTED');
149 149
             $iconData['text'] = _("Profile redirected");
150
-            $buffer_headline .= "<br/>" . $uiElements->catIcon(($iconData));
150
+            $buffer_headline .= "<br/>".$uiElements->catIcon(($iconData));
151 151
         } else {
152 152
             $certStatus = $theProfile->certificateStatus();
153 153
             switch ($certStatus) {
154 154
                 case core\AbstractProfile::CERT_STATUS_OK:
155 155
                     $iconData = $uiElements->iconData('CERT_STATUS_OK');
156
-                    $buffer_headline .= "<br/>" . $uiElements->catIcon(($iconData));
156
+                    $buffer_headline .= "<br/>".$uiElements->catIcon(($iconData));
157 157
                     break;
158 158
                 case core\AbstractProfile::CERT_STATUS_WARN:
159 159
                     $iconData = $uiElements->iconData('CERT_STATUS_WARN');
160
-                    $buffer_headline .= "<br/>" . $uiElements->catIcon(($iconData));                
160
+                    $buffer_headline .= "<br/>".$uiElements->catIcon(($iconData));                
161 161
                     break;
162 162
                 case core\AbstractProfile::CERT_STATUS_ERROR:
163 163
                     $iconData = $uiElements->iconData('CERT_STATUS_ERROR');
164
-                    $buffer_headline .= "<br/>" . $uiElements->catIcon(($iconData));
164
+                    $buffer_headline .= "<br/>".$uiElements->catIcon(($iconData));
165 165
                     break;            
166 166
             }
167 167
         }
@@ -188,11 +188,11 @@  discard block
 block discarded – undo
188 188
                 if (\config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] == "LOCAL") {
189 189
                     $diagUrl = "../diag/";
190 190
                 } else {
191
-                    $diagUrl = \config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] . "/diag/";
191
+                    $diagUrl = \config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS']."/diag/";
192 192
                 }
193 193
                 ?>
194
-                <form action='<?php echo $diagUrl . "action_realmcheck.php?inst_id=" . $theProfile->institution . "&profile_id=" . $theProfile->identifier ?>' method='post' accept-charset='UTF-8'>
195
-                    <input type='hidden' name='comefrom' value='<?php echo htmlspecialchars($link . $_SERVER['SCRIPT_NAME']); ?>'/>
194
+                <form action='<?php echo $diagUrl."action_realmcheck.php?inst_id=".$theProfile->institution."&profile_id=".$theProfile->identifier ?>' method='post' accept-charset='UTF-8'>
195
+                    <input type='hidden' name='comefrom' value='<?php echo htmlspecialchars($link.$_SERVER['SCRIPT_NAME']); ?>'/>
196 196
                     <button type='submit' name='profile_action' value='check' <?php echo ($has_realm ? "" : "disabled='disabled'"); ?> title='<?php echo _("The realm can only be checked if you configure the realm!"); ?>'>
197 197
                         <?php echo _("Check realm reachability"); ?>
198 198
                     </button>
@@ -234,9 +234,9 @@  discard block
 block discarded – undo
234 234
                 ?>
235 235
                 <div style='display: flex;'>
236 236
                     <?php
237
-                    $idpLevelUrl = $link . dirname(dirname($_SERVER['SCRIPT_NAME'])) . "?idp=" . $theProfile->institution;
238
-                    $displayurl = $idpLevelUrl . "&amp;profile=" . $theProfile->identifier;
239
-                    $QRurl = $idpLevelUrl . "&profile=" . $theProfile->identifier;
237
+                    $idpLevelUrl = $link.dirname(dirname($_SERVER['SCRIPT_NAME']))."?idp=".$theProfile->institution;
238
+                    $displayurl = $idpLevelUrl."&amp;profile=".$theProfile->identifier;
239
+                    $QRurl = $idpLevelUrl."&profile=".$theProfile->identifier;
240 240
                     $qrCode = new \chillerlan\QRCode\QRCode(new \chillerlan\QRCode\QROptions([
241 241
                                 'outputType' => \chillerlan\QRCode\QRCode::OUTPUT_IMAGE_PNG,
242 242
                                 'eccLevel' => \chillerlan\QRCode\QRCode::ECC_H,
@@ -248,9 +248,9 @@  discard block
 block discarded – undo
248 248
                     if (empty($rawQr)) {
249 249
                         throw new Exception("Something went seriously wrong during QR code generation!");
250 250
                     }
251
-                    $uri = "data:image/png;base64," . base64_encode($uiElements->pngInjectConsortiumLogo($rawQr, web\lib\admin\UIElements::QRCODE_PIXELS_PER_SYMBOL));
251
+                    $uri = "data:image/png;base64,".base64_encode($uiElements->pngInjectConsortiumLogo($rawQr, web\lib\admin\UIElements::QRCODE_PIXELS_PER_SYMBOL));
252 252
                     $size = getimagesize($uri);
253
-                    echo "<img width='" . ($size[0] / 4) . "' height='" . ($size[1] / 4) . "' src='$uri' alt='QR-code'/>";
253
+                    echo "<img width='".($size[0] / 4)."' height='".($size[1] / 4)."' src='$uri' alt='QR-code'/>";
254 254
 
255 255
                     //echo "<nobr>$displayurl</nobr></a>";
256 256
                     echo "<p>$displayurl</p></a>";
@@ -294,7 +294,7 @@  discard block
 block discarded – undo
294 294
             <h2><?php
295 295
                 switch ($deploymentObject->consortium) {
296 296
                     case "eduroam":
297
-                        $displayname = config\ConfAssistant::CONSORTIUM['name'] . " " . core\DeploymentManaged::PRODUCTNAME;
297
+                        $displayname = config\ConfAssistant::CONSORTIUM['name']." ".core\DeploymentManaged::PRODUCTNAME;
298 298
                         break;
299 299
                     case "OpenRoaming":
300 300
                         $displayname = "OpenRoaming ANP";
@@ -302,7 +302,7 @@  discard block
 block discarded – undo
302 302
                     default:
303 303
                         throw new Exception("We are supposed to operate on a roaming consortium we don't know.");
304 304
                 }
305
-                echo $displayname . " (<span style='color:" . ( $deploymentObject->status == \core\AbstractDeployment::INACTIVE ? "red;'>" . _("inactive") : "green;'>" . _("active") ) . "</span>)";
305
+                echo $displayname." (<span style='color:".($deploymentObject->status == \core\AbstractDeployment::INACTIVE ? "red;'>"._("inactive") : "green;'>"._("active"))."</span>)";
306 306
                 ?></h2>
307 307
             <table>
308 308
                 <caption><?php echo _("Deployment Details"); ?></caption>
@@ -316,13 +316,13 @@  discard block
 block discarded – undo
316 316
                     <td><strong><?php echo _("Your primary RADIUS server") ?></strong><br/>
317 317
                         <?php
318 318
                         if ($deploymentObject->host1_v4 !== NULL) {
319
-                            echo _("IPv4") . ": " . $deploymentObject->host1_v4;
319
+                            echo _("IPv4").": ".$deploymentObject->host1_v4;
320 320
                         }
321 321
                         if ($deploymentObject->host1_v4 !== NULL && $deploymentObject->host1_v6 !== NULL) {
322 322
                             echo "<br/>";
323 323
                         }
324 324
                         if ($deploymentObject->host1_v6 !== NULL) {
325
-                            echo _("IPv6") . ": " . $deploymentObject->host1_v6;
325
+                            echo _("IPv6").": ".$deploymentObject->host1_v6;
326 326
                         }
327 327
                         ?>
328 328
                     </td>
@@ -330,9 +330,9 @@  discard block
 block discarded – undo
330 330
                     <td><?php echo $deploymentObject->port1; ?></td>
331 331
                     <td>
332 332
                         <?php
333
-                        echo "<img src='" . $radiusMessages[$deploymentObject->radius_status_1]['icon'] .
334
-                        "' alt='" . $radiusMessages[$deploymentObject->radius_status_1]['text'] .
335
-                        "' title='" . $radiusMessages[$deploymentObject->radius_status_1]['text'] . "' class='cat-icon'>";
333
+                        echo "<img src='".$radiusMessages[$deploymentObject->radius_status_1]['icon'].
334
+                        "' alt='".$radiusMessages[$deploymentObject->radius_status_1]['text'].
335
+                        "' title='".$radiusMessages[$deploymentObject->radius_status_1]['text']."' class='cat-icon'>";
336 336
                         ?>
337 337
                     </td>
338 338
                 </tr>
@@ -340,22 +340,22 @@  discard block
 block discarded – undo
340 340
                     <td><strong><?php echo _("Your backup RADIUS server") ?><br/></strong>
341 341
                         <?php
342 342
                         if ($deploymentObject->host2_v4 !== NULL) {
343
-                            echo _("IPv4") . ": " . $deploymentObject->host2_v4;
343
+                            echo _("IPv4").": ".$deploymentObject->host2_v4;
344 344
                         }
345 345
                         if ($deploymentObject->host2_v4 !== NULL && $deploymentObject->host2_v6 !== NULL) {
346 346
                             echo "<br/>";
347 347
                         }
348 348
                         if ($deploymentObject->host2_v6 !== NULL) {
349
-                            echo _("IPv6") . ": " . $deploymentObject->host2_v6;
349
+                            echo _("IPv6").": ".$deploymentObject->host2_v6;
350 350
                         }
351 351
                         ?></td>
352 352
                     <td><?php echo _("RADIUS port number: ") ?></td>
353 353
                     <td><?php echo $deploymentObject->port2; ?></td>
354 354
                     <td>
355 355
                         <?php
356
-                        echo "<img src='" . $radiusMessages[$deploymentObject->radius_status_2]['icon'] .
357
-                        "' alt='" . $radiusMessages[$deploymentObject->radius_status_2]['text'] .
358
-                        "' title='" . $radiusMessages[$deploymentObject->radius_status_2]['text'] . "' class='cat-icon'>";
356
+                        echo "<img src='".$radiusMessages[$deploymentObject->radius_status_2]['icon'].
357
+                        "' alt='".$radiusMessages[$deploymentObject->radius_status_2]['text'].
358
+                        "' title='".$radiusMessages[$deploymentObject->radius_status_2]['text']."' class='cat-icon'>";
359 359
                         ?>
360 360
                     </td>
361 361
                 </tr>
@@ -407,12 +407,12 @@  discard block
 block discarded – undo
407 407
                             if (array_key_exists('FAILURE', $res) && $res['FAILURE'] > 0) {
408 408
                                 echo '<br>';
409 409
                                 if ($res['FAILURE'] == 2) {
410
-                                    echo ' <span style="color: red;">' . _("Activation failure.") . '</span>';
410
+                                    echo ' <span style="color: red;">'._("Activation failure.").'</span>';
411 411
                                 } else {
412 412
                                     if (isset($_GET['res'][1]) && $_GET['res']['1'] == 'FAILURE') {
413
-                                        echo ' <span style="color: red;">' . _("Activation failure for your primary RADIUS server.") . '</span>';
413
+                                        echo ' <span style="color: red;">'._("Activation failure for your primary RADIUS server.").'</span>';
414 414
                                     } else {
415
-                                        echo ' <span style="color: red;">' . _("Activation failure for your backup RADIUS server.") . '</span>';
415
+                                        echo ' <span style="color: red;">'._("Activation failure for your backup RADIUS server.").'</span>';
416 416
                                     }
417 417
                                 }
418 418
                             }
@@ -447,12 +447,12 @@  discard block
 block discarded – undo
447 447
                                 if ($res['FAILURE'] > 0) {
448 448
                                     echo '<br>';
449 449
                                     if ($res['FAILURE'] == 2) {
450
-                                        echo ' <span style="color: red;">' . _("Failure during deactivation, your request is queued for handling") . '</span>';
450
+                                        echo ' <span style="color: red;">'._("Failure during deactivation, your request is queued for handling").'</span>';
451 451
                                     } else {
452 452
                                         if (isset($_GET['res'][1]) && $_GET['res']['1'] == 'FAILURE') {
453
-                                            echo ' <span style="color: red;">' . _("Deactivation failure for your primary RADIUS server, your request is queued.") . '</span>';
453
+                                            echo ' <span style="color: red;">'._("Deactivation failure for your primary RADIUS server, your request is queued.").'</span>';
454 454
                                         } else {
455
-                                            echo ' <span style="color: red;">' . _("Deactivation failure for your backup RADIUS server, your request is queued.") . '</span>';
455
+                                            echo ' <span style="color: red;">'._("Deactivation failure for your backup RADIUS server, your request is queued.").'</span>';
456 456
                                         }
457 457
                                     }
458 458
                                 }
@@ -473,24 +473,24 @@  discard block
 block discarded – undo
473 473
         </div>
474 474
         <div style='width:20px;'></div> <!-- QR code space, reserved -->
475 475
         <div style='display: table-cell; min-width:200px;'>
476
-            <?php $tablecaption = _("Hotspot Usage Statistics");?>
476
+            <?php $tablecaption = _("Hotspot Usage Statistics"); ?>
477 477
             <h1><?php echo $tablecaption; ?></h1>
478
-            <h2><?php echo _("5 most recent authentications");?></h2>
479
-            <p><?php echo _("(AP Identifier is a /-separated tuple of NAS-Identifier/NAS-IP-Address/NAS-IPv6-Address/Called-Station-Id)");?></p>
478
+            <h2><?php echo _("5 most recent authentications"); ?></h2>
479
+            <p><?php echo _("(AP Identifier is a /-separated tuple of NAS-Identifier/NAS-IP-Address/NAS-IPv6-Address/Called-Station-Id)"); ?></p>
480 480
             <table class='authrecord'>
481
-    <caption><?php echo $tablecaption;?></caption>
481
+    <caption><?php echo $tablecaption; ?></caption>
482 482
     <tr style='text-align: left;'>
483
-        <th scope="col"><strong><?php echo _("Timestamp (UTC)");?></strong></th>
484
-        <th scope="col"><strong><?php echo _("Realm");?></strong></th>
485
-        <th scope="col"><strong><?php echo _("MAC Address");?></strong></th>
486
-        <th scope="col"><strong><?php echo _("Chargeable-User-Identity");?></strong></th>
487
-        <th scope="col"><strong><?php echo _("Result");?></strong></th>
488
-        <th scope="col"><strong><?php echo _("AP Identifier");?></strong></th>
483
+        <th scope="col"><strong><?php echo _("Timestamp (UTC)"); ?></strong></th>
484
+        <th scope="col"><strong><?php echo _("Realm"); ?></strong></th>
485
+        <th scope="col"><strong><?php echo _("MAC Address"); ?></strong></th>
486
+        <th scope="col"><strong><?php echo _("Chargeable-User-Identity"); ?></strong></th>
487
+        <th scope="col"><strong><?php echo _("Result"); ?></strong></th>
488
+        <th scope="col"><strong><?php echo _("AP Identifier"); ?></strong></th>
489 489
     </tr>
490 490
     <?php
491
-    $userAuthData = $deploymentObject->retrieveStatistics(0,5);
491
+    $userAuthData = $deploymentObject->retrieveStatistics(0, 5);
492 492
     foreach ($userAuthData as $oneRecord) {
493
-        echo "<tr class='".($oneRecord['result'] == "OK" ? "auth-success" : "auth-fail" )."'>"
493
+        echo "<tr class='".($oneRecord['result'] == "OK" ? "auth-success" : "auth-fail")."'>"
494 494
                 . "<td>".$oneRecord['activity_time']."</td>"
495 495
                 . "<td>".$oneRecord['realm']."</td>"
496 496
                 . "<td>".$oneRecord['mac']."</td>"
@@ -715,7 +715,7 @@  discard block
 block discarded – undo
715 715
                         <div>
716 716
                             <input type="hidden" name="consortium" value="eduroam"/>
717 717
                             <button type='submit' <?php echo ($hasMail > 0 ? "" : "disabled"); ?> name='profile_action' value='new'>
718
-                                <?php echo sprintf(_("Add %s deployment ..."), \config\ConfAssistant::CONSORTIUM['name'] . " " . \core\DeploymentManaged::PRODUCTNAME); ?>
718
+                                <?php echo sprintf(_("Add %s deployment ..."), \config\ConfAssistant::CONSORTIUM['name']." ".\core\DeploymentManaged::PRODUCTNAME); ?>
719 719
                             </button>
720 720
                             <span style='color: red;'>
721 721
                             <?php if ($hasMail == 0) { 
Please login to merge, or discard this patch.