GEANT / CAT

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/user/faq.php

Indentation +21 added lines, -21 removed lines

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

web/user/API.php

Indentation +9 added lines, -9 removed lines

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

web/index.php

Indentation +31 added lines, -31 removed lines

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

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

Indentation +5 added lines, -5 removed lines

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

web/basic.php

Indentation +268 added lines, -268 removed lines

@@ -23,23 +23,23 @@ 
 debug(4,$_POST);
 
 /**
-  * SimpleGUI defines extensions of the GUI class used only in the simple interface
-  * this class does not define its own constructor.
-  */
+ * SimpleGUI defines extensions of the GUI class used only in the simple interface
+ * this class does not define its own constructor.
+ */
 class SimpleGUI extends UserAPI {
 
 /**
-  *  create the SimpleGUI object calling CAT constructor first
-  *
-  *  sets up all public prperties of the object
-  */
+ *  create the SimpleGUI object calling CAT constructor first
+ *
+ *  sets up all public prperties of the object
+ */
 public function __construct() {
-  parent::__construct();
-  $this->Args = [];
-  $this->page =  0;
-  $this->set_locale('core');
-  $this->version = 2;
-  $this->Args['lang'] = CAT::get_lang();
+    parent::__construct();
+    $this->Args = [];
+    $this->page =  0;
+    $this->set_locale('core');
+    $this->version = 2;
+    $this->Args['lang'] = CAT::get_lang();
 //print "<pre>"; print_r($_REQUEST); print "</pre>";
 
 /*
@@ -50,24 +50,24 @@ 
 
 
     if(isset($_REQUEST['reset_dev']) && $_REQUEST['reset_dev'] == 1)
-      unset($_REQUEST['device']);
+        unset($_REQUEST['device']);
 
 /* Start with checking if we have the country code if not then use geolocation..
 */
     $F = array_keys($this->printCountryList(1));
     if(isset($_REQUEST['country']) && $_REQUEST['country']) {
-       $c = strtoupper($_REQUEST['country']);
+        $c = strtoupper($_REQUEST['country']);
     } else {
-       $L = $this->locateUser();
-       if( $L['status'] == 'ok' ) {
-         $c = strtoupper($L['country']);
-       } else {
-         debug(2, "No coutry provided and unable to locate the address\n");
-         $c='NONE';
-       }
+        $L = $this->locateUser();
+        if( $L['status'] == 'ok' ) {
+            $c = strtoupper($L['country']);
+        } else {
+            debug(2, "No coutry provided and unable to locate the address\n");
+            $c='NONE';
+        }
     }
     if(!in_array($c,$F))
-      $c= array_shift($F);
+        $c= array_shift($F);
     $this->Country = new Federation($c);
     $this->Args['country'] = $this->Country->identifier;
     $this->page =  1;
@@ -79,287 +79,287 @@ 
 // and they do not match then drop the profile code and just leave the IdP
 
     if(isset($_REQUEST['idp']) && $_REQUEST['idp']) {
-       $this->page =  2;
-       try {
-         $this->Idp = new IdP($_REQUEST['idp']);
-       }
-       catch (Exception $fail) {
-         $this->page =  1;
-         $this->set_locale("web_user");
-         return;
-       }
-       $country_tmp = new Federation($this->Idp->federation);
-       if(strtoupper($this->Country->identifier) !== strtoupper($country_tmp->identifier)) {
-         unset($this->Idp);
-         $this->page = 1;
-         $this->set_locale("web_user");
-         return;
-       } 
-       $this->Args['idp'] = $_REQUEST['idp'];
-       $this->profile_count = $this->Idp->profileCount();
-       if(!isset($_REQUEST['profile'])) {
-         $this->set_locale("web_user");
-         return;
-       }
-       $this->page =  3;
-       try {
-         $this->Profile = new Profile($_REQUEST['profile']);
-       }
-       catch (Exception $fail) {
-         $this->page =  2;
-         $this->set_locale("web_user");
-         return;
-       }
-       if($this->Profile->institution != $this->Idp->identifier)  {
-          unset($this->Profile);
-          $this->page = 2;
-          $this->set_locale("web_user");
-          return;
-       }
-       $this->Args['profile'] = $_REQUEST['profile'];
-       if(isset($_REQUEST['device'])) {
-             $this->Args['device'] = $_REQUEST['device'];
-       }
+        $this->page =  2;
+        try {
+            $this->Idp = new IdP($_REQUEST['idp']);
+        }
+        catch (Exception $fail) {
+            $this->page =  1;
+            $this->set_locale("web_user");
+            return;
+        }
+        $country_tmp = new Federation($this->Idp->federation);
+        if(strtoupper($this->Country->identifier) !== strtoupper($country_tmp->identifier)) {
+            unset($this->Idp);
+            $this->page = 1;
+            $this->set_locale("web_user");
+            return;
+        } 
+        $this->Args['idp'] = $_REQUEST['idp'];
+        $this->profile_count = $this->Idp->profileCount();
+        if(!isset($_REQUEST['profile'])) {
+            $this->set_locale("web_user");
+            return;
+        }
+        $this->page =  3;
+        try {
+            $this->Profile = new Profile($_REQUEST['profile']);
+        }
+        catch (Exception $fail) {
+            $this->page =  2;
+            $this->set_locale("web_user");
+            return;
+        }
+        if($this->Profile->institution != $this->Idp->identifier)  {
+            unset($this->Profile);
+            $this->page = 2;
+            $this->set_locale("web_user");
+            return;
+        }
+        $this->Args['profile'] = $_REQUEST['profile'];
+        if(isset($_REQUEST['device'])) {
+                $this->Args['device'] = $_REQUEST['device'];
+        }
 
     }
 //print "<pre>"; print_r($_REQUEST); print "</pre>";
-   $this->set_locale("web_user");
+    $this->set_locale("web_user");
 }
 
 // print coutry selection
 public function listCountries() {
-   $out = '';
-   $FED = $this->printCountryList(1);
-   $out .= _('Select your country').'<br>';
-   $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';
-     $out .= '>'.$F.'</option>'."\n";
-   }
-   $out .= '</select>';
-   return $out;
+    $out = '';
+    $FED = $this->printCountryList(1);
+    $out .= _('Select your country').'<br>';
+    $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';
+        $out .= '>'.$F.'</option>'."\n";
+    }
+    $out .= '</select>';
+    return $out;
 }
 
 public function listIdPs() {
-   $Inst = $this->orderIdentityProviders($this->Country->identifier);
-   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';
-      $out .= '>'.$I['title'].'</option>';
-   }
-   $out .= '</select>'; 
-   return $out;
+    $Inst = $this->orderIdentityProviders($this->Country->identifier);
+    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';
+        $out .= '>'.$I['title'].'</option>';
+    }
+    $out .= '</select>'; 
+    return $out;
 }
 
 public function listProfiles() {
-   $Prof = $this->Idp->listProfiles(1);
-   if(! isset($this->Profile))
-     $this->Profile = $Prof[0];
-   $p_id = $this->Profile->identifier;
-   $this->Args['profile'] = $p_id;
-   $out = '';
-   if (count($Prof) > 1) {
-     $out .=  _("Select the user group").'<br>';
-     $out .= '<select name="profile" onchange="submit_form(this)">';
-     foreach ($Prof as $P) {
-       $out .= '<option value="'.$P->identifier.'"';
-       if($P->identifier == $p_id)
-         $out .= ' selected';
-       $out .= '>'.$P->name.'</option>';
-     }
-     $out .= '</select>';
-   } else {
-     $out .= $this->passArgument('profile');
-   }
-   return $out;
+    $Prof = $this->Idp->listProfiles(1);
+    if(! isset($this->Profile))
+        $this->Profile = $Prof[0];
+    $p_id = $this->Profile->identifier;
+    $this->Args['profile'] = $p_id;
+    $out = '';
+    if (count($Prof) > 1) {
+        $out .=  _("Select the user group").'<br>';
+        $out .= '<select name="profile" onchange="submit_form(this)">';
+        foreach ($Prof as $P) {
+        $out .= '<option value="'.$P->identifier.'"';
+        if($P->identifier == $p_id)
+            $out .= ' selected';
+        $out .= '>'.$P->name.'</option>';
+        }
+        $out .= '</select>';
+    } else {
+        $out .= $this->passArgument('profile');
+    }
+    return $out;
 }
 
 
 
 public function listDevices() {
-   if(! isset($this->Profile))
-      return '';
-   $OS = $this->detectOS();
-   $os = $OS['device'];
-   $this->Args['device'] = $os;
-   $profile_redirect = 0;
-   $redirect_target = '';
-   $device_redirects = '';
-   $selected_os = 0;
-   $unsupported_message = '<div id="unsupported_os">'._("Your operating system was not properly detected, is not supported yet or cannot be configured with settings provided by your institution")."</div><br>";
+    if(! isset($this->Profile))
+        return '';
+    $OS = $this->detectOS();
+    $os = $OS['device'];
+    $this->Args['device'] = $os;
+    $profile_redirect = 0;
+    $redirect_target = '';
+    $device_redirects = '';
+    $selected_os = 0;
+    $unsupported_message = '<div id="unsupported_os">'._("Your operating system was not properly detected, is not supported yet or cannot be configured with settings provided by your institution")."</div><br>";
    
-   $a = $this->profileAttributes($this->Profile->identifier);
-   $thedevices = $a['devices'];
-   $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'];
-      $disp = $D['display'];
-      if($D['id'] === '0') {
+    $a = $this->profileAttributes($this->Profile->identifier);
+    $thedevices = $a['devices'];
+    $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'];
+        $disp = $D['display'];
+        if($D['id'] === '0') {
         $profile_redirect = 1;
         $redirect_target = $D['redirect'];
-      }
-      $out .= '<option value="'.$D['id'].'"';
-      if($D['id'] == $os) {
+        }
+        $out .= '<option value="'.$D['id'].'"';
+        if($D['id'] == $os) {
         $out .= ' selected';
         $selected_os = 1;
         if($D['redirect']) {
-           $redirect_target = $D['redirect'];
+            $redirect_target = $D['redirect'];
+        }
         }
-      }
-      $out .= '>'.$disp.'</option>';
-      $device_redirects .= 'redirects['.$i.'] = '.( $D['redirect'] ? 1 : 0 ).';';
-      $i++;
-   }
-   $out .= '</select>';
-   if( $selected_os == 0)
-      $message = $unsupported_message;
-   $out = $message . $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.");
-      $action = 'window.location.href=\''.$redirect_target.'\'; return(false);';
-   $out .= "<p><button id='devices' name='devices' style='width:100%;' onclick=\"".$action.'">'._("CONTINUE to local support page")."</button>";
-   } else {
-      $device_redirects .= 'is_redirected = 0;';
-      $action = 'submit_form(this)';
-   $out .= "<p><button id='devices' name='devices' style='width:100%;' onclick=\"".$action.'">'._("Do you have an account at this institution?").'<br>'._("If so and if the other settings above are OK then click here to download...")."</button>";
-   }
-   $out .= '<script type="text/javascript">'.$device_redirects.'</script>';
-   return $out;
+        $out .= '>'.$disp.'</option>';
+        $device_redirects .= 'redirects['.$i.'] = '.( $D['redirect'] ? 1 : 0 ).';';
+        $i++;
+    }
+    $out .= '</select>';
+    if( $selected_os == 0)
+        $message = $unsupported_message;
+    $out = $message . $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.");
+        $action = 'window.location.href=\''.$redirect_target.'\'; return(false);';
+    $out .= "<p><button id='devices' name='devices' style='width:100%;' onclick=\"".$action.'">'._("CONTINUE to local support page")."</button>";
+    } else {
+        $device_redirects .= 'is_redirected = 0;';
+        $action = 'submit_form(this)';
+    $out .= "<p><button id='devices' name='devices' style='width:100%;' onclick=\"".$action.'">'._("Do you have an account at this institution?").'<br>'._("If so and if the other settings above are OK then click here to download...")."</button>";
+    }
+    $out .= '<script type="text/javascript">'.$device_redirects.'</script>';
+    return $out;
 }
 
 public function displayDeviceDownload() {
-   $this->set_locale('devices');
-   $a = $this->profileAttributes($this->Profile->identifier);
-   $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( $out !== '') {
-     print '<div class="user_info">';
-     print _("If you encounter problems you should ask for help at your home institution");
-     print $out;
-     print "</div>\n";
-   }
+    $this->set_locale('devices');
+    $a = $this->profileAttributes($this->Profile->identifier);
+    $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( $out !== '') {
+        print '<div class="user_info">';
+        print _("If you encounter problems you should ask for help at your home institution");
+        print $out;
+        print "</div>\n";
+    }
                    
-   foreach ($thedevices as $D) {
-      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;
-   }
-   $this->set_locale("web_user");
-
-   $o = $this->generateInstaller($this->Args['device'], $this->Profile->identifier);
-   if (!$o['link']) {
-      print _("This is embarrassing. Generation of your installer failed. System admins have been notified. We will try to take care of the problem as soon as possible.");
-      return;
-   }
-   $extra_text = '';
-   if(isset($D['message']) && $D['message']) 
-      $extra_text = $D['message']; 
-   if(isset($D['device_customtext']) && $D['device_customtext']) {
-      if($extra_text)
-           $extra_text .= '<p>';
-      $extra_text = $D['device_customtext']; 
+    foreach ($thedevices as $D) {
+        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;
+    }
+    $this->set_locale("web_user");
+
+    $o = $this->generateInstaller($this->Args['device'], $this->Profile->identifier);
+    if (!$o['link']) {
+        print _("This is embarrassing. Generation of your installer failed. System admins have been notified. We will try to take care of the problem as soon as possible.");
+        return;
     }
-   if(isset($D['eap_customtext']) && $D['eap_customtext']) {
-      if($extra_text)
-          $extra_text .= '<p>';
-      $extra_text .= $D['eap_customtext']; 
+    $extra_text = '';
+    if(isset($D['message']) && $D['message']) 
+        $extra_text = $D['message']; 
+    if(isset($D['device_customtext']) && $D['device_customtext']) {
+        if($extra_text)
+            $extra_text .= '<p>';
+        $extra_text = $D['device_customtext']; 
     }
-   if($extra_text)
-      $extra_text .= '<p>';
-      print $extra_text;
+    if(isset($D['eap_customtext']) && $D['eap_customtext']) {
+        if($extra_text)
+            $extra_text .= '<p>';
+        $extra_text .= $D['eap_customtext']; 
+    }
+    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'];
+        $download_link = 'user/API.php?action=downloadInstaller&api_version=2&generatedfor=user&lang='.CAT::get_lang().'&device='.$o['device'].'&profile='.$o['profile'];
 
-      print '<p><button id="download_button" onclick="window.location.href=\'' . rtrim(dirname($_SERVER['SCRIPT_NAME']),'/'). '/' . $download_link . '\'; return(false)"><div>' . _("Download installer for") . '<br><span style="color:yellow; font-weight: bold">' . $D['display']. '</span></div></button>';
+        print '<p><button id="download_button" onclick="window.location.href=\'' . rtrim(dirname($_SERVER['SCRIPT_NAME']),'/'). '/' . $download_link . '\'; return(false)"><div>' . _("Download installer for") . '<br><span style="color:yellow; font-weight: bold">' . $D['display']. '</span></div></button>';
 
-      print '<p><button id="start_over" name="start_over" onclick="submit_form(this)">'._("Start over").'</button>';
-   print $this->passArgument('country');
-   print $this->passArgument('idp');
-   print $this->passArgument('profile');
-   print $this->passArgument('device');
+        print '<p><button id="start_over" name="start_over" onclick="submit_form(this)">'._("Start over").'</button>';
+    print $this->passArgument('country');
+    print $this->passArgument('idp');
+    print $this->passArgument('profile');
+    print $this->passArgument('device');
 }
 
 
 
 public function langSelection() {
-   $out = _("View this page in")." ";
-   $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';
-       $out .= '>'. $value['display'] . '</option>';
-   }
-   $out .= '</select>';
-   return $out;
+    $out = _("View this page in")." ";
+    $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';
+        $out .= '>'. $value['display'] . '</option>';
+    }
+    $out .= '</select>';
+    return $out;
 }
 
 /**
-  * displays the navigation bar showing the current location of the page
-  */
+ * displays the navigation bar showing the current location of the page
+ */
 
 public function yourChoice() {
-  $out = '';
-   $c = strtoupper($this->Country->identifier);
-   $name = isset(Federation::$FederationList[$c]) ? Federation::$FederationList[$c] : $c;
-   $name = preg_replace('/ +/','&nbsp;',$name);
-   $out .= "$name; ";
-   $name = $this->Idp->name;
-   $name = preg_replace('/ +/','&nbsp;',$name);
-   $out .= "$name";
-   if($this->profile_count > 1) {
-     $name = '; '.$this->Profile->name;
-     $name = preg_replace('/ +/','&nbsp;',$name);
-     $out .= "$name";
-   }
-  return $out;
+    $out = '';
+    $c = strtoupper($this->Country->identifier);
+    $name = isset(Federation::$FederationList[$c]) ? Federation::$FederationList[$c] : $c;
+    $name = preg_replace('/ +/','&nbsp;',$name);
+    $out .= "$name; ";
+    $name = $this->Idp->name;
+    $name = preg_replace('/ +/','&nbsp;',$name);
+    $out .= "$name";
+    if($this->profile_count > 1) {
+        $name = '; '.$this->Profile->name;
+        $name = preg_replace('/ +/','&nbsp;',$name);
+        $out .= "$name";
+    }
+    return $out;
 }
 
 /**
-  * returns the navigation link to a given GUI page
-  * @param int $new_page new page number
-  * @param string $text link text
-  * @return string
-  */
+ * returns the navigation link to a given GUI page
+ * @param int $new_page new page number
+ * @param string $text link text
+ * @return string
+ */
 
 public function passArgument($arg_name) {
-   return '<input type="hidden" name="'.$arg_name.'" value="'.$this->Args[$arg_name].'">';
+    return '<input type="hidden" name="'.$arg_name.'" value="'.$this->Args[$arg_name].'">';
 }
 
 public $Country;
