GEANT / CAT

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 +4 added lines, -4 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);
         }
     }
 
@@ -104,11 +104,11 @@ 
      */
     public static function optionListDisplayCode($coords, $number) {
         // quiesce warnings about unused parameter
-        if (strlen(sprintf("%d", $number)) <0) {
+        if (strlen(sprintf("%d", $number)) < 0) {
             throw new \Exception("A miracle! A string with negative length!");
         };
         $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>";
     }
     
     /**
@@ -118,7 +118,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;
     }

web/lib/admin/Maintenance.php

Spacing +4 added lines, -4 removed lines

@@ -34,8 +34,8 @@ 
      */
     public static function deleteObsoleteTempDirs() {
         $downloadsDirs = [
-            'site_installers' => dirname(dirname(dirname(dirname(__FILE__)))) . "/var/installer_cache",
-            'silverbullet' => dirname(dirname(dirname(dirname(__FILE__)))) . "/var/silverbullet"
+            'site_installers' => dirname(dirname(dirname(dirname(__FILE__))))."/var/installer_cache",
+            'silverbullet' => dirname(dirname(dirname(dirname(__FILE__))))."/var/silverbullet"
         ];
         $tm = time();
         $i = 0;
@@ -54,14 +54,14 @@ 
                     if ($entry === '.' || $entry === '..' || $entry === '.gitignore') {
                         continue;
                     }
-                    $ftime = $tm - filemtime($downloads . '/' . $entry);
+                    $ftime = $tm - filemtime($downloads.'/'.$entry);
                     if ($ftime < 3600) {
                         continue;
                     }
                     if (isset($Cache[$entry])) {
                         continue;
                     }
-                    \core\common\Entity::rrmdir($downloads . '/' . $entry);
+                    \core\common\Entity::rrmdir($downloads.'/'.$entry);
                     $i = $i + 1;
                     print "$entry\n";
                 }

web/copyright.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
  * @author Stefan Winter <stefan.winter@restena.lu>
  * @package Core
  */
-require_once dirname(dirname(__FILE__)) . "/config/_config.php";
+require_once dirname(dirname(__FILE__))."/config/_config.php";
 
 $Gui = new \web\lib\user\Gui();
 // ... unless overwritten by direct GET/POST parameter in the request or a SESSION setting

devices/xml/Device_XML.php

Spacing +10 added lines, -10 removed lines

@@ -31,7 +31,7 @@ 
  */
 namespace devices\xml;
 use Exception;
-require_once dirname(__FILE__) . '/XML.inc.php';
+require_once dirname(__FILE__).'/XML.inc.php';
 
 /**
  * This class implements full functionality of the generic XML device
@@ -132,11 +132,11 @@ 
         marshalObject($root, $eapIdp);
         $dom = dom_import_simplexml($root)->ownerDocument;
         //TODO schema validation makes sense so probably should be used
-        if ($dom->schemaValidate(ROOT . '/devices/xml/eap-metadata.xsd') === FALSE) {
+        if ($dom->schemaValidate(ROOT.'/devices/xml/eap-metadata.xsd') === FALSE) {
             throw new Exception("Schema validation failed for eap-metadata");
         }
-        file_put_contents($this->installerBasename . '.eap-config', $dom->saveXML());
-        return($this->installerBasename . '.eap-config');
+        file_put_contents($this->installerBasename.'.eap-config', $dom->saveXML());
+        return($this->installerBasename.'.eap-config');
     }
 
     private $AttributeNames = [
@@ -162,7 +162,7 @@ 
             $this->loggerInstance->debug(4, "Missing class definition for $attrName\n");
             return([]);
         }
-        $className = "\devices\xml\\" . $this->AttributeNames[$attrName];
+        $className = "\devices\xml\\".$this->AttributeNames[$attrName];
         $objs = [];
         if ($this->langScope === 'global') {
             foreach ($attributeList['langs'] as $language => $value) {
@@ -200,7 +200,7 @@ 
                 $displayname = new DisplayName();
                 if (isset($profileNameLangs)) {
                     $langOrC = isset($profileNameLangs[$language]) ? $profileNameLangs[$language] : $profileNameLangs['C'];
-                    $value .= ' - ' . $langOrC;
+                    $value .= ' - '.$langOrC;
                 }
                 $displayname->setValue($value);
                 $displayname->setAttributes(['lang' => $language]);
@@ -210,7 +210,7 @@ 
             $displayname = new DisplayName();
             $value = $attr['general:instname'][0];
             if ($attr['internal:profile_count'][0] > 1) {
-                $value .= ' - ' . $attr['profile:name'][0];
+                $value .= ' - '.$attr['profile:name'][0];
             }
             $displayname->setValue($value);
             $objs[] = $displayname;
@@ -227,7 +227,7 @@ 
         $attr = $this->attributes;
         if (isset($attr['general:logo_file'][0])) {
             $logoString = base64_encode($attr['general:logo_file'][0]);
-            $logoMime = 'image/' . $attr['internal:logo_file'][0]['mime'];
+            $logoMime = 'image/'.$attr['internal:logo_file'][0]['mime'];
             $providerlogo = new ProviderLogo();
             $providerlogo->setAttributes(['mime' => $logoMime, 'encoding' => 'base64']);
             $providerlogo->setValue($logoString);
@@ -327,7 +327,7 @@ 
 
         if (isset($inner["METHOD"]) && $inner["METHOD"]) {
             $innerauthmethod = new InnerAuthenticationMethod();
-            $typeOfInner = "\devices\xml\\" . ($inner["EAP"] ? 'EAPMethod' : 'NonEAPAuthMethod');
+            $typeOfInner = "\devices\xml\\".($inner["EAP"] ? 'EAPMethod' : 'NonEAPAuthMethod');
             $eapmethod = new $typeOfInner();
             $eaptype = new Type();
             $eaptype->setValue($inner['METHOD']);
@@ -364,7 +364,7 @@ 
         return($serversidecredential);
     }
     
-    private function setClientSideRealm ($clientsidecredential) {
+    private function setClientSideRealm($clientsidecredential) {
         $attr = $this->attributes;
         $realm = \core\common\Entity::getAttributeValue($attr, 'internal:realm', 0);
         if ($realm === NULL) {

Indentation +2 added lines, -2 removed lines

@@ -266,7 +266,7 @@ 
         return $helpdesk;
     }
 
-   private function getCredentialApplicability() {
+    private function getCredentialApplicability() {
         $setWired = isset($this->attributes['media:wired'][0]) && 
             $this->attributes['media:wired'][0] == 'on' ? 1 : 0;  
         $ssids = $this->attributes['internal:SSID'];
@@ -393,7 +393,7 @@ 
     }
     
     private function getAuthMethod($eap) {
- //       $attr = $this->attributes;
+    //       $attr = $this->attributes;
         $authmethod = new AuthenticationMethod();
         $eapParams = $this->getAuthenticationMethodParams($eap);
         $eaptype = new Type();

web/index.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
  * @author Stefan Winter <stefan.winter@restena.lu>
  * @package Core
  */
-require_once dirname(dirname(__FILE__)) . "/config/_config.php";
+require_once dirname(dirname(__FILE__))."/config/_config.php";
 
 $Gui = new \web\lib\user\Gui();
 // ... unless overwritten by direct GET/POST parameter in the request or a SESSION setting

web/skins/modern/diag/diag.php

Indentation +1 added lines, -1 removed lines

@@ -156,7 +156,7 @@
                         echo "0\">";
                         echo _("This service is for authenticated admins only.") . '<br>';
                         echo "<a href=\"diag.php?admin=1\">" .
-                             _("eduroam® admin access is needed") . "</a>";
+                                _("eduroam® admin access is needed") . "</a>";
                     }
                 ?>
             </div> 

