GEANT / CAT

web/skins/classic/user/js/cat_js.php

Indentation +9 added lines, -9 removed lines

@@ -11,14 +11,14 @@ 
 <?php 
 $cat = new core\CAT();
 function escaped_echo($s) {
-   echo preg_replace('/"/','&quot;',$s);
+    echo preg_replace('/"/','&quot;',$s);
 }
 
 $langObject = new \core\common\Language();
 $langObject->setTextDomain('web_user');
 $idpId = filter_input(INPUT_GET, 'idp', FILTER_VALIDATE_INT) ?? filter_input(INPUT_POST, 'idp', FILTER_VALIDATE_INT);
 $profileId = filter_input(INPUT_GET, 'profile', FILTER_VALIDATE_INT) ?? filter_input(INPUT_POST, 'profile', FILTER_VALIDATE_INT);
- ?>
+    ?>
 var n;
 var profile;
 var generateTimer;
@@ -353,7 +353,7 @@ 
 }
 
 <?php if($idpId) { 
-      print "front_page = 0;\n";
+        print "front_page = 0;\n";
 } ?>
 
 function showTOU(){
@@ -487,7 +487,7 @@ 
 if ($profileId) {
     print "listProfiles($idpId,$profileId);";
 }
- ?>
+    ?>
 
 $(".signin").click(function(event){
      pressedButton = $(this);
@@ -548,12 +548,12 @@ 
         });
 DiscoJuice.Constants.Countries = {
 <?php 
-  $C = $Gui->printCountryList(1);
-     $ret = '';
-   foreach ($C as $key => $val) {
+    $C = $Gui->printCountryList(1);
+        $ret = '';
+    foreach ($C as $key => $val) {
     $ret .= "'$key': \"$val\",";
-   }
-   echo substr($ret, 0, -1);
+    }
+    echo substr($ret, 0, -1);
 ?>
         };
 

Spacing +25 added lines, -25 removed lines

@@ -11,7 +11,7 @@ 
 <?php 
 $cat = new core\CAT();
 function escaped_echo($s) {
-   echo preg_replace('/"/','&quot;',$s);
+   echo preg_replace('/"/', '&quot;', $s);
 }
 
 $langObject = new \core\common\Language();
@@ -70,7 +70,7 @@ 
     result = j.status;
     if(! result) {
       alert("<?php escaped_echo(_("no matching data found"))?>");
-      document.location.href='<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']),'/').'/'?>';
+      document.location.href='<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']), '/') . '/'?>';
     }
     j = j.data;
     n = j.length;
@@ -78,7 +78,7 @@ 
     inst_name = j[0].idp_name;
     logo = j[0].logo;
     $("#inst_name").val(inst_name);
-    $("#inst_name_span").html("<?php escaped_echo(sprintf(_("Selected %s:"),$cat->nomenclature_inst))?> <strong>"+inst_name+"</strong>");
+    $("#inst_name_span").html("<?php escaped_echo(sprintf(_("Selected %s:"), $cat->nomenclature_inst))?> <strong>"+inst_name+"</strong>");
     $(".inst_name").text(inst_name);
     $("#user_page").show();
     $("#institution_name").show();
@@ -191,8 +191,8 @@ 
        j1 = $.parseJSON(data);
        result = j1.status;
        if(! result) {
-            alert("<?php escaped_echo( _("no matching data found"))?>");
-            document.location.href='<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']),'/').'/'?>';
+            alert("<?php escaped_echo(_("no matching data found"))?>");
+            document.location.href='<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']), '/') . '/'?>';
        }
        j = j1.data;
        if(j.description !== undefined && j.description) {
@@ -203,15 +203,15 @@ 
          $("#profile_desc").text('');
        }
        if(j.local_url !== undefined && j.local_url) 
-         txt = txt+'<tr><td><?php escaped_echo(_("WWW:"));?></td><td><a href="'+j.local_url+'" target="_blank">'+j.local_url+'</a></td></tr>';
+         txt = txt+'<tr><td><?php escaped_echo(_("WWW:")); ?></td><td><a href="'+j.local_url+'" target="_blank">'+j.local_url+'</a></td></tr>';
        if(j.local_email !== undefined && j.local_email) 
-         txt = txt+'<tr><td><?php escaped_echo(_("email:"));?></td><td><a href=mailto:"'+j.local_email+'">'+j.local_email+'</a></td></tr>';
+         txt = txt+'<tr><td><?php escaped_echo(_("email:")); ?></td><td><a href=mailto:"'+j.local_email+'">'+j.local_email+'</a></td></tr>';
        if(j.local_phone !== undefined && j.local_phone) 
