GEANT / CAT

web/user/API.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
  *
  * @package UserAPI
  */
-require dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
+require dirname(dirname(dirname(__FILE__)))."/config/_config.php";
 $API = new \core\UserNetAPI();
 $validator = new web\lib\common\InputValidation();
 $loggerInstance = new \core\common\Logging();

web/user/tou.inc.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
  *          <base_url>/copyright.php after deploying the software
  */
 
-        $Tou =  [
+        $Tou = [
     'title' => _("Terms of Use"),
     'subtitle' => _("(for legal reasons, the Terms of Use are in English only)"),
     'short' => "<p>The purpose of this service is to make eduroam configuration easier for end users and eduroam

web/admin/edit_user.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,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";
 
 $deco = new \web\lib\admin\PageDecoration();
 $uiElements = new web\lib\admin\UIElements();

web/admin/inc/toggleRedirect.inc.php

Spacing +6 added lines, -6 removed lines

@@ -19,7 +19,7 @@ 
  *          <base_url>/copyright.php after deploying the software
  */
 
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php";
+require_once dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php";
 
 $auth = new \web\lib\admin\Authentication();
 $loggerInstance = new \core\common\Logging();
@@ -85,7 +85,7 @@ 
         $remaining_attribs = $my_profile->beginFlushMethodLevelAttributes($eaptype->getIntegerRep(), NULL);
         $optionParser->processSubmittedFields($my_profile, $_POST, $_FILES, $eaptype->getIntegerRep(), NULL);
     }
-    $loggerInstance->writeAudit($_SESSION['user'], "MOD", "Profile " . $my_profile->identifier . " - device/EAP-Type settings changed");
+    $loggerInstance->writeAudit($_SESSION['user'], "MOD", "Profile ".$my_profile->identifier." - device/EAP-Type settings changed");
     header("Location: ../overview_installers.php?inst_id=$my_inst->identifier&profile_id=$my_profile->identifier");
     exit;
 }
@@ -99,7 +99,7 @@ 
     }
     $captiontext = sprintf(_("device <strong>%s</strong>"), $device['display']);
     $keyword = "device-specific";
