GEANT / CAT

web/admin/edit_hotspot.php

Indentation +5 added lines, -5 removed lines

@@ -109,7 +109,7 @@ 
                 $deployment->deactivate();
             }
             header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '&' . urldecode(http_build_query($response)) . '#profilebox_' . 
-                   $deployment->identifier);
+                    $deployment->identifier);
             exit(0);
         case web\lib\common\FormElements::BUTTON_REMOVESP:
             $deployment->remove();
@@ -140,9 +140,9 @@ 
                     // valid signature
                     $data = openssl_x509_parse($deployment->radsec_cert);
                     $certdata = array(
-                              $data['serialNumberHex'],
-                              date_create_from_format('ymdGis', substr($data['validTo'], 0, -1))->format('YmdHis')
-                             );
+                                $data['serialNumberHex'],
+                                date_create_from_format('ymdGis', substr($data['validTo'], 0, -1))->format('YmdHis')
+                                );
                     $torevoke = implode('#', $certdata);
                     $response = $deployment->setRADIUSconfig(0, 0, $torevoke);
                     $deployment->tlsfromcsr($csr);
@@ -194,7 +194,7 @@ 
             }
             header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '&' . urldecode(http_build_query($response)) . '#profilebox_' . $deployment->identifier);
             exit(0);
-          default:
+            default:
                 throw new Exception("Unknown button action requested!");
     }
 }

Spacing +18 added lines, -18 removed lines

@@ -27,7 +27,7 @@ 
  */
 ?>
 <?php
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
 
 
 $deco = new \web\lib\admin\PageDecoration();
@@ -41,10 +41,10 @@ 
             ( $_POST['consortium'] == "OpenRoaming" && count($myfed->getAttributes("fed:openroaming")) > 0 )
             )
     ) {*/
-    if (isset($_POST['consortium']) &&  $_POST['consortium'] == "eduroam")
+    if (isset($_POST['consortium']) && $_POST['consortium'] == "eduroam")
     {
         $deployment = $my_inst->newDeployment(\core\AbstractDeployment::DEPLOYMENTTYPE_MANAGED, $_POST['consortium']);
-        header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '#profilebox_' . $deployment->identifier);
+        header("Location: overview_org.php?inst_id=".$my_inst->identifier.'#profilebox_'.$deployment->identifier);
         exit(0);
     } else {
         throw new Exception("Desired consortium for Managed SP needs to be specified, and allowed!");
@@ -101,19 +101,19 @@ 
             if (isset($_POST['agreement']) && $_POST['agreement'] == "true") {
                 $deployment->addAttribute("hiddenmanagedsp:tou_accepted", NULL, 1);
             }
-            header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '#profilebox_' . $deployment->identifier);
+            header("Location: overview_org.php?inst_id=".$my_inst->identifier.'#profilebox_'.$deployment->identifier);
             exit(0);
         case web\lib\common\FormElements::BUTTON_DELETE:
             $response = $deployment->setRADIUSconfig();
             if (in_array('OK', $response)) {
                 $deployment->deactivate();
             }
-            header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '&' . urldecode(http_build_query($response)) . '#profilebox_' . 
+            header("Location: overview_org.php?inst_id=".$my_inst->identifier.'&'.urldecode(http_build_query($response)).'#profilebox_'. 
                    $deployment->identifier);
             exit(0);
         case web\lib\common\FormElements::BUTTON_REMOVESP:
             $deployment->remove();
-            header("Location: overview_org.php?inst_id=" . $my_inst->identifier);
+            header("Location: overview_org.php?inst_id=".$my_inst->identifier);
             exit(0);
         case web\lib\common\FormElements::BUTTON_RENEWTLS:
             $data = openssl_x509_parse($deployment->radsec_cert);
@@ -124,14 +124,14 @@ 
             $torevoke = implode('#', $certdata);
             $response = $deployment->setRADIUSconfig(0, 0, $torevoke);
             $deployment->renewtls();
-            header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '#profilebox_' . $deployment->identifier);
+            header("Location: overview_org.php?inst_id=".$my_inst->identifier.'#profilebox_'.$deployment->identifier);
             exit(0);
         case web\lib\common\FormElements::BUTTON_USECSR:
             if (isset($_FILES['upload']) && $_FILES['upload']['size'] > 0) {
                 $csrpem = file_get_contents($_FILES['upload']['tmp_name']);
                 if ($csrpem === FALSE) {
                     // seems we can't work with this file for some reason. Ignore.
-                    header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '&errormsg=NOCSR_' . $deployment->identifier . '#profilebox_' . $deployment->identifier);
+                    header("Location: overview_org.php?inst_id=".$my_inst->identifier.'&errormsg=NOCSR_'.$deployment->identifier.'#profilebox_'.$deployment->identifier);
                     exit(0);
                 }
                 $csr = new \phpseclib3\File\X509();
@@ -146,10 +146,10 @@ 
                     $torevoke = implode('#', $certdata);
                     $response = $deployment->setRADIUSconfig(0, 0, $torevoke);
                     $deployment->tlsfromcsr($csr);
-                    header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '#profilebox_' . $deployment->identifier);
+                    header("Location: overview_org.php?inst_id=".$my_inst->identifier.'#profilebox_'.$deployment->identifier);
                     exit(0);
                 } else {
-                    header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '&errormsg=WRONGCSR_' . $deployment->identifier . '#profilebox_' . $deployment->identifier);
+                    header("Location: overview_org.php?inst_id=".$my_inst->identifier.'&errormsg=WRONGCSR_'.$deployment->identifier.'#profilebox_'.$deployment->identifier);
                     exit(0);
                 }
             }
@@ -159,7 +159,7 @@ 
                 if (in_array('OK', $response)) {
                     $deployment->activate();
                 }
-                header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '&' . urldecode(http_build_query($response)) . '#profilebox_' . $deployment->identifier);
+                header("Location: overview_org.php?inst_id=".$my_inst->identifier.'&'.urldecode(http_build_query($response)).'#profilebox_'.$deployment->identifier);
                 exit(0);
             } else {
                 throw new Exception("Activate button pushed without acknowledged ToUs!");
@@ -192,7 +192,7 @@ 
             } else {
                 $response = ['NOOP', 'NOOP'];
             }
-            header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '&' . urldecode(http_build_query($response)) . '#profilebox_' . $deployment->identifier);
+            header("Location: overview_org.php?inst_id=".$my_inst->identifier.'&'.urldecode(http_build_query($response)).'#profilebox_'.$deployment->identifier);
             exit(0);
           default:
                 throw new Exception("Unknown button action requested!");
@@ -201,10 +201,10 @@ 
 if (isset($_POST['command'])) {
     switch ($_POST['command']) {
         case web\lib\common\FormElements::BUTTON_CLOSE:
-            header("Location: overview_org.php?inst_id=" . $my_inst->identifier) . '#profilebox_' . $deployment->identifier;
+            header("Location: overview_org.php?inst_id=".$my_inst->identifier).'#profilebox_'.$deployment->identifier;
             exit(0);
         default:
-            header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '#profilebox_' . $deployment->identifier);
+            header("Location: overview_org.php?inst_id=".$my_inst->identifier.'#profilebox_'.$deployment->identifier);
             exit(0);
         }
 }
@@ -230,7 +230,7 @@ 
     echo $uiElements->instLevelInfoBoxes($my_inst);
     $deploymentOptions = $deployment->getAttributes();
     echo "<form enctype='multipart/form-data' action='edit_hotspot.php?inst_id=$my_inst->identifier&amp;deployment_id=$deployment->identifier' method='post' accept-charset='UTF-8'>
-                <input type='hidden' name='MAX_FILE_SIZE' value='" . \config\Master::MAX_UPLOAD_SIZE . "'>";
+                <input type='hidden' name='MAX_FILE_SIZE' value='".\config\Master::MAX_UPLOAD_SIZE."'>";
     $optionDisplay = new \web\lib\admin\OptionDisplay($deploymentOptions, \core\Options::LEVEL_PROFILE);
     ?>
     <fieldset class='option_container' id='managedsp_override'>
@@ -264,7 +264,7 @@ 
                 <!-- input for VLAN identifier for guests-->
                 <td>
                     <span id='guest_vlan_label'>
-                        <?php echo sprintf(_("VLAN tag for guests:"), ($guest_vlan === NULL ? "" : " " . _("(unset with '0')"))); ?>
+                        <?php echo sprintf(_("VLAN tag for guests:"), ($guest_vlan === NULL ? "" : " "._("(unset with '0')"))); ?>
                     </span>
                 </td>
                 <td>
@@ -280,7 +280,7 @@ 
                 <!-- input for VLAN identifier for home users-->
                 <td>
                     <span id='vlan_label'>
