GEANT / CAT

devices/test_module/TestModule.php

Doc Comments -3 removed lines

@@ -76,9 +76,6 @@
     * It is CRUTCIAL that the constructor sets $this->supportedEapMethods to an array of methods
     * available for the particular device.
     * {@source}
-    * @param string $device a pointer to a device module, which must
-    * be an index of one of the devices defined in the {@link Devices}
-    * array in {@link devices.php}.
     * @final not to be redefined
     */
     final public function __construct() {

Indentation +43 added lines, -43 removed lines

@@ -70,51 +70,51 @@ 
  * @package ModuleWriting
  */
 class Device_TestModule extends DeviceConfig {
-   /**
-    * Constructs a Device object.
-    *
-    * It is CRUTCIAL that the constructor sets $this->supportedEapMethods to an array of methods
-    * available for the particular device.
-    * {@source}
-    * @param string $device a pointer to a device module, which must
-    * be an index of one of the devices defined in the {@link Devices}
-    * array in {@link devices.php}.
-    * @final not to be redefined
-    */
+    /**
+     * Constructs a Device object.
+     *
+     * It is CRUTCIAL that the constructor sets $this->supportedEapMethods to an array of methods
+     * available for the particular device.
+     * {@source}
+     * @param string $device a pointer to a device module, which must
+     * be an index of one of the devices defined in the {@link Devices}
+     * array in {@link devices.php}.
+     * @final not to be redefined
+     */
     final public function __construct() {
-      $this->supportedEapMethods  = EAP::listKnownEAPTypes();
-      debug(4,"This device supports the following EAP methods: ");
-      debug(4,$this->supportedEapMethods);
+        $this->supportedEapMethods  = EAP::listKnownEAPTypes();
+        debug(4,"This device supports the following EAP methods: ");
+        debug(4,$this->supportedEapMethods);
     }
 
-  /**
-   * prepare a zip archive containing files and settings which normally would be used inside the module to produce an installer
-   *
-   * {@source}
-   * @return string installer path name
-   */
-   public function writeInstaller() {
+    /**
+     * prepare a zip archive containing files and settings which normally would be used inside the module to produce an installer
+     *
+     * {@source}
+     * @return string installer path name
+     */
+    public function writeInstaller() {
 debug(4,"Test Module Installer start\n");
-   // create certificate files and save their names in $CA_files arrary
-     $CA_files = $this->saveCertificateFiles('der');
+    // create certificate files and save their names in $CA_files arrary
+        $CA_files = $this->saveCertificateFiles('der');
   
     // copy a fixed file from the module Files directory
-       if(! $this->copyFile('Module.howto'))
-          debug(2, "copying of Module.howto failed\n");
+        if(! $this->copyFile('Module.howto'))
+            debug(2, "copying of Module.howto failed\n");
 
     // copy a fixed file from the module Files directory and saveunde a different name
-       if( ! $this->copyFile('test_file','copied_test_file'))
-          debug(2, "copying of Module.howto to copied_test_file failed\n");
-       $this->dumpAttibutes('profile_attributes');
-       $installer_path =  $this->zipInstaller($this->attributes);
-       return($installer_path);
-   }
+        if( ! $this->copyFile('test_file','copied_test_file'))
+            debug(2, "copying of Module.howto to copied_test_file failed\n");
+        $this->dumpAttibutes('profile_attributes');
+        $installer_path =  $this->zipInstaller($this->attributes);
+        return($installer_path);
+    }
 
-  /**
-    * prepare module desctiption and usage information
-    * {@source}
-    * @return string HTML text to be displayed in the information window
-    */
+    /**
+     * prepare module desctiption and usage information
+     * {@source}
+     * @return string HTML text to be displayed in the information window
+     */
     public function writeDeviceInfo() {
     $ssid_ct=count($this->attributes['internal:SSID']);
     $out = "<p>";
@@ -124,15 +124,15 @@ 
 
 
 /**
-  * zip files and return the archive name
-  *
-  * inline{@source}
-  * return string
-  */
-  private function zipInstaller($attr) {
+ * zip files and return the archive name
+ *
+ * inline{@source}
+ * return string
+ */
+    private function zipInstaller($attr) {
     $e = $this->installerBasename.'.zip';
     $o = system('zip -q '.$e.' *');
     return $e;
-  }
+    }
 
 }

Spacing +10 added lines, -10 removed lines

@@ -82,9 +82,9 @@ 
     * @final not to be redefined
     */
     final public function __construct() {
-      $this->supportedEapMethods  = EAP::listKnownEAPTypes();
-      debug(4,"This device supports the following EAP methods: ");
-      debug(4,$this->supportedEapMethods);
+      $this->supportedEapMethods = EAP::listKnownEAPTypes();
+      debug(4, "This device supports the following EAP methods: ");
+      debug(4, $this->supportedEapMethods);
     }
 
   /**
@@ -94,19 +94,19 @@ 
    * @return string installer path name
    */
    public function writeInstaller() {
-debug(4,"Test Module Installer start\n");
+debug(4, "Test Module Installer start\n");
    // create certificate files and save their names in $CA_files arrary
      $CA_files = $this->saveCertificateFiles('der');
   
     // copy a fixed file from the module Files directory
-       if(! $this->copyFile('Module.howto'))
+       if (!$this->copyFile('Module.howto'))
           debug(2, "copying of Module.howto failed\n");
 
     // copy a fixed file from the module Files directory and saveunde a different name
-       if( ! $this->copyFile('test_file','copied_test_file'))
+       if (!$this->copyFile('test_file', 'copied_test_file'))
           debug(2, "copying of Module.howto to copied_test_file failed\n");
        $this->dumpAttibutes('profile_attributes');
-       $installer_path =  $this->zipInstaller($this->attributes);
+       $installer_path = $this->zipInstaller($this->attributes);
        return($installer_path);
    }
 
@@ -116,7 +116,7 @@ 
     * @return string HTML text to be displayed in the information window
     */
     public function writeDeviceInfo() {
-    $ssid_ct=count($this->attributes['internal:SSID']);
+    $ssid_ct = count($this->attributes['internal:SSID']);
     $out = "<p>";
     $out .= _("This installer is an example only. It produces a zip file containig the IdP certificates, info and logo files (if such have been defined by the IdP administrator) and a dump of all available attributes.");
     return $out;
@@ -130,8 +130,8 @@ 
   * return string
   */
   private function zipInstaller($attr) {
-    $e = $this->installerBasename.'.zip';
-    $o = system('zip -q '.$e.' *');
+    $e = $this->installerBasename . '.zip';
+    $o = system('zip -q ' . $e . ' *');
     return $e;
   }
 

Braces +6 added lines, -4 removed lines

@@ -99,12 +99,14 @@
      $CA_files = $this->saveCertificateFiles('der');
   
     // copy a fixed file from the module Files directory
-       if(! $this->copyFile('Module.howto'))
-          debug(2, "copying of Module.howto failed\n");
+       if(! $this->copyFile('Module.howto')) {
+                 debug(2, "copying of Module.howto failed\n");
+       }
 
     // copy a fixed file from the module Files directory and saveunde a different name
-       if( ! $this->copyFile('test_file','copied_test_file'))
-          debug(2, "copying of Module.howto to copied_test_file failed\n");
+       if( ! $this->copyFile('test_file','copied_test_file')) {
+                 debug(2, "copying of Module.howto to copied_test_file failed\n");
+       }
        $this->dumpAttibutes('profile_attributes');
        $installer_path =  $this->zipInstaller($this->attributes);
        return($installer_path);

devices/xml/XML.inc.php

Doc Comments +12 added lines

@@ -69,11 +69,19 @@ 
   public function areAttributes() {
     return empty($this->attributes)?0:1;
   }
+
+  /**
+   * @param string $attribute
+   */
   public function setAttribute($attribute,$value) {
     if( ! isset($this->attributes))
        $this->attributes = [];
     $this->attributes[$attribute] = $value;
   }
+
+  /**
+   * @param string $property
+   */
   public function setProperty($property,$value) {
     $this->$property = $value;
   }
@@ -255,6 +263,10 @@ 
   }
 }
 
+/**
+ * @param SimpleXMLElement $node
+ * @param EAPIdentityProvider $object
+ */
 function marshalObject($node, $object) {
 
   $name = get_class($object);

Indentation +119 added lines, -119 removed lines

@@ -20,100 +20,100 @@ 
  * base class extended by every element
  */
 class XMLElement {
-  private $attributes;
-  private $value;
+    private $attributes;
+    private $value;
 
-  protected function getObjectVars($obj) {
-  return get_object_vars($obj);
-  }
+    protected function getObjectVars($obj) {
+    return get_object_vars($obj);
+    }
 /**
- *  @var array $AuthMethodElements is used to limit
- *  XML elements present within ServerSideCredentials and
- *  ClientSideCredentials to ones which are relevant
- *  for a given EAP method.
- *  @var array of XLM element names which are allowed
- *  EAP method names are defined in core/EAP.php
- */
-  public static $AuthMethodElements =  [
-     'server' => [
+     *  @var array $AuthMethodElements is used to limit
+     *  XML elements present within ServerSideCredentials and
+     *  ClientSideCredentials to ones which are relevant
+     *  for a given EAP method.
+     *  @var array of XLM element names which are allowed
+     *  EAP method names are defined in core/EAP.php
+     */
+    public static $AuthMethodElements =  [
+        'server' => [
         TLS => ['CA', 'ServerID'],
         FAST => ['CA','ServerID'],
         PEAP => ['CA','ServerID'],
         TTLS => ['CA','ServerID'],
         PWD => [],
-     ],
-     'client' => [
-       TLS => ['UserName','Password','ClientCertificate'], 
-       MSCHAP2 => ['UserName','Password','OuterIdentity'], 
-       GTC => ['UserName','OneTimeToken'], 
-       NE_PAP => ['UserName','Password','OuterIdentity'], 
-     ]
-  ];
+        ],
+        'client' => [
+        TLS => ['UserName','Password','ClientCertificate'], 
+        MSCHAP2 => ['UserName','Password','OuterIdentity'], 
+        GTC => ['UserName','OneTimeToken'], 
+        NE_PAP => ['UserName','Password','OuterIdentity'], 
+        ]
+    ];
 
-  public function __construct() {
+    public function __construct() {
     $this->attributes = [];
     $this->value = [];
-  }
-  public function setAttributes($attributes) {
+    }
+    public function setAttributes($attributes) {
     $this->attributes = $attributes;
-  }
-  public function getAttributes() {
+    }
+    public function getAttributes() {
     return $this->attributes;
-  }
-  public function setValue($value) {
+    }
+    public function setValue($value) {
     $this->value = $value;
-  }
-  public function getValue() {
+    }
+    public function getValue() {
     return $this->value;
-  }
-  public function areAttributes() {
+    }
+    public function areAttributes() {
     return empty($this->attributes)?0:1;
-  }
-  public function setAttribute($attribute,$value) {
+    }
+    public function setAttribute($attribute,$value) {
     if( ! isset($this->attributes))
-       $this->attributes = [];
+        $this->attributes = [];
     $this->attributes[$attribute] = $value;
-  }
-  public function setProperty($property,$value) {
+    }
+    public function setProperty($property,$value) {
     $this->$property = $value;
-  }
-  public function getAll() {
+    }
+    public function getAll() {
     $elems = get_object_vars($this);
     $objvars = [];
     foreach ($elems as $key=>$val) 
-      if ( ($key!='attributes') && ($key!='value') ) 
+        if ( ($key!='attributes') && ($key!='value') ) 
         $objvars[$key] = $val;
     return $objvars;
-  }
+    }
 }
 class EAPIdentityProvider extends XMLElement {
-  protected $ValidUntil; 
-  protected $AuthenticationMethods;
-  protected $ProviderInfo;
-  protected $VendorSpecific;
+    protected $ValidUntil; 
+    protected $AuthenticationMethods;
+    protected $ProviderInfo;
+    protected $VendorSpecific;
 }
 
 class AuthenticationMethods extends XMLElement {
-  protected $AuthenticationMethod;
+    protected $AuthenticationMethod;
 }
 
 class AuthenticationMethod extends XMLElement {
-  protected $EAPMethod;
-  protected $ServerSideCredential;
-  protected $ClientSideCredential;
-  protected $InnerAuthenticationMethod;
+    protected $EAPMethod;
+    protected $ServerSideCredential;
+    protected $ClientSideCredential;
+    protected $InnerAuthenticationMethod;
 }
 
 class EAPMethod extends XMLElement {
-  protected $Type;
-  protected $TypeSpecific;
-  protected $VendorSpecific;
+    protected $Type;
+    protected $TypeSpecific;
+    protected $VendorSpecific;
 }
 
 class NonEAPAuthMethod extends XMLElement {
-  protected $Type;
-  protected $TypeSpecific;
-  protected $VendorSpecific;
+    protected $Type;
+    protected $TypeSpecific;
+    protected $VendorSpecific;
 }
 
 class Type extends XMLElement {
@@ -126,34 +126,34 @@ 
 }
 
 class ServerSideCredential extends XMLElement {
-  protected $CA; // multi
-  protected $ServerID; //multi
-  public function getAll() {
+    protected $CA; // multi
+    protected $ServerID; //multi
+    public function getAll() {
     if(isset(XMLElement::$AuthMethodElements['server'][$this->EAPType]) && XMLElement::$AuthMethodElements['server'][$this->EAPType]) {
     $E = XMLElement::$AuthMethodElements['server'][$this->EAPType];
     $out = get_object_vars($this);
     $OUT = [];
     foreach ($out as $o => $v) {
-       if(in_array($o, $E)) 
-         $OUT[$o] = $v;
+        if(in_array($o, $E)) 
+            $OUT[$o] = $v;
     }
     return($OUT);
-  }
-  }
+    }
+    }
 }
 
 class ServerID extends XMLElement {
 }
 
 class ClientSideCredential extends XMLElement {
-  protected $OuterIdentity;
-  protected $UserName;
-  protected $Password;
-  protected $ClientCertificate;
-  protected $Passphrase;
-  protected $PAC;
-  protected $ProvisionPAC;
-  public function getAll() {
+    protected $OuterIdentity;
+    protected $UserName;
+    protected $Password;
+    protected $ClientCertificate;
+    protected $Passphrase;
+    protected $PAC;
+    protected $ProvisionPAC;
+    public function getAll() {
     if(isset(XMLElement::$AuthMethodElements['client'][$this->EAPType]) && XMLElement::$AuthMethodElements['client'][$this->EAPType]) {
     $E = XMLElement::$AuthMethodElements['client'][$this->EAPType];
     $out = get_object_vars($this);
@@ -161,31 +161,31 @@ 
 debug(4,"EEE:".$this->EAPType.":\n");
 debug(4,$E);
     foreach ($out as $o => $v) {
-       if(in_array($o, $E)) 
-          $OUT[$o] = $v;
+        if(in_array($o, $E)) 
+            $OUT[$o] = $v;
     }
     return($OUT);
     }
-  }
+    }
 }
 class ClientCertificate extends XMLElement {
 }
 class CA extends XMLElement {
 }
 class InnerAuthenticationMethod extends XMLElement {
-  protected $EAPMethod;
-  protected $NonEAPAuthMethod;
-  protected $ServerSideCredential;
-  protected $ClientSideCredential;
+    protected $EAPMethod;
+    protected $NonEAPAuthMethod;
+    protected $ServerSideCredential;
+    protected $ClientSideCredential;
 }
 
 class ProviderInfo extends XMLElement {
-  protected $DisplayName;
-  protected $Description;
-  protected $ProviderLocation;
-  protected $ProviderLogo;
-  protected $TermsOfUse;
-  protected $Helpdesk;
+    protected $DisplayName;
+    protected $Description;
+    protected $ProviderLocation;
+    protected $ProviderLogo;
+    protected $TermsOfUse;
+    protected $Helpdesk;
 }
 
 class DisplayName extends XMLElement {
@@ -195,8 +195,8 @@ 
 }
 
 class ProviderLocation extends XMLElement {
-  protected $Longitude;
-  protected $Latitude;
+    protected $Longitude;
+    protected $Latitude;
 }
 
 class ProviderLogo  extends XMLElement {
@@ -206,9 +206,9 @@ 
 }
 
 class Helpdesk extends XMLElement {
-  protected $EmailAddress;
-  protected $WebAddress;
-  protected $Phone;
+    protected $EmailAddress;
+    protected $WebAddress;
+    protected $Phone;
 }
 
 class EmailAddress extends XMLElement {
@@ -242,61 +242,61 @@ 
 
 */
 function SimpleXMLElement_append($key, $value) {
-  if (trim((string) $value) == '') {
+    if (trim((string) $value) == '') {
     $element = $key->addChild($value->getName());
     foreach ($value->attributes() as $attKey => $attValue) {
-      $element->addAttribute($attKey, $attValue);
+        $element->addAttribute($attKey, $attValue);
     }
     foreach ($value->children() as $child) {
-      SimpleXMLElement_append($element, $child);
+        SimpleXMLElement_append($element, $child);
     }
-  } else {
+    } else {
     $element = $key->addChild($value->getName(), trim((string) $value));
-  }
+    }
 }
 
 function marshalObject($node, $object) {
 
-  $name = get_class($object);
-  $name = preg_replace("/_/", "-", $name);
-  if ($object->getValue()) $val = $object->getValue();
-  else $val = '';
-  $simplexmlelement = '';
-  if ($val instanceof SimpleXMLElement) {
+    $name = get_class($object);
+    $name = preg_replace("/_/", "-", $name);
+    if ($object->getValue()) $val = $object->getValue();
+    else $val = '';
+    $simplexmlelement = '';
+    if ($val instanceof SimpleXMLElement) {
     $simplexmlelement = $val;
     $val = '';
-  }
-  if ($val) { 
+    }
+    if ($val) { 
     if(getType($val) == 'string')
-       $val = preg_replace('/&/','&',$val);
+        $val = preg_replace('/&/','&',$val);
     $node = $node->addChild($name, $val);
-  } 
-  else 
+    } 
+    else 
     $node = $node->addChild($name);
-  if ($object->areAttributes()) {
+    if ($object->areAttributes()) {
     $attrs = $object->getAttributes();
     foreach ($attrs as $attrt=>$attrv)
-      $node->addAttribute($attrt, $attrv);
-  }
-  if ($simplexmlelement == '') {
+        $node->addAttribute($attrt, $attrv);
+    }
+    if ($simplexmlelement == '') {
     $fields = $object->getAll();
     if (!empty($fields)) {
-      foreach ($fields as $name=>$value) {
+        foreach ($fields as $name=>$value) {
         if (getType($value)=='string' || getType($value)=='integer' || getType($value)=='double') {
-          $node->addChild($name, $value);
+            $node->addChild($name, $value);
         } else {
-          if (getType($value)=='array') {
+            if (getType($value)=='array') {
             foreach ($value as $v)
-              if (is_object($v))
+                if (is_object($v))
                 marshalObject($node, $v);
-          } else if (getType($value)=='object')  {
+            } else if (getType($value)=='object')  {
             marshalObject($node, $value);
-          }
+            }
+        }
         }
-      }
     }
-  } else {
+    } else {
     SimpleXMLElement_append($node, $simplexmlelement);
-  }
+    }
 }
 

Spacing +24 added lines, -24 removed lines

@@ -34,19 +34,19 @@ 
  *  @var array of XLM element names which are allowed
  *  EAP method names are defined in core/EAP.php
  */
-  public static $AuthMethodElements =  [
+  public static $AuthMethodElements = [
      'server' => [
         TLS => ['CA', 'ServerID'],
-        FAST => ['CA','ServerID'],
-        PEAP => ['CA','ServerID'],
-        TTLS => ['CA','ServerID'],
+        FAST => ['CA', 'ServerID'],
+        PEAP => ['CA', 'ServerID'],
+        TTLS => ['CA', 'ServerID'],
         PWD => [],
      ],
      'client' => [
-       TLS => ['UserName','Password','ClientCertificate'], 
-       MSCHAP2 => ['UserName','Password','OuterIdentity'], 
-       GTC => ['UserName','OneTimeToken'], 
-       NE_PAP => ['UserName','Password','OuterIdentity'], 
+       TLS => ['UserName', 'Password', 'ClientCertificate'], 
+       MSCHAP2 => ['UserName', 'Password', 'OuterIdentity'], 
+       GTC => ['UserName', 'OneTimeToken'], 
+       NE_PAP => ['UserName', 'Password', 'OuterIdentity'], 
      ]
   ];
 
@@ -67,21 +67,21 @@ 
     return $this->value;
   }
   public function areAttributes() {
-    return empty($this->attributes)?0:1;
+    return empty($this->attributes) ? 0 : 1;
   }
-  public function setAttribute($attribute,$value) {
-    if( ! isset($this->attributes))
+  public function setAttribute($attribute, $value) {
+    if (!isset($this->attributes))
        $this->attributes = [];
     $this->attributes[$attribute] = $value;
   }
-  public function setProperty($property,$value) {
+  public function setProperty($property, $value) {
     $this->$property = $value;
   }
   public function getAll() {
     $elems = get_object_vars($this);
     $objvars = [];
     foreach ($elems as $key=>$val) 
-      if ( ($key!='attributes') && ($key!='value') ) 
+      if (($key != 'attributes') && ($key != 'value')) 
         $objvars[$key] = $val;
     return $objvars;
   }
@@ -129,12 +129,12 @@ 
   protected $CA; // multi
   protected $ServerID; //multi
   public function getAll() {
-    if(isset(XMLElement::$AuthMethodElements['server'][$this->EAPType]) && XMLElement::$AuthMethodElements['server'][$this->EAPType]) {
+    if (isset(XMLElement::$AuthMethodElements['server'][$this->EAPType]) && XMLElement::$AuthMethodElements['server'][$this->EAPType]) {
     $E = XMLElement::$AuthMethodElements['server'][$this->EAPType];
     $out = get_object_vars($this);
     $OUT = [];
     foreach ($out as $o => $v) {
-       if(in_array($o, $E)) 
+       if (in_array($o, $E)) 
          $OUT[$o] = $v;
     }
     return($OUT);
@@ -154,14 +154,14 @@ 
   protected $PAC;
   protected $ProvisionPAC;
   public function getAll() {
-    if(isset(XMLElement::$AuthMethodElements['client'][$this->EAPType]) && XMLElement::$AuthMethodElements['client'][$this->EAPType]) {
+    if (isset(XMLElement::$AuthMethodElements['client'][$this->EAPType]) && XMLElement::$AuthMethodElements['client'][$this->EAPType]) {
     $E = XMLElement::$AuthMethodElements['client'][$this->EAPType];
     $out = get_object_vars($this);
     $OUT = [];
-debug(4,"EEE:".$this->EAPType.":\n");
-debug(4,$E);
+debug(4, "EEE:" . $this->EAPType . ":\n");
+debug(4, $E);
     foreach ($out as $o => $v) {
-       if(in_array($o, $E)) 
+       if (in_array($o, $E)) 
           $OUT[$o] = $v;
     }
     return($OUT);
@@ -267,8 +267,8 @@ 
     $val = '';
   }
   if ($val) { 
-    if(getType($val) == 'string')
-       $val = preg_replace('/&/','&',$val);
+    if (getType($val) == 'string')
+       $val = preg_replace('/&/', '&', $val);
     $node = $node->addChild($name, $val);
   } 
   else 
@@ -282,14 +282,14 @@ 
     $fields = $object->getAll();
     if (!empty($fields)) {
       foreach ($fields as $name=>$value) {
-        if (getType($value)=='string' || getType($value)=='integer' || getType($value)=='double') {
+        if (getType($value) == 'string' || getType($value) == 'integer' || getType($value) == 'double') {
           $node->addChild($name, $value);
         } else {
-          if (getType($value)=='array') {
+          if (getType($value) == 'array') {
             foreach ($value as $v)
               if (is_object($v))
                 marshalObject($node, $v);
-          } else if (getType($value)=='object')  {
+          } else if (getType($value) == 'object') {
             marshalObject($node, $value);
           }
         }

Braces +29 added lines, -19 removed lines

@@ -70,8 +70,9 @@ 
     return empty($this->attributes)?0:1;
   }
   public function setAttribute($attribute,$value) {
-    if( ! isset($this->attributes))
-       $this->attributes = [];
+    if( ! isset($this->attributes)) {
+           $this->attributes = [];
+    }
     $this->attributes[$attribute] = $value;
   }
   public function setProperty($property,$value) {
@@ -80,9 +81,10 @@ 
   public function getAll() {
     $elems = get_object_vars($this);
     $objvars = [];
-    foreach ($elems as $key=>$val) 
-      if ( ($key!='attributes') && ($key!='value') ) 
+    foreach ($elems as $key=>$val) {
+          if ( ($key!='attributes') && ($key!='value') ) 
         $objvars[$key] = $val;
+    }
     return $objvars;
   }
 }
@@ -134,8 +136,9 @@ 
     $out = get_object_vars($this);
     $OUT = [];
     foreach ($out as $o => $v) {
-       if(in_array($o, $E)) 
-         $OUT[$o] = $v;
+       if(in_array($o, $E)) {
+                $OUT[$o] = $v;
+       }
     }
     return($OUT);
   }
@@ -161,8 +164,9 @@ 
 debug(4,"EEE:".$this->EAPType.":\n");
 debug(4,$E);
     foreach ($out as $o => $v) {
-       if(in_array($o, $E)) 
-          $OUT[$o] = $v;
+       if(in_array($o, $E)) {
+                 $OUT[$o] = $v;
+       }
     }
     return($OUT);
     }
@@ -259,24 +263,29 @@ 
 
   $name = get_class($object);
   $name = preg_replace("/_/", "-", $name);
-  if ($object->getValue()) $val = $object->getValue();
-  else $val = '';
+  if ($object->getValue()) {
+      $val = $object->getValue();
+  } else {
+      $val = '';
+  }
   $simplexmlelement = '';
   if ($val instanceof SimpleXMLElement) {
     $simplexmlelement = $val;
     $val = '';
   }
   if ($val) { 
-    if(getType($val) == 'string')
-       $val = preg_replace('/&/','&',$val);
+    if(getType($val) == 'string') {
+           $val = preg_replace('/&/','&',$val);
+    }
     $node = $node->addChild($name, $val);
-  } 
-  else 
-    $node = $node->addChild($name);
+  } else {
+      $node = $node->addChild($name);
+  }
   if ($object->areAttributes()) {
     $attrs = $object->getAttributes();
-    foreach ($attrs as $attrt=>$attrv)
-      $node->addAttribute($attrt, $attrv);
+    foreach ($attrs as $attrt=>$attrv) {
+          $node->addAttribute($attrt, $attrv);
+    }
   }
   if ($simplexmlelement == '') {
     $fields = $object->getAll();
@@ -286,9 +295,10 @@ 
           $node->addChild($name, $value);
         } else {
           if (getType($value)=='array') {
-            foreach ($value as $v)
-              if (is_object($v))
+            foreach ($value as $v) {
+                          if (is_object($v))
                 marshalObject($node, $v);
+            }
           } else if (getType($value)=='object')  {
             marshalObject($node, $value);
           }

devices/xml/XML.php

Doc Comments +3 added lines

@@ -129,6 +129,9 @@
 }
 
 
+/**
+ * @param string $attr_name
+ */
 private function getSimpleMLAttribute($attr_name) {
    if(isset($this->attributes[$attr_name][0]) && $this->attributes[$attr_name][0]) {
       $a = $this->attributes[$attr_name];

Indentation +186 added lines, -186 removed lines

@@ -22,13 +22,13 @@ 
 require_once('XML.inc.php');
 
 /**
-  * This class implements full functionality of the generic XML device
-  * the only fuction of the extenstions of this class is to specify
-  * supported EAP methods.
-  * Instead of specifying supported EAPS an extension can set $all_eaps to true
-  * this will cause the installer to configure all EAP methods supported by 
-  * the current profile and declared by the given device.
-  */
+ * This class implements full functionality of the generic XML device
+ * the only fuction of the extenstions of this class is to specify
+ * supported EAP methods.
+ * Instead of specifying supported EAPS an extension can set $all_eaps to true
+ * this will cause the installer to configure all EAP methods supported by 
+ * the current profile and declared by the given device.
+ */
 abstract class Device_XML extends DeviceConfig {
 
 /**
@@ -62,29 +62,29 @@ 
 //lang attribute
     $authmethods = [];
     if($this->all_eaps) {
-      $EAPs = [];
-      foreach ($attr['all_eaps'] as $eap) {
-         if(in_array($eap, $this->supportedEapMethods))
+        $EAPs = [];
+        foreach ($attr['all_eaps'] as $eap) {
+            if(in_array($eap, $this->supportedEapMethods))
             $EAPs[] = $eap;
-      }
+        }
     } else
-      $EAPs = [ $this->selected_eap];
+        $EAPs = [ $this->selected_eap];
 
     foreach ($EAPs as $eap) {
-       $authmethods[] = $this->getAuthMethod($eap);
+        $authmethods[] = $this->getAuthMethod($eap);
     }
     $authenticationmethods = new AuthenticationMethods();
     $authenticationmethods->setProperty('AuthenticationMethods',$authmethods);
     $eap_idp->setProperty('AuthenticationMethods',$authenticationmethods);
     if(empty($attr['internal:realm'][0])) {
-       $eap_idp->setAttribute('ID','undefined');
-       $eap_idp->setAttribute('namespace','urn:undefined');
+        $eap_idp->setAttribute('ID','undefined');
+        $eap_idp->setAttribute('namespace','urn:undefined');
     } else {
-       $eap_idp->setAttribute('ID',$attr['internal:realm'][0]);
-       $eap_idp->setAttribute('namespace',$NAMESPACE);
+        $eap_idp->setAttribute('ID',$attr['internal:realm'][0]);
+        $eap_idp->setAttribute('namespace',$NAMESPACE);
     }
     if($this->lang_scope === 'single')
-       $eap_idp->setAttribute('lang',$this->lang_index);
+        $eap_idp->setAttribute('lang',$this->lang_index);
     $eap_idp->setAttribute('version','1');
     
 
@@ -105,235 +105,235 @@ 
 }
 
 private $AttributeNames =  [
-   'support:email' => 'EmailAddress',
-   'support:url'   => 'WebAddress',
-   'support:phone' => 'Phone',
-   'profile:description' => 'Description',
-   'support:info_file' => 'TermsOfUse',
-   'general:logo_file' => 'ProviderLogo',
+    'support:email' => 'EmailAddress',
+    'support:url'   => 'WebAddress',
+    'support:phone' => 'Phone',
+    'profile:description' => 'Description',
+    'support:info_file' => 'TermsOfUse',
+    'general:logo_file' => 'ProviderLogo',
 ];
 
 private function getSimpleAttribute($attr_name) {
-   if(isset($this->attributes[$attr_name][0]) && $this->attributes[$attr_name][0]) {
-      $a = $this->attributes[$attr_name];
-      if(! isset($this->AttributeNames[$attr_name])) {
-         debug(4,"Missing class definition for $attr_name\n");
-         return;
-      }
-      $class_name = $this->AttributeNames[$attr_name];
-      $obj = new $class_name();
-      $obj->setValue($a[0]);
-      return($obj);   
-   } else
-     return '';
+    if(isset($this->attributes[$attr_name][0]) && $this->attributes[$attr_name][0]) {
+        $a = $this->attributes[$attr_name];
+        if(! isset($this->AttributeNames[$attr_name])) {
+            debug(4,"Missing class definition for $attr_name\n");
+            return;
+        }
+        $class_name = $this->AttributeNames[$attr_name];
+        $obj = new $class_name();
+        $obj->setValue($a[0]);
+        return($obj);   
+    } else
+        return '';
 }
 
 
 private function getSimpleMLAttribute($attr_name) {
-   if(isset($this->attributes[$attr_name][0]) && $this->attributes[$attr_name][0]) {
-      $a = $this->attributes[$attr_name];
-      if(! isset($this->AttributeNames[$attr_name])) {
-         debug(4,"Missing class definition for $attr_name\n");
-         return;
-      }
-      $class_name = $this->AttributeNames[$attr_name];
-      $objs = [];
-      if($this->lang_scope === 'global') {
-         foreach( $a['langs'] as $l => $v ) {
+    if(isset($this->attributes[$attr_name][0]) && $this->attributes[$attr_name][0]) {
+        $a = $this->attributes[$attr_name];
+        if(! isset($this->AttributeNames[$attr_name])) {
+            debug(4,"Missing class definition for $attr_name\n");
+            return;
+        }
+        $class_name = $this->AttributeNames[$attr_name];
+        $objs = [];
+        if($this->lang_scope === 'global') {
+            foreach( $a['langs'] as $l => $v ) {
             $l = ( $l === 'C' ? 'any' : $l );
             $obj = new $class_name();
             $obj->setValue($v);
             $obj->setAttributes(['lang' => $l]);
             $objs[] = $obj;
-         }
-       } else {
-         $obj = new $class_name();
-         $obj->setValue($a[0]);
-         $objs[] = $obj;
-      }
-
-      return($objs);
-      } else
-     return '';
+            }
+        } else {
+            $obj = new $class_name();
+            $obj->setValue($a[0]);
+            $objs[] = $obj;
+        }
+
+        return($objs);
+        } else
+        return '';
 }
 
 private function getDisplayName() {
-   $attr = $this->attributes;
-   $objs = [];
-   if($this->lang_scope === 'global') {
-      $I = $attr['general:instname']['langs'];
-      if($attr['internal:profile_count'][0] > 1)
+    $attr = $this->attributes;
+    $objs = [];
+    if($this->lang_scope === 'global') {
+        $I = $attr['general:instname']['langs'];
+        if($attr['internal:profile_count'][0] > 1)
         $P = $attr['profile:name']['langs'];
-      foreach( $I as $l => $v ) {
+        foreach( $I as $l => $v ) {
         $l = ( $l === 'C' ? 'any' : $l );
         $displayname = new DisplayName();
         if(isset($P)) {
-          $p = isset($P[$l]) ? $P[$l] : $P['C'];  
-          $v .= ' - '. $p;
+            $p = isset($P[$l]) ? $P[$l] : $P['C'];  
+            $v .= ' - '. $p;
         }
         $displayname->setValue($v);
         $displayname->setAttributes(['lang' => $l]);
         $objs[] = $displayname;
-      }
-   } else {
-   $displayname = new DisplayName();
-   $v = $attr['general:instname'][0];
-   if($attr['internal:profile_count'][0] > 1)
-       $v .= ' - '.$attr['profile:name'][0];
-   $displayname->setValue($v);
-     $objs[] = $displayname;
-   }
-   return $objs;
+        }
+    } else {
+    $displayname = new DisplayName();
+    $v = $attr['general:instname'][0];
+    if($attr['internal:profile_count'][0] > 1)
+        $v .= ' - '.$attr['profile:name'][0];
+    $displayname->setValue($v);
+        $objs[] = $displayname;
+    }
+    return $objs;
 }
 
 private function getProviderLogo() {
-   $attr = $this->attributes;
-   if(isset($attr['general:logo_file'][0])){
-      $logo_string = base64_encode($attr['general:logo_file'][0]);
-      $logo_mime = 'image/'.$attr['internal:logo_file'][0]['mime'];
-      $providerlogo = new ProviderLogo();
-      $providerlogo->setAttributes(['mime'=>$logo_mime, 'encoding'=>'base64']);
-      $providerlogo->setValue($logo_string);
-      return $providerlogo;
-  }
+    $attr = $this->attributes;
+    if(isset($attr['general:logo_file'][0])){
+        $logo_string = base64_encode($attr['general:logo_file'][0]);
+        $logo_mime = 'image/'.$attr['internal:logo_file'][0]['mime'];
+        $providerlogo = new ProviderLogo();
+        $providerlogo->setAttributes(['mime'=>$logo_mime, 'encoding'=>'base64']);
+        $providerlogo->setValue($logo_string);
+        return $providerlogo;
+    }
 }
 
 private function getProviderInfo() {
-   $providerinfo = new ProviderInfo();
-   $providerinfo->setProperty('DisplayName',$this->getDisplayName());
-   $providerinfo->setProperty('Description',$this->getSimpleMLAttribute('profile:description'));
-   $providerinfo->setProperty('ProviderLocation',$this->getProvideLocation());
-   $providerinfo->setProperty('ProviderLogo',$this->getProviderLogo());
-   $providerinfo->setProperty('TermsOfUse',$this->getSimpleMLAttribute('support:info_file'));
-   $providerinfo->setProperty('Helpdesk',$this->getHelpdesk());
-   return $providerinfo;
+    $providerinfo = new ProviderInfo();
+    $providerinfo->setProperty('DisplayName',$this->getDisplayName());
+    $providerinfo->setProperty('Description',$this->getSimpleMLAttribute('profile:description'));
+    $providerinfo->setProperty('ProviderLocation',$this->getProvideLocation());
+    $providerinfo->setProperty('ProviderLogo',$this->getProviderLogo());
+    $providerinfo->setProperty('TermsOfUse',$this->getSimpleMLAttribute('support:info_file'));
+    $providerinfo->setProperty('Helpdesk',$this->getHelpdesk());
+    return $providerinfo;
 }
 
 private function getProvideLocation() {
-   $attr = $this->attributes;
-   if(isset($attr['general:geo_coordinates'])){
-      $at = $attr['general:geo_coordinates'];
-      if (count($at) > 1) {
-          $at1 = [];
-          foreach ($at as $a) {
-               $providerlocation = new ProviderLocation();
-               $b = unserialize($a);
-               $providerlocation->setProperty('Longitude',$b['lon']);
-               $providerlocation->setProperty('Latitude',$b['lat']);
-               $at1[] = $providerlocation;
-          }
-         }
-         else {
-               $providerlocation = new ProviderLocation();
-               $b = unserialize($at[0]);
-               $providerlocation->setProperty('Longitude',$b['lon']);
-               $providerlocation->setProperty('Latitude',$b['lat']);
-               $at1 = $providerlocation;
-         }
-         return$at1;
+    $attr = $this->attributes;
+    if(isset($attr['general:geo_coordinates'])){
+        $at = $attr['general:geo_coordinates'];
+        if (count($at) > 1) {
+            $at1 = [];
+            foreach ($at as $a) {
+                $providerlocation = new ProviderLocation();
+                $b = unserialize($a);
+                $providerlocation->setProperty('Longitude',$b['lon']);
+                $providerlocation->setProperty('Latitude',$b['lat']);
+                $at1[] = $providerlocation;
+            }
+            }
+            else {
+                $providerlocation = new ProviderLocation();
+                $b = unserialize($at[0]);
+                $providerlocation->setProperty('Longitude',$b['lon']);
+                $providerlocation->setProperty('Latitude',$b['lat']);
+                $at1 = $providerlocation;
+            }
+            return$at1;
     }
 }
   
 private function getHelpdesk() {
-   $helpdesk = new Helpdesk();
-   $helpdesk->setProperty('EmailAddress',$this->getSimpleMLAttribute('support:email'));
-   $helpdesk->setProperty('WebAddress',$this->getSimpleMLAttribute('support:url'));
-   $helpdesk->setProperty('Phone',$this->getSimpleMLAttribute('support:phone'));
-   return $helpdesk;  
+    $helpdesk = new Helpdesk();
+    $helpdesk->setProperty('EmailAddress',$this->getSimpleMLAttribute('support:email'));
+    $helpdesk->setProperty('WebAddress',$this->getSimpleMLAttribute('support:url'));
+    $helpdesk->setProperty('Phone',$this->getSimpleMLAttribute('support:phone'));
+    return $helpdesk;  
 }
 
 private function getCompatibleUses() {
-   $SSIDs = $this->attributes['internal:SSID'];
-   $compatibleuses = new CompatibleUses();
-   $ieee80211s = [];
-   foreach ($SSIDs as $ssid => $ciph) {
-      $ieee80211 = new IEEE80211();
-      $ieee80211->setProperty('SSID',$ssid);
-      $ieee80211->setProperty('MinRSNProto', $ciph == 'AES' ? 'CCMP' : 'TKIP');
-      $ieee80211s[] = $ieee80211;
-   }
-   $compatibleuses->setProperty('IEEE80211',$ieee80211s);
+    $SSIDs = $this->attributes['internal:SSID'];
+    $compatibleuses = new CompatibleUses();
+    $ieee80211s = [];
+    foreach ($SSIDs as $ssid => $ciph) {
+        $ieee80211 = new IEEE80211();
+        $ieee80211->setProperty('SSID',$ssid);
+        $ieee80211->setProperty('MinRSNProto', $ciph == 'AES' ? 'CCMP' : 'TKIP');
+        $ieee80211s[] = $ieee80211;
+    }
+    $compatibleuses->setProperty('IEEE80211',$ieee80211s);
 // TODO IEEE8023, ABFAB
-   return($compatibleuses);
+    return($compatibleuses);
 }
 
 private function getAuthenticationMethodParams($eap) {
-   $inner = EAP::innerAuth($eap);
-   $outer_id = $eap["OUTER"];
-
-   if(isset($inner["METHOD"]) && $inner["METHOD"]) {
-      $innerauthmethod = new InnerAuthenticationMethod();
-      $class_name = $inner["EAP"] ? 'EAPMethod' : 'NonEAPAuthMethod';
-      $eapmethod = new $class_name();
-      $eaptype = new  Type();
-      $eaptype->setValue($inner['METHOD']); 
-      $eapmethod->setProperty('Type',$eaptype);
-      $innerauthmethod->setProperty($class_name,$eapmethod);
-      return ['inner_method'=>$innerauthmethod,'methodID'=> $outer_id, 'inner_methodID'=>$inner['METHOD']];
-   } else
-   return ['inner_method'=>0,'methodID'=>$outer_id, 'inner_methodID'=>0];
+    $inner = EAP::innerAuth($eap);
+    $outer_id = $eap["OUTER"];
+
+    if(isset($inner["METHOD"]) && $inner["METHOD"]) {
+        $innerauthmethod = new InnerAuthenticationMethod();
+        $class_name = $inner["EAP"] ? 'EAPMethod' : 'NonEAPAuthMethod';
+        $eapmethod = new $class_name();
+        $eaptype = new  Type();
+        $eaptype->setValue($inner['METHOD']); 
+        $eapmethod->setProperty('Type',$eaptype);
+        $innerauthmethod->setProperty($class_name,$eapmethod);
+        return ['inner_method'=>$innerauthmethod,'methodID'=> $outer_id, 'inner_methodID'=>$inner['METHOD']];
+    } else
+    return ['inner_method'=>0,'methodID'=>$outer_id, 'inner_methodID'=>0];
 }
 
 private function getAuthMethod($eap) {
-   $attr = $this->attributes;
-   $eapParams = $this->getAuthenticationMethodParams($eap);
-   $authmethod = new AuthenticationMethod();
-   $eapmethod = new EAPMethod();
-   $eaptype = new Type();
-   $eaptype->setValue($eapParams['methodID']);
-   $eapmethod->setProperty('Type',$eaptype);
-   if(isset($this->VendorSpecific)) {
-     $vendorspecifics = [];
-     foreach($this->VendorSpecific as $vs) {
+    $attr = $this->attributes;
+    $eapParams = $this->getAuthenticationMethodParams($eap);
+    $authmethod = new AuthenticationMethod();
+    $eapmethod = new EAPMethod();
+    $eaptype = new Type();
+    $eaptype->setValue($eapParams['methodID']);
+    $eapmethod->setProperty('Type',$eaptype);
+    if(isset($this->VendorSpecific)) {
+        $vendorspecifics = [];
+        foreach($this->VendorSpecific as $vs) {
         $vendorspecific = new VendorSpecific();
         $vs['value']->addAttribute('xsi:noNamespaceSchemaLocation',"xxx.xsd");
         $vendorspecific->setValue($vs['value']);
         $vendorspecific->setAttributes(['vendor'=>$vs['vendor']]);
         $vendorspecifics[] = $vendorspecific;
-     }
-     $eapmethod->setProperty('VendorSpecific',$vendorspecifics);
-   }
-   $authmethod->setProperty('EAPMethod',$eapmethod);
+        }
+        $eapmethod->setProperty('VendorSpecific',$vendorspecifics);
+    }
+    $authmethod->setProperty('EAPMethod',$eapmethod);
 
 // ServerSideCredentials
-   $serversidecredential = new ServerSideCredential();
+    $serversidecredential = new ServerSideCredential();
 
 // Certificates and server names
 
-   $CAs = [];
-   $cas = $attr['internal:CAs'][0];
-   foreach ($cas as $ca) {
-      $CA = new CA();
-      $CA->setValue(base64_encode($ca['der']));
-      $CA->setAttributes(['format'=>'X.509', 'encoding'=>'base64']);
-      $CAs[] = $CA;
-   }
-
-   $serverids = [];
-   $servers = $attr['eap:server_name'];
-   foreach ($servers as $server) {
-      $serverid = new ServerID();
-      $serverid->setValue($server);
-      $serverids[] = $serverid; 
-   }
-
-   $serversidecredential->setProperty('EAPType',$eaptype->getValue());
-   $serversidecredential->setProperty('CA',$CAs);
-   $serversidecredential->setProperty('ServerID',$serverids);
-   $authmethod->setProperty('ServerSideCredential',$serversidecredential);
+    $CAs = [];
+    $cas = $attr['internal:CAs'][0];
+    foreach ($cas as $ca) {
+        $CA = new CA();
+        $CA->setValue(base64_encode($ca['der']));
+        $CA->setAttributes(['format'=>'X.509', 'encoding'=>'base64']);
+        $CAs[] = $CA;
+    }
+
+    $serverids = [];
+    $servers = $attr['eap:server_name'];
+    foreach ($servers as $server) {
+        $serverid = new ServerID();
+        $serverid->setValue($server);
+        $serverids[] = $serverid; 
+    }
+
+    $serversidecredential->setProperty('EAPType',$eaptype->getValue());
+    $serversidecredential->setProperty('CA',$CAs);
+    $serversidecredential->setProperty('ServerID',$serverids);
+    $authmethod->setProperty('ServerSideCredential',$serversidecredential);
 
 // ClientSideCredentials
 
-   $clientsidecredential = new ClientSideCredential();
+    $clientsidecredential = new ClientSideCredential();
 
 // OuterIdentity 
-   if($attr['internal:use_anon_outer'] [0])
-      $clientsidecredential->setProperty('OuterIdentity',$attr['internal:anon_local_value'][0].'@'.$attr['internal:realm'][0]);
-   $clientsidecredential->setProperty('EAPType',$eapParams['inner_methodID'] ? $eapParams['inner_methodID'] : $eapParams['methodID']);
-   $authmethod->setProperty('ClientSideCredential',$clientsidecredential);
-   if($eapParams['inner_method'])
-      $authmethod->setProperty('InnerAuthenticationMethod',$eapParams['inner_method']);
-   return $authmethod;
+    if($attr['internal:use_anon_outer'] [0])
+        $clientsidecredential->setProperty('OuterIdentity',$attr['internal:anon_local_value'][0].'@'.$attr['internal:realm'][0]);
+    $clientsidecredential->setProperty('EAPType',$eapParams['inner_methodID'] ? $eapParams['inner_methodID'] : $eapParams['methodID']);
+    $authmethod->setProperty('ClientSideCredential',$clientsidecredential);
+    if($eapParams['inner_method'])
+        $authmethod->setProperty('InnerAuthenticationMethod',$eapParams['inner_method']);
+    return $authmethod;
 }
 
 

Spacing +78 added lines, -78 removed lines

@@ -41,9 +41,9 @@ 
 public $VendorSpecific;
 
 public function writeDeviceInfo() {
-    $ssid_ct=count($this->attributes['internal:SSID']);
+    $ssid_ct = count($this->attributes['internal:SSID']);
     $out = "<p>";
-    $out .= sprintf(_("This is a generic configuration file in the IETF <a href='%s'>EAP Metadata -00</a> XML format."),"https://tools.ietf.org/html/draft-winter-opsawg-eap-metadata-00");
+    $out .= sprintf(_("This is a generic configuration file in the IETF <a href='%s'>EAP Metadata -00</a> XML format."), "https://tools.ietf.org/html/draft-winter-opsawg-eap-metadata-00");
     return $out;
     }
 
@@ -54,38 +54,38 @@ 
     $eap_idp = new EAPIdentityProvider();
 //    $eap_idp->setProperty('ValidUntil',$this->getValidUntil());
 // ProviderInfo->
-    $eap_idp->setProperty('ProviderInfo',$this->getProviderInfo());
+    $eap_idp->setProperty('ProviderInfo', $this->getProviderInfo());
 // TODO    $eap_idp->setProperty('VendorSpecific',$this->getVendorSpecific());
 //AuthenticationMethods
 // TODO
 //ID attribute
 //lang attribute
     $authmethods = [];
-    if($this->all_eaps) {
+    if ($this->all_eaps) {
       $EAPs = [];
       foreach ($attr['all_eaps'] as $eap) {
-         if(in_array($eap, $this->supportedEapMethods))
+         if (in_array($eap, $this->supportedEapMethods))
             $EAPs[] = $eap;
       }
     } else
-      $EAPs = [ $this->selected_eap];
+      $EAPs = [$this->selected_eap];
 
     foreach ($EAPs as $eap) {
        $authmethods[] = $this->getAuthMethod($eap);
     }
     $authenticationmethods = new AuthenticationMethods();
-    $authenticationmethods->setProperty('AuthenticationMethods',$authmethods);
-    $eap_idp->setProperty('AuthenticationMethods',$authenticationmethods);
-    if(empty($attr['internal:realm'][0])) {
-       $eap_idp->setAttribute('ID','undefined');
-       $eap_idp->setAttribute('namespace','urn:undefined');
+    $authenticationmethods->setProperty('AuthenticationMethods', $authmethods);
+    $eap_idp->setProperty('AuthenticationMethods', $authenticationmethods);
+    if (empty($attr['internal:realm'][0])) {
+       $eap_idp->setAttribute('ID', 'undefined');
+       $eap_idp->setAttribute('namespace', 'urn:undefined');
     } else {
-       $eap_idp->setAttribute('ID',$attr['internal:realm'][0]);
-       $eap_idp->setAttribute('namespace',$NAMESPACE);
+       $eap_idp->setAttribute('ID', $attr['internal:realm'][0]);
+       $eap_idp->setAttribute('namespace', $NAMESPACE);
     }
-    if($this->lang_scope === 'single')
-       $eap_idp->setAttribute('lang',$this->lang_index);
-    $eap_idp->setAttribute('version','1');
+    if ($this->lang_scope === 'single')
+       $eap_idp->setAttribute('lang', $this->lang_index);
+    $eap_idp->setAttribute('version', '1');
     
 
 // EAPIdentityProvider end
@@ -95,16 +95,16 @@ 
     $rootname = 'EAPIdentityProviderList';
     $root = new SimpleXMLElement("<?xml version=\"1.0\" encoding=\"utf-8\" ?><{$rootname} xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"eap-metadata.xsd\"></{$rootname}>");
 
-    marshalObject($root,$eap_idp);
+    marshalObject($root, $eap_idp);
     $dom = dom_import_simplexml($root)->ownerDocument;
-    $res = $dom->schemaValidate(CAT::$root .'/devices/xml/eap-metadata.xsd');
-    $f = fopen($this->installerBasename.'.eap-config',"w");
-    fwrite($f,$dom->saveXML());
+    $res = $dom->schemaValidate(CAT::$root . '/devices/xml/eap-metadata.xsd');
+    $f = fopen($this->installerBasename . '.eap-config', "w");
+    fwrite($f, $dom->saveXML());
     fclose($f);
-    return($this->installerBasename.'.eap-config');
+    return($this->installerBasename . '.eap-config');
 }
 
-private $AttributeNames =  [
+private $AttributeNames = [
    'support:email' => 'EmailAddress',
    'support:url'   => 'WebAddress',
    'support:phone' => 'Phone',
@@ -114,10 +114,10 @@ 
 ];
 
 private function getSimpleAttribute($attr_name) {
-   if(isset($this->attributes[$attr_name][0]) && $this->attributes[$attr_name][0]) {
+   if (isset($this->attributes[$attr_name][0]) && $this->attributes[$attr_name][0]) {
       $a = $this->attributes[$attr_name];
-      if(! isset($this->AttributeNames[$attr_name])) {
-         debug(4,"Missing class definition for $attr_name\n");
+      if (!isset($this->AttributeNames[$attr_name])) {
+         debug(4, "Missing class definition for $attr_name\n");
          return;
       }
       $class_name = $this->AttributeNames[$attr_name];
@@ -130,17 +130,17 @@ 
 
 
 private function getSimpleMLAttribute($attr_name) {
-   if(isset($this->attributes[$attr_name][0]) && $this->attributes[$attr_name][0]) {
+   if (isset($this->attributes[$attr_name][0]) && $this->attributes[$attr_name][0]) {
       $a = $this->attributes[$attr_name];
-      if(! isset($this->AttributeNames[$attr_name])) {
-         debug(4,"Missing class definition for $attr_name\n");
+      if (!isset($this->AttributeNames[$attr_name])) {
+         debug(4, "Missing class definition for $attr_name\n");
          return;
       }
       $class_name = $this->AttributeNames[$attr_name];
       $objs = [];
-      if($this->lang_scope === 'global') {
-         foreach( $a['langs'] as $l => $v ) {
-            $l = ( $l === 'C' ? 'any' : $l );
+      if ($this->lang_scope === 'global') {
+         foreach ($a['langs'] as $l => $v) {
+            $l = ($l === 'C' ? 'any' : $l);
             $obj = new $class_name();
             $obj->setValue($v);
             $obj->setAttributes(['lang' => $l]);
@@ -160,16 +160,16 @@ 
 private function getDisplayName() {
    $attr = $this->attributes;
    $objs = [];
-   if($this->lang_scope === 'global') {
+   if ($this->lang_scope === 'global') {
       $I = $attr['general:instname']['langs'];
-      if($attr['internal:profile_count'][0] > 1)
+      if ($attr['internal:profile_count'][0] > 1)
         $P = $attr['profile:name']['langs'];
-      foreach( $I as $l => $v ) {
-        $l = ( $l === 'C' ? 'any' : $l );
+      foreach ($I as $l => $v) {
+        $l = ($l === 'C' ? 'any' : $l);
         $displayname = new DisplayName();
-        if(isset($P)) {
+        if (isset($P)) {
           $p = isset($P[$l]) ? $P[$l] : $P['C'];  
-          $v .= ' - '. $p;
+          $v .= ' - ' . $p;
         }
         $displayname->setValue($v);
         $displayname->setAttributes(['lang' => $l]);
@@ -178,8 +178,8 @@ 
    } else {
    $displayname = new DisplayName();
    $v = $attr['general:instname'][0];
-   if($attr['internal:profile_count'][0] > 1)
-       $v .= ' - '.$attr['profile:name'][0];
+   if ($attr['internal:profile_count'][0] > 1)
+       $v .= ' - ' . $attr['profile:name'][0];
    $displayname->setValue($v);
      $objs[] = $displayname;
    }
@@ -188,9 +188,9 @@ 
 
 private function getProviderLogo() {
    $attr = $this->attributes;
-   if(isset($attr['general:logo_file'][0])){
+   if (isset($attr['general:logo_file'][0])) {
       $logo_string = base64_encode($attr['general:logo_file'][0]);
-      $logo_mime = 'image/'.$attr['internal:logo_file'][0]['mime'];
+      $logo_mime = 'image/' . $attr['internal:logo_file'][0]['mime'];
       $providerlogo = new ProviderLogo();
       $providerlogo->setAttributes(['mime'=>$logo_mime, 'encoding'=>'base64']);
       $providerlogo->setValue($logo_string);
@@ -200,34 +200,34 @@ 
 
 private function getProviderInfo() {
    $providerinfo = new ProviderInfo();
-   $providerinfo->setProperty('DisplayName',$this->getDisplayName());
-   $providerinfo->setProperty('Description',$this->getSimpleMLAttribute('profile:description'));
-   $providerinfo->setProperty('ProviderLocation',$this->getProvideLocation());
-   $providerinfo->setProperty('ProviderLogo',$this->getProviderLogo());
-   $providerinfo->setProperty('TermsOfUse',$this->getSimpleMLAttribute('support:info_file'));
-   $providerinfo->setProperty('Helpdesk',$this->getHelpdesk());
+   $providerinfo->setProperty('DisplayName', $this->getDisplayName());
+   $providerinfo->setProperty('Description', $this->getSimpleMLAttribute('profile:description'));
+   $providerinfo->setProperty('ProviderLocation', $this->getProvideLocation());
+   $providerinfo->setProperty('ProviderLogo', $this->getProviderLogo());
+   $providerinfo->setProperty('TermsOfUse', $this->getSimpleMLAttribute('support:info_file'));
+   $providerinfo->setProperty('Helpdesk', $this->getHelpdesk());
    return $providerinfo;
 }
 
 private function getProvideLocation() {
    $attr = $this->attributes;
-   if(isset($attr['general:geo_coordinates'])){
+   if (isset($attr['general:geo_coordinates'])) {
       $at = $attr['general:geo_coordinates'];
       if (count($at) > 1) {
           $at1 = [];
           foreach ($at as $a) {
                $providerlocation = new ProviderLocation();
                $b = unserialize($a);
-               $providerlocation->setProperty('Longitude',$b['lon']);
-               $providerlocation->setProperty('Latitude',$b['lat']);
+               $providerlocation->setProperty('Longitude', $b['lon']);
+               $providerlocation->setProperty('Latitude', $b['lat']);
                $at1[] = $providerlocation;
           }
          }
          else {
                $providerlocation = new ProviderLocation();
                $b = unserialize($at[0]);
-               $providerlocation->setProperty('Longitude',$b['lon']);
-               $providerlocation->setProperty('Latitude',$b['lat']);
+               $providerlocation->setProperty('Longitude', $b['lon']);
+               $providerlocation->setProperty('Latitude', $b['lat']);
                $at1 = $providerlocation;
          }
          return$at1;
@@ -236,9 +236,9 @@ 
   
 private function getHelpdesk() {
    $helpdesk = new Helpdesk();
-   $helpdesk->setProperty('EmailAddress',$this->getSimpleMLAttribute('support:email'));
-   $helpdesk->setProperty('WebAddress',$this->getSimpleMLAttribute('support:url'));
-   $helpdesk->setProperty('Phone',$this->getSimpleMLAttribute('support:phone'));
+   $helpdesk->setProperty('EmailAddress', $this->getSimpleMLAttribute('support:email'));
+   $helpdesk->setProperty('WebAddress', $this->getSimpleMLAttribute('support:url'));
+   $helpdesk->setProperty('Phone', $this->getSimpleMLAttribute('support:phone'));
    return $helpdesk;  
 }
 
@@ -248,11 +248,11 @@ 
    $ieee80211s = [];
    foreach ($SSIDs as $ssid => $ciph) {
       $ieee80211 = new IEEE80211();
-      $ieee80211->setProperty('SSID',$ssid);
+      $ieee80211->setProperty('SSID', $ssid);
       $ieee80211->setProperty('MinRSNProto', $ciph == 'AES' ? 'CCMP' : 'TKIP');
       $ieee80211s[] = $ieee80211;
    }
-   $compatibleuses->setProperty('IEEE80211',$ieee80211s);
+   $compatibleuses->setProperty('IEEE80211', $ieee80211s);
 // TODO IEEE8023, ABFAB
    return($compatibleuses);
 }
@@ -261,17 +261,17 @@ 
    $inner = EAP::innerAuth($eap);
    $outer_id = $eap["OUTER"];
 
-   if(isset($inner["METHOD"]) && $inner["METHOD"]) {
+   if (isset($inner["METHOD"]) && $inner["METHOD"]) {
       $innerauthmethod = new InnerAuthenticationMethod();
       $class_name = $inner["EAP"] ? 'EAPMethod' : 'NonEAPAuthMethod';
       $eapmethod = new $class_name();
       $eaptype = new  Type();
       $eaptype->setValue($inner['METHOD']); 
-      $eapmethod->setProperty('Type',$eaptype);
-      $innerauthmethod->setProperty($class_name,$eapmethod);
-      return ['inner_method'=>$innerauthmethod,'methodID'=> $outer_id, 'inner_methodID'=>$inner['METHOD']];
+      $eapmethod->setProperty('Type', $eaptype);
+      $innerauthmethod->setProperty($class_name, $eapmethod);
+      return ['inner_method'=>$innerauthmethod, 'methodID'=> $outer_id, 'inner_methodID'=>$inner['METHOD']];
    } else
-   return ['inner_method'=>0,'methodID'=>$outer_id, 'inner_methodID'=>0];
+   return ['inner_method'=>0, 'methodID'=>$outer_id, 'inner_methodID'=>0];
 }
 
 private function getAuthMethod($eap) {
@@ -281,19 +281,19 @@ 
    $eapmethod = new EAPMethod();
    $eaptype = new Type();
    $eaptype->setValue($eapParams['methodID']);
-   $eapmethod->setProperty('Type',$eaptype);
-   if(isset($this->VendorSpecific)) {
+   $eapmethod->setProperty('Type', $eaptype);
+   if (isset($this->VendorSpecific)) {
      $vendorspecifics = [];
-     foreach($this->VendorSpecific as $vs) {
+     foreach ($this->VendorSpecific as $vs) {
         $vendorspecific = new VendorSpecific();
-        $vs['value']->addAttribute('xsi:noNamespaceSchemaLocation',"xxx.xsd");
+        $vs['value']->addAttribute('xsi:noNamespaceSchemaLocation', "xxx.xsd");
         $vendorspecific->setValue($vs['value']);
         $vendorspecific->setAttributes(['vendor'=>$vs['vendor']]);
         $vendorspecifics[] = $vendorspecific;
      }
-     $eapmethod->setProperty('VendorSpecific',$vendorspecifics);
+     $eapmethod->setProperty('VendorSpecific', $vendorspecifics);
    }
-   $authmethod->setProperty('EAPMethod',$eapmethod);
+   $authmethod->setProperty('EAPMethod', $eapmethod);
 
 // ServerSideCredentials
    $serversidecredential = new ServerSideCredential();
@@ -317,22 +317,22 @@ 
       $serverids[] = $serverid; 
    }
 
-   $serversidecredential->setProperty('EAPType',$eaptype->getValue());
-   $serversidecredential->setProperty('CA',$CAs);
-   $serversidecredential->setProperty('ServerID',$serverids);
-   $authmethod->setProperty('ServerSideCredential',$serversidecredential);
+   $serversidecredential->setProperty('EAPType', $eaptype->getValue());
+   $serversidecredential->setProperty('CA', $CAs);
+   $serversidecredential->setProperty('ServerID', $serverids);
+   $authmethod->setProperty('ServerSideCredential', $serversidecredential);
 
 // ClientSideCredentials
 
    $clientsidecredential = new ClientSideCredential();
 
 // OuterIdentity 
-   if($attr['internal:use_anon_outer'] [0])
-      $clientsidecredential->setProperty('OuterIdentity',$attr['internal:anon_local_value'][0].'@'.$attr['internal:realm'][0]);
-   $clientsidecredential->setProperty('EAPType',$eapParams['inner_methodID'] ? $eapParams['inner_methodID'] : $eapParams['methodID']);
-   $authmethod->setProperty('ClientSideCredential',$clientsidecredential);
-   if($eapParams['inner_method'])
-      $authmethod->setProperty('InnerAuthenticationMethod',$eapParams['inner_method']);
+   if ($attr['internal:use_anon_outer'] [0])
+      $clientsidecredential->setProperty('OuterIdentity', $attr['internal:anon_local_value'][0] . '@' . $attr['internal:realm'][0]);
+   $clientsidecredential->setProperty('EAPType', $eapParams['inner_methodID'] ? $eapParams['inner_methodID'] : $eapParams['methodID']);
+   $authmethod->setProperty('ClientSideCredential', $clientsidecredential);
+   if ($eapParams['inner_method'])
+      $authmethod->setProperty('InnerAuthenticationMethod', $eapParams['inner_method']);
    return $authmethod;
 }
 

Braces +34 added lines, -25 removed lines

@@ -64,11 +64,13 @@ 
     if($this->all_eaps) {
       $EAPs = [];
       foreach ($attr['all_eaps'] as $eap) {
-         if(in_array($eap, $this->supportedEapMethods))
-            $EAPs[] = $eap;
+         if(in_array($eap, $this->supportedEapMethods)) {
+                     $EAPs[] = $eap;
+         }
       }
-    } else
-      $EAPs = [ $this->selected_eap];
+    } else {
+          $EAPs = [ $this->selected_eap];
+    }
 
     foreach ($EAPs as $eap) {
        $authmethods[] = $this->getAuthMethod($eap);
@@ -83,8 +85,9 @@ 
        $eap_idp->setAttribute('ID',$attr['internal:realm'][0]);
        $eap_idp->setAttribute('namespace',$NAMESPACE);
     }
-    if($this->lang_scope === 'single')
-       $eap_idp->setAttribute('lang',$this->lang_index);
+    if($this->lang_scope === 'single') {
+           $eap_idp->setAttribute('lang',$this->lang_index);
+    }
     $eap_idp->setAttribute('version','1');
     
 
@@ -124,9 +127,10 @@ 
       $obj = new $class_name();
       $obj->setValue($a[0]);
       return($obj);   
-   } else
-     return '';
-}
+   } else {
+        return '';
+   }
+   }
 
 
 private function getSimpleMLAttribute($attr_name) {
@@ -153,17 +157,19 @@ 
       }
 
       return($objs);
-      } else
-     return '';
-}
+      } else {
+           return '';
+      }
+      }
 
 private function getDisplayName() {
    $attr = $this->attributes;
    $objs = [];
    if($this->lang_scope === 'global') {
       $I = $attr['general:instname']['langs'];
-      if($attr['internal:profile_count'][0] > 1)
-        $P = $attr['profile:name']['langs'];
+      if($attr['internal:profile_count'][0] > 1) {
+              $P = $attr['profile:name']['langs'];
+      }
       foreach( $I as $l => $v ) {
         $l = ( $l === 'C' ? 'any' : $l );
         $displayname = new DisplayName();
@@ -178,8 +184,9 @@ 
    } else {
    $displayname = new DisplayName();
    $v = $attr['general:instname'][0];
-   if($attr['internal:profile_count'][0] > 1)
-       $v .= ' - '.$attr['profile:name'][0];
+   if($attr['internal:profile_count'][0] > 1) {
+          $v .= ' - '.$attr['profile:name'][0];
+   }
    $displayname->setValue($v);
      $objs[] = $displayname;
    }
@@ -222,8 +229,7 @@ 
                $providerlocation->setProperty('Latitude',$b['lat']);
                $at1[] = $providerlocation;
           }
-         }
-         else {
+         } else {
                $providerlocation = new ProviderLocation();
                $b = unserialize($at[0]);
                $providerlocation->setProperty('Longitude',$b['lon']);
@@ -270,9 +276,10 @@ 
       $eapmethod->setProperty('Type',$eaptype);
       $innerauthmethod->setProperty($class_name,$eapmethod);
       return ['inner_method'=>$innerauthmethod,'methodID'=> $outer_id, 'inner_methodID'=>$inner['METHOD']];
-   } else
-   return ['inner_method'=>0,'methodID'=>$outer_id, 'inner_methodID'=>0];
-}
+   } else {
+      return ['inner_method'=>0,'methodID'=>$outer_id, 'inner_methodID'=>0];
+   }
+   }
 
 private function getAuthMethod($eap) {
    $attr = $this->attributes;
@@ -327,12 +334,14 @@ 
    $clientsidecredential = new ClientSideCredential();
 
 // OuterIdentity 
-   if($attr['internal:use_anon_outer'] [0])
-      $clientsidecredential->setProperty('OuterIdentity',$attr['internal:anon_local_value'][0].'@'.$attr['internal:realm'][0]);
+   if($attr['internal:use_anon_outer'] [0]) {
+         $clientsidecredential->setProperty('OuterIdentity',$attr['internal:anon_local_value'][0].'@'.$attr['internal:realm'][0]);
+   }
    $clientsidecredential->setProperty('EAPType',$eapParams['inner_methodID'] ? $eapParams['inner_methodID'] : $eapParams['methodID']);
    $authmethod->setProperty('ClientSideCredential',$clientsidecredential);
-   if($eapParams['inner_method'])
-      $authmethod->setProperty('InnerAuthenticationMethod',$eapParams['inner_method']);
+   if($eapParams['inner_method']) {
+         $authmethod->setProperty('InnerAuthenticationMethod',$eapParams['inner_method']);
+   }
    return $authmethod;
 }
 

web/admin/inc/common.inc.php

Doc Comments +9 added lines

@@ -201,6 +201,9 @@ 
   }
  */
 
+/**
+ * @param false|string $filename
+ */
 function check_upload_sanity($optiontype, $filename) {
 //echo "check_upload_sanity:$optiontype:$filename<br>\n";
 // we check logo_file with ImageMagick
@@ -257,6 +260,9 @@ 
     return FALSE;
 }
 
+/**
+ * @param boolean $checkpublic
+ */
 function getBlobFromDB($ref, $checkpublic) {
 
     $reference = valid_DB_reference($ref);
@@ -294,6 +300,9 @@ 
     return $blob;
 }
 
+/**
+ * @param integer $number
+ */
 function display_size($number) {
     if ($number > 1024 * 1024)
         return round($number / 1024 / 1024, 2) . " MiB";

Spacing +2 added lines, -2 removed lines

@@ -264,7 +264,7 @@ 
 
     $details['name'] = preg_replace('/(.)\/(.)/', "$1<br/>$2", $details['name']);
     $details['name'] = preg_replace('/\//', "", $details['name']);
-    $certstatus = ( $details['root'] == 1 ? "R" : "I");
+    $certstatus = ($details['root'] == 1 ? "R" : "I");
     if ($details['ca'] == 0 && $details['root'] != 1) {
         return "<div class='ca-summary' style='background-color:red'><div style='position:absolute; right: 0px; width:20px; height:20px; background-color:maroon;  border-radius:10px; text-align: center;'><div style='padding-top:3px; font-weight:bold; color:#ffffff;'>S</div></div>" . _("This is a <strong>SERVER</strong> certificate!") . "<br/>" . $details['name'] . "</div>";
     }
@@ -339,7 +339,7 @@ 
                     }
                     break;
                 case "boolean":
-                    $retval .= "<tr><td>" . display_name($option['name']) . "</td><td>$language</td><td><strong>" . ($content == "on" ? _("on") : _("off") ) . "</strong></td></tr>";
+                    $retval .= "<tr><td>" . display_name($option['name']) . "</td><td>$language</td><td><strong>" . ($content == "on" ? _("on") : _("off")) . "</strong></td></tr>";
                     break;
                 default:
                     $retval .= "<tr><td>" . display_name($option['name']) . "</td><td>$language</td><td><strong>$content</strong></td></tr>";

Braces +12 added lines, -8 removed lines

@@ -121,16 +121,20 @@
     ];
 
     $retval = "";
-    if (!$omittabletags)
-        $retval .= "<tr><td>";
+    if (!$omittabletags) {
+            $retval .= "<tr><td>";
+    }
     $caption = $caption !== 0 ? $caption : $UI_messages[$level]['text'];
     $retval .= "<img class='icon' src='" . $UI_messages[$level]['icon'] . "' alt='" . $caption . "' title='" . $caption . "'/>";
-    if (!$omittabletags)
-        $retval .= "</td><td>";
-    if ($text !== 0)
-        $retval .= $text;
-    if (!$omittabletags)
-        $retval .= "</td></tr>";
+    if (!$omittabletags) {
+            $retval .= "</td><td>";
+    }
+    if ($text !== 0) {
+            $retval .= $text;
+    }
+    if (!$omittabletags) {
+            $retval .= "</td></tr>";
+    }
     return $retval;
 }
 

web/admin/inc/input_validation.inc.php

Doc Comments +6 added lines

@@ -164,6 +164,9 @@ 
     return $input;
 }
 
+/**
+ * @return string
+ */
 function valid_coord_serialized($input) {
     if (is_array(unserialize($input))) {
         $tentative = unserialize($input);
@@ -182,6 +185,9 @@ 
     }
 }
 
+/**
+ * @return string
+ */
 function valid_boolean($input) {
     if ($input != "on") {
         echo input_validation_error(_("Unknown state of boolean option!"));

Braces +39 added lines, -26 removed lines

@@ -27,9 +27,10 @@ 
         exit(1);
     }
 
-    foreach ($temp->listFederationAdmins() as $oneowner)
-        if ($oneowner == $owner)
+    foreach ($temp->listFederationAdmins() as $oneowner) {
+            if ($oneowner == $owner)
             return $temp;
+    }
     echo input_validation_error(_("This Federation identifier is not accessible!"));
     exit(1);
 }
@@ -47,9 +48,10 @@ 
     }
 
     if ($owner !== 0) { // check if the authenticated user is allowed to see this institution
-        foreach ($temp->owner() as $oneowner)
-            if ($oneowner['ID'] == $owner)
+        foreach ($temp->owner() as $oneowner) {
+                    if ($oneowner['ID'] == $owner)
                 return $temp;
+        }
         echo input_validation_error(_("This IdP identifier is not accessible!"));
         exit(1);
     }
@@ -77,8 +79,9 @@ 
 
 function valid_Device($input) {
     $devicelist = Devices::listDevices();
-    if (!isset($devicelist[$input]))
-        echo input_validation_error(_("This device does not exist!"));
+    if (!isset($devicelist[$input])) {
+            echo input_validation_error(_("This device does not exist!"));
+    }
     return $input;
 }
 
@@ -89,20 +92,24 @@ 
     $retval = filter_var($retval, FILTER_SANITIZE_STRING, ["flags" => FILTER_FLAG_NO_ENCODE_QUOTES]);
     // unless explicitly wanted, take away intermediate disturbing whitespace
     // a simple "space" is NOT disturbing :-)
-    if ($allow_whitspace === 0)
-        $retval = preg_replace('/(\0|\r|\x0b|\t|\n)/', '', $retval);
-    else // even if we allow whitespace, not pathological ones!
+    if ($allow_whitspace === 0) {
+            $retval = preg_replace('/(\0|\r|\x0b|\t|\n)/', '', $retval);
+    } else {
+        // even if we allow whitespace, not pathological ones!
         $retval = preg_replace('/(\0|\r|\x0b)/', '', $retval);
+    }
 
     return $retval;
 }
 
 function valid_consortium_oi($input) {
     $shallow = valid_string_db($input);
-    if (strlen($shallow) != 6 && strlen($shallow) != 10)
-        return FALSE;
-    if (!preg_match("/^[a-fA-F0-9]+$/", $shallow))
-        return FALSE;
+    if (strlen($shallow) != 6 && strlen($shallow) != 10) {
+            return FALSE;
+    }
+    if (!preg_match("/^[a-fA-F0-9]+$/", $shallow)) {
+            return FALSE;
+    }
     return $shallow;
 }
 
@@ -167,8 +174,9 @@ 
 function valid_coord_serialized($input) {
     if (is_array(unserialize($input))) {
         $tentative = unserialize($input);
-        if (isset($tentative['lon']) && isset($tentative['lat']) && valid_coordinate($tentative['lon']) && valid_coordinate($tentative['lat']))
-            return $input;
+        if (isset($tentative['lon']) && isset($tentative['lat']) && valid_coordinate($tentative['lon']) && valid_coordinate($tentative['lat'])) {
+                    return $input;
+        }
     } else {
         echo input_validation_error(_("Wrong coordinate encoding!"));
         exit(1);
@@ -186,9 +194,10 @@ 
     if ($input != "on") {
         echo input_validation_error(_("Unknown state of boolean option!"));
         exit(1);
-    } else
-        return $input;
-}
+    } else {
+            return $input;
+    }
+    }
 
 function valid_DB_reference($input) {
     $table = "";
@@ -201,22 +210,26 @@ 
         $table = "profile_option";
     } elseif (preg_match("/FED/", $input)) {
         $table = "federation_option";
-    } else
-        return FALSE;
+    } else {
+            return FALSE;
+    }
     if (preg_match("/.*-([0-9]*)/", $input, $rowindexmatch)) {
         $rowindex = $rowindexmatch[1];
-    } else
-        return FALSE;
+    } else {
+            return FALSE;
+    }
     return ["table" => $table, "rowindex" => $rowindex];
 }
 
 function valid_host($input) {
     // is it a valid IP address (IPv4 or IPv6)?
-    if (filter_var($input, FILTER_VALIDATE_IP))
-        return $input;
+    if (filter_var($input, FILTER_VALIDATE_IP)) {
+            return $input;
+    }
     // if not, it must be a host name. Use email validation by prefixing with a local part
-    if (filter_var("stefan@" . $input, FILTER_VALIDATE_EMAIL))
-        return $input;
+    if (filter_var("stefan@" . $input, FILTER_VALIDATE_EMAIL)) {
+            return $input;
+    }
     // if we get here, it's bogus
     return FALSE;
 }
\ No newline at end of file

web/basic.php

Doc Comments +1 added lines, -2 removed lines

@@ -353,8 +353,7 @@
 
 /**
   * returns the navigation link to a given GUI page
-  * @param int $new_page new page number
-  * @param string $text link text
+  * @param string $arg_name
   * @return string
   */
 

Spacing +96 added lines, -96 removed lines

@@ -19,8 +19,8 @@ 
 require_once("CAT.php");
 require_once("UserAPI.php");
 
-debug(4,"basic.php\n");
-debug(4,$_POST);
+debug(4, "basic.php\n");
+debug(4, $_POST);
 
 /**
   * SimpleGUI defines extensions of the GUI class used only in the simple interface
@@ -36,7 +36,7 @@ 
 public function __construct() {
   parent::__construct();
   $this->Args = [];
-  $this->page =  0;
+  $this->page = 0;
   $this->set_locale('core');
   $this->version = 2;
   $this->Args['lang'] = CAT::get_lang();
@@ -49,28 +49,28 @@ 
 */
 
 
-    if(isset($_REQUEST['reset_dev']) && $_REQUEST['reset_dev'] == 1)
+    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..
 */
     $F = array_keys($this->printCountryList(1));
-    if(isset($_REQUEST['country']) && $_REQUEST['country']) {
+    if (isset($_REQUEST['country']) && $_REQUEST['country']) {
        $c = strtoupper($_REQUEST['country']);
     } else {
        $L = $this->locateUser();
-       if( $L['status'] == 'ok' ) {
+       if ($L['status'] == 'ok') {
          $c = strtoupper($L['country']);
        } else {
          debug(2, "No coutry provided and unable to locate the address\n");
-         $c='NONE';
+         $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->name;
-    $this->page =  1;
+    $this->page = 1;
 
 // If we have IdP identifier then match country to this identifier
 // if the request contians a country code and an IdP code that do nat match
@@ -78,18 +78,18 @@ 
 // If we have Profile identifier then test if we also have IdP identifier, if we do
 // and they do not match then drop the profile code and just leave the IdP
 
-    if(isset($_REQUEST['idp']) && $_REQUEST['idp']) {
-       $this->page =  2;
+    if (isset($_REQUEST['idp']) && $_REQUEST['idp']) {
+       $this->page = 2;
        try {
          $this->Idp = new IdP($_REQUEST['idp']);
        }
        catch (Exception $fail) {
-         $this->page =  1;
+         $this->page = 1;
          $this->set_locale("web_user");
          return;
        }
        $country_tmp = new Federation($this->Idp->federation);
-       if(strtoupper($this->Country->name) !== strtoupper($country_tmp->name)) {
+       if (strtoupper($this->Country->name) !== strtoupper($country_tmp->name)) {
          unset($this->Idp);
          $this->page = 1;
          $this->set_locale("web_user");
@@ -97,27 +97,27 @@ 
        } 
        $this->Args['idp'] = $_REQUEST['idp'];
        $this->profile_count = $this->Idp->profileCount();
-       if(!isset($_REQUEST['profile'])) {
+       if (!isset($_REQUEST['profile'])) {
          $this->set_locale("web_user");
          return;
        }
-       $this->page =  3;
+       $this->page = 3;
        try {
          $this->Profile = new Profile($_REQUEST['profile']);
        }
        catch (Exception $fail) {
-         $this->page =  2;
+         $this->page = 2;
          $this->set_locale("web_user");
          return;
        }
-       if($this->Profile->institution != $this->Idp->identifier)  {
+       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'])) {
+       if (isset($_REQUEST['device'])) {
              $this->Args['device'] = $_REQUEST['device'];
        }
 
@@ -130,13 +130,13 @@ 
 public function listCountries() {
    $out = '';
    $FED = $this->printCountryList(1);
-   $out .= _('Select your country').'<br>';
-   $out .= '<select name="country" onchange="submit_form(this)">'."\n";
+   $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->name)
+     $out .= '<option value="' . $f . '"';
+     if ($f === $this->Country->name)
          $out .= ' selected';
-     $out .= '>'.$F.'</option>'."\n";
+     $out .= '>' . $F . '</option>' . "\n";
    }
    $out .= '</select>';
    return $out;
@@ -144,17 +144,17 @@ 
 
 public function listIdPs() {
    $Inst = $this->orderIdentityProviders($this->Country->name);
-   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 .= '<option value="' . $I['idp'] . '"';
+      if ($I['idp'] == $i_id)
          $out .= ' selected';
-      $out .= '>'.$I['title'].'</option>';
+      $out .= '>' . $I['title'] . '</option>';
    }
    $out .= '</select>'; 
    return $out;
@@ -162,19 +162,19 @@ 
 
 public function listProfiles() {
    $Prof = $this->Idp->listProfiles(1);
-   if(! isset($this->Profile))
+   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 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 .= '<option value="' . $P->identifier . '"';
+       if ($P->identifier == $p_id)
          $out .= ' selected';
-       $out .= '>'.$P->name.'</option>';
+       $out .= '>' . $P->name . '</option>';
      }
      $out .= '</select>';
    } else {
@@ -186,7 +186,7 @@ 
 
 
 public function listDevices() {
-   if(! isset($this->Profile))
+   if (!isset($this->Profile))
       return '';
    $OS = $this->detectOS();
    $os = $OS['device'];
@@ -195,55 +195,55 @@ 
    $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>";
+   $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)
+   if (!$os)
      $message = $unsupported_message;
-   $out = _("Choose an installer to download").'<br>';
+   $out = _("Choose an installer to download") . '<br>';
    $out .= '<select name="device" onchange="set_device(this)">';
-   $i= 0;
+   $i = 0;
    foreach ($thedevices as $D) {
-      if((isset($D['options']) && isset($D['options']['hidden']) &&  $D['options']['hidden']) || $D['status'] )
+      if ((isset($D['options']) && isset($D['options']['hidden']) && $D['options']['hidden']) || $D['status'])
          continue; 
-      if(! $os)
+      if (!$os)
          $os = $D['id'];
       $disp = $D['display'];
-      if($D['id'] === '0') {
+      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']) {
+        if ($D['redirect']) {
            $redirect_target = $D['redirect'];
         }
       }
-      $out .= '>'.$disp.'</option>';
-      $device_redirects .= 'redirects['.$i.'] = '.( $D['redirect'] ? 1 : 0 ).';';
+      $out .= '>' . $disp . '</option>';
+      $device_redirects .= 'redirects[' . $i . '] = ' . ($D['redirect'] ? 1 : 0) . ';';
       $i++;
    }
    $out .= '</select>';
-   if( $selected_os == 0)
+   if ($selected_os == 0)
       $message = $unsupported_message;
    $out = $message . $out;
-   if($profile_redirect)
+   if ($profile_redirect)
       $out = '';
-   if($redirect_target) {
+   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>";
+      $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 .= "<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>';
+   $out .= '<script type="text/javascript">' . $device_redirects . '</script>';
    return $out;
 }
 
@@ -253,15 +253,15 @@ 
    $thedevices = $a['devices'];
    $this->set_locale("web_user");
    $out = '';
-   if(isset($a['description']) && $a['description'])
-     print '<div>'.$a['description'] . '</div>';
+   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 !== '') {
+   if ($out !== '') {
      print '<div class="user_info">';
      print _("If you encounter problems you should ask for help at your home institution");
      print $out;
@@ -269,15 +269,15 @@ 
    }
                    
    foreach ($thedevices as $D) {
-      if(isset($D['options']) && isset($D['options']['hidden']) &&  $D['options']['hidden'])
+      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>';
+      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']) 
+      if ($D['id'] === $this->Args['device']) 
           break;
    }
    $this->set_locale("web_user");
@@ -288,27 +288,27 @@ 
       return;
    }
    $extra_text = '';
-   if(isset($D['message']) && $D['message']) 
+   if (isset($D['message']) && $D['message']) 
       $extra_text = $D['message']; 
-   if(isset($D['device_customtext']) && $D['device_customtext']) {
-      if($extra_text)
+   if (isset($D['device_customtext']) && $D['device_customtext']) {
+      if ($extra_text)
            $extra_text .= '<p>';
       $extra_text = $D['device_customtext']; 
     }
-   if(isset($D['eap_customtext']) && $D['eap_customtext']) {
-      if($extra_text)
+   if (isset($D['eap_customtext']) && $D['eap_customtext']) {
+      if ($extra_text)
           $extra_text .= '<p>';
       $extra_text .= $D['eap_customtext']; 
     }
-   if($extra_text)
+   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 '<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');
@@ -318,13 +318,13 @@ 
 
 
 public function langSelection() {
-   $out = _("View this page in")." ";
+   $out = _("View this page in") . " ";
    $out .= '<select onchange="submit_form(this)" name="lang">';
    foreach (Config::$LANGUAGES as $lng => $value) {
-       $out .= '<option value="'.$lng.'"';
+       $out .= '<option value="' . $lng . '"';
        if ($lng === CAT::get_lang())
           $out .= ' selected';
-       $out .= '>'. $value['display'] . '</option>';
+       $out .= '>' . $value['display'] . '</option>';
    }
    $out .= '</select>';
    return $out;
@@ -338,14 +338,14 @@ 
   $out = '';
    $c = strtoupper($this->Country->name);
    $name = isset(Federation::$FederationList[$c]) ? Federation::$FederationList[$c] : $c;
-   $name = preg_replace('/ +/','&nbsp;',$name);
+   $name = preg_replace('/ +/', '&nbsp;', $name);
    $out .= "$name; ";
    $name = $this->Idp->name;
-   $name = preg_replace('/ +/','&nbsp;',$name);
+   $name = preg_replace('/ +/', '&nbsp;', $name);
    $out .= "$name";
-   if($this->profile_count > 1) {
-     $name = '; '.$this->Profile->name;
-     $name = preg_replace('/ +/','&nbsp;',$name);
+   if ($this->profile_count > 1) {
+     $name = '; ' . $this->Profile->name;
+     $name = preg_replace('/ +/', '&nbsp;', $name);
      $out .= "$name";
    }
   return $out;
@@ -359,7 +359,7 @@ 
   */
 
 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;
@@ -372,13 +372,13 @@ 
 
 $Gui = new SimpleGUI();
 
-debug(4,"\n----------------------------------SIMPLE.PHP------------------------\n");
+debug(4, "\n----------------------------------SIMPLE.PHP------------------------\n");
 ?>
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" lang="<?php echo CAT::get_lang()?>">
     <head lang="<?php echo CAT::get_lang()?>"> 
-        <title><?php echo Config::$APPEARANCE['productname_long'];?></title>
-<link href="<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']),'/') ?>/resources/css/cat-basic.css.php" type= "text/css" rel="stylesheet" />
+        <title><?php echo Config::$APPEARANCE['productname_long']; ?></title>
+<link href="<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']), '/') ?>/resources/css/cat-basic.css.php" type= "text/css" rel="stylesheet" />
         <meta charset="utf-8" /> 
     <script type="text/javascript">
     var redirects = new Array();
@@ -407,8 +407,8 @@ 
     </head>
     <body style="">
 
-<?php debug(4,"SERVER\n"); debug(4,$_SERVER) ?>
-<?php    print '<div id="motd">'.( isset(Config::$APPEARANCE['MOTD']) ? Config::$APPEARANCE['MOTD'] : '&nbsp' ).'</div>'; ?>
+<?php debug(4, "SERVER\n"); debug(4, $_SERVER) ?>
+<?php    print '<div id="motd">' . (isset(Config::$APPEARANCE['MOTD']) ? Config::$APPEARANCE['MOTD'] : '&nbsp') . '</div>'; ?>
 <form name="my_form" method="POST" action="<?php echo $_SERVER['SCRIPT_NAME']?>" accept-charset='UTF-8'>
         <img src="<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']), '/') ?>/resources/images/consortium_logo.png" style="width: 20%; padding-right:20px; padding-top:0px; float:right" alt="logo" />
          <?php
@@ -420,22 +420,22 @@ 
 */
         print '<h1><a href="' . $_SERVER['SCRIPT_NAME'] . '?lang=' . CAT::get_lang() . '">' . Config::$APPEARANCE['productname'] . '</a></h1>';
         print $Gui->langSelection();
-        if(! isset($_REQUEST['devices_h']) || $_REQUEST['devices_h'] == 0 || isset($_REQUEST['start_over'])) {
+        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->name)]))
+          if ($Gui->page == 2 && !isset($FED[strtoupper($Gui->Country->name)]))
              $Gui->page = 1;
-          print "<p>".$Gui->listIdPs();
-          print "<p>".$Gui->listProfiles();
-          print "<p>".$Gui->listDevices();
+          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) {
+          if ($Gui->page != 3) {
              print "Arguments missmatch error.";
              exit;
           }
-        print '<div id="user_choice">'.$Gui->yourChoice().'</div><p>';
+        print '<div id="user_choice">' . $Gui->yourChoice() . '</div><p>';
           $Gui->displayDeviceDownload();
         print '<input type="hidden" name="devices_h" id="devices_h" value="1">';
         }
@@ -444,8 +444,8 @@ 
         </form>
         <div class='footer'><hr />
 <?php
-print('<a href="tou.php">'._("Terms of use")."</a><p>");
-echo Config::$APPEARANCE['productname']." - " . CAT::$VERSION;
-echo " &copy; 2011-15 G&Eacute;ANT on behalf of the GN3, GN3plus, GN4 consortia and others <a href='copyright.php'>Full Copyright and Licenses</a></div>";?>
+print('<a href="tou.php">' . _("Terms of use") . "</a><p>");
+echo Config::$APPEARANCE['productname'] . " - " . CAT::$VERSION;
+echo " &copy; 2011-15 G&Eacute;ANT on behalf of the GN3, GN3plus, GN4 consortia and others <a href='copyright.php'>Full Copyright and Licenses</a></div>"; ?>
 </body>
 </html>

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->name;
     $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->name)
-         $out .= ' selected';
+     if($f === $this->Country->name) {
+              $out .= ' selected';
+     }
      $out .= '>'.$F.'</option>'."\n";
    }
    $out .= '</select>';
@@ -144,16 +145,18 @@ 
 
 public function listIdPs() {
    $Inst = $this->orderIdentityProviders($this->Country->name);
-   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->name)]))
-             $Gui->page = 1;
+          if($Gui->page == 2 && ! isset($FED[strtoupper($Gui->Country->name)])) {
+                       $Gui->page = 1;
+          }
           print "<p>".$Gui->listIdPs();
           print "<p>".$Gui->listProfiles();
           print "<p>".$Gui->listDevices();

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->name;
     $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->name) !== strtoupper($country_tmp->name)) {
-         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->name) !== strtoupper($country_tmp->name)) {
+            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->name)
-         $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->name)
+            $out .= ' selected';
+        $out .= '>'.$F.'</option>'."\n";
+    }
+    $out .= '</select>';
+    return $out;
 }
 
 public function listIdPs() {
-   $Inst = $this->orderIdentityProviders($this->Country->name);
-   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->name);
+    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->name);
-   $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->name);
+    $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->name)]))
-             $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->name)]))
+                $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 />

