GEANT / CAT

web/user/cat_info.php

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

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/API.php

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

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/copyright.php

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>

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

web/resources/inc/footer.php

Braces +14 added lines, -12 removed lines

@@ -26,22 +26,24 @@
           <td style='padding-left:80px; padding-right:20px; text-align:right; vertical-align:top;'>";
     if (Config::$CONSORTIUM['name'] == "eduroam" && isset(Config::$CONSORTIUM['deployment-voodoo']) && Config::$CONSORTIUM['deployment-voodoo'] == "Operations Team") { // SW: APPROVED
         $logo_base = valid_host($_SERVER['HTTP_HOST']);
-        if ($logo_base === FALSE)
-            exit(1);
-        if (strpos($_SERVER['PHP_SELF'], "admin/") === FALSE)
-            $logo_base .= substr($_SERVER['PHP_SELF'], 0, strrpos($_SERVER['PHP_SELF'], "/")) . "/resources/images";
-        else
-            $logo_base .= substr($_SERVER['PHP_SELF'], 0, strrpos($_SERVER['PHP_SELF'], "/admin/")) . "/resources/images";
-        if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == "on")
-            $logo_base = "https://" . $logo_base;
-        else
-            $logo_base = "http://" . $logo_base;
+        if ($logo_base === FALSE) {
+                    exit(1);
+        }
+        if (strpos($_SERVER['PHP_SELF'], "admin/") === FALSE) {
+                    $logo_base .= substr($_SERVER['PHP_SELF'], 0, strrpos($_SERVER['PHP_SELF'], "/")) . "/resources/images";
+        } else {
+                    $logo_base .= substr($_SERVER['PHP_SELF'], 0, strrpos($_SERVER['PHP_SELF'], "/admin/")) . "/resources/images";
+        }
+        if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == "on") {
+                    $logo_base = "https://" . $logo_base;
+        } else {
+                    $logo_base = "http://" . $logo_base;
+        }
 
         echo "<span id='logos' style='position:fixed; left:50%;'><img src='$logo_base/dante.png' alt='DANTE' style='height:23px;width:47px'/>
               <img src='$logo_base/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 {
+    } else {
         echo "&nbsp;";
     }
     echo "</td>

web/resources/inc/header.php

Braces +32 added lines, -24 removed lines

@@ -44,8 +44,9 @@ 
           <head lang='$ourlocale'>
           <meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>";
     $css_url = valid_host($_SERVER['HTTP_HOST']);
-    if ($css_url === FALSE)
-        exit(1);
+    if ($css_url === FALSE) {
+            exit(1);
+    }
     // we need to construct the right path to the consortium logo; we are either
     // in the admin area or on the main index.php ...
     if (strpos($_SERVER['PHP_SELF'], "admin/") !== FALSE) {
@@ -56,10 +57,11 @@ 
         $css_url .= substr($_SERVER['PHP_SELF'], 0, strrpos($_SERVER['PHP_SELF'], "/")) . "/resources/css/cat.css.php";
     }
     
-    if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == "on")
-        $css_url = "https://" . $css_url;
-    else
-        $css_url = "http://" . $css_url;
+    if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == "on") {
+            $css_url = "https://" . $css_url;
+    } else {
+            $css_url = "http://" . $css_url;
+    }
     echo "<link rel='stylesheet' type='text/css' href='$css_url' />";
     echo "<title>".htmlspecialchars($pagetitle)."</title>";
 
@@ -136,24 +138,28 @@ 
     }
     echo "</select>";
     foreach ($_GET as $var => $value) {
-        if ($var != "lang" && $value != "")
-            echo "<input type='hidden' name='".htmlspecialchars($var)."' value='".htmlspecialchars($value)."'>";
+        if ($var != "lang" && $value != "") {
+                    echo "<input type='hidden' name='".htmlspecialchars($var)."' value='".htmlspecialchars($value)."'>";
+        }
     }
     echo "</form>";
     echo "</div><!--langselection-->";
     $logo_url = valid_host($_SERVER['HTTP_HOST']);
-    if ($logo_url === FALSE)
-        exit(1);
+    if ($logo_url === FALSE) {
+            exit(1);
+    }
     // we need to construct the right path to the consortium logo; we are either
     // in the admin area or on the main index.php ...
