GEANT / CAT

core/DeploymentManaged.php

Spacing +25 added lines, -25 removed lines

@@ -250,7 +250,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") {
@@ -281,28 +281,28 @@ 
             $ourLocation = ['lon' => $geoip['geo']['lon'], 'lat' => $geoip['geo']['lat']];
         }
         $inst = new IdP($this->institution);
-        $ourserver = $this->findGoodServerLocation($ourLocation, $inst->federation , []);
+        $ourserver = $this->findGoodServerLocation($ourLocation, $inst->federation, []);
         // now, find an unused port in the preferred server
         $foundFreePort1 = 0;
         while ($foundFreePort1 == 0) {
             $portCandidate = random_int(1200, 65535);
-            $check = $this->databaseHandle->exec("SELECT port_instance_1 FROM deployment WHERE radius_instance_1 = '" . $ourserver . "' AND port_instance_1 = $portCandidate");
+            $check = $this->databaseHandle->exec("SELECT port_instance_1 FROM deployment WHERE radius_instance_1 = '".$ourserver."' AND port_instance_1 = $portCandidate");
             if (mysqli_num_rows(/** @scrutinizer ignore-type */ $check) == 0) {
                 $foundFreePort1 = $portCandidate;
             }
         }
-        $ourSecondServer = $this->findGoodServerLocation($ourLocation, $inst->federation , [$ourserver]);
+        $ourSecondServer = $this->findGoodServerLocation($ourLocation, $inst->federation, [$ourserver]);
         $foundFreePort2 = 0;
         while ($foundFreePort2 == 0) {
             $portCandidate = random_int(1200, 65535);
-            $check = $this->databaseHandle->exec("SELECT port_instance_2 FROM deployment WHERE radius_instance_2 = '" . $ourSecondServer . "' AND port_instance_2 = $portCandidate");
+            $check = $this->databaseHandle->exec("SELECT port_instance_2 FROM deployment WHERE radius_instance_2 = '".$ourSecondServer."' AND port_instance_2 = $portCandidate");
             if (mysqli_num_rows(/** @scrutinizer ignore-type */ $check) == 0) {
                 $foundFreePort2 = $portCandidate;
             }
         }
         // and make up a shared secret that is halfways readable
         $futureSecret = $this->randomString(16, "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ");
-        $this->databaseHandle->exec("UPDATE deployment SET radius_instance_1 = '" . $ourserver . "', radius_instance_2 = '" . $ourSecondServer . "', port_instance_1 = $foundFreePort1, port_instance_2 = $foundFreePort2, secret = '$futureSecret' WHERE deployment_id = $this->identifier");
+        $this->databaseHandle->exec("UPDATE deployment SET radius_instance_1 = '".$ourserver."', radius_instance_2 = '".$ourSecondServer."', port_instance_1 = $foundFreePort1, port_instance_2 = $foundFreePort2, secret = '$futureSecret' WHERE deployment_id = $this->identifier");
         return ["port_instance_1" => $foundFreePort1, "port_instance_2" => $foundFreePort2, "secret" => $futureSecret, "radius_instance_1" => $ourserver, "radius_instance_2" => $ourserver];
     }
 
