GEANT / CAT

core/Options.php

Spacing +9 added lines, -9 removed lines

@@ -77,15 +77,15 @@ 
      */
     private function __construct() {
         $this->type_db = [];
-        debug(3,"--- BEGIN constructing Options instance ---\n");
+        debug(3, "--- BEGIN constructing Options instance ---\n");
         $options = DBConnection::exec(Options::$DB_TYPE, "SELECT name,type,flag from profile_option_dict ORDER BY name");
-        while($a = mysqli_fetch_object($options))
-            $this->type_db[$a->name]       =  ["type" => $a->type, "flag" => $a->flag];
-        $this->type_db["general:logo_url"] =  ["type" => "string", "flag" => NULL];
-        $this->type_db["eap:ca_url"]       =  ["type" => "string", "flag" => NULL];
-        $this->type_db["internal:country"] =  ["type" => "string", "flag" => NULL];
+        while ($a = mysqli_fetch_object($options))
+            $this->type_db[$a->name]       = ["type" => $a->type, "flag" => $a->flag];
+        $this->type_db["general:logo_url"] = ["type" => "string", "flag" => NULL];
+        $this->type_db["eap:ca_url"]       = ["type" => "string", "flag" => NULL];
+        $this->type_db["internal:country"] = ["type" => "string", "flag" => NULL];
 
-        debug(3,"--- END constructing Options instance ---\n");
+        debug(3, "--- END constructing Options instance ---\n");
     }
     
     /**
@@ -99,13 +99,13 @@ 
      */
     public function availableOptions($class_name = 0) {
         $temporary_array = [];
-        debug(3,"CLASSNAME IS $class_name\n");
+        debug(3, "CLASSNAME IS $class_name\n");
         
         foreach (array_keys($this->type_db) as $name) {
             if ($class_name === 0) {
                 $temporary_array[] = $name;
             } else {
-                if ( preg_match('/^'.$class_name.':/', $name) > 0 ) {
+                if (preg_match('/^' . $class_name . ':/', $name) > 0) {
                         $temporary_array[] = $name;
                 }
             }

core/Profile.php

Spacing +13 added lines, -13 removed lines

@@ -120,7 +120,7 @@ 
                 $temparray[] = [
                     "name" => $a->option_name,
                     "value" => $a->option_value,
-                    "level" => ($a->device_id == NULL && $a->method == 0 ? "Profile" : "Method" ),
+                    "level" => ($a->device_id == NULL && $a->method == 0 ? "Profile" : "Method"),
                     "row" => $a->row,
                     "device" => $a->device_id,
                     "flag" => $optinfo['flag'],
@@ -141,8 +141,8 @@ 
 
                 $temparray[] = [
                     "name" => $a->option_name,
-                    "value" => ( $lang == "" ? $content : serialize(['lang' => $lang, 'content' => $content])),
-                    "level" => ($a->device_id == NULL && $a->method == 0 ? "Profile" : "Method" ),
+                    "value" => ($lang == "" ? $content : serialize(['lang' => $lang, 'content' => $content])),
+                    "level" => ($a->device_id == NULL && $a->method == 0 ? "Profile" : "Method"),
                     "row" => $a->row,
                     "flag" => $optinfo['flag'],
                     "device" => $a->device_id,
@@ -355,7 +355,7 @@ 
             if ($lc = mysqli_fetch_object($exec_update)->last_change) {
                 if ($lc < $cache->tm) {
                     debug(4, "Installer cached:$cache->download_path\n");
-                    return(['cache'=>$cache->download_path,'mime'=>$cache->mime]);
+                    return(['cache'=>$cache->download_path, 'mime'=>$cache->mime]);
                 }
                 else
                     return NULL;
@@ -373,7 +373,7 @@ 
      * @param string device the device identifier string
      * @param string path the path where the new installer can be found
      */
-    public function updateCache($device, $path,$mime) {
+    public function updateCache($device, $path, $mime) {
         $device = DBConnection::escape_value(Profile::$DB_TYPE, $device);
         $path   = DBConnection::escape_value(Profile::$DB_TYPE, $path);
         DBConnection::exec(Profile::$DB_TYPE, "INSERT INTO downloads (profile_id,device_id,download_path,mime,lang,installer_time) 
@@ -471,7 +471,7 @@ 
         $attr_value = DBConnection::escape_value(Profile::$DB_TYPE, $attr_value);
         
         DBConnection::exec(Profile::$DB_TYPE, "INSERT INTO profile_option (profile_id, option_name, option_value, eap_method_id" . ($device !== 0 ? ",device_id" : "") . ") 
-                          VALUES(". $this->identifier . ", '$attr_name', '$attr_value', $eap_type" . ($device !== 0 ? ",'". DBConnection::escape_value(Profile::$DB_TYPE, $device) . "'" : "" ) . ")");
+                          VALUES(". $this->identifier . ", '$attr_name', '$attr_value', $eap_type" . ($device !== 0 ? ",'" . DBConnection::escape_value(Profile::$DB_TYPE, $device) . "'" : "") . ")");
         $this->updateFreshness();
     }
 
@@ -524,20 +524,20 @@ 
      * @param string $localpart the username
      *
      */
-    public function setRealmCheckUser($shallwe,$localpart = NULL) {
+    public function setRealmCheckUser($shallwe, $localpart = NULL) {
         DBConnection::exec(Profile::$DB_TYPE, 
                 "UPDATE profile SET checkuser_outer = " . ($shallwe == true ? "1" : "0") . 
-                ( $localpart !== NULL ? ", checkuser_value = '$localpart' " : "") .
+                ($localpart !== NULL ? ", checkuser_value = '$localpart' " : "") .
                 " WHERE profile_id = $this->identifier");
     }
 
     /** should username be verified or even prefilled?
      * 
      */
-    public function setInputVerificationPreference($verify,$hint) {
+    public function setInputVerificationPreference($verify, $hint) {
         DBConnection::exec(Profile::$DB_TYPE, 
                 "UPDATE profile SET verify_userinput_suffix = " . ($verify == true ? "1" : "0") . 
-                ", hint_userinput_suffix = ". ($hint == true ? "1" : "0") .
+                ", hint_userinput_suffix = " . ($hint == true ? "1" : "0") .
                 " WHERE profile_id = $this->identifier");
     }
     
@@ -679,15 +679,15 @@ 
             $dev = $factory->device;
             $redirect_url = getLocalisedValue($this->getAttributes("device-specific:redirect", 0, $d), $locale);
             $dev_status = AVAILABLE;
-            if(isset($D['options']) && isset($D['options']['message']) && $D['options']['message']) 
+            if (isset($D['options']) && isset($D['options']['message']) && $D['options']['message']) 
                $message = $D['options']['message'];
             else
                $message = 0;
 
             if ($redirect_url === 0) {
-                if(isset($D['options']) && isset($D['options']['redirect']) && $D['options']['redirect']) {
+                if (isset($D['options']) && isset($D['options']['redirect']) && $D['options']['redirect']) {
                    $dev_status = HIDDEN;
-                }  else {
+                } else {
                    $eap = $dev->getPreferredEapType($preferred_eap);
                    if ($eap) {
                        if (isset($EAP_options["eap-specific:customtext"][serialize($eap)]))

core/X509.php

Spacing +29 added lines, -29 removed lines

@@ -35,7 +35,7 @@ 
 public function pem2der($pem_data) {
    $begin = "CERTIFICATE-----";
    $end   = "-----END";
-   $pem_data = substr($pem_data, strpos($pem_data, $begin)+strlen($begin));
+   $pem_data = substr($pem_data, strpos($pem_data, $begin) + strlen($begin));
    $pem_data = substr($pem_data, 0, strpos($pem_data, $end));
    $der = base64_decode($pem_data);
    return $der;
@@ -43,7 +43,7 @@ 
 
 public function der2pem($der_data) {
    $pem = chunk_split(base64_encode($der_data), 64, "\n");
-   $pem = "-----BEGIN CERTIFICATE-----\n".$pem."-----END CERTIFICATE-----\n";
+   $pem = "-----BEGIN CERTIFICATE-----\n" . $pem . "-----END CERTIFICATE-----\n";
    return $pem;
 }
 /**
@@ -63,19 +63,19 @@ 
   * @param blob $cadata certificate in ether PEM or DER format
   * @return array
   */
-public function processCertificate ($cadata) {
-    $begin_pem = strpos($cadata,"-----BEGIN CERTIFICATE-----");
-   if($begin_pem !== FALSE) {
-        $end_c = strpos($cadata,"-----END CERTIFICATE-----") + 25;
-        if($end_c !== FALSE) {
-           $cadata = substr($cadata,$begin_pem,$end_c - $begin_pem);
+public function processCertificate($cadata) {
+    $begin_pem = strpos($cadata, "-----BEGIN CERTIFICATE-----");
+   if ($begin_pem !== FALSE) {
+        $end_c = strpos($cadata, "-----END CERTIFICATE-----") + 25;
+        if ($end_c !== FALSE) {
+           $cadata = substr($cadata, $begin_pem, $end_c - $begin_pem);
         }
         $ca_der = X509::pem2der($cadata);
         $ca_pem = X509::der2pem($ca_der);
         // echo "XXXXXXXXXXXXX".$cadata."XXXXXXXXXXXXX"; exit;
     } else {
         $ca_der = $cadata;
-        $ca_pem =  X509::der2pem($cadata);
+        $ca_pem = X509::der2pem($cadata);
     }
 
     # check that the certificate is OK
@@ -86,11 +86,11 @@ 
     $mydetails = openssl_x509_parse($myca);
     if (!isset($mydetails['subject']))
         return FALSE;
-    $md5 = openssl_digest($ca_der,'MD5');
-    $sha1 = openssl_digest($ca_der,'SHA1');
-    $out =  ["uuid" => uuid(), "pem" => $ca_pem, "der" => $ca_der, "md5"=>$md5, "sha1"=>$sha1, "name"=>$mydetails['name']];
+    $md5 = openssl_digest($ca_der, 'MD5');
+    $sha1 = openssl_digest($ca_der, 'SHA1');
+    $out = ["uuid" => uuid(), "pem" => $ca_pem, "der" => $ca_der, "md5"=>$md5, "sha1"=>$sha1, "name"=>$mydetails['name']];
     $diff_a = array_diff($mydetails['issuer'], $mydetails['subject']);
-    if(count($diff_a) == 0 ) {
+    if (count($diff_a) == 0) {
      $out['root'] = 1;
      $mydetails['type'] = 'root';
     } else {
@@ -99,16 +99,16 @@ 
     // if no basicContraints are set at all, this is a problem in itself
     // is this a CA? or not? Treat as server, but add a warning...
     if (isset($mydetails['extensions']['basicConstraints'])) {
-       $out['ca'] = preg_match('/^CA:TRUE/',$mydetails['extensions']['basicConstraints']);
+       $out['ca'] = preg_match('/^CA:TRUE/', $mydetails['extensions']['basicConstraints']);
        $out['basicconstraints_set'] = 1;
     } else {
        $out['ca'] = 0; // we need to resolve this ambiguity
        $out['basicconstraints_set'] = 0;
     }
     
-    if( $out['ca'] > 0 && $out['root'] == 0 )
+    if ($out['ca'] > 0 && $out['root'] == 0)
      $mydetails['type'] = 'interm_ca';
-    if( $out['ca'] == 0 && $out['root'] == 0 )
+    if ($out['ca'] == 0 && $out['root'] == 0)
      $mydetails['type'] = 'server';
     $mydetails['sha1'] = $sha1;
     $out['full_details'] = $mydetails;
@@ -118,12 +118,12 @@ 
     
     
     openssl_x509_export($myca, $output, FALSE);
-    if(preg_match('/^\s+Signature Algorithm:\s*(.*)\s*$/m', $output, $match)) 
+    if (preg_match('/^\s+Signature Algorithm:\s*(.*)\s*$/m', $output, $match)) 
       $out['full_details']['signature_algorithm'] = $match[1];
     else
       $out['full_details']['signature_algorithm'] = $output;
  
-    if((preg_match('/^\s+Public-Key:\s*\((.*) bit\)\s*$/m', $output, $match)) && is_numeric($match[1])) 
+    if ((preg_match('/^\s+Public-Key:\s*\((.*) bit\)\s*$/m', $output, $match)) && is_numeric($match[1])) 
       $out['full_details']['public_key_length'] = $match[1];
     else
       $out['full_details']['public_key_length'] = $output;
@@ -148,18 +148,18 @@ 
   // the trivial case: if the file is empty, there's no cert in it
   if ($cadata == "")
       return $returnarray;
-  $start_c = strpos($cadata,"-----BEGIN CERTIFICATE-----" );
-  if( $start_c !== FALSE) {
-        $cadata = substr($cadata,$start_c);
-        $end_c = strpos($cadata,"-----END CERTIFICATE-----") + 25;
-        $next_c = strpos($cadata,"-----BEGIN CERTIFICATE-----",30);
-        while ( $next_c !== FALSE) {
-          $returnarray[] = substr($cadata,0,$end_c);
-          $cadata = substr($cadata,$next_c);
-          $end_c = strpos($cadata,"-----END CERTIFICATE-----") + 25;
-          $next_c = strpos($cadata,"-----BEGIN CERTIFICATE-----",30);
+  $start_c = strpos($cadata, "-----BEGIN CERTIFICATE-----");
+  if ($start_c !== FALSE) {
+        $cadata = substr($cadata, $start_c);
+        $end_c = strpos($cadata, "-----END CERTIFICATE-----") + 25;
+        $next_c = strpos($cadata, "-----BEGIN CERTIFICATE-----", 30);
+        while ($next_c !== FALSE) {
+          $returnarray[] = substr($cadata, 0, $end_c);
+          $cadata = substr($cadata, $next_c);
+          $end_c = strpos($cadata, "-----END CERTIFICATE-----") + 25;
+          $next_c = strpos($cadata, "-----BEGIN CERTIFICATE-----", 30);
         }
-        $returnarray[] = substr($cadata,0,$end_c);
+        $returnarray[] = substr($cadata, 0, $end_c);
     } else {
         // TODO: before we blindly hand it over to der2pem - is this valid DER
         // data at all?

core/Helper.php

Spacing +26 added lines, -26 removed lines

@@ -177,65 +177,65 @@
  * @param $fail (default true) decides if a creation failure should cause an error
  * @return - the tupple full directory path, directory name
  */
-function createTemporaryDirectory($purpose = 'installer',$fail = 1) {
-        $name = md5(time().rand());
-        switch($purpose) {
+function createTemporaryDirectory($purpose = 'installer', $fail = 1) {
+        $name = md5(time() . rand());
+        switch ($purpose) {
            case 'installer':
-             $path = CAT::$root.'/var/installer_cache';
+             $path = CAT::$root . '/var/installer_cache';
              break;
            case 'logo':
-             $path = CAT::$root.'/web/downloads/logos';
+             $path = CAT::$root . '/web/downloads/logos';
              break;
            case 'test':
-             $path = CAT::$root.'/var/tmp';
+             $path = CAT::$root . '/var/tmp';
              break;
            default:
              error("unable to create temporary directory for unknown purpose: $purpose\n");
              exit;
         }
-        $tmp_dir = $path .'/'. $name;
-        debug(4,"temp dir: $purpose : $tmp_dir\n");
-        if(! mkdir($tmp_dir,0700, true)) {
-          if($fail) {
+        $tmp_dir = $path . '/' . $name;
+        debug(4, "temp dir: $purpose : $tmp_dir\n");
+        if (!mkdir($tmp_dir, 0700, true)) {
+          if ($fail) {
              error("unable to create temporary directory: $tmp_dir\n");
              exit;
-          } else  {
+          } else {
             debug(4, "Directory creation failed for $tmp_dir\n");
-            return ['base'=>$path,'dir'=>'',$name=>''];
+            return ['base'=>$path, 'dir'=>'', $name=>''];
           }
         } else
          debug(4, "Directory created: $tmp_dir\n");
-     return ['base'=>$path,'dir'=>$tmp_dir,'name'=>$name];
+     return ['base'=>$path, 'dir'=>$tmp_dir, 'name'=>$name];
 }
 
-function png_inject_consortium_logo ($inputpngstring, $symbolsize = 12, $marginsymbols = 4) {
+function png_inject_consortium_logo($inputpngstring, $symbolsize = 12, $marginsymbols = 4) {
     $inputgd = imagecreatefromstring($inputpngstring);
     
-    debug(4,"Consortium logo is at: ".CAT::$root."/web/resources/images/consortium_logo_large.png");
-    $logogd = imagecreatefrompng(CAT::$root."/web/resources/images/consortium_logo_large.png");
+    debug(4, "Consortium logo is at: " . CAT::$root . "/web/resources/images/consortium_logo_large.png");
+    $logogd = imagecreatefrompng(CAT::$root . "/web/resources/images/consortium_logo_large.png");
     
-    $sizeinput = [imagesx($inputgd),imagesy($inputgd)];
-    $sizelogo = [imagesx($logogd),imagesy($logogd)];
+    $sizeinput = [imagesx($inputgd), imagesy($inputgd)];
+    $sizelogo = [imagesx($logogd), imagesy($logogd)];
     // Q level QR-codes can sustain 25% "damage"
     // make our logo cover approx 15% of area to be sure; mind that there's a $symbolsize * $marginsymbols pixel white border around each edge
-    $totalpixels = ($sizeinput[0] - $symbolsize*$marginsymbols) * ($sizeinput[1] - $symbolsize*$marginsymbols);
+    $totalpixels = ($sizeinput[0] - $symbolsize * $marginsymbols) * ($sizeinput[1] - $symbolsize * $marginsymbols);
     $totallogopixels = ($sizelogo[0]) * ($sizelogo[1]);
     $maxoccupy = $totalpixels * 0.04;
     // find out how much we have to scale down logo to reach 10% QR estate
     $scale = sqrt($maxoccupy / $totallogopixels);
-    debug(4,"Scaling info: $scale, $maxoccupy, $totallogopixels\n");
+    debug(4, "Scaling info: $scale, $maxoccupy, $totallogopixels\n");
     // determine final pixel size - round to multitude of $symbolsize to match exact symbol boundary
     $targetwidth = $symbolsize * round($sizelogo[0] * $scale / $symbolsize);
     $targetheight = $symbolsize * round($sizelogo[1] * $scale / $symbolsize);
     // paint white below the logo, in case it has transparencies (looks bad)
     // have one symbol in each direction extra white space
-    $whiteimage = imagecreate($targetwidth+2*$symbolsize, $targetheight+2*$symbolsize);
-    imagecolorallocate($whiteimage, 255,255,255);
+    $whiteimage = imagecreate($targetwidth + 2 * $symbolsize, $targetheight + 2 * $symbolsize);
+    imagecolorallocate($whiteimage, 255, 255, 255);
     // also make sure the initial placement is a multitude of 12; otherwise "two half" symbols might be affected
-    $targetplacementx = $symbolsize * round(($sizeinput[0] / 2 - ($targetwidth - $symbolsize) / 2)/$symbolsize);
-    $targetplacementy = $symbolsize * round(($sizeinput[1] / 2 - ($targetheight - $symbolsize) / 2)/$symbolsize);
-    imagecopyresized($inputgd, $whiteimage, $targetplacementx-$symbolsize, $targetplacementy-$symbolsize, 0, 0, $targetwidth+2*$symbolsize, $targetheight+2*$symbolsize, $targetwidth+2*$symbolsize, $targetheight+2*$symbolsize);
-    imagecopyresized($inputgd, $logogd,     $targetplacementx, $targetplacementy, 0, 0, $targetwidth   , $targetheight   , $sizelogo[0]   , $sizelogo[1]);
+    $targetplacementx = $symbolsize * round(($sizeinput[0] / 2 - ($targetwidth - $symbolsize) / 2) / $symbolsize);
+    $targetplacementy = $symbolsize * round(($sizeinput[1] / 2 - ($targetheight - $symbolsize) / 2) / $symbolsize);
+    imagecopyresized($inputgd, $whiteimage, $targetplacementx - $symbolsize, $targetplacementy - $symbolsize, 0, 0, $targetwidth + 2 * $symbolsize, $targetheight + 2 * $symbolsize, $targetwidth + 2 * $symbolsize, $targetheight + 2 * $symbolsize);
+    imagecopyresized($inputgd, $logogd, $targetplacementx, $targetplacementy, 0, 0, $targetwidth, $targetheight, $sizelogo[0], $sizelogo[1]);
  // imagecopyresized($dst_image, $src_image, $dst_x,                               $dst_y,                                $src_x, $src_y, $dst_w,       $dst_h,        $src_w,       $src_h);
     ob_start();
     imagepng($inputgd);

core/UserAPI.php

Spacing +150 added lines, -150 removed lines

@@ -52,21 +52,21 @@ 
  *  link - the path name of the resulting installer
  *  mime - the mimetype of the installer
  */
-  public function generateInstaller($device,$prof_id, $generated_for = "user") {
+  public function generateInstaller($device, $prof_id, $generated_for = "user") {
     $this->set_locale("devices");
     $Dev = Devices::listDevices();
     $Config = $Dev[$device];
-    debug(4,"installer:$device:$prof_id\n");
+    debug(4, "installer:$device:$prof_id\n");
     $profile = new Profile($prof_id);
     $attribs = $profile->getCollapsedAttributes();
     // test if the profile is production-ready and if not if the authenticated user is an owner
     if (!isset($attribs['profile:production']) || (isset($attribs['profile:production']) && $attribs['profile:production'][0] != "on")) {
-       debug(4,"Attempt to download a non-production ready installer fir profile: $prof_id\n");
+       debug(4, "Attempt to download a non-production ready installer fir profile: $prof_id\n");
        require_once(Config::$AUTHENTICATION['ssp-path-to-autoloader']);
        $as = new SimpleSAML_Auth_Simple(Config::$AUTHENTICATION['ssp-authsource']);
-       if($as->isAuthenticated()) {
+       if ($as->isAuthenticated()) {
           $user_object = new User($_SESSION['user']);
-          if($user_object->isIdPOwner($profile->institution)) {
+          if ($user_object->isIdPOwner($profile->institution)) {
               debug(4, "User is the owner - allowing access\n");
           } else {
              debug(2, "User not an owner of a non-production profile - access forbidden\n");
@@ -82,38 +82,38 @@ 
     $a = [];
     $a['profile'] = $prof_id;
     $a['device'] = $device;
-    if( (isset(Devices::$Options['no_cache']) && Devices::$Options['no_cache'] ) || ( isset($Config['options']['no_cache']) && $Config['options']['no_cache'] ))
+    if ((isset(Devices::$Options['no_cache']) && Devices::$Options['no_cache']) || (isset($Config['options']['no_cache']) && $Config['options']['no_cache']))
       $this->i_path = FALSE;
     else {
       $cache = $profile->testCache($device);
       $this->i_path = $cache['cache'];
     }
-    if($this->i_path && is_file($this->i_path)) { 
-      debug(4,"Using cached installer for: $device\n");
-      $a['link'] = "API.php?api_version=$version&action=downloadInstaller&lang=".CAT::get_lang()."&profile=$prof_id&device=$device&generatedfor=$generated_for";
+    if ($this->i_path && is_file($this->i_path)) { 
+      debug(4, "Using cached installer for: $device\n");
+      $a['link'] = "API.php?api_version=$version&action=downloadInstaller&lang=" . CAT::get_lang() . "&profile=$prof_id&device=$device&generatedfor=$generated_for";
       $a['mime'] = $cache['mime'];
     } else {
       $factory = new DeviceFactory($device);
       $dev = $factory->device;
-      if(isset($dev)) {
+      if (isset($dev)) {
          $dev->setup($profile);
          $installer = $dev->writeInstaller();
-         $i_path = $dev->FPATH.'/tmp/'.$installer;
-         if($i_path && is_file($i_path)) {
-         if(isset($dev->options['mime']))
+         $i_path = $dev->FPATH . '/tmp/' . $installer;
+         if ($i_path && is_file($i_path)) {
+         if (isset($dev->options['mime']))
                $a['mime'] = $dev->options['mime'];
          else {
            $info = new finfo();
            $a['mime'] = $info->file($i_path, FILEINFO_MIME_TYPE);
          }
-         $this->i_path = $dev->FPATH.'/'.$installer;
+         $this->i_path = $dev->FPATH . '/' . $installer;
          rename($i_path, $this->i_path);
-         $profile->updateCache($device,$this->i_path,$a['mime']);
+         $profile->updateCache($device, $this->i_path, $a['mime']);
 //         rrmdir($dev->FPATH.'/tmp');
-         debug(4,"Generated installer: ".$this->i_path.": for: $device\n");
-         $a['link'] = "API.php?api_version=$version&action=downloadInstaller&lang=".CAT::get_lang()."&profile=$prof_id&device=$device&generatedfor=$generated_for";
+         debug(4, "Generated installer: " . $this->i_path . ": for: $device\n");
+         $a['link'] = "API.php?api_version=$version&action=downloadInstaller&lang=" . CAT::get_lang() . "&profile=$prof_id&device=$device&generatedfor=$generated_for";
          } else {
-         debug(2,"Installer generation failed for: $prof_id:$device:".CAT::get_lang()."\n");
+         debug(2, "Installer generation failed for: $prof_id:$device:" . CAT::get_lang() . "\n");
          $a['link'] = 0;
          }
       } 
@@ -129,31 +129,31 @@ 
     $Dev = Devices::listDevices();
     $R = [];
     $ct = 0;
-    if($show_hidden !== 0 && $show_hidden != 1)
+    if ($show_hidden !== 0 && $show_hidden != 1)
       return;
     foreach ($Dev as $device => $D) {
-      if(isset($D['options']['hidden']) && $D['options']['hidden'] && $show_hidden == 0)
+      if (isset($D['options']['hidden']) && $D['options']['hidden'] && $show_hidden == 0)
          continue;
-      $ct ++;
-      if($this->version == 1)
+      $ct++;
+      if ($this->version == 1)
          $D['device'] = $device;
       else
          $D['device'] = $device;
       $group = isset($D['group']) ? $D['group'] : 'other';
-      if (! isset($R[$group]))
+      if (!isset($R[$group]))
          $R[$group] = [];
       $R[$group][$device] = $D;
     }
    return $R;
  }
 
- public function deviceInfo($device,$prof_id) {
+ public function deviceInfo($device, $prof_id) {
     $this->set_locale("devices");
     $out = 0;
     $profile = new Profile($prof_id);
     $factory = new DeviceFactory($device);
     $dev = $factory->device;
-    if(isset($dev)) {
+    if (isset($dev)) {
 //       $dev->setup($profile);
        $out = $dev->writeDeviceInfo();
    }
@@ -178,13 +178,13 @@ 
       $profile = new Profile($prof_id);
       $attr = $profile->getCollapsedAttributes();
       $a = [];
-      if(isset($attr['support:email']))
+      if (isset($attr['support:email']))
          $a['local_email'] = $attr['support:email'][0];
-      if(isset($attr['support:phone']))
+      if (isset($attr['support:phone']))
          $a['local_phone'] = $attr['support:phone'][0];
-      if(isset($attr['support:url']))
+      if (isset($attr['support:url']))
          $a['local_url'] = $attr['support:url'][0];
-      if(isset($attr['profile:description']))
+      if (isset($attr['profile:description']))
          $a['description'] = $attr['profile:description'][0];
       $a['devices'] = $profile->listDevices();
       $this->set_locale("web_user");
@@ -196,30 +196,30 @@ 
    cicumstances
 */
 private function GetRootURL() {
-    $backtrace =  debug_backtrace();
+    $backtrace = debug_backtrace();
     $F = array_pop($backtrace);
-    $file= $F['file'];
-    $file = substr($file,strlen(dirname(__DIR__)));
-    while(substr($file,0,1) == '/')
-       $file = substr($file,1);
-    $n = count(explode('/',$file));
+    $file = $F['file'];
+    $file = substr($file, strlen(dirname(__DIR__)));
+    while (substr($file, 0, 1) == '/')
+       $file = substr($file, 1);
+    $n = count(explode('/', $file));
     $out = $_SERVER['SCRIPT_NAME'];
-    for ($i= 0; $i < $n; $i++)
+    for ($i = 0; $i < $n; $i++)
       $out = dirname($out);
     if ($out == '/')
       $out = '';
     $s = isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] ? 'https' : 'http';
-    $s .= '://'.$_SERVER['HTTP_HOST'] . $out;
+    $s .= '://' . $_SERVER['HTTP_HOST'] . $out;
     return $s;
 }
 
 /* JSON functions */
 
-  public function return_json($data,$status=1) {
+  public function return_json($data, $status = 1) {
      $return_array = [];
      $return_array['status'] = $status;
      $return_array['data'] = $data;
-     $return_array['tou'] =  "Please consult Terms of Use at: ".$this->GetRootURL()."/tou.php";
+     $return_array['tou'] = "Please consult Terms of Use at: " . $this->GetRootURL() . "/tou.php";
      return(json_encode($return_array));
   }
 
@@ -230,11 +230,11 @@ 
   */
   public function JSON_listLanguages() {
      $return_array = [];
-     foreach(Config::$LANGUAGES as $id => $val){
-       if($this->version == 1)
-          $return_array[] = ['id'=>$id,'display'=>$val['display'],'locale'=>$val['locale']];
+     foreach (Config::$LANGUAGES as $id => $val) {
+       if ($this->version == 1)
+          $return_array[] = ['id'=>$id, 'display'=>$val['display'], 'locale'=>$val['locale']];
        else
-          $return_array[] = ['lang'=>$id,'display'=>$val['display'],'locale'=>$val['locale']];
+          $return_array[] = ['lang'=>$id, 'display'=>$val['display'], 'locale'=>$val['locale']];
      }
      echo $this->return_json($return_array);
   }
@@ -249,10 +249,10 @@ 
      $FED = $this->printCountryList(1);
      $return_array = [];
      foreach ($FED as $id => $val) {
-       if($this->version == 1)
-          $return_array[] = ['id'=>$id,'display'=>$val];
+       if ($this->version == 1)
+          $return_array[] = ['id'=>$id, 'display'=>$val];
        else
-          $return_array[] = ['federation'=>$id,'display'=>$val];
+          $return_array[] = ['federation'=>$id, 'display'=>$val];
      }
      echo $this->return_json($return_array);
   }
@@ -265,13 +265,13 @@ 
  */
 
   public function JSON_listIdentityProviders($country) {
-     $idps = Federation::listAllIdentityProviders(1,$country);
+     $idps = Federation::listAllIdentityProviders(1, $country);
      $return_array = [];
      foreach ($idps as $idp) {
-        if($this->version == 1)
-           $return_array[] = ['id'=>$idp['entityID'],'display'=>$idp['title']];
+        if ($this->version == 1)
+           $return_array[] = ['id'=>$idp['entityID'], 'display'=>$idp['title']];
         else
-           $return_array[] = ['idp'=>$idp['entityID'],'display'=>$idp['title']];
+           $return_array[] = ['idp'=>$idp['entityID'], 'display'=>$idp['title']];
      }
      echo $this->return_json($return_array);
   }
@@ -287,7 +287,7 @@ 
      $idps = Federation::listAllIdentityProviders(1);
      $return_array = [];
      foreach ($idps as $idp) {
-        if($this->version == 1)
+        if ($this->version == 1)
            $idp['id'] = $idp['entityID'];
          else
            $idp['idp'] = $idp['entityID'];
@@ -306,14 +306,14 @@ 
  */
 
 
-  public function JSON_orderIdentityProviders($country,$L=NULL) {
-     $idps = $this->orderIdentityProviders($country,$L);
+  public function JSON_orderIdentityProviders($country, $L = NULL) {
+     $idps = $this->orderIdentityProviders($country, $L);
      $return_array = [];
      foreach ($idps as $idp) {
-        if($this->version == 1)
-           $return_array[] = ['id'=>$idp['id'],'display'=>$idp['title']];
+        if ($this->version == 1)
+           $return_array[] = ['id'=>$idp['id'], 'display'=>$idp['title']];
         else
-           $return_array[] = ['idp'=>$idp['id'],'display'=>$idp['title']];
+           $return_array[] = ['idp'=>$idp['id'], 'display'=>$idp['title']];
      }
      echo $this->return_json($return_array);
   }
@@ -324,28 +324,28 @@ 
  * @param int $idp_id the IdP identifier
  * @return string JSON encoded data
  */
-  public function JSON_listProfiles($idp_id,$sort = 0) {
+  public function JSON_listProfiles($idp_id, $sort = 0) {
      $this->set_locale("web_user");
      $return_array = [];
      try {     
          $idp = new IdP($idp_id);
      }
      catch (Exception $fail) {
-        echo $this->return_json($return_array,0);
+        echo $this->return_json($return_array, 0);
         return;
      }
      $l = 0;
      $logo = $idp->getAttributes('general:logo_file');
-     if($logo)
+     if ($logo)
        $l = 1;
      $profiles = $idp->listProfiles(1);
-     if($sort == 1)
-        usort($profiles,"profile_sort");
+     if ($sort == 1)
+        usort($profiles, "profile_sort");
      foreach ($profiles as $P) {
-       if($this->version == 1)
-          $return_array[] = ['id'=>$P->identifier,'display'=>$P->name, 'idp_name'=>$P->inst_name,'logo'=>$l]; 
+       if ($this->version == 1)
+          $return_array[] = ['id'=>$P->identifier, 'display'=>$P->name, 'idp_name'=>$P->inst_name, 'logo'=>$l]; 
        else
-          $return_array[] = ['profile'=>$P->identifier,'display'=>$P->name, 'idp_name'=>$P->inst_name,'logo'=>$l]; 
+          $return_array[] = ['profile'=>$P->identifier, 'display'=>$P->name, 'idp_name'=>$P->inst_name, 'logo'=>$l]; 
      }
      echo $this->return_json($return_array);
   }
@@ -361,20 +361,20 @@ 
      $return_array = [];
      $a = $this->profileAttributes($profile_id);
      $thedevices = $a['devices'];
-     if(!isset($profile_redirect) || ! $profile_redirect) {
+     if (!isset($profile_redirect) || !$profile_redirect) {
          $profile_redirect = 0;
          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($this->version == 1) {
-                 if($D['id'] === '0') {
+              if ($this->version == 1) {
+                 if ($D['id'] === '0') {
                      $profile_redirect = 1;
                      $disp = $c;
                  }
                 $return_array[] = ['id'=>$D['id'], 'display'=>$disp, 'status'=>$D['status'], 'redirect'=>$D['redirect']];
              } else {
-                 if($D['device'] === '0') {
+                 if ($D['device'] === '0') {
                      $profile_redirect = 1;
                      $disp = $c;
                  }
@@ -393,12 +393,12 @@ 
  * @param int $prof_id profile identifier
  * @return string JSON encoded data
  */
-  public function JSON_generateInstaller($device,$prof_id) {
-    debug(4,"JSON::generateInstaller arguments: $device,$prof_id\n");
-    $o = $this->generateInstaller($device,$prof_id);
-    debug(4,"output from GUI::generateInstaller:");
-    debug(4,$o);
-    debug(4,json_encode($o));
+  public function JSON_generateInstaller($device, $prof_id) {
+    debug(4, "JSON::generateInstaller arguments: $device,$prof_id\n");
+    $o = $this->generateInstaller($device, $prof_id);
+    debug(4, "output from GUI::generateInstaller:");
+    debug(4, $o);
+    debug(4, json_encode($o));
 //    header('Content-type: application/json; utf-8');
     echo $this->return_json($o);
  }
@@ -411,12 +411,12 @@ 
  * @return binary installerFile
  */
 
- public function downloadInstaller($device,$prof_id,$generated_for='user') {
-    debug(4,"downloadInstaller arguments: $device,$prof_id,$generated_for\n");
-    $o = $this->generateInstaller($device,$prof_id);
-    debug(4,"output from GUI::generateInstaller:");
-    debug(4,$o);
-    if(! $o['link']) {
+ public function downloadInstaller($device, $prof_id, $generated_for = 'user') {
+    debug(4, "downloadInstaller arguments: $device,$prof_id,$generated_for\n");
+    $o = $this->generateInstaller($device, $prof_id);
+    debug(4, "output from GUI::generateInstaller:");
+    debug(4, $o);
+    if (!$o['link']) {
        header("HTTP/1.0 404 Not Found");
        return;
     }
@@ -424,9 +424,9 @@ 
     $profile->incrementDownloadStats($device, $generated_for);
     $file = $this->i_path;
     $filetype = $o['mime'];
-    debug(4,"installer MIME type:$filetype\n");
-    header("Content-type: ".$filetype);
-    header('Content-Disposition: inline; filename="'.basename($file).'"');
+    debug(4, "installer MIME type:$filetype\n");
+    header("Content-type: " . $filetype);
+    header('Content-Disposition: inline; filename="' . basename($file) . '"');
     header('Content-Length: ' . filesize($file));
     ob_clean();
     flush();
@@ -444,67 +444,67 @@ 
  *
  */
 
- public function sendLogo($idp_id, $disco=FALSE, $width=0, $height=0) {
+ public function sendLogo($idp_id, $disco = FALSE, $width = 0, $height = 0) {
    $ExpStr = '';
    $resize = 0;
-   if(($width || $height) && is_numeric($width) && is_numeric($height)) {
+   if (($width || $height) && is_numeric($width) && is_numeric($height)) {
        $resize = 1;
-       if($height == 0)
+       if ($height == 0)
           $height = 10000;
-       if($width == 0)
+       if ($width == 0)
           $width = 10000;
-       $logo_file = CAT::$root.'/web/downloads/logos/'.$idp_id.'_'.$width.'_'.$height.'.png';
-   } elseif($disco == 1) {
+       $logo_file = CAT::$root . '/web/downloads/logos/' . $idp_id . '_' . $width . '_' . $height . '.png';
+   } elseif ($disco == 1) {
        $width = 120;
        $height = 40;
        $resize = 1;
-       $logo_file = CAT::$root.'/web/downloads/logos/'.$idp_id.'_'.$width.'_'.$height.'.png';
+       $logo_file = CAT::$root . '/web/downloads/logos/' . $idp_id . '_' . $width . '_' . $height . '.png';
    }
 
-   if($resize && is_file($logo_file)){
-      debug(4,"Using cached logo $logo_file for: $idp_id\n");
+   if ($resize && is_file($logo_file)) {
+      debug(4, "Using cached logo $logo_file for: $idp_id\n");
       $blob = file_get_contents($logo_file);
       $filetype = 'image/png';
    }
    else {
       $idp = new IdP($idp_id);
       $at = $idp->getAttributes('general:logo_file');
-      $blob =  $at[0]['value'];
+      $blob = $at[0]['value'];
       $info = new finfo();
       $filetype = $info->buffer($blob, FILEINFO_MIME_TYPE);
       $offset = 60 * 60 * 24 * 30;
-      $ExpStr = "Expires: " . gmdate( "D, d M Y H:i:s", time() + $offset ) . " GMT";
-      if($resize) {
+      $ExpStr = "Expires: " . gmdate("D, d M Y H:i:s", time() + $offset) . " GMT";
+      if ($resize) {
          $filetype = 'image/png';
          $image = new Imagick();
          $image->readImageBlob($blob);
-         if( $image->setImageFormat('PNG')) {
-           $image->thumbnailImage($width,$height,1);
+         if ($image->setImageFormat('PNG')) {
+           $image->thumbnailImage($width, $height, 1);
            $blob = $image->getImageBlob();
-           debug(4,"Writing cached logo $logo_file for: $idp_id\n");
-           file_put_contents($logo_file,$blob);
+           debug(4, "Writing cached logo $logo_file for: $idp_id\n");
+           file_put_contents($logo_file, $blob);
          }
          else
            $blob = "XXXXXX";
       }
    }
-   header( "Content-type: ".$filetype );
-   header( "Cache-Control:max-age=36000, must-revalidate" );
-   header( $ExpStr );
+   header("Content-type: " . $filetype);
+   header("Cache-Control:max-age=36000, must-revalidate");
+   header($ExpStr);
    echo $blob;
  }
 
  public function locateUser() {
    $host = $_SERVER['REMOTE_ADDR'];
    $record = geoip_record_by_name($host);
-   if($record) {
+   if ($record) {
      $result = ['status' => 'ok'];
      $result['country'] = $record['country_code'];
 //  the two lines below are a dirty hack to take of the error in naming the UK federation
-     if($result['country'] == 'GB')
+     if ($result['country'] == 'GB')
          $result['country'] = 'UK';
      $result['region'] = $record['region'];
-     $result['geo'] = ['lat' => (float)$record['latitude'] , 'lon' => (float)$record['longitude']];
+     $result['geo'] = ['lat' => (float) $record['latitude'], 'lon' => (float) $record['longitude']];
    } else {
      $result = ['status' => 'error', 'error' =>'Problem listing countries']; 
    }
@@ -525,22 +525,22 @@ 
    $result = ['status' => 'ok'];
    $result['country'] = $record->country->isoCode;
 //  the two lines below are a dirty hack to take of the error in naming the UK federation
-   if($result['country'] == 'GB')
+   if ($result['country'] == 'GB')
        $result['country'] = 'UK';
    $result['region'] = $record->continent->name;
 
-   $result['geo'] = ['lat' => (float)$record->location->latitude , 'lon' => (float)$record->location->longitude];
+   $result['geo'] = ['lat' => (float) $record->location->latitude, 'lon' => (float) $record->location->longitude];
    return($result);
  }
 
 public function JSON_locateUser() {
     header('Content-type: application/json; utf-8');
    
-    if(empty(Config::$GEOIP['version']) || Config::$GEOIP['version'] == 0)
+    if (empty(Config::$GEOIP['version']) || Config::$GEOIP['version'] == 0)
       echo json_encode(['status' => 'error', 'error' =>'Geolocation not supported']);
-    if(Config::$GEOIP['version'] == 1)
+    if (Config::$GEOIP['version'] == 1)
       echo json_encode($this->locateUser());
-    if(Config::$GEOIP['version'] == 2)
+    if (Config::$GEOIP['version'] == 2)
       echo json_encode($this->locateUser2());
 }
 
@@ -560,11 +560,11 @@ 
   * @param array $P2 - second point as an 'lat', 'lon' array 
   * @return float distance in km
   */
-private function geoDistance($P1,$P2) {
+private function geoDistance($P1, $P2) {
 
   $dist = sin(deg2rad($P1['lat'])) * sin(deg2rad($P2['lat'])) +  
          cos(deg2rad($P1['lat'])) * cos(deg2rad($P2['lat'])) * cos(deg2rad($P1['lon'] - $P2['lon']));
-  $dist = rad2deg(acos($dist)) * 60 * 1.1852 ;
+  $dist = rad2deg(acos($dist)) * 60 * 1.1852;
   return(round($dist));
 }
 
@@ -574,44 +574,44 @@ 
   * @return array $IdPs -  list of arrays ('id', 'name');
   */
 
-public function orderIdentityProviders($country,$L=NULL) {
-     $idps = Federation::listAllIdentityProviders(1,$country);
+public function orderIdentityProviders($country, $L = NULL) {
+     $idps = Federation::listAllIdentityProviders(1, $country);
 
-  if(is_null($L)) {
+  if (is_null($L)) {
      $U = $this->locateUser();
-     if($U['status'] == 'ok') {
+     if ($U['status'] == 'ok') {
      $L = $U['geo'];
      } else {
-       $L = ['lat'=>"90",'lon'=>"0"];
+       $L = ['lat'=>"90", 'lon'=>"0"];
      }
   }
-  $T=[];
-  $R=[];
+  $T = [];
+  $R = [];
      foreach ($idps as $idp) {
         $T[$idp['entityID']] = $idp['title'];
         $dist = 10000;
-        if(isset($idp['geo'])) {
-          $G=$idp['geo'];
-          if(isset($G['lon'])) {
-             $d1 = $this->geoDistance($L,$G); 
-             if( $d1 < $dist)
+        if (isset($idp['geo'])) {
+          $G = $idp['geo'];
+          if (isset($G['lon'])) {
+             $d1 = $this->geoDistance($L, $G); 
+             if ($d1 < $dist)
                 $dist = $d1;
           } else {
             foreach ($G as $g) {
-             $d1 = $this->geoDistance($L,$g); 
-             if( $d1 < $dist)
+             $d1 = $this->geoDistance($L, $g); 
+             if ($d1 < $dist)
                 $dist = $d1;
             }
           }
         }
-       if($dist > 100)
-         $dist=10000;
-      $d = sprintf("%06d",$dist);
-      $R[$idp['entityID']] = $d." ".$idp['title'];
+       if ($dist > 100)
+         $dist = 10000;
+      $d = sprintf("%06d", $dist);
+      $R[$idp['entityID']] = $d . " " . $idp['title'];
      }
      asort($R);
      foreach (array_keys($R) as $r) {
-      if($this->version == 1)
+      if ($this->version == 1)
          $outarray[] = ['id'=>$r, 'title'=>$T[$r]];
       else
          $outarray[] = ['idp'=>$r, 'title'=>$T[$r]];
@@ -629,44 +629,44 @@ 
 
 public function detectOS() {
    $Dev = Devices::listDevices();
-   if( isset($_REQUEST['device']) && isset($Dev[$_REQUEST['device']]) && (!isset($device['options']['hidden']) || $device['options']['hidden'] == 0)) {
+   if (isset($_REQUEST['device']) && isset($Dev[$_REQUEST['device']]) && (!isset($device['options']['hidden']) || $device['options']['hidden'] == 0)) {
       $dev_id = $_REQUEST['device'];
       $device = $Dev[$dev_id];
-      if($this->version == 1)
-         return(['id'=>$dev_id,'display'=>$device['display'], 'group'=>$device['group']]);
+      if ($this->version == 1)
+         return(['id'=>$dev_id, 'display'=>$device['display'], 'group'=>$device['group']]);
       else
-         return(['device'=>$dev_id,'display'=>$device['display'], 'group'=>$device['group']]);
+         return(['device'=>$dev_id, 'display'=>$device['display'], 'group'=>$device['group']]);
    }
    $browser = $_SERVER['HTTP_USER_AGENT'];
-   debug(4,"HTTP_USER_AGENT=$browser\n");
+   debug(4, "HTTP_USER_AGENT=$browser\n");
    foreach ($Dev as $dev_id => $device) {
-     if(!isset($device['match']))
+     if (!isset($device['match']))
         continue;
-     if(preg_match('/'.$device['match'].'/',$browser)) {
-       if(!isset($device['options']['hidden']) || $device['options']['hidden'] == 0) {
-          debug(4,"Browser_id: $dev_id\n");
-          if($this->version == 1)
-             return(['id'=>$dev_id,'display'=>$device['display'], 'group'=>$device['group']]);
+     if (preg_match('/' . $device['match'] . '/', $browser)) {
+       if (!isset($device['options']['hidden']) || $device['options']['hidden'] == 0) {
+          debug(4, "Browser_id: $dev_id\n");
+          if ($this->version == 1)
+             return(['id'=>$dev_id, 'display'=>$device['display'], 'group'=>$device['group']]);
           else
-             return(['device'=>$dev_id,'display'=>$device['display'], 'group'=>$device['group']]);
+             return(['device'=>$dev_id, 'display'=>$device['display'], 'group'=>$device['group']]);
        }
        else {
-         debug(2, "Unrecognised system: ".$_SERVER['HTTP_USER_AGENT']."\n");
+         debug(2, "Unrecognised system: " . $_SERVER['HTTP_USER_AGENT'] . "\n");
          return(false);
        }
      }
    }
-   debug(2, "Unrecognised system: ".$_SERVER['HTTP_USER_AGENT']."\n");
+   debug(2, "Unrecognised system: " . $_SERVER['HTTP_USER_AGENT'] . "\n");
    return(false);
 }
 
 public function JSON_detectOS() {
-     $return_array=$this->detectOS();
-     if($return_array)
+     $return_array = $this->detectOS();
+     if ($return_array)
         $status = 1;
      else
         $status = 0;
-     echo $this->return_json($return_array,$status);
+     echo $this->return_json($return_array, $status);
 }
 
 
@@ -675,7 +675,7 @@ 
 private $i_path;
   
 }
-function profile_sort($P1,$P2) {
+function profile_sort($P1, $P2) {
    return strcasecmp($P1->name, $P2->name);
 } 
 ?>

core/User.php

Spacing +1 added lines, -1 removed lines

@@ -253,7 +253,7 @@
         // who to whom?
         $mail->From = Config::$APPEARANCE['from-mail'];
         $mail->FromName = Config::$APPEARANCE['productname'] . " Notification System";
-        $mail->addReplyTo(Config::$APPEARANCE['support-contact']['mail'], Config::$APPEARANCE['productname'] . " " ._("Feedback"));
+        $mail->addReplyTo(Config::$APPEARANCE['support-contact']['mail'], Config::$APPEARANCE['productname'] . " " . _("Feedback"));
         
         $mailaddr = $this->getAttributes("user:email");
         if (count($mailaddr) == 0) // we don't know his mail address

devices/redirect_dev/RedirectDev.php

Spacing +2 added lines, -2 removed lines

@@ -14,8 +14,8 @@
     * @final not to be redefined
     */
     final public function __construct() {
-      $this->supportedEapMethods  = [EAP::$EAP_NONE];
-      debug(4,"RedirectEx called");
+      $this->supportedEapMethods = [EAP::$EAP_NONE];
+      debug(4, "RedirectEx called");
     }
     public function writeDeviceInfo() {
         $out = "<p>";

devices/linux/Linux.php

Spacing +101 added lines, -101 removed lines

@@ -32,11 +32,11 @@ 
 
       final public function __construct() {
 //      $this->supportedEapMethods  = array(EAP::$TLS, EAP::$PEAP_MSCHAP2, EAP::$TTLS_PAP);
-      $this->supportedEapMethods  = [ EAP::$PEAP_MSCHAP2, EAP::$TTLS_PAP, EAP::$TTLS_MSCHAP2, EAP::$TLS ];
+      $this->supportedEapMethods = [EAP::$PEAP_MSCHAP2, EAP::$TTLS_PAP, EAP::$TTLS_MSCHAP2, EAP::$TLS];
       $this->local_dir = '.cat_installer';
-      $this->conf_file = '$HOME/'.$this->local_dir.'/cat_installer.conf';
-      debug(4,"LINUX: This device supports the following EAP methods: ");
-      debug(4,$this->supportedEapMethods);
+      $this->conf_file = '$HOME/' . $this->local_dir . '/cat_installer.conf';
+      debug(4, "LINUX: This device supports the following EAP methods: ");
+      debug(4, $this->supportedEapMethods);
     }
 
    public function writeInstaller() {
@@ -59,40 +59,40 @@ 
       $out_string .= "# save certificates\n";
       $out_string .= 'echo "';
       foreach ($CAs as $ca) {
-        $out_string .= $ca['pem']."\n";
+        $out_string .= $ca['pem'] . "\n";
       }
-      $out_string .= '"'." > \$HOME/$this->local_dir/ca.pem\n";
+      $out_string .= '"' . " > \$HOME/$this->local_dir/ca.pem\n";
 
      $SSIDs = $this->attributes['internal:SSID'];
      $delSSIDs = $this->attributes['internal:remove_SSID'];
 
-     $out_string .= $this->printNMScript($SSIDs,$delSSIDs);
+     $out_string .= $this->printNMScript($SSIDs, $delSSIDs);
      $out_string .= $this->writeWpaConf($SSIDs);
-     if($this->selected_eap == EAP::$TLS) 
+     if ($this->selected_eap == EAP::$TLS) 
        $out_string .= $this->printP12Dialog();
      else
        $out_string .= $this->printPasswordDialog();
      $out_string .= $this->checkNMResultAndCont();
-     $installer_path = $this->installerBasename.'.sh';
+     $installer_path = $this->installerBasename . '.sh';
       file_put_contents($installer_path, $out_string);
       return($installer_path);
    }
 
     public function writeDeviceInfo() {
-    $ssid_ct=count($this->attributes['internal:SSID']);
+    $ssid_ct = count($this->attributes['internal:SSID']);
     $out = '';
 
    $out .= _("The installer is in the form of a bash script. It will try to configure eduroam under Network Manager and if this is either not appropriate for your system or your version of Network Manager is too old, a wpa_supplicant config file will be created instead.");
    $out .= "<p>";
-    if($ssid_ct > 1) {
-        if($ssid_ct > 2) {
-            $out .= sprintf(_("In addition to <strong>%s</strong> the installer will also configure access to the following networks:"),implode(', ',Config::$CONSORTIUM['ssid']))." ";
+    if ($ssid_ct > 1) {
+        if ($ssid_ct > 2) {
+            $out .= sprintf(_("In addition to <strong>%s</strong> the installer will also configure access to the following networks:"), implode(', ', Config::$CONSORTIUM['ssid'])) . " ";
         } else
-            $out .= sprintf(_("In addition to <strong>%s</strong> the installer will also configure access to:"),implode(', ',Config::$CONSORTIUM['ssid']))." ";
+            $out .= sprintf(_("In addition to <strong>%s</strong> the installer will also configure access to:"), implode(', ', Config::$CONSORTIUM['ssid'])) . " ";
         $i = 0;
         foreach ($this->attributes['internal:SSID'] as $ssid=>$v) {
-           if(! in_array($ssid, Config::$CONSORTIUM['ssid'])) {
-             if($i > 0)
+           if (!in_array($ssid, Config::$CONSORTIUM['ssid'])) {
+             if ($i > 0)
            $out .= ", ";
          $i++;
          $out .= "<strong>$ssid</strong>";
@@ -101,7 +101,7 @@ 
     $out .= "<p>";
     }
    $out .= _("The installer will create .cat_installer sub-directory in your home directory and will copy your server certificates there.");
-if($this->eap == EAP::$TLS)
+if ($this->eap == EAP::$TLS)
    $out .= _("In order to connect to the network you will need a personal certificate in the form of a p12 file. You should obtain this certificate from your home institution. Consult the support page to find out how this certificate can be obtained. Such certificate files are password protected. You should have both the file and the password available during the installation process. Your p12 file will also be copied to the .cat_installer directory.");
 else {
    $out .= _("In order to connect to the network you will need an account from your home institution. You should consult the support page to find out how this account can be obtained. It is very likely that your account is already activated.");
@@ -114,10 +114,10 @@ 
 
 
   private function printCheckDirectory() {
-$out = 'if [ -d $HOME/'.$this->local_dir.' ] ; then
-   if ! ask "'.sprintf(_("Directory %s exists; some of its files may be overwritten."),'$HOME/'.$this->local_dir).'" "'._("Continue").'" 1 ; then exit; fi
+$out = 'if [ -d $HOME/' . $this->local_dir . ' ] ; then
+   if ! ask "'.sprintf(_("Directory %s exists; some of its files may be overwritten."), '$HOME/' . $this->local_dir) . '" "' . _("Continue") . '" 1 ; then exit; fi
 else
-  mkdir $HOME/'.$this->local_dir.'
+  mkdir $HOME/'.$this->local_dir . '
 fi
 ';
  return $out;
@@ -125,17 +125,17 @@ 
 
   private function checkNMResultAndCont() {
     $out = 'if run_python_script ; then
-   show_info "'._("Installation successful").'"
+   show_info "'._("Installation successful") . '"
 else
-   show_info "'._("Network Manager configuration failed, generating wpa_supplicant.conf").'"
-   if ! ask "'.("Network Manager configuration failed, but we may generate a wpa_supplicant configuration file if you wish. Be warned that your connection password will be saved in this file as clear text.").'" "'._("Write the file").'" 1 ; then exit ; fi
+   show_info "'._("Network Manager configuration failed, generating wpa_supplicant.conf") . '"
+   if ! ask "'.("Network Manager configuration failed, but we may generate a wpa_supplicant configuration file if you wish. Be warned that your connection password will be saved in this file as clear text.") . '" "' . _("Write the file") . '" 1 ; then exit ; fi
 
-if [ -f '.$this->conf_file.' ] ; then
-  if ! ask "'.sprintf(_("File %s exists; it will be overwritten."),$this->conf_file).'" "'._("Continue").'" 1 ; then confirm_exit; fi
-  rm '.$this->conf_file.'
+if [ -f '.$this->conf_file . ' ] ; then
+  if ! ask "'.sprintf(_("File %s exists; it will be overwritten."), $this->conf_file) . '" "' . _("Continue") . '" 1 ; then confirm_exit; fi
+  rm '.$this->conf_file . '
   fi
    create_wpa_conf
-   show_info "'.sprintf(_("Output written to %s"),$this->conf_file).'"
+   show_info "'.sprintf(_("Output written to %s"), $this->conf_file) . '"
 fi
 ';
   return $out;
@@ -143,19 +143,19 @@ 
 
 private function printStart() {
      $out = "setup_environment\n";
-     $out .= 'show_info "'._("This installer has been prepared for \${ORGANISATION}").'\n\n'._("More information and comments:").'\n\nEMAIL: ${SUPPORT}\nWWW: ${URL}\n\n'.
-_("Installer created with software from the GEANT project.").'"
+     $out .= 'show_info "' . _("This installer has been prepared for \${ORGANISATION}") . '\n\n' . _("More information and comments:") . '\n\nEMAIL: ${SUPPORT}\nWWW: ${URL}\n\n' .
+_("Installer created with software from the GEANT project.") . '"
 ';
   return $out;
 }
 
 
 private function printProfileConfirmation() {
- if($this->attributes['internal:profile_count'][0] > 1)
-       $out = 'if ! ask "'.sprintf(_("This installer will only work properly if you are a member of %s and the user group: %s."),'${bf}'.$this->attributes['general:instname'][0].'${n}','${bf}'.$this->attributes['profile:name'][0]).'${n}"';
+ if ($this->attributes['internal:profile_count'][0] > 1)
+       $out = 'if ! ask "' . sprintf(_("This installer will only work properly if you are a member of %s and the user group: %s."), '${bf}' . $this->attributes['general:instname'][0] . '${n}', '${bf}' . $this->attributes['profile:name'][0]) . '${n}"';
     else
-       $out = 'if ! ask "'.sprintf(_("This installer will only work properly if you are a member of %s."),'${bf}'.$this->attributes['general:instname'][0]).'${n}"';
-    $out .= ' "'._("Continue").'" 1 ; then exit; fi
+       $out = 'if ! ask "' . sprintf(_("This installer will only work properly if you are a member of %s."), '${bf}' . $this->attributes['general:instname'][0]) . '${n}"';
+    $out .= ' "' . _("Continue") . '" 1 ; then exit; fi
 ';
   return $out;
 
@@ -164,14 +164,14 @@ 
 
   private function printUserConsent() {
     $out = '';
-    if(isset($this->attributes['support:info_file'])) {
-      if( $this->attributes['internal:info_file'][0]['mime'] == 'txt') {
-         $handle = fopen($this->attributes['internal:info_file'][0]['name'],"r");
+    if (isset($this->attributes['support:info_file'])) {
+      if ($this->attributes['internal:info_file'][0]['mime'] == 'txt') {
+         $handle = fopen($this->attributes['internal:info_file'][0]['name'], "r");
          $consent = '';
          while (($buffer = fgets($handle, 4096)) !== false) {
            $consent .= rtrim($buffer) . '\n';
          }
-         $out = 'if ! ask "'.$consent.'${n}" "'._("Continue").'" 1 ; then exit; fi
+         $out = 'if ! ask "' . $consent . '${n}" "' . _("Continue") . '" 1 ; then exit; fi
 ';
       }
     }
@@ -182,18 +182,18 @@ 
 # if the second argument is 0 then the first element of yes_no array
 # will be the default value prompted to the user
   private function printFunctions() {
-$url = (isset($this->attributes['support:url'][0]) && $this->attributes['support:url'][0] ) ? $this->attributes['support:url'][0] : $this->support_url_substitute;
-$support=(isset($this->attributes['support:email'][0]) && $this->attributes['support:email'][0] ) ? $this->attributes['support:email'][0] : $this->support_email_substitute;
-$out ='
+$url = (isset($this->attributes['support:url'][0]) && $this->attributes['support:url'][0]) ? $this->attributes['support:url'][0] : $this->support_url_substitute;
+$support = (isset($this->attributes['support:email'][0]) && $this->attributes['support:email'][0]) ? $this->attributes['support:email'][0] : $this->support_email_substitute;
+$out = '
 my_name=$0
 
 
 function setup_environment {
   bf=""
   n=""
-  ORGANISATION="'.$this->attributes['general:instname'][0].'"
-  URL="'.$url.'"
-  SUPPORT="'.$support.'"
+  ORGANISATION="'.$this->attributes['general:instname'][0] . '"
+  URL="'.$url . '"
+  SUPPORT="'.$support . '"
 if [ ! -z "$DISPLAY" ] ; then
   if which zenity 1>/dev/null 2>&1 ; then
     ZENITY=`which zenity`
@@ -232,7 +232,7 @@ 
 
 
 function ask {
-     T="'.Config::$APPEARANCE['productname'].'"
+     T="'.Config::$APPEARANCE['productname'] . '"
 #  if ! [ -z "$3" ] ; then
 #     T="$T: $3"
 #  fi
@@ -252,8 +252,8 @@ 
      fi
   fi
 
-  yes='._("Y").'
-  no='._("N").'
+  yes='._("Y") . '
+  no='._("N") . '
   yes1=`echo $yes | awk \'{ print toupper($0) }\'`
   no1=`echo $no | awk \'{ print toupper($0) }\'`
 
@@ -310,12 +310,12 @@ 
 
 function confirm_exit {
   if [ ! -z $KDIALOG ] ; then
-     if $KDIALOG --yesno "'._("Really quit?").'"  ; then
+     if $KDIALOG --yesno "'._("Really quit?") . '"  ; then
      exit 1
      fi
   fi
   if [ ! -z $ZENITY ] ; then
-     if $ZENITY --question --text="'._("Really quit?").'" 2>/dev/null ; then
+     if $ZENITY --question --text="'._("Really quit?") . '" 2>/dev/null ; then
         exit 1
      fi
   fi
@@ -368,20 +368,20 @@ 
   PASSWORD="a"
   PASSWORD1="b"
 
-  if ! USER_NAME=`prompt_nonempty_string 1 "'._("enter your userid").'"` ; then
+  if ! USER_NAME=`prompt_nonempty_string 1 "'._("enter your userid") . '"` ; then
     exit 1
   fi
 
   while [ "$PASSWORD" != "$PASSWORD1" ]
   do
-    if ! PASSWORD=`prompt_nonempty_string 0 "'._("enter your password").'"` ; then
+    if ! PASSWORD=`prompt_nonempty_string 0 "'._("enter your password") . '"` ; then
       exit 1
     fi
-    if ! PASSWORD1=`prompt_nonempty_string 0 "'._("repeat your password").'"` ; then
+    if ! PASSWORD1=`prompt_nonempty_string 0 "'._("repeat your password") . '"` ; then
       exit 1
     fi
     if [ "$PASSWORD" != "$PASSWORD1" ] ; then
-      alert "'._("passwords do not match").'"
+      alert "'._("passwords do not match") . '"
     fi
   done
 }
@@ -394,38 +394,38 @@ 
   private function writeWpaConf($SSIDs) {
      $e = EAP::eapDisplayName($this->selected_eap);
 $out = 'function create_wpa_conf {
-cat << EOFW >> '.$this->conf_file."\n";
+cat << EOFW >> '.$this->conf_file . "\n";
      foreach (array_keys($SSIDs) as $ssid) {
     $out .= '
 network={
-  ssid="'.$ssid.'"
+  ssid="'.$ssid . '"
   key_mgmt=WPA-EAP
   pairwise=CCMP
   group=CCMP TKIP
-  eap='.$e['OUTER'].'
-  ca_cert="${HOME}/'.$this->local_dir.'/ca.pem"
+  eap='.$e['OUTER'] . '
+  ca_cert="${HOME}/'.$this->local_dir . '/ca.pem"
   identity="${USER_NAME}"';
-  if($this->server_name)
+  if ($this->server_name)
     $out .= '
-  domain_suffix_match="'.$this->server_name.'"';
-  if($this->selected_eap == EAP::$TLS) {
+  domain_suffix_match="'.$this->server_name . '"';
+  if ($this->selected_eap == EAP::$TLS) {
     $out .= '
-  private_key="${HOME}/'.$this->local_dir.'/user.p12"
+  private_key="${HOME}/'.$this->local_dir . '/user.p12"
   private_key_passwd="${PASSWORD}"';
   } else {
     $out .= '
-  phase2="auth='.$e['INNER'].'"
+  phase2="auth='.$e['INNER'] . '"
   password="${PASSWORD}"';
-  if($this->attributes['internal:use_anon_outer'][0] == 1) 
+  if ($this->attributes['internal:use_anon_outer'][0] == 1) 
     $out .= '
-  anonymous_identity="'.$this->attributes['internal:anon_local_value'][0].'@'.$this->attributes['internal:realm'][0].'"';
+  anonymous_identity="'.$this->attributes['internal:anon_local_value'][0] . '@' . $this->attributes['internal:realm'][0] . '"';
   }
     $out .= '
 }';
 }
   $out .= '
 EOFW
-chmod 600 '.$this->conf_file.'
+chmod 600 '.$this->conf_file . '
 }
 ';
   return $out;
@@ -440,13 +440,13 @@ 
   return $out;
 }
   private function printP12Dialog() {
-  $out ='function p12dialog {
+  $out = 'function p12dialog {
   if [ ! -z $ZENITY ] ; then
-    if ! cert=`$ZENITY --file-selection --file-filter="'._("personal certificate file (p12 or pfx)").' | *.p12 *.P12 *.pfx *.PFX" --file-filter="All files | *" --title="'._("personal certificate file (p12 or pfx)").'" 2>/dev/null` ; then
+    if ! cert=`$ZENITY --file-selection --file-filter="'._("personal certificate file (p12 or pfx)") . ' | *.p12 *.P12 *.pfx *.PFX" --file-filter="All files | *" --title="' . _("personal certificate file (p12 or pfx)") . '" 2>/dev/null` ; then
        exit
     fi
   elif [ ! -z $KDIALOG ] ; then
-    if ! cert=`$KDIALOG --getopenfilename . "*.p12 *.P12 *.pfx *.PFX | '._("personal certificate file (p12 or pfx)").'" --title "'._("personal certificate file (p12 or pfx)").'"` ; then
+    if ! cert=`$KDIALOG --getopenfilename . "*.p12 *.P12 *.pfx *.PFX | '._("personal certificate file (p12 or pfx)") . '" --title "' . _("personal certificate file (p12 or pfx)") . '"` ; then
        exit
     fi
   
@@ -458,7 +458,7 @@ 
     fi
 
     while true ; do
-      prompt="'._("personal certificate file (p12 or pfx)").'"
+      prompt="'._("personal certificate file (p12 or pfx)") . '"
       read -p "${prompt} [$bf$cert${n}]" cert_f
       if [ "$cert" -a -z "$cert_f" ] ; then
          break
@@ -467,20 +467,20 @@ 
           cert=$cert_f
           break
         else
-          echo "'._("file not found").'"
+          echo "'._("file not found") . '"
           cert=""
         fi
       fi
     done
 fi
-    cp "$cert" $HOME/'.$this->local_dir.'/user.p12
-    cert=$HOME/'.$this->local_dir.'/user.p12
+    cp "$cert" $HOME/'.$this->local_dir . '/user.p12
+    cert=$HOME/'.$this->local_dir . '/user.p12
 
     PASSWORD=""
-    prompt="'._("enter the password for the certificate file").'"
+    prompt="'._("enter the password for the certificate file") . '"
     while [ ! "$PASSWORD" ]
     do
-      if ! PASSWORD=`prompt_nonempty_string 0 "'._("enter the password for the certificate file").'"` ; then
+      if ! PASSWORD=`prompt_nonempty_string 0 "'._("enter the password for the certificate file") . '"` ; then
         exit 1
       fi
       if openssl pkcs12 -in $cert -passin pass:"$PASSWORD" -noout 2>/dev/null; then
@@ -493,7 +493,7 @@ 
         PASSWORD=""
       fi
     done
-      if ! USERNAME=`prompt_nonempty_string 1 "'._("enter your userid").'" "$USER_NAME"` ; then
+      if ! USERNAME=`prompt_nonempty_string 1 "'._("enter your userid") . '" "$USER_NAME"` ; then
        exit 1
     fi
 }  
@@ -504,31 +504,31 @@ 
 
 
 private function glueServerNames($server_list) {
-  if(! $server_list)
+  if (!$server_list)
     return '';
-  $A0 =  array_reverse(explode('.',array_shift($server_list)));
+  $A0 = array_reverse(explode('.', array_shift($server_list)));
   $B = $A0;
-  foreach($server_list as $a) {
-     $A= array_reverse(explode('.',$a));
-     $B = array_intersect_assoc($A0,$A);
+  foreach ($server_list as $a) {
+     $A = array_reverse(explode('.', $a));
+     $B = array_intersect_assoc($A0, $A);
      $A0 = $B;
    }
-  return(implode('.',array_reverse($B)));
+  return(implode('.', array_reverse($B)));
 }
 
 private function mkSubjectAltNameList($server_list) {
-  if(! $server_list)
+  if (!$server_list)
     return '';
   $out = '';
-  foreach($server_list as $a) {
-     if($out)
+  foreach ($server_list as $a) {
+     if ($out)
        $out .= ','; 
      $out .= "'DNS:$a'";
   }
   return $out;
 }
 
-private function printNMScript($SSIDs,$delSSIDs) {
+private function printNMScript($SSIDs, $delSSIDs) {
    $e = EAP::eapDisplayName($this->selected_eap);
 $out = 'function run_python_script {
 PASSWORD=$( echo "$PASSWORD" | sed "s/\'/\\\\\\\'/g" )
@@ -588,8 +588,8 @@ 
             sys.exit(2)
 
     def check_opts(self):
-        self.cacert_file = \'${HOME}/'.$this->local_dir.'/ca.pem\'
-        self.pfx_file = \'${HOME}/'.$this->local_dir.'/user.p12\'
+        self.cacert_file = \'${HOME}/'.$this->local_dir . '/ca.pem\'
+        self.pfx_file = \'${HOME}/'.$this->local_dir . '/user.p12\'
         if not os.path.isfile(self.cacert_file):
             print("Certificate file not found, looks like a CAT error")
             sys.exit(2)
@@ -638,8 +638,8 @@ 
                pass
 
     def add_connection(self,ssid):
-        server_alt_subject_name_list = dbus.Array({'.$this->server_alt_subject_name_list.'})
-        server_name = \''.$this->server_name.'\'
+        server_alt_subject_name_list = dbus.Array({'.$this->server_alt_subject_name_list . '})
+        server_name = \''.$this->server_name . '\'
         if self.nm_version == "0.9" or self.nm_version == "1.0":
              match_key = \'altsubject-matches\'
              match_value = server_alt_subject_name_list
@@ -664,14 +664,14 @@ 
             \'group\': [\'ccmp\', \'tkip\']
         })
         s_8021x = dbus.Dictionary({
-            \'eap\': [\''.strtolower($e['OUTER']).'\'],
+            \'eap\': [\''.strtolower($e['OUTER']) . '\'],
             \'identity\': \'$USER_NAME\',
             \'ca-cert\': dbus.ByteArray("file://{0}\0".format(self.cacert_file).encode(\'utf8\')),';
-    if($this->server_name) {
+    if ($this->server_name) {
              $out .= '
              match_key: match_value,';
     }
-    if($this->selected_eap == EAP::$TLS) {
+    if ($this->selected_eap == EAP::$TLS) {
        $out .= '
             \'client-cert\':  dbus.ByteArray("file://{0}\0".format(self.pfx_file).encode(\'utf8\')),
             \'private-key\':  dbus.ByteArray("file://{0}\0".format(self.pfx_file).encode(\'utf8\')),
@@ -679,10 +679,10 @@ 
     } else {
        $out .= '
             \'password\': \'$PASSWORD\',
-            \'phase2-auth\': \''.strtolower($e['INNER']).'\',';
-         if($this->attributes['internal:use_anon_outer'][0] == 1) 
+            \'phase2-auth\': \''.strtolower($e['INNER']) . '\',';
+         if ($this->attributes['internal:use_anon_outer'][0] == 1) 
               $out .= '
-            \'anonymous-identity\': \''.$this->attributes['internal:anon_local_value'][0].'@'.$this->attributes['internal:realm'][0].'\',';
+            \'anonymous-identity\': \''.$this->attributes['internal:anon_local_value'][0] . '@' . $this->attributes['internal:realm'][0] . '\',';
     }
     $out .= '
         })
@@ -702,18 +702,18 @@ 
         self.check_opts()
         ver = self.connect_to_NM()';
      foreach (array_keys($SSIDs) as $ssid) {
-           $out .='
-        self.delete_existing_connections(\''.$ssid.'\')
-        self.add_connection(\''.$ssid.'\')';
+           $out .= '
+        self.delete_existing_connections(\''.$ssid . '\')
+        self.add_connection(\''.$ssid . '\')';
      }
 //   create a list of profiles to be deleted after installation
      foreach ($delSSIDs as $ssid => $cipher) {
-         if($cipher == 'DEL')
-            $out .='
-        self.delete_existing_connections(\''.$ssid.'\')';
+         if ($cipher == 'DEL')
+            $out .= '
+        self.delete_existing_connections(\''.$ssid . '\')';
      }
 
-$out .='
+$out .= '
 
 if __name__ == "__main__":
     ENMCT = EduroamNMConfigTool()

devices/devices-template.php

Spacing +6 added lines, -6 removed lines

@@ -19,7 +19,7 @@ 
  * 
  * @package ModuleWriting
  */
-class Devices{
+class Devices {
 
 /**
  * This array lists available configuration options for local device management.
@@ -54,7 +54,7 @@ 
  *         The default is unset, so it is not listed in the Options array.
  */
 
-public static $Options=[
+public static $Options = [
   'sign'=>0,
   'no_cache'=>0,
   'hidden'=>0,
@@ -298,7 +298,7 @@ 
                             "eduroamCAT",
                             "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
                             "<a target='_blank' href='unbeknownst'>Amazon Appstore</a>",
-                            "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
+                            "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
       ],
    ],
 
@@ -314,7 +314,7 @@ 
                             "eduroamCAT",
                             "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
                             "<a target='_blank' href='unbeknownst'>Amazon Appstore</a>",
-                            "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
+                            "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
       ],
    ],
 
@@ -330,7 +330,7 @@ 
                             "eduroamCAT",
                             "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
                             "<a target='_blank' href='unbeknownst'>Amazon Appstore</a>",
-                            "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
+                            "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
       ],
    ],
 
@@ -347,7 +347,7 @@ 
                             "eduroamCAT",
                             "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
                             "<a target='_blank' href='unbeknownst'>Amazon Appstore</a>",
-                            "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
+                            "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
       ],
    ],