-    if (strpos($_SERVER['PHP_SELF'], "admin/") === FALSE)
-        $logo_url .= substr($_SERVER['PHP_SELF'], 0, strrpos($_SERVER['PHP_SELF'], "/")) . "/resources/images/consortium_logo.png";
-    else
-        $logo_url .= substr($_SERVER['PHP_SELF'], 0, strrpos($_SERVER['PHP_SELF'], "/admin/")) . "/resources/images/consortium_logo.png";
-    if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == "on")
-        $logo_url = "https://" . $logo_url;
-    else
-        $logo_url = "http://" . $logo_url;
+    if (strpos($_SERVER['PHP_SELF'], "admin/") === FALSE) {
+            $logo_url .= substr($_SERVER['PHP_SELF'], 0, strrpos($_SERVER['PHP_SELF'], "/")) . "/resources/images/consortium_logo.png";
+    } else {
+            $logo_url .= substr($_SERVER['PHP_SELF'], 0, strrpos($_SERVER['PHP_SELF'], "/admin/")) . "/resources/images/consortium_logo.png";
+    }
+    if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == "on") {
+            $logo_url = "https://" . $logo_url;
+    } else {
+            $logo_url = "http://" . $logo_url;
+    }
     echo "<div class='consortium_logo'>
     <img id='test_locate' src='$logo_url' alt='Consortium Logo'>
 </div> <!-- consortium_logo -->";
@@ -168,10 +174,11 @@ 
     echo "<h2>$cap2</h2>";
     echo "</div><!--secondarycaptions-->";
 
-    if (isset(Config::$APPEARANCE['MOTD']) && Config::$APPEARANCE['MOTD'] != "") 
-        echo "<div id='header_MOTD' style='display:inline-block; padding-left:20px;vertical-align:top;'>
+    if (isset(Config::$APPEARANCE['MOTD']) && Config::$APPEARANCE['MOTD'] != "") {
+            echo "<div id='header_MOTD' style='display:inline-block; padding-left:20px;vertical-align:top;'>
               <p class='MOTD'>" . Config::$APPEARANCE['MOTD'] . "</p>
               </div><!--header_MOTD-->";
+    }
 
     // echo $_SERVER['PHP_SELF'];
     echo "<div class='sidebar'><p>";
@@ -183,10 +190,11 @@ 
               <a href='overview_user.php'>" . _("Go to your Profile page") . "</a> 
               <a href='inc/logout.php'>" . _("Logout") . "</a> ";
     }
-    if (strpos($_SERVER['PHP_SELF'], "admin/") === FALSE)
-        echo "<a href='" . dirname($_SERVER['SCRIPT_NAME']) . "/'>" . _("Start page") . "</a>";
-    else
-        echo "<a href='../'>" . _("Start page") . "</a>";
+    if (strpos($_SERVER['PHP_SELF'], "admin/") === FALSE) {
+            echo "<a href='" . dirname($_SERVER['SCRIPT_NAME']) . "/'>" . _("Start page") . "</a>";
+    } else {
+            echo "<a href='../'>" . _("Start page") . "</a>";
+    }
     echo "</p>
 </div> <!-- sidebar --></div><!--secondrow-->";
 }

web/basic.php

Braces +77 added lines, -54 removed lines

@@ -49,8 +49,9 @@ 
 */
 
 
-    if(isset($_REQUEST['reset_dev']) && $_REQUEST['reset_dev'] == 1)
-      unset($_REQUEST['device']);
+    if(isset($_REQUEST['reset_dev']) && $_REQUEST['reset_dev'] == 1) {
+          unset($_REQUEST['device']);
+    }
 
 /* Start with checking if we have the country code if not then use geolocation..
 */
@@ -66,8 +67,9 @@ 
          $c='NONE';
        }
     }
-    if(!in_array($c,$F))
-      $c= array_shift($F);
+    if(!in_array($c,$F)) {
+          $c= array_shift($F);
+    }
     $this->Country = new Federation($c);
     $this->Args['country'] = $this->Country->identifier;
     $this->page =  1;
