GEANT / CAT

web/user/js/roll.php

Indentation +6 added lines, -7 removed lines

@@ -68,13 +68,12 @@
 
 <?php
 /**
-  * The OS object holds operating system descriptions
-  * @param name is the main title
-  * @param subtitle - the subtitle
-  * @param path - the path to the scriin-dump image
-  * @param signed - if true show information that the module is signed
-    
-*/
+ * The OS object holds operating system descriptions
+ * @param name is the main title
+ * @param subtitle - the subtitle
+ * @param path - the path to the scriin-dump image
+ * @param signed - if true show information that the module is signed
+ */
 ?>
 
 function OS(name, subtitle, path, signed) {

web/user/js/cat_js.php

Indentation +8 added lines, -8 removed lines

@@ -331,7 +331,7 @@ 
 }
 
 <?php if(isset($_REQUEST['idp']) && $_REQUEST['idp']) { 
-      print "front_page = 0;\n";
+        print "front_page = 0;\n";
 } ?>
 
 function showTOU(){
@@ -469,9 +469,9 @@ 
     $p_id = (isset($_REQUEST['profile']) && $_REQUEST['profile']) ? $_REQUEST['profile'] : 0; 
     if(! is_numeric($p_id))
         exit;
-   print 'listProfiles('.$_REQUEST['idp'].','.$p_id.');';
+    print 'listProfiles('.$_REQUEST['idp'].','.$p_id.');';
 }
