GEANT / CAT

core/DeviceConfig.php

Indentation -1 removed lines

@@ -109,7 +109,6 @@
      * ["my.server.name"] => "my.server.name"
      * ["foo.bar.de", "baz.bar.ge"] => "e"
      * ["server1.example.com", "server2.example.com", "serverN.example.com"] => ".example.com"
-
      * @return string
      */
     public function longestNameSuffix()

Spacing +3 added lines, -3 removed lines

@@ -86,7 +86,7 @@ 
     protected function setSupportedEapMethods($eapArray)
     {
         $this->supportedEapMethods = $eapArray;
-        $this->loggerInstance->debug(4, "This device (" . __CLASS__ . ") supports the following EAP methods: ");
+        $this->loggerInstance->debug(4, "This device (".__CLASS__.") supports the following EAP methods: ");
         $this->loggerInstance->debug(4, $this->supportedEapMethods);
     }
 
@@ -460,7 +460,7 @@ 
                 return $baseName.$inst.'-'.$prof;
             }
         }
-        return $baseName . $inst;
+        return $baseName.$inst;
     }
 
     /**
@@ -590,7 +590,7 @@ 
             // only add network blocks if their respective condition is met in this profile
             if ($netDetails['condition'] === TRUE || (isset($this->attributes[$netDetails['condition']]) && $this->attributes[$netDetails['condition']] === TRUE)) { 
                 $networks[$netName] = $netDetails;
-                $this->loggerInstance->debug(5,$netName, "\nAdding network: ");
+                $this->loggerInstance->debug(5, $netName, "\nAdding network: ");
             }
         }
         // add locally defined SSIDs

web/lib/common/InputValidation.php

Spacing +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
     private function inputValidationError($customtext)
     {
         \core\common\Entity::intoThePotatoes();
-        $retval = "<p>" . _("Input validation error: ") . $customtext . "</p>";
+        $retval = "<p>"._("Input validation error: ").$customtext."</p>";
         \core\common\Entity::outOfThePotatoes();
         return $retval;
     }
@@ -541,7 +541,7 @@ 
         try {
             $image->readImageBlob($binary);
         } catch (\ImagickException $exception) {
-            echo "Error" . $exception->getMessage();
+            echo "Error".$exception->getMessage();
             return FALSE;
         }
         // image survived the sanity check

core/ExternalEduroamDBData.php

Spacing +3 added lines, -3 removed lines

@@ -131,7 +131,7 @@ 
             return $this->counter;
         }
 
-        $cachedNumber = @file_get_contents(ROOT . "/var/tmp/cachedSPNumber.serialised");
+        $cachedNumber = @file_get_contents(ROOT."/var/tmp/cachedSPNumber.serialised");
         if ($cachedNumber !== FALSE) {
             $numberData = unserialize($cachedNumber);
             $now = new \DateTime();
@@ -144,7 +144,7 @@ 
         } else { // data in cache is too old or doesn't exist. We really need to ask the database
             $list = $this->listAllServiceProviders();
             $this->counter = count($list);
-            file_put_contents(ROOT . "/var/tmp/cachedSPNumber.serialised", serialize(["number" => $this->counter, "timestamp" => new \DateTime()]));
+            file_put_contents(ROOT."/var/tmp/cachedSPNumber.serialised", serialize(["number" => $this->counter, "timestamp" => new \DateTime()]));
             return $this->counter;
         }
     }
@@ -175,7 +175,7 @@ 
         $returnarray = [];
         $query = "SELECT id_institution AS id, country, inst_realm as realmlist, name AS collapsed_name, contact AS collapsed_contact, type FROM view_active_institution WHERE country = ?";
         if ($eduroamDbType !== NULL) {
-            $query .= " AND ( type = '" . ExternalEduroamDBData::TYPE_IDPSP . "' OR type = '" . $eduroamDbType . "')";
+            $query .= " AND ( type = '".ExternalEduroamDBData::TYPE_IDPSP."' OR type = '".$eduroamDbType."')";
         }
         $externals = $this->db->exec($query, "s", $tld);
         // was a SELECT query, so a resource and not a boolean

web/user/faq.inc.php

Spacing +3 added lines, -3 removed lines

@@ -45,11 +45,11 @@ 
     ],
     [
         'title' => sprintf(_("Is it safe to use %s installers?"), \config\Master::APPEARANCE['productname']),
-        'text' => sprintf(_("%s installers configure security settings on your device, therefore you should be sure that you are using genuine ones."), \config\Master::APPEARANCE['productname']) . ' ' . ( isset(\config\ConfAssistant::CONSORTIUM['signer_name']) && \config\ConfAssistant::CONSORTIUM['signer_name'] != "" ? sprintf(_("This is why %s installers are digitally signed by %s. Watch out for a system message confirming this."), \config\Master::APPEARANCE['productname'], \config\ConfAssistant::CONSORTIUM['signer_name']) : ""),
+        'text' => sprintf(_("%s installers configure security settings on your device, therefore you should be sure that you are using genuine ones."), \config\Master::APPEARANCE['productname']).' '.(isset(\config\ConfAssistant::CONSORTIUM['signer_name']) && \config\ConfAssistant::CONSORTIUM['signer_name'] != "" ? sprintf(_("This is why %s installers are digitally signed by %s. Watch out for a system message confirming this."), \config\Master::APPEARANCE['productname'], \config\ConfAssistant::CONSORTIUM['signer_name']) : ""),
     ],
     [
         'title' => _("Windows 'SmartScreen' or 'Internet Explorer' tell me that the file is not commonly downloaded and possibly harmful. Should I be concerned?"),
-        'text' => _("Contrary to what the name suggests, 'SmartScreen' isn't actually very smart. The warning merely means that the file has not yet been downloaded by enough users to make Microsoft consider it popular (which would strangely enough make it be considered 'safe'). This message alone is not a security problem.") . " " . (isset(\config\ConfAssistant::CONSORTIUM['signer_name']) && \config\ConfAssistant::CONSORTIUM['signer_name'] != "" ? sprintf(_("So long as the file is carrying a valid signature from %s, the download is safe."), \config\ConfAssistant::CONSORTIUM['signer_name']) . " " : "") . sprintf(_("Please see also Microsoft's FAQ regarding SmartScreen at %s."), "<a href='http://windows.microsoft.com/en-US/windows7/SmartScreen-Filter-frequently-asked-questions-IE9?SignedIn=1'>Microsoft FAQ</a>")
+        'text' => _("Contrary to what the name suggests, 'SmartScreen' isn't actually very smart. The warning merely means that the file has not yet been downloaded by enough users to make Microsoft consider it popular (which would strangely enough make it be considered 'safe'). This message alone is not a security problem.")." ".(isset(\config\ConfAssistant::CONSORTIUM['signer_name']) && \config\ConfAssistant::CONSORTIUM['signer_name'] != "" ? sprintf(_("So long as the file is carrying a valid signature from %s, the download is safe."), \config\ConfAssistant::CONSORTIUM['signer_name'])." " : "").sprintf(_("Please see also Microsoft's FAQ regarding SmartScreen at %s."), "<a href='http://windows.microsoft.com/en-US/windows7/SmartScreen-Filter-frequently-asked-questions-IE9?SignedIn=1'>Microsoft FAQ</a>")
     ],
     [
         'title' => sprintf(_("I can see %s network and my device is configured but it does not connect, what can be the cause?"), \config\ConfAssistant::CONSORTIUM['display_name']),
@@ -68,7 +68,7 @@ 
 $consortium = \config\ConfAssistant::CONSORTIUM['display_name'];
 array_push($Faq,
         [
-            'id' => 'what_is_' . \config\ConfAssistant::CONSORTIUM['name'],
+            'id' => 'what_is_'.\config\ConfAssistant::CONSORTIUM['name'],
             'title' => sprintf(_("What is this %s thing anyway?"), $consortium),
             'text' => sprintf(_("%s is a global WiFi roaming consortium which gives members of education and research access to the internet <i>for free</i> on all %s hotspots on the planet. There are several million %s users already, enjoying free internet access on more than %d hotspots! Visit <a href='http://www.eduroam.org'>the %s homepage</a> or <a href='http://monitor.eduroam.org/map_service_loc.php'>the %s location map</a> for more details."), $consortium, $consortium, $consortium, $SPs, $consortium, $consortium)
 ]);

core/diag/RADIUSTestsUI.php

Spacing +5 added lines, -5 removed lines

@@ -290,7 +290,7 @@ 
          <table><tr>
          <td class='icon_td'>";
         $out[] = "<img src='".$this->stateIcons[$this->globalLevelStatic]."' id='main_static_ico' class='icon'></td><td id='main_static_result'>".
-                            $this->globalInfo[$this->globalLevelStatic].' '. _("See the appropriate tab for details.").'</td>
+                            $this->globalInfo[$this->globalLevelStatic].' '._("See the appropriate tab for details.").'</td>
          </tr></table>';
         if ($this->naptr > 0) {
             $out[] = "<hr><strong>"._("Dynamic connectivity tests")."</strong>
@@ -323,7 +323,7 @@ 
 <td class='icon_td'><img src='".$this->stateIcons[$result->level]."' id='src".$hostindex."_img'></td>
 <td id='src$hostindex' colspan=2>
 ";
-            $out[] = '<strong>'.($result->server ? $result->server : _("Connected to undetermined server")).'</strong><br/>'.sprintf (_("elapsed time: %sms."), $result->time_millisec).'<p>'.$result->message.'</p>';
+            $out[] = '<strong>'.($result->server ? $result->server : _("Connected to undetermined server")).'</strong><br/>'.sprintf(_("elapsed time: %sms."), $result->time_millisec).'<p>'.$result->message.'</p>';
                     
             if ($result->level > \core\common\Entity::L_OK && property_exists($result, 'cert_oddities')) {
                 foreach ($result->cert_oddities as $oddities) {
@@ -408,7 +408,7 @@ 
             } else {
                 $certdesc = '<br>';
             }
-            $capathtest[] = '<div>'.($capath->message!='' ? $capath->message : _('Test failed')).'</div>'.$more;
+            $capathtest[] = '<div>'.($capath->message != '' ? $capath->message : _('Test failed')).'</div>'.$more;
             $capathtest[] = '</td>
 </tr>
 </table>';
@@ -434,7 +434,7 @@ 
                         $srefused = 0;
                         $cliinfo = '';
                         $cliinfo .= '<li>'._('Client certificate').' <b>'.$ca->clientcertinfo->from.
-                                    '</b>'.', '.$ca->clientcertinfo->message .
+                                    '</b>'.', '.$ca->clientcertinfo->message.
                                     '<br> (CA: '.$ca->clientcertinfo->issuer.')<ul>';
                         foreach ($ca->certificate as $certificate) {
                             if ($certificate->returncode == \core\diag\RADIUSTests::RETVAL_CONNECTION_REFUSED) {
@@ -494,7 +494,7 @@ 
                 } else {
                     $cliinfo = _('Test failed');
                     $clientstest[] = "<table><tr><td class='icon_td' id='srcclient".$hostindex."_img'><img src='".
-                                    $this->stateIcons[\core\common\Entity::L_WARN]."'></td>" .
+                                    $this->stateIcons[\core\common\Entity::L_WARN]."'></td>".
                                     "<td id='srcclient$hostindex'>$cliinfo</td></tr></table>";
                 }
             } else {

ansible/ManagedSP/templates/web/lib.inc

Spacing +3 added lines, -3 removed lines

@@ -6,9 +6,9 @@
 function cat_socket($obj) {
    $sock = socket_create(AF_UNIX, SOCK_STREAM, 0);
    $conn = socket_connect($sock, SOCKET);
-   if ( $conn ) {
-     socket_write ($sock, $obj, strlen($obj));
-     $out = socket_read ($sock, 2048);
+   if ($conn) {
+     socket_write($sock, $obj, strlen($obj));
+     $out = socket_read($sock, 2048);
      return $out;
    }
    return 'FAILURE';

Indentation +8 added lines, -8 removed lines

@@ -2,12 +2,12 @@
 define('SOCKET', '/opt/Socket/CAT_requests/queue');
 
 function cat_socket($obj) {
-   $sock = socket_create(AF_UNIX, SOCK_STREAM, 0);
-   $conn = socket_connect($sock, SOCKET);
-   if ( $conn ) {
-     socket_write ($sock, $obj, strlen($obj));
-     $out = socket_read ($sock, 2048);
-     return $out;
-   }
-   return 'FAILURE';
+    $sock = socket_create(AF_UNIX, SOCK_STREAM, 0);
+    $conn = socket_connect($sock, SOCKET);
+    if ( $conn ) {
+        socket_write ($sock, $obj, strlen($obj));
+        $out = socket_read ($sock, 2048);
+        return $out;
+    }
+    return 'FAILURE';
 }

web/lib/admin/MapGoogle.php

Spacing +14 added lines, -14 removed lines

@@ -47,7 +47,7 @@ 
     public function htmlHeadCode() {
         $cat = new \core\CAT();
         \core\common\Entity::intoThePotatoes();
-        $retval = "<script type='text/javascript' src='https://maps.googleapis.com/maps/api/js?key=" . \config\Master::APPEARANCE['google_maps_api_key'] . "'></script>
+        $retval = "<script type='text/javascript' src='https://maps.googleapis.com/maps/api/js?key=".\config\Master::APPEARANCE['google_maps_api_key']."'></script>
     <script type='text/javascript'>
         // some global variables;
         var center_lat=49.6114885608729;
@@ -103,19 +103,19 @@ 
          *
          */
         function locator_magic() {
-            geocoder.geocode({'address':\"" . preg_replace("/\"/", "&quot;", $this->instName) . "\", 'region':\"" . strtolower($this->fedName) . "\"},
+            geocoder.geocode({'address':\"" . preg_replace("/\"/", "&quot;", $this->instName)."\", 'region':\"".strtolower($this->fedName)."\"},
             function(r,status) {
                 if(status != google.maps.GeocoderStatus.OK) {
-                    locate_country(\"" . $cat->knownFederations[strtoupper($this->fedName)] . "\");
+                    locate_country(\"" . $cat->knownFederations[strtoupper($this->fedName)]."\");
                 } else {
                     var i;
                     for(i = 0; i < r.length; i++) {
                         Addr = getAddressElements(r[i].address_components);
-                        if(Addr.country == \"" . strtoupper($this->fedName) . "\")
+                        if(Addr.country == \"" . strtoupper($this->fedName)."\")
                         break;
                     }
-                    if(Addr.country != \"" . strtoupper($this->fedName) . "\")
-                    locate_country(\"" . $cat->knownFederations[strtoupper($this->fedName)] . "\");
+                    if(Addr.country != \"" . strtoupper($this->fedName)."\")
+                    locate_country(\"" . $cat->knownFederations[strtoupper($this->fedName)]."\");
                     else {
                         addMarker(r[i].geometry.location,15,null);
                     }
@@ -128,7 +128,7 @@ 
          */
         function markerClicked(m) {
             info_window.close();
-            var t = \"" . _("This is location ") . "\"+m.info;
+            var t = \"" . _("This is location ")."\"+m.info;
             info_window.setContent(t);
             info_window.setPosition(m.getPosition());
             info_window.open(map,m);
@@ -207,7 +207,7 @@ 
         function getAddressLocation() {
             var city = $('#address').val();
             if(city == '') {
-                alert(\"" . _("nothing entered in the address field") . "\");
+                alert(\"" . _("nothing entered in the address field")."\");
                 return false;
             }
             geocoder.geocode( { 'address': city}, function(results, status) {
@@ -227,7 +227,7 @@ 
          * trigger geolocation
          */
         function locateMe() {
-            $('#address').val(\"" . _("locating") . "\");
+            $('#address').val(\"" . _("locating")."\");
             navigator.geolocation.getCurrentPosition(locate_succes,locate_fail,{maximumAge:3600000, timeout:5000});
         }
 
@@ -345,7 +345,7 @@ 
         if ($this->readOnly) {
             return "<div id='map' class='googlemap'></div>";
         } else {
-            return $this->htmlPreEdit($wizard, $additional) . $this->findLocationHtml() . "<div id='map' class='googlemap'></div>" . $this->htmlPostEdit(FALSE);
+            return $this->htmlPreEdit($wizard, $additional).$this->findLocationHtml()."<div id='map' class='googlemap'></div>".$this->htmlPostEdit(FALSE);
         }
     }
 
@@ -358,11 +358,11 @@ 
      */
     public static function optionListDisplayCode($coords, $number) {
         // quiesce warnings about unused variable
-        if (strlen(sprintf("%s", $coords)) <0) {
+        if (strlen(sprintf("%s", $coords)) < 0) {
             throw new \Exception("A miracle! A string with negative length!");
         };
         \core\common\Entity::intoThePotatoes();
-        $retval = "<button id='location_b_" . $number . "' class='location_button'>" . _("Click to see location") . " $number</button>";
+        $retval = "<button id='location_b_".$number."' class='location_button'>"._("Click to see location")." $number</button>";
         \core\common\Entity::outOfThePotatoes();
         return $retval;
     }
@@ -373,7 +373,7 @@ 
      * @return string
      */
     public function bodyTagCode() {
-        return "onload='load(" . ($this->readOnly ? "0" : "1") . ")'";
+        return "onload='load(".($this->readOnly ? "0" : "1").")'";
     }
 
     /**
@@ -383,7 +383,7 @@ 
      */
     private function findLocationHtml() {
         \core\common\Entity::intoThePotatoes();
-        $retval = "<p>" . _("Address:") . " <input name='address' id='address' /><button type='button' onclick='getAddressLocation()'>" . _("Find address") . "</button> <button type='button' onclick='locateMe()'>" . _("Locate Me!") . "</button></p>";
+        $retval = "<p>"._("Address:")." <input name='address' id='address' /><button type='button' onclick='getAddressLocation()'>"._("Find address")."</button> <button type='button' onclick='locateMe()'>"._("Locate Me!")."</button></p>";
         \core\common\Entity::outOfThePotatoes();
         return $retval;
     }

web/admin/edit_user.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(__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();
@@ -37,14 +37,14 @@ 
     </h1>
     <div class='infobox'>
         <h2>
-            <?php $tablecaption = _("Current User Attributes"); echo $tablecaption;?>
+            <?php $tablecaption = _("Current User Attributes"); echo $tablecaption; ?>
         </h2>
         <table>
-            <caption><?php echo $tablecaption;?></caption>
+            <caption><?php echo $tablecaption; ?></caption>
             <tr>
-                <th class="wai-invisible" scope="col"><?php echo _("Property Type");?></th>
-                <th class="wai-invisible" scope="col"><?php echo _("Language if applicable");?></th>
-                <th class="wai-invisible" scope="col"><?php echo _("Property Value");?></th>
+                <th class="wai-invisible" scope="col"><?php echo _("Property Type"); ?></th>
+                <th class="wai-invisible" scope="col"><?php echo _("Language if applicable"); ?></th>
+                <th class="wai-invisible" scope="col"><?php echo _("Property Value"); ?></th>
             </tr>
             <?php echo $uiElements->infoblock($user->getAttributes(), "user", "User"); ?>
         </table>

web/admin/edit_user_result.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(__FILE__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
 
 $loggerInstance = new \core\common\Logging();
 $deco = new \web\lib\admin\PageDecoration();
@@ -29,7 +29,7 @@ 
 
 $user = new \core\User($_SESSION['user']);
 if (!isset($_POST['submitbutton']) || $_POST['submitbutton'] != web\lib\common\FormElements::BUTTON_SAVE) { // what are we supposed to do?
-    echo "<p>" . _("The page was called with insufficient data. Please report this as an error.") . "</p>";
+    echo "<p>"._("The page was called with insufficient data. Please report this as an error.")."</p>";
     echo $deco->footer();
     exit(0);
 }
@@ -46,7 +46,7 @@ 
 if (isset($_POST['option'])) {
     foreach ($_POST['option'] as $opt_id => $optname) {
         if ($optname == "user:fedadmin") {
-            echo "Security violation: user tried to make himself " . \config\ConfAssistant::CONSORTIUM['nomenclature_federation'] . " administrator!";
+            echo "Security violation: user tried to make himself ".\config\ConfAssistant::CONSORTIUM['nomenclature_federation']." administrator!";
             exit(1);
         }
     }
@@ -71,11 +71,11 @@ 
 ?>
 <h1><?php $tablecaption = _("Submitted attributes for this user"); echo $tablecaption; ?></h1>
 <table>
-            <caption><?php echo $tablecaption;?></caption>
+            <caption><?php echo $tablecaption; ?></caption>
             <tr>
                             <tr>
-                <th class="wai-invisible" scope="col"><?php echo _("Overall Result");?></th>
-                <th class="wai-invisible" scope="col"><?php echo _("Details");?></th>
+                <th class="wai-invisible" scope="col"><?php echo _("Overall Result"); ?></th>
+                <th class="wai-invisible" scope="col"><?php echo _("Details"); ?></th>
             </tr>
     <?php
     echo $optionParser->processSubmittedFields($user, $_POST, $_FILES);