GEANT / CAT

web/admin/edit_idp_result.php

Spacing +26 added lines, -26 removed lines

@@ -20,7 +20,7 @@ 
  *          <base_url>/copyright.php after deploying the software
  */
 
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
 
 $auth = new \web\lib\admin\Authentication();
 $loggerInstance = new \core\common\Logging();
@@ -40,7 +40,7 @@ 
 switch ($_POST['submitbutton']) {
     case web\lib\common\FormElements::BUTTON_DELETE:
         $myInstOriginal->destroy();
-        $loggerInstance->writeAudit($_SESSION['user'], "DEL", "IdP " . $instId);
+        $loggerInstance->writeAudit($_SESSION['user'], "DEL", "IdP ".$instId);
         header("Location: overview_user.php");
         exit;
     case web\lib\common\FormElements::BUTTON_FLUSH_AND_RESTART:
@@ -50,7 +50,7 @@ 
         }
         // flush all IdP attributes and send user to creation wizard
         $myInstOriginal->flushAttributes();
-        $loggerInstance->writeAudit($_SESSION['user'], "DEL", "IdP starting over" . $instId);
+        $loggerInstance->writeAudit($_SESSION['user'], "DEL", "IdP starting over".$instId);
         header("Location: edit_idp.php?inst_id=$instId&wizard=true");
         exit;
     case web\lib\common\FormElements::BUTTON_SAVE:
@@ -63,19 +63,19 @@ 
             exit(0);
         }
         $inst_name = $myInstOriginal->name;
-        echo "<h1>" . sprintf(_("Submitted attributes for IdP '%s'"), $inst_name) . "</h1>";
+        echo "<h1>".sprintf(_("Submitted attributes for IdP '%s'"), $inst_name)."</h1>";
         echo "<table>";
         echo $optionParser->processSubmittedFields($myInstOriginal, $_POST, $_FILES);
         echo "</table>";
 // delete cached logo, if present
-        $dir = ROOT . '/web/downloads/logos/';
-        $globResult = glob($dir . $myInstOriginal->identifier . "_*.png");
+        $dir = ROOT.'/web/downloads/logos/';
+        $globResult = glob($dir.$myInstOriginal->identifier."_*.png");
         if ($globResult === FALSE) { // we should catch the improbable error condition
             $globResult = [];
         }
         array_map('unlink', $globResult);
         $loggerInstance->debug(4, "UNLINK from $dir\n");
-        $loggerInstance->writeAudit($_SESSION['user'], "MOD", "IdP " . $myInstOriginal->identifier . " - attributes changed");
+        $loggerInstance->writeAudit($_SESSION['user'], "MOD", "IdP ".$myInstOriginal->identifier." - attributes changed");
 
 // re-instantiate ourselves... profiles need fresh data
         $myInstReinstantiated = $validator->IdP($_GET['inst_id'], $_SESSION['user']);