-                        <?php echo sprintf(_("VLAN tag for own users%s:"), ($vlan === NULL ? "" : " " . _("(unset with '0')"))); ?>
+                        <?php echo sprintf(_("VLAN tag for own users%s:"), ($vlan === NULL ? "" : " "._("(unset with '0')"))); ?>
                     </span>
                 </td>
                 <td>
@@ -300,7 +300,7 @@ 
     </fieldset>
 
     <?php
-    echo "<p><button type='submit' name='submitbutton' class='deploymentopts' value='" . web\lib\common\FormElements::BUTTON_SAVE . "'>" . _("Save data") . "</button><button type='button' class='delete' name='abortbutton' value='abort' onclick='javascript:window.location = \"overview_org.php?inst_id=$my_inst->identifier\"'>" . _("Discard changes") . "</button></p></form>";
+    echo "<p><button type='submit' name='submitbutton' class='deploymentopts' value='".web\lib\common\FormElements::BUTTON_SAVE."'>"._("Save data")."</button><button type='button' class='delete' name='abortbutton' value='abort' onclick='javascript:window.location = \"overview_org.php?inst_id=$my_inst->identifier\"'>"._("Discard changes")."</button></p></form>";
     echo $deco->footer();
     ?>
     <script>

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->openroamingReadinessTest();

web/lib/admin/MapGoogle.php

Spacing +14 added lines, -14 removed lines

