GEANT / CAT

core/SanityTests.php

Spacing +45 added lines, -45 removed lines

@@ -129,7 +129,7 @@ 
         $this->test_result = [];
         $this->test_result['global'] = 0;
         // parse the schema file to find out the number of expected rows...
-        $schema = file(dirname(dirname(__FILE__)) . "/schema/schema.sql");
+        $schema = file(dirname(dirname(__FILE__))."/schema/schema.sql");
         $this->profileOptionCount = 0;
         $passedTheWindmill = FALSE;
         foreach ($schema as $schemaLine) {
@@ -156,7 +156,7 @@ 
     {
         $this->out[$test] = [];
         $this->name = $test;
-        $m_name = 'test' . $test;
+        $m_name = 'test'.$test;
         $this->test_result[$test] = 0;
         if (!method_exists($this, $m_name)) {
             $this->storeTestResult(\core\common\Entity::L_ERROR, "Configuration error, no test configured for <strong>$test</strong>.");
@@ -269,9 +269,9 @@ 
     private function testPhp()
     {
         if (version_compare(phpversion(), $this->needversionPHP, '>=')) {
-            $this->storeTestResult(\core\common\Entity::L_OK, "<strong>PHP</strong> is sufficiently recent. You are running " . phpversion() . ".");
+            $this->storeTestResult(\core\common\Entity::L_OK, "<strong>PHP</strong> is sufficiently recent. You are running ".phpversion().".");
         } else {
-            $this->storeTestResult(\core\common\Entity::L_ERROR, "<strong>PHP</strong> is too old. We need at least $this->needversionPHP, but you only have " . phpversion() . ".");
+            $this->storeTestResult(\core\common\Entity::L_ERROR, "<strong>PHP</strong> is too old. We need at least $this->needversionPHP, but you only have ".phpversion().".");
         }
     }
     
@@ -284,12 +284,12 @@ 
      */
     private function runConstantsTest($config)
     {
-        $templateConfig = file_get_contents(ROOT . "/config/$config-template.php");
-        $newTemplateConfig = preg_replace("/class *$config/", "class $config" . "_template", $templateConfig);
-        file_put_contents(ROOT . "/var/tmp/$config-template.php", $newTemplateConfig);
-        include(ROOT . "/var/tmp/$config-template.php");
-        unlink(ROOT . "/var/tmp/$config-template.php");
-        $rft = new \ReflectionClass("\config\\$config" . "_template");
+        $templateConfig = file_get_contents(ROOT."/config/$config-template.php");
+        $newTemplateConfig = preg_replace("/class *$config/", "class $config"."_template", $templateConfig);
+        file_put_contents(ROOT."/var/tmp/$config-template.php", $newTemplateConfig);
+        include(ROOT."/var/tmp/$config-template.php");
+        unlink(ROOT."/var/tmp/$config-template.php");
+        $rft = new \ReflectionClass("\config\\$config"."_template");
         $templateConstants = $rft->getConstants();
         $failResults = [];
         foreach ($templateConstants as $constant => $value) {
@@ -306,7 +306,7 @@ 
      * Check if all required constants are set
      */
     private function testConfigConstants() {
-        set_error_handler(function ($severity, $message, $file, $line) {
+        set_error_handler(function($severity, $message, $file, $line) {
             throw new \ErrorException($message, $severity, $severity, $file, $line);
         });
         
@@ -317,7 +317,7 @@ 
             $failCount = $failCount + count($failResults);
             if (count($failResults) > 0) {
             $this->storeTestResult(\core\common\Entity::L_ERROR, 
-                    "<strong>The following constants are not set:</strong>" . implode(', ', $failResults));
+                    "<strong>The following constants are not set:</strong>".implode(', ', $failResults));
             }
         }
         
@@ -341,7 +341,7 @@ 
             $this->storeTestResult(\core\common\Entity::L_OK, "<strong>cat_base_url</strong> set correctly");
         } else {
             $rootFromScript = $m[1] === '' ? '/' : $m[1];
-            $this->storeTestResult(\core\common\Entity::L_ERROR, "<strong>cat_base_url</strong> is set to <strong>" . \config\Master::PATHS['cat_base_url'] . "</strong> and should be <strong>$rootFromScript</strong>");
+            $this->storeTestResult(\core\common\Entity::L_ERROR, "<strong>cat_base_url</strong> is set to <strong>".\config\Master::PATHS['cat_base_url']."</strong> and should be <strong>$rootFromScript</strong>");
         }
     }
 
@@ -362,7 +362,7 @@ 
         if (count($probeReturns) == 0) {
             $this->storeTestResult(common\Entity::L_OK, "All configured RADIUS/UDP probes are reachable.");
         } else {
-            $this->storeTestResult(common\Entity::L_ERROR, "The following RADIUS probes are NOT reachable: " . implode(', ', $probeReturns));
+            $this->storeTestResult(common\Entity::L_ERROR, "The following RADIUS probes are NOT reachable: ".implode(', ', $probeReturns));
         }
     }
 
@@ -380,9 +380,9 @@ 
             $SSPconfig = \SimpleSAML\Configuration::getInstance();
             $sspVersion = explode('.', $SSPconfig->getVersion());
             if ((int) $sspVersion[0] >= $this->needversionSSP['major'] && (int) $sspVersion[1] >= $this->needversionSSP['minor']) {
-                $this->storeTestResult(\core\common\Entity::L_OK, "<strong>simpleSAMLphp</strong> is sufficently recent. You are running " . implode('.', $sspVersion));
+                $this->storeTestResult(\core\common\Entity::L_OK, "<strong>simpleSAMLphp</strong> is sufficently recent. You are running ".implode('.', $sspVersion));
             } else {
-                $this->storeTestResult(\core\common\Entity::L_ERROR, "<strong>simpleSAMLphp</strong> is too old. We need at least " . implode('.', $this->needversionSSP));
+                $this->storeTestResult(\core\common\Entity::L_ERROR, "<strong>simpleSAMLphp</strong> is too old. We need at least ".implode('.', $this->needversionSSP));
             }
         }
     }
@@ -409,7 +409,7 @@ 
         $A = $this->getExecPath('zip');
         if ($A['exec'] != "") {
             $fullOutput = [];
-            $t = exec($A['exec'] . ' --version', $fullOutput);
+            $t = exec($A['exec'].' --version', $fullOutput);
             if ($A['exec_is'] == "EXPLICIT") {
                 $this->storeTestResult(\core\common\Entity::L_OK, "<strong>".$fullOutput[1]."</strong> was found and is configured explicitly in your config.");
             } else {
@@ -447,8 +447,8 @@ 
      */
     private function testLogdir()
     {
-        if (fopen(\config\Master::PATHS['logdir'] . "/debug.log", "a") == FALSE) {
-            $this->storeTestResult(\core\common\Entity::L_WARN, "Log files in <strong>" . \config\Master::PATHS['logdir'] . "</strong> are not writable!");
+        if (fopen(\config\Master::PATHS['logdir']."/debug.log", "a") == FALSE) {
+            $this->storeTestResult(\core\common\Entity::L_WARN, "Log files in <strong>".\config\Master::PATHS['logdir']."</strong> are not writable!");
         } else {
             $this->storeTestResult(\core\common\Entity::L_OK, "Log directory is writable.");
         }
@@ -480,7 +480,7 @@ 
         }
 
         $classname = 'Imagick';
-        if (class_exists('\\' . $classname)) {
+        if (class_exists('\\'.$classname)) {
             $this->storeTestResult(\core\common\Entity::L_OK, "PHP extension <strong>Imagick</strong> is installed.");
         } else {
             $this->storeTestResult(\core\common\Entity::L_ERROR, "PHP extension <strong>Imagick</strong> not found! Get it from your distribution or <a href='http://pecl.php.net/package/imagick'>here</a>.");
@@ -576,7 +576,7 @@ 
     {
         $A = $this->getExecPath('openssl');
         if ($A['exec'] != "") {
-            $t = exec($A['exec'] . ' version');
+            $t = exec($A['exec'].' version');
             if ($A['exec_is'] == "EXPLICIT") {
                 $this->storeTestResult(\core\common\Entity::L_OK, "<strong>$t</strong> was found and is configured explicitly in your config.");
             } else {
@@ -604,14 +604,14 @@ 
         }
         $A = $this->getExecPath('makensis');
         if ($A['exec'] != "") {
-            $t = exec($A['exec'] . ' -VERSION');
+            $t = exec($A['exec'].' -VERSION');
             if ($A['exec_is'] == "EXPLICIT") {
                 $this->storeTestResult(\core\common\Entity::L_OK, "<strong>makensis $t</strong> was found and is configured explicitly in your config.");
             } else {
                 $this->storeTestResult(\core\common\Entity::L_WARN, "<strong>makensis $t</strong> was found, but is not configured with an absolute path in your config.");
             }
             $outputArray = [];
-            exec($A['exec'] . ' -HELP', $outputArray);
+            exec($A['exec'].' -HELP', $outputArray);
             $t1 = count(preg_grep('/INPUTCHARSET/', $outputArray));
             if ($t1 == 1 && \config\ConfAssistant::NSIS_VERSION == 2) {
                 $this->storeTestResult(\core\common\Entity::L_ERROR, "Declared NSIS_VERSION does not seem to match the file pointed to by PATHS['makensis']!");
@@ -641,7 +641,7 @@ 
         $NSIS_Module_status = [];
         foreach ($this->NSISModules as $module) {
             unset($out);
-            exec(\config\ConfAssistant::PATHS['makensis'] . " -V1 '-X!include $module' '-XOutFile $exe' '-XSection X' '-XSectionEnd'", $out, $retval);
+            exec(\config\ConfAssistant::PATHS['makensis']." -V1 '-X!include $module' '-XOutFile $exe' '-XSection X' '-XSectionEnd'", $out, $retval);
             if ($retval > 0) {
                 $NSIS_Module_status[$module] = 0;
             } else {
@@ -708,8 +708,8 @@ 
         $locales = shell_exec("locale -a");
         $allthere = "";
         foreach (\config\Master::LANGUAGES as $onelanguage) {
-            if (preg_match("/" . $onelanguage['locale'] . "/", $locales) == 0) {
-                $allthere .= $onelanguage['locale'] . " ";
+            if (preg_match("/".$onelanguage['locale']."/", $locales) == 0) {
+                $allthere .= $onelanguage['locale']." ";
             }
         }
         if ($allthere == "") {
@@ -723,47 +723,47 @@ 
         ["SETTING" => \config\Master::APPEARANCE['from-mail'],
             "DEFVALUE" => "cat-invite@your-cat-installation.example",
             "COMPLAINTSTRING" => "APPEARANCE/from-mail ",
-            "REQUIRED" => FALSE,],
+            "REQUIRED" => FALSE, ],
         ["SETTING" => \config\Master::APPEARANCE['support-contact']['url'],
             "DEFVALUE" => "cat-support@our-cat-installation.example?body=Only%20English%20language%20please!",
             "COMPLAINTSTRING" => "APPEARANCE/support-contact/url ",
-            "REQUIRED" => FALSE,],
+            "REQUIRED" => FALSE, ],
         ["SETTING" => \config\Master::APPEARANCE['support-contact']['display'],
             "DEFVALUE" => "cat-support@our-cat-installation.example",
             "COMPLAINTSTRING" => "APPEARANCE/support-contact/display ",
-            "REQUIRED" => FALSE,],
+            "REQUIRED" => FALSE, ],
         ["SETTING" => \config\Master::APPEARANCE['support-contact']['developer-mail'],
             "DEFVALUE" => "cat-develop@our-cat-installation.example",
             "COMPLAINTSTRING" => "APPEARANCE/support-contact/mail ",
-            "REQUIRED" => FALSE,],
+            "REQUIRED" => FALSE, ],
         ["SETTING" => \config\Master::APPEARANCE['abuse-mail'],
             "DEFVALUE" => "my-abuse-contact@your-cat-installation.example",
             "COMPLAINTSTRING" => "APPEARANCE/abuse-mail ",
-            "REQUIRED" => FALSE,],
+            "REQUIRED" => FALSE, ],
         ["SETTING" => \config\Master::APPEARANCE['MOTD'],
             "DEFVALUE" => "Release Candidate. All bugs to be shot on sight!",
             "COMPLAINTSTRING" => "APPEARANCE/MOTD ",
-            "REQUIRED" => FALSE,],
+            "REQUIRED" => FALSE, ],
         ["SETTING" => \config\Master::APPEARANCE['webcert_CRLDP'],
             "DEFVALUE" => ['list', 'of', 'CRL', 'pointers'],
             "COMPLAINTSTRING" => "APPEARANCE/webcert_CRLDP ",
-            "REQUIRED" => TRUE,],
+            "REQUIRED" => TRUE, ],
         ["SETTING" => \config\Master::APPEARANCE['webcert_OCSP'],
             "DEFVALUE" => ['list', 'of', 'OCSP', 'pointers'],
             "COMPLAINTSTRING" => "APPEARANCE/webcert_OCSP ",
-            "REQUIRED" => TRUE,],
+            "REQUIRED" => TRUE, ],
         ["SETTING" => \config\Master::DB['INST']['host'],
             "DEFVALUE" => "db.host.example",
             "COMPLAINTSTRING" => "DB/INST ",
-            "REQUIRED" => TRUE,],
+            "REQUIRED" => TRUE, ],
         ["SETTING" => \config\Master::DB['INST']['host'],
             "DEFVALUE" => "db.host.example",
             "COMPLAINTSTRING" => "DB/USER ",
-            "REQUIRED" => TRUE,],
+            "REQUIRED" => TRUE, ],
         ["SETTING" => \config\Master::DB['EXTERNAL']['host'],
             "DEFVALUE" => "customerdb.otherhost.example",
             "COMPLAINTSTRING" => "DB/EXTERNAL ",
-            "REQUIRED" => FALSE,],
+            "REQUIRED" => FALSE, ],
     ];
 
     /**
@@ -792,11 +792,11 @@ 
         if (isset(\config\Diagnostics::RADIUSTESTS['TLS-clientcerts'])) {
             foreach (\config\Diagnostics::RADIUSTESTS['TLS-clientcerts'] as $cadata) {
                 foreach ($cadata['certificates'] as $cert_files) {
-                    if (file_get_contents(ROOT . "/config/cli-certs/" . $cert_files['public']) === FALSE) {
-                        $defaultvalues .= "CERTIFICATE/" . $cert_files['public'] . " ";
+                    if (file_get_contents(ROOT."/config/cli-certs/".$cert_files['public']) === FALSE) {
+                        $defaultvalues .= "CERTIFICATE/".$cert_files['public']." ";
                     }
-                    if (file_get_contents(ROOT . "/config/cli-certs/" . $cert_files['private']) === FALSE) {
-                        $defaultvalues .= "CERTIFICATE/" . $cert_files['private'] . " ";
+                    if (file_get_contents(ROOT."/config/cli-certs/".$cert_files['private']) === FALSE) {
+                        $defaultvalues .= "CERTIFICATE/".$cert_files['private']." ";
                     }
                 }
             }
@@ -889,14 +889,14 @@ 
         if ($global_no_cache) {
             foreach ($Devs as $dev => $D) {
                 if (empty($D['options']['no_cache']) || $D['options']['no_cache'] != 0) {
-                    $no_cache_dev .= $dev . " ";
+                    $no_cache_dev .= $dev." ";
                     $no_cache_dev_count++;
                 }
             }
         } else {
             foreach ($Devs as $dev => $D) {
                 if (!empty($D['options']['no_cache']) && $D['options']['no_cache'] != 0) {
-                    $no_cache_dev .= $dev . " ";
+                    $no_cache_dev .= $dev." ";
                     $no_cache_dev_count++;
                 }
             }
@@ -935,13 +935,13 @@ 
         $mail->isHTML(FALSE);
         $mail->CharSet = 'UTF-8';
         $mail->From = \config\Master::APPEARANCE['from-mail'];
-        $mail->FromName = \config\Master::APPEARANCE['productname'] . " Invitation System";
+        $mail->FromName = \config\Master::APPEARANCE['productname']." Invitation System";
         $mail->addAddress(\config\Master::APPEARANCE['abuse-mail']);
         $mail->Subject = "testing CAT configuration mail";
         $mail->Body = "Testing CAT mailing\n";
         $sent = $mail->send();
         if ($sent) {
-            $this->storeTestResult(\core\common\Entity::L_OK, "mailer settings appear to be working, check " . \config\Master::APPEARANCE['abuse-mail'] . " mailbox if the message was receiced.");
+            $this->storeTestResult(\core\common\Entity::L_OK, "mailer settings appear to be working, check ".\config\Master::APPEARANCE['abuse-mail']." mailbox if the message was receiced.");
         } else {
             $this->storeTestResult(\core\common\Entity::L_ERROR, "mailer settings failed, check the Config::MAILSETTINGS");
         }

config/ConfAssistant-template.php

Spacing +4 added lines, -4 removed lines

@@ -90,7 +90,7 @@ 
                     ], 
                 'condition' => TRUE],
             'OpenRoaming®' => [
-                'ssid' => [],     /* OpenRoaming has left SSIDs behind */
+                'ssid' => [], /* OpenRoaming has left SSIDs behind */
                 'oi' => [
                     '5A03BA0000', /* OpenRoaming/AllIdentities/SettlementFree/NoPersonalData/BaselineQoS */
                     '5A03BA0800', /* OpenRoaming/EduIdentities/SettlementFree/NoPersonalData/BaselineQoS */
@@ -155,7 +155,7 @@ 
         'makensis' => 'makensis',
         'zip' => 'zip',
         'trust-store-mozilla' => '/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem',
-        'trust-store-custom' => __DIR__ . "/known-roots.pem",
+        'trust-store-custom' => __DIR__."/known-roots.pem",
     ];
 
     /**
@@ -193,13 +193,13 @@ 
             'db' => 'radacct',
             'user' => 'someuser',
             'pass' => 'somepass',
-            'readonly' => TRUE,],
+            'readonly' => TRUE, ],
         'RADIUS_2' => [
             'host' => 'auth-2.hosted.eduroam.org',
             'db' => 'radacct',
             'user' => 'someuser',
             'pass' => 'somepass',
-            'readonly' => TRUE,],
+            'readonly' => TRUE, ],
     ];
 
     /**

core/DeploymentManaged.php

Spacing +27 added lines, -27 removed lines

@@ -270,7 +270,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") {
@@ -307,7 +307,7 @@ 
         $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;
             }
@@ -316,14 +316,14 @@ 
         $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', consortium = '$this->consortium' 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', consortium = '$this->consortium' WHERE deployment_id = $this->identifier");
         return ["port_instance_1" => $foundFreePort1, "port_instance_2" => $foundFreePort2, "secret" => $futureSecret, "radius_instance_1" => $ourserver, "radius_instance_2" => $ourserver];
     }
 
@@ -370,7 +370,7 @@ 
      */
     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");
     }
 
     /**
@@ -381,7 +381,7 @@ 
      */
     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");
     }
 
     /**
@@ -393,7 +393,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"];
     }
@@ -409,13 +409,13 @@ 
     {
 
         $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");
+            $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);
@@ -431,7 +431,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;
     }
 
@@ -452,19 +452,19 @@ 
         } else {
             $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');
@@ -498,7 +498,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);
@@ -590,35 +590,35 @@ 
     {
         $remove = ($this->status == \core\AbstractDeployment::INACTIVE) ? 0 : 1;
         $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");
-            $response['res[' . $key . ']'] = $this->sendToRADIUS($key, $toPost[$key]);
+            $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;
         }
         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);
             }
         }

web/admin/overview_org.php

Switch Indentation +53 added lines, -53 removed lines

@@ -207,70 +207,70 @@ 
                     </div>
                     <?php
                     break;
-                case "core\ProfileRADIUS":
-                    ?>
-                    <div style='padding-bottom:20px;'>
+                    case "core\ProfileRADIUS":
+                        ?>
+                        <div style='padding-bottom:20px;'>
                         <?php $profile_name = $profile_list->name; ?>
-                        <h2 style='overflow:auto; display:inline; padding-bottom: 10px;'><?php printf(_("Profile: %s"), $profile_name); ?></h2>
+                            <h2 style='overflow:auto; display:inline; padding-bottom: 10px;'><?php printf(_("Profile: %s"), $profile_name); ?></h2>
                         <?php
-                        // see if there are any profile-level overrides
-                        $attribs = $profile_list->getAttributes();
-                        // write things into a buffer; we need some function calls to determine
-                        // readiness - but want to display it before!
-                        $has_overrides = FALSE;
-                        foreach ($attribs as $attrib) {
-                            if ($attrib['level'] == \core\Options::LEVEL_PROFILE && !preg_match("/^(internal:|profile:name|profile:description|eap:)/", $attrib['name'])) {
-                                $has_overrides = TRUE;
+                            // see if there are any profile-level overrides
+                            $attribs = $profile_list->getAttributes();
+                            // write things into a buffer; we need some function calls to determine
+                            // readiness - but want to display it before!
+                            $has_overrides = FALSE;
+                            foreach ($attribs as $attrib) {
+                                if ($attrib['level'] == \core\Options::LEVEL_PROFILE && !preg_match("/^(internal:|profile:name|profile:description|eap:)/", $attrib['name'])) {
+                                    $has_overrides = TRUE;
+                                }
                             }
-                        }
-                        $buffer_eaptypediv = "<div style='margin-bottom:40px; float:left;'>" . _("<strong>EAP Types</strong> (in order of preference):") . "<br/>";
-                        $typelist = $profile_list->getEapMethodsinOrderOfPreference();
-                        $allcomplete = TRUE;
-                        foreach ($typelist as $eaptype) {
-                            $buffer_eaptypediv .= $eaptype->getPrintableRep();
-                            $completeness = $profile_list->isEapTypeDefinitionComplete($eaptype);
-                            if ($completeness === true) {
-                                $buffer_eaptypediv .= " <div class='acceptable'>" . _("OK") . "</div>";
-                            } else {
-                                $buffer_eaptypediv .= " <div class='notacceptable'>";
-                                $buffer_eaptypediv .= _("Information needed!");
-                                if (is_array($completeness)) {
-                                    $buffer_eaptypediv .= "<ul style='margin:1px'>";
-                                    foreach ($completeness as $missing_attrib) {
-                                        $buffer_eaptypediv .= "<li>" . $uiElements->displayName($missing_attrib) . "</li>";
+                            $buffer_eaptypediv = "<div style='margin-bottom:40px; float:left;'>" . _("<strong>EAP Types</strong> (in order of preference):") . "<br/>";
+                            $typelist = $profile_list->getEapMethodsinOrderOfPreference();
+                            $allcomplete = TRUE;
+                            foreach ($typelist as $eaptype) {
+                                $buffer_eaptypediv .= $eaptype->getPrintableRep();
+                                $completeness = $profile_list->isEapTypeDefinitionComplete($eaptype);
+                                if ($completeness === true) {
+                                    $buffer_eaptypediv .= " <div class='acceptable'>" . _("OK") . "</div>";
+                                } else {
+                                    $buffer_eaptypediv .= " <div class='notacceptable'>";
+                                    $buffer_eaptypediv .= _("Information needed!");
+                                    if (is_array($completeness)) {
+                                        $buffer_eaptypediv .= "<ul style='margin:1px'>";
+                                        foreach ($completeness as $missing_attrib) {
+                                            $buffer_eaptypediv .= "<li>" . $uiElements->displayName($missing_attrib) . "</li>";
+                                        }
+                                        $buffer_eaptypediv .= "</ul>";
                                     }
-                                    $buffer_eaptypediv .= "</ul>";
+                                    $buffer_eaptypediv .= "</div>";
+                                    $allcomplete = FALSE;
                                 }
-                                $buffer_eaptypediv .= "</div>";
-                                $allcomplete = FALSE;
-                            }
-                            $attribs = $profile_list->getAttributes();
-                            $justOnce = FALSE;
-                            foreach ($attribs as $attrib) {
-                                if ($attrib['level'] == \core\Options::LEVEL_METHOD && !preg_match("/^internal:/", $attrib['name']) && !$justOnce) {
-                                    $justOnce = TRUE;
-                                    $buffer_eaptypediv .= "<img src='../resources/images/icons/Letter-E-blue-icon.png' alt='" . _("Options on EAP Method/Device level are in effect.") . "'>";
+                                $attribs = $profile_list->getAttributes();
+                                $justOnce = FALSE;
+                                foreach ($attribs as $attrib) {
+                                    if ($attrib['level'] == \core\Options::LEVEL_METHOD && !preg_match("/^internal:/", $attrib['name']) && !$justOnce) {
+                                        $justOnce = TRUE;
+                                        $buffer_eaptypediv .= "<img src='../resources/images/icons/Letter-E-blue-icon.png' alt='" . _("Options on EAP Method/Device level are in effect.") . "'>";
+                                    }
                                 }
+                                $buffer_eaptypediv .= "<br/>";
                             }
-                            $buffer_eaptypediv .= "<br/>";
-                        }
-                        $buffer_eaptypediv .= "</div>";
+                            $buffer_eaptypediv .= "</div>";
 
-                        $buffer_headline = "<span style='float:right;'>";
-                        $readiness = $profile_list->readinessLevel();
-                        if ($has_overrides) {
-                            $buffer_headline .= $uiElements->boxRemark("", _("Option override on profile level is in effect."), TRUE);
-                        }
-                        if (!$allcomplete) {
-                            $buffer_headline .= $uiElements->boxError("", _("The information in this profile is incomplete."), TRUE);
-                        }
-                        switch ($readiness) {
+                            $buffer_headline = "<span style='float:right;'>";
+                            $readiness = $profile_list->readinessLevel();
+                            if ($has_overrides) {
+                                $buffer_headline .= $uiElements->boxRemark("", _("Option override on profile level is in effect."), TRUE);
+                            }
+                            if (!$allcomplete) {
+                                $buffer_headline .= $uiElements->boxError("", _("The information in this profile is incomplete."), TRUE);
+                            }
+                            switch ($readiness) {
                             case core\AbstractProfile::READINESS_LEVEL_SHOWTIME:
                                 $buffer_headline .= $uiElements->boxOkay("", _("This profile is shown on the user download interface."), TRUE);
                                 break;
                             case core\AbstractProfile::READINESS_LEVEL_SUFFICIENTCONFIG:
                                 $buffer_headline .= $uiElements->boxWarning("", sprintf(_("This profile is NOT shown on the user download interface, even though we have enough information to show. To enable the profile, add the attribute \"%s\" and tick the corresponding box."), $uiElements->displayName("profile:production")), TRUE);
-                        }
+                            }
 
                         $buffer_headline .= "</span></div>";
 
@@ -353,8 +353,8 @@ 
                     </div>
                     <?php
                     break;
-                default:
-                    throw new Exception("We were asked to operate on something that is neither a RADIUS nor Silverbullet profile!");
+                    default:
+                        throw new Exception("We were asked to operate on something that is neither a RADIUS nor Silverbullet profile!");
             }
             ?>
             <!-- dummy width to keep a little distance -->

Spacing +36 added lines, -36 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->nomenclatureParticipant));
@@ -182,14 +182,14 @@ 
                                     <ul style='margin:1px'>
                                         <?php
                                         foreach ($completeness as $missing_attrib) {
-                                            echo "<li>" . $uiElements->displayName($missing_attrib) . "</li>";
+                                            echo "<li>".$uiElements->displayName($missing_attrib)."</li>";
                                         }
                                         ?>
                                     </ul>
                                 </div>
                                 <?php
                             } else {
-                                echo sprintf(_("You can create up to %d users."), $maxusers[0]['value']) . "<br/>" . sprintf(_("Their credentials will carry the name <strong>%s</strong>."), $profile_list->realm);
+                                echo sprintf(_("You can create up to %d users."), $maxusers[0]['value'])."<br/>".sprintf(_("Their credentials will carry the name <strong>%s</strong>."), $profile_list->realm);
                             }
                             ?>
                             <br/>
@@ -198,7 +198,7 @@ 
                             if ($readonly === FALSE) {
                                 ?>
                                 <form action='edit_silverbullet.php?inst_id=<?php echo $my_inst->identifier; ?>&amp;profile_id=<?php echo $profile_list->identifier; ?>' method='POST'>
-                                    <button <?php echo ( is_array($completeness) ? "disabled" : "" ); ?> type='submit' name='sb_action' value='sb_edit'><?php echo _("Manage User Base"); ?></button>
+                                    <button <?php echo (is_array($completeness) ? "disabled" : ""); ?> type='submit' name='sb_action' value='sb_edit'><?php echo _("Manage User Base"); ?></button>
                                 </form>
                                 <?php
                             }
@@ -223,21 +223,21 @@ 
                                 $has_overrides = TRUE;
                             }
                         }
-                        $buffer_eaptypediv = "<div style='margin-bottom:40px; float:left;'>" . _("<strong>EAP Types</strong> (in order of preference):") . "<br/>";
+                        $buffer_eaptypediv = "<div style='margin-bottom:40px; float:left;'>"._("<strong>EAP Types</strong> (in order of preference):")."<br/>";
                         $typelist = $profile_list->getEapMethodsinOrderOfPreference();
                         $allcomplete = TRUE;
                         foreach ($typelist as $eaptype) {
                             $buffer_eaptypediv .= $eaptype->getPrintableRep();
                             $completeness = $profile_list->isEapTypeDefinitionComplete($eaptype);
                             if ($completeness === true) {
-                                $buffer_eaptypediv .= " <div class='acceptable'>" . _("OK") . "</div>";
+                                $buffer_eaptypediv .= " <div class='acceptable'>"._("OK")."</div>";
                             } else {
                                 $buffer_eaptypediv .= " <div class='notacceptable'>";
                                 $buffer_eaptypediv .= _("Information needed!");
                                 if (is_array($completeness)) {
                                     $buffer_eaptypediv .= "<ul style='margin:1px'>";
                                     foreach ($completeness as $missing_attrib) {
-                                        $buffer_eaptypediv .= "<li>" . $uiElements->displayName($missing_attrib) . "</li>";
+                                        $buffer_eaptypediv .= "<li>".$uiElements->displayName($missing_attrib)."</li>";
                                     }
                                     $buffer_eaptypediv .= "</ul>";
                                 }
@@ -249,7 +249,7 @@ 
                             foreach ($attribs as $attrib) {
                                 if ($attrib['level'] == \core\Options::LEVEL_METHOD && !preg_match("/^internal:/", $attrib['name']) && !$justOnce) {
                                     $justOnce = TRUE;
-                                    $buffer_eaptypediv .= "<img src='../resources/images/icons/Letter-E-blue-icon.png' alt='" . _("Options on EAP Method/Device level are in effect.") . "'>";
+                                    $buffer_eaptypediv .= "<img src='../resources/images/icons/Letter-E-blue-icon.png' alt='"._("Options on EAP Method/Device level are in effect.")."'>";
                                 }
                             }
                             $buffer_eaptypediv .= "<br/>";
@@ -287,10 +287,10 @@ 
                                 if (\config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] == "LOCAL") {
                                     $diagUrl = "../diag/";
                                 } else {
-                                    $diagUrl = \config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] . "/diag/";
+                                    $diagUrl = \config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS']."/diag/";
                                 }
                                 ?>
-                                <form action='<?php echo $diagUrl . "action_realmcheck.php?inst_id=" . $my_inst->identifier . "&profile_id=" . $profile_list->identifier ?>' method='post' accept-charset='UTF-8'>
+                                <form action='<?php echo $diagUrl."action_realmcheck.php?inst_id=".$my_inst->identifier."&profile_id=".$profile_list->identifier ?>' method='post' accept-charset='UTF-8'>
                                     <input type='hidden' name='comefrom' id='comefrom-<?php echo $profilecount; ?>' value='<?php echo $link; ?>'/>
                                     <button type='submit' name='profile_action' value='check' <?php echo ($has_realm ? "" : "disabled='disabled'"); ?> title='<?php echo _("The realm can only be checked if you configure the realm!"); ?>'>
                                         <?php echo _("Check realm reachability"); ?>
@@ -324,9 +324,9 @@ 
                                 ?>
                                 <div style='display: flex;'>
                                     <?php
-                                    $idpLevelUrl = ( isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == "on" ? 'https://' : 'http://') . $_SERVER['SERVER_NAME'] . dirname(dirname($_SERVER['SCRIPT_NAME'])) . "?idp=" . $my_inst->identifier;
-                                    $displayurl = $idpLevelUrl . "&amp;profile=" . $profile_list->identifier;
-                                    $QRurl = $idpLevelUrl . "&profile=" . $profile_list->identifier;
+                                    $idpLevelUrl = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == "on" ? 'https://' : 'http://').$_SERVER['SERVER_NAME'].dirname(dirname($_SERVER['SCRIPT_NAME']))."?idp=".$my_inst->identifier;
+                                    $displayurl = $idpLevelUrl."&amp;profile=".$profile_list->identifier;
+                                    $QRurl = $idpLevelUrl."&profile=".$profile_list->identifier;
                                     $qrCode = new \chillerlan\QRCode\QRCode(new \chillerlan\QRCode\QROptions([
                                                 'outputType' => \chillerlan\QRCode\QRCode::OUTPUT_IMAGE_PNG,
                                                 'eccLevel' => \chillerlan\QRCode\QRCode::ECC_H,
@@ -338,9 +338,9 @@ 
                                     if (empty($rawQr)) {
                                         throw new Exception("Something went seriously wrong during QR code generation!");
                                     }
-                                    $uri = "data:image/png;base64," . base64_encode($uiElements->pngInjectConsortiumLogo($rawQr, web\lib\admin\UIElements::QRCODE_PIXELS_PER_SYMBOL));
+                                    $uri = "data:image/png;base64,".base64_encode($uiElements->pngInjectConsortiumLogo($rawQr, web\lib\admin\UIElements::QRCODE_PIXELS_PER_SYMBOL));
                                     $size = getimagesize($uri);
-                                    echo "<img width='" . ($size[0] / 4) . "' height='" . ($size[1] / 4) . "' src='$uri' alt='QR-code'/>";
+                                    echo "<img width='".($size[0] / 4)."' height='".($size[1] / 4)."' src='$uri' alt='QR-code'/>";
 
                                     //echo "<nobr>$displayurl</nobr></a>";
                                     echo "<p>$displayurl</p></a>";
@@ -390,7 +390,7 @@ 
                     <div>
                         <input type="hidden" name="consortium" value="eduroam"/>
                         <button type='submit' <?php echo ($hasMail > 0 ? "" : "disabled"); ?> name='profile_action' value='new'>
-                            <?php echo sprintf(_("Add %s deployment ..."), \config\ConfAssistant::CONSORTIUM['name'] . " " . \core\DeploymentManaged::PRODUCTNAME); ?>
+                            <?php echo sprintf(_("Add %s deployment ..."), \config\ConfAssistant::CONSORTIUM['name']." ".\core\DeploymentManaged::PRODUCTNAME); ?>
                         </button>
 
                     </div>
@@ -416,7 +416,7 @@ 
     <?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>";
     }
 
     foreach ($hotspotProfiles as $counter => $deploymentObject) {
@@ -437,7 +437,7 @@ 
                 <h2><?php
                     switch ($deploymentObject->consortium) {
                         case "eduroam":
-                            $displayname = config\ConfAssistant::CONSORTIUM['name'] . " " . core\DeploymentManaged::PRODUCTNAME;
+                            $displayname = config\ConfAssistant::CONSORTIUM['name']." ".core\DeploymentManaged::PRODUCTNAME;
                             break;
                         case "OpenRoaming":
                             $displayname = "OpenRoaming ANP";
@@ -445,7 +445,7 @@ 
                         default:
                             throw new Exception("We are supposed to operate on a roaming consortium we don't know.");
                     }
-                    echo $displayname . " (<span style='color:" . ( $deploymentObject->status == \core\AbstractDeployment::INACTIVE ? "red;'>" . _("inactive") : "green;'>" . _("active") ) . "</span>)";
+                    echo $displayname." (<span style='color:".($deploymentObject->status == \core\AbstractDeployment::INACTIVE ? "red;'>"._("inactive") : "green;'>"._("active"))."</span>)";
                     ?></h2>
                 <table>
                     <caption><?php echo _("Deployment Details"); ?></caption>
@@ -459,13 +459,13 @@ 
                         <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>
@@ -473,9 +473,9 @@ 
                         <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>
@@ -483,22 +483,22 @@ 
                         <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_2]['text'] . "'>";
+                            echo "<img src='".$radiusMessages[$deploymentObject->radius_status_2]['icon'].
+                            "' alt='".$radiusMessages[$deploymentObject->radius_status_2]['text'].
+                            "' title='".$radiusMessages[$deploymentObject->radius_status_2]['text']."'>";
                             ?>
                         </td>
                     </tr>
@@ -550,12 +550,12 @@ 
                                 if (array_key_exists('FAILURE', $res) && $res['FAILURE'] > 0) {
                                     echo '<br>';
                                     if ($res['FAILURE'] == 2) {
-                                        echo ' <span style="color: red;">' . _("Activation failure.") . '</span>';
+                                        echo ' <span style="color: red;">'._("Activation failure.").'</span>';
                                     } else {
                                         if (isset($_GET['res'][1]) && $_GET['res']['1'] == 'FAILURE') {
-                                            echo ' <span style="color: red;">' . _("Activation failure for your primary RADIUS server.") . '</span>';
+                                            echo ' <span style="color: red;">'._("Activation failure for your primary RADIUS server.").'</span>';
                                         } else {
-                                            echo ' <span style="color: red;">' . _("Activation failure for your backup RADIUS server.") . '</span>';
+                                            echo ' <span style="color: red;">'._("Activation failure for your backup RADIUS server.").'</span>';
                                         }
                                     }
                                 }
@@ -575,12 +575,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>';
                                         }
                                     }
                                 }

web/admin/edit_hotspot.php

Indentation +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
             && ( $_POST['consortium'] == "eduroam" 
                     ||   
                  ( $_POST['consortium'] == "OpenRoaming" && count($myfed->getAttributes("fed:openroaming")) > 0 )
-               )
+                )
             ) {
         $my_inst->newDeployment(\core\AbstractDeployment::DEPLOYMENTTYPE_MANAGED, $_POST['consortium']);
         header("Location: overview_org.php?inst_id=" . $my_inst->identifier);

Spacing +10 added lines, -10 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();
@@ -37,13 +37,13 @@ 
 
 if (!isset($_GET['deployment_id'])) {
     if (isset($_POST['consortium']) 
-            && ( $_POST['consortium'] == "eduroam" 
+            && ($_POST['consortium'] == "eduroam" 
                     ||   
-                 ( $_POST['consortium'] == "OpenRoaming" && count($myfed->getAttributes("fed:openroaming")) > 0 )
+                 ($_POST['consortium'] == "OpenRoaming" && count($myfed->getAttributes("fed:openroaming")) > 0)
                )
             ) {
         $my_inst->newDeployment(\core\AbstractDeployment::DEPLOYMENTTYPE_MANAGED, $_POST['consortium']);
-        header("Location: overview_org.php?inst_id=" . $my_inst->identifier);
+        header("Location: overview_org.php?inst_id=".$my_inst->identifier);
         exit(0);
     } else {
         throw new Exception("Desired consortium for Managed SP needs to be specified, and allowed!");
@@ -58,7 +58,7 @@ 
         if (in_array('OK', $response)) {
             $deployment->deactivate();
         }
-        header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '&' . urldecode(http_build_query($response)));
+        header("Location: overview_org.php?inst_id=".$my_inst->identifier.'&'.urldecode(http_build_query($response)));
         exit(0);
     }
 
@@ -67,7 +67,7 @@ 
         if (in_array('OK', $response)) {
             $deployment->activate();
         }
-        header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '&' . urldecode(http_build_query($response)));
+        header("Location: overview_org.php?inst_id=".$my_inst->identifier.'&'.urldecode(http_build_query($response)));
         exit(0);
     }
 
@@ -89,7 +89,7 @@ 
         } else {
             $response = ['NOOP', 'NOOP'];
         }
-        header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '&' . urldecode(http_build_query($response)));
+        header("Location: overview_org.php?inst_id=".$my_inst->identifier.'&'.urldecode(http_build_query($response)));
         exit(0);
     }
 }
@@ -117,7 +117,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'>
@@ -149,7 +149,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>
@@ -169,7 +169,7 @@ 
     </fieldset>
 
     <?php
-    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_org.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_org.php?inst_id=$my_inst->identifier\"'>"._("Discard changes")."</button></p></form>";
     echo $deco->footer();
 
     
\ No newline at end of file