@@ -345,7 +345,7 @@ 
      * @return void
      */
     public function deactivate() {
-        $this->databaseHandle->exec("UPDATE deployment SET status = " . DeploymentManaged::INACTIVE . " WHERE deployment_id = $this->identifier");
+        $this->databaseHandle->exec("UPDATE deployment SET status = ".DeploymentManaged::INACTIVE." WHERE deployment_id = $this->identifier");
     }
 
     /**
@@ -355,7 +355,7 @@ 
      * @return void
      */
     public function activate() {
-        $this->databaseHandle->exec("UPDATE deployment SET status = " . DeploymentManaged::ACTIVE . " WHERE deployment_id = $this->identifier");
+        $this->databaseHandle->exec("UPDATE deployment SET status = ".DeploymentManaged::ACTIVE." WHERE deployment_id = $this->identifier");
     }
 
     /**
@@ -379,12 +379,12 @@ 
      */
     public function setRADIUSconfig($remove = 0) {
         $toPost = array(1 => '', 2 => '');
-        $toPost[1] = 'instid=' . $this->institution . '&deploymentid=' . $this->identifier . '&secret=' . $this->secret . '&country=' . $this->getAttributes("internal:country")[0]['value'] . '&';
+        $toPost[1] = 'instid='.$this->institution.'&deploymentid='.$this->identifier.'&secret='.$this->secret.'&country='.$this->getAttributes("internal:country")[0]['value'].'&';
         if ($remove) {
-            $toPost[1] = $toPost[1] . 'remove=1&';
+            $toPost[1] = $toPost[1].'remove=1&';
         } else {
             if ($this->getAttributes("managedsp:operatorname")[0]['value'] ?? NULL) {
-                $toPost[1] = $toPost[1] . 'operatorname=' . $this->getAttributes("managedsp:operatorname")[0]['value'] . '&';
+                $toPost[1] = $toPost[1].'operatorname='.$this->getAttributes("managedsp:operatorname")[0]['value'].'&';
             }
             if ($this->getAttributes("managedsp:vlan")[0]['value'] ?? NULL) {
                 $idp = new IdP($this->institution);
@@ -402,26 +402,26 @@ 
                 }
                 if (!empty($allRealms)) {
                     $this->loggerInstance->debug(1, $allRealms);
-                    $toPost[1] = $toPost[1] . 'vlan=' . $this->getAttributes("managedsp:vlan")[0]['value'] . '&';
-                    $toPost[1] = $toPost[1] . 'realmforvlan[]=' . implode('&realmforvlan[]=', $allRealms) . '&';
+                    $toPost[1] = $toPost[1].'vlan='.$this->getAttributes("managedsp:vlan")[0]['value'].'&';
+                    $toPost[1] = $toPost[1].'realmforvlan[]='.implode('&realmforvlan[]=', $allRealms).'&';
                 }
             }
         }
         $toPost[2] = $toPost[1];
-        $toPost[1] = $toPost[1] . 'port=' . $this->port1;
-        $toPost[2] = $toPost[2] . 'port=' . $this->port2;
+        $toPost[1] = $toPost[1].'port='.$this->port1;
+        $toPost[2] = $toPost[2].'port='.$this->port2;
         $response = array();
-        for ($idx=1; $idx<=2; $idx++) {
+        for ($idx = 1; $idx <= 2; $idx++) {
             $hostname = "radius_hostname_$idx";
-            $ch = curl_init( "http://" . $this->$hostname );
+            $ch = curl_init("http://".$this->$hostname);
             if ($ch) {
-                curl_setopt( $ch, CURLOPT_POST, 1);
-                curl_setopt( $ch, CURLOPT_POSTFIELDS, $toPost[$idx]);
-                $this->loggerInstance->debug(1, "Posting to http://" . $this->$hostname . ": $toPost[$idx]\n");
-                curl_setopt( $ch, CURLOPT_FOLLOWLOCATION, 1);
-                curl_setopt( $ch, CURLOPT_HEADER, 0);
-                curl_setopt( $ch, CURLOPT_RETURNTRANSFER, 1);
-                $response[$idx] = curl_exec( $ch );
+                curl_setopt($ch, CURLOPT_POST, 1);
+                curl_setopt($ch, CURLOPT_POSTFIELDS, $toPost[$idx]);
+                $this->loggerInstance->debug(1, "Posting to http://".$this->$hostname.": $toPost[$idx]\n");
+                curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
+                curl_setopt($ch, CURLOPT_HEADER, 0);
+                curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+                $response[$idx] = curl_exec($ch);
                 if ($response[$idx] === FALSE) {
                     $response[$idx] = 'FAILURE';
                 }
@@ -429,7 +429,7 @@ 
             } else {
                 $response[$idx] = 'FAILURE';
             }
-            $this->databaseHandle->exec("UPDATE deployment SET radius_status_$idx = " . ($response[$idx] == 'OK'? \core\AbstractDeployment::RADIUS_OK : \core\AbstractDeployment::RADIUS_FAILURE) . " WHERE deployment_id = $this->identifier");
+            $this->databaseHandle->exec("UPDATE deployment SET radius_status_$idx = ".($response[$idx] == 'OK' ? \core\AbstractDeployment::RADIUS_OK : \core\AbstractDeployment::RADIUS_FAILURE)." WHERE deployment_id = $this->identifier");
         }
         return $response;
     }

