GEANT / CAT

core/ProfileRADIUS.php

Spacing +10 added lines, -10 removed lines

@@ -105,9 +105,9 @@ 
 
         $attributesLowLevel = array_merge($this->deviceLevelAttributes, $this->eapLevelAttributes);
 
-        $this->loggerInstance->debug(5, "Device-Level Attributes: " . /** @scrutinizer ignore-type */ print_r($this->deviceLevelAttributes, true));
-        $this->loggerInstance->debug(5, "EAP-Level Attributes: " . /** @scrutinizer ignore-type */ print_r($this->eapLevelAttributes, true));
-        $this->loggerInstance->debug(5, "All low-Level Attributes: " . /** @scrutinizer ignore-type */ print_r($attributesLowLevel, true));
+        $this->loggerInstance->debug(5, "Device-Level Attributes: "./** @scrutinizer ignore-type */ print_r($this->deviceLevelAttributes, true));
+        $this->loggerInstance->debug(5, "EAP-Level Attributes: "./** @scrutinizer ignore-type */ print_r($this->eapLevelAttributes, true));
+        $this->loggerInstance->debug(5, "All low-Level Attributes: "./** @scrutinizer ignore-type */ print_r($attributesLowLevel, true));
 
         // now fetch and merge profile-level attributes if not already set on deeper level
 
@@ -137,7 +137,7 @@ 
             }
         }
 
-        $this->loggerInstance->debug(5, "Merged Attributes: " . /** @scrutinizer ignore-type */ print_r($attributesLowLevel, true));
+        $this->loggerInstance->debug(5, "Merged Attributes: "./** @scrutinizer ignore-type */ print_r($attributesLowLevel, true));
 
         // now, fetch and merge IdP-wide attributes
 
@@ -152,7 +152,7 @@ 
         // add the internal attribute to that effect
         
         if (isset($this->attributes['media:openroaming_always'])) {
-            $this->attributes = array_merge($this->attributes, $this->addInternalAttributes([ "internal:openroaming" => TRUE ] ));
+            $this->attributes = array_merge($this->attributes, $this->addInternalAttributes(["internal:openroaming" => TRUE]));
         }
         
         $this->loggerInstance->debug(4, "--- END Constructing new Profile object ... ---\n");
@@ -200,7 +200,7 @@ 
                 "row_id" => $attributeQuery->row_id,
                 "flag" => $optinfo['flag'],
                 "device" => ($devicesOrEAPMethods == "DEVICES" ? $attributeQuery->deviceormethod : NULL),
-                "eapmethod" => ($devicesOrEAPMethods == "DEVICES" ? 0 : (new \core\common\EAP($attributeQuery->deviceormethod))->getArrayRep() )];
+                "eapmethod" => ($devicesOrEAPMethods == "DEVICES" ? 0 : (new \core\common\EAP($attributeQuery->deviceormethod))->getArrayRep())];
         }
         return $temparray;
     }