@@ -422,24 +422,24 @@ 
         print $Gui->langSelection();
         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;
-          print "<p>".$Gui->listIdPs();
-          print "<p>".$Gui->listProfiles();
-          print "<p>".$Gui->listDevices();
-          print '<input type="hidden" name="devices_h" id="devices_h" value="0">';
+            print $Gui->listCountries();
+            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();
+            print '<input type="hidden" name="devices_h" id="devices_h" value="0">';
 
         } else {
-          if($Gui->page != 3) {
-             print "Arguments missmatch error.";
-             exit;
-          }
+            if($Gui->page != 3) {
+                print "Arguments missmatch error.";
+                exit;
+            }
         print '<div id="user_choice">'.$Gui->yourChoice().'</div><p>';
-          $Gui->displayDeviceDownload();
+            $Gui->displayDeviceDownload();
         print '<input type="hidden" name="devices_h" id="devices_h" value="1">';
         }
-     ?>
+        ?>
       <input type="hidden" name="reset_dev" id="reset_dev" value="0">
         </form>
         <div class='footer'><hr />

core/Federation.php

Indentation +4 added lines, -4 removed lines

@@ -678,10 +678,10 @@
     }
     
         /**
-     * deletes all attributes in this federation except the _file ones, these are reported as array
-     *
-     * @return array list of row id's of file-based attributes which weren't deleted
-     */
+         * deletes all attributes in this federation except the _file ones, these are reported as array
+         *
+         * @return array list of row id's of file-based attributes which weren't deleted
+         */
     public function beginFlushAttributes() {
         DBConnection::exec(Federation::$DB_TYPE, "DELETE FROM federation_option WHERE federation_id = '$this->identifier' AND option_name NOT LIKE '%_file'");
         $exec_q = DBConnection::exec(Federation::$DB_TYPE, "SELECT row FROM federation_option WHERE federation_id = '$this->identifier'");

core/CAT.php

Indentation +3 added lines, -3 removed lines

@@ -191,9 +191,9 @@
      * gets the language setting in CAT
      */
     static public function get_lang() {
-       if(self::$LANG === '')
-         list(self::$LANG, $xx) = self::set_lang();
-       return self::$LANG;
+        if(self::$LANG === '')
+            list(self::$LANG, $xx) = self::set_lang();
+        return self::$LANG;
     }
 
     /**