GEANT / CAT

web/resources/inc/header.php

Spacing +4 added lines, -4 removed lines

@@ -61,7 +61,7 @@ 
     else
         $css_url = "http://" . $css_url;
     echo "<link rel='stylesheet' type='text/css' href='$css_url' />";
-    echo "<title>".htmlspecialchars($pagetitle)."</title>";
+    echo "<title>" . htmlspecialchars($pagetitle) . "</title>";
 
     return $Cat;
 }
@@ -132,12 +132,12 @@ 
     echo "<form action='" . $place['path'] . "' method='GET' accept-charset='UTF-8'>" . _("View this page in") . " ";
     echo "<select id='lang' name='lang' onchange='this.form.submit()'>";
     foreach (Config::$LANGUAGES as $lang => $value) {
-        echo "<option value='$lang' ".(strtoupper($language) == strtoupper($lang) ? "selected" : "" )." >" . $value['display'] . "</option> ";
+        echo "<option value='$lang' " . (strtoupper($language) == strtoupper($lang) ? "selected" : "") . " >" . $value['display'] . "</option> ";
     }
     echo "</select>";
     foreach ($_GET as $var => $value) {
         if ($var != "lang" && $value != "")
-            echo "<input type='hidden' name='".htmlspecialchars($var)."' value='".htmlspecialchars($value)."'>";
+            echo "<input type='hidden' name='" . htmlspecialchars($var) . "' value='" . htmlspecialchars($value) . "'>";
     }
     echo "</form>";
     echo "</div><!--langselection-->";
@@ -163,7 +163,7 @@ 
     // content from here on will SCROLL instead of being fixed at the top
     echo "<div class='pagecontent'>
           <div class='trick'>";
-    echo "<div id='secondrow' style='border-bottom:5px solid ". Config::$APPEARANCE['colour1']."; min-height:100px;'>";
+    echo "<div id='secondrow' style='border-bottom:5px solid " . Config::$APPEARANCE['colour1'] . "; min-height:100px;'>";
     echo "<div id='secondarycaptions' style='display:inline-block; float:left'>";
     echo "<h2>$cap2</h2>";
     echo "</div><!--secondarycaptions-->";

web/basic.php

Spacing +96 added lines, -96 removed lines

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

utils/notify_invitation_expiry.php

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
             $mailtext .= "$instname\n";
 
         if ($numberofexistingidps > 0)
-            $mailtext .="
+            $mailtext .= "
 
 Additionally, $numberofexistingidps invitations for existing institutions have expired.
 ";

core/Federation.php

Spacing +3 added lines, -3 removed lines

@@ -74,7 +74,7 @@ 
         
         $retstring = "";
         if (!$astablerows)
-            $retstring .= "<federation id='" . ( $federationid == NULL ? "ALL" : $federationid ) . "' ts='$timestamp'>\n";
+            $retstring .= "<federation id='" . ($federationid == NULL ? "ALL" : $federationid) . "' ts='$timestamp'>\n";
 
         foreach (Devices::listDevices() as $index => $device_array) {
             $query = "SELECT SUM(downloads_admin) AS admin, SUM(downloads_user) AS user FROM downloads, profile, institution WHERE device_id = '$index' AND downloads.profile_id = profile.profile_id AND profile.inst_id = institution.inst_id ";
@@ -87,9 +87,9 @@ 
                 if ($astablerows)
                     $retstring .= "<td>" . $device_array['display'] . "</td>";
                 $retstring .= ($astablerows ? "<td>" : "    <downloads group='admin'>");
-                $retstring .= ( $a->admin === NULL ? "0" : $a->admin);
+                $retstring .= ($a->admin === NULL ? "0" : $a->admin);
                 $retstring .= ($astablerows ? "</td><td>" : "</downloads>\n    <downloads group='user'>");
-                $retstring .= ( $a->user === NULL ? "0" : $a->user);
+                $retstring .= ($a->user === NULL ? "0" : $a->user);
                 $retstring .= ($astablerows ? "</td>" : "</downloads>\n");
                 $gross_admin = $gross_admin + $a->admin;
                 $gross_user = $gross_user + $a->user;

core/UserManagement.php

Spacing +6 added lines, -6 removed lines

@@ -158,7 +158,7 @@ 
 %s"), $bestnameguess, Config::$CONSORTIUM['name'], strtoupper($fed->identifier), Config::$APPEARANCE['productname'], Config::$APPEARANCE['productname_long']);
                     $retval = $user->sendMailToUser(_("IdP in your federation was created"), $message);
                     if ($retval == FALSE)
-                        debug (2, "Mail to federation admin was NOT sent!\n");
+                        debug(2, "Mail to federation admin was NOT sent!\n");
                 }
 
                 return $idp;