@@ -309,7 +309,7 @@ 
      */
     public function setAnonymousIDSupport($shallwe)
     {
-        $this->databaseHandle->exec("UPDATE profile SET use_anon_outer = " . ($shallwe === true ? "1" : "0") . " WHERE profile_id = $this->identifier");
+        $this->databaseHandle->exec("UPDATE profile SET use_anon_outer = ".($shallwe === true ? "1" : "0")." WHERE profile_id = $this->identifier");
     }
 
     /** Toggle special username for realm checks
@@ -319,7 +319,7 @@ 
      * @return void
      */
     public function setRealmCheckUser($shallwe, $localpart = NULL) {
-        $this->databaseHandle->exec("UPDATE profile SET checkuser_outer = " . ($shallwe === true ? "1" : "0") . " WHERE profile_id = $this->identifier");
+        $this->databaseHandle->exec("UPDATE profile SET checkuser_outer = ".($shallwe === true ? "1" : "0")." WHERE profile_id = $this->identifier");
         if ($localpart !== NULL) {
             $this->databaseHandle->exec("UPDATE profile SET checkuser_value = ? WHERE profile_id = $this->identifier", "s", $localpart);
         }
@@ -334,8 +334,8 @@ 
      */
     public function setInputVerificationPreference($verify, $hint)
     {
-        $this->databaseHandle->exec("UPDATE profile SET verify_userinput_suffix = " . ($verify === true ? "1" : "0") .
-                ", hint_userinput_suffix = " . ($hint === true ? "1" : "0") .
+        $this->databaseHandle->exec("UPDATE profile SET verify_userinput_suffix = ".($verify === true ? "1" : "0").
+                ", hint_userinput_suffix = ".($hint === true ? "1" : "0").
                 " WHERE profile_id = $this->identifier");
     }
 

web/user/about_cat.inc.php

Spacing +6 added lines, -6 removed lines

@@ -42,24 +42,24 @@
         \config\ConfAssistant::CONSORTIUM['display_name'], 
         \config\Master::APPEARANCE['productname'], 
         \config\Master::APPEARANCE['productname']);
-$out .= "<p>" . sprintf(_("<span class='edu_cat'>%s</span> currently supports the following devices and EAP type combinations:"), \config\Master::APPEARANCE['productname']) . "</p>";
-$out .= "<table><tr><th>" . _("Device Group") . "</th><th>" . _("Device") . "</th>";
+$out .= "<p>".sprintf(_("<span class='edu_cat'>%s</span> currently supports the following devices and EAP type combinations:"), \config\Master::APPEARANCE['productname'])."</p>";
+$out .= "<table><tr><th>"._("Device Group")."</th><th>"._("Device")."</th>";
 foreach (\core\common\EAP::listKnownEAPTypes() as $oneeap) {
-    $out .= "<th style='min-width: 80px;'>" . $oneeap->getPrintableRep() . "</th>";
+    $out .= "<th style='min-width: 80px;'>".$oneeap->getPrintableRep()."</th>";
 }
 $out .= "</tr>";
 foreach (\devices\Devices::listDevices() as $index => $onedevice) {
     if (isset($onedevice['options'])) {
-        if ((isset($onedevice['options']['hidden']) && ( $onedevice['options']['hidden'] == 1 || $onedevice['options']['hidden'] == 2 ))|| (isset($onedevice['options']['redirect']) && ($onedevice['options']['redirect'] == 1))) {
+        if ((isset($onedevice['options']['hidden']) && ($onedevice['options']['hidden'] == 1 || $onedevice['options']['hidden'] == 2)) || (isset($onedevice['options']['redirect']) && ($onedevice['options']['redirect'] == 1))) {
             continue;
         }
     }
-    $vendor = (new \web\lib\user\Skinjob())->findResourceUrl("IMAGES", "vendorlogo/" . $onedevice['group'] . ".png");
+    $vendor = (new \web\lib\user\Skinjob())->findResourceUrl("IMAGES", "vendorlogo/".$onedevice['group'].".png");
     $vendorImg = "";
     if ($vendor !== FALSE) {
         $vendorImg = "<img src='$vendor' alt='logo'>";
     }
-    $out .= "<tr><td class='vendor'>$vendorImg</td><td>" . $onedevice['display'] . "</td>";
+    $out .= "<tr><td class='vendor'>$vendorImg</td><td>".$onedevice['display']."</td>";
     $device_instance = new \core\DeviceFactory($index);
     foreach (\core\common\EAP::listKnownEAPTypes() as $oneeap) {
         $out .= "<td>";

web/diag/radius_tests.php

Spacing +1 added lines, -1 removed lines

@@ -374,7 +374,7 @@
         throw new Exception("Unknown test requested: default case reached!");
 }
 $returnarray['datetime'] = date("Y-m-d H:i:s");
-if ($token!= '' && is_dir($jsonDir.'/'.$token)) {
+if ($token != '' && is_dir($jsonDir.'/'.$token)) {
     @mkdir($jsonDir.'/'.$token, 0777, true);
 }
 $json_data = json_encode($returnarray);

web/admin/edit_federation.php

Spacing +11 added lines, -11 removed lines

@@ -26,7 +26,7 @@ 
  */
 ?>
 <?php
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
 
 $auth = new \web\lib\admin\Authentication();
 $deco = new \web\lib\admin\PageDecoration();
@@ -70,13 +70,13 @@ 
         ?>
     </h1>
     <div class='infobox'>
-        <h2><?php $tablecaption = sprintf(_("%s Properties"),$uiElements->nomenclatureFed); echo $tablecaption?></h2>
+        <h2><?php $tablecaption = sprintf(_("%s Properties"), $uiElements->nomenclatureFed); echo $tablecaption?></h2>
         <table>
-            <caption><?php echo $tablecaption;?></caption>
+            <caption><?php echo $tablecaption; ?></caption>
             <tr>
-                <th class="wai-invisible" scope="col"><?php echo _("Property Type");?></th>
-                <th class="wai-invisible" scope="col"><?php echo _("Language if applicable");?></th>
-                <th class="wai-invisible" scope="col"><?php echo _("Property Value");?></th>
+                <th class="wai-invisible" scope="col"><?php echo _("Property Type"); ?></th>
+                <th class="wai-invisible" scope="col"><?php echo _("Language if applicable"); ?></th>
+                <th class="wai-invisible" scope="col"><?php echo _("Property Value"); ?></th>
             </tr>
             <tr>
                 <td><?php echo _("Country:"); ?></td>
@@ -87,11 +87,11 @@ 
         </table>
     </div>
     <?php
-    echo "<form enctype='multipart/form-data' action='edit_federation_result.php?fed_id=$my_fed->tld" . "' method='post' accept-charset='UTF-8'>
-              <input type='hidden' name='MAX_FILE_SIZE' value='" . \config\Master::MAX_UPLOAD_SIZE . "'>";
+    echo "<form enctype='multipart/form-data' action='edit_federation_result.php?fed_id=$my_fed->tld"."' method='post' accept-charset='UTF-8'>
+              <input type='hidden' name='MAX_FILE_SIZE' value='" . \config\Master::MAX_UPLOAD_SIZE."'>";
     ?>
     <fieldset class="option_container">
-        <legend><strong><?php echo sprintf(_("%s Properties"),$uiElements->nomenclatureFed); ?></strong></legend>
+        <legend><strong><?php echo sprintf(_("%s Properties"), $uiElements->nomenclatureFed); ?></strong></legend>
         <?php
         $optionDisplay = new \web\lib\admin\OptionDisplay($fed_options, \core\Options::LEVEL_FED);
         echo $optionDisplay->prefilledOptionTable("fed", $my_fed->tld);
@@ -101,10 +101,10 @@ 
     <?php
     echo "<div>";
     if ($editMode === 'fullaccess') {
-        echo "<button type='submit' name='submitbutton' value='" . web\lib\common\FormElements::BUTTON_SAVE . "'>" . _("Save data") . "</button>";
+        echo "<button type='submit' name='submitbutton' value='".web\lib\common\FormElements::BUTTON_SAVE."'>"._("Save data")."</button>";
         $discardLabel = _("Discard changes");
     } else {
         $discardLabel = _("Return");
     }
-    echo "<button type='button' class='delete' name='abortbutton' value='abort' onclick='javascript:window.location = \"overview_federation.php?fed_id=$fedPost\"'>" . $discardLabel . "</button></div></form>";
+    echo "<button type='button' class='delete' name='abortbutton' value='abort' onclick='javascript:window.location = \"overview_federation.php?fed_id=$fedPost\"'>".$discardLabel."</button></div></form>";
     echo $deco->footer();

web/lib/common/InputValidation.php

Spacing +8 added lines, -8 removed lines

@@ -40,7 +40,7 @@ 
     private function inputValidationError($customtext)
     {
         \core\common\Entity::intoThePotatoes();
-        $retval = "<p>" . _("Input validation error: ") . $customtext . "</p>";
+        $retval = "<p>"._("Input validation error: ").$customtext."</p>";
         \core\common\Entity::outOfThePotatoes();
         return $retval;
     }
@@ -97,7 +97,7 @@ 
         $postFed = $fedIdentifiers[$correctIndex];
         $temp = new \core\Federation($postFed);
         if ($owner === NULL) {
-            return [$temp,'readonly'];
+            return [$temp, 'readonly'];
         }
         $user = new \core\User($owner);        
         foreach ($temp->listFederationAdmins() as $oneowner) {
@@ -105,9 +105,9 @@ 
                 return [$temp, 'fullaccess'];
             }
         }
-        if ($user->isSuperadmin()|| $user->isSupport()) {
+        if ($user->isSuperadmin() || $user->isSupport()) {
                 $this->loggerInstance->debug(4, "You are the superadmin/support\n");
-                return [$temp,'readonly'];                
+                return [$temp, 'readonly'];                
             }
         throw new Exception($this->inputValidationError(sprintf("User is not %s administrator!", \core\common\Entity::$nomenclature_fed)));
     }
@@ -168,18 +168,18 @@ 
             }
             if ($user->isFederationAdmin($temp->federation)) {
                 $this->loggerInstance->debug(4, "You are fed admin for this IdP\n");
-                return [$temp,'readonly'];
+                return [$temp, 'readonly'];
             }
             if ($user->isSuperadmin() || $user->isSupport()) {
                 $this->loggerInstance->debug(4, "You are the superadmin/support\n");
-                return [$temp,'readonly'];                
+                return [$temp, 'readonly'];                
             }
             throw new Exception($this->inputValidationError("This IdP identifier is not accessible!"));
         }
         if ($claimedFedBinding !== NULL && strtoupper($temp->federation) != strtoupper($claimedFedBinding->tld)) {
             throw new Exception($this->inputValidationError("This IdP does not belong to the claimed federation!"));
         }
-        return [$temp,'nouser'];
+        return [$temp, 'nouser'];
     }
 
     /**
@@ -621,7 +621,7 @@ 
         try {
             $image->readImageBlob($binary);
         } catch (\ImagickException $exception) {
-            echo "Error" . $exception->getMessage();
+            echo "Error".$exception->getMessage();
             return FALSE;
         }
         // image survived the sanity check

web/resources/css/cat.css.php

Spacing +126 added lines, -126 removed lines

@@ -19,7 +19,7 @@ 
  *          <base_url>/copyright.php after deploying the software
  */
 