Spacing +68 added lines, -68 removed lines

@@ -46,9 +46,9 @@ 
 $Gui->loggerInstance->debug(4, $operatingSystem);
 $uiElements = new web\lib\admin\UIElements();
 if ($operatingSystem) {
-    print "recognisedOS = '" . $operatingSystem['device'] . "';\n";
+    print "recognisedOS = '".$operatingSystem['device']."';\n";
 }
-require dirname(__DIR__) . '/user/js/cat_js.php';
+require dirname(__DIR__).'/user/js/cat_js.php';
 
 ?>
 </script>
@@ -60,7 +60,7 @@ 
 <div id='wrap' style='background-image:url("<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "beta.png"); ?>");'>
 <form id="cat_form" name="cat_form" accept-charset="UTF-8" action="<?php echo $_SERVER['SCRIPT_NAME']; ?>" method="POST">
 <?php
-require dirname(__DIR__) . '/diag/js/diag_js.php';
+require dirname(__DIR__).'/diag/js/diag_js.php';
 echo $divs->divHeading($visibility);
 $Gui->languageInstance->setTextDomain("diagnostics");
 ?>
@@ -78,12 +78,12 @@ 
     </div>
     <div id="main_body">
         <div id="user_page">
-            <?php echo $divs->divPagetitle(_("Diagnostics site") . " (<span style='color:red'>beta</span>)", ""); ?>
+            <?php echo $divs->divPagetitle(_("Diagnostics site")." (<span style='color:red'>beta</span>)", ""); ?>
             <div id="user_info" style='padding-top: 10px;'>
             <div id='diagnostic_choice'>