@@ -226,14 +226,14 @@ 
             return $token;
         } else if (func_num_args() == 4) { // string name, but no country - new IdP with link to external DB
             // what country are we talking about?
-            $newname = DBConnection::escape_value(UserManagement::$DB_TYPE,valid_string_db($inst_identifier));
+            $newname = DBConnection::escape_value(UserManagement::$DB_TYPE, valid_string_db($inst_identifier));
             $extinfo = Federation::getExternalDBEntityDetails($external_id);
-            $externalhandle = DBConnection::escape_value(UserManagement::$DB_TYPE,valid_string_db($external_id));
+            $externalhandle = DBConnection::escape_value(UserManagement::$DB_TYPE, valid_string_db($external_id));
             DBConnection::exec(UserManagement::$DB_TYPE, "INSERT INTO invitations (invite_issuer_level, invite_dest_mail, invite_token,name,country, external_db_uniquehandle) VALUES('$level', '$for', '$token', '" . $newname . "', '" . $extinfo['country'] . "',  '" . $externalhandle . "')");
             return $token;
         } else if (func_num_args() == 5) { // string name, and country set - whole new IdP
-            $newname = DBConnection::escape_value(UserManagement::$DB_TYPE,valid_string_db($inst_identifier));
-            $newcountry = DBConnection::escape_value(UserManagement::$DB_TYPE,valid_string_db($country));
+            $newname = DBConnection::escape_value(UserManagement::$DB_TYPE, valid_string_db($inst_identifier));
+            $newcountry = DBConnection::escape_value(UserManagement::$DB_TYPE, valid_string_db($country));
             DBConnection::exec(UserManagement::$DB_TYPE, "INSERT INTO invitations (invite_issuer_level, invite_dest_mail, invite_token,name,country) VALUES('$level', '$for', '$token', '" . $newname . "', '" . $newcountry . "')");
             return $token;
         } else {
@@ -252,7 +252,7 @@ 
         $retval = [];
         $invitations = DBConnection::exec(UserManagement::$DB_TYPE, "SELECT cat_institution_id, country, name, invite_issuer_level, invite_dest_mail, invite_token 
                                         FROM invitations 
-                                        WHERE cat_institution_id " . ( $idp_identifier != 0 ? "= $idp_identifier" : "IS NULL") . " AND invite_created >= TIMESTAMPADD(DAY, -1, NOW()) AND used = 0");
+                                        WHERE cat_institution_id " . ($idp_identifier != 0 ? "= $idp_identifier" : "IS NULL") . " AND invite_created >= TIMESTAMPADD(DAY, -1, NOW()) AND used = 0");
         if ($idp_identifier != 0) { // list invitations for existing institution, must match cat_institution_id
             while ($a = mysqli_fetch_object($invitations)) {
                 debug(4, "Retrieving pending invitations for IdP $idp_identifier.\n");

core/CAT.php

Spacing +9 added lines, -9 removed lines

@@ -73,12 +73,12 @@ 
 
 
         if (CAT::$RELEASE_VERSION) {
-            $temp_version = "CAT-".CAT::$VERSION_MAJOR.".".CAT::$VERSION_MINOR;
+            $temp_version = "CAT-" . CAT::$VERSION_MAJOR . "." . CAT::$VERSION_MINOR;
             if (CAT::$VERSION_PATCH != 0)
-                    $temp_version .= ".".CAT::$VERSION_PATCH;
+                    $temp_version .= "." . CAT::$VERSION_PATCH;
             if (CAT::$VERSION_EXTRA != "")
-                $temp_version .= "-".CAT::$VERSION_EXTRA;
-            CAT::$VERSION = sprintf(_("Release %s"), $temp_version );
+                $temp_version .= "-" . CAT::$VERSION_EXTRA;
+            CAT::$VERSION = sprintf(_("Release %s"), $temp_version);
         }
         else
             CAT::$VERSION = _("Unreleased SVN Revision");
@@ -191,7 +191,7 @@ 
      * gets the language setting in CAT
      */
     static public function get_lang() {
-       if(self::$LANG === '')
+       if (self::$LANG === '')
          list(self::$LANG, $xx) = self::set_lang();
        return self::$LANG;
     }
@@ -239,9 +239,9 @@ 
             case "MOD": // modified existing object
             case "DEL": // deleted an object
                 ob_start();
-                printf("%-015s",microtime(TRUE));
+                printf("%-015s", microtime(TRUE));
                 print " ($category) ";
-                print_r(" ".$user.": ".$message."\n");
+                print_r(" " . $user . ": " . $message . "\n");
                 $output = ob_get_clean();
                 if (Config::$PATHS['logdir']) {
                     $f = fopen(Config::$PATHS['logdir'] . "/audit-activity.log", "a");
@@ -268,8 +268,8 @@ 
         $logtext1 = preg_replace("/[\n\r]/", "", $query);
         $logtext = preg_replace("/ +/", " ", $logtext1);
         ob_start();
-        printf("%-015s",microtime(TRUE));
-        print(" ".$logtext."\n");
+        printf("%-015s", microtime(TRUE));
+        print(" " . $logtext . "\n");
         $output = ob_get_clean();
         if (Config::$PATHS['logdir']) {
             $f = fopen(Config::$PATHS['logdir'] . "/audit-SQL.log", "a");

core/SanityTests.php

Spacing +168 added lines, -168 removed lines

@@ -75,12 +75,12 @@ 
      * @param string $test the test name
      */
     public function test($test) {
-       $this->out[$test] =[];
+       $this->out[$test] = [];
        $this->name = $test;
-       $m_name = $test.'_test';
+       $m_name = $test . '_test';
        $this->test_result[$test] = 0;
-       if(! method_exists($this,$m_name)) {
-           $this->test_return($test,L_ERROR,"Configuration error, no test configured for <strong>$test</strong>.");
+       if (!method_exists($this, $m_name)) {
+           $this->test_return($test, L_ERROR, "Configuration error, no test configured for <strong>$test</strong>.");
            return;
        }
        $this->$m_name();
@@ -97,10 +97,10 @@ 
      */
     public function run_tests($Tests) {
        foreach ($Tests as $t) {
-         if(preg_match('/(.+)=>(.+)/',$t,$m)) {
+         if (preg_match('/(.+)=>(.+)/', $t, $m)) {
             $tst = $m[1];
-            $subtst=$m[2];
-            if($this->test_result[$tst]  < L_ERROR)
+            $subtst = $m[2];
+            if ($this->test_result[$tst] < L_ERROR)
                $this->test($subtst);
          }
          else
@@ -111,8 +111,8 @@ 
     public function get_test_names() {
        $T = get_class_methods($this);
        $out = [];
-       foreach($T as $t) {
-         if(preg_match('/^(.*)_test$/',$t,$m)) {
+       foreach ($T as $t) {
+         if (preg_match('/^(.*)_test$/', $t, $m)) {
             $out[] = $m[1];
          } 
        }
@@ -132,17 +132,17 @@ 
      */
     public $test_result;
 
-    private function test_return($level,$message) {
+    private function test_return($level, $message) {
         $this->out[$this->name][] = ['level'=>$level, 'message'=>$message];
-        $this->test_result[$this->name] = max($this->test_result[$this->name],$level);
-        $this->test_result['global'] = max($this->test_result['global'],$level);
+        $this->test_result[$this->name] = max($this->test_result[$this->name], $level);
+        $this->test_result['global'] = max($this->test_result['global'], $level);
     }
 
     private function get_exec_path($s) {
         $the_path = "";
         $exec_is = "UNDEFINED";
         if (!empty(Config::$PATHS[$s])) {
-             preg_match('/([^ ]+) ?/',Config::$PATHS[$s],$m);
+             preg_match('/([^ ]+) ?/', Config::$PATHS[$s], $m);
              $exe = $m[1];
              $the_path = exec("which " . Config::$PATHS[$s]);
              if ($the_path == $exe)
@@ -150,7 +150,7 @@ 
              else
                  $exec_is = "IMPLICIT";
          } 
-        return(['exec'=>$the_path,'exec_is'=>$exec_is]);
+        return(['exec'=>$the_path, 'exec_is'=>$exec_is]);
     }
 
     /**
@@ -158,9 +158,9 @@ 
       */
     private function php_test() {
          if (version_compare(phpversion(), $this->php_needversion, '>='))
-            $this->test_return(L_OK,"<strong>PHP</strong> is sufficiently recent. You are running " . phpversion() . ".");
+            $this->test_return(L_OK, "<strong>PHP</strong> is sufficiently recent. You are running " . phpversion() . ".");
          else
-            $this->test_return(L_ERROR,"<strong>PHP</strong> is too old. We need at least $this->php_needversion, but you only have ".phpversion(). ".");
+            $this->test_return(L_ERROR, "<strong>PHP</strong> is too old. We need at least $this->php_needversion, but you only have " . phpversion() . ".");
     }
 
     /**
@@ -168,9 +168,9 @@ 
       */
     private function ssp_test() {
          if (!is_file(CONFIG::$AUTHENTICATION['ssp-path-to-autoloader']))
-             $this->test_return(L_ERROR,"<strong>simpleSAMLphp</strong> not found!");
+             $this->test_return(L_ERROR, "<strong>simpleSAMLphp</strong> not found!");
          else
-             $this->test_return(L_OK,"<strong>simpleSAMLphp</strong> autoloader found.");
+             $this->test_return(L_OK, "<strong>simpleSAMLphp</strong> autoloader found.");
     }
 
     /**
@@ -178,7 +178,7 @@ 
       */
     private function security_test() {
          if (in_array("I do not care about security!", Config::$SUPERADMINS))
-             $this->test_return(L_WARN,"You do not care about security. This page should be made accessible to the CAT admin only! See config.php 'Superadmins'!");
+             $this->test_return(L_WARN, "You do not care about security. This page should be made accessible to the CAT admin only! See config.php 'Superadmins'!");
     }
 
     /**
@@ -186,9 +186,9 @@ 
       */
     private function zip_test() {
          if (exec("which zip") != "")
-             $this->test_return(L_OK,"<strong>zip</strong> binary found.");
+             $this->test_return(L_OK, "<strong>zip</strong> binary found.");
          else
-             $this->test_return(L_ERROR,"<strong>zip</strong> not found in your \$PATH!");
+             $this->test_return(L_ERROR, "<strong>zip</strong> not found in your \$PATH!");
     }
 
     /**
@@ -196,15 +196,15 @@ 
       */
     private function eapol_test_test() {
          exec(Config::$PATHS['eapol_test'], $out, $retval);
-         if($retval == 255 ) {
-            $o = preg_grep('/-o<server cert/',$out);
-               if(count($o) > 0)
-                   $this->test_return(L_OK,"<strong>eapol_test</strong> script found.");
+         if ($retval == 255) {
+            $o = preg_grep('/-o<server cert/', $out);
+               if (count($o) > 0)
+                   $this->test_return(L_OK, "<strong>eapol_test</strong> script found.");
                else
-                   $this->test_return(L_ERROR,"<strong>eapol_test</strong> found, but is too old!");
+                   $this->test_return(L_ERROR, "<strong>eapol_test</strong> found, but is too old!");
          }
          else
-            $this->test_return(L_ERROR,"<strong>eapol_test</strong> not found!");
+            $this->test_return(L_ERROR, "<strong>eapol_test</strong> not found!");
     }
 
     /**
@@ -212,9 +212,9 @@ 
       */
     private function logdir_test() {
          if (fopen(Config::$PATHS['logdir'] . "/debug.log", "a") == FALSE)
-             $this->test_return(L_WARN,"Log files in <strong>" . Config::$PATHS['logdir'] . "</strong> are not writable!");
+             $this->test_return(L_WARN, "Log files in <strong>" . Config::$PATHS['logdir'] . "</strong> are not writable!");
          else
-             $this->test_return(L_OK,"Log directory is writable.");
+             $this->test_return(L_OK, "Log directory is writable.");
     }
 
     /**
@@ -222,34 +222,34 @@ 
       */
     private function phpModules_test() {
         if (function_exists('idn_to_ascii'))
-            $this->test_return(L_OK,"PHP can handle internationalisation.");
+            $this->test_return(L_OK, "PHP can handle internationalisation.");
         else
-            $this->test_return(L_ERROR,"PHP can <strongNOT</strong> handle internationalisation (idn_to_ascii() from php5-intl).");
+            $this->test_return(L_ERROR, "PHP can <strongNOT</strong> handle internationalisation (idn_to_ascii() from php5-intl).");
 
         if (function_exists('gettext'))
-            $this->test_return(L_OK,"PHP extension <strong>GNU Gettext</strong> is installed.");
+            $this->test_return(L_OK, "PHP extension <strong>GNU Gettext</strong> is installed.");
         else
-           $this->test_return(L_ERROR,"PHP extension <strong>GNU Gettext</strong> not found!");
+           $this->test_return(L_ERROR, "PHP extension <strong>GNU Gettext</strong> not found!");
 
         if (function_exists('openssl_sign'))
-            $this->test_return(L_OK,"PHP extension <strong>OpenSSL</strong> is installed.");
+            $this->test_return(L_OK, "PHP extension <strong>OpenSSL</strong> is installed.");
         else
-            $this->test_return(L_ERROR,"PHP extension <strong>OpenSSL</strong> not found!");
+            $this->test_return(L_ERROR, "PHP extension <strong>OpenSSL</strong> not found!");
 
         if (class_exists('Imagick'))
-            $this->test_return(L_OK,"PHP extension <strong>Imagick</strong> is installed.");
+            $this->test_return(L_OK, "PHP extension <strong>Imagick</strong> is installed.");
         else
-            $this->test_return(L_ERROR,"PHP extension <strong>Imagick</strong> not found! Get it from your distribution or <a href='http://pecl.php.net/package/imagick'>here</a>.");
+            $this->test_return(L_ERROR, "PHP extension <strong>Imagick</strong> not found! Get it from your distribution or <a href='http://pecl.php.net/package/imagick'>here</a>.");
 
         if (function_exists('ImageCreate'))
-            $this->test_return(L_OK,"PHP extension <strong>GD</strong> is installed.");
+            $this->test_return(L_OK, "PHP extension <strong>GD</strong> is installed.");
         else
-            $this->test_return(L_ERROR,"PHP extension <strong>GD</strong> not found!</a>.");
+            $this->test_return(L_ERROR, "PHP extension <strong>GD</strong> not found!</a>.");
 
         if (function_exists('mysqli_connect'))
-            $this->test_return(L_OK,"PHP extension <strong>MySQL</strong> is installed.");
+            $this->test_return(L_OK, "PHP extension <strong>MySQL</strong> is installed.");
         else
-            $this->test_return(L_ERROR,"PHP extension <strong>MySQL</strong> not found!");
+            $this->test_return(L_ERROR, "PHP extension <strong>MySQL</strong> not found!");
 /*
         if (function_exists('geoip_record_by_name')) {
            $host = '158.75.1.10';
@@ -275,31 +275,31 @@ 
        $host_6 = '2001:610:188:444::50';
        switch (Config::$GEOIP['version']) {
            case 0:
-              $this->test_return(L_REMARK,"As set in the config, no geolocation service will be used");
+              $this->test_return(L_REMARK, "As set in the config, no geolocation service will be used");
               break;
            case 1:
               if (!function_exists('geoip_record_by_name')) {
-                  $this->test_return(L_ERROR,"PHP extension <strong>GeoIP</strong> (legacy) not found! Get it from your distribution or <a href='http://pecl.php.net/package/geoip'>here</a> or better install GeoIP2 from <a href='https://github.com/maxmind/GeoIP2-php'>here</a>.");
+                  $this->test_return(L_ERROR, "PHP extension <strong>GeoIP</strong> (legacy) not found! Get it from your distribution or <a href='http://pecl.php.net/package/geoip'>here</a> or better install GeoIP2 from <a href='https://github.com/maxmind/GeoIP2-php'>here</a>.");
                   return;
               }
               $record = geoip_record_by_name($host_4);
-              if(! $record) {
-                 $this->test_return(L_ERROR,"PHP extension <strong>GeoIP</strong> (legacy) found but not working properly, perhaps you need to download the databases. See utils/GeoIP-update.sh in the CAT distribution and use it tu update the GeoIP database regularly.");
+              if (!$record) {
+                 $this->test_return(L_ERROR, "PHP extension <strong>GeoIP</strong> (legacy) found but not working properly, perhaps you need to download the databases. See utils/GeoIP-update.sh in the CAT distribution and use it tu update the GeoIP database regularly.");
                  return;
               }
-              if($record['city'] != 'Utrecht') {
-                 $this->test_return(L_ERROR,"PHP extension <strong>GeoIP</strong> (legacy) found but not working properly, perhaps you need to download the databases. See utils/GeoIP-update.sh in the CAT distribution and use it tu update the GeoIP database regularly.");
+              if ($record['city'] != 'Utrecht') {
+                 $this->test_return(L_ERROR, "PHP extension <strong>GeoIP</strong> (legacy) found but not working properly, perhaps you need to download the databases. See utils/GeoIP-update.sh in the CAT distribution and use it tu update the GeoIP database regularly.");
                  return;
               }
-              $this->test_return(L_REMARK,"PHP extension <strong>GeoIP</strong> (legacy) is installed and working. See utils/GeoIP-update.sh in the CAT distribution and use it tu update the GeoIP database regularly. We stronly advise to replace the legacy GeoIP with GeoIP2 from <a href='https://github.com/maxmind/GeoIP2-php'>here</a>.");
+              $this->test_return(L_REMARK, "PHP extension <strong>GeoIP</strong> (legacy) is installed and working. See utils/GeoIP-update.sh in the CAT distribution and use it tu update the GeoIP database regularly. We stronly advise to replace the legacy GeoIP with GeoIP2 from <a href='https://github.com/maxmind/GeoIP2-php'>here</a>.");
               break;
            case 2:
-              if(! is_file(Config::$GEOIP['geoip2-path-to-autoloader'])) {
-                 $this->test_return(L_ERROR,"PHP extension <strong>GeoIP2</strong> not found! Get it from <a href='https://github.com/maxmind/GeoIP2-php'>here</a>.");
+              if (!is_file(Config::$GEOIP['geoip2-path-to-autoloader'])) {
+                 $this->test_return(L_ERROR, "PHP extension <strong>GeoIP2</strong> not found! Get it from <a href='https://github.com/maxmind/GeoIP2-php'>here</a>.");
                  return;
               }
-              if(! is_file(Config::$GEOIP['geoip2-path-to-db'])) {
-                 $this->test_return(L_ERROR,"<strong>GeoIP2 database</strong> not found! See utils/GeoIP-update.sh in the CAT distribution and use it tu update the GeoIP database regularly.");
+              if (!is_file(Config::$GEOIP['geoip2-path-to-db'])) {
+                 $this->test_return(L_ERROR, "<strong>GeoIP2 database</strong> not found! See utils/GeoIP-update.sh in the CAT distribution and use it tu update the GeoIP database regularly.");
                  return;
               }
               require_once Config::$GEOIP['geoip2-path-to-autoloader'];
@@ -307,27 +307,27 @@ 
               try {
                  $record = $reader->city($host_4);
               } catch (Exception $e) {
-                 $this->test_return(L_ERROR,"PHP extension <strong>GeoIP2</strong> found but not working properly, perhaps you need to download the databases. See utils/GeoIP-update.sh in the CAT distribution and use it tu update the GeoIP database regularly.");
+                 $this->test_return(L_ERROR, "PHP extension <strong>GeoIP2</strong> found but not working properly, perhaps you need to download the databases. See utils/GeoIP-update.sh in the CAT distribution and use it tu update the GeoIP database regularly.");
                  return;
               }
-              if( $record->city->name != 'Utrecht') {
-                 $this->test_return(L_ERROR,"PHP extension <strong>GeoIP2</strong> found but not working properly, perhaps you need to download the databases. See utils/GeoIP-update.sh in the CAT distribution and use it tu update the GeoIP database regularly.");
+              if ($record->city->name != 'Utrecht') {
+                 $this->test_return(L_ERROR, "PHP extension <strong>GeoIP2</strong> found but not working properly, perhaps you need to download the databases. See utils/GeoIP-update.sh in the CAT distribution and use it tu update the GeoIP database regularly.");
                  return;
               }
               try {
                  $record = $reader->city($host_6);
               } catch (Exception $e) {
-                 $this->test_return(L_ERROR,"PHP extension <strong>GeoIP2</strong> found but not working properly with IPv6, perhaps you need to download the databases. See utils/GeoIP-update.sh in the CAT distribution and use it tu update the GeoIP database regularly.");
+                 $this->test_return(L_ERROR, "PHP extension <strong>GeoIP2</strong> found but not working properly with IPv6, perhaps you need to download the databases. See utils/GeoIP-update.sh in the CAT distribution and use it tu update the GeoIP database regularly.");
                  return;
               }
-              if( $record->city->name != 'Utrecht') {
-                 $this->test_return(L_ERROR,"PHP extension <strong>GeoIP2</strong> found but not working properly with IPv6, perhaps you need to download the databases. See utils/GeoIP-update.sh in the CAT distribution and use it tu update the GeoIP database regularly.");
+              if ($record->city->name != 'Utrecht') {
+                 $this->test_return(L_ERROR, "PHP extension <strong>GeoIP2</strong> found but not working properly with IPv6, perhaps you need to download the databases. See utils/GeoIP-update.sh in the CAT distribution and use it tu update the GeoIP database regularly.");
                  return;
               }
-              $this->test_return(L_OK,"PHP extension <strong>GeoIP2</strong> is installed and working. See utils/GeoIP-update.sh in the CAT distribution and use it tu update the GeoIP database regularly.");
+              $this->test_return(L_OK, "PHP extension <strong>GeoIP2</strong> is installed and working. See utils/GeoIP-update.sh in the CAT distribution and use it tu update the GeoIP database regularly.");
               break;
            default:
-              $this->test_return(L_ERROR,'Check Config::$GEOIP[\'version\'], it must be set to either 1 or 2');
+              $this->test_return(L_ERROR, 'Check Config::$GEOIP[\'version\'], it must be set to either 1 or 2');
               break;
        }
     }
@@ -337,88 +337,88 @@ 
       */
     private function openssl_test() {
          $A = $this->get_exec_path('openssl');    
-         if($A['exec'] != "") {
+         if ($A['exec'] != "") {
              $t = exec($A['exec'] . ' version');
-             if($A['exec_is'] == "EXPLICIT")
-                $this->test_return(L_OK,"<strong>$t</strong> was found and is configured explicitly in your config.");
+             if ($A['exec_is'] == "EXPLICIT")
+                $this->test_return(L_OK, "<strong>$t</strong> was found and is configured explicitly in your config.");
              else
-                $this->test_return(L_WARN,"<strong>$t</strong> was found, but is not configured with an absolute path in your config.");
+                $this->test_return(L_WARN, "<strong>$t</strong> was found, but is not configured with an absolute path in your config.");
          } else
-            $this->test_return(L_ERROR,"<strong>openssl</strong> was not found on your system!");
+            $this->test_return(L_ERROR, "<strong>openssl</strong> was not found on your system!");
     }
 
     /**
       * test if makensis is available
       */
     private function makensis_test() {
-         if(! is_numeric(Config::$NSIS_VERSION)) {
-            $this->test_return(L_ERROR,"NSIS_VERSION needs to be numeric!");
+         if (!is_numeric(Config::$NSIS_VERSION)) {
+            $this->test_return(L_ERROR, "NSIS_VERSION needs to be numeric!");
             return;
          }
-         if(Config::$NSIS_VERSION < 2) {
-            $this->test_return(L_ERROR,"NSIS_VERSION needs to be at least 2!");
+         if (Config::$NSIS_VERSION < 2) {
+            $this->test_return(L_ERROR, "NSIS_VERSION needs to be at least 2!");
             return;
          }
          $A = $this->get_exec_path('makensis');    
-         if($A['exec'] != "") {
+         if ($A['exec'] != "") {
              $t = exec($A['exec'] . ' -VERSION');
-             if($A['exec_is'] == "EXPLICIT") 
-                $this->test_return(L_OK,"<strong>makensis $t</strong> was found and is configured explicitly in your config.");
+             if ($A['exec_is'] == "EXPLICIT") 
+                $this->test_return(L_OK, "<strong>makensis $t</strong> was found and is configured explicitly in your config.");
              else
-                $this->test_return(L_WARN,"<strong>makensis $t</strong> was found, but is not configured with an absolute path in your config.");
-             exec($A['exec'] . ' -HELP',$t);
-             $t1 = count(preg_grep('/INPUTCHARSET/',$t));
-             if($t1 == 1 && Config::$NSIS_VERSION == 2)
-                $this->test_return(L_ERROR,"Declared NSIS_VERSION does not seem to match the file pointed to by PATHS['makensis']!");
-             if($t1 == 0 && Config::$NSIS_VERSION >= 3)
-                $this->test_return(L_ERROR,"Declared NSIS_VERSION does not seem to match the file pointed to by PATHS['makensis']!");
+                $this->test_return(L_WARN, "<strong>makensis $t</strong> was found, but is not configured with an absolute path in your config.");
+             exec($A['exec'] . ' -HELP', $t);
+             $t1 = count(preg_grep('/INPUTCHARSET/', $t));
+             if ($t1 == 1 && Config::$NSIS_VERSION == 2)
+                $this->test_return(L_ERROR, "Declared NSIS_VERSION does not seem to match the file pointed to by PATHS['makensis']!");
+             if ($t1 == 0 && Config::$NSIS_VERSION >= 3)
+                $this->test_return(L_ERROR, "Declared NSIS_VERSION does not seem to match the file pointed to by PATHS['makensis']!");
          } else
-            $this->test_return(L_ERROR,"<strong>makensis</strong> was not found on your system!");
+            $this->test_return(L_ERROR, "<strong>makensis</strong> was not found on your system!");
     }
 
     /**
       * test if all required NSIS modules are available
       */
     private function NSISmodules_test() {
-         $tmp_dir = createTemporaryDirectory('installer',0)['dir'];
-         if(!chdir($tmp_dir)) {
+         $tmp_dir = createTemporaryDirectory('installer', 0)['dir'];
+         if (!chdir($tmp_dir)) {
            debug(2, "Cannot chdir to $tmp_dir\n");
-           $this->test_return(L_ERROR,"NSIS modules test - problem with temporary directory permissions, cannot continue");
+           $this->test_return(L_ERROR, "NSIS modules test - problem with temporary directory permissions, cannot continue");
            return;
          }
-         $exe= 'tt.exe';
+         $exe = 'tt.exe';
          $NSIS_Module_status = [];
          foreach ($this->NSIS_Modules as $module) {
             unset($out);
-            exec(Config::$PATHS['makensis']." -V1 '-X!include $module' '-XOutFile $exe' '-XSection X' '-XSectionEnd'", $out, $retval);
-            if($retval > 0) 
+            exec(Config::$PATHS['makensis'] . " -V1 '-X!include $module' '-XOutFile $exe' '-XSection X' '-XSectionEnd'", $out, $retval);
+            if ($retval > 0) 
                $NSIS_Module_status[$module] = 0;
             else
                $NSIS_Module_status[$module] = 1;
          }
-         if(is_file($exe))
+         if (is_file($exe))
             unlink($exe);
          foreach ($NSIS_Module_status as $module => $status) {
-            if($status == 1)
-               $this->test_return(L_OK,"NSIS module <strong>$module</strong> was found.");
+            if ($status == 1)
+               $this->test_return(L_OK, "NSIS module <strong>$module</strong> was found.");
             else
-               $this->test_return(L_ERROR,"NSIS module <strong>$module</strong> was not found or is not working correctly.");
+               $this->test_return(L_ERROR, "NSIS module <strong>$module</strong> was not found or is not working correctly.");
          }
     }
     private function NSIS_GetVersion_test() {
-         $tmp_dir = createTemporaryDirectory('installer',0)['dir'];
-         if(!chdir($tmp_dir)) {
+         $tmp_dir = createTemporaryDirectory('installer', 0)['dir'];
+         if (!chdir($tmp_dir)) {
            debug(2, "Cannot chdir to $tmp_dir\n");
-           $this->test_return(L_ERROR,"NSIS module <strong>GetVersion</strong> - problem with temporary directory permissions, cannot continue");
+           $this->test_return(L_ERROR, "NSIS module <strong>GetVersion</strong> - problem with temporary directory permissions, cannot continue");
            return;
          }
-         $exe= 'tt.exe';
-         exec(Config::$PATHS['makensis']." -V1 '-XOutFile $exe' '-XSection X' '-XGetVersion::WindowsName' '-XSectionEnd'", $out, $retval);
-         if($retval > 0)
-            $this->test_return(L_ERROR,"NSIS module <strong>GetVersion</strong> was not found or is not working correctly.");
+         $exe = 'tt.exe';
+         exec(Config::$PATHS['makensis'] . " -V1 '-XOutFile $exe' '-XSection X' '-XGetVersion::WindowsName' '-XSectionEnd'", $out, $retval);
+         if ($retval > 0)
+            $this->test_return(L_ERROR, "NSIS module <strong>GetVersion</strong> was not found or is not working correctly.");
          else
-            $this->test_return(L_OK,"NSIS module <strong>GetVersion</strong> was found.");
-         if(is_file($exe))
+            $this->test_return(L_OK, "NSIS module <strong>GetVersion</strong> was found.");
+         if (is_file($exe))
             unlink($exe);
     }
 
@@ -426,32 +426,32 @@ 
       * test access to dowloads directories
       */
     private function directories_test() {
-               $Dir = createTemporaryDirectory('installer',0);
+               $Dir = createTemporaryDirectory('installer', 0);
                $dir = $Dir['dir'];
                $base = $Dir['base'];
-               if($dir) {
-                  $this->test_return(L_OK,"Installer cache directory is writable.");
+               if ($dir) {
+                  $this->test_return(L_OK, "Installer cache directory is writable.");
                   rrmdir($dir);
                } else {
-                  $this->test_return(L_ERROR,"Installer cache directory $base does not exist or is not writable!");
+                  $this->test_return(L_ERROR, "Installer cache directory $base does not exist or is not writable!");
                }
-               $Dir = createTemporaryDirectory('test',0);
+               $Dir = createTemporaryDirectory('test', 0);
                $dir = $Dir['dir'];
                $base = $Dir['base'];
-               if($dir) {
-                  $this->test_return(L_OK,"Test directory is writable.");
+               if ($dir) {
+                  $this->test_return(L_OK, "Test directory is writable.");
                   rrmdir($dir);
                } else {
-                  $this->test_return(L_ERROR,"Test directory  $base does not exist or is not writable!");
+                  $this->test_return(L_ERROR, "Test directory  $base does not exist or is not writable!");
                }
-               $Dir = createTemporaryDirectory('logo',0);
+               $Dir = createTemporaryDirectory('logo', 0);
                $dir = $Dir['dir'];
                $base = $Dir['base'];
-               if($dir) {
-                  $this->test_return(L_OK,"Logos cache directory is writable.");
+               if ($dir) {
+                  $this->test_return(L_OK, "Logos cache directory is writable.");
                   rrmdir($dir);
                } else {
-                  $this->test_return(L_ERROR,"Logos cache directory  $base does not exist or is not writable!");
+                  $this->test_return(L_ERROR, "Logos cache directory  $base does not exist or is not writable!");
                }
     }
 
@@ -466,16 +466,16 @@ 
                         $allthere .= $onelanguage['locale'] . " ";
 
                 if ($allthere == "")
-                    $this->test_return(L_OK,"All of your configured locales are available on your system.");
+                    $this->test_return(L_OK, "All of your configured locales are available on your system.");
                 else
-                    $this->test_return(L_WARN,"Some of your configured locales (<strong>$allthere</strong>) are not installed and will not be displayed correctly!");
+                    $this->test_return(L_WARN, "Some of your configured locales (<strong>$allthere</strong>) are not installed and will not be displayed correctly!");
     }
 
-    private function check_config_default($type,$key,$value) {
+    private function check_config_default($type, $key, $value) {
                 if (empty(Config::$type[$key]))
-                    $missingvalues .="type/webcert_OCSP ";
+                    $missingvalues .= "type/webcert_OCSP ";
                 elseif (Config::$type['webcert_OCSP'] == $value)
-                    $defaultvalues .="type/$key ";
+                    $defaultvalues .= "type/$key ";
     }
 
 
@@ -486,31 +486,31 @@ 
                 $defaultvalues = "";
                 $missingvalues = "";
                 if (Config::$APPEARANCE['from-mail'] == "cat-invite@your-cat-installation.example")
-                    $defaultvalues .="APPEARANCE/from-mail ";
+                    $defaultvalues .= "APPEARANCE/from-mail ";
                 if (Config::$APPEARANCE['support-contact']['url'] == "cat-support@our-cat-installation.example?body=Only%20English%20language%20please!")
-                    $defaultvalues .="APPEARANCE/support-contact/url ";
+                    $defaultvalues .= "APPEARANCE/support-contact/url ";
                 if (Config::$APPEARANCE['support-contact']['display'] == "cat-support@our-cat-installation.example")
-                    $defaultvalues .="APPEARANCE/support-contact/display ";
+                    $defaultvalues .= "APPEARANCE/support-contact/display ";
                 if (Config::$APPEARANCE['support-contact']['developer-mail'] == "cat-develop@our-cat-installation.example")
-                    $defaultvalues .="APPEARANCE/support-contact/mail ";
+                    $defaultvalues .= "APPEARANCE/support-contact/mail ";
                 if (Config::$APPEARANCE['abuse-mail'] == "my-abuse-contact@your-cat-installation.example")
-                    $defaultvalues .="APPEARANCE/abuse-mail ";
+                    $defaultvalues .= "APPEARANCE/abuse-mail ";
                 if (Config::$APPEARANCE['MOTD'] == "Release Candidate. All bugs to be shot on sight!")
-                    $defaultvalues .="APPEARANCE/MOTD ";
+                    $defaultvalues .= "APPEARANCE/MOTD ";
                 if (Config::$APPEARANCE['webcert_CRLDP'] == ['list', 'of', 'CRL', 'pointers'])
-                    $defaultvalues .="APPEARANCE/webcert_CRLDP ";
+                    $defaultvalues .= "APPEARANCE/webcert_CRLDP ";
                 if (empty(Config::$APPEARANCE['webcert_OCSP']))
-                    $missingvalues .="APPEARANCE/webcert_OCSP ";
+                    $missingvalues .= "APPEARANCE/webcert_OCSP ";
                 elseif (Config::$APPEARANCE['webcert_OCSP'] == ['list', 'of', 'OCSP', 'pointers'])
-                    $defaultvalues .="APPEARANCE/webcert_OCSP ";
+                    $defaultvalues .= "APPEARANCE/webcert_OCSP ";
                 if (isset(Config::$RADIUSTESTS['UDP-hosts'][0]) && Config::$RADIUSTESTS['UDP-hosts'][0]['ip'] == "192.0.2.1")
-                    $defaultvalues .="RADIUSTESTS/UDP-hosts ";
+                    $defaultvalues .= "RADIUSTESTS/UDP-hosts ";
                 if (Config::$DB['INST']['host'] == "db.host.example")
-                    $defaultvalues .="DB/INST ";
+                    $defaultvalues .= "DB/INST ";
                 if (Config::$DB['INST']['host'] == "db.host.example")
-                    $defaultvalues .="DB/USER ";
-                if(!empty(Config::$DB['EXTERNAL']) && Config::$DB['EXTERNAL']['host'] == "customerdb.otherhost.example")
-                    $defaultvalues .="DB/EXTERNAL ";
+                    $defaultvalues .= "DB/USER ";
+                if (!empty(Config::$DB['EXTERNAL']) && Config::$DB['EXTERNAL']['host'] == "customerdb.otherhost.example")
+                    $defaultvalues .= "DB/EXTERNAL ";
                 $files = [];
                 foreach (Config::$RADIUSTESTS['TLS-clientcerts'] as $cadata) {
                     foreach ($cadata['certificates'] as $cert_files) {
@@ -522,14 +522,14 @@ 
                 foreach ($files as $file) {
                     $handle = fopen(CAT::$root . "/config/cli-certs/" . $file, 'r');
                     if (!$handle)
-                        $defaultvalues .="CERTIFICATE/$file ";
+                        $defaultvalues .= "CERTIFICATE/$file ";
                     else
                         fclose($handle);
                 }
                 if ($defaultvalues != "")
-                    $this->test_return(L_WARN,"Your configuration in config/config.php contains unchanged default values or links to inexistent files: <strong>$defaultvalues</strong>!");
+                    $this->test_return(L_WARN, "Your configuration in config/config.php contains unchanged default values or links to inexistent files: <strong>$defaultvalues</strong>!");
                 else
-                    $this->test_return(L_OK,"Your configuration does not contain any unchanged defaults, which is a good sign.");
+                    $this->test_return(L_OK, "Your configuration does not contain any unchanged defaults, which is a good sign.");
     }
 
    /**
@@ -538,37 +538,37 @@ 
    private function databases_test() {
         $DB = 'INST';
         $db = mysqli_connect(Config::$DB[$DB]['host'], Config::$DB[$DB]['user'], Config::$DB[$DB]['pass'], Config::$DB[$DB]['db']);
-        if(! $db) {
-           $this->test_return(L_ERROR,"Connection to the  $DB database failed");
+        if (!$db) {
+           $this->test_return(L_ERROR, "Connection to the  $DB database failed");
         } else {
-           $r = mysqli_query($db,'select * from profile_option_dict');
-           if($r->num_rows == $this->profile_option_ct)
-              $this->test_return(L_OK,"The $DB database appears to be OK.");
+           $r = mysqli_query($db, 'select * from profile_option_dict');
+           if ($r->num_rows == $this->profile_option_ct)
+              $this->test_return(L_OK, "The $DB database appears to be OK.");
            else
-              $this->test_return(L_ERROR,"The $DB database is reacheable but probably not updated to this version of CAT.");
+              $this->test_return(L_ERROR, "The $DB database is reacheable but probably not updated to this version of CAT.");
         }
         $DB = 'USER';
         $db = mysqli_connect(Config::$DB[$DB]['host'], Config::$DB[$DB]['user'], Config::$DB[$DB]['pass'], Config::$DB[$DB]['db']);
-        if(! $db) {
-           $this->test_return(L_ERROR,"Connection to the  $DB database failed");
+        if (!$db) {
+           $this->test_return(L_ERROR, "Connection to the  $DB database failed");
         } else {
-           $r = mysqli_query($db,'desc view_admin');
-           if($r->num_rows == $this->view_admin_ct)
-              $this->test_return(L_OK,"The $DB database appears to be OK.");
+           $r = mysqli_query($db, 'desc view_admin');
+           if ($r->num_rows == $this->view_admin_ct)
+              $this->test_return(L_OK, "The $DB database appears to be OK.");
            else
-              $this->test_return(L_ERROR,"The $DB is reacheable but there is something wrong with the schema");
+              $this->test_return(L_ERROR, "The $DB is reacheable but there is something wrong with the schema");
         }
         $DB = 'EXTERNAL';
-        if(! empty(Config::$DB[$DB])) {
+        if (!empty(Config::$DB[$DB])) {
         $db = mysqli_connect(Config::$DB[$DB]['host'], Config::$DB[$DB]['user'], Config::$DB[$DB]['pass'], Config::$DB[$DB]['db']);
-        if(! $db) {
-           $this->test_return(L_ERROR,"Connection to the  $DB database failed");
+        if (!$db) {
+           $this->test_return(L_ERROR, "Connection to the  $DB database failed");
         } else {
-           $r = mysqli_query($db,'desc view_admin');
-           if($r->num_rows == $this->view_admin_ct)
-              $this->test_return(L_OK,"The $DB database appears to be OK.");
+           $r = mysqli_query($db, 'desc view_admin');
+           if ($r->num_rows == $this->view_admin_ct)
+              $this->test_return(L_OK, "The $DB database appears to be OK.");
            else
-              $this->test_return(L_ERROR,"The $DB is reacheable but there is something wrong with the schema");
+              $this->test_return(L_ERROR, "The $DB is reacheable but there is something wrong with the schema");
         }
         }
    }
@@ -578,37 +578,37 @@ 
      * test devices.php for the no_cache option
      */
    private function device_cache_test() {
-       if((! empty(Devices::$Options['no_cache'])) && Devices::$Options['no_cache'])
+       if ((!empty(Devices::$Options['no_cache'])) && Devices::$Options['no_cache'])
           $global_no_cache = 1;
        else
           $global_no_cache = 0;
 
-       if($global_no_cache == 1)
-          $this->test_return(L_WARN,"Devices no_cache global option is set, this is not a good idea in a production setting\n");
+       if ($global_no_cache == 1)
+          $this->test_return(L_WARN, "Devices no_cache global option is set, this is not a good idea in a production setting\n");
        $Devs = Devices::listDevices();
        $no_cache_dev = '';
        $no_cache_dev_count = 0;
-       if($global_no_cache) {
+       if ($global_no_cache) {
           foreach ($Devs as $dev=>$D) {
-             if(empty($D['options']['no_cache']) || $D['options']['no_cache'] != 0) {
-                $no_cache_dev .= $dev." ";
+             if (empty($D['options']['no_cache']) || $D['options']['no_cache'] != 0) {
+                $no_cache_dev .= $dev . " ";
                 $no_cache_dev_count++;
              }
           }
        } else {
           foreach ($Devs as $dev=>$D) {
-             if(!empty($D['options']['no_cache']) && $D['options']['no_cache'] != 0) {
-                $no_cache_dev .= $dev." ";
+             if (!empty($D['options']['no_cache']) && $D['options']['no_cache'] != 0) {
+                $no_cache_dev .= $dev . " ";
                 $no_cache_dev_count++;
              }
           }
        }
 
 
-       if($no_cache_dev_count > 1 ) 
-          $this->test_return(L_WARN,"The following devices will not be cached: $no_cache_dev");
-       if($no_cache_dev_count == 1 ) 
-          $this->test_return(L_WARN,"The following device will not be cached: $no_cache_dev");
+       if ($no_cache_dev_count > 1) 
+          $this->test_return(L_WARN, "The following devices will not be cached: $no_cache_dev");
+       if ($no_cache_dev_count == 1) 
+          $this->test_return(L_WARN, "The following device will not be cached: $no_cache_dev");
 
    }
 
@@ -617,7 +617,7 @@ 
      */
    private function mailer_test() {
       if (empty(Config::$APPEARANCE['abuse-mail']) || Config::$APPEARANCE['abuse-mail'] == "my-abuse-contact@your-cat-installation.example") {
-         $this->test_return(L_ERROR,"Your abuse-mail has not been set, cannot continue with mailer tests.");
+         $this->test_return(L_ERROR, "Your abuse-mail has not been set, cannot continue with mailer tests.");
          return;
       }
       $mail = new PHPMailer();
@@ -637,10 +637,10 @@ 
       $mail->Subject = "testing CAT configuration mail";
       $mail->Body = "Testing CAT mailing\n";
       $sent = $mail->send();
-      if($sent)
-          $this->test_return(L_OK,"mailer settings appear to be working, check ".Config::$APPEARANCE['abuse-mail']." mailbox if the message was receiced.");
+      if ($sent)
+          $this->test_return(L_OK, "mailer settings appear to be working, check " . Config::$APPEARANCE['abuse-mail'] . " mailbox if the message was receiced.");
       else
-          $this->test_return(L_ERROR,"mailer settings failed, check the Config::MAILSETTINGS");
+          $this->test_return(L_ERROR, "mailer settings failed, check the Config::MAILSETTINGS");
 
    }
 

core/DeviceConfig.php

Spacing +103 added lines, -103 removed lines

@@ -63,9 +63,9 @@ 
      */
 
       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);
+      $this->supportedEapMethods = [EAP::$TLS, EAP::$PEAP_MSCHAP2, EAP::$TTLS_PAP];
+      debug(4, "This device supports the following EAP methods: ");
+      debug(4, $this->supportedEapMethods);
     }
 
 
@@ -88,50 +88,50 @@ 
     * @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");
+       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) {
+       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');
+       mkdir($T['dir'] . '/tmp');
+       chdir($T['dir'] . '/tmp');
        $CAs = [];
-       if(isset($this->attributes['eap:ca_file'])) {
+       if (isset($this->attributes['eap:ca_file'])) {
        foreach ($this->attributes['eap:ca_file'] as $ca) {
-          if($c = X509::processCertificate($ca))
+          if ($c = X509::processCertificate($ca))
              $CAs[] = $c;
           }
-          $this->attributes['internal:CAs'][0]=$CAs;
+          $this->attributes['internal:CAs'][0] = $CAs;
        }
-       if(isset($this->attributes['support:info_file'])) {
+       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']))
+       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: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']);
+       $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;
+       if ($this->signer && $this->options['sign'])
+         $this->sign = CAT::$root . '/signer/' . $this->signer;
        $this->installerBasename = $this->getInstallerBasename();
     }
 
@@ -143,10 +143,10 @@ 
     */   
    public function getPreferredEapType($eap_array) {
      foreach ($eap_array as $eap) {
-         if(in_array($eap,$this->supportedEapMethods)) {
+         if (in_array($eap, $this->supportedEapMethods)) {
             $this->selected_eap = $eap;
-            debug(4,"Selected EAP:");
-            debug(4,$eap);
+            debug(4, "Selected EAP:");
+            debug(4, $eap);
             return($eap);
          }
      }
@@ -178,22 +178,22 @@ 
     * @final not to be redefined
     */
    final protected function copyFile($source_name, $output_name = 0) {
-      if  ( $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;
+      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");
+        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(2,"fileCopy($source_name, $output_name) failed\n");
+      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); 
    }
 
@@ -223,31 +223,31 @@ 
     */
 
    final protected function translateFile($source_name, $output_name = 0, $encoding = 0) {
-      if(Config::$NSIS_VERSION >= 3)
+      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");
+      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;
+      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)
+      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);
+      $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");
+      debug(4, "translateFile($source, $output_name, $encoding) end\n");
    }
 
 
@@ -268,17 +268,17 @@ 
     * @final not to be redefined
     */
 
-   final protected function translateString($source_string,$encoding = 0) {
-      if(Config::$NSIS_VERSION >= 3)
+   final protected function translateString($source_string, $encoding = 0) {
+      if (Config::$NSIS_VERSION >= 3)
         $encoding = 0;
-      if($encoding)
-        $output_c = iconv('UTF-8',$encoding.'//TRANSLIT',$source_string);
+      if ($encoding)
+        $output_c = iconv('UTF-8', $encoding . '//TRANSLIT', $source_string);
       else
         $output_c = $source_string;
-      if($output_c) 
-         $source_string  = str_replace('"','$\\"',$output_c);
+      if ($output_c) 
+         $source_string = str_replace('"', '$\\"', $output_c);
       else
-         debug(2,"Failed to convert string $source_string\n");
+         debug(2, "Failed to convert string $source_string\n");
       return $source_string;
    }
 
@@ -295,19 +295,19 @@ 
    * root is set to 1 for the CA roor certicicate and 0 otherwise
   */ 
    final protected function saveCertificateFiles($format) {
-     if($format == 'der' || $format == 'pam') {
+     if ($format == 'der' || $format == 'pam') {
        $i = 0;
        $CA_files = [];
        $ca_array = $this->attributes['internal:CAs'][0];
-       if(! $ca_array)
+       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']);
+         $f = fopen("cert-$i.crt", "w");
+         if (!$f) die("problem opening the file\n");
+         if ($format == "pem")
+            fwrite($f, $CA['pem']);
          else
-            fwrite($f,$CA['der']);
+            fwrite($f, $CA['der']);
          fclose($f);
          $C = [];
          $C['file'] = "cert-$i.crt";
@@ -334,42 +334,42 @@ 
     */
    private function getInstallerBasename() {
       $replace_pattern = '/[ ()\/\'"]+/';
-      debug(4,"getInstallerBasename1:".$this->attributes['general:instname'][0]."\n");
+      debug(4, "getInstallerBasename1:" . $this->attributes['general:instname'][0] . "\n");
       $inst = iconv("UTF-8", "US-ASCII//TRANSLIT", preg_replace($replace_pattern, '_', $this->attributes['general:instname'][0]));
-      debug(4,"getInstallerBasename2:$inst\n");
-      $Inst_a = explode('_',$inst);
-      if(count($Inst_a) > 2) {
+      debug(4, "getInstallerBasename2:$inst\n");
+      $Inst_a = explode('_', $inst);
+      if (count($Inst_a) > 2) {
          $inst = '';
-         foreach($Inst_a as $i)
+         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'][0])) {
+      if ($this->attributes['internal:profile_count'][0] > 1) {
+         if (!empty($this->attributes['profile:name']) && !empty($this->attributes['profile:name'][0])) {
              $prof = iconv("UTF-8", "US-ASCII//TRANSLIT", preg_replace($replace_pattern, '_', $this->attributes['profile:name'][0]));
-             $prof = preg_replace('/_+$/','',$prof);
-             return $c_name. '-'. $this->getDeviceId() . $inst .'-'. $prof;
+             $prof = preg_replace('/_+$/', '', $prof);
+             return $c_name . '-' . $this->getDeviceId() . $inst . '-' . $prof;
          }
       }
-      return $c_name. '-'. $this->getDeviceId() . $inst;
+      return $c_name . '-' . $this->getDeviceId() . $inst;
   }
 
   private function getDeviceId() {
     $d_id = $this->device_id;
-    if(isset($this->options['device_id'])) 
+    if (isset($this->options['device_id'])) 
       $d_id = $this->options['device_id'];
-    if($d_id !== '')
+    if ($d_id !== '')
       $d_id .= '-';
     return $d_id;
   }
 
 
   private function getSSIDs() {
-    $S['add']=[];
-    $S['del']=[];
+    $S['add'] = [];
+    $S['del'] = [];
     if (isset(Config::$CONSORTIUM['ssid'])) {
        foreach (Config::$CONSORTIUM['ssid'] as $ssid) {
-        if(isset(Config::$CONSORTIUM['tkipsupport']) && Config::$CONSORTIUM['tkipsupport'] == TRUE)
+        if (isset(Config::$CONSORTIUM['tkipsupport']) && Config::$CONSORTIUM['tkipsupport'] == TRUE)
           $S['add'][$ssid] = 'TKIP';
         else {
           $S['add'][$ssid] = 'AES';
@@ -377,20 +377,20 @@ 
         }
        }
     }
-    if(isset($this->attributes['media:SSID'])) {
+    if (isset($this->attributes['media:SSID'])) {
       $SSID = $this->attributes['media:SSID'];
 
-      foreach($SSID as $ssid)
+      foreach ($SSID as $ssid)
          $S['add'][$ssid] = 'AES';
       }
-    if(isset($this->attributes['media:SSID_with_legacy'])) {
+    if (isset($this->attributes['media:SSID_with_legacy'])) {
       $SSID = $this->attributes['media:SSID_with_legacy'];
-      foreach($SSID as $ssid)
+      foreach ($SSID as $ssid)
          $S['add'][$ssid] = 'TKIP';
     }
-    if(isset($this->attributes['media:remove_SSID'])) {
+    if (isset($this->attributes['media:remove_SSID'])) {
       $SSID = $this->attributes['media:remove_SSID'];
-      foreach($SSID as $ssid)
+      foreach ($SSID as $ssid)
          $S['del'][$ssid] = 'DEL';
     }
     return $S;
@@ -416,25 +416,25 @@ 
   ];
 
   private function saveLogoFile($Logos) {
-    $i=0;
-    $returnarray= [];
+    $i = 0;
+    $returnarray = [];
     foreach ($Logos as $blob) {
       $finfo = new finfo(FILEINFO_MIME_TYPE);
       $mime = $finfo->buffer($blob);
-      if(preg_match('/^image\/(.*)/',$mime,$m))
+      if (preg_match('/^image\/(.*)/', $mime, $m))
         $ext = $m[1];
       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");
+      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);
+      fwrite($f, $blob);
       fclose($f);
-      $returnarray[]= ['name'=>$f_name,'mime'=>$ext];
+      $returnarray[] = ['name'=>$f_name, 'mime'=>$ext];
       $i++;
     }
     return($returnarray);
@@ -445,17 +445,17 @@ 
     $finfo = new finfo(FILEINFO_MIME_TYPE);
     $mime = $finfo->buffer($blob);
     $ext = isset($this->mime_extensions[$mime]) ? $this->mime_extensions[$mime] : 'usupported';
-    debug(4,"saveInfoFile: $mime : $ext\n");
-    $f = fopen('local-info.'.$ext,"w");
-    if(! $f) die("problem opening the file\n");
-    fwrite($f,$blob);
+    debug(4, "saveInfoFile: $mime : $ext\n");
+    $f = fopen('local-info.' . $ext, "w");
+    if (!$f) die("problem opening the file\n");
+    fwrite($f, $blob);
     fclose($f);
-    return(['name'=>'local-info.'.$ext,'mime'=>$ext]);
+    return(['name'=>'local-info.' . $ext, 'mime'=>$ext]);
   }
 
   private function getProfileAttributes(Profile $profile) {
      $eaps = $profile->getEapMethodsinOrderOfPreference(1);
-     if($eap = $this->getPreferredEapType($eaps)) {
+     if ($eap = $this->getPreferredEapType($eaps)) {
           $a = $profile->getCollapsedAttributes($eap);
           $a['eap'] = $eap;
           $a['all_eaps'] = $eaps;
@@ -476,8 +476,8 @@ 
         ob_start();
         print_r($this->attributes);
         $output = ob_get_clean();
-        $f = fopen($file,"w");
-        fwrite($f,$output);
+        $f = fopen($file, "w");
+        fwrite($f, $output);
         fclose($f);
   }
 /** 

core/DeviceFactory.php

Spacing +9 added lines, -9 removed lines

@@ -47,24 +47,24 @@
     public function __construct($blueprint) {
 
       $Dev = Devices::listDevices();
-        if(isset($Dev[$blueprint])) {
-            if($Dev[$blueprint]['directory'] && $Dev[$blueprint]['module'])
-                require_once("devices/".$Dev[$blueprint]['directory']."/".$Dev[$blueprint]['module'].".php");
-            debug(4,"loaded: devices/".$Dev[$blueprint]['directory']."/".$Dev[$blueprint]['module'].".php\n");
-            $class_name = "Device_".$Dev[$blueprint]['module'];
+        if (isset($Dev[$blueprint])) {
+            if ($Dev[$blueprint]['directory'] && $Dev[$blueprint]['module'])
+                require_once("devices/" . $Dev[$blueprint]['directory'] . "/" . $Dev[$blueprint]['module'] . ".php");
+            debug(4, "loaded: devices/" . $Dev[$blueprint]['directory'] . "/" . $Dev[$blueprint]['module'] . ".php\n");
+            $class_name = "Device_" . $Dev[$blueprint]['module'];
             $this->device = new $class_name();
-            if(! $this->device) {
-                debug(2,"module loading failed");
+            if (!$this->device) {
+                debug(2, "module loading failed");
                 die("module loading failed");
             }
         } else {
             error("unknown devicename:$blueprint");
         }
-       $this->device->module_path = CAT::$root.'/devices/'.$Dev[$blueprint]['directory'];
+       $this->device->module_path = CAT::$root . '/devices/' . $Dev[$blueprint]['directory'];
        $this->device->signer = isset($Dev[$blueprint]['signer']) ? $Dev[$blueprint]['signer'] : 0; 
        $this->device->device_id = $blueprint;
        $options = Devices::$Options;
-       if(isset($Dev[$blueprint]['options'])) {
+       if (isset($Dev[$blueprint]['options'])) {
           $Opt = $Dev[$blueprint]['options'];
           foreach ($Opt as $option => $value)
             $options[$option] = $value;