-         txt = txt+'<tr><td><?php escaped_echo(_("tel:"));?></td><td>'+j.local_phone+'</td></tr>';
+         txt = txt+'<tr><td><?php escaped_echo(_("tel:")); ?></td><td>'+j.local_phone+'</td></tr>';
        if(txt) 
-         txt = "<table><tr><th colspan='2'><?php escaped_echo(sprintf(_("If you encounter problems, then you can obtain direct assistance from your %s at:"),$cat->nomenclature_inst)); ?></th></tr>"+txt+'</table>';
+         txt = "<table><tr><th colspan='2'><?php escaped_echo(sprintf(_("If you encounter problems, then you can obtain direct assistance from your %s at:"), $cat->nomenclature_inst)); ?></th></tr>"+txt+'</table>';
         else 
-         txt = "<table><tr><th colspan='2'><?php escaped_echo(sprintf(_("If you encounter problems you should ask for help at your %s"),$cat->nomenclature_inst)); ?>.</th></tr></table>";
+         txt = "<table><tr><th colspan='2'><?php escaped_echo(sprintf(_("If you encounter problems you should ask for help at your %s"), $cat->nomenclature_inst)); ?>.</th></tr></table>";
       $("#user_info").html(txt);
       $("#user_info").show();
       if(j.silverbullet) {
@@ -229,7 +229,7 @@ 
           $("#g_"+v.id).addClass('alertButton');
           $("#cross_icon_"+v.id).show();
           $("#"+v.id).addClass('disabledDevice');
-          $("#download_button_header_"+v.id).html("<?php escaped_echo(sprintf(_("This device cannot be configured with settings provided by your %s"),$cat->nomenclature_inst))?>");
+          $("#download_button_header_"+v.id).html("<?php escaped_echo(sprintf(_("This device cannot be configured with settings provided by your %s"), $cat->nomenclature_inst))?>");
           $("#info_b_"+v.id+",#g_info_b_"+v.id).hide();
         } else  {
           if(v.status == -1)
@@ -241,7 +241,7 @@ 
           $("#"+v.id+",#g_"+v.id).addClass('additionalInfo');
           $("#"+v.id+",#g_"+v.id).click(function(event){
             i_div = $("#info_"+$(this).attr('id'));
-            t = "<?php escaped_echo(_("Your site administrator has specified that this device should be configured with resources located on a local page. When you click <b>Continue</b> this page will be opened in a new window/tab."))?>"+"<br><span class='redirect_link'><a href='"+v.redirect+"' target='_blank'><?php escaped_echo(_("Continue"));?></a></span>";
+            t = "<?php escaped_echo(_("Your site administrator has specified that this device should be configured with resources located on a local page. When you click <b>Continue</b> this page will be opened in a new window/tab."))?>"+"<br><span class='redirect_link'><a href='"+v.redirect+"' target='_blank'><?php escaped_echo(_("Continue")); ?></a></span>";
             i_div.html(t);
             $(".redirect_link").click(function(event) {
                i_div.hide();
@@ -249,13 +249,13 @@ 
                
           });
         } else if(v.device_customtext != '0' || v.eap_customtext != '0' || v.message != '0' || v.status > 0) {
-          var continue_text = "<?php escaped_echo(_("Continue"));?>";
+          var continue_text = "<?php escaped_echo(_("Continue")); ?>";
           $("#"+v.id+",#g_"+v.id).addClass('additionalInfo');
           $("#"+v.id+",#g_"+v.id).click(function(event){
             i_div = $("#info_"+$(this).attr('id'));
             if(v.status > 0) {
-              t = "<?php escaped_echo(sprintf(_("This device cannot be configured with settings provided by your %s"),$cat->nomenclature_inst))?>";
-              continue_text = "<?php escaped_echo(_("Close"));?>";
+              t = "<?php escaped_echo(sprintf(_("This device cannot be configured with settings provided by your %s"), $cat->nomenclature_inst))?>";
+              continue_text = "<?php escaped_echo(_("Close")); ?>";
             } else {
             t = i_div.html();
             if(v.message != '0') {
@@ -312,7 +312,7 @@ 
   }
 
   function infoCAT(k,title) {
-      $.post('<?php echo $Gui->skinObject->findResourceUrl("BASE", "user/cat_info.php");?>', {page: k, lang: lang}, function(data) {
+      $.post('<?php echo $Gui->skinObject->findResourceUrl("BASE", "user/cat_info.php"); ?>', {page: k, lang: lang}, function(data) {
     if(data.substring(0,8) == 'no_title') {
        data = data.substring(8,data.length);
     } else {
@@ -330,7 +330,7 @@ 
    var x = getWindowHCenter() - 16;
    $("#loading_ico").css('left',x+'px');
    $("#loading_ico").show();
-   window.location.replace("<?php echo $Gui->skinObject->findResourceUrl("BASE","admin/overview_user.php");?>?lang="+lang);
+   window.location.replace("<?php echo $Gui->skinObject->findResourceUrl("BASE", "admin/overview_user.php"); ?>?lang="+lang);
 }
 
 /* Get horizontal center of the Browser Window */
@@ -351,7 +351,7 @@ 
     return(Math.round(windowWidth/2));
 }
 
-<?php if($idpId) { 
+<?php if ($idpId) { 
       print "front_page = 0;\n";
 } ?>
 
@@ -389,10 +389,10 @@ 
     $("#download_info a").attr('href',download_link);
     $('#download_info').show();
     if( generateTimer > 0 ) {
-       setTimeout("document.location.href='<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']),'/')?>'+'/'+download_link",generateTimer);
+       setTimeout("document.location.href='<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']), '/')?>'+'/'+download_link",generateTimer);
     }
     else {
-       document.location.href='<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']),'/')?>'+'/'+download_link;
+       document.location.href='<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']), '/')?>'+'/'+download_link;
     }
   }
 }
@@ -510,13 +510,13 @@ 
    "overlay":true,"cookie":true,"type":false,
    "country":true,"location":true,
    "title":"<?php escaped_echo($cat->nomenclature_inst) ?>",
-   "subtitle":"<?php escaped_echo(sprintf(_("Select your <strong>%s<\/strong>"),$cat->nomenclature_inst)) ?>",
-   "textHelp": "<?php escaped_echo(sprintf(_("Help, my %s is not on the list"),$cat->nomenclature_inst)) ?>",
-   "textHelpMore": "<?php escaped_echo(sprintf(_("This system relies on information supplied by local %s administrators. If your %s is not on the list, then nag them to add information to the %s database."),CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], $cat->nomenclature_inst, CONFIG['APPEARANCE']['productname'])); ?>",
+   "subtitle":"<?php escaped_echo(sprintf(_("Select your <strong>%s<\/strong>"), $cat->nomenclature_inst)) ?>",
+   "textHelp": "<?php escaped_echo(sprintf(_("Help, my %s is not on the list"), $cat->nomenclature_inst)) ?>",
+   "textHelpMore": "<?php escaped_echo(sprintf(_("This system relies on information supplied by local %s administrators. If your %s is not on the list, then nag them to add information to the %s database."), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], $cat->nomenclature_inst, CONFIG['APPEARANCE']['productname'])); ?>",
    "textLocateMe": "<?php escaped_echo(_("Locate me more accurately using HTML5 Geo-Location")) ?>",
-   "textShowProviders": "<?php escaped_echo(sprintf(_("Show %ss in"),$cat->nomenclature_inst)) ?>",
+   "textShowProviders": "<?php escaped_echo(sprintf(_("Show %ss in"), $cat->nomenclature_inst)) ?>",
    "textAllCountries": "<?php escaped_echo(_("all countries")) ?>",
-   "textSearch" : "<?php escaped_echo(sprintf(_("or search for an %s, in example Univerity of Oslo"),$cat->nomenclature_inst)) ?>",
+   "textSearch" : "<?php escaped_echo(sprintf(_("or search for an %s, in example Univerity of Oslo"), $cat->nomenclature_inst)) ?>",
    "textShowAllCountries": "<?php escaped_echo(_("show all countries")) ?>",
    "textLimited1" : "<?php escaped_echo(_("Results limited to"))?>",
    "textLimited2" : "<?php escaped_echo(_("entries - show more"))?>",

web/admin/edit_idp.php

Spacing +5 added lines, -5 removed lines

@@ -137,7 +137,7 @@ 
             sprintf(_("In this section, you define on which media %s should be configured on user devices."), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']) . "</p>
           <ul>";
             echo "<li>";
-            echo "<strong>" . ( count(CONFIG_CONFASSISTANT['CONSORTIUM']['ssid']) > 0 ? _("Additional SSIDs:") : _("SSIDs:")) . " </strong>";
+            echo "<strong>" . (count(CONFIG_CONFASSISTANT['CONSORTIUM']['ssid']) > 0 ? _("Additional SSIDs:") : _("SSIDs:")) . " </strong>";
             if (count(CONFIG_CONFASSISTANT['CONSORTIUM']['ssid']) > 0) {
                 $ssidlist = "";
                 foreach (CONFIG_CONFASSISTANT['CONSORTIUM']['ssid'] as $ssid) {
@@ -156,7 +156,7 @@ 
             echo "</li>";
 
             echo "<li>";
-            echo "<strong>" . ( count(CONFIG_CONFASSISTANT['CONSORTIUM']['ssid']) > 0 ? _("Additional Hotspot 2.0 / Passpoint Consortia:") : _("Hotspot 2.0 / Passpoint Consortia:")) . " </strong>";
+            echo "<strong>" . (count(CONFIG_CONFASSISTANT['CONSORTIUM']['ssid']) > 0 ? _("Additional Hotspot 2.0 / Passpoint Consortia:") : _("Hotspot 2.0 / Passpoint Consortia:")) . " </strong>";
             if (count(CONFIG_CONFASSISTANT['CONSORTIUM']['interworking-consortium-oi']) > 0) {
                 $consortiumlist = "";
                 foreach (CONFIG_CONFASSISTANT['CONSORTIUM']['interworking-consortium-oi'] as $oi) {
@@ -186,7 +186,7 @@ 
         <legend><strong><?php echo _("Helpdesk Details for all users"); ?></strong></legend>
         <?php
         if ($wizardStyle) {
-            echo "<p>"._("This section can be used to upload specific Terms of Use for your users and to display details of how your users can reach your local helpdesk.")."</p>";
+            echo "<p>" . _("This section can be used to upload specific Terms of Use for your users and to display details of how your users can reach your local helpdesk.") . "</p>";
             
             if (CONFIG['FUNCTIONALITY_LOCATIONS']['CONFASSISTANT_RADIUS'] == "LOCAL") {
                 echo "<p>" .
@@ -194,10 +194,10 @@ 
                 "<p>" .
                 _("If you enter a value here, it will be added to the installers for all your users, and will be displayed on the download page. If you operate separate helpdesks for different user groups (we call this 'profiles'), or operate no help desk at all, you can also leave any of these fields empty and optionally specify per-profile helpdesk information later in this wizard.") . "</p>";
                 if (CONFIG['FUNCTIONALITY_LOCATIONS']['CONFASSISTANT_SILVERBULLET'] == "LOCAL") {
-                echo "<p>" . sprintf(_("For %s deployments, providing at least a local e-mail contact is required."), core\ProfileSilverbullet::PRODUCTNAME) ." " . _("This is the contact point for your end users' level 1 support.") . "</p>";
+                echo "<p>" . sprintf(_("For %s deployments, providing at least a local e-mail contact is required."), core\ProfileSilverbullet::PRODUCTNAME) . " " . _("This is the contact point for your end users' level 1 support.") . "</p>";
                 }
             } elseif (CONFIG['FUNCTIONALITY_LOCATIONS']['CONFASSISTANT_SILVERBULLET'] == "LOCAL") {
-                echo "<p>". _("Providing at least a local support e-mail contact is required.")." "._("This is the contact point for your end users' level 1 support.")."</p>";
+                echo "<p>" . _("Providing at least a local support e-mail contact is required.") . " " . _("This is the contact point for your end users' level 1 support.") . "</p>";
             }
             
         }

config/_config.php

Spacing +1 added lines, -1 removed lines

@@ -94,7 +94,7 @@
 
 /* load sub-configs if we are dealing with those in this installation */
 
-if (CONFIG['FUNCTIONALITY_LOCATIONS']['CONFASSISTANT_SILVERBULLET'] == 'LOCAL' || CONFIG['FUNCTIONALITY_LOCATIONS']['CONFASSISTANT_RADIUS'] == 'LOCAL' ) {
+if (CONFIG['FUNCTIONALITY_LOCATIONS']['CONFASSISTANT_SILVERBULLET'] == 'LOCAL' || CONFIG['FUNCTIONALITY_LOCATIONS']['CONFASSISTANT_RADIUS'] == 'LOCAL') {
     include(ROOT . "/config/config-confassistant.php");
 }
 

core/diag/RFC7585Tests.php

Indentation -1 removed lines

@@ -185,7 +185,6 @@
      * - RETVAL_NOTCONFIGURED; needs CONFIG_DIAGNOSTICS['RADIUSTESTS']['TLS-discoverytag']
      * - RETVAL_INVALID (at least one format error)
      * - RETVAL_OK (all fine)
-
      * @return int one of two RETVALs above
      */
     public function relevantNAPTRcompliance() {

web/admin/edit_profile.php

Spacing +13 added lines, -13 removed lines

@@ -279,7 +279,7 @@ 
                 </td>
                 <td>
                     <input type='checkbox' <?php
-                    echo ($verify != FALSE ? "checked" : "" );
+                    echo ($verify != FALSE ? "checked" : "");
                     ?> name='verify_support' onclick='
                             if (this.form.elements["verify_support"].checked !== true || this.form.elements["realm"].value.length == 0) {
                                 this.form.elements["hint_support"].setAttribute("disabled", "disabled");
@@ -287,48 +287,48 @@ 
                                 this.form.elements["hint_support"].removeAttribute("disabled");
                             }
                             ;'/>
-                    <span id='hint_label' style='<?php echo ($realm == "" ? "color:#999999" : "" ); ?>'>
+                    <span id='hint_label' style='<?php echo ($realm == "" ? "color:#999999" : ""); ?>'>
                         <?php echo _("Prefill user input with realm suffix:"); ?>
                     </span>
-                    <input type='checkbox' <?php echo ($verify == FALSE ? "disabled" : "" ); ?> name='hint_support' <?php echo ( $hint != FALSE ? "checked" : "" ); ?> />
+                    <input type='checkbox' <?php echo ($verify == FALSE ? "disabled" : ""); ?> name='hint_support' <?php echo ($hint != FALSE ? "checked" : ""); ?> />
                 </td>
             </tr>
             <tr>
 
                 <!-- checkbox and input field for anonymity support, available only when realm is known-->
                 <td>
-                    <span id='anon_support_label' style='<?php echo ($realm == "" ? "color:#999999" : "" ); ?>'>
+                    <span id='anon_support_label' style='<?php echo ($realm == "" ? "color:#999999" : ""); ?>'>
                         <?php echo _("Enable Anonymous Outer Identity:"); ?>
                     </span>
                 </td>
                 <td>
-                    <input type='checkbox' <?php echo ($useAnon != FALSE ? "checked" : "" ) . ($realm == "" ? " disabled" : "" ); ?> name='anon_support' onclick='
+                    <input type='checkbox' <?php echo ($useAnon != FALSE ? "checked" : "") . ($realm == "" ? " disabled" : ""); ?> name='anon_support' onclick='
                             if (this.form.elements["anon_support"].checked !== true) {
                                 this.form.elements["anon_local"].setAttribute("disabled", "disabled");
                             } else {
                                 this.form.elements["anon_local"].removeAttribute("disabled");
                             }
                             ;'/>
-                    <input type='text' <?php echo ($checkuserOuter == FALSE ? "disabled" : "" ); ?> name='anon_local' value='<?php echo $anonLocal; ?>'/>
+                    <input type='text' <?php echo ($checkuserOuter == FALSE ? "disabled" : ""); ?> name='anon_local' value='<?php echo $anonLocal; ?>'/>
                 </td>    
             </tr>
             <tr>
 
                 <!-- checkbox and input field for check realm outer id, available only when realm is known-->
                 <td>
-                    <span id='checkuser_label' style='<?php echo ($realm == "" ? "color:#999999" : "" ); ?>'>
+                    <span id='checkuser_label' style='<?php echo ($realm == "" ? "color:#999999" : ""); ?>'>
                         <?php echo _("Use special Outer Identity for realm checks:"); ?>
                     </span>
                 </td>
                 <td>
-                    <input type='checkbox' <?php echo ($checkuserOuter != FALSE ? "checked" : "" ) . ($realm == "" ? " disabled" : "" ); ?> name='checkuser_support' onclick='
+                    <input type='checkbox' <?php echo ($checkuserOuter != FALSE ? "checked" : "") . ($realm == "" ? " disabled" : ""); ?> name='checkuser_support' onclick='
                             if (this.form.elements["checkuser_support"].checked !== true) {
                                 this.form.elements["checkuser_local"].setAttribute("disabled", "disabled");
                             } else {
                                 this.form.elements["checkuser_local"].removeAttribute("disabled");
                             }
                             ;'/>
-                    <input type='text' <?php echo ($checkuserOuter == FALSE ? "disabled" : "" ); ?> name='checkuser_local' value='<?php echo $checkuserValue; ?>'/>
+                    <input type='text' <?php echo ($checkuserOuter == FALSE ? "disabled" : ""); ?> name='checkuser_local' value='<?php echo $checkuserValue; ?>'/>
                 </td>
             </tr>
         </table>
@@ -344,14 +344,14 @@ 
     <p>
 
         <?php
-        echo "<span id='redirect_label' style='" . ($realm == "" ? "color:#999999" : "" ) . "'><label for='redirect'>" . _("Redirect end users to own web page:") . "</label></span>
-                          <input type='checkbox'  name='redirect' id='redirect' " . ($blacklisted === FALSE ? "" : "checked " ) . "onclick='
+        echo "<span id='redirect_label' style='" . ($realm == "" ? "color:#999999" : "") . "'><label for='redirect'>" . _("Redirect end users to own web page:") . "</label></span>
+                          <input type='checkbox'  name='redirect' id='redirect' " . ($blacklisted === FALSE ? "" : "checked ") . "onclick='
                               if (this.form.elements[\"redirect\"].checked != true) {
                                 this.form.elements[\"redirect_target\"].setAttribute(\"disabled\", \"disabled\");
                               } else {
                                 this.form.elements[\"redirect_target\"].removeAttribute(\"disabled\");
                               };'/>
-                          <input type='text' name='redirect_target' " . ($blacklisted !== FALSE ? "value='$blacklisted'" : "disabled" ) . "/>";
+                          <input type='text' name='redirect_target' " . ($blacklisted !== FALSE ? "value='$blacklisted'" : "disabled") . "/>";
         ?>
     </p>
 
@@ -375,7 +375,7 @@ 
     function priority(string $eapType, bool $isenabled, int $priority) {
         echo "<td><select id='$eapType-priority' name='$eapType-priority' " . (!$isenabled ? "disabled='disabled'" : "") . ">";
         for ($a = 1; $a < 7; $a = $a + 1) {
-            echo "<option id='$eapType-$a' value='$a' " . ( $isenabled && $a == $priority ? "selected" : "" ) . ">$a</option>";
+            echo "<option id='$eapType-$a' value='$a' " . ($isenabled && $a == $priority ? "selected" : "") . ">$a</option>";
         }
         echo "</select></td>";
     }

devices/linux/Device_Linux.php

Indentation +1 added lines, -1 removed lines

@@ -137,7 +137,7 @@
         
         $out .= 'Config.sb_user_file = """' . $this->mkSbUserFile() . '"""' . "\n";
         if (!empty($this->attributes['internal:realm'][0])) {
-           $out .= 'Config.user_realm = "' . $this->attributes['internal:realm'][0] . "\"\n";
+            $out .= 'Config.user_realm = "' . $this->attributes['internal:realm'][0] . "\"\n";
         }
         if(!empty($this->attributes['internal:hint_userinput_suffix'][0]) && $this->attributes['internal:hint_userinput_suffix'][0] == 1) {
             $out .= "Config.hint_user_input = True\n";

Braces +1 added lines, -2 removed lines

@@ -124,8 +124,7 @@
         $out .= "Config.eap_inner = '" . $eapMethod['INNER'] . "'\n";
         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') {
             $out .= "Config.use_other_tls_id = True\n";
-        }
-        else {
+        } else {
             $out .= "Config.use_other_tls_id = False\n";
         }
         $tou = $this->mkUserConsent();

Spacing +10 added lines, -10 removed lines

@@ -33,12 +33,12 @@ 
     public function writeInstaller() {
         $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!");
         }
-        fwrite($installer,$this->writeMessages());
-        fwrite($installer,$this->writeConfigVars());
+        fwrite($installer, $this->writeMessages());
+        fwrite($installer, $this->writeConfigVars());
         fwrite($installer, "run_installer()\n");
         fclose($installer);
         return($installerPath);
@@ -104,7 +104,7 @@ 
         $out .= 'Messages.p12_title = "' . _("personal certificate file (p12 or pfx)") . "\"\n";
         $out .= 'Messages.save_wpa_conf = "' . _("Network Manager configuration failed, but we may generate a wpa_supplicant configuration file if you wish. Be warned that your connection password will be saved in this file as clear text.") . "\"\n";
         $out .= 'Messages.save_wpa_confirm = "' . _("Write the file") . "\"\n";
-        $out .= 'Messages.wrongUsernameFormat = "' ._("Error: Your username must be of the form 'xxx@institutionID' e.g. 'john@example.net'!") . "\"\n";
+        $out .= 'Messages.wrongUsernameFormat = "' . _("Error: Your username must be of the form 'xxx@institutionID' e.g. 'john@example.net'!") . "\"\n";
         $out .= 'Messages.wrong_realm = "' . _("Error: your username must be in the form of 'xxx@{}'. Please enter the username in the correct format.") . "\"\n";
         $out .= 'Messages.wrong_realm_suffix = "' . _("Error: your username must be in the form of 'xxx@institutionID' and end with '{}'. Please enter the username in the correct format.") . "\"\n";
     
@@ -133,8 +133,8 @@ 
             $out .= "Config.use_other_tls_id = False\n";
         }
         $tou = $this->mkUserConsent();
-        $out .= 'Config.tou = ' . ( $tou ? '"""' . $tou . '"""' : 'None' ) . "\n"; 
-        $out .= 'Config.CA = """' . $this->mkCAfile()  . '"""' . "\n";
+        $out .= 'Config.tou = ' . ($tou ? '"""' . $tou . '"""' : 'None') . "\n"; 
+        $out .= 'Config.CA = """' . $this->mkCAfile() . '"""' . "\n";
         $out .= "Config.anonymous_identity = '" . $this->determineOuterIdString() . "'\n";
         $out .= 'Config.init_info = """' . $this->mkIntro() . '"""' . "\n";
         $out .= 'Config.init_confirmation = "' . $this->mkProfileConfirmation() . "\"\n";
@@ -143,10 +143,10 @@ 
         if (!empty($this->attributes['internal:realm'][0])) {
            $out .= 'Config.user_realm = "' . $this->attributes['internal:realm'][0] . "\"\n";
         }
-        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) {
             $out .= "Config.hint_user_input = True\n";
         }
-        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) {
             $out .= "Config.verify_user_realm_input = True\n";
         }        
         return $out;
@@ -186,7 +186,7 @@ 
             }
             $out .= "'DNS:$oneServer'";
         }
-        return "[" . $out. "]";
+        return "[" . $out . "]";
     }
 
     
@@ -210,7 +210,7 @@ 
         return '[' . implode(', ', $outArray) . ']';
     }
     
-    private function mkCAfile(){
+    private function mkCAfile() {
         $out = '';
         $cAlist = $this->attributes['internal:CAs'][0];
         foreach ($cAlist as $oneCa) {

web/admin/inc/displayQRcode.inc.php

Spacing +3 added lines, -3 removed lines

@@ -29,6 +29,6 @@
 $link = \core\ProfileSilverbullet::generateTokenLink($cleanToken);
 header("Content-Type:text/html;charset=utf-8");
 ?>
-<h1 style='text-align:center;'><?php echo _("Invitation Token QR Code");?></h1>
-<img style='float:none' src='data:image/png;base64,<?php echo base64_encode($uiElements->pngInjectConsortiumLogo(\QRcode::png($link, FALSE, QR_ECLEVEL_Q, 11), 11));?>'/>
-<p>(<a href='<?php echo $link;?>'><?php echo $link;?>)</a></p>
\ No newline at end of file
+<h1 style='text-align:center;'><?php echo _("Invitation Token QR Code"); ?></h1>
+<img style='float:none' src='data:image/png;base64,<?php echo base64_encode($uiElements->pngInjectConsortiumLogo(\QRcode::png($link, FALSE, QR_ECLEVEL_Q, 11), 11)); ?>'/>
+<p>(<a href='<?php echo $link; ?>'><?php echo $link; ?>)</a></p>
\ No newline at end of file

web/skins/classic/index.php

Spacing +6 added lines, -6 removed lines

@@ -60,11 +60,11 @@ 
 
 $deco = new \web\lib\admin\PageDecoration();
 ?>
-<link rel="stylesheet" media="screen" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("CSS","cat-user.css");?>" />
+<link rel="stylesheet" media="screen" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("CSS", "cat-user.css"); ?>" />
 <!-- JQuery -->
-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery.js") ?>"></script>
-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery-migrate.js") ?>"></script>
-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery-ui.js") ?>"></script>
+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery.js") ?>"></script>
+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery-migrate.js") ?>"></script>
+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery-ui.js") ?>"></script>
 <!-- JQuery -->
 <script type="text/javascript">
     if (screen.width <= 480) {
@@ -106,7 +106,7 @@ 
     <div id="heading">
         <?php
         print '<img src="' . $Gui->skinObject->findResourceUrl("IMAGES", "consortium_logo.png") . '" alt="Consortium Logo" style="float:right; padding-right:20px; padding-top:20px"/>';
-        print '<div id="motd">' . ( isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp' ) . '</div>';
+        print '<div id="motd">' . (isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp') . '</div>';
         print '<h1 style="padding-bottom:0px; height:1em;">' . sprintf(_("Welcome to %s"), CONFIG['APPEARANCE']['productname']) . '</h1>
 <h2 style="padding-bottom:0px; height:0px; vertical-align:bottom;">' . CONFIG['APPEARANCE']['productname_long'] . '</h2>';
         echo '<table id="lang_select"><tr><td>';
@@ -160,7 +160,7 @@ 
                                             <span id="line1"><?php printf(_("%s installation made easy:"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']) ?></span>
                                             <span id="line2"></span>
                                             <span id="line3"></span>
-                                            <span id="line4"><?php echo sprintf(_("Custom built for your %s"),$Gui->nomenclature_inst) ?></span>
+                                            <span id="line4"><?php echo sprintf(_("Custom built for your %s"), $Gui->nomenclature_inst) ?></span>
                                             <span id="line5">
                                                 <?php
                                                 if (isset(CONFIG_CONFASSISTANT['CONSORTIUM']['signer_name']) && CONFIG_CONFASSISTANT['CONSORTIUM']['signer_name'] != "") {

web/skins/modern/test.php

Indentation +1 added lines, -1 removed lines

@@ -81,7 +81,7 @@
          <?php if (empty($_REQUEST['idp'])) { ?>
               <div id="front_page">
                   <?php
-                         echo $divs->div_top_welcome();
+                            echo $divs->div_top_welcome();
 //                         echo $divs->div_roller();
 //                         echo $divs->div_main_button(); ?>
               </div> <!-- id="front_page" -->

Spacing +9 added lines, -9 removed lines

@@ -18,9 +18,9 @@ 
 ?>
 
 <!-- JQuery -->
-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery.js") ?>"></script>
-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery-migrate-1.2.1.js") ?>"></script>
-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery-ui.js") ?>"></script>
+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery.js") ?>"></script>
+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery-migrate-1.2.1.js") ?>"></script>
+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery-ui.js") ?>"></script>
 <!-- JQuery -->
 
 <script type="text/javascript">
@@ -48,7 +48,7 @@ 
 include("user/js/cat_js.php");
 ?>
     var loading_ico = new Image();
-    loading_ico.src = "<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/loading51.gif")?>";
+    loading_ico.src = "<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/loading51.gif")?>";
 </script>
 <?php $Gui->langObject->setTextDomain("web_user"); ?>
 <!-- DiscoJuice -->
@@ -57,9 +57,9 @@ 
     front_page = 0;
     var lang = "<?php echo($Gui->langObject->getLang()) ?>";
 </script>
-<link rel="stylesheet" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","discojuice/css/discojuice.css")?>" />
+<link rel="stylesheet" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "discojuice/css/discojuice.css")?>" />
 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0, user-scalable=no">
-<link rel="stylesheet" media="screen" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("CSS","cat-user.css");?>" />
+<link rel="stylesheet" media="screen" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("CSS", "cat-user.css"); ?>" />
 </head>
 <body>
 <div id="wrap">
@@ -67,14 +67,14 @@ 
     <?php echo $divs->div_heading($visibility); ?>
     <div id="main_page">
         <div id="loading_ico">
-          <?php echo _("Authenticating") . "..." ?><br><img src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/loading51.gif")?>" alt="Authenticating ..."/>
+          <?php echo _("Authenticating") . "..." ?><br><img src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/loading51.gif")?>" alt="Authenticating ..."/>
         </div>
         <div id="info_overlay"> <!-- device info -->
             <div id="info_window"></div>
-            <img id="info_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/button_cancel.png")?>" ALT="Close"/>
+            <img id="info_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/button_cancel.png")?>" ALT="Close"/>
         </div>
         <div id="main_menu_info" style="display:none"> <!-- stuff triggered form main menu -->
-          <img id="main_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/button_cancel.png")?>" ALT="Close"/>
+          <img id="main_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/button_cancel.png")?>" ALT="Close"/>
           <div id="main_menu_content"></div>
         </div>
         <div id="main_body">