@@ -82,8 +84,7 @@ 
        $this->page =  2;
        try {
          $this->Idp = new IdP($_REQUEST['idp']);
-       }
-       catch (Exception $fail) {
+       } catch (Exception $fail) {
          $this->page =  1;
          $this->set_locale("web_user");
          return;
@@ -104,8 +105,7 @@ 
        $this->page =  3;
        try {
          $this->Profile = new Profile($_REQUEST['profile']);
-       }
-       catch (Exception $fail) {
+       } catch (Exception $fail) {
          $this->page =  2;
          $this->set_locale("web_user");
          return;
@@ -134,8 +134,9 @@ 
    $out .= '<select name="country" onchange="submit_form(this)">'."\n";
    foreach ($FED as $f => $F) {
      $out .= '<option value="'.$f.'"';
-     if($f === $this->Country->identifier)
-         $out .= ' selected';
+     if($f === $this->Country->identifier) {
+              $out .= ' selected';
+     }
      $out .= '>'.$F.'</option>'."\n";
    }
    $out .= '</select>';
@@ -144,16 +145,18 @@ 
 
 public function listIdPs() {
    $Inst = $this->orderIdentityProviders($this->Country->identifier);
-   if(! isset($this->Idp))
-     $this->Idp = new Idp ($Inst[0]['idp']);
+   if(! isset($this->Idp)) {
+        $this->Idp = new Idp ($Inst[0]['idp']);
+   }
    $i_id = $this->Idp->identifier;
    $out = '';
    $out .= _("Select your institution");
    $out .= '<select name="idp" onchange="submit_form(this)">';
    foreach ($Inst as $I) {
       $out .= '<option value="'.$I['idp'].'"';
-      if($I['idp'] == $i_id)
-         $out .= ' selected';
+      if($I['idp'] == $i_id) {
+               $out .= ' selected';
+      }
       $out .= '>'.$I['title'].'</option>';
    }
    $out .= '</select>'; 
@@ -162,8 +165,9 @@ 
 
 public function listProfiles() {
    $Prof = $this->Idp->listProfiles(1);
-   if(! isset($this->Profile))
-     $this->Profile = $Prof[0];
+   if(! isset($this->Profile)) {
+        $this->Profile = $Prof[0];
+   }
    $p_id = $this->Profile->identifier;
    $this->Args['profile'] = $p_id;
    $out = '';
@@ -172,8 +176,9 @@ 
      $out .= '<select name="profile" onchange="submit_form(this)">';
      foreach ($Prof as $P) {
        $out .= '<option value="'.$P->identifier.'"';
-       if($P->identifier == $p_id)
-         $out .= ' selected';
+       if($P->identifier == $p_id) {
+                $out .= ' selected';
+       }
        $out .= '>'.$P->name.'</option>';
      }
      $out .= '</select>';
@@ -186,8 +191,9 @@ 
 
 
 public function listDevices() {
-   if(! isset($this->Profile))
-      return '';
+   if(! isset($this->Profile)) {
+         return '';
+   }
    $OS = $this->detectOS();
    $os = $OS['device'];
    $this->Args['device'] = $os;
@@ -200,16 +206,19 @@ 
    $a = $this->profileAttributes($this->Profile->identifier);
    $thedevices = $a['devices'];
    $message = '';
-   if(! $os)
-     $message = $unsupported_message;
+   if(! $os) {
+        $message = $unsupported_message;
+   }
    $out = _("Choose an installer to download").'<br>';
    $out .= '<select name="device" onchange="set_device(this)">';
    $i= 0;
    foreach ($thedevices as $D) {
-      if((isset($D['options']) && isset($D['options']['hidden']) &&  $D['options']['hidden']) || $D['status'] )
-         continue; 
-      if(! $os)
-         $os = $D['id'];
+      if((isset($D['options']) && isset($D['options']['hidden']) &&  $D['options']['hidden']) || $D['status'] ) {
+               continue;
+      }
+      if(! $os) {
+               $os = $D['id'];
+      }
       $disp = $D['display'];
       if($D['id'] === '0') {
         $profile_redirect = 1;
@@ -228,11 +237,13 @@ 
       $i++;
    }
    $out .= '</select>';
-   if( $selected_os == 0)
-      $message = $unsupported_message;
+   if( $selected_os == 0) {
+         $message = $unsupported_message;
+   }
    $out = $message . $out;
-   if($profile_redirect)
-      $out = '';
+   if($profile_redirect) {
+         $out = '';
+   }
    if($redirect_target) {
       $device_redirects .= 'is_redirected = 1;';
       $out .= _("Your local administrator has specified a redirect to a local support page.").'<br>'. _("When you click <b>CONTINUE</b> this support page will be opened.");
@@ -253,14 +264,18 @@ 
    $thedevices = $a['devices'];
    $this->set_locale("web_user");
    $out = '';
-   if(isset($a['description']) && $a['description'])
-     print '<div>'.$a['description'] . '</div>';
-   if (isset($a['local_email']) && $a['local_email'])
-     $out .= '<p>Email: <a href="mailto:' . $a['local_email'] . '">' . $a['local_email'] . '</a>';
-   if (isset($a['local_url']) && $a['local_url'])
-     $out .= '<p>WWW: <a href="' . $a['local_url'] . '">' . $a['local_url'] . '</a>';
-   if (isset($a['local_phone']) && $a['local_phone'])
-     $out .= '<p>Tel: <a href="' . $a['local_phone'] . '">' . $a['local_phone'] . '</a>';
+   if(isset($a['description']) && $a['description']) {
+        print '<div>'.$a['description'] . '</div>';
+   }
+   if (isset($a['local_email']) && $a['local_email']) {
+        $out .= '<p>Email: <a href="mailto:' . $a['local_email'] . '">' . $a['local_email'] . '</a>';
+   }
+   if (isset($a['local_url']) && $a['local_url']) {
+        $out .= '<p>WWW: <a href="' . $a['local_url'] . '">' . $a['local_url'] . '</a>';
+   }
+   if (isset($a['local_phone']) && $a['local_phone']) {
+        $out .= '<p>Tel: <a href="' . $a['local_phone'] . '">' . $a['local_phone'] . '</a>';
+   }
    if( $out !== '') {
      print '<div class="user_info">';
      print _("If you encounter problems you should ask for help at your home institution");
@@ -269,16 +284,18 @@ 
    }
                    
    foreach ($thedevices as $D) {
-      if(isset($D['options']) && isset($D['options']['hidden']) &&  $D['options']['hidden'])
-          continue; 
+      if(isset($D['options']) && isset($D['options']['hidden']) &&  $D['options']['hidden']) {
+                continue;
+      }
       $disp = $D['display'];
       if($D['id'] === '0') {
           print _("Your local administrator has specified a redirect to a local support page.").' '. _("Click on the link below to continue.");
           print '<div style="width:100%; text-align:center"><a href ="'.$D['redirect'].'">'.$D['redirect'].'</a></div>';
           exit;
       }
-      if($D['id'] === $this->Args['device']) 
-          break;
+      if($D['id'] === $this->Args['device']) {
+                break;
+      }
    }
    $this->set_locale("web_user");
 
@@ -288,20 +305,24 @@ 
       return;
    }
    $extra_text = '';
-   if(isset($D['message']) && $D['message']) 
-      $extra_text = $D['message']; 
+   if(isset($D['message']) && $D['message']) {
+         $extra_text = $D['message'];
+   }
    if(isset($D['device_customtext']) && $D['device_customtext']) {
-      if($extra_text)
-           $extra_text .= '<p>';
+      if($extra_text) {
+                 $extra_text .= '<p>';
+      }
       $extra_text = $D['device_customtext']; 
     }
    if(isset($D['eap_customtext']) && $D['eap_customtext']) {
-      if($extra_text)
-          $extra_text .= '<p>';
+      if($extra_text) {
+                $extra_text .= '<p>';
+      }
       $extra_text .= $D['eap_customtext']; 
     }
-   if($extra_text)
-      $extra_text .= '<p>';
+   if($extra_text) {
+         $extra_text .= '<p>';
+   }
       print $extra_text;
 
       $download_link = 'user/API.php?action=downloadInstaller&api_version=2&generatedfor=user&lang='.CAT::get_lang().'&device='.$o['device'].'&profile='.$o['profile'];
@@ -322,8 +343,9 @@ 
    $out .= '<select onchange="submit_form(this)" name="lang">';
    foreach (Config::$LANGUAGES as $lng => $value) {
        $out .= '<option value="'.$lng.'"';
-       if ($lng === CAT::get_lang())
-          $out .= ' selected';
+       if ($lng === CAT::get_lang()) {
+                 $out .= ' selected';
+       }
        $out .= '>'. $value['display'] . '</option>';
    }
    $out .= '</select>';
@@ -423,8 +445,9 @@ 
         if(! isset($_REQUEST['devices_h']) || $_REQUEST['devices_h'] == 0 || isset($_REQUEST['start_over'])) {
         print "<p>\n";
           print $Gui->listCountries();
-          if($Gui->page == 2 && ! isset($FED[strtoupper($Gui->Country->identifier)]))
-             $Gui->page = 1;
+          if($Gui->page == 2 && ! isset($FED[strtoupper($Gui->Country->identifier)])) {
+                       $Gui->page = 1;
+          }
           print "<p>".$Gui->listIdPs();
           print "<p>".$Gui->listProfiles();
           print "<p>".$Gui->listDevices();