web/admin/edit_hotspot.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";
 
 $deco = new \web\lib\admin\PageDecoration();
 $validator = new \web\lib\common\InputValidation();
@@ -36,7 +36,7 @@ 
 
 if (!isset($_GET['deployment_id'])) {
     $my_inst->newDeployment(\core\AbstractDeployment::DEPLOYMENTTYPE_MANAGED);
-    header("Location: overview_sp.php?inst_id=" . $my_inst->identifier);
+    header("Location: overview_sp.php?inst_id=".$my_inst->identifier);
     exit(0);
 }
 
@@ -52,9 +52,9 @@ 
         }
         $addParam = '';
         foreach ($response as $idx=>$val) {
-            $addParam = $addParam . "&res[$idx]=$val";
+            $addParam = $addParam."&res[$idx]=$val";
         }
-        header("Location: overview_sp.php?inst_id=" . $my_inst->identifier . $addParam);
+        header("Location: overview_sp.php?inst_id=".$my_inst->identifier.$addParam);
         exit(0);
     }
 
@@ -63,7 +63,7 @@ 
         if ($res == 'OK') {
             $deployment->activate();
         }
-        header("Location: overview_sp.php?inst_id=" . $my_inst->identifier . "&res=$res");
+        header("Location: overview_sp.php?inst_id=".$my_inst->identifier."&res=$res");
         exit(0);
     }
     
@@ -85,7 +85,7 @@ 
             $res = $deployment->setRADIUSconfig();
             $addParam = "&res=$res";
         }
-        header("Location: overview_sp.php?inst_id=" . $my_inst->identifier . $addParam);
+        header("Location: overview_sp.php?inst_id=".$my_inst->identifier.$addParam);
         exit(0);
     }
 }
@@ -113,12 +113,12 @@ 
     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, "Profile");
     ?>
     <?php
     echo "<fieldset class='option_container' id='managedsp_override'>
-    <legend><strong>" . _("Options for this deployment") . "</strong></legend>";
+    <legend><strong>" . _("Options for this deployment")."</strong></legend>";
     ?>
     <table>
         <tr>
@@ -136,7 +136,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>
@@ -151,10 +151,10 @@ 
     </table>
     <?php
     echo $optionDisplay->prefilledOptionTable("managedsp");
-    echo "<button type='button' class='newoption' onclick='getXML(\"managedsp\")'>" . _("Add new option") . "</button>";
+    echo "<button type='button' class='newoption' onclick='getXML(\"managedsp\")'>"._("Add new option")."</button>";
     echo "</fieldset>";
 
 
-    echo "<p><button type='submit' name='submitbutton' value='" . web\lib\common\FormElements::BUTTON_SAVE . "'>" . _("Save data") . "</button><button type='button' class='delete' name='abortbutton' value='abort' onclick='javascript:window.location = \"overview_sp.php?inst_id=$my_inst->identifier\"'>" . _("Discard changes") . "</button></p></form>";
+    echo "<p><button type='submit' name='submitbutton' value='".web\lib\common\FormElements::BUTTON_SAVE."'>"._("Save data")."</button><button type='button' class='delete' name='abortbutton' value='abort' onclick='javascript:window.location = \"overview_sp.php?inst_id=$my_inst->identifier\"'>"._("Discard changes")."</button></p></form>";
     echo $deco->footer();
     

web/admin/overview_sp.php

Spacing +21 added lines, -21 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";
 
 $deco = new \web\lib\admin\PageDecoration();
 $validator = new \web\lib\common\InputValidation();
@@ -38,7 +38,7 @@ 
 } else {
     $link = 'http://';
 }
-$link .= $_SERVER['SERVER_NAME'] . $_SERVER['SCRIPT_NAME'];
+$link .= $_SERVER['SERVER_NAME'].$_SERVER['SCRIPT_NAME'];
 $link = htmlspecialchars($link);
 
 echo $deco->defaultPagePrelude(sprintf(_("%s: %s Dashboard"), \config\Master::APPEARANCE['productname'], $uiElements->nomenclatureHotspot));