-                <?php echo _("The diagnostics system will do its best to identify and resolve your problems!") . ' ' . _("Please help the system by answering the questions as precisely as possible.") . "<br/>" . _("Are you a") . ' '; ?>
-                <input type='radio' name='diagnostic_usertype' value='0'><?php echo _("end-user") . ' ' . _("or"); ?>   
-                <input type='radio' name='diagnostic_usertype' value='1' <?php if ($admin == 1) { echo " checked"; } ?> > <?php echo _("eduroam administrator") .'?'; ?>
+                <?php echo _("The diagnostics system will do its best to identify and resolve your problems!").' '._("Please help the system by answering the questions as precisely as possible.")."<br/>"._("Are you a").' '; ?>
+                <input type='radio' name='diagnostic_usertype' value='0'><?php echo _("end-user").' '._("or"); ?>   
+                <input type='radio' name='diagnostic_usertype' value='1' <?php if ($admin == 1) { echo " checked"; } ?> > <?php echo _("eduroam administrator").'?'; ?>
             </div>
             <div id='diagnostic_enduser' style='display: none;'>
                 <h2><?php echo _("Tools for End Users"); ?></h2>
@@ -93,24 +93,24 @@ 
                 ?>
                 </p>
                 <?php
-                    echo '<div id="before_stage_1"><h3>' . _("The system needs some information on your home institution - issuer of your account") . '</h3>';
+                    echo '<div id="before_stage_1"><h3>'._("The system needs some information on your home institution - issuer of your account").'</h3>';
                     echo _("What is the realm part of your user account (the part behind the @ of 'your.username@<strong>realm.tld</strong>):");
                 ?>
                 <input type='text' name='user_realm' id='user_realm' value=''>
                 <?php
-                    echo '<div id="realm_by_select"><br/>' . _("alternatively") . '<br/>';
-                    echo _("You can select your home institution from the following list") . '<br/>';
+                    echo '<div id="realm_by_select"><br/>'._("alternatively").'<br/>';
+                    echo _("You can select your home institution from the following list").'<br/>';
                     echo '<div id="select_idp_country"><a href="" id="idp_countries_list">';    
-                    echo '<span id="realmselect">' . _("Click to select your country/region and organisation") . '</span></a></div>';
+                    echo '<span id="realmselect">'._("Click to select your country/region and organisation").'</span></a></div>';
                 ?>
                 <div id="select_idp_area" style="display:none;">
                 </div>
                 </div>
                 <div id="position_info">
                     <?php
-                        echo '<h3>' . _("Optionally, to improve tests, you can provide information on your current location") . '</h3>';
+                        echo '<h3>'._("Optionally, to improve tests, you can provide information on your current location").'</h3>';
                         echo '<div id="select_sp_country"><a href="" id="sp_countries_list">';    
-                        echo '<span id="spselect">' . _("Click to select a location in which you have an eduroam problem") . '</span></a></div>';
+                        echo '<span id="spselect">'._("Click to select a location in which you have an eduroam problem").'</span></a></div>';
                     ?>
                     <div id="select_sp_area" style="display:none;">
                     </div>
@@ -143,11 +143,11 @@ 
                             echo 'none';
                         }
                         echo ";'>";
-                        echo '<h3>' . _("What is the nature of the problem?") . '</h3>';
-                        echo '<input type="radio" name="problem_type" value="0"' . (($sp==1)? ' checked' : '') . '>';
-                        echo _("I suspect a technical problem at a particular IdP") . '<br>';
+                        echo '<h3>'._("What is the nature of the problem?").'</h3>';
+                        echo '<input type="radio" name="problem_type" value="0"'.(($sp == 1) ? ' checked' : '').'>';
+                        echo _("I suspect a technical problem at a particular IdP").'<br>';
                         echo '<input type="radio" name="problem_type" value="1">';
-                        echo _("I want to report abuse of network resources by a roaming user") . '<br>';
+                        echo _("I want to report abuse of network resources by a roaming user").'<br>';
                         echo '<input type="radio" name="problem_type" value="2">';
                         echo _("I suspect a technical problem for one of my users at a particular SP");
                         echo "<div id='idp_contact_area'></div>";
@@ -156,9 +156,9 @@ 
                         echo "</div>"; 
                     } else {
                         echo "0\">";
-                        echo _("This service is for authenticated admins only.") . '<br>';
-                        echo "<a href=\"diag.php?admin=1\">" .
-                             _("eduroam® admin access is needed") . "</a>";
+                        echo _("This service is for authenticated admins only.").'<br>';
+                        echo "<a href=\"diag.php?admin=1\">".
+                             _("eduroam® admin access is needed")."</a>";
                     }
                 ?>
             </div> 
