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 {
@@ -331,7 +331,7 @@ 
    $("#loading_ico").css('left',x+'px');
    $("#loading_ico").attr('src','resources/images/icons/loading9.gif');
    $("#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 */
@@ -352,7 +352,7 @@ 
     return(Math.round(windowWidth/2));
 }
 
-<?php if($idpId) { 
+<?php if ($idpId) { 
       print "front_page = 0;\n";
 } ?>
 
@@ -390,10 +390,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;
     }
   }
 }
@@ -511,13 +511,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/skins/eduroam2016/Divs.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
             <img id='logo_img' src='" . $this->Gui->skinObject->findResourceUrl("IMAGES", "consortium_logo.png") . "' alt='Consortium Logo'/>
             <span>Configuration Assistant Tool</span>
         </div>
-        <div id='motd'>" . (isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp' ) . "</div>
+        <div id='motd'>" . (isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp') . "</div>
         <img id='hamburger' src='" . $this->Gui->skinObject->findResourceUrl("IMAGES", "icons/menu.png") . "' alt='Menu'/>
         <div id='menu_top'>
 ";

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

Spacing +18 added lines, -18 removed lines

@@ -206,13 +206,13 @@ 
        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>';
        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();
       resetDevices();
@@ -225,7 +225,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)
@@ -237,7 +237,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();
@@ -245,13 +245,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') {
@@ -306,7 +306,7 @@ 
   }
 
   function infoCAT(k,subK,title) {
-      $.post('<?php echo $Gui->skinObject->findResourceUrl("BASE","user/cat_info.php")?>', {page: k, subpage: subK, lang: lang}, function(data) {
+      $.post('<?php echo $Gui->skinObject->findResourceUrl("BASE", "user/cat_info.php")?>', {page: k, subpage: subK, lang: lang}, function(data) {
     if(data.substring(0,8) == 'no_title') {
        data = data.substring(8,data.length);
     } else {
@@ -329,7 +329,7 @@ 
    $("#loading_ico").css('left',x+'px');
    $("#loading_ico").attr('src','resources/images/icons/loading9.gif');
    $("#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);
 }
 
 
@@ -351,7 +351,7 @@ 
     return(Math.round(windowWidth/2));
 }
 
-<?php if($idpId) { 
+<?php if ($idpId) { 
         print "front_page = 0;\n";
 } ?>
 
@@ -390,10 +390,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;
     }
   }
 }
@@ -475,13 +475,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)) ?>",
    "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/skins/eduroam2016/user/cat_info.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 $Gui->langObject->setTextDomain("web_user");
 
 $page = $_REQUEST['page'];
-$subpage= $_REQUEST['subpage'];
+$subpage = $_REQUEST['subpage'];
 switch ($page) {
     case 'about' :
         require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/user/about_cat.inc.php");

web/skins/eduroam2016/Menu.php

Indentation +4 added lines, -4 removed lines

@@ -62,9 +62,9 @@ 
     }
     public function printMenu($menu = NULL, $id=NULL) {
         $menu = $menu ?? $this->menu;
-     if(count($menu) == 0) {
-          return;
-     }
+        if(count($menu) == 0) {
+            return;
+        }
         $out = "\n<ul>\n";
         foreach ($menu as $menuItem) {
             $itemVisibility = $menuItem['visibility'] ?? 'all';
@@ -80,7 +80,7 @@ 
                 $out .= $this->printMenuItem($menuItem['text'], $link, $class);
                 $out .= $this->printMenu($submenu,$iD);
                 $out .= "</li>\n";
-             }
+                }
         }
         $out .= '</ul>';
         return($out);

Spacing +11 added lines, -11 removed lines

@@ -20,9 +20,9 @@ 
         $langsArray = [];
         foreach (CONFIG['LANGUAGES'] as $lang => $value) {
             if ($lang == $selectedLang) {
-                $langsArray[] = ['text'=>$value['display'], 'link'=>'javascript:changeLang("'.$lang.'")', 'class'=>'selected-lang'];
+                $langsArray[] = ['text'=>$value['display'], 'link'=>'javascript:changeLang("' . $lang . '")', 'class'=>'selected-lang'];
             } else {
-                $langsArray[] = ['text'=>$value['display'], 'link'=>'javascript:changeLang("'.$lang.'")'];
+                $langsArray[] = ['text'=>$value['display'], 'link'=>'javascript:changeLang("' . $lang . '")'];
             }
         }
         $this->menu = [['id' => 'start',
@@ -36,7 +36,7 @@ 
                         'link' => CONFIG_CONFASSISTANT['CONSORTIUM']['homepage']],
                 ]],
             ['id' => 'lang',
-                'text' => _("Language"), 'submenu' => $langsArray,],
+                'text' => _("Language"), 'submenu' => $langsArray, ],
             ['id' => 'help',
                 'text' => _("Help"), 'submenu' => [
                     ['text' => _("My institution is not listed"), 'catInfo' => ['idp_not_listed', _("FAQ")], 'visibility' => 'index'],
@@ -60,9 +60,9 @@ 
         ];
         $this->visibility = $visibility;
     }
