GEANT / CAT

utils/SP_consistency_check.php

Indentation +4 added lines, -4 removed lines

@@ -1,10 +1,10 @@
 <?php
 require_once dirname(dirname(__FILE__)) . "/config/_config.php";
 /**
-    * check if URL responds with 200
-    *
-    * @param string server name
-    * @return integer or NULL
+ * check if URL responds with 200
+ *
+ * @param string server name
+ * @return integer or NULL
 */
 function checkURL ($srv) {
     $ch = curl_init();

Spacing +9 added lines, -9 removed lines

@@ -1,22 +1,22 @@ 
 <?php
-require_once dirname(dirname(__FILE__)) . "/config/_config.php";
+require_once dirname(dirname(__FILE__))."/config/_config.php";
 /**
     * check if URL responds with 200
     *
     * @param string server name
     * @return integer or NULL
 */
-function checkURL ($srv) {
+function checkURL($srv) {
     $ch = curl_init();
     if ($ch === FALSE) {
         return NULL;
     }
     $timeout = 10;
-    curl_setopt ( $ch, CURLOPT_URL, $srv );
-    curl_setopt ( $ch, CURLOPT_RETURNTRANSFER, 1 );
-    curl_setopt ( $ch, CURLOPT_TIMEOUT, $timeout );
+    curl_setopt($ch, CURLOPT_URL, $srv);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+    curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
     curl_exec($ch);
-    $http_code = curl_getinfo( $ch, CURLINFO_HTTP_CODE );
+    $http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
     if ($http_code == 200) {
         return 1;
     }
@@ -49,8 +49,8 @@ 
 }
 $siteStatus = array();
 foreach (array_keys($brokenDeployments) as $server_id) {
-    print "check $server_id " . $radiusSite[$server_id] . "\n";
-    $siteStatus[$server_id]  = checkUrl('http://' . $radiusSite[$server_id]);
+    print "check $server_id ".$radiusSite[$server_id]."\n";
+    $siteStatus[$server_id] = checkUrl('http://'.$radiusSite[$server_id]);
     if ($siteStatus[$server_id]) {
         echo "\ncheck radius\n";
         echo \config\Diagnostics::RADIUSSPTEST['port']."\n";
@@ -76,7 +76,7 @@ 
                 $idx = 2;
             }
             echo "\nfix $deployment_id of $inst_id on server $server_id index $idx\n";
-            $response = $deployment->setRADIUSconfig(($deployment->status == \core\AbstractDeployment::INACTIVE)? 1 : 0, $idx, 1);
+            $response = $deployment->setRADIUSconfig(($deployment->status == \core\AbstractDeployment::INACTIVE) ? 1 : 0, $idx, 1);
             if (isset($response["res[$idx]"]) && $response["res[$idx]"] = 'OK') {
                 echo "FIXED\n";
                 print_r($response);

core/DeploymentManaged.php

Spacing +39 added lines, -39 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");
     }
 
     /**
@@ -381,17 +381,17 @@ 
     private function sendToRADIUS($idx, $post) {
             
         $hostname = "radius_hostname_$idx";
-        $ch = curl_init( "http://" . $this->$hostname );
+        $ch = curl_init("http://".$this->$hostname);
         if ($ch === FALSE) {
             $res = 'FAILURE';
         } else {
-            curl_setopt( $ch, CURLOPT_POST, 1);
-            curl_setopt( $ch, CURLOPT_POSTFIELDS, $post);
-            $this->loggerInstance->debug(1, "Posting to http://" . $this->$hostname . ": $post\n");
-            curl_setopt( $ch, CURLOPT_FOLLOWLOCATION, 1);
-            curl_setopt( $ch, CURLOPT_HEADER, 0);
-            curl_setopt( $ch, CURLOPT_RETURNTRANSFER, 1);
-            $exec = curl_exec( $ch );
+            curl_setopt($ch, CURLOPT_POST, 1);
+            curl_setopt($ch, CURLOPT_POSTFIELDS, $post);
+            $this->loggerInstance->debug(1, "Posting to http://".$this->$hostname.": $post\n");
+            curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
+            curl_setopt($ch, CURLOPT_HEADER, 0);
+            curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+            $exec = curl_exec($ch);
             if ($exec === FALSE) {
                 $this->loggerInstance->debug(1, "curl_exec failure");
                 $res = 'FAILURE';
@@ -402,7 +402,7 @@ 
             $this->loggerInstance->debug(1, $this);           
         }
         $this->loggerInstance->debug(1, "Database update");
-        $this->databaseHandle->exec("UPDATE deployment SET radius_status_$idx = " . ($res == 'OK'? \core\AbstractDeployment::RADIUS_OK : \core\AbstractDeployment::RADIUS_FAILURE) . " WHERE deployment_id = $this->identifier");
+        $this->databaseHandle->exec("UPDATE deployment SET radius_status_$idx = ".($res == 'OK' ? \core\AbstractDeployment::RADIUS_OK : \core\AbstractDeployment::RADIUS_FAILURE)." WHERE deployment_id = $this->identifier");
         return $res;
     }
     /**
@@ -417,23 +417,23 @@ 
     private function sendMailtoAdmin($remove, $response, $status) {
         $txt = '';
         if ($status == 'OK') {
-            $txt = $remove? _('Profile dectivation succeeded') : _('Profile activation/modification succeeded');
+            $txt = $remove ? _('Profile dectivation succeeded') : _('Profile activation/modification succeeded');
         } else {
-            $txt = $remove? _('Profile dectivation failed') : _('Profile activation/modification failed');
+            $txt = $remove ? _('Profile dectivation 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');
@@ -442,7 +442,7 @@ 
         }
         $mail->Body = $txt;
         $sent = $mail->send();
-        if ( $sent === FALSE)
+        if ($sent === FALSE)
         $this->loggerInstance->debug(1, 'Mailing on RADIUS problem failed');
     }
     /**
@@ -451,7 +451,7 @@ 
      * @param integer $idx server index 1 (primary) or 2 (backup)
      * @return integer or NULL
      */
-    private function checkURL ($idx) {
+    private function checkURL($idx) {
         $ch = curl_init();
         if ($ch === FALSE) {
             return NULL;
@@ -464,11 +464,11 @@ 
             return NULL;
         }
         $timeout = 10;
-        curl_setopt ( $ch, CURLOPT_URL, 'http://'.$host );
-        curl_setopt ( $ch, CURLOPT_RETURNTRANSFER, 1 );
-        curl_setopt ( $ch, CURLOPT_TIMEOUT, $timeout );
+        curl_setopt($ch, CURLOPT_URL, 'http://'.$host);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+        curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
         curl_exec($ch);
-        $http_code = curl_getinfo( $ch, CURLINFO_HTTP_CODE );
+        $http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
         if ($http_code == 200) {
             return 1;
         }
@@ -547,32 +547,32 @@ 
      */
     public function setRADIUSconfig($remove = 0, $onlyone = 0, $notify = 0) {
         $toPost = ($onlyone ? array($onlyone => '') : array(1 => '', 2 => ''));
-        $toPostTemplate = 'instid=' . $this->institution . '&deploymentid=' . $this->identifier . '&secret=' . $this->secret . '&country=' . $this->getAttributes("internal:country")[0]['value'] . '&';
+        $toPostTemplate = 'instid='.$this->institution.'&deploymentid='.$this->identifier.'&secret='.$this->secret.'&country='.$this->getAttributes("internal:country")[0]['value'].'&';
         if ($remove) {
-            $toPostTemplate = $toPostTemplate . 'remove=1&';
+            $toPostTemplate = $toPostTemplate.'remove=1&';
         } else {
             if ($this->getAttributes("managedsp:operatorname")[0]['value'] ?? NULL) {
-                $toPostTemplate = $toPostTemplate . 'operatorname=' . $this->getAttributes("managedsp:operatorname")[0]['value'] . '&';
+                $toPostTemplate = $toPostTemplate.'operatorname='.$this->getAttributes("managedsp:operatorname")[0]['value'].'&';
             }
             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).'&';
                 }
             }
         }
         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");
             $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;
         }
         if (in_array('FAILURE', $response)) {
             $this->sendMailtoAdmin($remove, $response, 'FAILURE');

Braces +3 added lines, -2 removed lines

@@ -442,8 +442,9 @@
         }
         $mail->Body = $txt;
         $sent = $mail->send();
-        if ( $sent === FALSE)
-        $this->loggerInstance->debug(1, 'Mailing on RADIUS problem failed');
+        if ( $sent === FALSE) {
+                $this->loggerInstance->debug(1, 'Mailing on RADIUS problem failed');
+        }
     }
     /**
      * check if URL responds with 200