@@ -83,32 +83,32 @@ 
         $significantChanges = \core\IdP::significantChanges($myInstOriginal, $myInstReinstantiated);
         if (count($significantChanges) > 0) {
             // send a notification/alert mail to someone we know is in charge
-            $text = _("To whom it may concern,") . "\n\n";
+            $text = _("To whom it may concern,")."\n\n";
             /// were made to the *Identity Provider* *LU* / integer number of IdP / (previously known as) Name
-            $text .= sprintf(_("significant changes were made to the %s %s / %s / (previously known as) %s."), $uiElements->nomenclatureInst, strtoupper($myInstOriginal->federation), $myInstOriginal->identifier, $myInstOriginal->name) . "\n\n";
+            $text .= sprintf(_("significant changes were made to the %s %s / %s / (previously known as) %s."), $uiElements->nomenclatureInst, strtoupper($myInstOriginal->federation), $myInstOriginal->identifier, $myInstOriginal->name)."\n\n";
             if (isset($significantChanges[\core\IdP::CA_CLASH_ADDED])) {
-                $text .= _("WARNING! A new trusted root CA was added, and it has the exact same name as a previously existing root CA. This may (but does not necessarily) mean that this is an attempt to insert an unauthorised trust root by disguising as the genuine one. The details are below:") . "\n";
-                $text .= $significantChanges[\core\IdP::CA_CLASH_ADDED] . "\n\n";
+                $text .= _("WARNING! A new trusted root CA was added, and it has the exact same name as a previously existing root CA. This may (but does not necessarily) mean that this is an attempt to insert an unauthorised trust root by disguising as the genuine one. The details are below:")."\n";
+                $text .= $significantChanges[\core\IdP::CA_CLASH_ADDED]."\n\n";
             }
             if (isset($significantChanges[\core\IdP::INSTNAME_CHANGED])) {
-                $text .= sprintf(_("The %s has changed its name. The details are below:"), $uiElements->nomenclatureInst) . "\n\n";
-                $text .= $significantChanges[\core\IdP::INSTNAME_CHANGED] . "\n\n";
+                $text .= sprintf(_("The %s has changed its name. The details are below:"), $uiElements->nomenclatureInst)."\n\n";
+                $text .= $significantChanges[\core\IdP::INSTNAME_CHANGED]."\n\n";
             }
             if (isset($significantChanges[\core\IdP::CA_ADDED])) {
                 $text .= _("A new trusted root CA was added. The details are below:\n\n");
-                $text .= $significantChanges[\core\IdP::CA_ADDED] . "\n\n";
+                $text .= $significantChanges[\core\IdP::CA_ADDED]."\n\n";
             }
             if (isset($significantChanges[\core\IdP::SERVERNAME_ADDED])) {
-                $text .= _("A new acceptable server name for the authentication server was added. The details are below:") . "\n\n";
-                $text .= $significantChanges[\core\IdP::SERVERNAME_ADDED] . "\n\n";
+                $text .= _("A new acceptable server name for the authentication server was added. The details are below:")."\n\n";
+                $text .= $significantChanges[\core\IdP::SERVERNAME_ADDED]."\n\n";
             }
-            $text .= _("This mail is merely a cross-check because these changes can be security-relevant. If the change was expected, you do not need to take any action.") . "\n\n";
-            $text .= _("Greetings, ") . "\n\n" . CONFIG['APPEARANCE']['productname_long'];
+            $text .= _("This mail is merely a cross-check because these changes can be security-relevant. If the change was expected, you do not need to take any action.")."\n\n";
+            $text .= _("Greetings, ")."\n\n".CONFIG['APPEARANCE']['productname_long'];
             // (currently, send hard-wired to NRO - future: for linked insts, check eduroam DBv2 and send to registered admins directly)
             $fed = new core\Federation($$myInstOriginal->federation);
             foreach ($fed->listFederationAdmins() as $id) {
                 $user = new core\User($id);
-                $user->sendMailToUser(sprintf(_("%s: Significant Changes made to %s"),CONFIG['APPEARANCE']['productname'], $uiElements->nomenclatureInst), $text);
+                $user->sendMailToUser(sprintf(_("%s: Significant Changes made to %s"), CONFIG['APPEARANCE']['productname'], $uiElements->nomenclatureInst), $text);
             }
         }
 