-    public function printMenu($menu = NULL, $id=NULL) {
+    public function printMenu($menu = NULL, $id = NULL) {
         $menu = $menu ?? $this->menu;
-     if(count($menu) == 0) {
+     if (count($menu) == 0) {
           return;
      }
         $out = "\n<ul>\n";
@@ -72,13 +72,13 @@ 
                 $iD = $menuItem['id'] ?? $id;
                 $catInfo = NULL;
                 if (!empty($menuItem['catInfo'])) {
-                    $catInfo = 'javascript:infoCAT("'.$iD.'", "'.$menuItem['catInfo'][0].'","'.$menuItem['catInfo'][1].'")';
+                    $catInfo = 'javascript:infoCAT("' . $iD . '", "' . $menuItem['catInfo'][0] . '","' . $menuItem['catInfo'][1] . '")';
                 }
                 $link = $catInfo ?? $menuItem['link'] ?? '';
-                $class = empty($menuItem['class']) ? '' : ' class="'.$menuItem['class'].'"';
-                $submenu  = $menuItem['submenu'] ?? [];
+                $class = empty($menuItem['class']) ? '' : ' class="' . $menuItem['class'] . '"';
+                $submenu = $menuItem['submenu'] ?? [];
                 $out .= $this->printMenuItem($menuItem['text'], $link, $class);
-                $out .= $this->printMenu($submenu,$iD);
+                $out .= $this->printMenu($submenu, $iD);
                 $out .= "</li>\n";
              }
         }
@@ -86,8 +86,8 @@ 
         return($out);
     }
 