-require dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php";
+require dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php";
 $colour1 = \config\Master::APPEARANCE['colour1'];
 $colour2 = \config\Master::APPEARANCE['colour2'];
 // we need to know if we are serving a RTL language so we can flip some heading
@@ -34,14 +34,14 @@ 
 }
 
 body {
-    background: <?php echo $colour1;?>;
+    background: <?php echo $colour1; ?>;
     color: #000000;
     font-family:Verdana, Arial, Helvetica, sans-serif;
     font-size:11px;
     height: 100%;
     margin: 0px;
     padding: 0px;
-    padding-<?php echo $start;?>: 0px;
+    padding-<?php echo $start; ?>: 0px;
     min-width: 700px;
     font-size: 11px;
     font-weight: normal;
@@ -57,18 +57,18 @@ 
 }
 
 button {
-    background: <?php echo $colour2;?>; 
+    background: <?php echo $colour2; ?>; 
     color: #FFFFFF; 
     min-height: 23px;
-    border-<?php echo $start;?>-style: outset; 
-    border-<?php echo $start;?>-width: 1px; 
-    border-<?php echo $start;?>-color: #8bbacb;
+    border-<?php echo $start; ?>-style: outset; 
+    border-<?php echo $start; ?>-width: 1px; 
+    border-<?php echo $start; ?>-color: #8bbacb;
     border-top-style: outset; 
     border-top-width: 1px; 
     border-top-color: #8bbacb;
-    border-<?php echo $end;?>-style: outset; 
-    border-<?php echo $end;?>-width: 2px; 
-    border-<?php echo $end;?>-color: #043d52;
+    border-<?php echo $end; ?>-style: outset; 
+    border-<?php echo $end; ?>-width: 2px; 
+    border-<?php echo $end; ?>-color: #043d52;
     border-bottom-style: outset; 
     border-bottom-width: 2px; 
     border-bottom-color: #043d52;
@@ -78,14 +78,14 @@ 
     background:#095e80;
     border-style:inset;
     position: relative;
-    <?php echo $start;?>: 3px;
+    <?php echo $start; ?>: 3px;
 }
 
 button.pressedDisabled {
     background:#999;
     border-style:inset;
     position: relative;
-    <?php echo $start;?>: 3px;
+    <?php echo $start; ?>: 3px;
 }
 
 button.delete {
@@ -93,14 +93,14 @@ 
 }
 
 .problemdescription {
-    padding-<?php echo $start;?>:40px;
+    padding-<?php echo $start; ?>:40px;
     padding-top: 10px;
     padding-bottom: 10px;
     background-color: lightyellow;
 }
 
 .problemsolution {
-    padding-<?php echo $start;?>:40px;
+    padding-<?php echo $start; ?>:40px;
     padding-top: 10px;
     padding-bottom: 10px;
     background-color: lightgreen;
@@ -109,15 +109,15 @@ 
 .use_borders button.alertButton {
     color: maroon; 
     background: #bbb; 
-    border-<?php echo $start;?>-style: outset; 
-    border-<?php echo $start;?>-width: 1px; 
-    border-<?php echo $start;?>-color: #eee;
+    border-<?php echo $start; ?>-style: outset; 
+    border-<?php echo $start; ?>-width: 1px; 
+    border-<?php echo $start; ?>-color: #eee;
     border-top-style: outset; 
     border-top-width: 1px; 
     border-top-color: #eee;
-    border-<?php echo $end;?>-style: outset; 
-    border-<?php echo $end;?>-width: 2px; 
-    border-<?php echo $end;?>-color: #444;
+    border-<?php echo $end; ?>-style: outset; 
+    border-<?php echo $end; ?>-width: 2px; 
+    border-<?php echo $end; ?>-color: #444;
     border-bottom-style: outset; 
     border-bottom-width: 2px; 
     border-bottom-color: #444;
@@ -127,15 +127,15 @@ 
 button[disabled] {
     background: #bababa;
     color: #6a6a6a;
-    border-<?php echo $start;?>-style: inset;
-    border-<?php echo $start;?>-width: 1px;
-    border-<?php echo $start;?>-color: #dadada;
+    border-<?php echo $start; ?>-style: inset;
+    border-<?php echo $start; ?>-width: 1px;
+    border-<?php echo $start; ?>-color: #dadada;
     border-top-style: inset;
     border-top-width: 1px;
     border-top-color: #dadada;
-    border-<?php echo $end;?>-style: outset;
-    border-<?php echo $end;?>-width: 2px;
-    border-<?php echo $end;?>-color: #dadada;
+    border-<?php echo $end; ?>-style: outset;
+    border-<?php echo $end; ?>-width: 2px;
+    border-<?php echo $end; ?>-color: #dadada;
     border-bottom-style: outset;
     border-bottom-width: 2px;
     border-bottom-color: #dadada;
@@ -167,8 +167,8 @@ 
 div.profilemodulebuttons {
     position: inherit;
     bottom: 5px;
-    <?php echo $end;?>: 5px;
-    text-align: <?php echo $end;?>;
+    <?php echo $end; ?>: 5px;
+    text-align: <?php echo $end; ?>;
 }
 
 div.profilebox {
@@ -189,15 +189,15 @@ 
     display: block;
     position: absolute;
     top:0;
-    <?php echo $end;?>:0;
-    padding-<?php echo $end;?>:20px;
+    <?php echo $end; ?>:0;
+    padding-<?php echo $end; ?>:20px;
     padding-top:7px;
 }
 
 div.sidebar {
     display: inline;
-    float: <?php echo $end;?>;
-    padding-<?php echo $end;?>: 20px;
+    float: <?php echo $end; ?>;
+    padding-<?php echo $end; ?>: 20px;
 }
 div.sidebar a {
     color: white;
@@ -206,7 +206,7 @@ 
 div.header {
     height: 54px;
     background: #FFFFFF;
-    padding-<?php echo $start;?>:30px;
+    padding-<?php echo $start; ?>:30px;
     padding-bottom: 10px;
     color: <?php echo $colour2?>;
 }
@@ -216,8 +216,8 @@ 
     top: 54px;
     bottom: 50px;
     padding-top: 10px;
-    padding-<?php echo $start;?>: 0px;
-    padding-<?php echo $end;?>: 0px;
+    padding-<?php echo $start; ?>: 0px;
+    padding-<?php echo $end; ?>: 0px;
     width:100%;
 }
 
@@ -231,18 +231,18 @@ 
     color: #FFFFFF;
     min-height:100px;
     overflow: auto;
-    padding-<?php echo $start;?>:20px
+    padding-<?php echo $start; ?>:20px
 }
 
 #thirdrow {
-    padding-<?php echo $start;?>: 10px;
-    padding-<?php echo $end;?>: 10px;
+    padding-<?php echo $start; ?>: 10px;
+    padding-<?php echo $end; ?>: 10px;
 }
 
 #footer {
     width: 100%;
-    <?php echo $start;?>: 0;
-    <?php echo $end;?>: 0;
+    <?php echo $start; ?>: 0;
+    <?php echo $end; ?>: 0;
     bottom: 0;
     position: absolute;
     background: white;
@@ -268,8 +268,8 @@ 
     height: 100% !important;
     position: relative;
     min-width: 1000px;
-    margin-<?php echo $start;?>: auto;
-    margin-<?php echo $end;?>: auto;
+    margin-<?php echo $start; ?>: auto;
+    margin-<?php echo $end; ?>: auto;
 }
 
 div.device_info {
@@ -289,8 +289,8 @@ 
     position: fixed;
     top: 0;
     bottom: 0;
-    <?php echo $start;?>: 0;
-    <?php echo $end;?>: 0;
+    <?php echo $start; ?>: 0;
+    <?php echo $end; ?>: 0;
     background-color: #000000;
     opacity: 0.5;
     z-index: 90;
@@ -316,7 +316,7 @@ 
     padding: 15px;
     text-align: start;
     width: 850px;
-    <?php echo $start;?>: 100px;
+    <?php echo $start; ?>: 100px;
     top: 50px;
     z-index: 100;
 }