web/resources/inc/header.php

Doc Comments +6 added lines

@@ -30,6 +30,9 @@ 
     return $cat;
 }
 
+/**
+ * @param Type $pagetitle
+ */
 function defaultPagePrelude($pagetitle, $auth_required = TRUE) {
     if ($auth_required == TRUE) {
         require_once(dirname(dirname(dirname(__FILE__))) . "/admin/inc/auth.inc.php");
@@ -66,6 +69,9 @@ 
     return $Cat;
 }
 
+/**
+ * @param Type $area
+ */
 function productheader($area, $language) {
     echo "<div class='maincontent'>";
 // echo "You are here: ".$_SERVER['REQUEST_URI'];

Braces +6 added lines, -6 removed lines

@@ -99,8 +99,7 @@ 
             // in the admin area or on the main index.php ...
             if (strpos($_SERVER['PHP_SELF'], "admin/") === FALSE) {
                 $logoUrl .= substr($_SERVER['PHP_SELF'], 0, strrpos($_SERVER['PHP_SELF'], "/")) . "/resources/images/consortium_logo.png";
-            }
-            else {
+            } else {
                 $logoUrl .= substr($_SERVER['PHP_SELF'], 0, strrpos($_SERVER['PHP_SELF'], "/admin/")) . "/resources/images/consortium_logo.png";
             }
             $logoUrl = "//" . $logoUrl;
@@ -182,10 +181,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>";
+                }
                 ?>
             </p>
         </div> <!-- sidebar -->

Spacing +3 added lines, -3 removed lines

@@ -38,8 +38,8 @@ 
     $ourlocale = CAT::get_lang();
     header("Content-Type:text/html;charset=utf-8");
     echo "<!DOCTYPE html>
-          <html xmlns='http://www.w3.org/1999/xhtml' lang='". $ourlocale ."'>
-          <head lang='". $ourlocale ."'>
+          <html xmlns='http://www.w3.org/1999/xhtml' lang='". $ourlocale . "'>
+          <head lang='". $ourlocale . "'>
           <meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>";
 
     $cssUrl = valid_host($_SERVER['HTTP_HOST']);
@@ -77,7 +77,7 @@ 
                     <select id='lang' name='lang' onchange='this.form.submit()'>
                         <?php
                         foreach (Config::$LANGUAGES as $lang => $value) {
-                            echo "<option value='$lang' " . (strtoupper($language) == strtoupper($lang) ? "selected" : "" ) . " >" . $value['display'] . "</option> ";
+                            echo "<option value='$lang' " . (strtoupper($language) == strtoupper($lang) ? "selected" : "") . " >" . $value['display'] . "</option> ";
                         }
                         ?>
                     </select>

web/admin/edit_idp.php

Spacing +6 added lines, -6 removed lines

@@ -137,10 +137,10 @@ 
 <?php
 if ($wizard_style) {
     echo "<p>" .
-    sprintf(_("In this section, you define on which media %s should be configured on user devices."),Config::$CONSORTIUM['name']) . "</p>
+    sprintf(_("In this section, you define on which media %s should be configured on user devices."), Config::$CONSORTIUM['name']) . "</p>
           <ul>";
     echo "<li>";
-    echo "<strong>" . ( count(Config::$CONSORTIUM['ssid']) > 0 ? _("Additional SSIDs:") : _("SSIDs:")) . " </strong>";
+    echo "<strong>" . (count(Config::$CONSORTIUM['ssid']) > 0 ? _("Additional SSIDs:") : _("SSIDs:")) . " </strong>";
     if (count(Config::$CONSORTIUM['ssid']) > 0) {
         $ssidlist = "";
         foreach (Config::$CONSORTIUM['ssid'] as $ssid)
@@ -157,7 +157,7 @@ 
     echo "</li>";
 
     echo "<li>";
-    echo "<strong>" . ( count(Config::$CONSORTIUM['ssid']) > 0 ? _("Additional Hotspot 2.0 / Passpoint Consortia:") : _("Hotspot 2.0 / Passpoint Consortia:")) . " </strong>";
+    echo "<strong>" . (count(Config::$CONSORTIUM['ssid']) > 0 ? _("Additional Hotspot 2.0 / Passpoint Consortia:") : _("Hotspot 2.0 / Passpoint Consortia:")) . " </strong>";
     if (count(Config::$CONSORTIUM['interworking-consortium-oi']) > 0) {
         $consortiumlist = "";
         foreach (Config::$CONSORTIUM['interworking-consortium-oi'] as $oi)
@@ -170,10 +170,10 @@ 
         echo _("Please configure which Consortium OIs should be configured in the installers.");
     }   
     echo "</li>";
-    echo "<li><strong>"._("Support for wired IEEE 802.1X:")." </strong>"
-    . _("If you want to configure your users' devices with IEEE 802.1X support for wired ethernet, please check the corresponding box. Note that this makes the installation process a bit more difficult on some platforms (Windows: needs administrator privileges; Apple: attempting to install a profile with wired support on a device without an active wired ethernet card will fail).").
+    echo "<li><strong>" . _("Support for wired IEEE 802.1X:") . " </strong>"
+    . _("If you want to configure your users' devices with IEEE 802.1X support for wired ethernet, please check the corresponding box. Note that this makes the installation process a bit more difficult on some platforms (Windows: needs administrator privileges; Apple: attempting to install a profile with wired support on a device without an active wired ethernet card will fail).") .
             "</li>";
-    echo "<li><strong>"._("Removal of bootstrap/onboarding SSIDs:")." </strong>"
+    echo "<li><strong>" . _("Removal of bootstrap/onboarding SSIDs:") . " </strong>"
             . _("If you use a captive portal to distribute configurations, you may want to unconfigure/disable that SSID after the bootstrap process. With this option, the SSID will either be removed, or be defined as 'Only connect manually'.")
             . "</li>";
     echo "</ul>";

Braces +23 added lines, -14 removed lines

@@ -31,10 +31,11 @@ 
 $idpoptions = $my_inst->getAttributes();
 $inst_name = $my_inst->name;
 
-if ($wizard_style)
+if ($wizard_style) {
     $cat = defaultPagePrelude(sprintf(_("%s: IdP enrollment wizard (step 2)"), Config::$APPEARANCE['productname']));
-else
+} else {
     $cat = defaultPagePrelude(sprintf(_("%s: Editing IdP '%s'"), Config::$APPEARANCE['productname'], $inst_name));
+}
 // let's check if the inst handle actually exists in the DB and user is authorised
 ?>
 <script src="js/option_expand.js" type="text/javascript"></script>
@@ -43,9 +44,10 @@ 
 
 <?php
 $additional = FALSE;
-foreach ($idpoptions as $optionname => $optionvalue)
+foreach ($idpoptions as $optionname => $optionvalue) {
     if ($optionvalue['name'] == "general:geo_coordinates")
         $additional = TRUE;
+}
 geo_widget_head($my_inst->federation, $inst_name)
 ?>
 <script>
@@ -74,10 +76,11 @@ 
 
     <h1>
 <?php
-if ($wizard_style)
+if ($wizard_style) {
     echo _("Step 2: General Information about your IdP");
-else
+} else {
     printf(_("Editing IdP information for '%s'"), $inst_name);
+}
 ?>
     </h1>
     <div class='infobox'>
@@ -98,9 +101,10 @@ 
 echo "<form enctype='multipart/form-data' action='edit_idp_result.php?inst_id=$my_inst->identifier" . ($wizard_style ? "&wizard=true" : "") . "' method='post' accept-charset='UTF-8'>
               <input type='hidden' name='MAX_FILE_SIZE' value='" . Config::$MAX_UPLOAD_SIZE . "'>";
 
-if ($wizard_style)
+if ($wizard_style) {
     echo "<p>" .
     _("Hello, newcomer. Your institution is new to us. This wizard will ask you several questions about your IdP, so that we can generate beautiful profiles for you in the end. All of the information below is optional, but it is important to fill out as many fields as possible for the benefit of your end users.") . "</p>";
+}
 ?>
     <fieldset class="option_container">
         <legend><strong><?php echo _("General Information"); ?></strong></legend>
@@ -143,12 +147,14 @@ 
     echo "<strong>" . ( count(Config::$CONSORTIUM['ssid']) > 0 ? _("Additional SSIDs:") : _("SSIDs:")) . " </strong>";
     if (count(Config::$CONSORTIUM['ssid']) > 0) {
         $ssidlist = "";
-        foreach (Config::$CONSORTIUM['ssid'] as $ssid)
-            $ssidlist .= ", '<strong>" . $ssid . "</strong>'";
+        foreach (Config::$CONSORTIUM['ssid'] as $ssid) {
+                    $ssidlist .= ", '<strong>" . $ssid . "</strong>'";
+        }
         $ssidlist = substr($ssidlist, 2);
         echo sprintf(ngettext("We will always configure this SSID for WPA2/AES: %s.", "We will always configure these SSIDs for WPA2/AES: %s.", count(Config::$CONSORTIUM['ssid'])), $ssidlist);
-        if (Config::$CONSORTIUM['tkipsupport'])
-            echo " " . _("They will also be configured for WPA/TKIP if the device supports multiple encryption types.");
+        if (Config::$CONSORTIUM['tkipsupport']) {
+                    echo " " . _("They will also be configured for WPA/TKIP if the device supports multiple encryption types.");
+        }
         echo "<br/>" . sprintf(_("It is also possible to define custom additional SSIDs with the options '%s' and '%s' below."), display_name("media:SSID"), display_name("media:SSID_with_legacy"));
     } else {
         echo _("Please configure which SSIDs should be configured in the installers.");
@@ -160,8 +166,9 @@ 
     echo "<strong>" . ( count(Config::$CONSORTIUM['ssid']) > 0 ? _("Additional Hotspot 2.0 / Passpoint Consortia:") : _("Hotspot 2.0 / Passpoint Consortia:")) . " </strong>";
     if (count(Config::$CONSORTIUM['interworking-consortium-oi']) > 0) {
         $consortiumlist = "";
-        foreach (Config::$CONSORTIUM['interworking-consortium-oi'] as $oi)
-            $consortiumlist .= ", '<strong>" . $oi . "</strong>'";
+        foreach (Config::$CONSORTIUM['interworking-consortium-oi'] as $oi) {
+                    $consortiumlist .= ", '<strong>" . $oi . "</strong>'";
+        }
         $consortiumlist = substr($consortiumlist, 2);
         echo sprintf(ngettext("We will always configure this Consortium OI: %s.", "We will always configure these Consortium OIs: %s.", count(Config::$CONSORTIUM['interworking-consortium-oi'])), $consortiumlist);
         
@@ -190,11 +197,12 @@ 
     <fieldset class="option_container">
         <legend><strong><?php echo _("Helpdesk Details for all users"); ?></strong></legend>
 <?php
-if ($wizard_style)
+if ($wizard_style) {
     echo "<p>" .
     _("If your IdP provides a helpdesk for its users, it would be nice if you would tell us the pointers to this helpdesk. Some site installers might be able to signal this information to the user if he gets stuck.") . "</p>
         <p>" .
     _("If you enter a value here, it will be added to the site installers for all your users, and will be displayed on the download page. If you operate separate helpdesks for different user groups (we call this 'profiles'), or operate no help desk at all (shame on you!), you can also leave any of these fields empty and optionally specify per-profile helpdesk information later in this wizard.") . "</p>";
+}
 ?>
 
         <table id="expandable_support_options">
@@ -206,9 +214,10 @@ 
 <!--    <fieldset class="option_container">
         <legend><strong><?php echo _("EAP details for all users"); ?></strong></legend>
 <?php
-if ($wizard_style)
+if ($wizard_style) {
     echo "<p>" . _("Most EAP methods need server-side authentication details, like the CA certificate and/or server name(s) of your authentication servers. If all the EAP methods you support work with the same CA and or Common Names of servers, you can enter them here and they will be added as trust anchors in all profiles. If the details differ per profile or per EAP-type, you can also enter them in the individual profiles later.") . "</p>
         <p>" . sprintf(_("<strong>Note well: </strong>The server-side validation is a cornerstone of %s; without it, users are subject to man-in-the-middle attacks! We will not generate site installers without Trusted CA anchors and server names."), Config::$CONSORTIUM['name']) . "</p>";
+}
 ?>
         <table id="expandable_eapserver_options">
         <?php

web/admin/logout_check.php

Braces +5 added lines, -4 removed lines

@@ -18,10 +18,11 @@
 if ($ls['Code'] === 'urn:oasis:names:tc:SAML:2.0:status:Success' && !isset($ls['SubCode'])) {
     /* Successful logout. */
     $url = htmlspecialchars($_SERVER['HTTP_HOST']) . substr($_SERVER['PHP_SELF'], 0, strrpos($_SERVER['PHP_SELF'], "/admin/logout_check.php"));
-    if ($_SERVER['HTTPS'] == "on")
-        $url = "https://" . $url;
-    else
-        $url = "http://" . $url;
+    if ($_SERVER['HTTPS'] == "on") {
+            $url = "https://" . $url;
+    } else {
+            $url = "http://" . $url;
+    }
 
     header("Location: $url");
 } else {