-    $extrainput = "<input type='hidden' name='device' value='" . $device_key . "'/>";
+    $extrainput = "<input type='hidden' name='device' value='".$device_key."'/>";
 } elseif ($eaptype !== NULL) {
     foreach ($my_profile->getAttributes() as $attrib) {
         if (isset($attrib['eapmethod']) && $attrib['eapmethod'] == $eaptype->getArrayRep()) {
@@ -109,12 +109,12 @@ 
 
     $captiontext = sprintf(_("EAP-Type <strong>%s</strong>"), $eaptype->getPrintableRep());
     $keyword = "eap-specific";
-    $extrainput = "<input type='hidden' name='eaptype' value='" . $eaptype->getIntegerRep() . "'>";
+    $extrainput = "<input type='hidden' name='eaptype' value='".$eaptype->getIntegerRep()."'>";
 } else {
     throw new Exception("previous type checks make it impossible to reach this code path.");
 }
 ?>
-<p><?php echo _("Fine-tuning options for ") . $captiontext; ?></p>
+<p><?php echo _("Fine-tuning options for ").$captiontext; ?></p>
 <hr/>
 
 <form action='inc/toggleRedirect.inc.php?inst_id=<?php echo $my_inst->identifier; ?>&amp;profile_id=<?php echo $my_profile->identifier; ?>' method='post' accept-charset='UTF-8'><?php echo $extrainput; ?>
@@ -123,7 +123,7 @@ 
     $interesting_attribs = [];
 
     foreach ($attribs as $attrib) {
-        if ($attrib['level'] == "Method" && preg_match('/^' . $keyword . ':/', $attrib['name'])) {
+        if ($attrib['level'] == "Method" && preg_match('/^'.$keyword.':/', $attrib['name'])) {
             $interesting_attribs[] = $attrib;
         }
     }

web/admin/inc/logout.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
  */
 ?>
 <?php
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php";
+require_once dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php";
 
 $auth = new \web\lib\admin\Authentication();
 

web/admin/inc/click_button_js.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
  *          <base_url>/copyright.php after deploying the software
  */
 
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php";
+require_once dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php";
 ?>
 
 <!-- JQuery --> 

web/admin/overview_installers.php

Spacing +8 added lines, -8 removed lines

@@ -19,7 +19,7 @@ 
  *          <base_url>/copyright.php after deploying the software
  */
 
-require_once dirname(dirname(__DIR__)) . "/config/_config.php";
+require_once dirname(dirname(__DIR__))."/config/_config.php";
 
 $deco = new \web\lib\admin\PageDecoration();
 $validator = new \web\lib\common\InputValidation();
@@ -53,10 +53,10 @@ 
             <?php
             foreach ($preflist as $method) {
                 $escapedMethod = $method->getIntegerRep();
-                echo "<th style='min-width:200px'>" . $method->getPrintableRep() . "<br/>
+                echo "<th style='min-width:200px'>".$method->getPrintableRep()."<br/>
                         <form method='post' action='inc/toggleRedirect.inc.php?inst_id=$my_inst->identifier&amp;profile_id=$my_profile->identifier' onsubmit='popupRedirectWindow(this); return false;' accept-charset='UTF-8'>
                         <input type='hidden' name='eaptype' value='$escapedMethod'>
-                        <button class='redirect' type='submit'>" . _("EAP-Type-specific options...") . "</button>
+                        <button class='redirect' type='submit'>"._("EAP-Type-specific options...")."</button>
                         </form></th>";
             }
             ?>
@@ -72,10 +72,10 @@ 
         foreach (\devices\Devices::listDevices() as $index => $description) {
 
             echo "<tr>";
-            echo "<td align='center'><img src='../resources/images/vendorlogo/" . $description['group'] . ".png' alt='logo'></td><td>" . $description['display'] . "<br/>
+            echo "<td align='center'><img src='../resources/images/vendorlogo/".$description['group'].".png' alt='logo'></td><td>".$description['display']."<br/>
                         <form method='post' action='inc/toggleRedirect.inc.php?inst_id=$my_inst->identifier&amp;profile_id=$my_profile->identifier' onsubmit='popupRedirectWindow(this); return false;' accept-charset='UTF-8'>
                         <input type='hidden' name='device' value='$index'>
-                        <button class='redirect' type='submit'>" . _("Device-specific options...") . "</button>
+                        <button class='redirect' type='submit'>"._("Device-specific options...")."</button>
                         </form>
                         </td>";
             $factory = new \core\DeviceFactory($index);
@@ -84,10 +84,10 @@ 
                 $footnotesForDevEapCombo = [];
                 $display_footnote = FALSE;
                 $langObject = new \core\common\Language();
-                $downloadform = "<form action='" . rtrim(dirname(dirname($_SERVER['SCRIPT_NAME'])), '/') . "/user/API.php?action=downloadInstaller&profile=$my_profile->identifier&lang=" . $langObject->getLang() . "' method='post' accept-charset='UTF-8'>
+                $downloadform = "<form action='".rtrim(dirname(dirname($_SERVER['SCRIPT_NAME'])), '/')."/user/API.php?action=downloadInstaller&profile=$my_profile->identifier&lang=".$langObject->getLang()."' method='post' accept-charset='UTF-8'>
                                        <input type='hidden' name='device' value='$index'/>
                                        <input type='hidden' name='generatedfor'  value='admin'/>
-                                       <button class='download'>" . _("Download") . "</button>
+                                       <button class='download'>"._("Download")."</button>
                                      ";
                 // first of all: if redirected, indicate by color
 
@@ -158,7 +158,7 @@ 
     </table>
     <?php
     if (count($distinctFootnotes)) {
-        echo "<p><strong>" . _("Footnotes:") . "</strong></p><table>";
+        echo "<p><strong>"._("Footnotes:")."</strong></p><table>";
         foreach ($distinctFootnotes as $number => $text) {
             echo "<tr><td>($number) - </td><td>$text</td></tr>";
         }

web/admin/edit_profile_result.php

Spacing +13 added lines, -13 removed lines

@@ -19,7 +19,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();
 $deco = new \web\lib\admin\PageDecoration();
@@ -115,7 +115,7 @@ 
         $profile = $my_profile;
     } else {
         $profile = $my_inst->newProfile(core\AbstractProfile::PROFILETYPE_RADIUS);
-        $loggerInstance->writeAudit($_SESSION['user'], "NEW", "IdP " . $my_inst->identifier . " - Profile created");
+        $loggerInstance->writeAudit($_SESSION['user'], "NEW", "IdP ".$my_inst->identifier." - Profile created");
     }
 }
 
@@ -130,7 +130,7 @@ 
     $uiElements = new web\lib\admin\UIElements();
     // set realm info, if submitted
     if ($realm !== FALSE) {
-        $profile->setRealm($anonLocal . "@" . $realm);
+        $profile->setRealm($anonLocal."@".$realm);
         echo $uiElements->boxOkay(sprintf(_("Realm: <strong>%s</strong>"), $realm));
     } else {
         $profile->setRealm("");
@@ -153,7 +153,7 @@ 
             echo $uiElements->boxError(_("Realm check username cannot be configured: realm is missing!"));
         } else {
             $profile->setRealmcheckUser(true, $checkuser_name);
-            echo $uiElements->boxOkay(sprintf(_("Special username for realm check is <strong>%s</strong>, the value is <strong>%s</strong>"), _("ON"), $checkuser_name . "@" . $realm));
+            echo $uiElements->boxOkay(sprintf(_("Special username for realm check is <strong>%s</strong>, the value is <strong>%s</strong>"), _("ON"), $checkuser_name."@".$realm));
         }
     } else {
         $profile->setRealmCheckUser(false);
@@ -166,7 +166,7 @@ 
         } else {
             $profile->setInputVerificationPreference($verify, $hint);
             if ($hint !== FALSE) {
-                $extratext = " " . sprintf(_("and the input field will be prefilled with '<strong>@%s</strong>'."), $realm);
+                $extratext = " ".sprintf(_("and the input field will be prefilled with '<strong>@%s</strong>'."), $realm);
             } else {
                 $extratext = ".";
             }
@@ -203,7 +203,7 @@ 
         echo $uiElements->boxOkay(_("Redirection is <strong>OFF</strong>"));
     }
 
-    $loggerInstance->writeAudit($_SESSION['user'], "MOD", "Profile " . $profile->identifier . " - attributes changed");
+    $loggerInstance->writeAudit($_SESSION['user'], "MOD", "Profile ".$profile->identifier." - attributes changed");
 
     // re-instantiate $profile, we need to do completion checks and need fresh data for isEapTypeDefinitionComplete()
 
@@ -216,23 +216,23 @@ 
         if ($a->getIntegerRep() == \core\common\EAP::INTEGER_SILVERBULLET) { // do not allow adding silverbullet via the backdoor
             continue;
         }
-        if (isset($_POST[$a->getPrintableRep()]) && isset($_POST[$a->getPrintableRep() . "-priority"]) && is_numeric($_POST[$a->getPrintableRep() . "-priority"])) {
-            $priority = (int) $_POST[$a->getPrintableRep() . "-priority"];
+        if (isset($_POST[$a->getPrintableRep()]) && isset($_POST[$a->getPrintableRep()."-priority"]) && is_numeric($_POST[$a->getPrintableRep()."-priority"])) {
+            $priority = (int) $_POST[$a->getPrintableRep()."-priority"];
             // add EAP type to profile as requested, but ...
             $profile->addSupportedEapMethod($a, $priority);
-            $loggerInstance->writeAudit($_SESSION['user'], "MOD", "Profile " . $profile->identifier . " - supported EAP types changed");
+            $loggerInstance->writeAudit($_SESSION['user'], "MOD", "Profile ".$profile->identifier." - supported EAP types changed");
             // see if we can enable the EAP type, or if info is missing
             $eapcompleteness = $profile->isEapTypeDefinitionComplete($a);
             if ($eapcompleteness === true) {
-                echo $uiElements->boxOkay(_("Supported EAP Type: ") . "<strong>" . $a->getPrintableRep() . "</strong>");
+                echo $uiElements->boxOkay(_("Supported EAP Type: ")."<strong>".$a->getPrintableRep()."</strong>");
             } else {
                 $warntext = "";
                 if (is_array($eapcompleteness)) {
                     foreach ($eapcompleteness as $item) {
-                        $warntext .= "<strong>" . $uiElements->displayName($item) . "</strong> ";
+                        $warntext .= "<strong>".$uiElements->displayName($item)."</strong> ";
                     }
                 }
-                echo $uiElements->boxWarning(sprintf(_("Supported EAP Type: <strong>%s</strong> is missing required information %s !"), $a->getPrintableRep(), $warntext) . "<br/>" . _("The EAP type was added to the profile, but you need to complete the missing information before we can produce installers for you."));
+                echo $uiElements->boxWarning(sprintf(_("Supported EAP Type: <strong>%s</strong> is missing required information %s !"), $a->getPrintableRep(), $warntext)."<br/>"._("The EAP type was added to the profile, but you need to complete the missing information before we can produce installers for you."));
             }
         }
     }
@@ -248,7 +248,7 @@ 
 <?php
 if (count($reloadedProfile->getEapMethodsinOrderOfPreference(1)) > 0) {
     echo "<form method='post' action='overview_installers.php?inst_id=$my_inst->identifier&profile_id=$reloadedProfile->identifier' accept-charset='UTF-8'>
-        <button type='submit'>" . _("Continue to Installer Fine-Tuning and Download") . "</button>
+        <button type='submit'>"._("Continue to Installer Fine-Tuning and Download")."</button>
     </form>";
 }
 echo $deco->footer();

web/admin/112365365321.php

Spacing +3 added lines, -3 removed lines

@@ -19,7 +19,7 @@ 
  *          <base_url>/copyright.php after deploying the software
  */
 
-require_once dirname(dirname(__DIR__)) . '/config/_config.php';
+require_once dirname(dirname(__DIR__)).'/config/_config.php';
 
 $uiElements = new web\lib\admin\UIElements();
 
@@ -72,7 +72,7 @@ 
                     // filesystem cleanup
                     case web\lib\common\FormElements::BUTTON_DELETE:
                         $i = web\lib\admin\Maintenance::deleteObsoleteTempDirs();
-                        echo "<div class='ca-summary'><table>" . $uiElements->boxRemark(sprintf("Deleted %d cache directories.", $i), "Cache deleted") . "</table></div>";
+                        echo "<div class='ca-summary'><table>".$uiElements->boxRemark(sprintf("Deleted %d cache directories.", $i), "Cache deleted")."</table></div>";
                         break;
                     default:
                         break;
@@ -138,7 +138,7 @@ 
                     $admin_query = $dbHandle->exec("SELECT SUM(downloads_admin) AS admin, SUM(downloads_user) AS user, SUM(downloads_silverbullet) as silverbullet FROM downloads WHERE device_id = '$index'");
                     // SELECT -> mysqli_result, not boolean
                     while ($a = mysqli_fetch_object(/** @scrutinizer ignore-type */ $admin_query)) {
-                        echo "<td>" . $device_array['display'] . "</td><td>" . $a->admin . "</td><td>" . $a->user . "</td><td>" . $a->silverbullet . "</td><td>" . sprintf("%s", $a->user + $a->silverbullet) . "</td>";
+                        echo "<td>".$device_array['display']."</td><td>".$a->admin."</td><td>".$a->user."</td><td>".$a->silverbullet."</td><td>".sprintf("%s", $a->user + $a->silverbullet)."</td>";
                         $gross_admin = $gross_admin + $a->admin;
                         $gross_user = $gross_user + $a->user;
                         $gross_silverbullet = $gross_silverbullet + $a->silverbullet;