@@ -325,15 +325,15 @@ 
     position: absolute;
     top: 0;
     bottom: 0;
-    <?php echo $start;?>: 0;
-    <?php echo $end;?>: 0;
+    <?php echo $start; ?>: 0;
+    <?php echo $end; ?>: 0;
     z-index: 100;
 }
 
 div#msgbox div {
     position: fixed;
-    <?php echo $start;?>: 0;
-    <?php echo $end;?>: 0;
+    <?php echo $start; ?>: 0;
+    <?php echo $end; ?>: 0;
 }
 
 div#msgbox div div.graybox {
@@ -347,13 +347,13 @@ 
 div.graybox img {
     display: block;
     cursor: pointer;
-    float: <?php echo $end;?>;
+    float: <?php echo $end; ?>;
     margin: 0px 0px 10px 10px;
 }
 
 img.icon {
-    float: <?php echo $start;?>;
-    margin-<?php echo $end;?>: 5px;
+    float: <?php echo $start; ?>;
+    margin-<?php echo $end; ?>: 5px;
     margin-top: 3px;
 }
 
@@ -408,15 +408,15 @@ 
 div.ca-summary {
     border: 1px dotted;
     background-color: #ccccff;
-    border-<?php echo $start;?>: 10px solid;
-    border-<?php echo $start;?>-color: green;
+    border-<?php echo $start; ?>: 10px solid;
+    border-<?php echo $start; ?>-color: green;
     padding: 2px;
-    padding-<?php echo $start;?>: 8px;
+    padding-<?php echo $start; ?>: 8px;
 }
 
 span.edu_cat {
     font-weight: bold;
-    color: <?php echo $colour2;?>;
+    color: <?php echo $colour2; ?>;
 }
 
 span.tooltip {
@@ -475,7 +475,7 @@ 
 }
 
 table.authrecord td {
-    padding-<?php echo $end;?>: 10px;
+    padding-<?php echo $end; ?>: 10px;
 }
 
 p.MOTD {
@@ -493,15 +493,15 @@ 
 }
 
 .use_borders button {
-    border-<?php echo $start;?>-style: outset; 
-    border-<?php echo $start;?>-width: 1px; 
-    border-<?php echo $start;?>-color: #8bbacb;
+    border-<?php echo $start; ?>-style: outset; 
+    border-<?php echo $start; ?>-width: 1px; 
+    border-<?php echo $start; ?>-color: #8bbacb;
     border-top-style: outset; 
     border-top-width: 1px; 
     border-top-color: #8bbacb;
-    border-<?php echo $end;?>-style: outset; 
-    border-<?php echo $end;?>-width: 2px; 
-    border-<?php echo $end;?>-color: #043d52;
+    border-<?php echo $end; ?>-style: outset; 
+    border-<?php echo $end; ?>-width: 2px; 
+    border-<?php echo $end; ?>-color: #043d52;
     border-bottom-style: outset; 
     border-bottom-width: 2px; 
     border-bottom-color: #043d52;
@@ -524,8 +524,8 @@ 
     border-bottom-style:solid;
     border-top-width:5px; 
     border-bottom-width:5px; 
-    border-color: <?php echo $colour1;?>; 
-    padding-<?php echo $start;?>:30px;
+    border-color: <?php echo $colour1; ?>; 
+    padding-<?php echo $start; ?>:30px;
 }
 
 .no_borders button.disabledDevice {
@@ -541,13 +541,13 @@ 
 }
 
 input {
-    margin-<?php echo $end;?>: 5px;
+    margin-<?php echo $end; ?>: 5px;
 
 }
 
 select {
     vertical-align: middle;
-    margin-<?php echo $start;?>: 10px;
+    margin-<?php echo $start; ?>: 10px;
 }
 
 td.notapplicable {
@@ -580,8 +580,8 @@ 
 
 .signin_large {
     vertical-align: top;
-    padding-<?php echo $start;?>:20px;
-    padding-<?php echo $end;?>:20px;
+    padding-<?php echo $start; ?>:20px;
+    padding-<?php echo $end; ?>:20px;
     color: #bfd5dc;
     font-size: 20px;
 }
@@ -594,34 +594,34 @@ 
 }
 
 #close_button {
