GEANT / CAT

web/user/sb_download.php

Indentation +1 added lines, -1 removed lines

@@ -71,5 +71,5 @@
         throw new Exception("Unable to find our accountstatus.php page.");
     }
 //    print $accountPageUrl;
-  header("Location: ../accountstatus/accountstatus.php?token=" . $cleanToken . "&errorcode=GENERATOR_CONSUMED");
+    header("Location: ../accountstatus/accountstatus.php?token=" . $cleanToken . "&errorcode=GENERATOR_CONSUMED");
 }

web/skins/eduroam2016/user/cat_info.php

Indentation +10 added lines, -10 removed lines

@@ -32,8 +32,8 @@ 
 switch ($page) {
     case 'about' :
        require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/user/about_cat.inc.php");
-       $out = "<div>$out</div>";
-       break;
+        $out = "<div>$out</div>";
+        break;
     case 'tou':
         require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/user/tou.inc.php");
         $out = "no_title<div>
@@ -59,18 +59,18 @@ 
             case 'what_is_eduroam' :
                 $out = "no_title<div><h1>" . _("Help") . "</h1>";
                 foreach ($Faq as $faqItem) {
-                   if (!empty($faqItem['id']) && $faqItem['id'] == $subpage) {
-                       $out .= "<div><h3>" . $faqItem['title'] . "</h3>\n";
-                       $out .= "" . $faqItem['text'] . "</div>\n";
-                   }
+                    if (!empty($faqItem['id']) && $faqItem['id'] == $subpage) {
+                        $out .= "<div><h3>" . $faqItem['title'] . "</h3>\n";
+                        $out .= "" . $faqItem['text'] . "</div>\n";
+                    }
                 }
                 $out .= "</div>";
                 break;
             case 'faq':
                 $out = "no_title<div><h1>" . _("Frequently Asked Questions") . "</h1>";
                 foreach ($Faq as $faqItem) {
-                   $out .= "<div><h3>" . $faqItem['title'] . "</h3>\n";
-                   $out .= "" . $faqItem['text'] . "</div>\n";
+                    $out .= "<div><h3>" . $faqItem['title'] . "</h3>\n";
+                    $out .= "" . $faqItem['text'] . "</div>\n";
                 }
                 $out .= "</div>";
                 break;
@@ -98,8 +98,8 @@ 
                     $out .= "<input id='mail' name='mail' type='text'/><button onclick='window.location.replace(\"remindIdP.php?mail=stefan.winter@restena.lu\"; return false;'>" . _("Get IdP Reminder") . "</button>";
                 }
                 break;
-       }
-       break;
+        }
+        break;
     default:
         break;
 }

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

Indentation +9 added lines, -9 removed lines

@@ -10,7 +10,7 @@ 
 ?>
 <?php 
 function escaped_echo($s) {
-   echo preg_replace('/"/','&quot;',$s);
+    echo preg_replace('/"/','&quot;',$s);
 }
 
 $langObject = new \core\common\Language();
@@ -19,7 +19,7 @@ 
 $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);
 $skinObject = $Gui->skinObject;
- ?>
+    ?>
 var n;
 var profile;
 // var device_button_bg ="#0a698e";
