GEANT / CAT

web/admin/edit_hotspot.php

Spacing +8 added lines, -8 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 @@ 
 if (!isset($_GET['deployment_id'])) {
     if (isset($_POST['consortium']) && 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!");
@@ -53,7 +53,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);
     }
 
@@ -62,7 +62,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);
     }
 
@@ -84,7 +84,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);
     }
 }
@@ -112,7 +112,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'>
@@ -144,7 +144,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>
@@ -164,7 +164,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

web/admin/overview_org.php

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));
@@ -173,14 +173,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/>
@@ -189,7 +189,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
             }
@@ -214,21 +214,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>";
                                 }
@@ -240,7 +240,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/>";
@@ -278,10 +278,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"); ?>
@@ -315,9 +315,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,
@@ -329,9 +329,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>";
@@ -381,7 +381,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>
@@ -407,7 +407,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) {
@@ -428,7 +428,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";
@@ -436,7 +436,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>
@@ -450,13 +450,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>
@@ -464,9 +464,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>
@@ -474,22 +474,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>
@@ -541,12 +541,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>';
                                             }
                                         }
                                     }
@@ -566,12 +566,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>';
                                             }
                                         }
                                     }