GEANT / CAT

core/DeploymentManaged.php

Spacing +32 added lines, -32 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,15 +381,15 @@ 
     public function sendToRADIUS($idx, $post) {
             
         $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, $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);
-            $res = 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);
+            $res = curl_exec($ch);
             if ($res === FALSE) {
                 $res = 'FAILURE';
             }
@@ -398,7 +398,7 @@ 
         } else {
             $res = 'FAILURE';
         }
-        $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;
     }
     /**
@@ -411,28 +411,28 @@ 
     private function sendMailtoAdmin($remove, $response) {
         $txt = '';
         if ($remove) {
-            $txt = _('Profile dectivation failed' . ' ');
+            $txt = _('Profile dectivation failed'.' ');
         } else {
-            $txt = _('Profile activation/modification failed' . ' ');
+            $txt = _('Profile activation/modification failed'.' ');
         }
         if (array_count_values($response)['FAILURE'] == 2) {
-            $txt = $txt . _('on both RADIUS servers: primary and backup') . '.';
+            $txt = $txt._('on both RADIUS servers: primary and backup').'.';
         } else {
             if ($response['res[1]'] == 'FAILURE') {
-                $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);
         $mail->Subject = _('RADIUS profile update problem');
         $mail->Body = $txt;
 
         $sent = $mail->send();
-        if ( $sent === FALSE)
+        if ($sent === FALSE)
         $this->loggerInstance->debug(1, 'Mailing on RADIUS problem failed');
     }
     /**
@@ -443,12 +443,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);
@@ -465,16 +465,16 @@ 
                     }
                 }
                 if (!empty($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++) {
             $response['res['.$idx.']'] = $this->sendToRADIUS($idx, $toPost[$idx]);
         }
         if (in_array('FAILURE', $response)) {

Braces +3 added lines, -2 removed lines

@@ -432,8 +432,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');
+        }
     }
     /**
      * prepare request to add/modify RADIUS settings for given deployment