@@ -352,7 +352,7 @@ 
 }
 
 <?php if($idpId) { 
-      print "front_page = 0;\n";
+        print "front_page = 0;\n";
 } ?>
 
 function showTOU(){
@@ -434,7 +434,7 @@ 
 if ($profileId) {
     print "listProfiles($idpId,$profileId);";
 }
- ?>
+    ?>
 
 $(".signin").click(function(event){
      event.preventDefault();
@@ -517,12 +517,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 +23 added lines, -23 removed lines

@@ -10,7 +10,7 @@ 
 ?>
 <?php 
 function escaped_echo($s) {
-   echo preg_replace('/"/','&quot;',$s);
+   echo preg_replace('/"/', '&quot;', $s);
 }
 
 $langObject = new \core\common\Language();
@@ -75,7 +75,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;
@@ -192,8 +192,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) {
@@ -204,15 +204,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();
       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/Menu.php

Indentation +16 added lines, -16 removed lines

@@ -24,19 +24,19 @@ 
             }
         }
         $this->menu = [['id'=>'start',
-     'text'=>_("Start page"),
-     'visibility' => 'index'],
+        'text'=>_("Start page"),
+        'visibility' => 'index'],
     ['id'=>'about',
-     'text'=>_("About"),'link'=>'','submenu'=>[
+        'text'=>_("About"),'link'=>'','submenu'=>[
             ['text'=>sprintf(_("About %s"), CONFIG['APPEARANCE']['productname']),
-             'catInfo'=>['about_cat',sprintf(_("About %s"), CONFIG['APPEARANCE']['productname'])]],
+                'catInfo'=>['about_cat',sprintf(_("About %s"), CONFIG['APPEARANCE']['productname'])]],
             ['text'=>sprintf(_("About %s"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']),
-             'link'=>CONFIG_CONFASSISTANT['CONSORTIUM']['homepage']],
+                'link'=>CONFIG_CONFASSISTANT['CONSORTIUM']['homepage']],
         ]],
     ['id'=>'lang',
-     'text'=>_("Language"), 'submenu'=>$langsArray,],
+        'text'=>_("Language"), 'submenu'=>$langsArray,],
     ['id'=>'help',
-     'text'=>_("Help"), 'submenu'=>[
+        'text'=>_("Help"), 'submenu'=>[
             ['text'=>_("My institution is not listed"), 'catInfo'=>['idp_not_listed',_("FAQ")], 'visibility'=>'index'],
             ['text'=>_("My device is not listed"), 'catInfo'=>['device_not_listed',_("FAQ")], 'visibility'=>'index'],
             ['text'=>_("SB help item"),'visibility'=>'sb'],
@@ -45,24 +45,24 @@ 
             ['text'=>_("Contact"), 'catInfo'=>['contact',_("FAQ")]],
         ]],
     ['id'=>'manage',
-     'text'=>_("Manage"),'submenu'=>[
+        'text'=>_("Manage"),'submenu'=>[
             ['text'=>sprintf(_("%s admin access"),CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']),
-             'catInfo'=>['admin',sprintf(_("%s admin:<br>manage your IdP"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'])]],
+                'catInfo'=>['admin',sprintf(_("%s admin:<br>manage your IdP"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'])]],
             ['text'=>_("Become a CAT developer"),
-             'catInfo'=>['develop',_("Become a CAT developer")]],
+                'catInfo'=>['develop',_("Become a CAT developer")]],
             ['text'=>_("Documentation")],
         ],
-     'visibility' => 'index'],
+        'visibility' => 'index'],
     ['id'=>'tou',
-     'text'=>_("Terms of use"), 'catInfo'=>['tou','TOU']],
+        'text'=>_("Terms of use"), 'catInfo'=>['tou','TOU']],
     ];
         $this->visibility = $visibility;
     }
     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';
@@ -78,7 +78,7 @@ 
                 $out .= $this->printMenuItem($menuItem['text'], $link, $class);
                 $out .= $this->printMenu($submenu,$iD);
                 $out .= "</li>\n";
-             }
+                }
         }
         $out .= '</ul>';
         return($out);

Spacing +24 added lines, -24 removed lines

@@ -18,49 +18,49 @@ 
         $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',
      'text'=>_("Start page"),
      'visibility' => 'index'],
     ['id'=>'about',
-     'text'=>_("About"),'link'=>'','submenu'=>[
+     'text'=>_("About"), 'link'=>'', 'submenu'=>[
             ['text'=>sprintf(_("About %s"), CONFIG['APPEARANCE']['productname']),
-             'catInfo'=>['about_cat',sprintf(_("About %s"), CONFIG['APPEARANCE']['productname'])]],
+             'catInfo'=>['about_cat', sprintf(_("About %s"), CONFIG['APPEARANCE']['productname'])]],
             ['text'=>sprintf(_("About %s"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']),
              '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'],
-            ['text'=>_("My device is not listed"), 'catInfo'=>['device_not_listed',_("FAQ")], 'visibility'=>'index'],
-            ['text'=>_("SB help item"),'visibility'=>'sb'],
-            ['text'=>_("What is eduroam"), 'catInfo'=>['what_is_eduroam',_("FAQ")]],
-            ['text'=>_("FAQ"), 'catInfo'=>['faq',_("FAQ")]],
-            ['text'=>_("Contact"), 'catInfo'=>['contact',_("FAQ")]],
+            ['text'=>_("My institution is not listed"), 'catInfo'=>['idp_not_listed', _("FAQ")], 'visibility'=>'index'],
+            ['text'=>_("My device is not listed"), 'catInfo'=>['device_not_listed', _("FAQ")], 'visibility'=>'index'],
+            ['text'=>_("SB help item"), 'visibility'=>'sb'],
+            ['text'=>_("What is eduroam"), 'catInfo'=>['what_is_eduroam', _("FAQ")]],
+            ['text'=>_("FAQ"), 'catInfo'=>['faq', _("FAQ")]],
+            ['text'=>_("Contact"), 'catInfo'=>['contact', _("FAQ")]],
         ]],
     ['id'=>'manage',
-     'text'=>_("Manage"),'submenu'=>[
-            ['text'=>sprintf(_("%s admin access"),CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']),
-             'catInfo'=>['admin',sprintf(_("%s admin:<br>manage your IdP"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'])]],
+     'text'=>_("Manage"), 'submenu'=>[
+            ['text'=>sprintf(_("%s admin access"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']),
+             'catInfo'=>['admin', sprintf(_("%s admin:<br>manage your IdP"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'])]],
             ['text'=>_("Become a CAT developer"),
-             'catInfo'=>['develop',_("Become a CAT developer")]],
+             'catInfo'=>['develop', _("Become a CAT developer")]],
             ['text'=>_("Documentation")],
         ],
      'visibility' => 'index'],
     ['id'=>'tou',
-     'text'=>_("Terms of use"), 'catInfo'=>['tou','TOU']],
+     'text'=>_("Terms of use"), 'catInfo'=>['tou', 'TOU']],
     ];
         $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";
@@ -70,13 +70,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";
              }
         }
@@ -84,8 +84,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/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/resources/css/cat.css.php

Spacing +15 added lines, -15 removed lines

@@ -19,7 +19,7 @@ 
 }
 
 body {
-    background: <?php echo $colour1;?>;
+    background: <?php echo $colour1; ?>;
     color: #000000;
     font-family:"Open Sans", Helvetica, sans-serif;
     font-size:12px;
@@ -33,7 +33,7 @@ 
 }
 
 button {
-    background: <?php echo $colour2;?>; 
+    background: <?php echo $colour2; ?>; 
     color: #FFFFFF; 
     min-height: 23px;
     border-left-style: outset; 
@@ -187,9 +187,9 @@ 
     border-bottom-style:solid;
     border-top-width:5px; 
     border-bottom-width:5px; 
-    border-color: <?php echo $colour1;?>;
+    border-color: <?php echo $colour1; ?>;
     padding-left:30px;
-    color: <?php echo $colour2;?>;
+    color: <?php echo $colour2; ?>;
 }
 
 div.pagecontent {
@@ -382,7 +382,7 @@ 
 
 span.edu_cat {
     font-weight: bold;
-    color: <?php echo $colour2;?>;
+    color: <?php echo $colour2; ?>;
 }
 
 span.tooltip {
@@ -495,7 +495,7 @@ 
     border-bottom-style:solid;
     border-top-width:5px; 
     border-bottom-width:5px; 
-    border-color: <?php echo $colour1;?>; 
+    border-color: <?php echo $colour1; ?>; 
     padding-left:30px;
 }
 
@@ -549,7 +549,7 @@ 
 }
 
 span.redirect_link {
-    background: <?php echo $colour2;?>; color: #FFFFFF; height: 23px;
+    background: <?php echo $colour2; ?>; color: #FFFFFF; height: 23px;
     border-left-style: inset; border-left-width: 1px; border-left-color: #8bbacb;
     border-top-style: inset; border-top-width: 1px; border-top-color: #8bbacb;
     border-right-style: outset; border-right-width: 2px; border-right-color: #043d52;
@@ -619,7 +619,7 @@ 
     width: 30em; 
     padding-left: 10px; 
     padding-right: 00px; 
-    background: <?php echo $colour2;?>; 
+    background: <?php echo $colour2; ?>; 
     color: #FFFFFF; 
     box-shadow: 10px 10px 5px #888888;
 }
@@ -669,7 +669,7 @@ 
 //    border-bottom-width:5px;
     border-color: #e7e7e7;
     padding-left:30px;
-    color: <?php echo $colour2;?>;
+    color: <?php echo $colour2; ?>;
 }
 
 #headingx h1 { 
@@ -688,7 +688,7 @@ 
     text-align: justify;
     border-bottom-style:solid;
     border-bottom-width:5px;
-    border-color: <?php echo $colour1;?>;
+    border-color: <?php echo $colour1; ?>;
     font-size: 12px;
     font-weight: normal;
 }
@@ -697,7 +697,7 @@ 
 
 #faq {
     padding: 20px;
-    color: <?php echo $colour2;?>;
+    color: <?php echo $colour2; ?>;
     background: #ffffff;
 }
 
@@ -737,7 +737,7 @@ 
 
 #menu_column {
     border-right:solid;
-    border-color: <?php echo $colour1;?>;
+    border-color: <?php echo $colour1; ?>;
     border-width:5px;
     min-height:400px;
     padding-left: 10px;
@@ -755,11 +755,11 @@ 
 }
 
 a:link {
-    color:<?php echo $colour2;?>;
+    color:<?php echo $colour2; ?>;
 }
 
 a:visited {
-    color:<?php echo $colour2;?>;
+    color:<?php echo $colour2; ?>;
 }
 
 a:hover {
@@ -767,7 +767,7 @@ 
 }
 
 a:active {
-    color:<?php echo $colour2;?>;
+    color:<?php echo $colour2; ?>;
 }
 
 .comment {

web/skins/eduroam2016/index.php

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">
@@ -47,7 +47,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 -->
@@ -55,9 +55,9 @@ 
 <script type="text/javascript">
     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">
@@ -65,14 +65,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">

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"))?>",