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);
 ?>
         };
 

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 );

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

web/diag/action_userdiag.php

Braces +23 added lines, -16 removed lines

@@ -67,10 +67,11 @@ 
 
 function mainpage_url() {
     $main_url = valid_host($_SERVER['HTTP_HOST']);
-    if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == "on")
-        $main_url = "https://" . $main_url;
-    else
-        $main_url = "http://" . $main_url;
+    if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == "on") {
+            $main_url = "https://" . $main_url;
+    } else {
+            $main_url = "http://" . $main_url;
+    }
     $main_url .= substr($_SERVER['PHP_SELF'], 0, strrpos($_SERVER['PHP_SELF'], "/diag/"));
     return $main_url;
 }
@@ -135,8 +136,9 @@ 
                     array_multisort($name, SORT_ASC, SORT_LOCALE_STRING, $displaylist);
                     setlocale(LC_ALL, $current_locale);
 
-                    foreach ($displaylist as $id => $oneinst)
-                        echo "<option id='" . $id . "' value='" . $oneinst['realmlist'] . "'>" . $oneinst['name'] . "</option>";
+                    foreach ($displaylist as $id => $oneinst) {
+                                            echo "<option id='" . $id . "' value='" . $oneinst['realmlist'] . "'>" . $oneinst['name'] . "</option>";
+                    }
                     ?>
                 </select>
                 <button type='submit' class='submit'><?php echo _("Submit Information"); ?></button>