@@ -93,21 +93,21 @@ 
         <?php
         if (\config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] !== NULL) {
             echo "<tr>
-                        <td>" . _("Check another realm's reachability") . "</td>
+                        <td>" . _("Check another realm's reachability")."</td>
                         <td><form method='post' action='../diag/action_realmcheck.php?inst_id=$my_inst->identifier' accept-charset='UTF-8'>
                               <input type='text' name='realm' id='realm'>
                               <input type='hidden' name='comefrom' id='comefrom' value='$link'/>
-                              <button type='submit'>" . _("Go!") . "</button>
+                              <button type='submit'>"._("Go!")."</button>
                             </form>
                         </td>
                     </tr>";
         }
         if (\config\ConfAssistant::CONSORTIUM['name'] == "eduroam") { // SW: APPROVED
             echo "<tr>
-                        <td>" . sprintf(_("Check %s server status"), $uiElements->nomenclatureFed) . "</td>
+                        <td>" . sprintf(_("Check %s server status"), $uiElements->nomenclatureFed)."</td>
                         <td>
                            <form action='https://monitor.eduroam.org/mon_direct.php' accept-charset='UTF-8'>
-                              <button type='submit'>" . _("Go!") . "</button>
+                              <button type='submit'>" . _("Go!")."</button>
                            </form>
                         </td>
                     </tr>";
@@ -118,10 +118,10 @@ 
     <?php
     $hotspotProfiles = $my_inst->listDeployments();
     if (count($hotspotProfiles) == 0) { // no profiles yet.
-        echo "<h2>" . sprintf(_("There are not yet any known deployments for your %s."), $uiElements->nomenclatureHotspot) . "</h2>";
+        echo "<h2>".sprintf(_("There are not yet any known deployments for your %s."), $uiElements->nomenclatureHotspot)."</h2>";
     }
     if (count($hotspotProfiles) > 0) { // no profiles yet.
-        echo "<h2>" . sprintf(_("Deployments for this %s"), $uiElements->nomenclatureHotspot) . "</h2>";
+        echo "<h2>".sprintf(_("Deployments for this %s"), $uiElements->nomenclatureHotspot)."</h2>";
         // display an info box with the connection data
     }
 
@@ -129,19 +129,19 @@ 
         ?>
         <div style='display: table-row; margin-bottom: 20px;'>
             <div class='profilebox' style='display: table-cell;'>
-                <h2><?php echo core\DeploymentManaged::PRODUCTNAME . " (<span style='color:" . ( $deploymentObject->status == \core\AbstractDeployment::INACTIVE ? "red;'>" . _("inactive") : "green;'>" . _("active") ) . "</span>)"; ?></h2>
+                <h2><?php echo core\DeploymentManaged::PRODUCTNAME." (<span style='color:".($deploymentObject->status == \core\AbstractDeployment::INACTIVE ? "red;'>"._("inactive") : "green;'>"._("active"))."</span>)"; ?></h2>
                 <table>
                     <tr>
                         <td><strong><?php echo _("Your primary RADIUS server") ?></strong><br/>
                         <?php
                             if ($deploymentObject->host1_v4 !== NULL) {
-                                echo _("IPv4") . ": " . $deploymentObject->host1_v4;
+                                echo _("IPv4").": ".$deploymentObject->host1_v4;
                             }
                             if ($deploymentObject->host1_v4 !== NULL && $deploymentObject->host1_v6 !== NULL) {
                                 echo "<br/>";
                             }
                             if ($deploymentObject->host1_v6 !== NULL) {
-                                echo _("IPv6") . ": " . $deploymentObject->host1_v6;
+                                echo _("IPv6").": ".$deploymentObject->host1_v6;
                             }
                             ?>
                         </td>
@@ -149,7 +149,7 @@ 
                         <td><?php echo $deploymentObject->port1; ?></td>
                         <td>
                             <?php
-                                echo "<img src='" . $radiusMessages[$deploymentObject->radius_status_1]['icon'] . "' alt='" . $radiusMessages[$deploymentObject->radius_status_1]['text'] . "' title='" . $radiusMessages[$deploymentObject->radius_status_1]['text'] . "'>";
+                                echo "<img src='".$radiusMessages[$deploymentObject->radius_status_1]['icon']."' alt='".$radiusMessages[$deploymentObject->radius_status_1]['text']."' title='".$radiusMessages[$deploymentObject->radius_status_1]['text']."'>";
                             ?>
                         </td>
                     </tr>
@@ -157,20 +157,20 @@ 
                         <td><strong><?php echo _("Your backup RADIUS server") ?><br/></strong>
                             <?php
                             if ($deploymentObject->host2_v4 !== NULL) {
-                                echo _("IPv4") . ": " . $deploymentObject->host2_v4;
+                                echo _("IPv4").": ".$deploymentObject->host2_v4;
                             }
                             if ($deploymentObject->host2_v4 !== NULL && $deploymentObject->host2_v6 !== NULL) {
                                 echo "<br/>";
                             }
                             if ($deploymentObject->host2_v6 !== NULL) {
-                                echo _("IPv6") . ": " . $deploymentObject->host2_v6;
+                                echo _("IPv6").": ".$deploymentObject->host2_v6;
                             }
                             ?></td>
                         <td><?php echo _("RADIUS port number: ") ?></td>
                         <td><?php echo $deploymentObject->port2; ?></td>
                         <td>
                             <?php
-                                echo "<img src='" . $radiusMessages[$deploymentObject->radius_status_2]['icon'] . "' alt='" . $radiusMessages[$deploymentObject->radius_status_2]['text'] . "' title='" . $radiusMessages[$deploymentObject->radius_status_1]['text'] . "'>";
+                                echo "<img src='".$radiusMessages[$deploymentObject->radius_status_2]['icon']."' alt='".$radiusMessages[$deploymentObject->radius_status_2]['text']."' title='".$radiusMessages[$deploymentObject->radius_status_1]['text']."'>";
                             ?>
                         </td>
                     </tr>
@@ -221,12 +221,12 @@ 
                                     if ($res['FAILURE'] > 0) {
                                         echo '<br>';
                                         if ($res['FAILURE'] == 2) {
-                                            echo ' <span style="color: red;">' . _("Activation failure, your request is queued for handling.") . '</span>';
+                                            echo ' <span style="color: red;">'._("Activation failure, your request is queued for handling.").'</span>';
                                         } else {
                                             if (isset($_GET['res'][1]) && $_GET['res']['1'] == 'FAILURE') {
-                                                echo ' <span style="color: red;">' . _("Activation failure for your primary RADIUS server, your request is queued.") . '</span>';
+                                                echo ' <span style="color: red;">'._("Activation failure for your primary RADIUS server, your request is queued.").'</span>';
                                             } else {
-                                                echo ' <span style="color: red;">' . _("Activation failure for your backup RADIUS server, your request is queued.") . '</span>';
+                                                echo ' <span style="color: red;">'._("Activation failure for your backup RADIUS server, your request is queued.").'</span>';
                                             }
                                         }
                                     }
@@ -246,12 +246,12 @@ 
                                     if ($res['FAILURE'] > 0) {
                                         echo '<br>';
                                         if ($res['FAILURE'] == 2) {
-                                            echo ' <span style="color: red;">' . _("Failure during deactivation, your request is queued for handling") . '</span>';
+                                            echo ' <span style="color: red;">'._("Failure during deactivation, your request is queued for handling").'</span>';
                                         } else {
                                             if (isset($_GET['res'][1]) && $_GET['res']['1'] == 'FAILURE') {
-                                                echo ' <span style="color: red;">' . _("Deactivation failure for your primary RADIUS server, your request is queued.") . '</span>';
+                                                echo ' <span style="color: red;">'._("Deactivation failure for your primary RADIUS server, your request is queued.").'</span>';
                                             } else {
-                                                echo ' <span style="color: red;">' . _("Deactivation failure for your backup RADIUS server, your request is queued.") . '</span>';
+                                                echo ' <span style="color: red;">'._("Deactivation failure for your backup RADIUS server, your request is queued.").'</span>';
                                             }
                                         }
                                     }