@@ -234,7 +234,7 @@ 
         return false;
     });
     $(document).on('change', '#idp_country' , function() {
-        var comment = <?php echo '"' . _("Fetching institutions list") . '..."'; ?>;  
+        var comment = <?php echo '"'._("Fetching institutions list").'..."'; ?>;  
         var id = $(this).attr('id');
         var k = id.indexOf('_');
         var type = id.substr(0,k);
@@ -252,7 +252,7 @@ 
                         var shtml = '';
                         var select = '';
                         if (type !== 'asp') {
-                            shtml = <?php echo '"<td>' . _("Select institution:") . '</td><td>"'; ?>;
+                            shtml = <?php echo '"<td>'._("Select institution:").'</td><td>"'; ?>;
                         }
                         select = '<select id="' + type + '_inst" name="' + type + '_inst" style="margin-left:0px; width:400px;"><option value=""></option>';
                         for (var i in institutions) {
@@ -273,7 +273,7 @@ 
                     } else {
                         if (data.status === 0) {
                             inProgress(0);
-                            var msg = <?php echo '"' . _("The database does not contain the information needed to help you in realm selection for this country. You have to provide the realm you are interested in.") . '"'; ?>;
+                            var msg = <?php echo '"'._("The database does not contain the information needed to help you in realm selection for this country. You have to provide the realm you are interested in.").'"'; ?>;
                             alert(msg);
                             $('#select_idp_country').show();
                             $('#select_idp_area').hide();
@@ -282,7 +282,7 @@ 
                 },
                 error:function() {
                     inProgress(0);
-                    var msg = <?php echo '"' . _("Can not search in database. You have to provide the realm you are interested in.") . '"'; ?>;
+                    var msg = <?php echo '"'._("Can not search in database. You have to provide the realm you are interested in.").'"'; ?>;
                     alert(msg);
                     $('#select_idp_country').show();
                     $('#select_idp_area').hide();
@@ -298,9 +298,9 @@ 
     });
     $(document).on('change', '#select_sp_problem' , function() {
         if ($('#select_sp_problem').val().substr(0,6) == 'abuse-') {
-            $('#realm_in_db_admin').text(<?php echo '"' . _("Check if this realm is registered") . '"'; ?>);
+            $('#realm_in_db_admin').text(<?php echo '"'._("Check if this realm is registered").'"'; ?>);
         } else {
-            $('#realm_in_db_admin').text(<?php echo '"' . _("Check this realm") . '"'; ?>);
+            $('#realm_in_db_admin').text(<?php echo '"'._("Check this realm").'"'; ?>);
         }
         $('#realm_in_db_admin').hide();
         $('#admin_realm').val('');
@@ -308,7 +308,7 @@ 
         clear_sp_question();
     });
     $(document).on('change', '#sp_country, #asp_country' , function() {
-        var comment = <?php echo '"' . _("Fetching institutions list") . '..."'; ?>;  
+        var comment = <?php echo '"'._("Fetching institutions list").'..."'; ?>;  
         var id = $(this).attr('id');
         var k = id.indexOf('_');
         var type = id.substr(0,k);
@@ -326,7 +326,7 @@ 
                         var shtml = '';
                         var select = '';
                         if (type !== 'asp') {
-                            shtml = <?php echo '"<td>' . _("Select institution:") . '</td><td>"'; ?>;
+                            shtml = <?php echo '"<td>'._("Select institution:").'</td><td>"'; ?>;
                         }
                         select = '<select id="' + type + '_inst" name="' + type + '_inst" style="margin-left:0px; width:400px;"><option value=""></option>';
                         for (var i in hotspots) {
@@ -349,7 +349,7 @@ 
                             inProgress(0);
                             var select = '<select id="' + type + '_inst" name="' + type + '_inst" style="margin-left:0px; width:400px;"><option value="">';
                             var shtml = '<td></td><td>';
-                            select = select + <?php echo '"' . _("Other location") . '"'; ?> + '</option></select></td>';
+                            select = select + <?php echo '"'._("Other location").'"'; ?> + '</option></select></td>';
                             if (type !== 'asp') {
                                 $('#row_' + type + '_institution').html('');
                                 $('#row_' + type + '_institution').append(shtml + select);
@@ -383,7 +383,7 @@ 
             $('#start_test_area').hide();
             return false;
         }
-        var comment = <?php echo '"' . _("Fetching realms list") . '..."'; ?>;
+        var comment = <?php echo '"'._("Fetching realms list").'..."'; ?>;
         inProgress(1, comment);
         $.ajax({
             url: "findRealm.php",
@@ -395,7 +395,7 @@ 
                     var realms = data.realms;
                     var realmselect = '';
                     if (realms.length > 1) {
-                        realmselect = <?php echo '"<td>' . _("Check realm(s):") . '</td>"'; ?>;
+                        realmselect = <?php echo '"<td>'._("Check realm(s):").'</td>"'; ?>;
                         realmselect = realmselect + '<td>' + "<span style='margin-left: 10px'>";
                         for (var i in realms) {
                             realmselect = realmselect + '<input type="radio" name="realm" ';
@@ -407,7 +407,7 @@ 
                         }
                         realmselect = realmselect + '</span></td>';
                     } else {
-                        realmselect = <?php echo '"<td>' . _("Realm:") . '</td>"'; ?>;
+                        realmselect = <?php echo '"<td>'._("Realm:").'</td>"'; ?>;
                         realmselect = realmselect + '<td>' + "<span style='margin-left: 10px'>";
                         realmselect = realmselect + realms[0] + '</span>';
                         realmselect = realmselect + '<input type="hidden" name="realm" value="' + realms[0] + '">';
@@ -459,7 +459,7 @@ 
             clear_sp_question();
             t = 1;
         }
-        var comment = <?php echo '"' . _("Running realm tests") . '..."'; ?>;
+        var comment = <?php echo '"'._("Running realm tests").'..."'; ?>;
         inProgress(1, comment);
         /*waiting(comment);*/
         $.ajax({
@@ -518,7 +518,7 @@ 
         testSociopath('', answer);
     });
     $('#realmtest').click(function(event){
-        var comment = <?php echo '"<br><br>' . _("Running realm tests") . '..."'; ?>;
+        var comment = <?php echo '"<br><br>'._("Running realm tests").'..."'; ?>;
         inProgress(1, comment);
         $('#start_test_area').hide();
         if ($('#select_sp_area').is(':hidden')) {
@@ -566,13 +566,13 @@ 
                         reset_footer();
                         testSociopath(realm, 0);
                     } else {
-                        var title = <?php echo '"' . _("Diagnostics results for selected realms") . '"'; ?>;
-                        result = '<div class="padding"><h3>' + <?php echo '"' . _("An unknown problem occured") . '"'; ?>;
+                        var title = <?php echo '"'._("Diagnostics results for selected realms").'"'; ?>;
+                        result = '<div class="padding"><h3>' + <?php echo '"'._("An unknown problem occured").'"'; ?>;
                         result = result + '</h3>'
                         if (r.length == 1) {
-                            result = result + <?php echo '"' . _("This test includes checking of the following realm") . '"'; ?>;
+                            result = result + <?php echo '"'._("This test includes checking of the following realm").'"'; ?>;
                         } else {    
-                            result = result + <?php echo '"' . _("This test includes checking of the following realms") . '"'; ?>;
+                            result = result + <?php echo '"'._("This test includes checking of the following realms").'"'; ?>;
                         }
                         result = result + ': '
                         for (var i=0; i < r.length; i++) {
@@ -582,7 +582,7 @@ 
                             result = result + r[i];
                         }
                         result = result + '.<br>';
-                        result = result + <?php echo '"' . _("You should report this to") . '"'; ?> + ' <a href="mailto:admin@eduroam.pl">admin@eduroam.pl</a>';
+                        result = result + <?php echo '"'._("You should report this to").'"'; ?> + ' <a href="mailto:admin@eduroam.pl">admin@eduroam.pl</a>';
                         result = result + '</div>';
                         $('#after_stage_1').hide();
                         $('#before_stage_1').show();
@@ -650,43 +650,43 @@ 
             success:function(data) {
                 if (data.status === 1) {
                     var result = '';
-                    var title = <?php echo '"' . _("eduroam admin report submission") . '"'; ?>;
+                    var title = <?php echo '"'._("eduroam admin report submission").'"'; ?>;
                     result = '<div class="padding">';
                     if (type == 'idp_send') {
-                        result = result + '<h3>'+ <?php echo '"' . _("SP contacting IdP due to technical problems or abuse") . '"'; ?> + '</h3>';
+                        result = result + '<h3>'+ <?php echo '"'._("SP contacting IdP due to technical problems or abuse").'"'; ?> + '</h3>';
                         result = result + '<table>';
-                        result = result + '<tr><td>' + <?php echo '"' . _("Reason") . '"'; ?> + '</td><td>' + data.reason + '</td></tr>';
-                        result = result + '<tr><td>' + <?php echo '"' . _("Event's timestamp") . '"'; ?> + '</td><td>' + data.timestamp + '</td></tr>';
-                        result = result + '<tr><td>' + <?php echo '"' . _("Calling-Station-Id") . '"'; ?> + '</td><td>' + data.mac + '</td></tr>';
-                        result = result + '<tr><td>' + <?php echo '"' . _("Additional description") . '"'; ?> +'</td><td>' + data.freetext + '</td></tr>';
-                        result = result + '<tr><td>' + <?php echo '"' . _("An email to contact the reporter") . '"'; ?> + '</td><td>' + data.email + '</td></tr>';
-                        result = result + '<tr><td>' + <?php echo '"' . _("Test result") . '" '; ?> +'</td><td>';
+                        result = result + '<tr><td>' + <?php echo '"'._("Reason").'"'; ?> + '</td><td>' + data.reason + '</td></tr>';
+                        result = result + '<tr><td>' + <?php echo '"'._("Event's timestamp").'"'; ?> + '</td><td>' + data.timestamp + '</td></tr>';
+                        result = result + '<tr><td>' + <?php echo '"'._("Calling-Station-Id").'"'; ?> + '</td><td>' + data.mac + '</td></tr>';
+                        result = result + '<tr><td>' + <?php echo '"'._("Additional description").'"'; ?> +'</td><td>' + data.freetext + '</td></tr>';
+                        result = result + '<tr><td>' + <?php echo '"'._("An email to contact the reporter").'"'; ?> + '</td><td>' + data.email + '</td></tr>';
+                        result = result + '<tr><td>' + <?php echo '"'._("Test result").'" '; ?> +'</td><td>';
                         if (data.tests_result == 1) {
-                            result = result + <?php echo '"' . _("failure") . '"'; ?>;
+                            result = result + <?php echo '"'._("failure").'"'; ?>;
                         } else {
-                            result = result + <?php echo '"' . _("success") . '"'; ?>;
+                            result = result + <?php echo '"'._("success").'"'; ?>;
                         }
                         result = result + '</td></tr>';
-                        result = result + '<tr><td>' + <?php echo '"' . _("Test URL") . '" '; ?> +'</td><td><a href="' + data.testurl + '">' + data.testurl + '</a></td></tr>';
-                        result = result + '<tr><td>' + <?php echo '"' . _("Email to IdP administrators ") . '"'; ?> + ' ';
+                        result = result + '<tr><td>' + <?php echo '"'._("Test URL").'" '; ?> +'</td><td><a href="' + data.testurl + '">' + data.testurl + '</a></td></tr>';
+                        result = result + '<tr><td>' + <?php echo '"'._("Email to IdP administrators ").'"'; ?> + ' ';
                         if (data.emailsent == 1) {
-                            result = result + <?php echo '"' . _("send successfully") . '"'; ?>;
+                            result = result + <?php echo '"'._("send successfully").'"'; ?>;
                         } else {
-                            result = result + <?php echo '"' . _("not sent - failure while sending") . '"'; ?>;
+                            result = result + <?php echo '"'._("not sent - failure while sending").'"'; ?>;
                         }
                         result = result + '</td><td></td></tr>';
                     }
                     if (type == 'sp_send') {
-                        result = result + '<h3>'+ <?php echo '"' . _("IdP contacting SP due to technical problems or abuse") . '"'; ?> + '</h3>';
+                        result = result + '<h3>'+ <?php echo '"'._("IdP contacting SP due to technical problems or abuse").'"'; ?> + '</h3>';
                         result = result + '<table>';
-                        result = result + '<tr><td>' + <?php echo '"' . _("Reason") . '"'; ?> + '</td><td>' + data.reason + '</td></tr>';
-                        result = result + '<tr><td>' + <?php echo '"' . _("SP's Operator-Name") . '"'; ?> + '</td><td>' + data.opname + '</td></tr>';
-                        result = result + '<tr><td>' + <?php echo '"' . _("User's outer ID") . '"'; ?> + '</td><td>' + data.outerid + '</td></tr>';
-                        result = result + '<tr><td>' + <?php echo '"' . _("IdP email") . '"'; ?> + '</td><td>' + data.email + '</td></tr>';
-                        result = result + '<tr><td>' + <?php echo '"' . _("Event's timestamp") . '"'; ?> + '</td><td>' + data.timestamp + '</td></tr>';
-                        result = result + '<tr><td>' + <?php echo '"' . _("Calling-Station-Id") . '"'; ?> + '</td><td>' + data.mac + '</td></tr>';
-                        result = result + '<tr><td>' + <?php echo '"' . _("Additional description") . '"'; ?> +'</td><td>' + data.freetext + '</td></tr>';
-                        result = result + '<tr><td>' + <?php echo '"' . _("How to contact the user") . '"'; ?> +'</td><td>' + data.cdetails + '</td></tr>';
+                        result = result + '<tr><td>' + <?php echo '"'._("Reason").'"'; ?> + '</td><td>' + data.reason + '</td></tr>';
+                        result = result + '<tr><td>' + <?php echo '"'._("SP's Operator-Name").'"'; ?> + '</td><td>' + data.opname + '</td></tr>';
+                        result = result + '<tr><td>' + <?php echo '"'._("User's outer ID").'"'; ?> + '</td><td>' + data.outerid + '</td></tr>';
+                        result = result + '<tr><td>' + <?php echo '"'._("IdP email").'"'; ?> + '</td><td>' + data.email + '</td></tr>';
+                        result = result + '<tr><td>' + <?php echo '"'._("Event's timestamp").'"'; ?> + '</td><td>' + data.timestamp + '</td></tr>';
+                        result = result + '<tr><td>' + <?php echo '"'._("Calling-Station-Id").'"'; ?> + '</td><td>' + data.mac + '</td></tr>';
+                        result = result + '<tr><td>' + <?php echo '"'._("Additional description").'"'; ?> +'</td><td>' + data.freetext + '</td></tr>';
+                        result = result + '<tr><td>' + <?php echo '"'._("How to contact the user").'"'; ?> +'</td><td>' + data.cdetails + '</td></tr>';
                     }
                     result = result + '</div>';
                     showInfo(result, title);
@@ -711,7 +711,7 @@ 
                         $(this).removeClass('visible_row').addClass('hidden_row');
                     }
                 });
-                $('#admin_realm').attr('title', <?php echo '"' . _("Wrong format of realm") . '"'; ?>);
+                $('#admin_realm').attr('title', <?php echo '"'._("Wrong format of realm").'"'; ?>);
             } else {
                 $('#admin_realm').removeClass('error_input');
                 $('#admin_realm').attr('title', '');
@@ -721,7 +721,7 @@ 
     $(document).on('keyup change', '#email' , function() {
         if ($(this).val().length == 0 || !isEmail($(this).val())) {
             $('#email').addClass('error_input');
-            $('#email').attr('title', <?php echo '"' . _("Wrong format of email") . '"'; ?>);
+            $('#email').attr('title', <?php echo '"'._("Wrong format of email").'"'; ?>);
         } else {
             $('#email').removeClass('error_input');
             $('#email').attr('title', '');
@@ -734,7 +734,7 @@ 
         if ($('#mac').val().length > 0) {
             if ($('#mac').val().length != 17) {
                 $('#mac').addClass('error_input');
-                $('#mac').attr('title', <?php echo '"' . _("MAC address is incomplete") . '"'; ?>);
+                $('#mac').attr('title', <?php echo '"'._("MAC address is incomplete").'"'; ?>);
             } else {
                 $('#mac').removeClass('error_input'); 
                 $('#mac').attr('title', '');
@@ -743,7 +743,7 @@ 
         if ($(this).attr('id') == 'email' &&  $(this).val().length > 0) {
             if (!isEmail($(this).val())) {
                 $('#email').addClass('error_input');
-                $('#email').attr('title', <?php echo '"' . _("Wrong format of email") . '"'; ?>);
+                $('#email').attr('title', <?php echo '"'._("Wrong format of email").'"'; ?>);
             } else {
                 $('#email').removeClass('error_input');
                 $('#email').attr('title', '');
@@ -752,7 +752,7 @@ 
         if ($(this).attr('id') == 'outer_id' &&  $(this).val().length > 0) {
             if (!isEmail($(this).val(), true)) {
                 $('#outer_id').addClass('error_input');
-                $('#outer_id').attr('title', <?php echo '"' . _("Wrong format of outer ID") . '"'; ?>);
+                $('#outer_id').attr('title', <?php echo '"'._("Wrong format of outer ID").'"'; ?>);
             } else {
                 $('#outer_id').removeClass('error_input');
                 $('#outer_id').attr('title', '');
@@ -761,7 +761,7 @@ 
         if ($(this).attr('id') == 'opname' && $('#opname').val().length > 0) {
             if (!isOperatorName($(this).val())) {
                 $('#opname').addClass('error_input');
-                $('#opname').attr('title', <?php echo '"' . _("Wrong string given as OperatorName") . '"'; ?>);
+                $('#opname').attr('title', <?php echo '"'._("Wrong string given as OperatorName").'"'; ?>);
                 $('#spmanually').show();
             } else {
                 $('#opname').removeClass('error_input');

devices/linux/DeviceLinux.php

Indentation +1 added lines, -1 removed lines

@@ -211,7 +211,7 @@
         }
 
         if (!empty($this->attributes['internal:realm'][0])) {
-           $config['user_realm'] = $this->attributes['internal:realm'][0];
+            $config['user_realm'] = $this->attributes['internal:realm'][0];
         }
         
         if(!empty($this->attributes['internal:hint_userinput_suffix'][0]) && $this->attributes['internal:hint_userinput_suffix'][0] == 1) {

Braces +1 added lines, -2 removed lines

@@ -201,8 +201,7 @@
             
         if ($this->selectedEap == \core\common\EAP::EAPTYPE_TLS && isset($this->attributes['eap-specific:tls_use_other_id']) && $this->attributes['eap-specific:tls_use_other_id'][0] == 'on') {
             $configRaw['use_other_tls_id'] = "True";
-        }
-        else {
+        } else {
             $configRaw['use_other_tls_id'] = "False";
         }
 

Spacing +21 added lines, -21 removed lines

@@ -55,9 +55,9 @@ 
      *
      */
     public function writeInstaller() {
-        $installerPath = $this->installerBasename . ".py";
+        $installerPath = $this->installerBasename.".py";
         $this->copyFile("main.py", $installerPath);
-        $installer = fopen($installerPath,"a");
+        $installer = fopen($installerPath, "a");
         if ($installer === FALSE) {
             throw new Exception("Unable to open installer file for writing!");
         }
@@ -84,9 +84,9 @@ 
         $out .= "<p>";
         if ($ssidCount > 1) {
             if ($ssidCount > 2) {
-                $out .= sprintf(_("In addition to <strong>%s</strong> the installer will also configure access to the following networks:"), implode(', ', \config\ConfAssistant::CONSORTIUM['ssid'])) . " ";
+                $out .= sprintf(_("In addition to <strong>%s</strong> the installer will also configure access to the following networks:"), implode(', ', \config\ConfAssistant::CONSORTIUM['ssid']))." ";
             } else {
-                $out .= sprintf(_("In addition to <strong>%s</strong> the installer will also configure access to:"), implode(', ', \config\ConfAssistant::CONSORTIUM['ssid'])) . " ";
+                $out .= sprintf(_("In addition to <strong>%s</strong> the installer will also configure access to:"), implode(', ', \config\ConfAssistant::CONSORTIUM['ssid']))." ";
             }
             $iterator = 0;
             foreach ($this->attributes['internal:SSID'] as $ssid => $v) {
@@ -124,8 +124,8 @@ 
      * @return void
      */
     private function writeConfigLine($file, $prefix, $name, $text) {
-        $out = $prefix . $name . ' = "' . $text;
-        fwrite($file, wordwrap($out, 70, " \" \\\n    \"") . "\n");
+        $out = $prefix.$name.' = "'.$text;
+        fwrite($file, wordwrap($out, 70, " \" \\\n    \"")."\n");
     }
     
     /**
@@ -164,7 +164,7 @@ 
         'user_cert_missing' => _("personal certificate file not found"),
         ];
         foreach ($messages as $name => $value) {
-            $this->writeConfigLine($file, 'Messages.', $name, $value . '"');
+            $this->writeConfigLine($file, 'Messages.', $name, $value.'"');
         }
         \core\common\Entity::outOfThePotatoes();
     }
@@ -208,39 +208,39 @@ 
         }
 
         if ($outerId !== NULL) {
-            $configRaw['anonymous_identity'] = '"' . $outerId . '"';
+            $configRaw['anonymous_identity'] = '"'.$outerId.'"';
         }
 
         if (!empty($this->attributes['internal:realm'][0])) {
            $config['user_realm'] = $this->attributes['internal:realm'][0];
         }
         
-        if(!empty($this->attributes['internal:hint_userinput_suffix'][0]) && $this->attributes['internal:hint_userinput_suffix'][0] == 1) {
+        if (!empty($this->attributes['internal:hint_userinput_suffix'][0]) && $this->attributes['internal:hint_userinput_suffix'][0] == 1) {
             $configRaw['hint_user_input'] = "True";
         }
         
-        if(!empty($this->attributes['internal:verify_userinput_suffix'][0]) && $this->attributes['internal:verify_userinput_suffix'][0] == 1) {
+        if (!empty($this->attributes['internal:verify_userinput_suffix'][0]) && $this->attributes['internal:verify_userinput_suffix'][0] == 1) {
             $configRaw['verify_user_realm_input'] = "True";
         }
         
         foreach ($config as $name => $value) {
-            $this->writeConfigLine($file, 'Config.', $name, $value . '"');
+            $this->writeConfigLine($file, 'Config.', $name, $value.'"');
         }
         
         foreach ($configRaw as $name => $value) {
-            fwrite($file, 'Config.' . $name . ' = ' . $value . "\n");
+            fwrite($file, 'Config.'.$name.' = '.$value."\n");
         }
         
         if ($tou === '') {
-            fwrite($file, 'Config.tou = ""' . "\n");
+            fwrite($file, 'Config.tou = ""'."\n");
         } else {
-            fwrite($file, 'Config.tou = """' . $tou . '"""' . "\n");
+            fwrite($file, 'Config.tou = """'.$tou.'"""'."\n");
         }
         
-        fwrite($file, 'Config.CA = """' . $this->mkCAfile() . '"""' . "\n");
+        fwrite($file, 'Config.CA = """'.$this->mkCAfile().'"""'."\n");
         $sbUserFile = $this->mkSbUserFile();
         if ($sbUserFile !== '') {
-            fwrite($file, 'Config.sb_user_file = """' . $sbUserFile . '"""' . "\n");
+            fwrite($file, 'Config.sb_user_file = """'.$sbUserFile.'"""'."\n");
         }
     }
 
@@ -292,7 +292,7 @@ 
             }
             $out .= "'DNS:$oneServer'";
         }
-        return "[" . $out. "]";
+        return "[".$out."]";
     }
 
     /**
@@ -306,7 +306,7 @@ 
         foreach ($ssids as $ssid => $cipher) {
             $outArray[] = "'$ssid'";
         }
-        return '[' . implode(', ', $outArray) . ']';
+        return '['.implode(', ', $outArray).']';
     }
     
     /**
@@ -322,7 +322,7 @@ 
                 $outArray[] = "'$ssid'";
             }
         }
-        return '[' . implode(', ', $outArray) . ']';
+        return '['.implode(', ', $outArray).']';
     }
     
     /**
@@ -330,7 +330,7 @@ 
      * 
      * @return string
      */
-    private function mkCAfile(){
+    private function mkCAfile() {
         $out = '';
         $cAlist = $this->attributes['internal:CAs'][0];
         foreach ($cAlist as $oneCa) {
@@ -346,7 +346,7 @@ 
      */
     private function mkIntro() {
         \core\common\Entity::intoThePotatoes();
-        $out = _("This installer has been prepared for {0}") . '\n\n' . _("More information and comments:") . '\n\nEMAIL: {1}\nWWW: {2}\n\n' .
+        $out = _("This installer has been prepared for {0}").'\n\n'._("More information and comments:").'\n\nEMAIL: {1}\nWWW: {2}\n\n'.
             _("Installer created with software from the GEANT project.");
         \core\common\Entity::outOfThePotatoes();
         return $out;