GEANT / CAT

config/config-template.php

Indentation +37 added lines, -37 removed lines

@@ -148,13 +148,13 @@ 
     ];
 
     /**
-      * Configuration for GeoIP2 
-      * Beware, the legacy version does not really work with IPv6 addresses
-      * version: set to 2 if you wish to use GeoIP2, to 1 for the legacy version or set to 0 to turn off geolocation service
-      * geoip2-path-to-autoloader: points to the GeoIP2 autoloader 
-      * geoip2-path-to-db: points to the GeoIP2 city database
-      * @var array
-      */
+     * Configuration for GeoIP2 
+     * Beware, the legacy version does not really work with IPv6 addresses
+     * version: set to 2 if you wish to use GeoIP2, to 1 for the legacy version or set to 0 to turn off geolocation service
+     * geoip2-path-to-autoloader: points to the GeoIP2 autoloader 
+     * geoip2-path-to-db: points to the GeoIP2 city database
+     * @var array
+     */
       
     public static $GEOIP = [
         'version' => 0,
@@ -181,21 +181,21 @@ 
      * @var array
      */
     public static $LANGUAGES = [
-      'ca' => ['display' => 'Català',      'locale' => 'ca_ES.utf8',    'latin_based' => TRUE],
-      'de' => ['display' => 'Deutsch',     'locale' => 'de_DE.utf8',    'latin_based' => TRUE],
-      'en' => ['display' => 'English(GB)', 'locale' => 'en_GB.utf8',    'latin_based' => TRUE],
-      'es' => ['display' => 'Español',     'locale' => 'es_ES.utf8',    'latin_based' => TRUE],
-      'gl' => ['display' => 'Galego',      'locale' => 'gl_ES.utf8',    'latin_based' => TRUE],
-      'hr' => ['display' => 'Hrvatski',    'locale' => 'hr_HR.utf8',    'latin_based' => TRUE],
-      'it' => ['display' => 'Italiano',    'locale' => 'it_IT.utf8',    'latin_based' => TRUE],
-      'nb' => ['display' => 'Norsk',       'locale' => 'nb_NO.utf8',    'latin_based' => TRUE],
-      'pl' => ['display' => 'Polski',      'locale' => 'pl_PL.utf8',    'latin_based' => TRUE],
-      'sl' => ['display' => 'Slovenščina', 'locale' => 'sl_SI.utf8',    'latin_based' => TRUE],
-      'sr' => ['display' => 'Srpski',      'locale' => 'sr_RS@latin',    'latin_based' => TRUE],
-      'fi' => ['display' => 'Suomi',       'locale' => 'fi_FI.utf8',    'latin_based' => TRUE],
-      'el' => ['display' => 'Ελληνικά',    'locale' => 'el_GR.utf8',    'latin_based' => FALSE],
-      'hu' => ['display' => 'Magyar',      'locale' => 'hu_HU.utf8',    'latin_based' => TRUE],
-      'pt' => ['display' => 'Português',   'locale' => 'pt_PT.utf8',    'latin_based' => TRUE],
+        'ca' => ['display' => 'Català',      'locale' => 'ca_ES.utf8',    'latin_based' => TRUE],
+        'de' => ['display' => 'Deutsch',     'locale' => 'de_DE.utf8',    'latin_based' => TRUE],
+        'en' => ['display' => 'English(GB)', 'locale' => 'en_GB.utf8',    'latin_based' => TRUE],
+        'es' => ['display' => 'Español',     'locale' => 'es_ES.utf8',    'latin_based' => TRUE],
+        'gl' => ['display' => 'Galego',      'locale' => 'gl_ES.utf8',    'latin_based' => TRUE],
+        'hr' => ['display' => 'Hrvatski',    'locale' => 'hr_HR.utf8',    'latin_based' => TRUE],
+        'it' => ['display' => 'Italiano',    'locale' => 'it_IT.utf8',    'latin_based' => TRUE],
+        'nb' => ['display' => 'Norsk',       'locale' => 'nb_NO.utf8',    'latin_based' => TRUE],
+        'pl' => ['display' => 'Polski',      'locale' => 'pl_PL.utf8',    'latin_based' => TRUE],
+        'sl' => ['display' => 'Slovenščina', 'locale' => 'sl_SI.utf8',    'latin_based' => TRUE],
+        'sr' => ['display' => 'Srpski',      'locale' => 'sr_RS@latin',    'latin_based' => TRUE],
+        'fi' => ['display' => 'Suomi',       'locale' => 'fi_FI.utf8',    'latin_based' => TRUE],
+        'el' => ['display' => 'Ελληνικά',    'locale' => 'el_GR.utf8',    'latin_based' => FALSE],
+        'hu' => ['display' => 'Magyar',      'locale' => 'hu_HU.utf8',    'latin_based' => TRUE],
+        'pt' => ['display' => 'Português',   'locale' => 'pt_PT.utf8',    'latin_based' => TRUE],
 
 // For the following languages, partial translations exist in Transifex, but
 // they are not complete enough for display. Their Transifex content is not
@@ -244,45 +244,45 @@ 
         ],
 
         'TLS-clientcerts' => [
-          'CA1' => [
+            'CA1' => [
             'status' => 'ACCREDITED',
             'issuerCA' => '/DC=org/DC=pki1/CN=PKI 1',
             'certificates' => [
-              [
+                [
                 'status' => 'CORRECT',
                 'public' => 'ca1-client-cert.pem',
                 'private' => 'ca1-client-key.pem',
                 'expected' => 'PASS'],
-              [
+                [
                 'status' => 'WRONGPOLICY',
                 'public' => 'ca1-nopolicy-cert.pem',
                 'private' => 'ca1-nopolicy-key.key',
                 'expected' => 'FAIL'],
-              [
+                [
                 'status' => 'EXPIRED',
                 'public' => 'ca1-exp.pem',
                 'private' => 'ca1-exp.key',
                 'expected' => 'FAIL'],
-              [
+                [
                 'status' => 'REVOKED',
                 'public' => 'ca1-revoked.pem',
                 'private' => 'ca1-revoked.key',
                 'expected' => 'FAIL'],
             ]
-          ],
-          'CA-N' => [
+            ],
+            'CA-N' => [
             'status' => 'NONACCREDITED',
             'issuerCA' => '/DC=org/DC=pkiN/CN=PKI N',
             'certificates' => [
-               [
+                [
                 'status' => 'CORRECT',
                 'public' => 'caN-client-cert.pem',
                 'private' => 'caN-client-cert.key',
                 'expected' => 'FAIL'],
-               ]
-          ]
-      ],
-      'accreditedCAsURL' => '',
+                ]
+            ]
+        ],
+        'accreditedCAsURL' => '',
     ];
 
     /**
@@ -320,11 +320,11 @@ 
             'db' => 'customer_db',
             'user' => 'customerservice',
             'pass' => '2lame4u'],
-         'enforce-external-sync' => TRUE,
-         /* if you feed your user database from a third-party source and do not want CAT to update it on its own, you can 
+            'enforce-external-sync' => TRUE,
+            /* if you feed your user database from a third-party source and do not want CAT to update it on its own, you can 
           * make it read-only
           */
-         'userdb-readonly' => FALSE,
+            'userdb-readonly' => FALSE,
     ];
 
     /**

core/DeviceConfig.php

Indentation +422 added lines, -422 removed lines

@@ -6,10 +6,10 @@ 
 ?>
 <?php
 /**
-  * This file defines the abstract Device class
-  *
-  * @package ModuleWriting
-  */
+ * This file defines the abstract Device class
+ *
+ * @package ModuleWriting
+ */
 
 /**
  * 
@@ -46,10 +46,10 @@ 
  */
 
 abstract class DeviceConfig {
-   /**
-    * stores the path to the temporary working directory for a module instance
-    * @var string $FPATH
-    */
+    /**
+     * stores the path to the temporary working directory for a module instance
+     * @var string $FPATH
+     */
     public $FPATH;
 
     /**
@@ -58,391 +58,391 @@ 
      */
     public $specialities;
 
-   /**
+    /**
      * device module constructor should be defined by each module, but if it is not, then here is a default one
      */
 
-      public function __construct() {
-      $this->supportedEapMethods  = [EAP::$TLS, EAP::$PEAP_MSCHAP2, EAP::$TTLS_PAP];
-      debug(4,"This device supports the following EAP methods: ");
-      debug(4,$this->supportedEapMethods);
+        public function __construct() {
+        $this->supportedEapMethods  = [EAP::$TLS, EAP::$PEAP_MSCHAP2, EAP::$TTLS_PAP];
+        debug(4,"This device supports the following EAP methods: ");
+        debug(4,$this->supportedEapMethods);
     }
 
 
-   /**
-    * Set up working environment for a device module
-    *
-    * Sets up the device module environment taking into account the actual profile
-    * selected by the user in the GUI. The selected profile is passed as the
-    * Profile $profile argumant.
-    *
-    * This method needs to be called after the device instance has been created (the GUI class does that)
-    *
-    * setup performs the following tasks:
-    * - collect profile attributes and pass them as the attributes property;
-    * - create the temporary working directory
-    * - process CA certificates and store them as 'internal:CAs' attribute
-    * - process and save optional info files and store references to them in
-    *   'internal:info_file' attribute
-    * @param Profile $profile the profile object which will be passed by the caller
-    * @final not to be redefined
-    */
+    /**
+     * Set up working environment for a device module
+     *
+     * Sets up the device module environment taking into account the actual profile
+     * selected by the user in the GUI. The selected profile is passed as the
+     * Profile $profile argumant.
+     *
+     * This method needs to be called after the device instance has been created (the GUI class does that)
+     *
+     * setup performs the following tasks:
+     * - collect profile attributes and pass them as the attributes property;
+     * - create the temporary working directory
+     * - process CA certificates and store them as 'internal:CAs' attribute
+     * - process and save optional info files and store references to them in
+     *   'internal:info_file' attribute
+     * @param Profile $profile the profile object which will be passed by the caller
+     * @final not to be redefined
+     */
     final public function setup(Profile $profile) {
-       debug(4,"module setup start\n");
-       if(! $profile instanceof Profile) {
-          debug(2,"No profile has been set\n");
-          error("No profile has been set");
-          exit;
-       }
-       $this->attributes = $this->getProfileAttributes($profile);
-       if(! $this->selected_eap) {
-          error("No EAP type specified.");
-          exit;
-       }
-       // create temporary directory, its full path will be saved in $this->FPATH;
-       $T = createTemporaryDirectory('installer');
-       $this->FPATH = $T['dir'];
-       mkdir($T['dir'].'/tmp');
-       chdir($T['dir'].'/tmp');
-       $CAs = [];
-       if(isset($this->attributes['eap:ca_file'])) {
-       foreach ($this->attributes['eap:ca_file'] as $ca) {
-          if($c = X509::processCertificate($ca))
-             $CAs[] = $c;
-          }
-          $this->attributes['internal:CAs'][0]=$CAs;
-       }
-       if(isset($this->attributes['support:info_file'])) {
-          $this->attributes['internal:info_file'][0] = 
-             $this->saveInfoFile($this->attributes['support:info_file'][0]);
-       }
-       if(isset($this->attributes['general:logo_file']))
-          $this->attributes['internal:logo_file'] = 
-             $this->saveLogoFile($this->attributes['general:logo_file']);
-       $this->attributes['internal:SSID'] = $this->getSSIDs()['add'];;
-       $this->attributes['internal:remove_SSID'] = $this->getSSIDs()['del'];;
-       $this->attributes['internal:consortia'] = $this->getConsortia();
-       $this->lang_index = CAT::get_lang();
-       // phpMD says the below is not needed. Wow.
-       // $idp = new IdP($profile->institution);
-       $olddomain = CAT::set_locale("core");
-       $this->support_email_substitute = sprintf(_("your local %s support"),Config::$CONSORTIUM['name']);
-       $this->support_url_substitute = sprintf(_("your local %s support page"),Config::$CONSORTIUM['name']);
-       CAT::set_locale($olddomain);
-
-       if($this->signer && $this->options['sign'])
-         $this->sign = CAT::$root . '/signer/'. $this->signer;
-       $this->installerBasename = $this->getInstallerBasename();
+        debug(4,"module setup start\n");
+        if(! $profile instanceof Profile) {
+            debug(2,"No profile has been set\n");
+            error("No profile has been set");
+            exit;
+        }
+        $this->attributes = $this->getProfileAttributes($profile);
+        if(! $this->selected_eap) {
+            error("No EAP type specified.");
+            exit;
+        }
+        // create temporary directory, its full path will be saved in $this->FPATH;
+        $T = createTemporaryDirectory('installer');
+        $this->FPATH = $T['dir'];
+        mkdir($T['dir'].'/tmp');
+        chdir($T['dir'].'/tmp');
+        $CAs = [];
+        if(isset($this->attributes['eap:ca_file'])) {
+        foreach ($this->attributes['eap:ca_file'] as $ca) {
+            if($c = X509::processCertificate($ca))
+                $CAs[] = $c;
+            }
+            $this->attributes['internal:CAs'][0]=$CAs;
+        }
+        if(isset($this->attributes['support:info_file'])) {
+            $this->attributes['internal:info_file'][0] = 
+                $this->saveInfoFile($this->attributes['support:info_file'][0]);
+        }
+        if(isset($this->attributes['general:logo_file']))
+            $this->attributes['internal:logo_file'] = 
+                $this->saveLogoFile($this->attributes['general:logo_file']);
+        $this->attributes['internal:SSID'] = $this->getSSIDs()['add'];;
+        $this->attributes['internal:remove_SSID'] = $this->getSSIDs()['del'];;
+        $this->attributes['internal:consortia'] = $this->getConsortia();
+        $this->lang_index = CAT::get_lang();
+        // phpMD says the below is not needed. Wow.
+        // $idp = new IdP($profile->institution);
+        $olddomain = CAT::set_locale("core");
+        $this->support_email_substitute = sprintf(_("your local %s support"),Config::$CONSORTIUM['name']);
+        $this->support_url_substitute = sprintf(_("your local %s support page"),Config::$CONSORTIUM['name']);
+        CAT::set_locale($olddomain);
+
+        if($this->signer && $this->options['sign'])
+            $this->sign = CAT::$root . '/signer/'. $this->signer;
+        $this->installerBasename = $this->getInstallerBasename();
     }
 
-  /**
-    * Selects the preferred eap method based on profile EAP configuration and device EAP capabilities
-    *
-    * @param array eap_array an array of eap methods supported by a given device
-    * @return the best matching EAP type for the profile; or 0 if no match was found
-    */   
-   public function getPreferredEapType($eap_array) {
-     foreach ($eap_array as $eap) {
-         if(in_array($eap,$this->supportedEapMethods)) {
+    /**
+     * Selects the preferred eap method based on profile EAP configuration and device EAP capabilities
+     *
+     * @param array eap_array an array of eap methods supported by a given device
+     * @return the best matching EAP type for the profile; or 0 if no match was found
+     */   
+    public function getPreferredEapType($eap_array) {
+        foreach ($eap_array as $eap) {
+            if(in_array($eap,$this->supportedEapMethods)) {
             $this->selected_eap = $eap;
             debug(4,"Selected EAP:");
             debug(4,$eap);
             return($eap);
-         }
-     }
-     return(0);
-   }
-  /**
-    * prepare usage information for the installer
-    * every device module should override this method
-    *
-    * @return String HTML text to be displayed
-    */ 
-   public function writeDeviceInfo() {
-     return _("Sorry, this should not happen - no additional information is available");
-   }
-
-  /**
-    *  Copy a file from the module location to the temporary directory.
-    *
-    * If the second argument is provided then the file will be saved under the name 
-    * taken form this argument. If only one parameter is given, source and destination
-    * filenames are the same
-    * Source file can be located either in the Files subdirectory or in the sibdirectory of Files
-    * named the same as device_id. The second option takes precedence.
-    *
-    * @param string $source_name The source file name
-    * @param string $output_name The destination file name
-    *
-    * @return bool result of the copy operation
-    * @final not to be redefined
-    */
-   final protected function copyFile($source_name, $output_name = 0) {
-      if  ( $output_name === 0)
+            }
+        }
+        return(0);
+    }
+    /**
+     * prepare usage information for the installer
+     * every device module should override this method
+     *
+     * @return String HTML text to be displayed
+     */ 
+    public function writeDeviceInfo() {
+        return _("Sorry, this should not happen - no additional information is available");
+    }
+
+    /**
+     *  Copy a file from the module location to the temporary directory.
+     *
+     * If the second argument is provided then the file will be saved under the name 
+     * taken form this argument. If only one parameter is given, source and destination
+     * filenames are the same
+     * Source file can be located either in the Files subdirectory or in the sibdirectory of Files
+     * named the same as device_id. The second option takes precedence.
+     *
+     * @param string $source_name The source file name
+     * @param string $output_name The destination file name
+     *
+     * @return bool result of the copy operation
+     * @final not to be redefined
+     */
+    final protected function copyFile($source_name, $output_name = 0) {
+        if  ( $output_name === 0)
         $output_name = $source_name;
 
-      debug(4,"fileCopy($source_name, $output_name)\n");
-      if(is_file($this->module_path.'/Files/'.$this->device_id.'/'.$source_name))
-         $source = $this->module_path.'/Files/'.$this->device_id.'/'.$source_name;
-      elseif(is_file($this->module_path.'/Files/'.$source_name))
-         $source = $this->module_path.'/Files/'.$source_name;
-      else {
+        debug(4,"fileCopy($source_name, $output_name)\n");
+        if(is_file($this->module_path.'/Files/'.$this->device_id.'/'.$source_name))
+            $source = $this->module_path.'/Files/'.$this->device_id.'/'.$source_name;
+        elseif(is_file($this->module_path.'/Files/'.$source_name))
+            $source = $this->module_path.'/Files/'.$source_name;
+        else {
         debug(2,"fileCopy:reqested file $source_name does not exist\n");
         return(FALSE);
-      }
-      debug(4,"Copying $source to $output_name\n");
-      $result = copy($source,"$output_name");
-      if(! $result )
+        }
+        debug(4,"Copying $source to $output_name\n");
+        $result = copy($source,"$output_name");
+        if(! $result )
         debug(2,"fileCopy($source_name, $output_name) failed\n");
-      return($result); 
-   }
-
-
-  /**
-    *  Copy a file from the module location to the temporary directory aplying transcoding.
-    *
-    * Transcoding is only required for Windows installers, and no Unicode support
-    * in NSIS (NSIS version below 3)
-    * Trancoding is only applied if the third optional parameter is set and nonzero
-    * If Config::$NSIS_VERSION is set to 3 or more, no transcoding will be applied
-    * regardless of the third parameter value.
-    * If the second argument is provided and is not equal to 0, then the file will be
-    * saved under the name taken from this argument.
-    * If only one parameter is given or the second is equal to 0, source and destination
-    * filenames are the same.
-    * The third optional parameter, if nonzero, should be the character set understood by iconv
-    * This is required by the Windows installer and is expected to go away in the future.
-    * Source file can be located either in the Files subdirectory or in the sibdirectory of Files
-    * named the same as device_id. The second option takes precedence.
-    *
-    * @param string $source_name The source file name
-    * @param string $output_name The destination file name
-    * @param int $use_win_cp Set Windows charset if non-zero
-    *
-    * @final not to be redefined
-    */
-
-   final protected function translateFile($source_name, $output_name = 0, $encoding = 0) {
-      if(Config::$NSIS_VERSION >= 3)
+        return($result); 
+    }
+
+
+    /**
+     *  Copy a file from the module location to the temporary directory aplying transcoding.
+     *
+     * Transcoding is only required for Windows installers, and no Unicode support
+     * in NSIS (NSIS version below 3)
+     * Trancoding is only applied if the third optional parameter is set and nonzero
+     * If Config::$NSIS_VERSION is set to 3 or more, no transcoding will be applied
+     * regardless of the third parameter value.
+     * If the second argument is provided and is not equal to 0, then the file will be
+     * saved under the name taken from this argument.
+     * If only one parameter is given or the second is equal to 0, source and destination
+     * filenames are the same.
+     * The third optional parameter, if nonzero, should be the character set understood by iconv
+     * This is required by the Windows installer and is expected to go away in the future.
+     * Source file can be located either in the Files subdirectory or in the sibdirectory of Files
+     * named the same as device_id. The second option takes precedence.
+     *
+     * @param string $source_name The source file name
+     * @param string $output_name The destination file name
+     * @param int $use_win_cp Set Windows charset if non-zero
+     *
+     * @final not to be redefined
+     */
+
+    final protected function translateFile($source_name, $output_name = 0, $encoding = 0) {
+        if(Config::$NSIS_VERSION >= 3)
         $encoding = 0;
-      if  ( $output_name === 0)
+        if  ( $output_name === 0)
         $output_name = $source_name;
 
-      debug(4,"translateFile($source_name, $output_name, $encoding)\n");
-      ob_start();
-      debug(4,$this->module_path.'/Files/'.$this->device_id.'/'.$source_name."\n");
-      if(is_file($this->module_path.'/Files/'.$this->device_id.'/'.$source_name))
-         $source = $this->module_path.'/Files/'.$this->device_id.'/'.$source_name;
-      elseif(is_file($this->module_path.'/Files/'.$source_name))
-         $source = $this->module_path.'/Files/'.$source_name;
-      include($source);
-      $output = ob_get_clean();
-      if($encoding) {
+        debug(4,"translateFile($source_name, $output_name, $encoding)\n");
+        ob_start();
+        debug(4,$this->module_path.'/Files/'.$this->device_id.'/'.$source_name."\n");
+        if(is_file($this->module_path.'/Files/'.$this->device_id.'/'.$source_name))
+            $source = $this->module_path.'/Files/'.$this->device_id.'/'.$source_name;
+        elseif(is_file($this->module_path.'/Files/'.$source_name))
+            $source = $this->module_path.'/Files/'.$source_name;
+        include($source);
+        $output = ob_get_clean();
+        if($encoding) {
         $output_c = iconv('UTF-8',$encoding.'//TRANSLIT',$output);
         if($output_c)
-           $output = $output_c;
-      }
-      $f = fopen("$output_name","w");
-      if(! $f)
-         debug(2,"translateFile($source, $output_name, $encoding) failed\n");
-      fwrite($f,$output);
-      fclose($f);
-      debug(4,"translateFile($source, $output_name, $encoding) end\n");
-   }
-
-
-  /**
-    * Transcode a string adding double quotes escaping
-    *
-    * Transcoding is only required for Windows installers, and no Unicode support
-    * in NSIS (NSIS version below 3)
-    * Trancoding is only applied if the third optional parameter is set and nonzero
-    * If Config::$NSIS_VERSION is set to 3 or more, no transcoding will be applied
-    * regardless of the second parameter value.
-    * The second optional parameter, if nonzero, should be the character set understood by iconv
-    * This is required by the Windows installer and is expected to go away in the future.
-    *
-    * @param string $source_name The source file name
-    * @param int $use_win_cp Set Windows charset if non-zero
-    *
-    * @final not to be redefined
-    */
-
-   final protected function translateString($source_string,$encoding = 0) {
-      if(Config::$NSIS_VERSION >= 3)
+            $output = $output_c;
+        }
+        $f = fopen("$output_name","w");
+        if(! $f)
+            debug(2,"translateFile($source, $output_name, $encoding) failed\n");
+        fwrite($f,$output);
+        fclose($f);
+        debug(4,"translateFile($source, $output_name, $encoding) end\n");
+    }
+
+
+    /**
+     * Transcode a string adding double quotes escaping
+     *
+     * Transcoding is only required for Windows installers, and no Unicode support
+     * in NSIS (NSIS version below 3)
+     * Trancoding is only applied if the third optional parameter is set and nonzero
+     * If Config::$NSIS_VERSION is set to 3 or more, no transcoding will be applied
+     * regardless of the second parameter value.
+     * The second optional parameter, if nonzero, should be the character set understood by iconv
+     * This is required by the Windows installer and is expected to go away in the future.
+     *
+     * @param string $source_name The source file name
+     * @param int $use_win_cp Set Windows charset if non-zero
+     *
+     * @final not to be redefined
+     */
+
+    final protected function translateString($source_string,$encoding = 0) {
+        if(Config::$NSIS_VERSION >= 3)
         $encoding = 0;
-      if($encoding)
+        if($encoding)
         $output_c = iconv('UTF-8',$encoding.'//TRANSLIT',$source_string);
-      else
+        else
         $output_c = $source_string;
-      if($output_c) 
-         $source_string  = str_replace('"','$\\"',$output_c);
-      else
-         debug(2,"Failed to convert string $source_string\n");
-      return $source_string;
-   }
-
-
-  /**
-   * Save certificate files in either DER or PEM format
-   *
-   * Certificate files will be saved in the module working directory.
-   * @param string $format  only "der" and "pem" are currently allowed
-   * @return array an array of arrays or FALSE on error
-   * saved certificate file names are avalable under the 'file' index
-   * additional array entries are indexed as 'sha1', 'md5', and 'root'.
-   * sha1 and md5 are correcponding certificate hashes
-   * root is set to 1 for the CA roor certicicate and 0 otherwise
-  */ 
-   final protected function saveCertificateFiles($format) {
-     if($format == 'der' || $format == 'pam') {
-       $i = 0;
-       $CA_files = [];
-       $ca_array = $this->attributes['internal:CAs'][0];
-       if(! $ca_array)
-         return(FALSE);
-       foreach ($ca_array as $CA) {
-         $f = fopen("cert-$i.crt","w");
-         if(! $f) die("problem opening the file\n");
-         if($format == "pem")
+        if($output_c) 
+            $source_string  = str_replace('"','$\\"',$output_c);
+        else
+            debug(2,"Failed to convert string $source_string\n");
+        return $source_string;
+    }
+
+
+    /**
+     * Save certificate files in either DER or PEM format
+     *
+     * Certificate files will be saved in the module working directory.
+     * @param string $format  only "der" and "pem" are currently allowed
+     * @return array an array of arrays or FALSE on error
+     * saved certificate file names are avalable under the 'file' index
+     * additional array entries are indexed as 'sha1', 'md5', and 'root'.
+     * sha1 and md5 are correcponding certificate hashes
+     * root is set to 1 for the CA roor certicicate and 0 otherwise
+     */ 
+    final protected function saveCertificateFiles($format) {
+        if($format == 'der' || $format == 'pam') {
+        $i = 0;
+        $CA_files = [];
+        $ca_array = $this->attributes['internal:CAs'][0];
+        if(! $ca_array)
+            return(FALSE);
+        foreach ($ca_array as $CA) {
+            $f = fopen("cert-$i.crt","w");
+            if(! $f) die("problem opening the file\n");
+            if($format == "pem")
             fwrite($f,$CA['pem']);
-         else
+            else
             fwrite($f,$CA['der']);
-         fclose($f);
-         $C = [];
-         $C['file'] = "cert-$i.crt";
-         $C['sha1'] = $CA['sha1'];
-         $C['md5'] = $CA['md5'];
-         $C['root'] = $CA['root'];
-         $CA_files[] = $C;
-         $i++;
-       }
-       return($CA_files);
-     } else {
-       debug(2, 'incorrect format value specified');
-       return(FALSE);
-     }
+            fclose($f);
+            $C = [];
+            $C['file'] = "cert-$i.crt";
+            $C['sha1'] = $CA['sha1'];
+            $C['md5'] = $CA['md5'];
+            $C['root'] = $CA['root'];
+            $CA_files[] = $C;
+            $i++;
+        }
+        return($CA_files);
+        } else {
+        debug(2, 'incorrect format value specified');
+        return(FALSE);
+        }
       
-   }
-
-   /**
-    * Generate installer filename base.
-    * Device module should use this name adding an extension.
-    * Normally the device identifier follows the Consortium name.
-    * The sting taken for the device identifier equals (by default) to the index in the listDevices array,
-    * but can be overriden with the 'device_id' device option.
-    */
-   private function getInstallerBasename() {
-      $replace_pattern = '/[ ()\/\'"]+/';
-      $lang_pointer = Config::$LANGUAGES[$this->lang_index]['latin_based'] == TRUE ? 0 : 1;
-      debug(4,"getInstallerBasename1:".$this->attributes['general:instname'][$lang_pointer]."\n");
-      $inst = iconv("UTF-8", "US-ASCII//TRANSLIT", preg_replace($replace_pattern, '_', $this->attributes['general:instname'][$lang_pointer]));
-      debug(4,"getInstallerBasename2:$inst\n");
-      $Inst_a = explode('_',$inst);
-      if(count($Inst_a) > 2) {
-         $inst = '';
-         foreach($Inst_a as $i)
-           $inst .= $i[0];
-      }   
-      $c_name = iconv("UTF-8", "US-ASCII//TRANSLIT", preg_replace($replace_pattern, '_', Config::$CONSORTIUM['name']));
-      if($this->attributes['internal:profile_count'][0] > 1) {
-         if(!empty($this->attributes['profile:name']) && ! empty($this->attributes['profile:name'][$lang_pointer])) {
-             $prof = iconv("UTF-8", "US-ASCII//TRANSLIT", preg_replace($replace_pattern, '_', $this->attributes['profile:name'][$lang_pointer]));
-             $prof = preg_replace('/_+$/','',$prof);
-             return $c_name. '-'. $this->getDeviceId() . $inst .'-'. $prof;
-         }
-      }
-      return $c_name. '-'. $this->getDeviceId() . $inst;
-  }
-
-  private function getDeviceId() {
+    }
+
+    /**
+     * Generate installer filename base.
+     * Device module should use this name adding an extension.
+     * Normally the device identifier follows the Consortium name.
+     * The sting taken for the device identifier equals (by default) to the index in the listDevices array,
+     * but can be overriden with the 'device_id' device option.
+     */
+    private function getInstallerBasename() {
+        $replace_pattern = '/[ ()\/\'"]+/';
+        $lang_pointer = Config::$LANGUAGES[$this->lang_index]['latin_based'] == TRUE ? 0 : 1;
+        debug(4,"getInstallerBasename1:".$this->attributes['general:instname'][$lang_pointer]."\n");
+        $inst = iconv("UTF-8", "US-ASCII//TRANSLIT", preg_replace($replace_pattern, '_', $this->attributes['general:instname'][$lang_pointer]));
+        debug(4,"getInstallerBasename2:$inst\n");
+        $Inst_a = explode('_',$inst);
+        if(count($Inst_a) > 2) {
+            $inst = '';
+            foreach($Inst_a as $i)
+            $inst .= $i[0];
+        }   
+        $c_name = iconv("UTF-8", "US-ASCII//TRANSLIT", preg_replace($replace_pattern, '_', Config::$CONSORTIUM['name']));
+        if($this->attributes['internal:profile_count'][0] > 1) {
+            if(!empty($this->attributes['profile:name']) && ! empty($this->attributes['profile:name'][$lang_pointer])) {
+                $prof = iconv("UTF-8", "US-ASCII//TRANSLIT", preg_replace($replace_pattern, '_', $this->attributes['profile:name'][$lang_pointer]));
+                $prof = preg_replace('/_+$/','',$prof);
+                return $c_name. '-'. $this->getDeviceId() . $inst .'-'. $prof;
+            }
+        }
+        return $c_name. '-'. $this->getDeviceId() . $inst;
+    }
+
+    private function getDeviceId() {
     $d_id = $this->device_id;
     if(isset($this->options['device_id'])) 
-      $d_id = $this->options['device_id'];
+        $d_id = $this->options['device_id'];
     if($d_id !== '')
-      $d_id .= '-';
+        $d_id .= '-';
     return $d_id;
-  }
+    }
 
 
-  private function getSSIDs() {
+    private function getSSIDs() {
     $S['add']=[];
     $S['del']=[];
     if (isset(Config::$CONSORTIUM['ssid'])) {
-       foreach (Config::$CONSORTIUM['ssid'] as $ssid) {
+        foreach (Config::$CONSORTIUM['ssid'] as $ssid) {
         if(isset(Config::$CONSORTIUM['tkipsupport']) && Config::$CONSORTIUM['tkipsupport'] == TRUE)
-          $S['add'][$ssid] = 'TKIP';
+            $S['add'][$ssid] = 'TKIP';
         else {
-          $S['add'][$ssid] = 'AES';
-          $S['del'][$ssid] = 'TKIP';
+            $S['add'][$ssid] = 'AES';
+            $S['del'][$ssid] = 'TKIP';
+        }
         }
-       }
     }
     if(isset($this->attributes['media:SSID'])) {
-      $SSID = $this->attributes['media:SSID'];
+        $SSID = $this->attributes['media:SSID'];
 
-      foreach($SSID as $ssid)
-         $S['add'][$ssid] = 'AES';
-      }
+        foreach($SSID as $ssid)
+            $S['add'][$ssid] = 'AES';
+        }
     if(isset($this->attributes['media:SSID_with_legacy'])) {
-      $SSID = $this->attributes['media:SSID_with_legacy'];
-      foreach($SSID as $ssid)
-         $S['add'][$ssid] = 'TKIP';
+        $SSID = $this->attributes['media:SSID_with_legacy'];
+        foreach($SSID as $ssid)
+            $S['add'][$ssid] = 'TKIP';
     }
     if(isset($this->attributes['media:remove_SSID'])) {
-      $SSID = $this->attributes['media:remove_SSID'];
-      foreach($SSID as $ssid)
-         $S['del'][$ssid] = 'DEL';
+        $SSID = $this->attributes['media:remove_SSID'];
+        foreach($SSID as $ssid)
+            $S['del'][$ssid] = 'DEL';
     }
     return $S;
-  }
+    }
 
-  private function getConsortia() {
-      $OIs = [];
-      $OIs = array_merge($OIs, Config::$CONSORTIUM['interworking-consortium-oi']);
-      if (isset($this->attributes['media:consortium_OI']))
-          foreach ($this->attributes['media:consortium_OI'] as $new_oi)
+    private function getConsortia() {
+        $OIs = [];
+        $OIs = array_merge($OIs, Config::$CONSORTIUM['interworking-consortium-oi']);
+        if (isset($this->attributes['media:consortium_OI']))
+            foreach ($this->attributes['media:consortium_OI'] as $new_oi)
             $OIs[] = $new_oi;
-      return $OIs;
-  }
+        return $OIs;
+    }
   
-  /**
-   * An array with shorthand definitions for MIME types
-   * @var array
-   */
-  private $mime_extensions = [
-     'text/plain' => 'txt',
-     'text/rtf' => 'rtf',
-     'application/pdf' =>'pdf',
-  ];
-
-  private function saveLogoFile($Logos) {
+    /**
+     * An array with shorthand definitions for MIME types
+     * @var array
+     */
+    private $mime_extensions = [
+        'text/plain' => 'txt',
+        'text/rtf' => 'rtf',
+        'application/pdf' =>'pdf',
+    ];
+
+    private function saveLogoFile($Logos) {
     $i=0;
     $returnarray= [];
     foreach ($Logos as $blob) {
-      $finfo = new finfo(FILEINFO_MIME_TYPE);
-      $mime = $finfo->buffer($blob);
-      if(preg_match('/^image\/(.*)/',$mime,$m))
+        $finfo = new finfo(FILEINFO_MIME_TYPE);
+        $mime = $finfo->buffer($blob);
+        if(preg_match('/^image\/(.*)/',$mime,$m))
         $ext = $m[1];
-      else
+        else
         $ext = 'unsupported';
-      debug(4,"saveLogoFile: $mime : $ext\n");
-      $f_name = 'logo-'.$i.'.'.$ext;
-      $f = fopen($f_name,"w");
-      if(! $f) {
-          debug(2,"saveLogoFile failed for: $f_name\n");
-          die("problem opening the file\n");
-      }
-      fwrite($f,$blob);
-      fclose($f);
-      $returnarray[]= ['name'=>$f_name,'mime'=>$ext];
-      $i++;
+        debug(4,"saveLogoFile: $mime : $ext\n");
+        $f_name = 'logo-'.$i.'.'.$ext;
+        $f = fopen($f_name,"w");
+        if(! $f) {
+            debug(2,"saveLogoFile failed for: $f_name\n");
+            die("problem opening the file\n");
+        }
+        fwrite($f,$blob);
+        fclose($f);
+        $returnarray[]= ['name'=>$f_name,'mime'=>$ext];
+        $i++;
     }
     return($returnarray);
-  }
+    }
 
 
-  private function saveInfoFile($blob) {
+    private function saveInfoFile($blob) {
     $finfo = new finfo(FILEINFO_MIME_TYPE);
     $mime = $finfo->buffer($blob);
     $ext = isset($this->mime_extensions[$mime]) ? $this->mime_extensions[$mime] : 'usupported';
@@ -452,43 +452,43 @@ 
     fwrite($f,$blob);
     fclose($f);
     return(['name'=>'local-info.'.$ext,'mime'=>$ext]);
-  }
-
-  private function getProfileAttributes(Profile $profile) {
-     $eaps = $profile->getEapMethodsinOrderOfPreference(1);
-     if($eap = $this->getPreferredEapType($eaps)) {
-          $a = $profile->getCollapsedAttributes($eap);
-          $a['eap'] = $eap;
-          $a['all_eaps'] = $eaps;
-          return($a);
-     } else {
-       error("No supported eap types found for this profile.");
-       return(FALSE);
-  }
-  }
+    }
+
+    private function getProfileAttributes(Profile $profile) {
+        $eaps = $profile->getEapMethodsinOrderOfPreference(1);
+        if($eap = $this->getPreferredEapType($eaps)) {
+            $a = $profile->getCollapsedAttributes($eap);
+            $a['eap'] = $eap;
+            $a['all_eaps'] = $eaps;
+            return($a);
+        } else {
+        error("No supported eap types found for this profile.");
+        return(FALSE);
+    }
+    }
 /**
-  * dumps attributes for debugging purposes
-  *
-  * dumpAttibutes method is supplied for debuging purposes, it simply dumps the attribute array
-  * to a file with name passed in the attribute.
-  * @param string $file the output file name
-  */
-  protected function dumpAttibutes($file) {
+     * dumps attributes for debugging purposes
+     *
+     * dumpAttibutes method is supplied for debuging purposes, it simply dumps the attribute array
+     * to a file with name passed in the attribute.
+     * @param string $file the output file name
+     */
+    protected function dumpAttibutes($file) {
         ob_start();
         print_r($this->attributes);
         $output = ob_get_clean();
         $f = fopen($file,"w");
         fwrite($f,$output);
         fclose($f);
-  }
+    }
 /** 
- * placeholder for the main device method
- *
- */
+     * placeholder for the main device method
+     *
+     */
 
-  protected function writeInstaller() {
-     return("download path");
-  }
+    protected function writeInstaller() {
+        return("download path");
+    }
 
 /**
  * Array passing all options to the device module.
@@ -522,75 +522,75 @@ 
  * @see X509::processCertificate()
  * @var array $attributes
  */
-  public $attributes;
+    public $attributes;
 /**
-  * stores the path to the module source location and is used 
-  * by copyFile and translateFile
-  * the only reason for it to be a public variable ies that it is set by the DeviceFactory class
-  * module_path should not be used by module drivers.
-  * @var string 
-  */
-  public $module_path;
+     * stores the path to the module source location and is used 
+     * by copyFile and translateFile
+     * the only reason for it to be a public variable ies that it is set by the DeviceFactory class
+     * module_path should not be used by module drivers.
+     * @var string 
+     */
+    public $module_path;
 
 /**
  * The optimal EAP type
  *
  */ 
 /**
-  * optimal EAP method selected given profile and device
-  * @var EAP::constant
-  */
-  public $selected_eap;
+ * optimal EAP method selected given profile and device
+ * @var EAP::constant
+ */
+    public $selected_eap;
 /**
-  * the path to the profile signing program
-  * device modules which require signing should use this property to exec the signer
-  * the signer program must accept two arguments - input and output file names
-  * the signer program mus operate in the local directory and filenames are relative to this
-  * directory
-  *
-  *@var string
-  */
-  public $sign;
-  public $signer;
+     * the path to the profile signing program
+     * device modules which require signing should use this property to exec the signer
+     * the signer program must accept two arguments - input and output file names
+     * the signer program mus operate in the local directory and filenames are relative to this
+     * directory
+     *
+     *@var string
+     */
+    public $sign;
+    public $signer;
 /**
- * the string referencing the language (index ot the Config::$LANGUAGES array).
- * It is set to the current language and may be used by the device module to
- * set its language
- *
- *@var string
- */
-  public $lang_index;
-  /**
-   * The string identifier of the device (don't show this to users)
-   * @var string
-   */
-  public $device_id;
-
-  /**
-   * See devices-template.php for a list of available options
-   * @var array
-   */
-  public $options;
-
-  /**
-   * This string will be shown if no support email was configured by the admin
-   * 
-   * @var string 
-   */
-  public static $support_email_substitute;
-
-  /**
-   * This string will be shown if no support URL was configured by the admin
-   * 
-   * @var string 
-   */
-  public static $support_url_substitute;
-
-  /**
-   * This string should be used by all installer modules to set the 
-   * installer file basename.
-   *
-   * @var string 
-   */
-  public static $installerBasename;
+     * the string referencing the language (index ot the Config::$LANGUAGES array).
+     * It is set to the current language and may be used by the device module to
+     * set its language
+     *
+     *@var string
+     */
+    public $lang_index;
+    /**
+     * The string identifier of the device (don't show this to users)
+     * @var string
+     */
+    public $device_id;
+
+    /**
+     * See devices-template.php for a list of available options
+     * @var array
+     */
+    public $options;
+
+    /**
+     * This string will be shown if no support email was configured by the admin
+     * 
+     * @var string 
+     */
+    public static $support_email_substitute;
+
+    /**
+     * This string will be shown if no support URL was configured by the admin
+     * 
+     * @var string 
+     */
+    public static $support_url_substitute;
+
+    /**
+     * This string should be used by all installer modules to set the 
+     * installer file basename.
+     *
+     * @var string 
+     */
+    public static $installerBasename;
 }

core/Profile.php

Indentation +1 added lines, -3 removed lines

@@ -819,6 +819,4 @@
      * boolean value: should anonymous outer IDs be used or not?
      * @var boolean
      */
-    public $use_anon_outer;
-
-}
+    public $use_anon_outer
\ No newline at end of file