@@ -197,10 +199,12 @@ 
                 $checkresult[$number] = $check['instance']->UDP_reachability($number, FALSE, FALSE);
                 if ($checkresult[$number] == RETVAL_CONVERSATION_REJECT) { // so now things work?!
                     // either a packet size or Operator-Name problem!
-                    if ($check['instance']->UDP_reachability($number, TRUE, FALSE) != RETVAL_CONVERSATION_REJECT)
-                        $realmproblems[] = ["REALM" => $check['realm'], "STATUS" => "OPERATOR-NAME", "FROM" => $probe['display_name'], "DETAIL" => ""];
-                    if ($check['instance']->UDP_reachability($number, FALSE, TRUE) != RETVAL_CONVERSATION_REJECT)
-                        $realmproblems[] = ["REALM" => $check['realm'], "STATUS" => "PACKETSIZE", "FROM" => $probe['display_name'], "DETAIL" => ""];
+                    if ($check['instance']->UDP_reachability($number, TRUE, FALSE) != RETVAL_CONVERSATION_REJECT) {
+                                            $realmproblems[] = ["REALM" => $check['realm'], "STATUS" => "OPERATOR-NAME", "FROM" => $probe['display_name'], "DETAIL" => ""];
+                    }
+                    if ($check['instance']->UDP_reachability($number, FALSE, TRUE) != RETVAL_CONVERSATION_REJECT) {
+                                            $realmproblems[] = ["REALM" => $check['realm'], "STATUS" => "PACKETSIZE", "FROM" => $probe['display_name'], "DETAIL" => ""];
+                    }
                 } else { // still no response or immediate reject
                     // if this is a CAT realm with anon ID set, we can't be seeing an NPS ignorance problem
                     // and consequently, the realm has actual issues
@@ -234,12 +238,13 @@ 
 // re-write check history with that extra knowledge
     $copycat = $realmproblems;
 
-    foreach ($realmproblems as &$problem)
-        if ($problem['STATUS'] == "REALM_POSSIBLY_NPS")
+    foreach ($realmproblems as &$problem) {
+            if ($problem['STATUS'] == "REALM_POSSIBLY_NPS")
             foreach ($copycat as $otherproblem)
                 if ($problem['REALM'] == $otherproblem['REALM'] && $problem['FROM'] != $otherproblem['FROM'] && $otherproblem['STATUS'] != "REALM_POSSIBLY_NPS")
                     if ($otherproblem['STATUS'] == "REACHABLE") { // worked elsewhere, but not on this probe:
                         $problem['STATUS'] = "REALM_DOWN";
+    }
                     } else { // inherit other problem; in any case not an NPS problem
                         $problem['STATUS'] = $otherproblem['STATUS'];
                     }
@@ -249,11 +254,12 @@ 
 
     $copycat = $realmproblems;
 
-    foreach ($realmproblems as &$problem)
-        if ($problem['STATUS'] == "REALM_DOWN")
+    foreach ($realmproblems as &$problem) {
+            if ($problem['STATUS'] == "REALM_DOWN")
             foreach ($copycat as $otherproblem)
                 if ($problem['REALM'] == $otherproblem['REALM'] && $problem['FROM'] != $otherproblem['FROM'] && $otherproblem['STATUS'] == "REACHABLE")
                     $problem['STATUS'] = "INFRASTRUCTURE";
+    }
     unset($problem);
 
 // finally, extract all certprobs we got from the reachability checks; merge from all
@@ -264,8 +270,9 @@ 
     foreach ($checks as $check) {
         $instance = $check['instance'];
         $resultset = $instance->UDP_reachability_result;
-        foreach ($resultset as $result)
-            $all_certprobs = array_merge($all_certprobs, $result['cert_oddities']);
+        foreach ($resultset as $result) {
+                    $all_certprobs = array_merge($all_certprobs, $result['cert_oddities']);
+        }
     }
     echo "<pre>";
     print_r($realmproblems);

core/RADIUSTests.php

Indentation -1 removed lines

@@ -328,7 +328,6 @@
      * - RETVAL_NOT_CONFIGURED; needs Config::$RADIUSTESTS['TLS-discoverytag']
      * - RETVAL_INVALID (at least one format error)
      * - RETVAL_OK (all fine)
-
      * @return int one of two RETVALs above
      */
     public function NAPTR_compliance() {

web/admin/action_fedcheck.php

Braces +26 added lines, -17 removed lines

@@ -44,10 +44,11 @@ 
     // NAPTR existence check
     $tabletext .= "<td>";
     $naptr = $testsuite->NAPTR();
-    if ($naptr != RETVAL_NOTCONFIGURED)
-        switch ($naptr) {
+    if ($naptr != RETVAL_NOTCONFIGURED) {
+            switch ($naptr) {
             case RETVAL_NONAPTR:
                 $tabletext .= _("No NAPTR records");
+    }
                 break;
             case RETVAL_ONLYUNRELATEDNAPTR:
                 $tabletext .= sprintf(_("No associated NAPTR records"));
@@ -73,8 +74,9 @@ 
                 }
                 if ($srv > 0) {
                     $hosts = $testsuite->NAPTR_hostnames();
-                    if ($hosts == RETVAL_INVALID)
-                        $NAPTR_issues = true;
+                    if ($hosts == RETVAL_INVALID) {
+                                            $NAPTR_issues = true;
+                    }
                 }
                 break;
         }
@@ -91,14 +93,17 @@ 
     foreach (Config::$RADIUSTESTS['UDP-hosts'] as $hostindex => $host) {
         $testsuite->UDP_reachability($hostindex, true, true);
         $results = $testsuite->UDP_reachability_result[$hostindex];
-        if ($results['packetflow_sane'] != TRUE)
-            $UDPErrors = true;
-        if (empty($results['packetflow'][11]))
-            $UDPErrors = true;
+        if ($results['packetflow_sane'] != TRUE) {
+                    $UDPErrors = true;
+        }
+        if (empty($results['packetflow'][11])) {
+                    $UDPErrors = true;
+        }
         if (count($results['cert_oddities']) > 0) {
-            foreach ($results['cert_oddities'] as $oddity)
-                if ($oddity['level'] > $certBiggestOddity)
+            foreach ($results['cert_oddities'] as $oddity) {
+                            if ($oddity['level'] > $certBiggestOddity)
                     $certBiggestOddity = $oddity['level'];
+            }
         }
     }
 
@@ -119,8 +124,9 @@ 
     if ($naptr > 0 && count($testsuite->NAPTR_hostname_records) > 0) {
         foreach ($testsuite->NAPTR_hostname_records as $hostindex => $addr) {
             $retval = $testsuite->TLS_clients_side_check($addr);
-            if ($retval != RETVAL_OK && $retval != RETVAL_SKIPPED)
-                $dynamicErrors = true;
+            if ($retval != RETVAL_OK && $retval != RETVAL_SKIPPED) {
+                            $dynamicErrors = true;
+            }
         }
     }
     if (!$dynamicErrors) {
@@ -162,10 +168,11 @@ 
 $profiles_showtime = [];
 $profiles_readyconf = [];
 
-foreach ($allIDPs as $index => $oneidp)
+foreach ($allIDPs as $index => $oneidp) {
     foreach ($oneidp['instance']->listProfiles() as $profile)
         if ($profile->isShowtime()) {
             $profiles_showtime[] = ['idp' => $oneidp['instance'], 'profile' => $profile];
+}
         } else if ($profile->readyForShowtime()) {
             $profiles_confready[] = ['idp' => $oneidp['instance'], 'profile' => $profile];
         }
@@ -173,16 +180,18 @@ 
 if (count($profiles_showtime) > 0) {
     echo "<h2>" . _("Profiles marked as visible (V)") . "</h2>" . "<table>";
     echo rowdescription();
-    foreach ($profiles_showtime as $oneprofile)
-        echo profilechecks($oneprofile['idp'], $oneprofile['profile']);
+    foreach ($profiles_showtime as $oneprofile) {
+            echo profilechecks($oneprofile['idp'], $oneprofile['profile']);
+    }
     echo "</table>";
 }
 
 if (count($profiles_confready) > 0) {
     echo "<h2>" . _("Profiles with sufficient configuration, not marked as visible (C)") . "</h2>" . "<table>";
     echo rowdescription();
-    foreach ($profiles_confready as $oneprofile)
-        echo profilechecks($oneprofile['idp'], $oneprofile['profile']);
+    foreach ($profiles_confready as $oneprofile) {
+            echo profilechecks($oneprofile['idp'], $oneprofile['profile']);
+    }
     echo "</table>";
 }
 ?>

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'])
-      ]);
+        ]);
 
 /**
  * This is a template for further FAQ entries. Simply copy&paste and add more
@@ -81,8 +81,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>
@@ -90,8 +90,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>

devices/redirect_dev/RedirectDev.php

Indentation +7 added lines, -7 removed lines

@@ -2,15 +2,15 @@
 require_once('DeviceConfig.php');
 
 class Device_RedirectDev extends DeviceConfig {
-   /**
-    * Constructs a Device object.
-    *
-    * @final not to be redefined
-    */
+    /**
+     * Constructs a Device object.
+     *
+     * @final not to be redefined
+     */
     final public function __construct() {
         parent::__construct();
-      $this->supportedEapMethods  = [EAPTYPE_NONE];
-      $this->loggerInstance->debug(4,"RedirectEx called");
+        $this->supportedEapMethods  = [EAPTYPE_NONE];
+        $this->loggerInstance->debug(4,"RedirectEx called");
     }
     public function writeDeviceInfo() {
         $out = "<p>";