-    background: <?php echo $colour2;?>; 
+    background: <?php echo $colour2; ?>; 
     color: #FFFFFF; 
     height: 23px;
-    border-<?php echo $start;?>-style: inset; 
-    border-<?php echo $start;?>-width: 1px; 
-    border-<?php echo $start;?>-color: #8bbacb;
+    border-<?php echo $start; ?>-style: inset; 
+    border-<?php echo $start; ?>-width: 1px; 
+    border-<?php echo $start; ?>-color: #8bbacb;
     border-top-style: inset; 
     border-top-width: 1px; 
     border-top-color: #8bbacb;
-    border-<?php echo $end;?>-style: outset; 
-    border-<?php echo $end;?>-width: 2px; 
-    border-<?php echo $end;?>-color: #043d52;
+    border-<?php echo $end; ?>-style: outset; 
+    border-<?php echo $end; ?>-width: 2px; 
+    border-<?php echo $end; ?>-color: #043d52;
     border-bottom-style: outset; 
     border-bottom-width: 2px; 
     border-bottom-color: #043d52;
-    padding-<?php echo $start;?>: 5px;
-    padding-<?php echo $end;?>: 5px;
+    padding-<?php echo $start; ?>: 5px;
+    padding-<?php echo $end; ?>: 5px;
     padding-top: 1px;
     padding-bottom: 1px;
     position: relative;
-    <?php echo $start;?>: 640px;
+    <?php echo $start; ?>: 640px;
     cursor:pointer;
 }
 
 #loading_ico {
     display: none;
     position: absolute;
-    <?php echo $start;?>: 200px;
+    <?php echo $start; ?>: 200px;
     top: 220px;
     z-index: 200;
     text-align: center;
@@ -635,7 +635,7 @@ 
     z-index: 100;
     position: absolute;
     width: 700px;
-    <?php echo $start;?>: 200px;
+    <?php echo $start; ?>: 200px;
     text-align: justify;
     top: 200px;
     box-shadow: 5px 5px 5px #666666;
@@ -643,23 +643,23 @@ 
 }
 
 #user_info {
-    padding-<?php echo $start;?>: 30px; 
+    padding-<?php echo $start; ?>: 30px; 
     font-size: 11px;  
     font-weight: normal; 
 }
 
 #user_welcome {
     background: #ffffff;
-    padding-<?php echo $start;?>: 30px; 
+    padding-<?php echo $start; ?>: 30px; 
     padding-top: 20px; 
-    padding-<?php echo $end;?>: 180px;
+    padding-<?php echo $end; ?>: 180px;
     font-size: 12px;  
     font-weight: normal; 
 }
 
 #devices {
     z-index:90;
-    padding-<?php echo $start;?>: 30px;
+    padding-<?php echo $start; ?>: 30px;
     font-size: 11px;  
     font-weight: normal;
     position: relative;
@@ -667,15 +667,15 @@ 
 
 #profile_list {
     width: 30em; 