-    private function printMenuItem($itemText,$itemLink = '',$itemClass = '') {
-        return "<li><a href='" . $itemLink . "'".$itemClass.'>' . $itemText . "</a>";
+    private function printMenuItem($itemText, $itemLink = '', $itemClass = '') {
+        return "<li><a href='" . $itemLink . "'" . $itemClass . '>' . $itemText . "</a>";
     }
     
 

web/skins/eduroam2016/accountstatus/accountstatus.php

Indentation +2 added lines, -2 removed lines

@@ -49,7 +49,7 @@ 
             <div id="user_info"></div> <!-- this will be filled with the profile contact information -->
             <div id="sb_info">
                 <?php 
-             switch ($statusInfo['errorcode']) {
+                switch ($statusInfo['errorcode']) {
                     case "GENERATOR_CONSUMED":
                         echo $uiElements->boxError(_("You attempted to download an installer that was already downloaded before. Please request a new token from your administrator instead."), _("Attempt to re-use download link"), TRUE) . "<p>";
                         break;
@@ -147,7 +147,7 @@ 
                         }
 
                         echo "<div id='sb_download_message'><p>".sprintf(_("You can now download a personalised  %s installation program."), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']);
- //                       echo sprintf(_("The installation program is <span class='emph'>strictly personal</span>, to be used <span class='emph'>only on this device (%s)</span>, and it is <span class='emph'>not permitted to share</span> this information with anyone."), $statusInfo['OS']['display']);
+    //                       echo sprintf(_("The installation program is <span class='emph'>strictly personal</span>, to be used <span class='emph'>only on this device (%s)</span>, and it is <span class='emph'>not permitted to share</span> this information with anyone."), $statusInfo['OS']['display']);
                         echo sprintf(_("The installation program is <span class='emph'>strictly personal</span>, to be used <span class='emph'>only on this device (%s)</span>, and it is <span class='emph'>not permitted to share</span> this information with anyone."), $statusInfo['OS']['display']);
                         echo "<p style='color:red;'>" . _("When the system detects abuse such as sharing login data with others, all access rights for you will be revoked and you may be sanctioned by your local eduroam administrator.") . "</p>";
                         echo "<p>" . _("During the installation process, you will be asked for the following import PIN. This only happens once during the installation. You do not have to write down this PIN.") . "</p></div>";

Spacing +16 added lines, -16 removed lines

@@ -3,9 +3,9 @@ 
 $Gui->defaultPagePrelude();
 ?>
 <!-- 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">
     var recognisedOS = '';
@@ -27,7 +27,7 @@ 
 ?>
 var lang = "<?php echo($Gui->langObject->getLang()) ?>";
 </script>
-<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>
@@ -37,15 +37,15 @@ 
     <?php echo $divs->div_heading($visibility); ?>
     <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">
         <div id="user_page">
-            <?php  echo $divs->div_institution(FALSE);?>
+            <?php  echo $divs->div_institution(FALSE); ?>
             <div id="user_info"></div> <!-- this will be filled with the profile contact information -->
             <div id="sb_info">
                 <?php 
@@ -101,11 +101,11 @@ 
                                 $categoryText = "<tr style='color:$color;'><th colspan=5 class='th1'>" . $categoryText;
 
                                 $categoryText .= "</th></tr>";
-                                $categoryText .= "<tr style='color:$color;'><th>" . _("Pseudonym") . "</th><th>" . _("Device Type") . "</th><th>" . _("Serial Number") . "</th><th>" . _("Issue Date") . "</th><th>" . _("Expiry Date") . "</th>". ( $category == \core\ProfileSilverbullet::SB_CERTSTATUS_VALID ? $revokeText : "") . "</tr>";
+                                $categoryText .= "<tr style='color:$color;'><th>" . _("Pseudonym") . "</th><th>" . _("Device Type") . "</th><th>" . _("Serial Number") . "</th><th>" . _("Issue Date") . "</th><th>" . _("Expiry Date") . "</th>" . ($category == \core\ProfileSilverbullet::SB_CERTSTATUS_VALID ? $revokeText : "") . "</tr>";
                                 foreach ($allcerts as $oneCredential) {
                                     if ($oneCredential['status'] == $category) {
                                         $categoryCount++;
-                                        ${$categoryCountVar} ++;
+                                        ${$categoryCountVar}++;
                                         $categoryText .= "<tr style='color:$color;'>";
                                         $categoryText .= "<td>" . $oneCredential['name'] . "</td>";
                                         $categoryText .= "<td>" . $oneCredential['device'] . "</td>";
@@ -139,18 +139,18 @@ 
                             echo "<h3>" . sprintf(_("Your invitation token is valid for %d more device activations (%d have already been used)."), $statusInfo['tokenstatus']['activations_remaining'], $statusInfo['tokenstatus']['activations_total'] - $statusInfo['tokenstatus']['activations_remaining']) . "</h3>";
                         }
                         if (!$statusInfo["OS"]) {
-                            echo "<p>"._("Unfortunately, we are unable to determine your device's operating system. If you have made modifications on your device which prevent it from being recognised (e.g. custom 'User Agent' settings), please undo such modifications. You can come back to this page again; the invitation link has not been used up yet.") . "</p>";
+                            echo "<p>" . _("Unfortunately, we are unable to determine your device's operating system. If you have made modifications on your device which prevent it from being recognised (e.g. custom 'User Agent' settings), please undo such modifications. You can come back to this page again; the invitation link has not been used up yet.") . "</p>";
                             break;
                         }
 
                         $dev = new \core\DeviceFactory($statusInfo['OS']['device']);
                         $dev->device->calculatePreferredEapType([new \core\common\EAP(\core\common\EAP::EAPTYPE_SILVERBULLET)]);
                         if ($dev->device->selectedEap == []) {
-                            echo "<p>".sprintf(_("Unfortunately, the operating system your device uses (%s) is currently not supported for hosted end-user accounts. You can visit this page with a supported operating system later; the invitation link has not been used up yet."), $statusInfo['OS']['display']) . "</p>";
+                            echo "<p>" . sprintf(_("Unfortunately, the operating system your device uses (%s) is currently not supported for hosted end-user accounts. You can visit this page with a supported operating system later; the invitation link has not been used up yet."), $statusInfo['OS']['display']) . "</p>";
                             break;
                         }
 
-                        echo "<div id='sb_download_message'><p>".sprintf(_("You can now download a personalised  %s installation program."), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']);
+                        echo "<div id='sb_download_message'><p>" . sprintf(_("You can now download a personalised  %s installation program."), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']);
  //                       echo sprintf(_("The installation program is <span class='emph'>strictly personal</span>, to be used <span class='emph'>only on this device (%s)</span>, and it is <span class='emph'>not permitted to share</span> this information with anyone."), $statusInfo['OS']['display']);
                         echo sprintf(_("The installation program is <span class='emph'>strictly personal</span>, to be used <span class='emph'>only on this device (%s)</span>, and it is <span class='emph'>not permitted to share</span> this information with anyone."), $statusInfo['OS']['display']);
                         echo "<p style='color:red;'>" . _("When the system detects abuse such as sharing login data with others, all access rights for you will be revoked and you may be sanctioned by your local eduroam administrator.") . "</p>";
@@ -202,9 +202,9 @@ 
             $supportInfo .= '<tr><td>' . ("tel:") . '</td><td><a href="' . $attributes['local_phone'] . '" target="_blank">' . $attributes['local_phone'] . '</a></td></tr>';
         }
         if ($supportInfo != '') {
-            $supportInfo = "<table><tr><th colspan='2'>" . sprintf(_("If you encounter problems, then you can obtain direct assistance from your %s at:"),$cat->nomenclature_inst) . "</th></tr>$supportInfo</table>";
+            $supportInfo = "<table><tr><th colspan='2'>" . sprintf(_("If you encounter problems, then you can obtain direct assistance from your %s at:"), $cat->nomenclature_inst) . "</th></tr>$supportInfo</table>";
         } else {
-            $supportInfo = "<table><tr><th colspan='2'>" . sprintf(_("If you encounter problems you should ask for help at your %s"),$cat->nomenclature_inst) . "</th></tr></table>";
+            $supportInfo = "<table><tr><th colspan='2'>" . sprintf(_("If you encounter problems you should ask for help at your %s"), $cat->nomenclature_inst) . "</th></tr></table>";
         }
 ?>
     <script>
@@ -215,7 +215,7 @@ 
     $("#inst_name").val(idpName);
     $("#inst_name_span").html(idpName);
     $(".inst_name").text(idpName);
-    $("#inst_extra_text").html("<?php escaped_echo(sprintf(_("Your personal %s account status page"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']));?>");
+    $("#inst_extra_text").html("<?php escaped_echo(sprintf(_("Your personal %s account status page"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'])); ?>");
         if(logo) {
     $("#idp_logo").attr("src","<?php echo $skinObject->findResourceUrl("BASE", "user/API.php"); ?>?action=sendLogo&api_version=2&idp="+idpId);
     $("#idp_logo").show();
@@ -230,7 +230,7 @@ 
         
         $("#user_button_sb").click(function(event){
             event.preventDefault();
-            $("#cat_form").attr('action','<?php echo $Gui->skinObject->findResourceUrl("BASE","user/sb_download.php");?>');
+            $("#cat_form").attr('action','<?php echo $Gui->skinObject->findResourceUrl("BASE", "user/sb_download.php"); ?>');
             $("#cat_form").submit();
         });
         

web/user/API.php

Spacing +11 added lines, -11 removed lines

@@ -39,7 +39,7 @@ 
     'getUserCerts',
 ];
 
-function getRequest($varName,$filter) {
+function getRequest($varName, $filter) {
     $safeText = ["options"=>["regexp"=>"/^[\w\d]+$/"]];
     switch ($filter) {
         case 'safe_text':
@@ -57,7 +57,7 @@ 
 
 // make sure this is a known action
 $actionR = getRequest('action', 'safe_text');
-$action = array_search($actionR,LISTOFACTIONS) ? $actionR : FALSE;
+$action = array_search($actionR, LISTOFACTIONS) ? $actionR : FALSE;
 if ($action === FALSE) {
     exit;
 }
@@ -65,18 +65,18 @@ 
 $lang = $langR ? $validator->supportedLanguage($langR) : FALSE;
 $deviceR = getRequest('device', 'safe_text');
 $device = $deviceR ? $validator->Device($deviceR) : FALSE;
-$idpR = getRequest('idp','int');
+$idpR = getRequest('idp', 'int');
 $idp = $idpR ? $validator->IdP($idpR)->identifier : FALSE;
-$profileR = getRequest('profile','int');
+$profileR = getRequest('profile', 'int');
 $profile = $profileR ? $validator->Profile($profileR)->identifier : FALSE;
-$federationR = getRequest('federation','safe_text');
+$federationR = getRequest('federation', 'safe_text');
 $federation = $federationR ? $validator->Federation($deviceR)->identifier : FALSE;
-$disco = getRequest('disco','int');
-$width = getRequest('width','int') ?? 0;
-$height = getRequest('height','int') ?? 0;
-$sort = getRequest('sort','int') ?? 0;
-$generatedforR = getRequest('generatedfor','safe_text') ?? 'user';
-$token = getRequest('token','safe_text');
+$disco = getRequest('disco', 'int');
+$width = getRequest('width', 'int') ?? 0;
+$height = getRequest('height', 'int') ?? 0;
+$sort = getRequest('sort', 'int') ?? 0;
+$generatedforR = getRequest('generatedfor', 'safe_text') ?? 'user';
+$token = getRequest('token', 'safe_text');
 
 
 switch ($action) {