@@ -47,7 +47,7 @@ 
     public function htmlHeadCode() {
         $cat = new \core\CAT();
         \core\common\Entity::intoThePotatoes();
-        $retval = "<script type='text/javascript' src='https://maps.googleapis.com/maps/api/js?key=" . \config\Master::APPEARANCE['google_maps_api_key'] . "'></script>
+        $retval = "<script type='text/javascript' src='https://maps.googleapis.com/maps/api/js?key=".\config\Master::APPEARANCE['google_maps_api_key']."'></script>
     <script type='text/javascript'>
         // some global variables;
         var center_lat=49.6114885608729;
@@ -103,19 +103,19 @@ 
          *
          */
         function locator_magic() {
-            geocoder.geocode({'address':\"" . preg_replace("/\"/", "&quot;", $this->instName) . "\", 'region':\"" . strtolower($this->fedName) . "\"},
+            geocoder.geocode({'address':\"" . preg_replace("/\"/", "&quot;", $this->instName)."\", 'region':\"".strtolower($this->fedName)."\"},
             function(r,status) {
                 if(status != google.maps.GeocoderStatus.OK) {
-                    locate_country(\"" . $cat->knownFederations[strtoupper($this->fedName)]['name'] . "\");
+                    locate_country(\"" . $cat->knownFederations[strtoupper($this->fedName)]['name']."\");
                 } else {
                     var i;
                     for(i = 0; i < r.length; i++) {
                         Addr = getAddressElements(r[i].address_components);
-                        if(Addr.country == \"" . strtoupper($this->fedName) . "\")
+                        if(Addr.country == \"" . strtoupper($this->fedName)."\")
                         break;
                     }
-                    if(Addr.country != \"" . strtoupper($this->fedName) . "\")
-                    locate_country(\"" . $cat->knownFederations[strtoupper($this->fedName)]['name'] . "\");
+                    if(Addr.country != \"" . strtoupper($this->fedName)."\")
+                    locate_country(\"" . $cat->knownFederations[strtoupper($this->fedName)]['name']."\");
                     else {
                         addMarker(r[i].geometry.location,15,null);
                     }
@@ -128,7 +128,7 @@ 
          */
         function markerClicked(m) {
             info_window.close();
-            var t = \"" . _("This is location ") . "\"+m.info;
+            var t = \"" . _("This is location ")."\"+m.info;
             info_window.setContent(t);
             info_window.setPosition(m.getPosition());
             info_window.open(map,m);
@@ -207,7 +207,7 @@ 
         function getAddressLocation() {
             var city = $('#address').val();
             if(city == '') {
-                alert(\"" . _("nothing entered in the address field") . "\");
+                alert(\"" . _("nothing entered in the address field")."\");
                 return false;
             }
             geocoder.geocode( { 'address': city}, function(results, status) {
@@ -227,7 +227,7 @@ 
          * trigger geolocation
          */
         function locateMe() {
-            $('#address').val(\"" . _("locating") . "\");
+            $('#address').val(\"" . _("locating")."\");
             navigator.geolocation.getCurrentPosition(locate_success,locate_fail,{maximumAge:3600000, timeout:5000});
         }
 
@@ -345,7 +345,7 @@ 
         if ($this->readOnly) {
             return "<div id='map' class='googlemap'></div>";
         } else {
-            return $this->htmlPreEdit($wizard, $additional) . $this->findLocationHtml() . "<div id='map' class='googlemap'></div>" . $this->htmlPostEdit(FALSE);
+            return $this->htmlPreEdit($wizard, $additional).$this->findLocationHtml()."<div id='map' class='googlemap'></div>".$this->htmlPostEdit(FALSE);
         }
     }
 
@@ -358,11 +358,11 @@ 
      */
     public static function optionListDisplayCode($coords, $number) {
         // quiesce warnings about unused variable
-        if (strlen(sprintf("%s", $coords)) <0) {
+        if (strlen(sprintf("%s", $coords)) < 0) {
             throw new \Exception("A miracle! A string with negative length!");
         };
         \core\common\Entity::intoThePotatoes();
-        $retval = "<button id='location_b_" . $number . "' class='location_button'>" . _("Click to see location") . " $number</button>";
+        $retval = "<button id='location_b_".$number."' class='location_button'>"._("Click to see location")." $number</button>";
         \core\common\Entity::outOfThePotatoes();
         return $retval;
     }
@@ -373,7 +373,7 @@ 
      * @return string
      */
     public function bodyTagCode() {
-        return "onload='load(" . ($this->readOnly ? "0" : "1") . ")'";
+        return "onload='load(".($this->readOnly ? "0" : "1").")'";
     }
 
     /**
@@ -383,7 +383,7 @@ 
      */
     private function findLocationHtml() {
         \core\common\Entity::intoThePotatoes();
-        $retval = "<p>" . _("Address:") . " <input name='address' id='address' /><button type='button' onclick='getAddressLocation()'>" . _("Find address") . "</button> <button type='button' onclick='locateMe()'>" . _("Locate Me!") . "</button></p>";
+        $retval = "<p>"._("Address:")." <input name='address' id='address' /><button type='button' onclick='getAddressLocation()'>"._("Find address")."</button> <button type='button' onclick='locateMe()'>"._("Locate Me!")."</button></p>";
         \core\common\Entity::outOfThePotatoes();
         return $retval;
     }

web/lib/admin/MapOpenLayers.php

Spacing +7 added lines, -7 removed lines

@@ -83,7 +83,7 @@ 
         
 // use HTML5 geolocation
         function locateMe() {
-            $('#address').val(\"" . _("locating") . "\");
+            $('#address').val(\"" . _("locating")."\");
             navigator.geolocation.getCurrentPosition(locate_success,locate_fail,{maximumAge:3600000, timeout:5000});
         }
         
@@ -205,7 +205,7 @@ 
                 view.fit(extent, {padding: [10, 0, 10, 0]});
             } else {
                 view.setCenter([0,0]);
-                locate_country('" . $cat->knownFederations[strtoupper($this->fedName)]['name'] . "'); // use the federation code to locate the country
+                locate_country('" . $cat->knownFederations[strtoupper($this->fedName)]['name']."'); // use the federation code to locate the country
                 map.setView(view);
             }
             view.setMaxZoom(20);
@@ -227,14 +227,14 @@ 
         function getAddressLocation() {
             var city = $('#address').val();
             if(city == '') {
-                alert(\"" . _("nothing entered in the address field") . "\");
+                alert(\"" . _("nothing entered in the address field")."\");
                 return false;
             }
             city = city.replace(/\s*,\s*/g,',+');
             city = city.replace(/ +/,'+');
             $.get(addressService+'?format=json&addressdetails=0&q='+city, '',  function(data) {
                 if (data[0] === undefined) {
-                    alert('" . _("Address not found, perhaps try another form, like putting the street number to the front.") . "');
+                    alert('" . _("Address not found, perhaps try another form, like putting the street number to the front.")."');
                     return;
                 }
                 showTmpPointer(data[0].lon, data[0].lat);
@@ -285,7 +285,7 @@ 
         if ($this->readOnly) {
             return "<div id='map' class='locationmap'></div><script>generateMap('map')</script>";
         } else {
-            return $this->htmlPreEdit($wizard, $additional) . $this->findLocationHtml() . "<span id='location-prompt'>You can drag the pointer to the final location before you save the results.</span><div id='map' class='locationmap'></div><script>generateMap('map')</script>" . $this->htmlPostEdit(FALSE);
+            return $this->htmlPreEdit($wizard, $additional).$this->findLocationHtml()."<span id='location-prompt'>You can drag the pointer to the final location before you save the results.</span><div id='map' class='locationmap'></div><script>generateMap('map')</script>".$this->htmlPostEdit(FALSE);
         }
     }
 
@@ -310,7 +310,7 @@ 
         // we don't need this parameter in this subclass
         unset($coords);
         \core\common\Entity::intoThePotatoes();
-        $retval = "<button id='location_b_" . $number . "' class='location_button'>" . _("Click to see location") . " $number</button>";
+        $retval = "<button id='location_b_".$number."' class='location_button'>"._("Click to see location")." $number</button>";
         \core\common\Entity::outOfThePotatoes();
         return $retval;
     }
@@ -322,7 +322,7 @@ 
      */
     private function findLocationHtml() {
         \core\common\Entity::intoThePotatoes();
-        $retval = "<p>" . _("Address:") . " <input name='address' id='address' /><button type='button' onclick='getAddressLocation()'>" . _("Find address") . "</button> <button type='button' onclick='locateMe()'>" . _("Locate Me!") . "</button></p>";
+        $retval = "<p>"._("Address:")." <input name='address' id='address' /><button type='button' onclick='getAddressLocation()'>"._("Find address")."</button> <button type='button' onclick='locateMe()'>"._("Locate Me!")."</button></p>";
         \core\common\Entity::outOfThePotatoes();
         return $retval;
     }

web/skins/modern/accountstatus/accountstatus.php

Spacing +27 added lines, -27 removed lines

@@ -47,9 +47,9 @@ 
 $Gui->loggerInstance->debug(4, $operatingSystem);
 $uiElements = new web\lib\admin\UIElements();
 if ($operatingSystem) {
-    print "recognisedOS = '" . $operatingSystem['device'] . "';\n";
+    print "recognisedOS = '".$operatingSystem['device']."';\n";
 }
-require dirname(__DIR__) . '/user/js/cat_js.php';
+require dirname(__DIR__).'/user/js/cat_js.php';
 ?>
     var lang = "<?php echo($Gui->languageInstance->getLang()) ?>";
 </script>
@@ -79,7 +79,7 @@ 
                         <?php
                         switch ($statusInfo['errorcode']) {
                             case "GENERATOR_CONSUMED":
-                                echo $uiElements->boxError(_("You attempted to download an installer that was already downloaded before. Please request a new token from your administrator instead."), _("Attempt to reuse download link"), TRUE) . "<p>";
+                                echo $uiElements->boxError(_("You attempted to download an installer that was already downloaded before. Please request a new token from your administrator instead."), _("Attempt to reuse download link"), TRUE)."<p>";
                                 break;
                             case NULL:
                             default:
@@ -102,7 +102,7 @@ 
                                     echo " ";
                                     echo sprintf(ngettext("<strong>%d</strong> of your credentials is not valid any more.", "<strong>%d</strong> of your credentials are not valid any more.", $noGoodCerts), $noGoodCerts);
                                 }
-                                echo " <span id='detailtext'>" . _("I want to see the details.") . "</span>";
+                                echo " <span id='detailtext'>"._("I want to see the details.")."</span>";
                                 echo "<table id='cert_details'></table>";
                             }
                         }
@@ -111,60 +111,60 @@ 
                             case \core\SilverbulletInvitation::SB_TOKENSTATUS_VALID: // treat both cases as equal
                             case \core\SilverbulletInvitation::SB_TOKENSTATUS_PARTIALLY_REDEEMED:
                                 if ($statusInfo['invitation_object']->activationsTotal > 1) { // only show this extra info in the non-trivial case.
-                                    echo "<h3>" . sprintf(_("Your invitation token is valid for %d more device activations (%d have already been used)."), $statusInfo['invitation_object']->activationsRemaining, $statusInfo['invitation_object']->activationsTotal - $statusInfo['invitation_object']->activationsRemaining) . "</h3>";
+                                    echo "<h3>".sprintf(_("Your invitation token is valid for %d more device activations (%d have already been used)."), $statusInfo['invitation_object']->activationsRemaining, $statusInfo['invitation_object']->activationsTotal - $statusInfo['invitation_object']->activationsRemaining)."</h3>";
                                 }
                                 if (!$statusInfo["OS"]) {
-                                    echo "<p>" . _("Unfortunately, we are unable to determine your device's operating system. If you have made modifications on your device which prevent it from being recognised (e.g. custom 'User Agent' settings), please undo such modifications. You can come back to this page again; the invitation link has not been used up yet.") . "</p>";
+                                    echo "<p>"._("Unfortunately, we are unable to determine your device's operating system. If you have made modifications on your device which prevent it from being recognised (e.g. custom 'User Agent' settings), please undo such modifications. You can come back to this page again; the invitation link has not been used up yet.")."</p>";
                                     break;
                                 }
 
                                 $dev = new \core\DeviceFactory($statusInfo['OS']['device']);
                                 $dev->device->calculatePreferredEapType([new \core\common\EAP(\core\common\EAP::EAPTYPE_SILVERBULLET)]);
                                 if ($dev->device->selectedEap == []) {
-                                    echo "<p>" . sprintf(_("Unfortunately, the operating system your device uses (%s) is currently not supported for hosted end-user accounts. You can visit this page with a supported operating system later; the invitation link has not been used up yet."), $statusInfo['OS']['display']) . "</p>";
+                                    echo "<p>".sprintf(_("Unfortunately, the operating system your device uses (%s) is currently not supported for hosted end-user accounts. You can visit this page with a supported operating system later; the invitation link has not been used up yet."), $statusInfo['OS']['display'])."</p>";
                                     break;
                                 }
-                                $message = $dev->device->options['message'] ?? '' ;
+                                $message = $dev->device->options['message'] ?? '';
 
                                 $sbMessage = $dev->device->options['sb_message'] ?? '';
                                 if ($message != '' && $sbMessage != '') {
-                                    $message = $message . "<p>" . $sbMessage;
+                                    $message = $message."<p>".$sbMessage;
                                 } else {
-                                    $message = $message . $sbMessage;
+                                    $message = $message.$sbMessage;
                                 }
                          
-                                echo "<div id='sb_download_message'><p>" . sprintf(_("You can now download a personalised  %s installation program."), \config\ConfAssistant::CONSORTIUM['display_name']);
+                                echo "<div id='sb_download_message'><p>".sprintf(_("You can now download a personalised  %s installation program."), \config\ConfAssistant::CONSORTIUM['display_name']);
 //                       echo sprintf(_("The installation program is <span class='emph'>strictly personal</span>, to be used <span class='emph'>only on this device (%s)</span>, and it is <span class='emph'>not permitted to share</span> this information with anyone."), $statusInfo['OS']['display']);
                                 echo sprintf(_("The installation program is <span class='emph'>strictly personal</span>, to be used <span class='emph'>only on this device (%s)</span>, and it is <span class='emph'>not permitted to share</span> this information with anyone."), $statusInfo['OS']['display']);
-                                echo "<p style='color:red;'>" . sprintf(_("When the system detects abuse such as sharing login data with others, all access rights for you will be revoked and you may be sanctioned by your local %s administrator."), \config\ConfAssistant::CONSORTIUM['display_name']) . "</p>";
-                                echo "<p>" . _("During the installation process, you will be asked for the following import PIN. This only happens once during the installation. You do not have to write down this PIN.") . "</p></div>";
+                                echo "<p style='color:red;'>".sprintf(_("When the system detects abuse such as sharing login data with others, all access rights for you will be revoked and you may be sanctioned by your local %s administrator."), \config\ConfAssistant::CONSORTIUM['display_name'])."</p>";
+                                echo "<p>"._("During the installation process, you will be asked for the following import PIN. This only happens once during the installation. You do not have to write down this PIN.")."</p></div>";
 
                                 $importPassword = \core\common\Entity::randomString(4, "0123456789");
                                 $profile = new \core\ProfileSilverbullet($statusInfo['profile']->identifier, NULL);
                                 
-                                echo "<h2>" . sprintf(_("Import PIN: %s"), $importPassword) . "</h2>";
+                                echo "<h2>".sprintf(_("Import PIN: %s"), $importPassword)."</h2>";
                                 $_SESSION['individualtoken'] = $cleanToken;
                                 $_SESSION['importpassword'] = $importPassword;
-                                echo "<input type='hidden' name='device' value='" . $statusInfo['OS']['device'] . "'/>";
+                                echo "<input type='hidden' name='device' value='".$statusInfo['OS']['device']."'/>";
                                 echo "<input type='hidden' name='generatedfor' value='silverbullet'/>";
-                                echo "<button class='large_button' id='user_button_sb' style='height:80px;'><span id='user_buttonnnn'>" . sprintf(_("Click here to download your %s installer!"), \config\ConfAssistant::CONSORTIUM['display_name']) . "</span></button>";
+                                echo "<button class='large_button' id='user_button_sb' style='height:80px;'><span id='user_buttonnnn'>".sprintf(_("Click here to download your %s installer!"), \config\ConfAssistant::CONSORTIUM['display_name'])."</span></button>";
                                 echo "<div class='device_info' id='info_g_sb'></div>";
                                 break;
                             case \core\SilverbulletInvitation::SB_TOKENSTATUS_EXPIRED:
                                 echo "<h2>Invitation link expired</h2>";
-                                echo "<p>" . sprintf(_("Unfortunately, the invitation link you just used is too old. The %s sign-up invitation was valid until %s. You cannot use this link any more. Please ask your administrator to issue you a new invitation link."), \config\ConfAssistant::CONSORTIUM['display_name'], $statusInfo['invitation_object']->expiry) . "</p>";
+                                echo "<p>".sprintf(_("Unfortunately, the invitation link you just used is too old. The %s sign-up invitation was valid until %s. You cannot use this link any more. Please ask your administrator to issue you a new invitation link."), \config\ConfAssistant::CONSORTIUM['display_name'], $statusInfo['invitation_object']->expiry)."</p>";
                                 echo "<p>Below is all the information about your account's other login details, if any.</p>";
 // do NOT break, display full account info instead (this was a previously valid token after all)
                             case \core\SilverbulletInvitation::SB_TOKENSTATUS_REDEEMED:
                                 // nothing to say really. User got the breakdown of certs above, and this link doesn't give him any new ones.
                                 break;
                             case \core\SilverbulletInvitation::SB_TOKENSTATUS_INVALID:
-                                echo "<h2>" . _("Account information not found") . "</h2>";
-                                echo "<p>" . sprintf(_("The invitation link you followed does not map to any invitation we have on file.") . "</p><p>" . _("You should use the exact link you got during sign-up to come here. Alternatively, if you have a valid %s credential already, you can visit this page and Accept the question about logging in with a client certificate (select a certificate with a name ending in '…%s')."),\config\ConfAssistant::CONSORTIUM['display_name'], \config\ConfAssistant::SILVERBULLET['realm_suffix']);
+                                echo "<h2>"._("Account information not found")."</h2>";
+                                echo "<p>".sprintf(_("The invitation link you followed does not map to any invitation we have on file.")."</p><p>"._("You should use the exact link you got during sign-up to come here. Alternatively, if you have a valid %s credential already, you can visit this page and Accept the question about logging in with a client certificate (select a certificate with a name ending in '…%s')."), \config\ConfAssistant::CONSORTIUM['display_name'], \config\ConfAssistant::SILVERBULLET['realm_suffix']);
                         }
                         if (isset($statusInfo['profile_id']) && isset($statusInfo['idp_id'])) {
-                            echo "<input type='hidden' name='profile' id='profile_id' value='" . $statusInfo['profile_id'] . "'/>";
-                            echo "<input type='hidden' id='inst_id' name='idp' value='" . $statusInfo['idp_id'] . "'/>";
+                            echo "<input type='hidden' name='profile' id='profile_id' value='".$statusInfo['profile_id']."'/>";
+                            echo "<input type='hidden' id='inst_id' name='idp' value='".$statusInfo['idp_id']."'/>";
                         }
                         ?>
                     </div>
@@ -184,18 +184,18 @@ 
     $attributes = $statusInfo['attributes'];
     $supportInfo = '';
     if (!empty($attributes['local_url'])) {
-        $supportInfo .= '<tr><td>' . ("WWW:") . '</td><td><a href="' . $attributes['local_url'] . '" target="_blank">' . $attributes['local_url'] . '</a></td></tr>';
+        $supportInfo .= '<tr><td>'.("WWW:").'</td><td><a href="'.$attributes['local_url'].'" target="_blank">'.$attributes['local_url'].'</a></td></tr>';
     }
     if (!empty($attributes['local_email'])) {
-        $supportInfo .= '<tr><td>' . ("email:") . '</td><td><a href="' . $attributes['local_email'] . '" target="_blank">' . $attributes['local_email'] . '</a></td></tr>';
+        $supportInfo .= '<tr><td>'.("email:").'</td><td><a href="'.$attributes['local_email'].'" target="_blank">'.$attributes['local_email'].'</a></td></tr>';
     }
     if (!empty($attributes['local_phone'])) {
-        $supportInfo .= '<tr><td>' . ("tel:") . '</td><td><a href="' . $attributes['local_phone'] . '" target="_blank">' . $attributes['local_phone'] . '</a></td></tr>';
+        $supportInfo .= '<tr><td>'.("tel:").'</td><td><a href="'.$attributes['local_phone'].'" target="_blank">'.$attributes['local_phone'].'</a></td></tr>';
     }
     if ($supportInfo != '') {
-        $supportInfo = "<table><tr><th colspan='2'>" . _("If you encounter problems, then you can obtain direct assistance from your organisation at:") . "</th></tr>$supportInfo</table>";
+        $supportInfo = "<table><tr><th colspan='2'>"._("If you encounter problems, then you can obtain direct assistance from your organisation at:")."</th></tr>$supportInfo</table>";
     } else {
-        $supportInfo = "<table><tr><th colspan='2'>" . _("If you encounter problems you should ask those who gave you your account for help.") . "</th></tr></table>";
+        $supportInfo = "<table><tr><th colspan='2'>"._("If you encounter problems you should ask those who gave you your account for help.")."</th></tr></table>";
     }
     ?>
     <script>
@@ -204,7 +204,7 @@ 
             var logo = <?php echo $statusInfo['idp_logo']; ?>;
             var idpId = <?php echo $statusInfo['idp_id']; ?>;
             <?php
-                if($message != '') {
+                if ($message != '') {
                     echo "message = \"$message\";\n";
                 }
             ?>

web/admin/inc/deploymentLogs.inc.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
  * ******************************************************************************
  */
 
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php";
+require_once dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php";
 $auth = new \web\lib\admin\Authentication();
 $auth->authenticate();
 $languageInstance = new \core\common\Language();

core/DeploymentManaged.php

Indentation +44 added lines, -44 removed lines

@@ -372,20 +372,20 @@ 
         );
         // Generate a new private (and public) key pair
         $privkey = openssl_pkey_new(array(
-                                          "private_key_bits" => 4096,
-                                          "private_key_type" => OPENSSL_KEYTYPE_RSA));
+                                            "private_key_bits" => 4096,
+                                            "private_key_type" => OPENSSL_KEYTYPE_RSA));
         // export private key to $clientprivateKey (as string)
         openssl_pkey_export($privkey, $this->radsec_priv);
         // Generate a certificate signing request
         $csr = openssl_csr_new($dn, $privkey,
-                               array('digest_alg' => 'sha256', 'config' => ROOT . "/config/ManagedSPCerts/openssl.cnf"));
+                                array('digest_alg' => 'sha256', 'config' => ROOT . "/config/ManagedSPCerts/openssl.cnf"));
         // get CA certificate and private key
         $caprivkey = array(file_get_contents(ROOT . "/config/ManagedSPCerts/eduroamSP-CA.key"),
                             \config\Master::MANAGEDSP['capass']);
         $cacert = file_get_contents(ROOT .  "/config/ManagedSPCerts/eduroamSP-CA.pem");
         $this->setTLSSerialNumber();
         $clientcert = openssl_csr_sign($csr, $cacert, $caprivkey, \config\Master::MANAGEDSP['daystoexpiry'],
-                          array('digest_alg'=>'sha512', 'config' => ROOT . "/config/ManagedSPCerts/openssl.cnf"), $this->radsec_cert_serial_no);
+                            array('digest_alg'=>'sha512', 'config' => ROOT . "/config/ManagedSPCerts/openssl.cnf"), $this->radsec_cert_serial_no);
         openssl_x509_export($clientcert, $this->radsec_cert);
     } 
     /**
@@ -506,9 +506,9 @@ 
      */
     public function renewtls()
     {
-       $id = $this->identifier;
-       $futureTlsClient = $this->createTLScredentials();
-       $this->databaseHandle->exec("UPDATE deployment SET radsec_priv = ?, radsec_cert = ?, radsec_cert_serial_number = ? WHERE deployment_id = ?", "ssii", $this->radsec_priv, $this->radsec_cert, $this->radsec_cert_serial_no, $id);           
+        $id = $this->identifier;
+        $futureTlsClient = $this->createTLScredentials();
+        $this->databaseHandle->exec("UPDATE deployment SET radsec_priv = ?, radsec_cert = ?, radsec_cert_serial_number = ? WHERE deployment_id = ?", "ssii", $this->radsec_priv, $this->radsec_cert, $this->radsec_cert_serial_no, $id);           
     }
     
     /**
@@ -518,38 +518,38 @@ 
      */
     public function tlsfromcsr($csr)
     {
-       $id = $this->identifier;
-       $dn = array();
-       $dn['rdnSequence'] = array();
-       $dn['rdnSequence'][0] = array();
-       $dn['rdnSequence'][0][] = array('type' => 'id-at-organizationName', 'value' => array());
-       $dn['rdnSequence'][0][0]['value']['utf8String'] = 'eduroam';
-       $dn['rdnSequence'][1] = array();
-       $dn['rdnSequence'][1][] = array('type' => 'id-at-organizationalUnitName', 'value' => array());
-       $dn['rdnSequence'][1][0]['value']['utf8String'] = 'eduroam Managed SP';
-       $dn['rdnSequence'][2] = array();
-       $dn['rdnSequence'][2][] = array('type' => 'id-at-commonName', 'value' => array());
-       $dn['rdnSequence'][2][0]['value']['utf8String'] = 'SP' . $this->identifier . "-" . $this->institution;
-       $csr->setDN($dn);
-       $pemcakey = file_get_contents(ROOT . "/config/ManagedSPCerts/eduroamSP-CA.key");
-       $cakey = \phpseclib3\Crypt\PublicKeyLoader::loadPrivateKey($pemcakey, \config\Master::MANAGEDSP['capass'] );
-       $pemca = file_get_contents(ROOT .  "/config/ManagedSPCerts/eduroamSP-CA.pem");
-       $ca = new \phpseclib3\File\X509();
-       $ca->loadX509($pemca);
-       $ca->setPrivateKey($cakey);
-       // Sign the updated request, producing the certificate.
-       $x509 = new \phpseclib3\File\X509();
-       $csr->setExtension('id-ce-keyUsage', ['digitalSignature', 'nonRepudiation', 'keyEncipherment']);
-       $csr->setExtension('id-ce-extKeyUsage', ['id-kp-clientAuth']);
-       $csr->setExtension('id-ce-basicConstraints', ['cA' => false], false);
-       $x509->setEndDate('+' . \config\Master::MANAGEDSP['daystoexpiry'] . ' days');
-       $this->setTLSSerialNumber(999999999999999999);
-       $x509->setSerialNumber($this->radsec_cert_serial_no, 10);
-       $cert = $x509->loadX509($x509->saveX509($x509->sign($ca, $csr)));
-       $this->radsec_cert = $x509->saveX509($cert);
-       $this->radsec_priv = NULL;
-       //$futureTlsClient = $this->createTLScredentials();
-       $this->databaseHandle->exec("UPDATE deployment SET radsec_priv = NULL, radsec_cert = ?, radsec_cert_serial_number = ? WHERE deployment_id = ?", "sii", $this->radsec_cert, $this->radsec_cert_serial_no, $id);           
+        $id = $this->identifier;
+        $dn = array();
+        $dn['rdnSequence'] = array();
+        $dn['rdnSequence'][0] = array();
+        $dn['rdnSequence'][0][] = array('type' => 'id-at-organizationName', 'value' => array());
+        $dn['rdnSequence'][0][0]['value']['utf8String'] = 'eduroam';
+        $dn['rdnSequence'][1] = array();
+        $dn['rdnSequence'][1][] = array('type' => 'id-at-organizationalUnitName', 'value' => array());
+        $dn['rdnSequence'][1][0]['value']['utf8String'] = 'eduroam Managed SP';
+        $dn['rdnSequence'][2] = array();
+        $dn['rdnSequence'][2][] = array('type' => 'id-at-commonName', 'value' => array());
+        $dn['rdnSequence'][2][0]['value']['utf8String'] = 'SP' . $this->identifier . "-" . $this->institution;
+        $csr->setDN($dn);
+        $pemcakey = file_get_contents(ROOT . "/config/ManagedSPCerts/eduroamSP-CA.key");
+        $cakey = \phpseclib3\Crypt\PublicKeyLoader::loadPrivateKey($pemcakey, \config\Master::MANAGEDSP['capass'] );
+        $pemca = file_get_contents(ROOT .  "/config/ManagedSPCerts/eduroamSP-CA.pem");
+        $ca = new \phpseclib3\File\X509();
+        $ca->loadX509($pemca);
+        $ca->setPrivateKey($cakey);
+        // Sign the updated request, producing the certificate.
+        $x509 = new \phpseclib3\File\X509();
+        $csr->setExtension('id-ce-keyUsage', ['digitalSignature', 'nonRepudiation', 'keyEncipherment']);
+        $csr->setExtension('id-ce-extKeyUsage', ['id-kp-clientAuth']);
+        $csr->setExtension('id-ce-basicConstraints', ['cA' => false], false);
+        $x509->setEndDate('+' . \config\Master::MANAGEDSP['daystoexpiry'] . ' days');
+        $this->setTLSSerialNumber(999999999999999999);
+        $x509->setSerialNumber($this->radsec_cert_serial_no, 10);
+        $cert = $x509->loadX509($x509->saveX509($x509->sign($ca, $csr)));
+        $this->radsec_cert = $x509->saveX509($cert);
+        $this->radsec_priv = NULL;
+        //$futureTlsClient = $this->createTLScredentials();
+        $this->databaseHandle->exec("UPDATE deployment SET radsec_priv = NULL, radsec_cert = ?, radsec_cert_serial_number = ? WHERE deployment_id = ?", "sii", $this->radsec_cert, $this->radsec_cert_serial_no, $id);           
     }
     /**
      * marks the deployment as deactivated 
@@ -883,11 +883,11 @@ 
                 unlink("$zipdir/$key/detail.zip");
                 $files = scandir("$zipdir/$key/");
                 foreach($files as $file) {
-                  if ($file == '.' || $file == '..') continue;
-                  $data = file_get_contents("$zipdir/$key/$file");
-                  $zipt->addFromString("radius-$key/$file", $data);
-                  $cnt += 1;
-                  unlink("$zipdir/$key/$file");
+                    if ($file == '.' || $file == '..') continue;
+                    $data = file_get_contents("$zipdir/$key/$file");
+                    $zipt->addFromString("radius-$key/$file", $data);
+                    $cnt += 1;
+                    unlink("$zipdir/$key/$file");
                 } 
                 if (file_exists("$zipdir/$key")) {
                     rmdir("$zipdir/$key");

Spacing +51 added lines, -51 removed lines

@@ -322,7 +322,7 @@ 
                 $serverCandidates[IdPlist::geoDistance($adminLocation, ['lat' => $iterator->location_lat, 'lon' => $iterator->location_lon])] = $iterator->server_id;
             }
             if ($clients > $maxSupportedClients * 0.9) {
-                $this->loggerInstance->debug(1, "A RADIUS server for Managed SP (" . $iterator->server_id . ") is serving at more than 90% capacity!");
+                $this->loggerInstance->debug(1, "A RADIUS server for Managed SP (".$iterator->server_id.") is serving at more than 90% capacity!");
             }
         }
         if (count($serverCandidates) == 0 && $federation != "DEFAULT") {
@@ -344,7 +344,7 @@ 
      * 
      * @throws Exception
      */
-    private function setTLSSerialNumber($max=PHP_INT_MAX) {
+    private function setTLSSerialNumber($max = PHP_INT_MAX) {
         $nonDupSerialFound = FALSE;
         do {
             $serial = random_int(1000000000, $max);
@@ -364,7 +364,7 @@ 
      */
     private function createTLScredentials()
     {
-        $clientName = 'SP' . $this->identifier . '-' . $this->institution;
+        $clientName = 'SP'.$this->identifier.'-'.$this->institution;
         $dn = array(
                     "organizationName" => "eduroam",
                     "organizationalUnitName" => "eduroam Managed SP",
@@ -378,14 +378,14 @@ 
         openssl_pkey_export($privkey, $this->radsec_priv);
         // Generate a certificate signing request
         $csr = openssl_csr_new($dn, $privkey,
-                               array('digest_alg' => 'sha256', 'config' => ROOT . "/config/ManagedSPCerts/openssl.cnf"));
+                               array('digest_alg' => 'sha256', 'config' => ROOT."/config/ManagedSPCerts/openssl.cnf"));
         // get CA certificate and private key
-        $caprivkey = array(file_get_contents(ROOT . "/config/ManagedSPCerts/eduroamSP-CA.key"),
+        $caprivkey = array(file_get_contents(ROOT."/config/ManagedSPCerts/eduroamSP-CA.key"),
                             \config\Master::MANAGEDSP['capass']);
-        $cacert = file_get_contents(ROOT .  "/config/ManagedSPCerts/eduroamSP-CA.pem");
+        $cacert = file_get_contents(ROOT."/config/ManagedSPCerts/eduroamSP-CA.pem");
         $this->setTLSSerialNumber();
         $clientcert = openssl_csr_sign($csr, $cacert, $caprivkey, \config\Master::MANAGEDSP['daystoexpiry'],
-                          array('digest_alg'=>'sha512', 'config' => ROOT . "/config/ManagedSPCerts/openssl.cnf"), $this->radsec_cert_serial_no);
+                          array('digest_alg'=>'sha512', 'config' => ROOT."/config/ManagedSPCerts/openssl.cnf"), $this->radsec_cert_serial_no);
         openssl_x509_export($clientcert, $this->radsec_cert);
     } 
     /**
@@ -410,8 +410,8 @@ 
             $conditional1 = "AND activity_time > DATE_SUB(NOW(), INTERVAL $backlog SECOND )";
             $conditional2 = "DESC";
         }
-        $client = 'SP' . $this->identifier . '-' . $this->institution;
-        $stats = $this->databaseHandle->exec("SELECT activity_time, realm, mac, cui, result, ap_id, prot, outer_user FROM activity WHERE owner = ? $conditional1 ORDER BY activity_time $conditional2", "s", $client );
+        $client = 'SP'.$this->identifier.'-'.$this->institution;
+        $stats = $this->databaseHandle->exec("SELECT activity_time, realm, mac, cui, result, ap_id, prot, outer_user FROM activity WHERE owner = ? $conditional1 ORDER BY activity_time $conditional2", "s", $client);
        
         return mysqli_fetch_all($stats, \MYSQLI_ASSOC);
     }
@@ -529,11 +529,11 @@ 
        $dn['rdnSequence'][1][0]['value']['utf8String'] = 'eduroam Managed SP';
        $dn['rdnSequence'][2] = array();
        $dn['rdnSequence'][2][] = array('type' => 'id-at-commonName', 'value' => array());
-       $dn['rdnSequence'][2][0]['value']['utf8String'] = 'SP' . $this->identifier . "-" . $this->institution;
+       $dn['rdnSequence'][2][0]['value']['utf8String'] = 'SP'.$this->identifier."-".$this->institution;
        $csr->setDN($dn);
-       $pemcakey = file_get_contents(ROOT . "/config/ManagedSPCerts/eduroamSP-CA.key");
-       $cakey = \phpseclib3\Crypt\PublicKeyLoader::loadPrivateKey($pemcakey, \config\Master::MANAGEDSP['capass'] );
-       $pemca = file_get_contents(ROOT .  "/config/ManagedSPCerts/eduroamSP-CA.pem");
+       $pemcakey = file_get_contents(ROOT."/config/ManagedSPCerts/eduroamSP-CA.key");
+       $cakey = \phpseclib3\Crypt\PublicKeyLoader::loadPrivateKey($pemcakey, \config\Master::MANAGEDSP['capass']);
+       $pemca = file_get_contents(ROOT."/config/ManagedSPCerts/eduroamSP-CA.pem");
        $ca = new \phpseclib3\File\X509();
        $ca->loadX509($pemca);
        $ca->setPrivateKey($cakey);
@@ -542,7 +542,7 @@ 
        $csr->setExtension('id-ce-keyUsage', ['digitalSignature', 'nonRepudiation', 'keyEncipherment']);
        $csr->setExtension('id-ce-extKeyUsage', ['id-kp-clientAuth']);
        $csr->setExtension('id-ce-basicConstraints', ['cA' => false], false);
-       $x509->setEndDate('+' . \config\Master::MANAGEDSP['daystoexpiry'] . ' days');
+       $x509->setEndDate('+'.\config\Master::MANAGEDSP['daystoexpiry'].' days');
        $this->setTLSSerialNumber(999999999999999999);
        $x509->setSerialNumber($this->radsec_cert_serial_no, 10);
        $cert = $x509->loadX509($x509->saveX509($x509->sign($ca, $csr)));
@@ -584,7 +584,7 @@ 
     {
         $customAttrib = $this->getAttributes("managedsp:operatorname");
         if (count($customAttrib) == 0) {
-            return "1sp." . $this->identifier . "-" . $this->institution . \config\ConfAssistant::SILVERBULLET['realm_suffix'];
+            return "1sp.".$this->identifier."-".$this->institution.\config\ConfAssistant::SILVERBULLET['realm_suffix'];
         }
         return $customAttrib[0]["value"];
     }
@@ -599,14 +599,14 @@ 
     private function sendToRADIUS(int $idx, $post)
     {
         $hostname = "radius_hostname_$idx";
-        $ch = curl_init("http://" . $this->$hostname . ':' . \config\Master::MANAGEDSP['radiusconfigport']);
+        $ch = curl_init("http://".$this->$hostname.':'.\config\Master::MANAGEDSP['radiusconfigport']);
         if ($ch === FALSE) {
             $res = 'FAILURE';
         } else {
             curl_setopt($ch, CURLOPT_USERAGENT, "CAT-ManagedSP");
             curl_setopt($ch, CURLOPT_POST, 1);
             curl_setopt($ch, CURLOPT_POSTFIELDS, $post);
-            $this->loggerInstance->debug(1, "Posting to http://" . $this->$hostname . ':' . \config\Master::MANAGEDSP['radiusconfigport'] . "/$post\n");
+            $this->loggerInstance->debug(1, "Posting to http://".$this->$hostname.':'.\config\Master::MANAGEDSP['radiusconfigport']."/$post\n");
             curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
             curl_setopt($ch, CURLOPT_HEADER, 0);
             curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
@@ -647,19 +647,19 @@ 
         } else {
             $txt = $remove ? _('Profile deactivation failed') : _('Profile activation/modification failed');
         }
-        $txt = $txt . ' ';
+        $txt = $txt.' ';
         if (array_count_values($response)[$status] == 2) {
-            $txt = $txt . _('on both RADIUS servers: primary and backup') . '.';
+            $txt = $txt._('on both RADIUS servers: primary and backup').'.';
         } else {
             if ($response['res[1]'] == $status) {
-                $txt = $txt . _('on primary RADIUS server') . '.';
+                $txt = $txt._('on primary RADIUS server').'.';
             } else {
-                $txt = $txt . _('on backup RADIUS server') . '.';
+                $txt = $txt._('on backup RADIUS server').'.';
             }
         }
         $mail = \core\common\OutsideComm::mailHandle();
         $email = $this->getAttributes("support:email")[0]['value'];
-        $mail->FromName = \config\Master::APPEARANCE['productname'] . " Notification System";
+        $mail->FromName = \config\Master::APPEARANCE['productname']." Notification System";
         $mail->addAddress($email);
         if ($status == 'OK') {
             $mail->Subject = _('RADIUS profile update problem fixed');
@@ -693,7 +693,7 @@ 
             return NULL;
         }
         $timeout = 10;
-        curl_setopt($ch, CURLOPT_URL, 'http://' . $host);
+        curl_setopt($ch, CURLOPT_URL, 'http://'.$host);
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
         curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
         curl_exec($ch);
@@ -785,52 +785,52 @@ 
     {
         $toPost = ($onlyone ? array($onlyone => '') : array(1 => '', 2 => ''));
         if ($torevoke != '') {
-            $toPostTemplate = 'instid=' . $this->institution . '&deploymentid=' . $this->identifier .
+            $toPostTemplate = 'instid='.$this->institution.'&deploymentid='.$this->identifier.
                     "&torevoke=$torevoke";
             foreach (array_keys($toPost) as $key) {
                 $toPost[$key] = $toPostTemplate;
             }
         } else {
             $remove = ($this->status == \core\AbstractDeployment::INACTIVE) ? 0 : 1;
-            $toPostTemplate = 'instid=' . $this->institution . '&deploymentid=' . $this->identifier . 
-                '&secret=' . $this->secret .
-                '&country=' . $this->getAttributes("internal:country")[0]['value'] .
-                '&pskkey=' . $this->pskkey . '&';
+            $toPostTemplate = 'instid='.$this->institution.'&deploymentid='.$this->identifier. 
+                '&secret='.$this->secret.
+                '&country='.$this->getAttributes("internal:country")[0]['value'].
+                '&pskkey='.$this->pskkey.'&';
             if ($remove) {
-                $toPostTemplate = $toPostTemplate . 'remove=1&';
+                $toPostTemplate = $toPostTemplate.'remove=1&';
             } else {
-                $toPostTemplate = $toPostTemplate . 'operatorname=' . $this->getOperatorName() . '&'; 
+                $toPostTemplate = $toPostTemplate.'operatorname='.$this->getOperatorName().'&'; 
                 if ($this->getAttributes("managedsp:vlan")[0]['value'] ?? NULL) {
                     $allRealms = $this->getAllRealms();
                     if (!empty($allRealms)) {
-                        $toPostTemplate = $toPostTemplate . 'vlan=' . $this->getAttributes("managedsp:vlan")[0]['value'] . '&';
-                        $toPostTemplate = $toPostTemplate . 'realmforvlan[]=' . implode('&realmforvlan[]=', $allRealms) . '&';
+                        $toPostTemplate = $toPostTemplate.'vlan='.$this->getAttributes("managedsp:vlan")[0]['value'].'&';
+                        $toPostTemplate = $toPostTemplate.'realmforvlan[]='.implode('&realmforvlan[]=', $allRealms).'&';
                     }
                 }
                 if ($this->getAttributes("managedsp:guest_vlan")[0]['value'] ?? NULL) {
-                    $toPostTemplate = $toPostTemplate . 'guest_vlan=' . $this->getAttributes("managedsp:guest_vlan")[0]['value'] . '&';
+                    $toPostTemplate = $toPostTemplate.'guest_vlan='.$this->getAttributes("managedsp:guest_vlan")[0]['value'].'&';
                 }
             }
             foreach (array_keys($toPost) as $key) {
-                $elem = 'port' . $key;
-                $toPost[$key] = $toPostTemplate . 'port=' . $this->$elem;
+                $elem = 'port'.$key;
+                $toPost[$key] = $toPostTemplate.'port='.$this->$elem;
             }
         }
         $response = array();
         foreach ($toPost as $key => $value) {
-            $this->loggerInstance->debug(1, 'toPost ' . $toPost[$key] . "\n");
+            $this->loggerInstance->debug(1, 'toPost '.$toPost[$key]."\n");
             // temporarly one server $response['res[' . $key . ']'] = $this->sendToRADIUS($key, $toPost[$key]);
             //if ($key == 2) {
             //    $response['res[2]'] = 'OK'; 
             //} else {
-                $response['res[' . $key . ']'] = $this->sendToRADIUS($key, $toPost[$key]);
+                $response['res['.$key.']'] = $this->sendToRADIUS($key, $toPost[$key]);
             //}
         }
         if ($onlyone) {
-            $response['res[' . ($onlyone == 1) ? 2 : 1 . ']'] = \core\AbstractDeployment::RADIUS_OK;
+            $response['res['.($onlyone == 1) ? 2 : 1.']'] = \core\AbstractDeployment::RADIUS_OK;
         }
         foreach (array('OK', 'FAILURE') as $status) {
-            if ( ( ($status == 'OK' && $notify) || ($status == 'FAILURE') ) && ( in_array($status, $response) ) ) {
+            if ((($status == 'OK' && $notify) || ($status == 'FAILURE')) && (in_array($status, $response))) {
                 $this->sendMailtoAdmin($remove, $response, $status);
             }
         }
@@ -847,7 +847,7 @@ 
     {
         $toPost = ($onlyone ? array($onlyone => '') : array(1 => '', 2 => ''));
         if ($logs) {
-            $toPostTemplate = 'logid=DEBUG-' . $this->identifier . '-' .$this->institution . "&backlog=$logs";
+            $toPostTemplate = 'logid=DEBUG-'.$this->identifier.'-'.$this->institution."&backlog=$logs";
             foreach (array_keys($toPost) as $key) {
                 $toPost[$key] = $toPostTemplate;
             }
@@ -856,13 +856,13 @@ 
         $tempdir = \core\common\Entity::createTemporaryDirectory("test");
         $zipdir = $tempdir['dir'];
         foreach ($toPost as $key => $value) {
-            $this->loggerInstance->debug(1, 'toPost ' . $toPost[$key] . "\n");
-            $response['res[' . $key . ']'] = $this->sendToRADIUS($key, $toPost[$key]);
+            $this->loggerInstance->debug(1, 'toPost '.$toPost[$key]."\n");
+            $response['res['.$key.']'] = $this->sendToRADIUS($key, $toPost[$key]);
             $paths = [];
-            if (substr($response['res[' . $key . ']'], 0, 8) == 'ZIPDATA:') {
-                $data = substr($response['res[' . $key . ']'], 8);
+            if (substr($response['res['.$key.']'], 0, 8) == 'ZIPDATA:') {
+                $data = substr($response['res['.$key.']'], 8);
                 if (!file_exists("$zipdir/$key")) {
-                    mkdir("$zipdir/$key", 0755, true );
+                    mkdir("$zipdir/$key", 0755, true);
                 }
                 $fileHandle = fopen("$zipdir/$key/detail.zip", "wb");
                 fwrite($fileHandle, $data);
@@ -870,7 +870,7 @@ 
             }
         }
         $zipt = new \ZipArchive;
-        $zipt->open("$zipdir/detail-" . $this->identifier . '-' .$this->institution . '.zip', \ZipArchive::CREATE);
+        $zipt->open("$zipdir/detail-".$this->identifier.'-'.$this->institution.'.zip', \ZipArchive::CREATE);
         $cnt = 0;
         foreach ($toPost as $key => $value) {
             if (file_exists("$zipdir/$key/detail.zip")) {
@@ -882,7 +882,7 @@ 
                 $zipf->close();
                 unlink("$zipdir/$key/detail.zip");
                 $files = scandir("$zipdir/$key/");
-                foreach($files as $file) {
+                foreach ($files as $file) {
                   if ($file == '.' || $file == '..') continue;
                   $data = file_get_contents("$zipdir/$key/$file");
                   $zipt->addFromString("radius-$key/$file", $data);
@@ -898,14 +898,14 @@ 
             $zipt->addEmptyDir('.');
         }
         $zipt->close();
-        if (file_exists("$zipdir/detail-" . $this->identifier . '-' .$this->institution . '.zip')) {
-            $data = file_get_contents("$zipdir/detail-" . $this->identifier . '-' .$this->institution . '.zip');
-            unlink("$zipdir/detail-" . $this->identifier . '-' .$this->institution . '.zip'); 
+        if (file_exists("$zipdir/detail-".$this->identifier.'-'.$this->institution.'.zip')) {
+            $data = file_get_contents("$zipdir/detail-".$this->identifier.'-'.$this->institution.'.zip');
+            unlink("$zipdir/detail-".$this->identifier.'-'.$this->institution.'.zip'); 
             rmdir($zipdir);
         }     
         if ($data !== FALSE) {
             header('Content-Type: application/zip');
-            header("Content-Disposition: attachment; filename=\"detail-".$this->identifier . '-' .$this->institution.".zip\"");
+            header("Content-Disposition: attachment; filename=\"detail-".$this->identifier.'-'.$this->institution.".zip\"");
             header("Content-Transfer-Encoding: binary");
             echo $data;
         } 

Braces +3 added lines, -1 removed lines

@@ -883,7 +883,9 @@
                 unlink("$zipdir/$key/detail.zip");
                 $files = scandir("$zipdir/$key/");
                 foreach($files as $file) {
-                  if ($file == '.' || $file == '..') continue;
+                  if ($file == '.' || $file == '..') {
+                      continue;
+                  }
                   $data = file_get_contents("$zipdir/$key/$file");
                   $zipt->addFromString("radius-$key/$file", $data);
                   $cnt += 1;

docker/MSP/web/html/index.php

Indentation +30 added lines, -30 removed lines

@@ -7,23 +7,23 @@ 
 error_log(serialize($_REQUEST));
 # when a request contains logid and backlog ";s:11:"DEBUG-11-52";s:7:"backlog";s:1:"7";}
 if ( isset($_REQUEST['logid']) && isset($_REQUEST['backlog']) ) {
-	if (substr($_REQUEST['logid'], 0, 5) == 'DEBUG') {
-          $logid = substr($_REQUEST['logid'], 6);
+    if (substr($_REQUEST['logid'], 0, 5) == 'DEBUG') {
+            $logid = substr($_REQUEST['logid'], 6);
         }
-  	$res = cat_socket(implode(':', array($logid, $_REQUEST['backlog'])));
-	error_log('GOT '.$res);
-	if (substr($res, 0, strlen(ZIPDIR)) == ZIPDIR) {
+        $res = cat_socket(implode(':', array($logid, $_REQUEST['backlog'])));
+    error_log('GOT '.$res);
+    if (substr($res, 0, strlen(ZIPDIR)) == ZIPDIR) {
             error_log('GOT filename '.$res);
             $za = new ZipArchive();
             $za->open($res);
-	    header('Content-Type: application/zip');
+        header('Content-Type: application/zip');
             header("Content-Disposition: attachment; filename=\"detail_".$logid.".zip\"");
             header("Content-Transfer-Encoding: binary");
-	    echo 'ZIPDATA:'.file_get_contents($res);
-	    error_log('Sent data in response');
-	}
+        echo 'ZIPDATA:'.file_get_contents($res);
+        error_log('Sent data in response');
+    }
         error_log('with '.$za->numFiles . ' files');
-	exit;
+    exit;
 }
 # MUST provide: deployment_id, inst_id
 #               and port, secret, pskkey, country or torevoke
@@ -32,33 +32,33 @@ 
     isset($_REQUEST['instid']) && isset($_REQUEST['deploymentid']) &&
     (isset($_REQUEST['port']) && isset($_REQUEST['secret']) && isset($_REQUEST['pskkey']) && isset($_REQUEST['country']) ||
      isset($_REQUEST['torevoke']))) {
-  if (isset($_REQUEST['remove'])) {
+    if (isset($_REQUEST['remove'])) {
     $remove = 1;
-  } else {
+    } else {
     if (isset($_REQUEST['operatorname'])) {
-      $opn = trim($_REQUEST['operatorname']);
+        $opn = trim($_REQUEST['operatorname']);
     }
     if (isset($_REQUEST['vlan']) && isset($_REQUEST['realmforvlan']) &&
         is_array($_REQUEST['realmforvlan'])) {
-      $vlans = $_REQUEST['vlan'] . '#' . implode('#', $_REQUEST['realmforvlan']);
+        $vlans = $_REQUEST['vlan'] . '#' . implode('#', $_REQUEST['realmforvlan']);
     }
     if (isset($_REQUEST['guest_vlan'])) {
-      $guest_vlan = $_REQUEST['guest_vlan'];
+        $guest_vlan = $_REQUEST['guest_vlan'];
+    }
+    }
+    if (isset($_REQUEST['torevoke'])) {
+        $el = explode('#', $_REQUEST['torevoke']);
+        $res = cat_socket(implode(':', array($_REQUEST['instid'], $_REQUEST['deploymentid'], $el[0], $el[1])));
+    } else {
+        # arguments 5-7 are Base64 encoded
+        $res = cat_socket(implode(':', array($_REQUEST['country'],
+                                    $_REQUEST['instid'], $_REQUEST['deploymentid'],
+                                    $_REQUEST['port'],
+                                    base64_encode($_REQUEST['secret']),
+                                    base64_encode($opn), 
+                                    base64_encode($vlans), base64_encode($_REQUEST['pskkey']), $guest_vlan, $remove)));
     }
-  }
-  if (isset($_REQUEST['torevoke'])) {
-	  $el = explode('#', $_REQUEST['torevoke']);
-	  $res = cat_socket(implode(':', array($_REQUEST['instid'], $_REQUEST['deploymentid'], $el[0], $el[1])));
-  } else {
-  	# arguments 5-7 are Base64 encoded
-  	$res = cat_socket(implode(':', array($_REQUEST['country'],
-                                 $_REQUEST['instid'], $_REQUEST['deploymentid'],
-                                 $_REQUEST['port'],
-                                 base64_encode($_REQUEST['secret']),
-                                 base64_encode($opn), 
-                                 base64_encode($vlans), base64_encode($_REQUEST['pskkey']), $guest_vlan, $remove)));
-  }
-  echo $res;
+    echo $res;
 } else {
-  echo "FAILURE";
+    echo "FAILURE";
 }

Spacing +3 added lines, -3 removed lines

@@ -6,7 +6,7 @@ 
 $guest_vlan = 0;
 error_log(serialize($_REQUEST));
 # when a request contains logid and backlog ";s:11:"DEBUG-11-52";s:7:"backlog";s:1:"7";}
-if ( isset($_REQUEST['logid']) && isset($_REQUEST['backlog']) ) {
+if (isset($_REQUEST['logid']) && isset($_REQUEST['backlog'])) {
 	if (substr($_REQUEST['logid'], 0, 5) == 'DEBUG') {
           $logid = substr($_REQUEST['logid'], 6);
         }
@@ -22,7 +22,7 @@ 
 	    echo 'ZIPDATA:'.file_get_contents($res);
 	    error_log('Sent data in response');
 	}
-        error_log('with '.$za->numFiles . ' files');
+        error_log('with '.$za->numFiles.' files');
 	exit;
 }
 # MUST provide: deployment_id, inst_id
@@ -40,7 +40,7 @@ 
     }
     if (isset($_REQUEST['vlan']) && isset($_REQUEST['realmforvlan']) &&
         is_array($_REQUEST['realmforvlan'])) {
-      $vlans = $_REQUEST['vlan'] . '#' . implode('#', $_REQUEST['realmforvlan']);
+      $vlans = $_REQUEST['vlan'].'#'.implode('#', $_REQUEST['realmforvlan']);
     }
     if (isset($_REQUEST['guest_vlan'])) {
       $guest_vlan = $_REQUEST['guest_vlan'];

web/admin/overview_radsec_readiness.php

Spacing +19 added lines, -19 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();
@@ -92,11 +92,11 @@ 
         ?>
         
     <select name="INST-list" id="INST-list">
-        <option value=""><?php echo _('---PLEASE CHOOSE---');?></option>
+        <option value=""><?php echo _('---PLEASE CHOOSE---'); ?></option>
         <?php 
         $instdata = array();
         foreach ($extInsts as $iid => $oneInst) {
-            print '<option value="' . $iid . '">' . $oneInst['name'] . '</option>';
+            print '<option value="'.$iid.'">'.$oneInst['name'].'</option>';
             $instdata[$iid] = array();
             $instdata[$iid]['name'] = $oneInst['name'];   
             $instdata[$iid]['type'] = _('no data');
@@ -110,22 +110,22 @@ 
             $contactdata = '';
             foreach ($oneInst['contacts'] as $oneContact) {
                 if ($contactdata != '') {
-                    $contactdata = $contactdata . '<br>';
+                    $contactdata = $contactdata.'<br>';
                 }
                 if ($oneContact['name']) {
-                    $contactdata = $contactdata . $oneContact['name'];
+                    $contactdata = $contactdata.$oneContact['name'];
                 }
                 if ($contactdata != '') {
-                    $contactdata = $contactdata . '<br>';
+                    $contactdata = $contactdata.'<br>';
                 }
                 if ($oneContact['mail']) {
-                    $contactdata = $contactdata . $oneContact['mail'];
+                    $contactdata = $contactdata.$oneContact['mail'];
                 }
                 if ($contactdata != '') {
-                    $contactdata = $contactdata . '<br>';
+                    $contactdata = $contactdata.'<br>';
                 }
                 if ($oneContact['phone']) {
-                    $contactdata = $contactdata . $oneContact['phone'];
+                    $contactdata = $contactdata.$oneContact['phone'];
                 }        
             }
             if ($contactdata == '') {
@@ -144,11 +144,11 @@ 
             var instts = [];
             <?php
             foreach (array_keys($instdata) as $iid) {
-                echo "instservers['" . $iid . "']='" . $instdata[$iid]['servers']. "';\n";
-                echo "instname['" . $iid . "']='" . $instdata[$iid]['name']. "';\n";
-                echo "insttype['" . $iid . "']='" . $instdata[$iid]['type']. "';\n";
-                echo "instcontact['" . $iid . "']='" . $instdata[$iid]['contacts']. "';\n";
-                echo "instts['" . $iid . "']='" . $instdata[$iid]['ts']. "';\n";
+                echo "instservers['".$iid."']='".$instdata[$iid]['servers']."';\n";
+                echo "instname['".$iid."']='".$instdata[$iid]['name']."';\n";
+                echo "insttype['".$iid."']='".$instdata[$iid]['type']."';\n";
+                echo "instcontact['".$iid."']='".$instdata[$iid]['contacts']."';\n";
+                echo "instts['".$iid."']='".$instdata[$iid]['ts']."';\n";
             }
             ?>
             $(document).ready(function(){
@@ -170,18 +170,18 @@ 
     <div id="instdata_area">
         <table>
             <tr><th align="left" width="350">
-                    <?php echo _('Name');?>
+                    <?php echo _('Name'); ?>
                 </th><th align="left" width="100">
-                    <?php echo _('Type');?>
+                    <?php echo _('Type'); ?>
                 </th>
                 <th align="left" width="200">
-                    <?php echo _('Servers');?>
+                    <?php echo _('Servers'); ?>
                 </th>
                 <th align="left" width="200">
-                    <?php echo _('Contact data');?>
+                    <?php echo _('Contact data'); ?>
                 </th>
                 <th align="left" width="100">
-                    <?php echo _('Timestamp');?>
+                    <?php echo _('Timestamp'); ?>
                 </th>
             </tr>
             <tr id="toshow"></tr>