-    padding-<?php echo $start;?>: 10px; 
-    padding-<?php echo $end;?>: 0px; 
-    background: <?php echo $colour2;?>; 
+    padding-<?php echo $start; ?>: 10px; 
+    padding-<?php echo $end; ?>: 0px; 
+    background: <?php echo $colour2; ?>; 
     color: white; 
     box-shadow: 10px 10px 5px #888888;
 }
 
 #profile_redirect {
-    padding-<?php echo $start;?>: 30px;
+    padding-<?php echo $start; ?>: 30px;
     padding-top: 20px;
     font-size: 11px;
     font-weight: normal;
@@ -685,13 +685,13 @@ 
 }
 
 #profiles {
-    padding-<?php echo $start;?>: 30px; 
+    padding-<?php echo $start; ?>: 30px; 
     font-size: 11px; 
     padding-bottom: 10px 
 }
 
 #signin {
-    padding-<?php echo $start;?>: 30px;
+    padding-<?php echo $start; ?>: 30px;
     padding-top: 10px;
 }
 
@@ -715,8 +715,8 @@ 
     font-size: 14px; 
     padding-top: 4px; 
     padding-bottom: 12px; 
-    padding-<?php echo $start;?>: 30px; 
-    background: <?php echo $colour1;?>; 
+    padding-<?php echo $start; ?>: 30px; 
+    background: <?php echo $colour1; ?>; 
     text-align: start; 
     text-shadow: 10px 10px 5px #888888;
 }
@@ -726,9 +726,9 @@ 
     border-bottom-style:solid;
     border-top-width:5px;
     border-bottom-width:5px;
-    border-color: <?php echo $colour1;?>;
-    padding-<?php echo $start;?>:30px;
-    color: <?php echo $colour2;?>;
+    border-color: <?php echo $colour1; ?>;
+    padding-<?php echo $start; ?>:30px;
+    color: <?php echo $colour2; ?>;
 }
 
 #heading h1 { 
@@ -743,11 +743,11 @@ 
 
 #welcome {
     padding: 20px;
-    padding-<?php echo $start;?>: 30px;
+    padding-<?php echo $start; ?>: 30px;
     text-align: justify;
     border-bottom-style:solid;
     border-bottom-width:5px;
-    border-color: <?php echo $colour1;?>;
+    border-color: <?php echo $colour1; ?>;
     font-size: 11px;
     font-weight: normal;
 }
@@ -756,14 +756,14 @@ 
 #main_menu_info { 
                     position: relative;
                     top: 15px;
-                    <?php echo $start;?>: 0px;
-                    padding:10px; padding-<?php echo $start;?>:20px; padding-<?php echo $end;?>:20px;
+                    <?php echo $start; ?>: 0px;
+                    padding:10px; padding-<?php echo $start; ?>:20px; padding-<?php echo $end; ?>:20px;
                     background: #f0f0f0;
                     border: 1px solid #dddddd;
-                    margin-<?php echo $start;?>: 25px;
-                    padding-<?php echo $start;?>: 25px;
-                    margin-<?php echo $end;?>: 25px;
-                    padding-<?php echo $end;?>: 25px;
+                    margin-<?php echo $start; ?>: 25px;
+                    padding-<?php echo $start; ?>: 25px;
+                    margin-<?php echo $end; ?>: 25px;
+                    padding-<?php echo $end; ?>: 25px;
                     padding-bottom: 10px;
                     vertical-align: top;
                     box-shadow: 5px 5px 5px #666666;
@@ -794,7 +794,7 @@ 
 
 #faq {
     padding: 20px;
-    color: <?php echo $colour2;?>;
+    color: <?php echo $colour2; ?>;
     background: #ffffff;
 }
 
@@ -812,7 +812,7 @@ 
 #idp_logo {
    display:none;
    position:absolute;
-   <?php echo $end;?>:30px;
+   <?php echo $end; ?>:30px;
    max-height:150px;
    max-width:150px;
    padding-top:10px;
@@ -835,18 +835,18 @@ 
 #slides img {
     position: absolute;
     top: 145px;
-    <?php echo $end;?>: 60px;
+    <?php echo $end; ?>: 60px;
 }
 
 #slides span {
     position: absolute;
-    <?php echo $start;?>: 180px;
+    <?php echo $start; ?>: 180px;
     z-index: 20;
 }
 
 #line1 {
     top:145px;
-    color: <?php echo $colour2;?>;
+    color: <?php echo $colour2; ?>;
     font-size:20px;
 }
 
@@ -858,7 +858,7 @@ 
 
 #line3 {
     top:245px;
-    <?php echo $start;?>: 200px;
+    <?php echo $start; ?>: 200px;
     color: maroon;
     font-size:25px;
 }
@@ -887,16 +887,16 @@ 
     height:100%;
     border-spacing:0; 
     border-collapse:collapse;
-    padding-<?php echo $start;?>:200px;
+    padding-<?php echo $start; ?>:200px;
     padding-top:10px;
 }
 
 #front_page_leftmenu {
-    border-<?php echo $end;?>:solid; 
-    border-color: <?php echo $colour1;?>; 
+    border-<?php echo $end; ?>:solid; 
+    border-color: <?php echo $colour1; ?>; 
     border-width:5px; 
     min-height:400px; 
-    padding-<?php echo $start;?>: 10px; 
+    padding-<?php echo $start; ?>: 10px; 
     vertical-align:top; 
     width:110px; 
     padding-top:30px;
@@ -906,8 +906,8 @@ 
     vertical-align: top;
     height:280px;
     background: #fff;
-    padding-<?php echo $start;?>: 20px;
-    padding-<?php echo $end;?>: 20px;
+    padding-<?php echo $start; ?>: 20px;
+    padding-<?php echo $end; ?>: 20px;
 }
 
 #user_button_td {
