GEANT / CAT

web/user/cat_back.php

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;

web/user/faq.php

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

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

web/index.php

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

web/download.php

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

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

web/404.php

Spacing +4 added lines, -4 removed lines

@@ -26,8 +26,8 @@ 
 <body>
     <div id="heading">
         <?php
-        print '<img src="'. dirname($_SERVER['SCRIPT_NAME']) .'/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 '<img src="' . dirname($_SERVER['SCRIPT_NAME']) . '/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 '<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>';
@@ -41,8 +41,8 @@ 
         ?>
     </div> <!-- id="heading" -->
     <div id="main_body" style='padding:20px;'>
-        <h1><?php echo _("This is not the CAT you are looking for.");?></h1>
-        <p><?php echo _("Whatever you expected to see at this URL - it's not here. The only thing here is the number");?></p>
+        <h1><?php echo _("This is not the CAT you are looking for."); ?></h1>
+        <p><?php echo _("Whatever you expected to see at this URL - it's not here. The only thing here is the number"); ?></p>
         <h2>404</h2>
         <p><?php echo sprintf(_("staring at you. Your mistake? Our error? Who knows! Maybe you should go back to the <a href='%s'>Start Page</a>."), dirname($_SERVER['SCRIPT_NAME']) . '?lang=' . CAT::get_lang())?></p>
     </div> <!-- id="main_body" -->

web/4013.php

Spacing +4 added lines, -4 removed lines

@@ -26,8 +26,8 @@ 
 <body>
     <div id="heading">
         <?php
-        print '<img src="'. dirname($_SERVER['SCRIPT_NAME']) .'/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 '<img src="' . dirname($_SERVER['SCRIPT_NAME']) . '/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 '<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>';
@@ -41,8 +41,8 @@ 
         ?>
     </div> <!-- id="heading" -->
     <div id="main_body" style='padding:20px;'>
-        <h1><?php echo _("Maybe this is the CAT you are looking for...");?></h1>
-        <p><?php echo _("but we don't want to show it to you. You need to be authenticated and authorised to see this content. Since you are not, you got this error page usually known as");?></p>
+        <h1><?php echo _("Maybe this is the CAT you are looking for..."); ?></h1>
+        <p><?php echo _("but we don't want to show it to you. You need to be authenticated and authorised to see this content. Since you are not, you got this error page usually known as"); ?></p>
         <h2>401/403</h2>
         <p><?php echo sprintf(_("Your mistake? Our error? Who knows! Maybe you should go back to the <a href='%s'>Start Page</a>."), dirname($_SERVER['SCRIPT_NAME']) . '?lang=' . CAT::get_lang())?></p>
     </div> <!-- id="main_body" -->

web/resources/css/cat.css.php

Spacing +21 added lines, -21 removed lines

@@ -9,7 +9,7 @@ 
 }
 
 body {
-    background: <?php echo $colour1;?>;
+    background: <?php echo $colour1; ?>;
     font-family:Verdana, Arial, Helvetica, sans-serif;
     font-size:11px;
     height: 100%;
@@ -23,7 +23,7 @@ 
 }
 
 button {
-    background: <?php echo $colour2;?>; 
+    background: <?php echo $colour2; ?>; 
     color: #FFFFFF; 
     min-height: 23px;
     border-left-style: outset; 
@@ -205,9 +205,9 @@ 
     border-bottom-style:solid;
     border-top-width:5px; 
     border-bottom-width:5px; 
-    border-color: <?php echo $colour1;?>;
+    border-color: <?php echo $colour1; ?>;
     padding-left:30px;
-    color: <?php echo $colour2;?>;
+    color: <?php echo $colour2; ?>;
 }
 
 div.pagecontent {
@@ -400,7 +400,7 @@ 
 
 span.edu_cat {
     font-weight: bold;
-    color: <?php echo $colour2;?>;
+    color: <?php echo $colour2; ?>;
 }
 
 span.tooltip {
@@ -513,7 +513,7 @@ 
     border-bottom-style:solid;
     border-top-width:5px; 
     border-bottom-width:5px; 
-    border-color: <?php echo $colour1;?>; 
+    border-color: <?php echo $colour1; ?>; 
     padding-left:30px;
 }
 
@@ -567,7 +567,7 @@ 
 }
 
 span.redirect_link {
-    background: <?php echo $colour2;?>; color: #FFFFFF; height: 23px;
+    background: <?php echo $colour2; ?>; color: #FFFFFF; height: 23px;
     border-left-style: inset; border-left-width: 1px; border-left-color: #8bbacb;
     border-top-style: inset; border-top-width: 1px; border-top-color: #8bbacb;
     border-right-style: outset; border-right-width: 2px; border-right-color: #043d52;
@@ -614,7 +614,7 @@ 
 }
 
 #close_button {
