GEANT / CAT

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/diag/testTelepath.php

Spacing +2 added lines, -2 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";
 
 $therealm = filter_input(INPUT_GET, 'realm', FILTER_SANITIZE_STRING);
 $thevisited = filter_input(INPUT_GET, 'visited', FILTER_SANITIZE_STRING);
@@ -35,7 +35,7 @@ 
     $validator = new \web\lib\common\InputValidation();
     
     echo "<pre>";
-    echo "Testing " . $validatedRealm . " in " . $validator->string($thevisited);
+    echo "Testing ".$validatedRealm." in ".$validator->string($thevisited);
     print_r($telepath->magic());
     echo "</pre>";
 }
\ No newline at end of file

web/diag/testSociopath.php

Spacing +1 added lines, -1 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";
 
 $sociopath = new \core\diag\Sociopath();
 

web/lib/user/Skinjob.php

Spacing +6 added lines, -6 removed lines

@@ -95,17 +95,17 @@
         }
 
         // does the file exist in the current skin's directory? Has precedence
-        if ($submodule !== '' && file_exists(__DIR__ . "/../../skins/" . $this->skin . "/" . $submodule . $path . $filename)) {
-            $extrapath = "/skins/" . $this->skin . "/" . $submodule;
+        if ($submodule !== '' && file_exists(__DIR__."/../../skins/".$this->skin."/".$submodule.$path.$filename)) {
+            $extrapath = "/skins/".$this->skin."/".$submodule;
         }
-        elseif (file_exists(__DIR__ . "/../../skins/" . $this->skin . $path . $filename)) {
-            $extrapath = "/skins/" . $this->skin;
-        } elseif (file_exists(__DIR__ . "/../../" . $path . $filename)) {
+        elseif (file_exists(__DIR__."/../../skins/".$this->skin.$path.$filename)) {
+            $extrapath = "/skins/".$this->skin;
+        } elseif (file_exists(__DIR__."/../../".$path.$filename)) {
             $extrapath = "";
         } else {
             return FALSE;
         }       
-        return htmlspecialchars(\core\CAT::getRootUrlPath() . $extrapath . $path . $filename, ENT_QUOTES);
+        return htmlspecialchars(\core\CAT::getRootUrlPath().$extrapath.$path.$filename, ENT_QUOTES);
     }
 
 }

Braces +1 added lines, -2 removed lines

@@ -97,8 +97,7 @@
         // does the file exist in the current skin's directory? Has precedence
         if ($submodule !== '' && file_exists(__DIR__ . "/../../skins/" . $this->skin . "/" . $submodule . $path . $filename)) {
             $extrapath = "/skins/" . $this->skin . "/" . $submodule;
-        }
-        elseif (file_exists(__DIR__ . "/../../skins/" . $this->skin . $path . $filename)) {
+        } elseif (file_exists(__DIR__ . "/../../skins/" . $this->skin . $path . $filename)) {
             $extrapath = "/skins/" . $this->skin;
         } elseif (file_exists(__DIR__ . "/../../" . $path . $filename)) {
             $extrapath = "";

web/lib/admin/MapNone.php

Indentation +1 added lines, -1 removed lines

@@ -83,7 +83,7 @@
      */
     public function htmlShowtime($wizard = FALSE, $additional = FALSE) {
         if (!$this->readOnly) {
- //           return $this->htmlPreEdit($wizard, $additional) . $this->htmlPostEdit(TRUE);
+    //           return $this->htmlPreEdit($wizard, $additional) . $this->htmlPostEdit(TRUE);
             return $this->htmlPreEdit($wizard, $additional) . $this->findLocationHtml() . $this->htmlPostEdit(TRUE);
         }
     }

Spacing +3 added lines, -3 removed lines

@@ -82,7 +82,7 @@ 
     public function htmlShowtime($wizard = FALSE, $additional = FALSE) {
         if (!$this->readOnly) {
  //           return $this->htmlPreEdit($wizard, $additional) . $this->htmlPostEdit(TRUE);
-            return $this->htmlPreEdit($wizard, $additional) . $this->findLocationHtml() . $this->htmlPostEdit(TRUE);
+            return $this->htmlPreEdit($wizard, $additional).$this->findLocationHtml().$this->htmlPostEdit(TRUE);
         }
     }
 
@@ -106,7 +106,7 @@ 
         // quiesce warnings about unused parameter
         sprintf("%d", $number);
         $pair = json_decode($coords, true);
-        return "<table><tr><td>Latitude</td><td><strong>" . $pair['lat'] . "</strong></td></tr><tr><td>Longitude</td><td><strong>" . $pair['lon'] . "</strong></td></tr></table>";
+        return "<table><tr><td>Latitude</td><td><strong>".$pair['lat']."</strong></td></tr><tr><td>Longitude</td><td><strong>".$pair['lon']."</strong></td></tr></table>";
     }
     
     /**
@@ -116,7 +116,7 @@ 
      */
     private function findLocationHtml() {
         \core\common\Entity::intoThePotatoes();
-        $retval = "<button type='button' onclick='locateMe()'>" . _("Locate Me!") . "</button></p>";
+        $retval = "<button type='button' onclick='locateMe()'>"._("Locate Me!")."</button></p>";
         \core\common\Entity::outOfThePotatoes();
         return $retval;
     }