- ?>
+    ?>
 
 $(".signin").click(function(event){
      pressedButton = $(this);
@@ -532,12 +532,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 +15 added lines, -15 removed lines

@@ -57,7 +57,7 @@ 
     result = j.status;
     if(! result) {
       alert("<?php 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;
@@ -185,11 +185,11 @@ 
          $("#profile_desc").text('');
        }
        if(j.local_url !== undefined && j.local_url) 
-         txt = txt+'<tr><td><?php echo _("WWW:");?></td><td><a href="'+j.local_url+'" target="_blank">'+j.local_url+'</a></td></tr>';
+         txt = txt+'<tr><td><?php 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 echo _("email:");?></td><td><a href=mailto:"'+j.local_email+'">'+j.local_email+'</a></td></tr>';
+         txt = txt+'<tr><td><?php 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 echo _("tel:");?></td><td>'+j.local_phone+'</td></tr>';
+         txt = txt+'<tr><td><?php echo _("tel:"); ?></td><td>'+j.local_phone+'</td></tr>';
        if(txt) 
          txt = "<table><tr><th colspan='2'><?php echo _("If you encounter problems, then you can obtain direct assistance from you home organisation at:"); ?></th></tr>"+txt+'</table>';
         else 
@@ -218,7 +218,7 @@ 
           $("#"+v.id+",#g_"+v.id).addClass('additionalInfo');
           $("#"+v.id+",#g_"+v.id).click(function(event){
             i_div = $("#info_"+$(this).attr('id'));
-            t = "<?php 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 echo _("Continue");?></a></span>";
+            t = "<?php 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 echo _("Continue"); ?></a></span>";
             i_div.html(t);
             $(".redirect_link").click(function(event) {
                i_div.hide();
@@ -226,13 +226,13 @@ 
                
           });
         } else if(v.device_customtext != '0' || v.eap_customtext != '0' || v.message != '0' || v.status > 0) {
-          var continue_text = "<?php echo _("Continue");?>";
+          var continue_text = "<?php 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 echo _("This device cannot be configured with settings provided by your institution")?>";
-              continue_text = "<?php echo _("Close");?>";
+              continue_text = "<?php echo _("Close"); ?>";
             } else {
             t = i_div.html();
             if(v.message != '0') {
@@ -330,7 +330,7 @@ 
     return(Math.round(windowWidth/2));
 }
 
-<?php if(isset($_REQUEST['idp']) && $_REQUEST['idp']) { 
+<?php if (isset($_REQUEST['idp']) && $_REQUEST['idp']) { 
       print "front_page = 0;\n";
 } ?>
 
@@ -369,10 +369,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;
     }
   }
 }
@@ -463,13 +463,13 @@ 
   $(window).resize(set_front_page);
   resetDevices();
  <?php 
-if(isset($_REQUEST['idp']) && $_REQUEST['idp']) { 
-    if(! is_numeric($_REQUEST['idp']))
+if (isset($_REQUEST['idp']) && $_REQUEST['idp']) { 
+    if (!is_numeric($_REQUEST['idp']))
         exit;
     $p_id = (isset($_REQUEST['profile']) && $_REQUEST['profile']) ? $_REQUEST['profile'] : 0; 
-    if(! is_numeric($p_id))
+    if (!is_numeric($p_id))
         exit;
-   print 'listProfiles('.$_REQUEST['idp'].','.$p_id.');';
+   print 'listProfiles(' . $_REQUEST['idp'] . ',' . $p_id . ');';
 }
  ?>
 
@@ -497,7 +497,7 @@ 
    "title":"<?php echo _("Home institution") ?>",
    "subtitle":"<?php echo _("Select your <strong>institution<\/strong>") ?>",
    "textHelp": "<?php echo _("Help, my institution is not on the list") ?>",
-   "textHelpMore": "<?php echo sprintf(_("This system relies on information supplied by local %s administrators. If your institution is not on the list, then nag them to add information to the %s database."),Config::$CONSORTIUM['name'],Config::$APPEARANCE['productname']); ?>",
+   "textHelpMore": "<?php echo sprintf(_("This system relies on information supplied by local %s administrators. If your institution is not on the list, then nag them to add information to the %s database."), Config::$CONSORTIUM['name'], Config::$APPEARANCE['productname']); ?>",
    "textLocateMe": "<?php echo _("Locate me more accurately using HTML5 Geo-Location") ?>",
    "textShowProviders": "<?php echo _("Show institutions in") ?>",
    "textAllCountries": "<?php echo _("all countries") ?>",

Braces +6 added lines, -4 removed lines

@@ -464,11 +464,13 @@
   resetDevices();
  <?php 
 if(isset($_REQUEST['idp']) && $_REQUEST['idp']) { 
-    if(! is_numeric($_REQUEST['idp']))
-        exit;
+    if(! is_numeric($_REQUEST['idp'])) {
+            exit;
+    }
     $p_id = (isset($_REQUEST['profile']) && $_REQUEST['profile']) ? $_REQUEST['profile'] : 0; 
-    if(! is_numeric($p_id))
-        exit;
+    if(! is_numeric($p_id)) {
+            exit;
+    }
    print 'listProfiles('.$_REQUEST['idp'].','.$p_id.');';
 }
  ?>

web/user/cat_info.php

Spacing +2 added lines, -2 removed lines

@@ -43,7 +43,7 @@ 
     case 'about':
         $out = sprintf(_("<span class='edu_cat'>%s</span> is built as a cooperation platform.<p>Local %s administrators enter their %s configuration details and based on them, <span class='edu_cat'>%s</span> builds customised installers for a number of popular platforms. An installer prepared for one institution will not work for users of another one, therefore if your institution is not on the list, you cannot use this system. Please contact your local administrators and try to influence them to add your institution configuration to <span class='edu_cat'>%s</span>."), Config::$APPEARANCE['productname'], Config::$CONSORTIUM['name'], Config::$CONSORTIUM['name'], Config::$APPEARANCE['productname'], Config::$APPEARANCE['productname']);
         $out .= "<p>" . sprintf(_("<span class='edu_cat'>%s</span> currently supports the following devices and EAP type combinations:"), Config::$APPEARANCE['productname']) . "</p>";
-        $out .= "<table><tr><th>"._("Device Group")."</th><th>"._("Device")."</th>";
+        $out .= "<table><tr><th>" . _("Device Group") . "</th><th>" . _("Device") . "</th>";
         foreach (EAP::listKnownEAPTypes() as $oneeap) {
             $out .= "<th style='min-width: 80px;'>" . display_name($oneeap) . "</th>";
         }
@@ -117,7 +117,7 @@ 
 
         $as = new SimpleSAML_Auth_Simple(Config::$AUTHENTICATION['ssp-authsource']);
         if ($as->isAuthenticated())
-            $out.='<script type="text/javascript">goAdmin()</script>';
+            $out .= '<script type="text/javascript">goAdmin()</script>';
         else {
             if (Config::$CONSORTIUM['selfservice_registration'] === NULL)
                 $out .= sprintf(_("You must have received an invitation from your national %s operator before being able to manage your institution. If that is the case, please continue and log in."), Config::$CONSORTIUM['name']);

Braces +27 added lines, -21 removed lines

@@ -35,10 +35,11 @@ 
         $out = '<script type="text/javascript">document.location.href="' . Config::$CONSORTIUM['homepage'] . '"</script>';
         break;
     case 'about_consortium':
-        if (Config::$CONSORTIUM['name'] == "eduroam")
-            $out = sprintf(_("eduroam is a global WiFi roaming consortium which gives members of education and research access to the internet <i>for free</i> on all eduroam hotspots on the planet. There are several million eduroam users already, enjoying free internet access on more than 6.000 hotspots! Visit <a href='http://www.eduroam.org'>the eduroam homepage</a> for more details."));
-        else
-            $out = "";
+        if (Config::$CONSORTIUM['name'] == "eduroam") {
+                    $out = sprintf(_("eduroam is a global WiFi roaming consortium which gives members of education and research access to the internet <i>for free</i> on all eduroam hotspots on the planet. There are several million eduroam users already, enjoying free internet access on more than 6.000 hotspots! Visit <a href='http://www.eduroam.org'>the eduroam homepage</a> for more details."));
+        } else {
+                    $out = "";
+        }
         break;
     case 'about':
         $out = sprintf(_("<span class='edu_cat'>%s</span> is built as a cooperation platform.<p>Local %s administrators enter their %s configuration details and based on them, <span class='edu_cat'>%s</span> builds customised installers for a number of popular platforms. An installer prepared for one institution will not work for users of another one, therefore if your institution is not on the list, you cannot use this system. Please contact your local administrators and try to influence them to add your institution configuration to <span class='edu_cat'>%s</span>."), Config::$APPEARANCE['productname'], Config::$CONSORTIUM['name'], Config::$CONSORTIUM['name'], Config::$APPEARANCE['productname'], Config::$APPEARANCE['productname']);
@@ -49,16 +50,18 @@ 
         }
         $out .= "</tr>";
         foreach (Devices::listDevices() as $index => $onedevice) {
-            if (isset ($onedevice['options']) && (($onedevice['options']['hidden'] == 1) || ($onedevice['options']['redirect'] == 1)))
-                continue;
+            if (isset ($onedevice['options']) && (($onedevice['options']['hidden'] == 1) || ($onedevice['options']['redirect'] == 1))) {
+                            continue;
+            }
             $out .= "<tr><td class='vendor'><img src='resources/images/vendorlogo/" . $onedevice['group'] . ".png' alt='logo'></td><td>" . $onedevice['display'] . "</td>";
             $device_instance = new DeviceFactory($index);
             foreach (EAP::listKnownEAPTypes() as $oneeap) {
                 $out .= "<td>";
-                if (in_array($oneeap, $device_instance->device->supportedEapMethods))
-                    $out .= "<img src='resources/images/icons/Quetto/check-icon.png' alt='SUPPORTED'>";
-                else
-                    $out .= "<img src='resources/images/icons/Quetto/no-icon.png' alt='UNSUPPOERTED'>";
+                if (in_array($oneeap, $device_instance->device->supportedEapMethods)) {
+                                    $out .= "<img src='resources/images/icons/Quetto/check-icon.png' alt='SUPPORTED'>";
+                } else {
+                                    $out .= "<img src='resources/images/icons/Quetto/no-icon.png' alt='UNSUPPOERTED'>";
+                }
                 $out .= "</td>";
             }
             $out .= "</tr>";
@@ -69,10 +72,12 @@ 
                                 . "<b><u>REQUIRED</u></b>"
                                 . "<ul>"
                                 . "<li><b>%s</b> (the service itself)</li>"), Config::$APPEARANCE['productname'], valid_host($_SERVER['HTTP_HOST']));
-        if (!empty(Config::$APPEARANCE['webcert_CRLDP']))
-            $out .= sprintf(ngettext("<li><b>%s</b> (the CRL Distribution Point for the site certificate), also TCP/80</li>", "<li><b>%s</b> (the CRL Distribution Points for the site certificate), also TCP/80</li>", count(Config::$APPEARANCE['webcert_CRLDP'])), implode(", ", Config::$APPEARANCE['webcert_CRLDP']));
-        if (!empty(Config::$APPEARANCE['webcert_OCSP']))
-            $out .= sprintf(ngettext("<li><b>%s</b> (the OCSP Responder for the site certificate), also TCP/80</li>", "<li><b>%s</b> (the OCSP Responder for the site certificate), also TCP/80</li>", count(Config::$APPEARANCE['webcert_OCSP'])), implode(", ", Config::$APPEARANCE['webcert_OCSP']));
+        if (!empty(Config::$APPEARANCE['webcert_CRLDP'])) {
+                    $out .= sprintf(ngettext("<li><b>%s</b> (the CRL Distribution Point for the site certificate), also TCP/80</li>", "<li><b>%s</b> (the CRL Distribution Points for the site certificate), also TCP/80</li>", count(Config::$APPEARANCE['webcert_CRLDP'])), implode(", ", Config::$APPEARANCE['webcert_CRLDP']));
+        }
+        if (!empty(Config::$APPEARANCE['webcert_OCSP'])) {
+                    $out .= sprintf(ngettext("<li><b>%s</b> (the OCSP Responder for the site certificate), also TCP/80</li>", "<li><b>%s</b> (the OCSP Responder for the site certificate), also TCP/80</li>", count(Config::$APPEARANCE['webcert_OCSP'])), implode(", ", Config::$APPEARANCE['webcert_OCSP']));
+        }
         $out .= sprintf(_("<li><b>android.l.google.com</b> (Google Play access for Android App)</li>"
                         . "<li><b>android.clients.google.com</b> (Google Play access for Android App)</li>"
                         . "<li><b>play.google.com</b> (Google Play access for Android App)</li>"
@@ -116,13 +121,14 @@ 
         require_once(Config::$AUTHENTICATION['ssp-path-to-autoloader']);
 
         $as = new SimpleSAML_Auth_Simple(Config::$AUTHENTICATION['ssp-authsource']);
-        if ($as->isAuthenticated())
-            $out.='<script type="text/javascript">goAdmin()</script>';
-        else {
-            if (Config::$CONSORTIUM['selfservice_registration'] === NULL)
-                $out .= sprintf(_("You must have received an invitation from your national %s operator before being able to manage your institution. If that is the case, please continue and log in."), Config::$CONSORTIUM['name']);
-            else
-                $out .= _("Please authenticate yourself and login");
+        if ($as->isAuthenticated()) {
+                    $out.='<script type="text/javascript">goAdmin()</script>';
+        } else {
+            if (Config::$CONSORTIUM['selfservice_registration'] === NULL) {
+                            $out .= sprintf(_("You must have received an invitation from your national %s operator before being able to manage your institution. If that is the case, please continue and log in."), Config::$CONSORTIUM['name']);
+            } else {
+                            $out .= _("Please authenticate yourself and login");
+            }
             $out .= "<p><button onclick='goAdmin(); return(false);'>" . _("Login") . "</button>";
         }
         break;

web/user/cat_back.php

Indentation +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
 
 // extract request parameters; action is mandatory
 if(!isset($_REQUEST['action']))
-   exit;
+    exit;
 
 $action  = $_REQUEST['action'];
 $id      = ( isset($_REQUEST['id'])      ? $_REQUEST['id']      : FALSE );

Spacing +11 added lines, -11 removed lines

@@ -10,23 +10,23 @@ 
  *
  * @package UserAPI
  */
-include(dirname(dirname(dirname(__FILE__)))."/config/_config.php");
+include(dirname(dirname(dirname(__FILE__))) . "/config/_config.php");
 include_once("UserAPI.php");
 $API = new UserAPI();
 
 // extract request parameters; action is mandatory
-if(!isset($_REQUEST['action']))
+if (!isset($_REQUEST['action']))
    exit;
 
 $action  = $_REQUEST['action'];
-$id      = ( isset($_REQUEST['id'])      ? $_REQUEST['id']      : FALSE );
-$lang    = ( isset($_REQUEST['lang'])    ? $_REQUEST['lang']    : FALSE );
-$profile = ( isset($_REQUEST['profile']) ? $_REQUEST['profile'] : FALSE );
-$disco   = ( isset($_REQUEST['disco'])   ? $_REQUEST['disco']   : FALSE );
-$sort    = ( isset($_REQUEST['sort'])    ? $_REQUEST['sort']    : 0 );
-$generatedfor      = ( isset($_REQUEST['generatedfor'])      ? $_REQUEST['generatedfor']      : 'user' );
+$id      = (isset($_REQUEST['id']) ? $_REQUEST['id'] : FALSE);
+$lang    = (isset($_REQUEST['lang']) ? $_REQUEST['lang'] : FALSE);
+$profile = (isset($_REQUEST['profile']) ? $_REQUEST['profile'] : FALSE);
+$disco   = (isset($_REQUEST['disco']) ? $_REQUEST['disco'] : FALSE);
+$sort    = (isset($_REQUEST['sort']) ? $_REQUEST['sort'] : 0);
+$generatedfor = (isset($_REQUEST['generatedfor']) ? $_REQUEST['generatedfor'] : 'user');
     
-debug(4,"cat_back action: ".$action.':'.$id.':'.$lang.':'.$profile.':'.$disco."\n");
+debug(4, "cat_back action: " . $action . ':' . $id . ':' . $lang . ':' . $profile . ':' . $disco . "\n");
 
 switch ($action) {
     case 'listLanguages':
@@ -43,7 +43,7 @@ 
         break;
     case 'listProfiles': // needs $id set - abort if not
         if ($id === FALSE) exit;
-        $API->JSON_listProfiles($id,$sort);
+        $API->JSON_listProfiles($id, $sort);
         break;
     case 'listDevices':
         $API->JSON_listDevices($id);
@@ -54,7 +54,7 @@ 
         break;
     case 'downloadInstaller': // needs $id and $profile set optional $generatedfor
         if ($id === FALSE || $profile === FALSE) exit;
-        $API->downloadInstaller($id, $profile,$generatedfor);
+        $API->downloadInstaller($id, $profile, $generatedfor);
         break;
     case 'profileAttributes': // needs $id set
         if ($id === FALSE) exit;

Braces +20 added lines, -7 removed lines

@@ -15,8 +15,9 @@ 
 $API = new UserAPI();
 
 // extract request parameters; action is mandatory
-if(!isset($_REQUEST['action']))
+if(!isset($_REQUEST['action'])) {
    exit;
+}
 
 $action  = $_REQUEST['action'];
 $id      = ( isset($_REQUEST['id'])      ? $_REQUEST['id']      : FALSE );
@@ -42,29 +43,41 @@ 
         $API->JSON_listIdentityProvidersForDisco();
         break;
     case 'listProfiles': // needs $id set - abort if not
-        if ($id === FALSE) exit;
+        if ($id === FALSE) {
+            exit;
+        }
         $API->JSON_listProfiles($id,$sort);
         break;
     case 'listDevices':
         $API->JSON_listDevices($id);
         break;
     case 'generateInstaller': // needs $id and $profile set
-        if ($id === FALSE || $profile === FALSE) exit;
+        if ($id === FALSE || $profile === FALSE) {
+            exit;
+        }
         $API->JSON_generateInstaller($id, $profile);
         break;
     case 'downloadInstaller': // needs $id and $profile set optional $generatedfor
-        if ($id === FALSE || $profile === FALSE) exit;
+        if ($id === FALSE || $profile === FALSE) {
+            exit;
+        }
         $API->downloadInstaller($id, $profile,$generatedfor);
         break;
     case 'profileAttributes': // needs $id set
-        if ($id === FALSE) exit;
+        if ($id === FALSE) {
+            exit;
+        }
         $API->JSON_profileAttributes($id);
         break;
     case 'sendLogo': // needs $id and $disco set
-        if ($id === FALSE) exit;
+        if ($id === FALSE) {
+            exit;
+        }
         $API->sendLogo($id, $disco);
     case 'deviceInfo': // needs $id and profile set
-        if ($id === FALSE || $profile === FALSE) exit;
+        if ($id === FALSE || $profile === FALSE) {
+            exit;
+        }
         $API->deviceInfo($id, $profile);
         break;
     case 'locateUser':

web/user/faq.php

Indentation +21 added lines, -21 removed lines

@@ -2,63 +2,63 @@ 
 $FAQ = [];
 
 array_push($FAQ,
-      [
+        [
         'title'=>sprintf(_("My institution is not listed. Can't I just use any of the other ones?")),
         'text'=>sprintf(_("No! The installers contain security settings which are specific to the institution. If you are not from that institution, your computer will detect that you are about to send your username and credential to an unauthorised server and will abort the login. Using a different institution installer is <i>guaranteed to not work</i>!"))
-         ]);
+            ]);
 
 array_push($FAQ,
-      [
+        [
         'title'=>sprintf(_("What can I do to get my institution listed?")),
         'text'=>sprintf(_("Contact %s administrators at your home institution and complain. It will take at most one hour of their time to get things done."),Config::$CONSORTIUM['name'])
 ]);
 
 array_push($FAQ,
-      [
+        [
         'title'=>sprintf(_("My device is not listed! Does that mean I can't do %s?"),Config::$CONSORTIUM['name']),
         'text'=>sprintf(_("No. The CAT tool can only support Operating Systems which can be automatically configured in some way. Many other devices can still be used with %s, but must be configured manually. Please contact your %s Identity Provider to get help in setting up such a device."),Config::$CONSORTIUM['name'],Config::$CONSORTIUM['name'])
-      ]);
+        ]);
 
 array_push($FAQ,
-      [
+        [
         'title'=>sprintf(_("I can connect to %s simply by providing username and password, what is the point of using an installer?"),Config::$CONSORTIUM['name']),
         'text'=>sprintf(_("When you are connecting from an unconfigured device your security is at risk. The very point of preconfiguration is to set up security, when this is done, your device will first confirm that it talks to the correct authentication server and will never send your password to an untrusted one."))
 ]);
 
 if (Config::$CONSORTIUM['name'] == "eduroam") {
-   array_push($FAQ,
-         [
-           'title'=>sprintf(_("What is this eduroam thing anyway?")),
-           'text'=>sprintf(_("eduroam is a global WiFi roaming consortium which gives members of education and research access to the internet <i>for free</i> on all eduroam hotspots on the planet. There are several million eduroam users already, enjoying free internet access on more than 6.000 hotspots! Visit <a href='http://www.eduroam.org'>the eduroam homepage</a> for more details."))
-         ]);
+    array_push($FAQ,
+            [
+            'title'=>sprintf(_("What is this eduroam thing anyway?")),
+            'text'=>sprintf(_("eduroam is a global WiFi roaming consortium which gives members of education and research access to the internet <i>for free</i> on all eduroam hotspots on the planet. There are several million eduroam users already, enjoying free internet access on more than 6.000 hotspots! Visit <a href='http://www.eduroam.org'>the eduroam homepage</a> for more details."))
+            ]);
 }
 
 array_push($FAQ,
-      [
+        [
         'title'=>sprintf(_("Is it safe to use %s installers?"),Config::$APPEARANCE['productname']),
         'text'=>sprintf(_("%s installers configure security settings on your device, therefore you should be sure that you are using genuine ones."),Config::$APPEARANCE['productname']).' '.( isset(Config::$CONSORTIUM['signer_name']) && Config::$CONSORTIUM['signer_name'] != "" ? sprintf(_("This is why %s installers are digitally signed by %s. Watch out for a system message confirming this."),Config::$APPEARANCE['productname'],Config::$CONSORTIUM['signer_name']):""),
         
 ]);
 
 array_push($FAQ,
-      [
+        [
         'title'=>_("Windows 'SmartScreen' or 'Internet Explorer' tell me that the file is not commonly downloaded and possibly harmful. Should I be concerned?"),
         'text'=>_("Contrary to what the name suggests, 'SmartScreen' isn't actually very smart. The warning merely means that the file has not yet been downloaded by enough users to make Microsoft consider it popular (which would strangely enough make it be considered 'safe'). This message alone is not a security problem.")." ".(isset(Config::$CONSORTIUM['signer_name']) && Config::$CONSORTIUM['signer_name'] != "" ? sprintf(_("So long as the file is carrying a valid signature from %s, the download is safe."),Config::$CONSORTIUM['signer_name'])." ":"").sprintf(_("Please see also Microsoft's FAQ regarding SmartScreen at %s."),"<a href='http://windows.microsoft.com/en-US/windows7/SmartScreen-Filter-frequently-asked-questions-IE9?SignedIn=1'>Microsoft FAQ</a>")
         
 ]);
 
 array_push($FAQ,
-      [
+        [
         'title'=>sprintf(_("I can see %s network and my device is configured but it does not connect, what can be the cause?"),Config::$CONSORTIUM['name']),
-      'text'=>sprintf(_("There can be a number of different reasons. The network you see may not be a genuine %s one and your device silently drops the connection attempt; there may be something wrong with the configuration of the network; your account may have expired; there may be a connection problem with your home authentication server; you may have broken the regulations of the network you are using and have been refused access as a consequence. You should contact your home institution and report the problem, the administrators should be able to trace your connections."),Config::$CONSORTIUM[
+        'text'=>sprintf(_("There can be a number of different reasons. The network you see may not be a genuine %s one and your device silently drops the connection attempt; there may be something wrong with the configuration of the network; your account may have expired; there may be a connection problem with your home authentication server; you may have broken the regulations of the network you are using and have been refused access as a consequence. You should contact your home institution and report the problem, the administrators should be able to trace your connections."),Config::$CONSORTIUM[
 'name'])
 ]);
 
 array_push($FAQ,
-      [
+        [
         'title'=>sprintf(_("I have a question about this web site. Whom should I contact?")),
         'text'=>sprintf(_("You should send a mail to %s."),Config::$APPEARANCE['support-contact']['display'])
-      ]);
+        ]);
 
 
 
@@ -86,8 +86,8 @@ 
     <?php
     $i =0;
     foreach ($FAQ as $faq) {
-       print '<a href="#toc'.$i.'">'.$faq['title']."</a><br>\n";
-       $i++;
+        print '<a href="#toc'.$i.'">'.$faq['title']."</a><br>\n";
+        $i++;
     }
     ?>
     </div>
@@ -95,8 +95,8 @@ 
     <?php
     $i =0;
     foreach ($FAQ as $faq) {
-      print "<dt><a name=toc$i>".$faq['title']."</a></dt>\n<dd>".$faq['text']."</dd>\n";
-      $i++;
+        print "<dt><a name=toc$i>".$faq['title']."</a></dt>\n<dd>".$faq['text']."</dd>\n";
+        $i++;
     }
     ?>
 </dl>

Spacing +14 added lines, -14 removed lines

@@ -10,18 +10,18 @@ 
 array_push($FAQ,
       [
         'title'=>sprintf(_("What can I do to get my institution listed?")),
-        'text'=>sprintf(_("Contact %s administrators at your home institution and complain. It will take at most one hour of their time to get things done."),Config::$CONSORTIUM['name'])
+        'text'=>sprintf(_("Contact %s administrators at your home institution and complain. It will take at most one hour of their time to get things done."), Config::$CONSORTIUM['name'])
 ]);
 
 array_push($FAQ,
       [
-        'title'=>sprintf(_("My device is not listed! Does that mean I can't do %s?"),Config::$CONSORTIUM['name']),
-        'text'=>sprintf(_("No. The CAT tool can only support Operating Systems which can be automatically configured in some way. Many other devices can still be used with %s, but must be configured manually. Please contact your %s Identity Provider to get help in setting up such a device."),Config::$CONSORTIUM['name'],Config::$CONSORTIUM['name'])
+        'title'=>sprintf(_("My device is not listed! Does that mean I can't do %s?"), Config::$CONSORTIUM['name']),
+        'text'=>sprintf(_("No. The CAT tool can only support Operating Systems which can be automatically configured in some way. Many other devices can still be used with %s, but must be configured manually. Please contact your %s Identity Provider to get help in setting up such a device."), Config::$CONSORTIUM['name'], Config::$CONSORTIUM['name'])
       ]);
 
 array_push($FAQ,
       [
-        'title'=>sprintf(_("I can connect to %s simply by providing username and password, what is the point of using an installer?"),Config::$CONSORTIUM['name']),
+        'title'=>sprintf(_("I can connect to %s simply by providing username and password, what is the point of using an installer?"), Config::$CONSORTIUM['name']),
         'text'=>sprintf(_("When you are connecting from an unconfigured device your security is at risk. The very point of preconfiguration is to set up security, when this is done, your device will first confirm that it talks to the correct authentication server and will never send your password to an untrusted one."))
 ]);
 
@@ -35,29 +35,29 @@ 
 
 array_push($FAQ,
       [
-        'title'=>sprintf(_("Is it safe to use %s installers?"),Config::$APPEARANCE['productname']),
-        'text'=>sprintf(_("%s installers configure security settings on your device, therefore you should be sure that you are using genuine ones."),Config::$APPEARANCE['productname']).' '.( isset(Config::$CONSORTIUM['signer_name']) && Config::$CONSORTIUM['signer_name'] != "" ? sprintf(_("This is why %s installers are digitally signed by %s. Watch out for a system message confirming this."),Config::$APPEARANCE['productname'],Config::$CONSORTIUM['signer_name']):""),
+        'title'=>sprintf(_("Is it safe to use %s installers?"), Config::$APPEARANCE['productname']),
+        'text'=>sprintf(_("%s installers configure security settings on your device, therefore you should be sure that you are using genuine ones."), Config::$APPEARANCE['productname']) . ' ' . (isset(Config::$CONSORTIUM['signer_name']) && Config::$CONSORTIUM['signer_name'] != "" ? sprintf(_("This is why %s installers are digitally signed by %s. Watch out for a system message confirming this."), Config::$APPEARANCE['productname'], Config::$CONSORTIUM['signer_name']) : ""),
         
 ]);
 
 array_push($FAQ,
       [
         'title'=>_("Windows 'SmartScreen' or 'Internet Explorer' tell me that the file is not commonly downloaded and possibly harmful. Should I be concerned?"),
-        'text'=>_("Contrary to what the name suggests, 'SmartScreen' isn't actually very smart. The warning merely means that the file has not yet been downloaded by enough users to make Microsoft consider it popular (which would strangely enough make it be considered 'safe'). This message alone is not a security problem.")." ".(isset(Config::$CONSORTIUM['signer_name']) && Config::$CONSORTIUM['signer_name'] != "" ? sprintf(_("So long as the file is carrying a valid signature from %s, the download is safe."),Config::$CONSORTIUM['signer_name'])." ":"").sprintf(_("Please see also Microsoft's FAQ regarding SmartScreen at %s."),"<a href='http://windows.microsoft.com/en-US/windows7/SmartScreen-Filter-frequently-asked-questions-IE9?SignedIn=1'>Microsoft FAQ</a>")
+        'text'=>_("Contrary to what the name suggests, 'SmartScreen' isn't actually very smart. The warning merely means that the file has not yet been downloaded by enough users to make Microsoft consider it popular (which would strangely enough make it be considered 'safe'). This message alone is not a security problem.") . " " . (isset(Config::$CONSORTIUM['signer_name']) && Config::$CONSORTIUM['signer_name'] != "" ? sprintf(_("So long as the file is carrying a valid signature from %s, the download is safe."), Config::$CONSORTIUM['signer_name']) . " " : "") . sprintf(_("Please see also Microsoft's FAQ regarding SmartScreen at %s."), "<a href='http://windows.microsoft.com/en-US/windows7/SmartScreen-Filter-frequently-asked-questions-IE9?SignedIn=1'>Microsoft FAQ</a>")
         
 ]);
 
 array_push($FAQ,
       [
-        'title'=>sprintf(_("I can see %s network and my device is configured but it does not connect, what can be the cause?"),Config::$CONSORTIUM['name']),
-      'text'=>sprintf(_("There can be a number of different reasons. The network you see may not be a genuine %s one and your device silently drops the connection attempt; there may be something wrong with the configuration of the network; your account may have expired; there may be a connection problem with your home authentication server; you may have broken the regulations of the network you are using and have been refused access as a consequence. You should contact your home institution and report the problem, the administrators should be able to trace your connections."),Config::$CONSORTIUM[
+        'title'=>sprintf(_("I can see %s network and my device is configured but it does not connect, what can be the cause?"), Config::$CONSORTIUM['name']),
+      'text'=>sprintf(_("There can be a number of different reasons. The network you see may not be a genuine %s one and your device silently drops the connection attempt; there may be something wrong with the configuration of the network; your account may have expired; there may be a connection problem with your home authentication server; you may have broken the regulations of the network you are using and have been refused access as a consequence. You should contact your home institution and report the problem, the administrators should be able to trace your connections."), Config::$CONSORTIUM[
 'name'])
 ]);
 
 array_push($FAQ,
       [
         'title'=>sprintf(_("I have a question about this web site. Whom should I contact?")),
-        'text'=>sprintf(_("You should send a mail to %s."),Config::$APPEARANCE['support-contact']['display'])
+        'text'=>sprintf(_("You should send a mail to %s."), Config::$APPEARANCE['support-contact']['display'])
       ]);
 
 
@@ -84,18 +84,18 @@ 
     </h1>
     <div class="faq_toc" style="background:white; padding:5px;">
     <?php
-    $i =0;
+    $i = 0;
     foreach ($FAQ as $faq) {
-       print '<a href="#toc'.$i.'">'.$faq['title']."</a><br>\n";
+       print '<a href="#toc' . $i . '">' . $faq['title'] . "</a><br>\n";
        $i++;
     }
     ?>
     </div>
     <dl>
     <?php
-    $i =0;
+    $i = 0;
     foreach ($FAQ as $faq) {
-      print "<dt><a name=toc$i>".$faq['title']."</a></dt>\n<dd>".$faq['text']."</dd>\n";
+      print "<dt><a name=toc$i>" . $faq['title'] . "</a></dt>\n<dd>" . $faq['text'] . "</dd>\n";
       $i++;
     }
     ?>

web/user/API.php

Indentation +9 added lines, -9 removed lines

@@ -16,7 +16,7 @@ 
 
 // extract request parameters; action is mandatory
 if(!isset($_REQUEST['action']))
-   exit;
+    exit;
 
 $action  = $_REQUEST['action'];
 $id      = ( isset($_REQUEST['id'])      ? $_REQUEST['id']      : FALSE );
@@ -48,7 +48,7 @@ 
         break;
     case 'listIdentityProviders':
         if(! $federation)
-           $federation = $id;
+            $federation = $id;
         $API->JSON_listIdentityProviders($federation);
         break;
     case 'listAllIdentityProviders':
@@ -56,13 +56,13 @@ 
         break;
     case 'listProfiles': // needs $idp set - abort if not
         if(! $idp) 
-           $idp = $id;
+            $idp = $id;
         if ($idp === FALSE) exit;
         $API->JSON_listProfiles($idp,$sort);
         break;
     case 'listDevices':
         if(! $profile)
-           $profile = $id;
+            $profile = $id;
         $API->JSON_listDevices($profile);
         break;
     case 'generateInstaller': // needs $id and $profile set
@@ -79,13 +79,13 @@ 
         break;
     case 'profileAttributes': // needs $id set
         if(! $profile)
-           $profile = $id;
+            $profile = $id;
         if ($profile === FALSE) exit;
         $API->JSON_profileAttributes($profile);
         break;
     case 'sendLogo': // needs $id and $disco set
         if(! $idp)
-           $idp = $id;
+            $idp = $id;
         if ($idp === FALSE) exit;
         $API->sendLogo($idp, $disco,$width,$height);
         break;
@@ -103,11 +103,11 @@ 
         break;
     case 'orderIdentityProviders':
         if(! $federation)
-           $federation = $id;
-         if($location)  {
+            $federation = $id;
+            if($location)  {
             $A=explode(':',$location);
             $L = ['lat'=>$A[0],'lon'=>$A[1]];
-         } else
+            } else
             $L = NULL;
         $API->JSON_orderIdentityProviders($federation,$L);
         break;

Spacing +32 added lines, -32 removed lines

@@ -10,28 +10,28 @@ 
  *
  * @package UserAPI
  */
-include(dirname(dirname(dirname(__FILE__)))."/config/_config.php");
+include(dirname(dirname(dirname(__FILE__))) . "/config/_config.php");
 include_once("UserAPI.php");
 $API = new UserAPI();
 
 // extract request parameters; action is mandatory
-if(!isset($_REQUEST['action']))
+if (!isset($_REQUEST['action']))
    exit;
 
 $action  = $_REQUEST['action'];
-$id      = ( isset($_REQUEST['id'])      ? $_REQUEST['id']      : FALSE );
-$device  = ( isset($_REQUEST['device'])  ? $_REQUEST['device']  : FALSE );
-$lang    = ( isset($_REQUEST['lang'])    ? $_REQUEST['lang']    : FALSE );
-$idp     = ( isset($_REQUEST['idp'])     ? $_REQUEST['idp']     : FALSE );
-$profile = ( isset($_REQUEST['profile']) ? $_REQUEST['profile'] : FALSE );
-$federation = ( isset($_REQUEST['federation']) ? $_REQUEST['federation'] : FALSE );
-$disco   = ( isset($_REQUEST['disco'])   ? $_REQUEST['disco']   : FALSE );
-$width   = ( isset($_REQUEST['width'])   ? $_REQUEST['width']   : 0 );
-$height   = ( isset($_REQUEST['height'])   ? $_REQUEST['height']   : 0 );
-$sort    = ( isset($_REQUEST['sort'])    ? $_REQUEST['sort']    : 0 );
-$location    = ( isset($_REQUEST['location'])    ? $_REQUEST['location']    : 0 );
-$api_version = ( isset($_REQUEST['api_version']) ? $_REQUEST['api_version'] : 1 );
-$generatedfor = ( isset($_REQUEST['generatedfor']) ? $_REQUEST['generatedfor'] : 'user' );
+$id      = (isset($_REQUEST['id']) ? $_REQUEST['id'] : FALSE);
+$device  = (isset($_REQUEST['device']) ? $_REQUEST['device'] : FALSE);
+$lang    = (isset($_REQUEST['lang']) ? $_REQUEST['lang'] : FALSE);
+$idp     = (isset($_REQUEST['idp']) ? $_REQUEST['idp'] : FALSE);
+$profile = (isset($_REQUEST['profile']) ? $_REQUEST['profile'] : FALSE);
+$federation = (isset($_REQUEST['federation']) ? $_REQUEST['federation'] : FALSE);
+$disco   = (isset($_REQUEST['disco']) ? $_REQUEST['disco'] : FALSE);
+$width   = (isset($_REQUEST['width']) ? $_REQUEST['width'] : 0);
+$height = (isset($_REQUEST['height']) ? $_REQUEST['height'] : 0);
+$sort    = (isset($_REQUEST['sort']) ? $_REQUEST['sort'] : 0);
+$location    = (isset($_REQUEST['location']) ? $_REQUEST['location'] : 0);
+$api_version = (isset($_REQUEST['api_version']) ? $_REQUEST['api_version'] : 1);
+$generatedfor = (isset($_REQUEST['generatedfor']) ? $_REQUEST['generatedfor'] : 'user');
 
 /* in order to provide bacwards compatibility, both $id and new named arguments are supported.
    Support for $id will be removed in the futute
@@ -47,7 +47,7 @@ 
         $API->JSON_listCountries();
         break;
     case 'listIdentityProviders':
-        if(! $federation)
+        if (!$federation)
            $federation = $id;
         $API->JSON_listIdentityProviders($federation);
         break;
@@ -55,42 +55,42 @@ 
         $API->JSON_listIdentityProvidersForDisco();
         break;
     case 'listProfiles': // needs $idp set - abort if not
-        if(! $idp) 
+        if (!$idp) 
            $idp = $id;
         if ($idp === FALSE) exit;
-        $API->JSON_listProfiles($idp,$sort);
+        $API->JSON_listProfiles($idp, $sort);
         break;
     case 'listDevices':
-        if(! $profile)
+        if (!$profile)
            $profile = $id;
         $API->JSON_listDevices($profile);
         break;
     case 'generateInstaller': // needs $id and $profile set
-        if(! $device)
+        if (!$device)
             $device = $id;
         if ($device === FALSE || $profile === FALSE) exit;
         $API->JSON_generateInstaller($device, $profile);
         break;
     case 'downloadInstaller': // needs $id and $profile set optional $generatedfor
-        if(! $device)
+        if (!$device)
             $device = $id;
         if ($device === FALSE || $profile === FALSE) exit;
-        $API->downloadInstaller($device, $profile,$generatedfor);
+        $API->downloadInstaller($device, $profile, $generatedfor);
         break;
     case 'profileAttributes': // needs $id set
-        if(! $profile)
+        if (!$profile)
            $profile = $id;
         if ($profile === FALSE) exit;
         $API->JSON_profileAttributes($profile);
         break;
     case 'sendLogo': // needs $id and $disco set
-        if(! $idp)
+        if (!$idp)
            $idp = $id;
         if ($idp === FALSE) exit;
-        $API->sendLogo($idp, $disco,$width,$height);
+        $API->sendLogo($idp, $disco, $width, $height);
         break;
     case 'deviceInfo': // needs $id and profile set
-        if(! $device)
+        if (!$device)
             $device = $id;
         if ($id === FALSE || $profile === FALSE) exit;
         $API->deviceInfo($device, $profile);
@@ -102,16 +102,16 @@ 
         $API->JSON_detectOS();
         break;
     case 'orderIdentityProviders':
-        if(! $federation)
+        if (!$federation)
            $federation = $id;
-         if($location)  {
-            $A=explode(':',$location);
-            $L = ['lat'=>$A[0],'lon'=>$A[1]];
+         if ($location) {
+            $A = explode(':', $location);
+            $L = ['lat'=>$A[0], 'lon'=>$A[1]];
          } else
             $L = NULL;
-        $API->JSON_orderIdentityProviders($federation,$L);
+        $API->JSON_orderIdentityProviders($federation, $L);
         break;
 }
-debug(4,"UserAPI action: ".$action.':'.$id.':'.$lang.':'.$profile.':'.$disco."\n");
+debug(4, "UserAPI action: " . $action . ':' . $id . ':' . $lang . ':' . $profile . ':' . $disco . "\n");
 
 ?>

Braces +50 added lines, -27 removed lines

@@ -15,8 +15,9 @@ 
 $API = new UserAPI();
 
 // extract request parameters; action is mandatory
-if(!isset($_REQUEST['action']))
+if(!isset($_REQUEST['action'])) {
    exit;
+}
 
 $action  = $_REQUEST['action'];
 $id      = ( isset($_REQUEST['id'])      ? $_REQUEST['id']      : FALSE );
@@ -47,52 +48,72 @@ 
         $API->JSON_listCountries();
         break;
     case 'listIdentityProviders':
-        if(! $federation)
-           $federation = $id;
+        if(! $federation) {
+                   $federation = $id;
+        }
         $API->JSON_listIdentityProviders($federation);
         break;
     case 'listAllIdentityProviders':
         $API->JSON_listIdentityProvidersForDisco();
         break;
     case 'listProfiles': // needs $idp set - abort if not
-        if(! $idp) 
-           $idp = $id;
-        if ($idp === FALSE) exit;
+        if(! $idp) {
+                   $idp = $id;
+        }
+        if ($idp === FALSE) {
+            exit;
+        }
         $API->JSON_listProfiles($idp,$sort);
         break;
     case 'listDevices':
-        if(! $profile)
-           $profile = $id;
+        if(! $profile) {
+                   $profile = $id;
+        }
         $API->JSON_listDevices($profile);
         break;
     case 'generateInstaller': // needs $id and $profile set
-        if(! $device)
-            $device = $id;
-        if ($device === FALSE || $profile === FALSE) exit;
+        if(! $device) {
+                    $device = $id;
+        }
+        if ($device === FALSE || $profile === FALSE) {
+            exit;
+        }
         $API->JSON_generateInstaller($device, $profile);
         break;
     case 'downloadInstaller': // needs $id and $profile set optional $generatedfor
-        if(! $device)
-            $device = $id;
-        if ($device === FALSE || $profile === FALSE) exit;
+        if(! $device) {
+                    $device = $id;
+        }
+        if ($device === FALSE || $profile === FALSE) {
+            exit;
+        }
         $API->downloadInstaller($device, $profile,$generatedfor);
         break;
     case 'profileAttributes': // needs $id set
-        if(! $profile)
-           $profile = $id;
-        if ($profile === FALSE) exit;
+        if(! $profile) {
+                   $profile = $id;
+        }
+        if ($profile === FALSE) {
+            exit;
+        }
         $API->JSON_profileAttributes($profile);
         break;
     case 'sendLogo': // needs $id and $disco set
-        if(! $idp)
-           $idp = $id;
-        if ($idp === FALSE) exit;
+        if(! $idp) {
+                   $idp = $id;
+        }
+        if ($idp === FALSE) {
+            exit;
+        }
         $API->sendLogo($idp, $disco,$width,$height);
         break;
     case 'deviceInfo': // needs $id and profile set
-        if(! $device)
-            $device = $id;
-        if ($id === FALSE || $profile === FALSE) exit;
+        if(! $device) {
+                    $device = $id;
+        }
+        if ($id === FALSE || $profile === FALSE) {
+            exit;
+        }
         $API->deviceInfo($device, $profile);
         break;
     case 'locateUser':
@@ -102,13 +123,15 @@ 
         $API->JSON_detectOS();
         break;
     case 'orderIdentityProviders':
-        if(! $federation)
-           $federation = $id;
+        if(! $federation) {
+                   $federation = $id;
+        }
          if($location)  {
             $A=explode(':',$location);
             $L = ['lat'=>$A[0],'lon'=>$A[1]];
-         } else
-            $L = NULL;
+         } else {
+                     $L = NULL;
+         }
         $API->JSON_orderIdentityProviders($federation,$L);
         break;
 }

web/index.php

Indentation +31 added lines, -31 removed lines

@@ -23,33 +23,33 @@ 
 //debug(4,$_REQUEST);
 
 /**
-  * Menu class helps to define the menu on the main page
-  */
+ * Menu class helps to define the menu on the main page
+ */
 class Menu {
 /**
-  * the constructor takes an array argument defining menu items.
-  * the array must be indexed by strings which will be passed to user/cat_info.php a the page argument
-  * the values of the array can be either a simple string which is passed to user/cat_info.php
-  * as the title argument or an two element array - the first element of this array will be
-  * the title and the second is a style specification applied to the given menu item
+ * the constructor takes an array argument defining menu items.
+ * the array must be indexed by strings which will be passed to user/cat_info.php a the page argument
+ * the values of the array can be either a simple string which is passed to user/cat_info.php
+ * as the title argument or an two element array - the first element of this array will be
+ * the title and the second is a style specification applied to the given menu item
  */
 public function __construct($menu_array) {
-  $this->menu = $menu_array;
+    $this->menu = $menu_array;
 }
 
 private function printMenuLine($index,$title="",$style="") {
 if ($style !== "")
-   print  "<tr><td style='$style'><a href='javascript:infoCAT(\"$index\",\"".rawurlencode($title)."\")'>$title</a></td></tr>\n";
+    print  "<tr><td style='$style'><a href='javascript:infoCAT(\"$index\",\"".rawurlencode($title)."\")'>$title</a></td></tr>\n";
 else
-   print  "<tr><td><a href='javascript:infoCAT(\"$index\",\"".rawurlencode($title)."\")'>$title</a></td></tr>\n";
+    print  "<tr><td><a href='javascript:infoCAT(\"$index\",\"".rawurlencode($title)."\")'>$title</a></td></tr>\n";
 }
 
 public function printMenu() {
-  foreach ($this->menu as $index => $title)
-  if(is_array($title))
-     $this->printMenuLine($index,$title[0],$title[1]); 
-  else
-     $this->printMenuLine($index,$title); 
+    foreach ($this->menu as $index => $title)
+    if(is_array($title))
+        $this->printMenuLine($index,$title[0],$title[1]); 
+    else
+        $this->printMenuLine($index,$title); 
 }
 
 private $menu;
@@ -94,7 +94,7 @@ 
 $OS = $Gui->detectOS();
 debug(4,$OS);
 if($OS)
-   print "recognised_os = '".$OS['device']."';\n";
+    print "recognised_os = '".$OS['device']."';\n";
 $download_message = sprintf(_("Download your %s installer"),Config::$CONSORTIUM['name']);
 print 'download_message = "'.$download_message.'";';
 //TODO modify this based on OS detection
@@ -149,13 +149,13 @@ 
                             <table id="left_menu">
 <?php
                                 $menu = new Menu( [
-                                   "about_consortium"=>[sprintf(_("About %s"), Config::$CONSORTIUM['name']),'padding-bottom:20px;font-weight: bold; '],
-                                   "about"=>sprintf(_("About %s"), Config::$APPEARANCE['productname']),
-                                   "tou"=>sprintf(_("Terms of use")),
-                                   "faq"=>sprintf(_("FAQ")),
-                                   "report"=>sprintf(_("Report a problem")),
-                                   "develop"=>sprintf(_("Become a CAT developer")),
-                                   "admin"=>[sprintf(_("%s admin:<br>manage your IdP"), Config::$CONSORTIUM['name']),'padding-top:30px;'],
+                                    "about_consortium"=>[sprintf(_("About %s"), Config::$CONSORTIUM['name']),'padding-bottom:20px;font-weight: bold; '],
+                                    "about"=>sprintf(_("About %s"), Config::$APPEARANCE['productname']),
+                                    "tou"=>sprintf(_("Terms of use")),
+                                    "faq"=>sprintf(_("FAQ")),
+                                    "report"=>sprintf(_("Report a problem")),
+                                    "develop"=>sprintf(_("Become a CAT developer")),
+                                    "admin"=>[sprintf(_("%s admin:<br>manage your IdP"), Config::$CONSORTIUM['name']),'padding-top:30px;'],
                                 ]);
 
                                 $menu->printMenu(); ?>
@@ -224,9 +224,9 @@ 
                        <strong><?php echo _("Welcome aboard the eduroam® user community!")?></strong>
                        <p>
                        <span id="download_info"><?php 
-                       /// the empty href is dynamically exchanged with the actual path by jQuery at runtime
-                       echo _("Your download will start shortly. In case of problems with the automatic download please use this direct <a href=''>link</a>.");
-                       ?></span>
+                        /// the empty href is dynamically exchanged with the actual path by jQuery at runtime
+                        echo _("Your download will start shortly. In case of problems with the automatic download please use this direct <a href=''>link</a>.");
+                        ?></span>
                        <p>
                        <?php printf(_("Dear user from %s,"),"<span class='inst_name'></span>") ?>
                        <br/>
@@ -338,14 +338,14 @@ 
                  </td>
                  <td style="padding-left:80px; text-align:right;">
                  <?php
-                     if (Config::$CONSORTIUM['name'] == "eduroam" && isset(Config::$CONSORTIUM['deployment-voodoo']) && Config::$CONSORTIUM['deployment-voodoo'] == "Operations Team") // SW: APPROVED
-                         echo "
+                        if (Config::$CONSORTIUM['name'] == "eduroam" && isset(Config::$CONSORTIUM['deployment-voodoo']) && Config::$CONSORTIUM['deployment-voodoo'] == "Operations Team") // SW: APPROVED
+                            echo "
                   <span id='logos' style='position:fixed; left:50%;'><img src='resources/images/dante.png' alt='DANTE' style='height:23px;width:47px'/>
                   <img src='resources/images/eu.png' alt='EU' style='height:23px;width:27px;border-width:0px;'/></span>
                   <span id='eu_text' style='text-align:right;'><a href='http://ec.europa.eu/dgs/connect/index_en.htm' style='text-decoration:none; vertical-align:top;'>European Commission Communications Networks, Content and Technology</a></span>";
-                     else
-                         echo "&nbsp;";
-                 ?>
+                        else
+                            echo "&nbsp;";
+                    ?>
                 </td>
             </tr>
         </table>

Spacing +22 added lines, -22 removed lines

@@ -37,19 +37,19 @@ 
   $this->menu = $menu_array;
 }
 
-private function printMenuLine($index,$title="",$style="") {
+private function printMenuLine($index, $title = "", $style = "") {
 if ($style !== "")
-   print  "<tr><td style='$style'><a href='javascript:infoCAT(\"$index\",\"".rawurlencode($title)."\")'>$title</a></td></tr>\n";
+   print  "<tr><td style='$style'><a href='javascript:infoCAT(\"$index\",\"" . rawurlencode($title) . "\")'>$title</a></td></tr>\n";
 else
-   print  "<tr><td><a href='javascript:infoCAT(\"$index\",\"".rawurlencode($title)."\")'>$title</a></td></tr>\n";
+   print  "<tr><td><a href='javascript:infoCAT(\"$index\",\"" . rawurlencode($title) . "\")'>$title</a></td></tr>\n";
 }
 
 public function printMenu() {
   foreach ($this->menu as $index => $title)
-  if(is_array($title))
-     $this->printMenuLine($index,$title[0],$title[1]); 
+  if (is_array($title))
+     $this->printMenuLine($index, $title[0], $title[1]); 
   else
-     $this->printMenuLine($index,$title); 
+     $this->printMenuLine($index, $title); 
 }
 
 private $menu;
@@ -92,11 +92,11 @@ 
         var download_message;
 <?php
 $OS = $Gui->detectOS();
-debug(4,$OS);
-if($OS)
-   print "recognised_os = '".$OS['device']."';\n";
-$download_message = sprintf(_("Download your %s installer"),Config::$CONSORTIUM['name']);
-print 'download_message = "'.$download_message.'";';
+debug(4, $OS);
+if ($OS)
+   print "recognised_os = '" . $OS['device'] . "';\n";
+$download_message = sprintf(_("Download your %s installer"), Config::$CONSORTIUM['name']);
+print 'download_message = "' . $download_message . '";';
 //TODO modify this based on OS detection
 if (preg_match('/Android/', $_SERVER['HTTP_USER_AGENT']))
     $profile_list_size = 1;
@@ -120,7 +120,7 @@ 
         <div id="heading">
             <?php
             print '<img src="resources/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>';
@@ -142,20 +142,20 @@ 
         </div>
         <form id="cat_form" name="cat_form" method="POST"  accept-charset="UTF-8" action="<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']), '/'); ?>/">
         <div id="main_body">
-<?php if(! isset($_REQUEST['idp']) || ! $_REQUEST['idp']) { ?>
+<?php if (!isset($_REQUEST['idp']) || !$_REQUEST['idp']) { ?>
                 <table id="front_page">
                     <tr>
                         <td rowspan=2 id="menu_column">
                             <table id="left_menu">
 <?php
-                                $menu = new Menu( [
-                                   "about_consortium"=>[sprintf(_("About %s"), Config::$CONSORTIUM['name']),'padding-bottom:20px;font-weight: bold; '],
+                                $menu = new Menu([
+                                   "about_consortium"=>[sprintf(_("About %s"), Config::$CONSORTIUM['name']), 'padding-bottom:20px;font-weight: bold; '],
                                    "about"=>sprintf(_("About %s"), Config::$APPEARANCE['productname']),
                                    "tou"=>sprintf(_("Terms of use")),
                                    "faq"=>sprintf(_("FAQ")),
                                    "report"=>sprintf(_("Report a problem")),
                                    "develop"=>sprintf(_("Become a CAT developer")),
-                                   "admin"=>[sprintf(_("%s admin:<br>manage your IdP"), Config::$CONSORTIUM['name']),'padding-top:30px;'],
+                                   "admin"=>[sprintf(_("%s admin:<br>manage your IdP"), Config::$CONSORTIUM['name']), 'padding-top:30px;'],
                                 ]);
 
                                 $menu->printMenu(); ?>
@@ -177,7 +177,7 @@ 
                                             <span id="line5">
                                             <?php
                                             if (isset(Config::$CONSORTIUM['signer_name']) && Config::$CONSORTIUM['signer_name'] != "")
-                                                echo sprintf(_("Digitally signed by the organisation that coordinates %s: %s"),Config::$CONSORTIUM['name'],Config::$CONSORTIUM['signer_name']);
+                                                echo sprintf(_("Digitally signed by the organisation that coordinates %s: %s"), Config::$CONSORTIUM['name'], Config::$CONSORTIUM['signer_name']);
                                             ?>
                                             </span>
                                         </div>
@@ -228,7 +228,7 @@ 
                        echo _("Your download will start shortly. In case of problems with the automatic download please use this direct <a href=''>link</a>.");
                        ?></span>
                        <p>
-                       <?php printf(_("Dear user from %s,"),"<span class='inst_name'></span>") ?>
+                       <?php printf(_("Dear user from %s,"), "<span class='inst_name'></span>") ?>
                        <br/>
                        <br/>
                        <?php echo _("we would like to warmly welcome you among the several million users of eduroam®! From now on, you will be able to use internet access resources on thousands of universities, research centres and other places all over the globe. All of this completely free of charge!") ?>
@@ -236,7 +236,7 @@ 
                        <p>
                        <?php echo _("Now that you have downloaded and installed a client configurator, all you need to do is find an eduroam® hotspot in your vicinity and enter your user credentials (this is our fancy name for 'username and password' or 'personal certificate') - and be online!") ?>
                        <p>
-                       <?php printf(_("Should you have any problems using this service, please always contact the helpdesk of %s. They will diagnose the problem and help you out. You can reach them via the means shown above."),"<span class='inst_name'></span>") ?>
+                       <?php printf(_("Should you have any problems using this service, please always contact the helpdesk of %s. They will diagnose the problem and help you out. You can reach them via the means shown above."), "<span class='inst_name'></span>") ?>
                        </p>
                        <p>
                        <a href="javascript:back_to_downloads()"><strong><?php echo _("Back to downloads") ?></strong></a>
@@ -252,7 +252,7 @@ 
                             </span>
                     </div> <!-- id="profile_redirect" -->
                     <div id="devices" class="device_list">
-<?php if($OS) { ?>  <!-- this part is shown when we have guessed the OS -->
+<?php if ($OS) { ?>  <!-- this part is shown when we have guessed the OS -->
                         
                         <div class="sub_h" id="guess_os"> 
                               <table id='browser'>
@@ -302,11 +302,11 @@ 
                                     foreach ($Gui->listDevices(isset($_REQUEST['hidden']) ? $_REQUEST['hidden'] : 0) as $group => $G) {
                                         $ct = count($G);
                                         $i = 0;
-                                        print '<tbody><tr><td class="vendor" rowspan="' . $ct . '"><img src="resources/images/vendorlogo/' . $group . '.png" alt="'.$group.' Device"></td>';
+                                        print '<tbody><tr><td class="vendor" rowspan="' . $ct . '"><img src="resources/images/vendorlogo/' . $group . '.png" alt="' . $group . ' Device"></td>';
                                         foreach ($G as $d => $D) {
                                             if ($i)
                                                 print '<tr>';
-                                            $j = ($i+1)*20;
+                                            $j = ($i + 1) * 20;
                                             print "<td><button id='" . $d . "'>" . $D['display'] . "</button>";
                                             print "<div class='device_info' id='info_" . $d . "'></div></td>";
                                             print "<td><button class='more_info_b' id='info_b_" . $d . "'></button></td></tr>\n";

Braces +27 added lines, -18 removed lines

@@ -38,19 +38,22 @@ 
 }
 
 private function printMenuLine($index,$title="",$style="") {
-if ($style !== "")
+if ($style !== "") {
    print  "<tr><td style='$style'><a href='javascript:infoCAT(\"$index\",\"".rawurlencode($title)."\")'>$title</a></td></tr>\n";
-else
+} else {
    print  "<tr><td><a href='javascript:infoCAT(\"$index\",\"".rawurlencode($title)."\")'>$title</a></td></tr>\n";
 }
+}
 
 public function printMenu() {
-  foreach ($this->menu as $index => $title)
-  if(is_array($title))
-     $this->printMenuLine($index,$title[0],$title[1]); 
-  else
-     $this->printMenuLine($index,$title); 
-}
+  foreach ($this->menu as $index => $title) {
+    if(is_array($title))
+     $this->printMenuLine($index,$title[0],$title[1]);
+  }
+  else {
+       $this->printMenuLine($index,$title);
+  }
+  }
 
 private $menu;
 }
@@ -93,15 +96,17 @@ 
 <?php
 $OS = $Gui->detectOS();
 debug(4,$OS);
-if($OS)
+if($OS) {
    print "recognised_os = '".$OS['device']."';\n";
+}
 $download_message = sprintf(_("Download your %s installer"),Config::$CONSORTIUM['name']);
 print 'download_message = "'.$download_message.'";';
 //TODO modify this based on OS detection
-if (preg_match('/Android/', $_SERVER['HTTP_USER_AGENT']))
+if (preg_match('/Android/', $_SERVER['HTTP_USER_AGENT'])) {
     $profile_list_size = 1;
-else
+} else {
     $profile_list_size = 4;
+}
 include("user/js/roll.php");
 include("user/js/cat_js.php");
 ?>
@@ -176,8 +181,9 @@ 
                                             <span id="line4"><?php echo _("Custom built for your home institution") ?></span>
                                             <span id="line5">
                                             <?php
-                                            if (isset(Config::$CONSORTIUM['signer_name']) && Config::$CONSORTIUM['signer_name'] != "")
-                                                echo sprintf(_("Digitally signed by the organisation that coordinates %s: %s"),Config::$CONSORTIUM['name'],Config::$CONSORTIUM['signer_name']);
+                                            if (isset(Config::$CONSORTIUM['signer_name']) && Config::$CONSORTIUM['signer_name'] != "") {
+                                                                                            echo sprintf(_("Digitally signed by the organisation that coordinates %s: %s"),Config::$CONSORTIUM['name'],Config::$CONSORTIUM['signer_name']);
+                                            }
                                             ?>
                                             </span>
                                         </div>
@@ -304,8 +310,9 @@ 
                                         $i = 0;
                                         print '<tbody><tr><td class="vendor" rowspan="' . $ct . '"><img src="resources/images/vendorlogo/' . $group . '.png" alt="'.$group.' Device"></td>';
                                         foreach ($G as $d => $D) {
-                                            if ($i)
-                                                print '<tr>';
+                                            if ($i) {
+                                                                                            print '<tr>';
+                                            }
                                             $j = ($i+1)*20;
                                             print "<td><button id='" . $d . "'>" . $D['display'] . "</button>";
                                             print "<div class='device_info' id='info_" . $d . "'></div></td>";
@@ -338,13 +345,15 @@ 
                  </td>
                  <td style="padding-left:80px; text-align:right;">
                  <?php
-                     if (Config::$CONSORTIUM['name'] == "eduroam" && isset(Config::$CONSORTIUM['deployment-voodoo']) && Config::$CONSORTIUM['deployment-voodoo'] == "Operations Team") // SW: APPROVED
+                     if (Config::$CONSORTIUM['name'] == "eduroam" && isset(Config::$CONSORTIUM['deployment-voodoo']) && Config::$CONSORTIUM['deployment-voodoo'] == "Operations Team") {
+                         // SW: APPROVED
                          echo "
                   <span id='logos' style='position:fixed; left:50%;'><img src='resources/images/dante.png' alt='DANTE' style='height:23px;width:47px'/>
                   <img src='resources/images/eu.png' alt='EU' style='height:23px;width:27px;border-width:0px;'/></span>
                   <span id='eu_text' style='text-align:right;'><a href='http://ec.europa.eu/dgs/connect/index_en.htm' style='text-decoration:none; vertical-align:top;'>European Commission Communications Networks, Content and Technology</a></span>";
-                     else
-                         echo "&nbsp;";
+                     } else {
+                                              echo "&nbsp;";
+                     }
                  ?>
                 </td>
             </tr>

web/download.php

Indentation +2 added lines, -2 removed lines

@@ -42,8 +42,8 @@
 $p = new Profile($profile_id);
 
 if(!$p->institution || $p->institution !== $inst_id) {
-  header("HTTP/1.0 404 Not Found");
-  return;
+    header("HTTP/1.0 404 Not Found");
+    return;
 }
 
 // now we generate the installer

Spacing +5 added lines, -5 removed lines

@@ -13,7 +13,7 @@ 
  * @package UserGUI
  */
 
-include(dirname(dirname(__FILE__))."/config/_config.php");
+include(dirname(dirname(__FILE__)) . "/config/_config.php");
 require_once("UserAPI.php");
 $Gui = new UserAPI();
 
@@ -28,26 +28,26 @@ 
 
 
 if ($generated_for != "admin" && $generated_for != "user") {
-    debug(2,"Invalid downloads triggered (neither for admin nor user???)");
+    debug(2, "Invalid downloads triggered (neither for admin nor user???)");
     print("Invalid downloads triggered (neither for admin nor user???)");
     exit(1);
 }
 
 //print_r($_REQUEST);
 
-debug(4,"download: profile:$profile_id; inst:$inst_id; device:$device\n");
+debug(4, "download: profile:$profile_id; inst:$inst_id; device:$device\n");
 
 // first block will test if the user input was valid.
 
 $p = new Profile($profile_id);
 
-if(!$p->institution || $p->institution !== $inst_id) {
+if (!$p->institution || $p->institution !== $inst_id) {
   header("HTTP/1.0 404 Not Found");
   return;
 }
 
 // now we generate the installer
 
-$Gui->downloadInstaller($device,$profile_id, $generated_for);
+$Gui->downloadInstaller($device, $profile_id, $generated_for);
 
 ?>

web/copyright.php

Indentation +5 added lines, -5 removed lines

@@ -205,14 +205,14 @@
                  </td>
                  <td style="padding-left:80px; padding-right:20px; text-align:right; vertical-align:top;">
                  <?php
-                     if (Config::$CONSORTIUM['name'] == "eduroam" && isset(Config::$CONSORTIUM['deployment-voodoo']) && Config::$CONSORTIUM['deployment-voodoo'] == "Operations Team") // SW: APPROVED
-                         echo "
+                        if (Config::$CONSORTIUM['name'] == "eduroam" && isset(Config::$CONSORTIUM['deployment-voodoo']) && Config::$CONSORTIUM['deployment-voodoo'] == "Operations Team") // SW: APPROVED
+                            echo "
                   <span id='logos' style='position:fixed; left:50%;'><img src='resources/images/dante.png' alt='DANTE' style='height:23px;width:47px'/>
                   <img src='resources/images/eu.png' alt='EU' style='height:23px;width:27px;border-width:0px;'/></span>
                   <span id='eu_text' style='text-align:right;'><a href='http://ec.europa.eu/dgs/connect/index_en.htm' style='text-decoration:none; vertical-align:top;'>European Commission Communications Networks, Content and Technology</a></span>";
-                     else
-                         echo "&nbsp;";
-                 ?>
+                        else
+                            echo "&nbsp;";
+                    ?>
                 </td>
             </tr>
         </table>

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
         <div id="heading">
             <?php
             print '<img src="resources/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(_("%s Copyright and Licensing"), 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>';

Braces +10 added lines, -7 removed lines

@@ -196,22 +196,25 @@
 // this variable gets set during "make distribution" only
                     $RELEASE = "THERELEASE";
                     echo Config::$APPEARANCE['productname'] . " - ";
-                    if ($RELEASE != "THERELEASE")
-                        echo sprintf(_("Release %s"), $RELEASE);
-                    else
-                        echo _("Unreleased SVN Revision");
+                    if ($RELEASE != "THERELEASE") {
+                                            echo sprintf(_("Release %s"), $RELEASE);
+                    } else {
+                                            echo _("Unreleased SVN Revision");
+                    }
                     echo " &copy; 2011-15 G&Eacute;ANT Ltd. on behalf of the GN3 and GN3plus consortia and others <a href='copyright.php'>Full Copyright and Licenses</a>";
                 ?>
                  </td>
                  <td style="padding-left:80px; padding-right:20px; text-align:right; vertical-align:top;">
                  <?php
-                     if (Config::$CONSORTIUM['name'] == "eduroam" && isset(Config::$CONSORTIUM['deployment-voodoo']) && Config::$CONSORTIUM['deployment-voodoo'] == "Operations Team") // SW: APPROVED
+                     if (Config::$CONSORTIUM['name'] == "eduroam" && isset(Config::$CONSORTIUM['deployment-voodoo']) && Config::$CONSORTIUM['deployment-voodoo'] == "Operations Team") {
+                         // SW: APPROVED
                          echo "
                   <span id='logos' style='position:fixed; left:50%;'><img src='resources/images/dante.png' alt='DANTE' style='height:23px;width:47px'/>
                   <img src='resources/images/eu.png' alt='EU' style='height:23px;width:27px;border-width:0px;'/></span>
                   <span id='eu_text' style='text-align:right;'><a href='http://ec.europa.eu/dgs/connect/index_en.htm' style='text-decoration:none; vertical-align:top;'>European Commission Communications Networks, Content and Technology</a></span>";
-                     else
-                         echo "&nbsp;";
+                     } else {
+                                              echo "&nbsp;";
+                     }
                  ?>
                 </td>
             </tr>