-    background: <?php echo $colour2;?>; 
+    background: <?php echo $colour2; ?>; 
     color: #FFFFFF; 
     height: 23px;
     border-left-style: inset; 
@@ -695,7 +695,7 @@ 
     width: 30em; 
     padding-left: 10px; 
     padding-right: 0px; 
-    background: <?php echo $colour2;?>; 
+    background: <?php echo $colour2; ?>; 
     color: white; 
     box-shadow: 10px 10px 5px #888888;
 }
@@ -704,7 +704,7 @@ 
     width: 30em; 
     padding-left: 10px; 
     padding-right: 00px; 
-    background: <?php echo $colour2;?>; 
+    background: <?php echo $colour2; ?>; 
     color: #FFFFFF; 
     box-shadow: 10px 10px 5px #888888;
 }
@@ -759,7 +759,7 @@ 
     padding-top: 4px; 
     padding-bottom: 12px; 
     padding-left: 30px; 
-    background: <?php echo $colour1;?>; 
+    background: <?php echo $colour1; ?>; 
     text-align: left; 
     text-shadow: 10px 10px 5px #888888;
 }
@@ -769,9 +769,9 @@ 
     border-bottom-style:solid;
     border-top-width:5px;
     border-bottom-width:5px;
-    border-color: <?php echo $colour1;?>;
+    border-color: <?php echo $colour1; ?>;
     padding-left:30px;
-    color: <?php echo $colour2;?>;
+    color: <?php echo $colour2; ?>;
 }
 
 #heading h1 { 
@@ -790,7 +790,7 @@ 
     text-align: justify;
     border-bottom-style:solid;
     border-bottom-width:5px;
-    border-color: <?php echo $colour1;?>;
+    border-color: <?php echo $colour1; ?>;
     font-size: 11px;
     font-weight: normal;
 }
@@ -838,7 +838,7 @@ 
 
 #faq {
     padding: 20px;
-    color: <?php echo $colour2;?>;
+    color: <?php echo $colour2; ?>;
     background: #ffffff;
 }
 
@@ -891,7 +891,7 @@ 
 
 #line1 {
     top:145px;
-    color: <?php echo $colour2;?>;
+    color: <?php echo $colour2; ?>;
     font-size:20px;
 }
 
@@ -946,7 +946,7 @@ 
 
 #menu_column {
     border-right:solid;
-    border-color: <?php echo $colour1;?>;
+    border-color: <?php echo $colour1; ?>;
     border-width:5px;
     min-height:400px;
     padding-left: 10px;
@@ -957,7 +957,7 @@ 
 
 #front_page_leftmenu {
     border-right:solid; 
-    border-color: <?php echo $colour1;?>; 
+    border-color: <?php echo $colour1; ?>; 
     border-width:5px; 
     min-height:400px; 
     padding-left: 10px; 
@@ -986,11 +986,11 @@ 
 }
 
 a:link {
-    color:<?php echo $colour2;?>;
+    color:<?php echo $colour2; ?>;
 }
 
 a:visited {
-    color:<?php echo $colour2;?>;
+    color:<?php echo $colour2; ?>;
 }
 
 a:hover {
@@ -998,7 +998,7 @@ 
 }
 
 a:active {
-    color:<?php echo $colour2;?>;
+    color:<?php echo $colour2; ?>;
 }
 
 .comment {