@@ -918,11 +918,11 @@ 
 }
 
 a:link {
-    color:<?php echo $colour2;?>;
+    color:<?php echo $colour2; ?>;
 }
 
 a:visited {
-    color:<?php echo $colour2;?>;
+    color:<?php echo $colour2; ?>;
 }
 
 a:hover {
@@ -930,7 +930,7 @@ 
 }
 
 a:active {
-    color:<?php echo $colour2;?>;
+    color:<?php echo $colour2; ?>;
 }
 
 .comment {
@@ -961,14 +961,14 @@ 
 table.user_overview th {
     text-align: start;  
     background: #f0f0f0;
-    padding-<?php echo $start;?>: 4px;
-    padding-<?php echo $end;?>: 4px;
+    padding-<?php echo $start; ?>: 4px;
+    padding-<?php echo $end; ?>: 4px;
 }
 
 table.user_overview td {
     border-top-style: none;
-    padding-<?php echo $start;?>: 4px;
-    padding-<?php echo $end;?>: 4px;
+    padding-<?php echo $start; ?>: 4px;
+    padding-<?php echo $end; ?>: 4px;
     vertical-align: middle;
     height: 28px;
 }
@@ -985,14 +985,14 @@ 
 .download_button_text {
     width: 380px;
     position:absolute;
-    <?php echo $end;?>: 5px;
+    <?php echo $end; ?>: 5px;
     padding-top:0px;
 }
 
 #download_info {
    background: #f0f0f0;
-   padding-<?php echo $start;?>: 20px;
-   padding-<?php echo $end;?>: 20px;
+   padding-<?php echo $start; ?>: 20px;
+   padding-<?php echo $end; ?>: 20px;
    padding-top:3px;
    padding-bottom:3px;
 }

utils/test_openroaming.php

Spacing +2 added lines, -2 removed lines

@@ -8,7 +8,7 @@ 
  * License: see the web/copyright.php file in the file structure
  * ******************************************************************************
  */
-require_once dirname(dirname(__FILE__)) . "/config/_config.php";
+require_once dirname(dirname(__FILE__))."/config/_config.php";
 
 /**
  * The sctipt will be called from crontab
@@ -28,7 +28,7 @@ 
 }
 
 
-while ( $row = mysqli_fetch_object(/** @scrutinizer ignore-type */ $allOpenRoamingProfiles)) {
+while ($row = mysqli_fetch_object(/** @scrutinizer ignore-type */ $allOpenRoamingProfiles)) {
     $profileId = $row->profile_id;
     $profile = \core\ProfileFactory::instantiate($profileId);
     $res = $profile->openroamingRedinessTest();

utils/update_monitor_copy.php

Spacing +8 added lines, -8 removed lines

@@ -24,7 +24,7 @@ 
  * update the local copy
  */
 
-require_once dirname(dirname(__FILE__)) . "/config/_config.php";
+require_once dirname(dirname(__FILE__))."/config/_config.php";
 setlocale(LC_CTYPE, "en_US.UTF-8");
 
 class updateFromMonitor {
@@ -113,7 +113,7 @@ 
         $tmp_table = 'tmp_'.$table_name;
         if ($this->tablesource[$table_name] == 'eduroam') {
             $this->db_local->select_db('monitor_copy');
-        } elseif($this->tablesource[$table_name] == 'eduroamv2') {
+        } elseif ($this->tablesource[$table_name] == 'eduroamv2') {
             $this->db_local->select_db('eduroamv2');
         }
         $this->db_local->query("CREATE TEMPORARY TABLE $tmp_table SELECT * FROM $table LIMIT 0");
@@ -122,7 +122,7 @@ 
         $this->db->query("SET NAMES 'utf8'");
         $this->db_local->query("SET NAMES 'utf8mb4'");
         $result = $this->db->query("SELECT * FROM $table");
-        $queryFields = implode(',', array_column($this->fields[$table_name],0));
+        $queryFields = implode(',', array_column($this->fields[$table_name], 0));
         while ($row = $result->fetch_assoc()) {
             $v = [];
             foreach ($this->fields[$table_name] as $field) {
@@ -140,7 +140,7 @@ 
                     }
                 }
             }
-            $queryValues = implode(',',$v);
+            $queryValues = implode(',', $v);
             $query = "INSERT INTO $tmp_table (".$queryFields.") VALUES (".$queryValues.")";
             $this->db_local->query($query);
         }
@@ -152,7 +152,7 @@ 
         $tmp_table = 'tmp_'.$table_name;
         if ($this->tablesource[$table_name] == 'eduroam') {
                 $this->db_local->select_db('monitor_copy');
-        } elseif($this->tablesource[$table_name] == 'eduroamv2') {
+        } elseif ($this->tablesource[$table_name] == 'eduroamv2') {
                 $this->db_local->select_db('eduroamv2');
         }
         $this->db_local->query("SET NAMES 'utf8mb4'");
@@ -161,9 +161,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);
     }

core/DBConnection.php

Spacing +20 added lines, -20 removed lines

@@ -62,24 +62,24 @@ 
             case "EXTERNAL":
             case "FRONTEND":
             case "DIAGNOSTICS":
-                if (!isset(self::${"instance" . $theDb})) {
+                if (!isset(self::${"instance".$theDb})) {
                     $class = __CLASS__;
-                    self::${"instance" . $theDb} = new $class($database);
-                    DBConnection::${"instance" . $theDb}->databaseInstance = $theDb;
+                    self::${"instance".$theDb} = new $class($database);
+                    DBConnection::${"instance".$theDb}->databaseInstance = $theDb;
                 }
-                return self::${"instance" . $theDb};
+                return self::${"instance".$theDb};
             case "RADIUS":
-                if (!isset(self::${"instance" . $theDb})) {
+                if (!isset(self::${"instance".$theDb})) {
                     $class = __CLASS__;
                     foreach (\config\ConfAssistant::DB as $name => $oneRadiusAuthDb) {
                         $theInstance = new $class($name);
-                        self::${"instance" . $theDb}[] = $theInstance;
+                        self::${"instance".$theDb}[] = $theInstance;
                         $theInstance->databaseInstance = $theDb;
                     }
                 }
-                return self::${"instance" . $theDb};
+                return self::${"instance".$theDb};
             default:
-                throw new Exception("This type of database (" . strtoupper($database) . ") is not known!");
+                throw new Exception("This type of database (".strtoupper($database).") is not known!");
         }
     }
 
@@ -121,18 +121,18 @@ 
             }
         }
         // log exact query to debug log, if log level is at 5
-        $this->loggerInstance->debug(5, "DB ATTEMPT: ".$this->databaseInstance .": " . $querystring . "\n");
+        $this->loggerInstance->debug(5, "DB ATTEMPT: ".$this->databaseInstance.": ".$querystring."\n");
         if ($types !== NULL) {
-            $this->loggerInstance->debug(5, "Argument type sequence: $types, parameters are: " . /** @scrutinizer ignore-type */ print_r($arguments, true));
+            $this->loggerInstance->debug(5, "Argument type sequence: $types, parameters are: "./** @scrutinizer ignore-type */ print_r($arguments, true));
         }
 
         if ($this->connection->connect_error) {
-            throw new Exception("ERROR: Cannot send query to $this->databaseInstance database (no connection, error number" . $this->connection->connect_error . ")!");
+            throw new Exception("ERROR: Cannot send query to $this->databaseInstance database (no connection, error number".$this->connection->connect_error.")!");
         }
         if ($types === NULL) {
             $result = $this->connection->query($querystring);
             if ($result === FALSE) {
-                throw new Exception("DB: Unable to execute simple statement! Error was --> " . $this->connection->error . " <--");
+                throw new Exception("DB: Unable to execute simple statement! Error was --> ".$this->connection->error." <--");
             }
         } else {
             // fancy! prepared statement with dedicated argument list
@@ -148,7 +148,7 @@ 
                 }
                 $prepResult = $statementObject->prepare($querystring);
                 if ($prepResult === FALSE) {
-                    throw new Exception("DB: Unable to prepare statement! Statement was --> $querystring <--, error was --> " . $statementObject->error . " <--.");
+                    throw new Exception("DB: Unable to prepare statement! Statement was --> $querystring <--, error was --> ".$statementObject->error." <--.");
                 }
                 $this->preparedStatements[$querystring] = $statementObject;
             }
@@ -161,11 +161,11 @@ 
             array_unshift($localArray, $types);
             $retval = call_user_func_array([$statementObject, "bind_param"], $localArray);
             if ($retval === FALSE) {
-                throw new Exception("DB: Unable to bind parameters to prepared statement! Argument array was --> " . var_export($localArray, TRUE) . " <--. Error was --> " . $statementObject->error . " <--");
+                throw new Exception("DB: Unable to bind parameters to prepared statement! Argument array was --> ".var_export($localArray, TRUE)." <--. Error was --> ".$statementObject->error." <--");
             }
             $result = $statementObject->execute();
             if ($result === FALSE) {
-                throw new Exception("DB: Unable to execute prepared statement! Error was --> " . $statementObject->error . " <--");
+                throw new Exception("DB: Unable to execute prepared statement! Error was --> ".$statementObject->error." <--");
             }
             $selectResult = $statementObject->get_result();
             if ($selectResult !== FALSE) {
@@ -175,14 +175,14 @@ 
 
         // all cases where $result could be FALSE have been caught earlier
         if ($this->connection->errno) {
-            throw new Exception("ERROR: Cannot execute query in $this->databaseInstance database - (hopefully escaped) query was '$querystring', errno was " . $this->connection->errno . "!");
+            throw new Exception("ERROR: Cannot execute query in $this->databaseInstance database - (hopefully escaped) query was '$querystring', errno was ".$this->connection->errno."!");
         }
 
 
         if ($isMoreThanSelect || \config\Master::DEBUG_LEVEL == 5) {
-            $this->loggerInstance->writeSQLAudit("[DB: " . strtoupper($this->databaseInstance) . "] " . $querystring);
+            $this->loggerInstance->writeSQLAudit("[DB: ".strtoupper($this->databaseInstance)."] ".$querystring);
             if ($types !== NULL) {
-                $this->loggerInstance->writeSQLAudit("Argument type sequence: $types, parameters are: " . /** @scrutinizer ignore-type */ print_r($arguments, true));
+                $this->loggerInstance->writeSQLAudit("Argument type sequence: $types, parameters are: "./** @scrutinizer ignore-type */ print_r($arguments, true));
             }
         }
         return $result;
@@ -280,13 +280,13 @@ 
         if (isset(\config\Master::DB[$databaseCapitalised])) {
             $this->connection = new \mysqli(\config\Master::DB[$databaseCapitalised]['host'], \config\Master::DB[$databaseCapitalised]['user'], \config\Master::DB[$databaseCapitalised]['pass'], \config\Master::DB[$databaseCapitalised]['db']);
             if ($this->connection->connect_error) {
-                throw new Exception("ERROR: Unable to connect to $database database! This is a fatal error, giving up (error number " . $this->connection->connect_errno . ").");
+                throw new Exception("ERROR: Unable to connect to $database database! This is a fatal error, giving up (error number ".$this->connection->connect_errno.").");
             }
             $this->readOnly = \config\Master::DB[$databaseCapitalised]['readonly'];
         } else { // one of the RADIUS DBs
             $this->connection = new \mysqli(\config\ConfAssistant::DB[$databaseCapitalised]['host'], \config\ConfAssistant::DB[$databaseCapitalised]['user'], \config\ConfAssistant::DB[$databaseCapitalised]['pass'], \config\ConfAssistant::DB[$databaseCapitalised]['db']);
             if ($this->connection->connect_error) {
-                throw new Exception("ERROR: Unable to connect to $database database! This is a fatal error, giving up (error number " . $this->connection->connect_errno . ").");
+                throw new Exception("ERROR: Unable to connect to $database database! This is a fatal error, giving up (error number ".$this->connection->connect_errno.").");
             }
             $this->readOnly = \config\ConfAssistant::DB[$databaseCapitalised]['readonly'];
         }