@@ -119,15 +119,15 @@ 
 
         if (isset(CONFIG_CONFASSISTANT['CONSORTIUM']['ssid']) && count(CONFIG_CONFASSISTANT['CONSORTIUM']['ssid']) > 0) {
             foreach (CONFIG_CONFASSISTANT['CONSORTIUM']['ssid'] as $ssidname) {
-                $ssids[] = $ssidname . " " . (isset(CONFIG_CONFASSISTANT['CONSORTIUM']['tkipsupport']) && CONFIG_CONFASSISTANT['CONSORTIUM']['tkipsupport'] === TRUE ? _("(WPA2/AES and WPA/TKIP)") : _("(WPA2/AES)") );
+                $ssids[] = $ssidname." ".(isset(CONFIG_CONFASSISTANT['CONSORTIUM']['tkipsupport']) && CONFIG_CONFASSISTANT['CONSORTIUM']['tkipsupport'] === TRUE ? _("(WPA2/AES and WPA/TKIP)") : _("(WPA2/AES)"));
             }
         }
 
         foreach ($myInstReinstantiated->getAttributes("media:SSID_with_legacy") as $ssidname) {
-            $ssids[] = $ssidname['value'] . " " . _("(WPA2/AES and WPA/TKIP)");
+            $ssids[] = $ssidname['value']." "._("(WPA2/AES and WPA/TKIP)");
         }
         foreach ($myInstReinstantiated->getAttributes("media:SSID") as $ssidname) {
-            $ssids[] = $ssidname['value'] . " " . _("(WPA2/AES)");
+            $ssids[] = $ssidname['value']." "._("(WPA2/AES)");
         }
 
         echo "<table>";
@@ -135,7 +135,7 @@ 
         if (count($ssids) > 0) {
             $printedlist = "";
             foreach ($ssids as $names) {
-                $printedlist = $printedlist . "$names ";
+                $printedlist = $printedlist."$names ";
             }
             echo $uiElements->boxOkay(sprintf(_("Your installers will configure the following SSIDs: <strong>%s</strong>"), $printedlist), _("SSIDs configured"));
         }
@@ -163,7 +163,7 @@ 
                 // did we get an email address? then, show the silverbullet jumpstart button
                 // otherwise, issue a smartass comment
                 if (count($myInstReinstantiated->getAttributes("support:email")) > 0) {
-                    echo "<form method='post' action='edit_silverbullet.php?inst_id=$myInstReinstantiated->identifier' accept-charset='UTF-8'><button type='submit'>" . sprintf(_("Continue to %s properties"), \core\ProfileSilverbullet::PRODUCTNAME) . "</button></form>";
+                    echo "<form method='post' action='edit_silverbullet.php?inst_id=$myInstReinstantiated->identifier' accept-charset='UTF-8'><button type='submit'>".sprintf(_("Continue to %s properties"), \core\ProfileSilverbullet::PRODUCTNAME)."</button></form>";
                 } else {
                     echo "<table>";
                     echo $uiElements->boxError(sprintf(_("You did not submit an e-mail address. This is required for %s. Please go to the %s dashboard and edit your helpdesk settings to include a helpdesk e-mail address."), core\ProfileSilverbullet::PRODUCTNAME, $ui->nomenclatureInst), _("No support e-mail!"));
@@ -171,10 +171,10 @@ 
                 }
             }
             if (CONFIG['FUNCTIONALITY_LOCATIONS']['CONFASSISTANT_RADIUS'] == "LOCAL") {
-                echo "<br/><form method='post' action='edit_profile.php?inst_id=$myInstReinstantiated->identifier' accept-charset='UTF-8'><button type='submit'>" . _("Continue to RADIUS/EAP profile definition") . "</button></form>";
+                echo "<br/><form method='post' action='edit_profile.php?inst_id=$myInstReinstantiated->identifier' accept-charset='UTF-8'><button type='submit'>"._("Continue to RADIUS/EAP profile definition")."</button></form>";
             }
         }
-        echo "<br/><form method='post' action='overview_idp.php?inst_id=$myInstReinstantiated->identifier' accept-charset='UTF-8'><button type='submit'>" . _("Continue to dashboard") . "</button></form>";
+        echo "<br/><form method='post' action='overview_idp.php?inst_id=$myInstReinstantiated->identifier' accept-charset='UTF-8'><button type='submit'>"._("Continue to dashboard")."</button></form>";
         echo $deco->footer();
         break;
     default: