nilsteampassnet / TeamPass

includes/libraries/LDAP/adLDAP/classes/adLDAPContacts.php

Indentation +36 added lines, -36 removed lines

@@ -55,11 +55,11 @@ 
     // * Still work to do in this area, and new functions to write
     
     /**
-    * Create a contact
-    * 
-    * @param array $attributes The attributes to set to the contact
-    * @return string|boolean
-    */
+     * Create a contact
+     * 
+     * @param array $attributes The attributes to set to the contact
+     * @return string|boolean
+     */
     public function create($attributes) {
         // Check for compulsory fields
         if (!array_key_exists("display_name", $attributes)) { return "Missing compulsory field [display_name]"; }
@@ -93,12 +93,12 @@ 
     }  
     
     /**
-    * Determine the list of groups a contact is a member of
-    * 
-    * @param string $distinguishedName The full DN of a contact
-    * @param bool $recursive Recursively check groups
-    * @return array
-    */
+     * Determine the list of groups a contact is a member of
+     * 
+     * @param string $distinguishedName The full DN of a contact
+     * @param bool $recursive Recursively check groups
+     * @return array
+     */
     public function groups($distinguishedName, $recursive = NULL) {
         if ($distinguishedName === NULL) { return false; }
         if ($recursive === NULL) { $recursive = $this->adldap->getRecursiveGroups(); } //use the default option if they haven't set it
@@ -118,12 +118,12 @@ 
     }
     
     /**
-    * Get contact information. Returned in a raw array format from AD
-    * 
-    * @param string $distinguishedName The full DN of a contact
-    * @param array $fields Attributes to be returned
-    * @return array
-    */
+     * Get contact information. Returned in a raw array format from AD
+     * 
+     * @param string $distinguishedName The full DN of a contact
+     * @param array $fields Attributes to be returned
+     * @return array
+     */
     public function info($distinguishedName, $fields = NULL)
     {
         if ($distinguishedName === NULL) { return false; }
@@ -195,12 +195,12 @@ 
     }          
 
     /**
-    * Modify a contact
-    * 
-    * @param string $distinguishedName The contact to query
-    * @param array $attributes The attributes to modify.  Note if you set the enabled attribute you must not specify any other attributes
-    * @return string|boolean
-    */
+     * Modify a contact
+     * 
+     * @param string $distinguishedName The contact to query
+     * @param array $attributes The attributes to modify.  Note if you set the enabled attribute you must not specify any other attributes
+     * @return string|boolean
+     */
     public function modify($distinguishedName, $attributes) {
         if ($distinguishedName === NULL) { return "Missing compulsory field [distinguishedname]"; }
         
@@ -221,11 +221,11 @@ 
     }
     
     /**
-    * Delete a contact
-    * 
-    * @param string $distinguishedName The contact dn to delete (please be careful here!)
-    * @return boolean
-    */
+     * Delete a contact
+     * 
+     * @param string $distinguishedName The contact dn to delete (please be careful here!)
+     * @return boolean
+     */
     public function delete($distinguishedName) {
         $result = $this->folder()->delete($distinguishedName);
         if ($result != true) { 
@@ -268,14 +268,14 @@ 
     }
     
     /**
-    * Mail enable a contact
-    * Allows email to be sent to them through Exchange
-    * 
-    * @param string $distinguishedName The contact to mail enable
-    * @param string $emailAddress The email address to allow emails to be sent through
-    * @param string $mailNickname The mailnickname for the contact in Exchange.  If NULL this will be set to the display name
-    * @return string|boolean
-    */
+     * Mail enable a contact
+     * Allows email to be sent to them through Exchange
+     * 
+     * @param string $distinguishedName The contact to mail enable
+     * @param string $emailAddress The email address to allow emails to be sent through
+     * @param string $mailNickname The mailnickname for the contact in Exchange.  If NULL this will be set to the display name
+     * @return string|boolean
+     */
     public function contactMailEnable($distinguishedName, $emailAddress, $mailNickname = NULL) {
         return $this->adldap->exchange()->contactMailEnable($distinguishedName, $emailAddress, $mailNickname);
     }

includes/libraries/LDAP/adLDAP/classes/adLDAPComputers.php

Indentation +7 added lines, -7 removed lines

@@ -96,13 +96,13 @@
     }
     
     /**
-    * Check if a computer is in a group
-    * 
-    * @param string $computerName The name of the computer
-    * @param string $group The group to check
-    * @param bool $recursive Whether to check recursively
-    * @return boolean
-    */
+     * Check if a computer is in a group
+     * 
+     * @param string $computerName The name of the computer
+     * @param string $group The group to check
+     * @param bool $recursive Whether to check recursively
+     * @return boolean
+     */
     public function inGroup($computerName, $group, $recursive = NULL) {
         if ($computerName === NULL) { return false; }
         if ($group === NULL) { return false; }

Spacing +2 added lines, -2 removed lines

@@ -129,14 +129,14 @@
     public function groups($computerName, $recursive = NULL) {
         if ($computerName === NULL) { return false; }
         if ($recursive === NULL) { $recursive = $this->adldap->getRecursiveGroups(); } //use the default option if they haven't set it
-        if (!$this->adldap->getLdapBind()){ return false; }
+        if (!$this->adldap->getLdapBind()) { return false; }
 
         //search the directory for their information
         $info = @$this->info($computerName, array("memberof", "primarygroupid"));
         $groups = $this->adldap->utilities()->niceNames($info[0]["memberof"]); //presuming the entry returned is our guy (unique usernames)
 
         if ($recursive === true) {
-            foreach ($groups as $id => $groupName){
+            foreach ($groups as $id => $groupName) {
                 $extraGroups = $this->adldap->group()->recursiveGroups($groupName);
                 $groups = array_merge($groups, $extraGroups);
             }

includes/libraries/LDAP/adLDAP/classes/adLDAPFolders.php

Indentation +5 added lines, -5 removed lines

@@ -140,11 +140,11 @@
     }
 
     /**
-    * Create an organizational unit
-    * 
-    * @param array $attributes Default attributes of the ou
-    * @return string|boolean
-    */
+     * Create an organizational unit
+     * 
+     * @param array $attributes Default attributes of the ou
+     * @return string|boolean
+     */
     public function create($attributes) {
         if (!is_array($attributes)) { return "Attributes must be an array"; }
         if (!is_array($attributes["container"])) { return "Container attribute must be an array."; }

Braces +1 added lines, -2 removed lines

@@ -118,8 +118,7 @@
             $ou = $dnType."=".implode(",".$dnType."=", $folderName);
             $filter .= '(!(distinguishedname='.$ou.','.$this->adldap->getBaseDn().')))';
             $searchOu = $ou.','.$this->adldap->getBaseDn();
-        }
-        else {
+        } else {
             $filter .= '(!(distinguishedname='.$this->adldap->getBaseDn().')))';
         }
 

includes/libraries/Database/Meekrodb/db.class.php

Indentation +67 added lines, -67 removed lines

@@ -312,27 +312,27 @@ 
     array_unshift($args, $table);
     array_unshift($args, $query);
     return call_user_func_array(array($this, 'query'), $args);
-  }
+    }
 
-  /**
-   * @param string $which
-   */
-  public function insertOrReplace($which, $table, $datas, $options=array()) {
+    /**
+     * @param string $which
+     */
+    public function insertOrReplace($which, $table, $datas, $options=array()) {
     $datas = unserialize(serialize($datas)); // break references within array
     $keys = $values = array();
 
     if (isset($datas[0]) && is_array($datas[0])) {
-      foreach ($datas as $datum) {
+        foreach ($datas as $datum) {
         ksort($datum);
         if (! $keys) {
             $keys = array_keys($datum);
         }
         $values[] = array_values($datum);
-      }
+        }
 
     } else {
-      $keys = array_keys($datas);
-      $values = array_values($datas);
+        $keys = array_keys($datas);
+        $values = array_values($datas);
     }
 
     if (isset($options['ignore']) && $options['ignore']) {
@@ -340,35 +340,35 @@ 
     }
 
     if (isset($options['update']) && is_array($options['update']) && $options['update'] && strtolower($which) == 'insert') {
-      if (array_values($options['update']) !== $options['update']) {
+        if (array_values($options['update']) !== $options['update']) {
         return $this->query("INSERT INTO %b %lb VALUES %? ON DUPLICATE KEY UPDATE %?", $table, $keys, $values, $options['update']);
-      } else {
+        } else {
         $update_str = array_shift($options['update']);
         $query_param = array("INSERT INTO %b %lb VALUES %? ON DUPLICATE KEY UPDATE $update_str", $table, $keys, $values);
         $query_param = array_merge($query_param, $options['update']);
         return call_user_func_array(array($this, 'query'), $query_param);
-      }
+        }
 
     }
 
     return $this->query("%l INTO %b %lb VALUES %?", $which, $table, $keys, $values);
-  }
+    }
 
-  public function insert($table, $data) { return $this->insertOrReplace('INSERT', $table, $data); }
-  public function insertIgnore($table, $data) { return $this->insertOrReplace('INSERT', $table, $data, array('ignore' => true)); }
-  public function replace($table, $data) { return $this->insertOrReplace('REPLACE', $table, $data); }
+    public function insert($table, $data) { return $this->insertOrReplace('INSERT', $table, $data); }
+    public function insertIgnore($table, $data) { return $this->insertOrReplace('INSERT', $table, $data, array('ignore' => true)); }
+    public function replace($table, $data) { return $this->insertOrReplace('REPLACE', $table, $data); }
 
-  public function insertUpdate() {
+    public function insertUpdate() {
     $args = func_get_args();
     $table = array_shift($args);
     $data = array_shift($args);
 
     if (!isset($args[0])) { // update will have all the data of the insert
-      if (isset($data[0]) && is_array($data[0])) { //multiple insert rows specified -- failing!
+        if (isset($data[0]) && is_array($data[0])) { //multiple insert rows specified -- failing!
         $this->nonSQLError("Badly formatted insertUpdate() query -- you didn't specify the update component!");
-      }
+        }
 
-      $args[0] = $data;
+        $args[0] = $data;
     }
 
     if (is_array($args[0])) {
@@ -378,31 +378,31 @@ 
     }
 
     return $this->insertOrReplace('INSERT', $table, $data, array('update' => $update));
-  }
+    }
 
-  public function delete() {
+    public function delete() {
     $args = func_get_args();
     $table = $this->formatTableName(array_shift($args));
     $where = array_shift($args);
     $buildquery = "DELETE FROM $table WHERE $where";
     array_unshift($args, $buildquery);
     return call_user_func_array(array($this, 'query'), $args);
-  }
+    }
 
-  public function sqleval() {
+    public function sqleval() {
     $args = func_get_args();
     $text = call_user_func_array(array($this, 'parseQueryParams'), $args);
     return new MeekroDBEval($text);
-  }
+    }
 
-  public function columnList($table) {
+    public function columnList($table) {
     return $this->queryOneColumn('Field', "SHOW COLUMNS FROM $table");
-  }
+    }
 
-  public function tableList($db = null) {
+    public function tableList($db = null) {
     if ($db) {
-      $olddb = $this->current_db;
-      $this->useDB($db);
+        $olddb = $this->current_db;
+        $this->useDB($db);
     }
 
     $result = $this->queryFirstColumn('SHOW TABLES');
@@ -410,9 +410,9 @@ 
         $this->useDB($olddb);
     }
     return $result;
-  }
+    }
 
-  protected function preparseQueryParams() {
+    protected function preparseQueryParams() {
     $args = func_get_args();
     $sql = trim(strval(array_shift($args)));
     $args_all = $args;
@@ -562,60 +562,60 @@ 
     $array_types = array('ls', 'li', 'ld', 'lb', 'll', 'lt');
 
     foreach ($chunkyQuery as $chunk) {
-      if (is_string($chunk)) {
+        if (is_string($chunk)) {
         $query .= $chunk;
         continue;
-      }
+        }
 
-      $type = $chunk['type'];
-      $arg = $chunk['value'];
-      $result = '';
+        $type = $chunk['type'];
+        $arg = $chunk['value'];
+        $result = '';
 
-      if ($type != '?') {
+        if ($type != '?') {
         $is_array_type = in_array($type, $array_types, true);
         if ($is_array_type && !is_array($arg)) $this->nonSQLError("Badly formatted SQL query: Expected array, got scalar instead!");
         else if (!$is_array_type && is_array($arg)) $this->nonSQLError("Badly formatted SQL query: Expected scalar, got array instead!");
-      }
+        }
 
-      if ($type == 's') $result = $this->escape($arg);
-      else if ($type == 'i') $result = $this->intval($arg);
-      else if ($type == 'd') $result = doubleval($arg);
-      else if ($type == 'b') $result = $this->formatTableName($arg);
-      else if ($type == 'l') $result = $arg;
-      else if ($type == 'ss') $result = $this->escape("%".str_replace(array('%', '_'), array('\%', '\_'), $arg)."%");
-      else if ($type == 't') $result = $this->escape($this->parseTS($arg));
+        if ($type == 's') $result = $this->escape($arg);
+        else if ($type == 'i') $result = $this->intval($arg);
+        else if ($type == 'd') $result = doubleval($arg);
+        else if ($type == 'b') $result = $this->formatTableName($arg);
+        else if ($type == 'l') $result = $arg;
+        else if ($type == 'ss') $result = $this->escape("%".str_replace(array('%', '_'), array('\%', '\_'), $arg)."%");
+        else if ($type == 't') $result = $this->escape($this->parseTS($arg));
 
-      else if ($type == 'ls') $result = array_map(array($this, 'escape'), $arg);
-      else if ($type == 'li') $result = array_map(array($this, 'intval'), $arg);
-      else if ($type == 'ld') $result = array_map('doubleval', $arg);
-      else if ($type == 'lb') $result = array_map(array($this, 'formatTableName'), $arg);
-      else if ($type == 'll') $result = $arg;
-      else if ($type == 'lt') $result = array_map(array($this, 'escape'), array_map(array($this, 'parseTS'), $arg));
+        else if ($type == 'ls') $result = array_map(array($this, 'escape'), $arg);
+        else if ($type == 'li') $result = array_map(array($this, 'intval'), $arg);
+        else if ($type == 'ld') $result = array_map('doubleval', $arg);
+        else if ($type == 'lb') $result = array_map(array($this, 'formatTableName'), $arg);
+        else if ($type == 'll') $result = $arg;
+        else if ($type == 'lt') $result = array_map(array($this, 'escape'), array_map(array($this, 'parseTS'), $arg));
 
-      else if ($type == '?') $result = $this->sanitize($arg);
+        else if ($type == '?') $result = $this->sanitize($arg);
 
-      else $this->nonSQLError("Badly formatted SQL query: Invalid MeekroDB param $type");
+        else $this->nonSQLError("Badly formatted SQL query: Invalid MeekroDB param $type");
 
-      if (is_array($result)) $result = '('.implode(',', $result).')';
+        if (is_array($result)) $result = '('.implode(',', $result).')';
 
-      $query .= $result;
+        $query .= $result;
     }
 
     return $query;
-  }
+    }
 
-  /**
-   * @param string $prepend
-   */
-  protected function prependCall($function, $args, $prepend) { array_unshift($args, $prepend); return call_user_func_array($function, $args); }
-  public function query() { $args = func_get_args(); return $this->prependCall(array($this, 'queryHelper'), $args, 'assoc'); }
-  public function queryAllLists() { $args = func_get_args(); return $this->prependCall(array($this, 'queryHelper'), $args, 'list'); }
-  public function queryFullColumns() { $args = func_get_args(); return $this->prependCall(array($this, 'queryHelper'), $args, 'full'); }
+    /**
+     * @param string $prepend
+     */
+    protected function prependCall($function, $args, $prepend) { array_unshift($args, $prepend); return call_user_func_array($function, $args); }
+    public function query() { $args = func_get_args(); return $this->prependCall(array($this, 'queryHelper'), $args, 'assoc'); }
+    public function queryAllLists() { $args = func_get_args(); return $this->prependCall(array($this, 'queryHelper'), $args, 'list'); }
+    public function queryFullColumns() { $args = func_get_args(); return $this->prependCall(array($this, 'queryHelper'), $args, 'full'); }
 
-  public function queryRaw() { $args = func_get_args(); return $this->prependCall(array($this, 'queryHelper'), $args, 'raw_buf'); }
-  public function queryRawUnbuf() { $args = func_get_args(); return $this->prependCall(array($this, 'queryHelper'), $args, 'raw_unbuf'); }
+    public function queryRaw() { $args = func_get_args(); return $this->prependCall(array($this, 'queryHelper'), $args, 'raw_buf'); }
+    public function queryRawUnbuf() { $args = func_get_args(); return $this->prependCall(array($this, 'queryHelper'), $args, 'raw_unbuf'); }
 
-  protected function queryHelper() {
+    protected function queryHelper() {
     $args = func_get_args();
     $type = array_shift($args);
     $db = $this->get();

Spacing +40 added lines, -40 removed lines

@@ -160,7 +160,7 @@ 
     public $nested_transactions_count = 0;
 
 
-    public function __construct($host=null, $user=null, $password=null, $dbName=null, $port=null, $encoding=null) {
+    public function __construct($host = null, $user = null, $password = null, $dbName = null, $port = null, $encoding = null) {
     if ($host === null) $host = DB::$host;
     if ($user === null) $user = DB::$user;
     if ($password === null) $password = DB::$password;
@@ -180,13 +180,13 @@ 
     $mysql = $this->internal_mysql;
 
     if (!($mysql instanceof MySQLi)) {
-        if (! $this->port) $this->port = ini_get('mysqli.default_port');
+        if (!$this->port) $this->port = ini_get('mysqli.default_port');
         $this->current_db = $this->dbName;
       
         $mysql = new mysqli($this->host, $this->user, $this->password, $this->dbName, $this->port);
 
         if ($mysql->connect_error) {
-        $this->nonSQLError('Unable to connect to MySQL server! Error: ' . $mysql->connect_error);
+        $this->nonSQLError('Unable to connect to MySQL server! Error: '.$mysql->connect_error);
         }
 
         $mysql->set_charset($this->encoding);
@@ -234,7 +234,7 @@ 
     public function useDB() { $args = func_get_args(); return call_user_func_array(array($this, 'setDB'), $args); }
     public function setDB($dbName) {
     $db = $this->get();
-    if (! $db->select_db($dbName)) {
+    if (!$db->select_db($dbName)) {
         $this->nonSQLError("Unable to set database to $dbName");
     }
     $this->current_db = $dbName;
@@ -243,7 +243,7 @@ 
 
     public function startTransaction() {
     if ($this->nested_transactions && $this->serverVersion() < '5.5') {
-        return $this->nonSQLError("Nested transactions are only available on MySQL 5.5 and greater. You are using MySQL " . $this->serverVersion());
+        return $this->nonSQLError("Nested transactions are only available on MySQL 5.5 and greater. You are using MySQL ".$this->serverVersion());
     }
 
     if (!$this->nested_transactions || $this->nested_transactions_count == 0) {
@@ -257,9 +257,9 @@ 
     return $this->nested_transactions_count;
     }
 
-    public function commit($all=false) {
+    public function commit($all = false) {
     if ($this->nested_transactions && $this->serverVersion() < '5.5') {
-        return $this->nonSQLError("Nested transactions are only available on MySQL 5.5 and greater. You are using MySQL " . $this->serverVersion());
+        return $this->nonSQLError("Nested transactions are only available on MySQL 5.5 and greater. You are using MySQL ".$this->serverVersion());
     }
 
     if ($this->nested_transactions && $this->nested_transactions_count > 0)
@@ -275,9 +275,9 @@ 
     return $this->nested_transactions_count;
     }
 
-    public function rollback($all=false) {
+    public function rollback($all = false) {
     if ($this->nested_transactions && $this->serverVersion() < '5.5') {
-        return $this->nonSQLError("Nested transactions are only available on MySQL 5.5 and greater. You are using MySQL " . $this->serverVersion());
+        return $this->nonSQLError("Nested transactions are only available on MySQL 5.5 and greater. You are using MySQL ".$this->serverVersion());
     }
 
     if ($this->nested_transactions && $this->nested_transactions_count > 0)
@@ -297,7 +297,7 @@ 
     $table = trim($table, '`');
 
     if (strpos($table, '.')) return implode('.', array_map(array($this, 'formatTableName'), explode('.', $table)));
-    else return '`' . str_replace('`', '``', $table) . '`';
+    else return '`'.str_replace('`', '``', $table).'`';
     }
 
     public function update() {
@@ -317,14 +317,14 @@ 
   /**
    * @param string $which
    */
-  public function insertOrReplace($which, $table, $datas, $options=array()) {
+  public function insertOrReplace($which, $table, $datas, $options = array()) {
     $datas = unserialize(serialize($datas)); // break references within array
     $keys = $values = array();
 
     if (isset($datas[0]) && is_array($datas[0])) {
       foreach ($datas as $datum) {
         ksort($datum);
-        if (! $keys) {
+        if (!$keys) {
             $keys = array_keys($datum);
         }
         $values[] = array_values($datum);
@@ -425,20 +425,20 @@ 
     $named_seperator_length = strlen($this->named_param_seperator);
 
     $types = array(
-        $this->param_char . 'll', // list of literals
-        $this->param_char . 'ls', // list of strings
-        $this->param_char . 'l',  // literal
-        $this->param_char . 'li', // list of integers
-        $this->param_char . 'ld', // list of decimals
-        $this->param_char . 'lb', // list of backticks
-        $this->param_char . 'lt', // list of timestamps
-        $this->param_char . 's',  // string
-        $this->param_char . 'i',  // integer
-        $this->param_char . 'd',  // double / decimal
-        $this->param_char . 'b',  // backtick
-        $this->param_char . 't',  // timestamp
-        $this->param_char . '?',  // infer type
-        $this->param_char . 'ss'  // search string (like string, surrounded with %'s)
+        $this->param_char.'ll', // list of literals
+        $this->param_char.'ls', // list of strings
+        $this->param_char.'l', // literal
+        $this->param_char.'li', // list of integers
+        $this->param_char.'ld', // list of decimals
+        $this->param_char.'lb', // list of backticks
+        $this->param_char.'lt', // list of timestamps
+        $this->param_char.'s', // string
+        $this->param_char.'i', // integer
+        $this->param_char.'d', // double / decimal
+        $this->param_char.'b', // backtick
+        $this->param_char.'t', // timestamp
+        $this->param_char.'?', // infer type
+        $this->param_char.'ss'  // search string (like string, surrounded with %'s)
     );
 
     // generate list of all MeekroDB variables in our query, and their position
@@ -513,7 +513,7 @@ 
     return $chunkyQuery;
     }
 
-    protected function escape($str) { return "'" . $this->get()->real_escape_string(strval($str)) . "'"; }
+    protected function escape($str) { return "'".$this->get()->real_escape_string(strval($str))."'"; }
 
     protected function sanitize($value) {
     if (is_object($value)) {
@@ -531,12 +531,12 @@ 
         // non-assoc array?
         if (array_values($value) === $value) {
         if (is_array($value[0])) return implode(', ', array_map(array($this, 'sanitize'), $value));
-        else return '(' . implode(', ', array_map(array($this, 'sanitize'), $value)) . ')';
+        else return '('.implode(', ', array_map(array($this, 'sanitize'), $value)).')';
         }
 
         $pairs = array();
         foreach ($value as $k => $v) {
-        $pairs[] = $this->formatTableName($k) . '=' . $this->sanitize($v);
+        $pairs[] = $this->formatTableName($k).'='.$this->sanitize($v);
         }
 
         return implode(', ', $pairs);
@@ -712,7 +712,7 @@ 
     if ($full_names) {
         $infos = array();
         foreach ($result->fetch_fields() as $info) {
-        if (strlen($info->table)) $infos[] = $info->table . '.' . $info->name;
+        if (strlen($info->table)) $infos[] = $info->table.'.'.$info->name;
         else $infos[] = $info->name;
         }
     }
@@ -843,12 +843,12 @@ 
     if ($this->clauses[$i] instanceof WhereClause) {
         $this->clauses[$i]->negate();
     } else {
-        $this->clauses[$i]['sql'] = 'NOT (' . $this->clauses[$i]['sql'] . ')';
+        $this->clauses[$i]['sql'] = 'NOT ('.$this->clauses[$i]['sql'].')';
     }
     }
 
     function negate() {
-    $this->negate = ! $this->negate;
+    $this->negate = !$this->negate;
     }
 
     function addClause($type) {
@@ -900,7 +900,7 @@ 
     DB::startTransaction();
     }
     function __destruct() {
-    if (! $this->committed) DB::rollback();
+    if (!$this->committed) DB::rollback();
     }
     function commit() {
     DB::commit();
@@ -913,7 +913,7 @@ 
 class MeekroDBException extends Exception {
     protected $query = '';
 
-    function __construct($message='', $query='', $code = 0) {
+    function __construct($message = '', $query = '', $code = 0) {
     parent::__construct($message);
     $this->query = $query;
     $this->code = $code;
@@ -934,10 +934,10 @@ 
 
     $R = array();
     foreach ($array as $obj) {
-        if (! array_key_exists($field, $obj)) die("verticalSlice: array doesn't have requested field\n");
+        if (!array_key_exists($field, $obj)) die("verticalSlice: array doesn't have requested field\n");
 
         if ($keyfield) {
-        if (! array_key_exists($keyfield, $obj)) die("verticalSlice: array doesn't have requested field\n");
+        if (!array_key_exists($keyfield, $obj)) die("verticalSlice: array doesn't have requested field\n");
         $R[$obj[$keyfield]] = $obj[$field];
         } else {
         $R[] = $obj[$field];
@@ -958,13 +958,13 @@ 
 
     $R = array();
     foreach ($array as $obj) {
-        $target =& $R;
+        $target = & $R;
 
         foreach ($fields as $field) {
-        if (! array_key_exists($field, $obj)) die("reIndex: array doesn't have requested field\n");
+        if (!array_key_exists($field, $obj)) die("reIndex: array doesn't have requested field\n");
 
         $nextkey = $obj[$field];
-        $target =& $target[$nextkey];
+        $target = & $target[$nextkey];
         }
         $target = $obj;
     }
@@ -979,7 +979,7 @@ 
 }
 
 function meekrodb_debugmode_handler($params) {
-    echo "QUERY: " . $params['query'] . " [" . $params['runtime'] . " ms]";
+    echo "QUERY: ".$params['query']." [".$params['runtime']." ms]";
     if (php_sapi_name() == 'cli' && empty($_SERVER['REMOTE_ADDR'])) {
     echo "\n";
     } else {

Braces +162 added lines, -70 removed lines

@@ -161,12 +161,24 @@ 
 
 
     public function __construct($host=null, $user=null, $password=null, $dbName=null, $port=null, $encoding=null) {
-    if ($host === null) $host = DB::$host;
-    if ($user === null) $user = DB::$user;
-    if ($password === null) $password = DB::$password;
-    if ($dbName === null) $dbName = DB::$dbName;
-    if ($port === null) $port = DB::$port;
-    if ($encoding === null) $encoding = DB::$encoding;
+    if ($host === null) {
+        $host = DB::$host;
+    }
+    if ($user === null) {
+        $user = DB::$user;
+    }
+    if ($password === null) {
+        $password = DB::$password;
+    }
+    if ($dbName === null) {
+        $dbName = DB::$dbName;
+    }
+    if ($port === null) {
+        $port = DB::$port;
+    }
+    if ($encoding === null) {
+        $encoding = DB::$encoding;
+    }
 
     $this->host = $host;
     $this->user = $user;
@@ -180,7 +192,9 @@ 
     $mysql = $this->internal_mysql;
 
     if (!($mysql instanceof MySQLi)) {
-        if (! $this->port) $this->port = ini_get('mysqli.default_port');
+        if (! $this->port) {
+            $this->port = ini_get('mysqli.default_port');
+        }
         $this->current_db = $this->dbName;
       
         $mysql = new mysqli($this->host, $this->user, $this->password, $this->dbName, $this->port);
@@ -200,7 +214,9 @@ 
     public function disconnect() {
     $mysqli = $this->internal_mysql;
     if ($mysqli instanceof MySQLi) {
-        if ($thread_id = $mysqli->thread_id) $mysqli->kill($thread_id);
+        if ($thread_id = $mysqli->thread_id) {
+            $mysqli->kill($thread_id);
+        }
         $mysqli->close();
     }
     $this->internal_mysql = null;
@@ -262,8 +278,9 @@ 
         return $this->nonSQLError("Nested transactions are only available on MySQL 5.5 and greater. You are using MySQL " . $this->serverVersion());
     }
 
-    if ($this->nested_transactions && $this->nested_transactions_count > 0)
-        $this->nested_transactions_count--;
+    if ($this->nested_transactions && $this->nested_transactions_count > 0) {
+            $this->nested_transactions_count--;
+    }
 
     if (!$this->nested_transactions || $all || $this->nested_transactions_count == 0) {
         $this->nested_transactions_count = 0;
@@ -280,8 +297,9 @@ 
         return $this->nonSQLError("Nested transactions are only available on MySQL 5.5 and greater. You are using MySQL " . $this->serverVersion());
     }
 
-    if ($this->nested_transactions && $this->nested_transactions_count > 0)
-        $this->nested_transactions_count--;
+    if ($this->nested_transactions && $this->nested_transactions_count > 0) {
+            $this->nested_transactions_count--;
+    }
 
     if (!$this->nested_transactions || $all || $this->nested_transactions_count == 0) {
         $this->nested_transactions_count = 0;
@@ -296,8 +314,11 @@ 
     protected function formatTableName($table) {
     $table = trim($table, '`');
 
-    if (strpos($table, '.')) return implode('.', array_map(array($this, 'formatTableName'), explode('.', $table)));
-    else return '`' . str_replace('`', '``', $table) . '`';
+    if (strpos($table, '.')) {
+        return implode('.', array_map(array($this, 'formatTableName'), explode('.', $table)));
+    } else {
+        return '`' . str_replace('`', '``', $table) . '`';
+    }
     }
 
     public function update() {
@@ -471,7 +492,9 @@ 
         // handle numbered parameters
         if ($arg_number_length = strspn($sql, '0123456789', $new_pos_back)) {
         $arg_number = substr($sql, $new_pos_back, $arg_number_length);
-        if (!array_key_exists($arg_number, $args_all)) $this->nonSQLError("Non existent argument reference (arg $arg_number): $sql");
+        if (!array_key_exists($arg_number, $args_all)) {
+            $this->nonSQLError("Non existent argument reference (arg $arg_number): $sql");
+        }
 
         $arg = $args_all[$arg_number];
 
@@ -481,8 +504,12 @@ 
             $new_pos_back + $named_seperator_length) + $named_seperator_length;
 
         $arg_number = substr($sql, $new_pos_back + $named_seperator_length, $arg_number_length - $named_seperator_length);
-        if (count($args_all) != 1 || !is_array($args_all[0])) $this->nonSQLError("If you use named parameters, the second argument must be an array of parameters");
-        if (!array_key_exists($arg_number, $args_all[0])) $this->nonSQLError("Non existent argument reference (arg $arg_number): $sql");
+        if (count($args_all) != 1 || !is_array($args_all[0])) {
+            $this->nonSQLError("If you use named parameters, the second argument must be an array of parameters");
+        }
+        if (!array_key_exists($arg_number, $args_all[0])) {
+            $this->nonSQLError("Non existent argument reference (arg $arg_number): $sql");
+        }
 
         $arg = $args_all[0][$arg_number];
 
@@ -491,7 +518,9 @@ 
         $arg = array_shift($args);
         }
 
-        if ($new_pos > 0) $chunkyQuery[] = substr($sql, 0, $new_pos);
+        if ($new_pos > 0) {
+            $chunkyQuery[] = substr($sql, 0, $new_pos);
+        }
 
         if (is_object($arg) && ($arg instanceof WhereClause)) {
         list($clause_sql, $clause_args) = $arg->textAndArgs();
@@ -517,21 +546,31 @@ 
 
     protected function sanitize($value) {
     if (is_object($value)) {
-        if ($value instanceof MeekroDBEval) return $value->text;
-        else if ($value instanceof DateTime) return $this->escape($value->format('Y-m-d H:i:s'));
-        else return '';
+        if ($value instanceof MeekroDBEval) {
+            return $value->text;
+        } else if ($value instanceof DateTime) {
+            return $this->escape($value->format('Y-m-d H:i:s'));
+        } else {
+            return '';
+        }
     }
 
-    if (is_null($value)) return $this->usenull ? 'NULL' : "''";
-    else if (is_bool($value)) return ($value ? 1 : 0);
-    else if (is_int($value)) return $value;
-    else if (is_float($value)) return $value;
-
-    else if (is_array($value)) {
+    if (is_null($value)) {
+        return $this->usenull ? 'NULL' : "''";
+    } else if (is_bool($value)) {
+        return ($value ? 1 : 0);
+    } else if (is_int($value)) {
+        return $value;
+    } else if (is_float($value)) {
+        return $value;
+    } else if (is_array($value)) {
         // non-assoc array?
         if (array_values($value) === $value) {
-        if (is_array($value[0])) return implode(', ', array_map(array($this, 'sanitize'), $value));
-        else return '(' . implode(', ', array_map(array($this, 'sanitize'), $value)) . ')';
+        if (is_array($value[0])) {
+            return implode(', ', array_map(array($this, 'sanitize'), $value));
+        } else {
+            return '(' . implode(', ', array_map(array($this, 'sanitize'), $value)) . ')';
+        }
         }
 
         $pairs = array();
@@ -540,17 +579,23 @@ 
         }
 
         return implode(', ', $pairs);
+    } else {
+        return $this->escape($value);
     }
-    else return $this->escape($value);
     }
 
     protected function parseTS($ts) {
-    if (is_string($ts)) return date('Y-m-d H:i:s', strtotime($ts));
-    else if (is_object($ts) && ($ts instanceof DateTime)) return $ts->format('Y-m-d H:i:s');
+    if (is_string($ts)) {
+        return date('Y-m-d H:i:s', strtotime($ts));
+    } else if (is_object($ts) && ($ts instanceof DateTime)) {
+        return $ts->format('Y-m-d H:i:s');
+    }
     }
 
     protected function intval($var) {
-    if (PHP_INT_SIZE == 8) return intval($var);
+    if (PHP_INT_SIZE == 8) {
+        return intval($var);
+    }
     return floor(doubleval($var));
     }
 
@@ -573,30 +618,48 @@ 
 
       if ($type != '?') {
         $is_array_type = in_array($type, $array_types, true);
-        if ($is_array_type && !is_array($arg)) $this->nonSQLError("Badly formatted SQL query: Expected array, got scalar instead!");
-        else if (!$is_array_type && is_array($arg)) $this->nonSQLError("Badly formatted SQL query: Expected scalar, got array instead!");
+        if ($is_array_type && !is_array($arg)) {
+            $this->nonSQLError("Badly formatted SQL query: Expected array, got scalar instead!");
+        } else if (!$is_array_type && is_array($arg)) {
+            $this->nonSQLError("Badly formatted SQL query: Expected scalar, got array instead!");
+        }
       }
 
-      if ($type == 's') $result = $this->escape($arg);
-      else if ($type == 'i') $result = $this->intval($arg);
-      else if ($type == 'd') $result = doubleval($arg);
-      else if ($type == 'b') $result = $this->formatTableName($arg);
-      else if ($type == 'l') $result = $arg;
-      else if ($type == 'ss') $result = $this->escape("%".str_replace(array('%', '_'), array('\%', '\_'), $arg)."%");
-      else if ($type == 't') $result = $this->escape($this->parseTS($arg));
-
-      else if ($type == 'ls') $result = array_map(array($this, 'escape'), $arg);
-      else if ($type == 'li') $result = array_map(array($this, 'intval'), $arg);
-      else if ($type == 'ld') $result = array_map('doubleval', $arg);
-      else if ($type == 'lb') $result = array_map(array($this, 'formatTableName'), $arg);
-      else if ($type == 'll') $result = $arg;
-      else if ($type == 'lt') $result = array_map(array($this, 'escape'), array_map(array($this, 'parseTS'), $arg));
-
-      else if ($type == '?') $result = $this->sanitize($arg);
-
-      else $this->nonSQLError("Badly formatted SQL query: Invalid MeekroDB param $type");
+      if ($type == 's') {
+          $result = $this->escape($arg);
+      } else if ($type == 'i') {
+          $result = $this->intval($arg);
+      } else if ($type == 'd') {
+          $result = doubleval($arg);
+      } else if ($type == 'b') {
+          $result = $this->formatTableName($arg);
+      } else if ($type == 'l') {
+          $result = $arg;
+      } else if ($type == 'ss') {
+          $result = $this->escape("%".str_replace(array('%', '_'), array('\%', '\_'), $arg)."%");
+      } else if ($type == 't') {
+          $result = $this->escape($this->parseTS($arg));
+      } else if ($type == 'ls') {
+          $result = array_map(array($this, 'escape'), $arg);
+      } else if ($type == 'li') {
+          $result = array_map(array($this, 'intval'), $arg);
+      } else if ($type == 'ld') {
+          $result = array_map('doubleval', $arg);
+      } else if ($type == 'lb') {
+          $result = array_map(array($this, 'formatTableName'), $arg);
+      } else if ($type == 'll') {
+          $result = $arg;
+      } else if ($type == 'lt') {
+          $result = array_map(array($this, 'escape'), array_map(array($this, 'parseTS'), $arg));
+      } else if ($type == '?') {
+          $result = $this->sanitize($arg);
+      } else {
+          $this->nonSQLError("Badly formatted SQL query: Invalid MeekroDB param $type");
+      }
 
-      if (is_array($result)) $result = '('.implode(',', $result).')';
+      if (is_array($result)) {
+          $result = '('.implode(',', $result).')';
+      }
 
       $query .= $result;
     }
@@ -702,23 +765,33 @@ 
     $this->affected_rows = $db->affected_rows;
 
     // mysqli_result->num_rows won't initially show correct results for unbuffered data
-    if ($is_buffered && ($result instanceof MySQLi_Result)) $this->num_rows = $result->num_rows;
-    else $this->num_rows = null;
+    if ($is_buffered && ($result instanceof MySQLi_Result)) {
+        $this->num_rows = $result->num_rows;
+    } else {
+        $this->num_rows = null;
+    }
 
-    if ($row_type == 'raw' || !($result instanceof MySQLi_Result)) return $result;
+    if ($row_type == 'raw' || !($result instanceof MySQLi_Result)) {
+        return $result;
+    }
 
     $return = array();
 
     if ($full_names) {
         $infos = array();
         foreach ($result->fetch_fields() as $info) {
-        if (strlen($info->table)) $infos[] = $info->table . '.' . $info->name;
-        else $infos[] = $info->name;
+        if (strlen($info->table)) {
+            $infos[] = $info->table . '.' . $info->name;
+        } else {
+            $infos[] = $info->name;
+        }
         }
     }
 
     while ($row = ($row_type == 'assoc' ? $result->fetch_assoc() : $result->fetch_row())) {
-        if ($full_names) $row = array_combine($infos, $row);
+        if ($full_names) {
+            $row = array_combine($infos, $row);
+        }
         $return[] = $row;
     }
 
@@ -726,7 +799,9 @@ 
     $result->free();
     while ($db->more_results()) {
         $db->next_result();
-        if ($result = $db->use_result()) $result->free();
+        if ($result = $db->use_result()) {
+            $result->free();
+        }
     }
 
     return $return;
@@ -736,7 +811,9 @@ 
     public function queryFirstRow() {
     $args = func_get_args();
     $result = call_user_func_array(array($this, 'query'), $args);
-    if (!$result) return null;
+    if (!$result) {
+        return null;
+    }
     return reset($result);
     }
 
@@ -744,7 +821,9 @@ 
     public function queryFirstList() {
     $args = func_get_args();
     $result = call_user_func_array(array($this, 'queryAllLists'), $args);
-    if (!$result) return null;
+    if (!$result) {
+        return null;
+    }
     return reset($result);
     }
 
@@ -881,10 +960,15 @@ 
         $args = array_merge($args, $clause_args);
     }
 
-    if ($this->type == 'and') $sql = implode(' AND ', $sql);
-    else $sql = implode(' OR ', $sql);
+    if ($this->type == 'and') {
+        $sql = implode(' AND ', $sql);
+    } else {
+        $sql = implode(' OR ', $sql);
+    }
 
-    if ($this->negate) $sql = '(NOT '.$sql.')';
+    if ($this->negate) {
+        $sql = '(NOT '.$sql.')';
+    }
     return array($sql, $args);
     }
 
@@ -900,7 +984,9 @@ 
     DB::startTransaction();
     }
     function __destruct() {
-    if (! $this->committed) DB::rollback();
+    if (! $this->committed) {
+        DB::rollback();
+    }
     }
     function commit() {
     DB::commit();
@@ -934,10 +1020,14 @@ 
 
     $R = array();
     foreach ($array as $obj) {
-        if (! array_key_exists($field, $obj)) die("verticalSlice: array doesn't have requested field\n");
+        if (! array_key_exists($field, $obj)) {
+            die("verticalSlice: array doesn't have requested field\n");
+        }
 
         if ($keyfield) {
-        if (! array_key_exists($keyfield, $obj)) die("verticalSlice: array doesn't have requested field\n");
+        if (! array_key_exists($keyfield, $obj)) {
+            die("verticalSlice: array doesn't have requested field\n");
+        }
         $R[$obj[$keyfield]] = $obj[$field];
         } else {
         $R[] = $obj[$field];
@@ -961,7 +1051,9 @@ 
         $target =& $R;
 
         foreach ($fields as $field) {
-        if (! array_key_exists($field, $obj)) die("reIndex: array doesn't have requested field\n");
+        if (! array_key_exists($field, $obj)) {
+            die("reIndex: array doesn't have requested field\n");
+        }
 
         $nextkey = $obj[$field];
         $target =& $target[$nextkey];

includes/libraries/Email/Phpmailer/language/phpmailer.lang-ar.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 $PHPMAILER_LANG['invalid_address']      = 'الإرسال غير ممكن لأن عنوان البريد الإلكتروني غير صالح: ';
 $PHPMAILER_LANG['mailer_not_supported'] = ' برنامج الإرسال غير مدعوم.';
 $PHPMAILER_LANG['provide_address']      = 'يجب توفير عنوان البريد الإلكتروني لمستلم واحد على الأقل.';
-$PHPMAILER_LANG['recipients_failed']    = 'خطأ SMTP: الأخطاء التالية ' .
+$PHPMAILER_LANG['recipients_failed']    = 'خطأ SMTP: الأخطاء التالية '.
                                             'فشل في الارسال لكل من : ';
 $PHPMAILER_LANG['signing']              = 'خطأ في التوقيع: ';
 $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() غير ممكن.';

includes/libraries/Authentication/DuoSecurity/Duo.php

Spacing +10 added lines, -10 removed lines

@@ -17,17 +17,17 @@ 
     const ERR_SKEY = 'ERR|The Duo secret key passed to sign_request() is invalid.';
     const ERR_AKEY = 'ERR|The application secret key passed to sign_request() must be at least 40 characters.';
 
-    private static function sign_vals($key, $vals, $prefix, $expire, $time=NULL) {
+    private static function sign_vals($key, $vals, $prefix, $expire, $time = NULL) {
         $exp = ($time ? $time : time()) + $expire;
-        $val = $vals . '|' . $exp;
+        $val = $vals.'|'.$exp;
         $b64 = base64_encode($val);
-        $cookie = $prefix . '|' . $b64;
+        $cookie = $prefix.'|'.$b64;
 
         $sig = hash_hmac("sha1", $cookie, $key);
-        return $cookie . '|' . $sig;
+        return $cookie.'|'.$sig;
     }
 
-    private static function parse_vals($key, $val, $prefix, $ikey, $time=NULL) {
+    private static function parse_vals($key, $val, $prefix, $ikey, $time = NULL) {
         $ts = ($time ? $time : time());
 
         $parts = explode('|', $val);
@@ -36,7 +36,7 @@ 
         }
         list($u_prefix, $u_b64, $u_sig) = $parts;
 
-        $sig = hash_hmac("sha1", $u_prefix . '|' . $u_b64, $key);
+        $sig = hash_hmac("sha1", $u_prefix.'|'.$u_b64, $key);
         if (hash_hmac("sha1", $sig, $key) !== hash_hmac("sha1", $u_sig, $key)) {
             return null;
         }
@@ -61,7 +61,7 @@ 
         return $user;
     }
 
-    public static function signRequest($ikey, $skey, $akey, $username, $time=NULL) {
+    public static function signRequest($ikey, $skey, $akey, $username, $time = NULL) {
         if (!isset($username) || strlen($username) === 0) {
             return self::ERR_USER;
         }
@@ -78,15 +78,15 @@ 
             return self::ERR_AKEY;
         }
 
-        $vals = $username . '|' . $ikey;
+        $vals = $username.'|'.$ikey;
 
         $duo_sig = self::sign_vals($skey, $vals, self::DUO_PREFIX, self::DUO_EXPIRE, $time);
         $app_sig = self::sign_vals($akey, $vals, self::APP_PREFIX, self::APP_EXPIRE, $time);
 
-        return $duo_sig . ':' . $app_sig;
+        return $duo_sig.':'.$app_sig;
     }
 
-    public static function verifyResponse($ikey, $skey, $akey, $sig_response, $time=NULL) {
+    public static function verifyResponse($ikey, $skey, $akey, $sig_response, $time = NULL) {
         list($auth_sig, $app_sig) = explode(':', $sig_response);
 
         $auth_user = self::parse_vals($skey, $auth_sig, self::AUTH_PREFIX, $ikey, $time);

includes/libraries/Authentication/Yubico/Yubico.php

Indentation +316 added lines, -316 removed lines

@@ -34,343 +34,343 @@
  */
 class Auth_Yubico
 {
-	/**#@+
+    /**#@+
 	 * @access private
 	 */
 
-	/**
-	 * Yubico client ID
-	 * @var string
-	 */
-	var $_id;
+    /**
+     * Yubico client ID
+     * @var string
+     */
+    var $_id;
 
-	/**
-	 * Yubico client key
-	 * @var string
-	 */
-	var $_key;
+    /**
+     * Yubico client key
+     * @var string
+     */
+    var $_key;
 
-	/**
-	 * URL part of validation server
-	 * @var string
-	 */
-	var $_url;
+    /**
+     * URL part of validation server
+     * @var string
+     */
+    var $_url;
 
-	/**
-	 * List with URL part of validation servers
-	 * @var array
-	 */
-	var $_url_list;
+    /**
+     * List with URL part of validation servers
+     * @var array
+     */
+    var $_url_list;
 
-	/**
-	 * index to _url_list
-	 * @var int
-	 */
-	var $_url_index;
+    /**
+     * index to _url_list
+     * @var int
+     */
+    var $_url_index;
 
-	/**
-	 * Last query to server
-	 * @var string
-	 */
-	var $_lastquery;
+    /**
+     * Last query to server
+     * @var string
+     */
+    var $_lastquery;
 
-	/**
-	 * Response from server
-	 * @var string
-	 */
-	var $_response;
+    /**
+     * Response from server
+     * @var string
+     */
+    var $_response;
 
-	/**
-	 * Flag whether to use https or not.
-	 * @var boolean
-	 */
-	var $_https;
+    /**
+     * Flag whether to use https or not.
+     * @var boolean
+     */
+    var $_https;
 
-	/**
-	 * Flag whether to verify HTTPS server certificates or not.
-	 * @var boolean
-	 */
-	var $_httpsverify;
-
-	/**
-	 * Constructor
-	 *
-	 * Sets up the object
-	 * @param    string  $id     The client identity
-	 * @param    string  $key    The client MAC key (optional)
-	 * @param    integer $https  Flag whether to use https (optional)
-	 * @param    integer $httpsverify  Flag whether to use verify HTTPS
-	 *                                 server certificates (optional,
-	 *                                 default true)
-	 * @access public
-	 */
-	public function __construct($id, $key = '', $https = 0, $httpsverify = 1)
-	{
-		$this->_id = $id;
-		$this->_key = base64_decode($key);
-		$this->_https = $https;
-		$this->_httpsverify = $httpsverify;
-	}
-
-	/**
-	 * Specify to use a different URL part for verification.
-	 * The default is "api.yubico.com/wsapi/verify".
-	 *
-	 * @param  string $url  New server URL part to use
-	 * @access public
-	 */
-	function setURLpart($url)
-	{
-		$this->_url = $url;
-	}
-
-	/**
-	 * Get URL part to use for validation.
-	 *
-	 * @return string  Server URL part
-	 * @access public
-	 */
-	function getURLpart()
-	{
-		if ($this->_url) {
-			return $this->_url;
-		} else {
-			return "api.yubico.com/wsapi/verify";
-		}
-	}
-
-
-	/**
-	 * Get next URL part from list to use for validation.
-	 *
-	 * @return mixed string with URL part of false if no more URLs in list
-	 * @access public
-	 */
-	function getNextURLpart()
-	{
-	  if ($this->_url_list) $url_list = $this->_url_list;
-	  else $url_list = array('api.yubico.com/wsapi/2.0/verify',
-			       'api2.yubico.com/wsapi/2.0/verify', 
-			       'api3.yubico.com/wsapi/2.0/verify', 
-			       'api4.yubico.com/wsapi/2.0/verify',
-			       'api5.yubico.com/wsapi/2.0/verify');
+    /**
+     * Flag whether to verify HTTPS server certificates or not.
+     * @var boolean
+     */
+    var $_httpsverify;
+
+    /**
+     * Constructor
+     *
+     * Sets up the object
+     * @param    string  $id     The client identity
+     * @param    string  $key    The client MAC key (optional)
+     * @param    integer $https  Flag whether to use https (optional)
+     * @param    integer $httpsverify  Flag whether to use verify HTTPS
+     *                                 server certificates (optional,
+     *                                 default true)
+     * @access public
+     */
+    public function __construct($id, $key = '', $https = 0, $httpsverify = 1)
+    {
+        $this->_id = $id;
+        $this->_key = base64_decode($key);
+        $this->_https = $https;
+        $this->_httpsverify = $httpsverify;
+    }
+
+    /**
+     * Specify to use a different URL part for verification.
+     * The default is "api.yubico.com/wsapi/verify".
+     *
+     * @param  string $url  New server URL part to use
+     * @access public
+     */
+    function setURLpart($url)
+    {
+        $this->_url = $url;
+    }
+
+    /**
+     * Get URL part to use for validation.
+     *
+     * @return string  Server URL part
+     * @access public
+     */
+    function getURLpart()
+    {
+        if ($this->_url) {
+            return $this->_url;
+        } else {
+            return "api.yubico.com/wsapi/verify";
+        }
+    }
+
+
+    /**
+     * Get next URL part from list to use for validation.
+     *
+     * @return mixed string with URL part of false if no more URLs in list
+     * @access public
+     */
+    function getNextURLpart()
+    {
+        if ($this->_url_list) $url_list = $this->_url_list;
+        else $url_list = array('api.yubico.com/wsapi/2.0/verify',
+                    'api2.yubico.com/wsapi/2.0/verify', 
+                    'api3.yubico.com/wsapi/2.0/verify', 
+                    'api4.yubico.com/wsapi/2.0/verify',
+                    'api5.yubico.com/wsapi/2.0/verify');
 	  
-	  if ($this->_url_index >= count($url_list)) return false;
-	  else return $url_list[$this->_url_index++];
-	}
-
-	/**
-	 * Resets index to URL list
-	 *
-	 * @access public
-	 */
-	function URLreset()
-	{
-	  $this->_url_index = 0;
-	}
-
-	/**
-	 * Add another URLpart.
-	 *
-	 * @access public
-	 */
-	function addURLpart($URLpart) 
-	{
-	  $this->_url_list[] = $URLpart;
-	}
+        if ($this->_url_index >= count($url_list)) return false;
+        else return $url_list[$this->_url_index++];
+    }
+
+    /**
+     * Resets index to URL list
+     *
+     * @access public
+     */
+    function URLreset()
+    {
+        $this->_url_index = 0;
+    }
+
+    /**
+     * Add another URLpart.
+     *
+     * @access public
+     */
+    function addURLpart($URLpart) 
+    {
+        $this->_url_list[] = $URLpart;
+    }
 	
-	/**
-	 * Return the last query sent to the server, if any.
-	 *
-	 * @return string  Request to server
-	 * @access public
-	 */
-	function getLastQuery()
-	{
-		return $this->_lastquery;
-	}
-
-	/**
-	 * Return the last data received from the server, if any.
-	 *
-	 * @return string  Output from server
-	 * @access public
-	 */
-	function getLastResponse()
-	{
-		return $this->_response;
-	}
-
-	/**
-	 * Parse input string into password, yubikey prefix,
-	 * ciphertext, and OTP.
-	 *
-	 * @param  string    Input string to parse
-	 * @param  string    Optional delimiter re-class, default is '[:]'
-	 * @param string $str
-	 * @return array     Keyed array with fields
-	 * @access public
-	 */
-	function parsePasswordOTP($str, $delim = '[:]')
-	{
-	  if (!preg_match("/^((.*)".$delim.")?".
-			  "(([cbdefghijklnrtuv]{0,16})".
-			  "([cbdefghijklnrtuv]{32}))$/i",
-			  $str, $matches)) {
-	    /* Dvorak? */
-	    if (!preg_match("/^((.*)".$delim.")?".
-			    "(([jxe\.uidchtnbpygk]{0,16})".
-			    "([jxe\.uidchtnbpygk]{32}))$/i",
-			    $str, $matches)) {
-	      return false;
-	    } else {
-	      $ret['otp'] = strtr($matches[3], "jxe.uidchtnbpygk", "cbdefghijklnrtuv");
-	    }
-	  } else {
-	    $ret['otp'] = $matches[3];
-	  }
-	  $ret['password'] = $matches[2];
-	  $ret['prefix'] = $matches[4];
-	  $ret['ciphertext'] = $matches[5];
-	  return $ret;
-	}
-
-	/* TODO? Add functions to get parsed parts of server response? */
-
-	/**
-	 * Parse parameters from last response
-	 *
-	 * example: getParameters("timestamp", "sessioncounter", "sessionuse");
-	 *
-	 * @param  array @parameters  Array with strings representing
-	 *                            parameters to parse
-	 * @return array  parameter array from last response
-	 * @access public
-	 */
-	function getParameters($parameters)
-	{
-	  if ($parameters == null) {
-	    $parameters = array('timestamp', 'sessioncounter', 'sessionuse');
-	  }
-	  $param_array = array();
-	  foreach ($parameters as $param) {
-	    if (!preg_match("/".$param."=([0-9]+)/", $this->_response, $out)) {
-	      return PEAR::raiseError('Could not parse parameter '.$param.' from response');
-	    }
-	    $param_array[$param] = $out[1];
-	  }
-	  return $param_array;
-	}
-
-	/**
-	 * Verify Yubico OTP against multiple URLs
-	 * Protocol specification 2.0 is used to construct validation requests
-	 *
-	 * @param string $token        Yubico OTP
-	 * @param int $use_timestamp   1=>send request with &timestamp=1 to
-	 *                             get timestamp and session information
-	 *                             in the response
-	 * @param boolean $wait_for_all  If true, wait until all
-	 *                               servers responds (for debugging)
-	 * @param string $sl           Sync level in percentage between 0
-	 *                             and 100 or "fast" or "secure".
-	 * @param int $timeout         Max number of seconds to wait
-	 *                             for responses
-	 * @return mixed               PEAR error on error, true otherwise
-	 * @access public
-	 */
-	function verify($token, $use_timestamp = null, $wait_for_all = False,
-			$sl = null, $timeout = null)
-	{
-	  /* Construct parameters string */
-	  $ret = $this->parsePasswordOTP($token);
-	  if (!$ret) {
-	    return PEAR::raiseError('Could not parse Yubikey OTP');
-	  }
-	  $params = array('id'=>$this->_id, 
-			  'otp'=>$ret['otp'],
-			  'nonce'=>md5(uniqid(rand())));
-	  /* Take care of protocol version 2 parameters */
-	  if ($use_timestamp) $params['timestamp'] = 1;
-	  if ($sl) $params['sl'] = $sl;
-	  if ($timeout) $params['timeout'] = $timeout;
-	  ksort($params);
-	  $parameters = '';
-	  foreach ($params as $p=>$v) $parameters .= "&".$p."=".$v;
-	  $parameters = ltrim($parameters, "&");
+    /**
+     * Return the last query sent to the server, if any.
+     *
+     * @return string  Request to server
+     * @access public
+     */
+    function getLastQuery()
+    {
+        return $this->_lastquery;
+    }
+
+    /**
+     * Return the last data received from the server, if any.
+     *
+     * @return string  Output from server
+     * @access public
+     */
+    function getLastResponse()
+    {
+        return $this->_response;
+    }
+
+    /**
+     * Parse input string into password, yubikey prefix,
+     * ciphertext, and OTP.
+     *
+     * @param  string    Input string to parse
+     * @param  string    Optional delimiter re-class, default is '[:]'
+     * @param string $str
+     * @return array     Keyed array with fields
+     * @access public
+     */
+    function parsePasswordOTP($str, $delim = '[:]')
+    {
+        if (!preg_match("/^((.*)".$delim.")?".
+                "(([cbdefghijklnrtuv]{0,16})".
+                "([cbdefghijklnrtuv]{32}))$/i",
+                $str, $matches)) {
+        /* Dvorak? */
+        if (!preg_match("/^((.*)".$delim.")?".
+                "(([jxe\.uidchtnbpygk]{0,16})".
+                "([jxe\.uidchtnbpygk]{32}))$/i",
+                $str, $matches)) {
+            return false;
+        } else {
+            $ret['otp'] = strtr($matches[3], "jxe.uidchtnbpygk", "cbdefghijklnrtuv");
+        }
+        } else {
+        $ret['otp'] = $matches[3];
+        }
+        $ret['password'] = $matches[2];
+        $ret['prefix'] = $matches[4];
+        $ret['ciphertext'] = $matches[5];
+        return $ret;
+    }
+
+    /* TODO? Add functions to get parsed parts of server response? */
+
+    /**
+     * Parse parameters from last response
+     *
+     * example: getParameters("timestamp", "sessioncounter", "sessionuse");
+     *
+     * @param  array @parameters  Array with strings representing
+     *                            parameters to parse
+     * @return array  parameter array from last response
+     * @access public
+     */
+    function getParameters($parameters)
+    {
+        if ($parameters == null) {
+        $parameters = array('timestamp', 'sessioncounter', 'sessionuse');
+        }
+        $param_array = array();
+        foreach ($parameters as $param) {
+        if (!preg_match("/".$param."=([0-9]+)/", $this->_response, $out)) {
+            return PEAR::raiseError('Could not parse parameter '.$param.' from response');
+        }
+        $param_array[$param] = $out[1];
+        }
+        return $param_array;
+    }
+
+    /**
+     * Verify Yubico OTP against multiple URLs
+     * Protocol specification 2.0 is used to construct validation requests
+     *
+     * @param string $token        Yubico OTP
+     * @param int $use_timestamp   1=>send request with &timestamp=1 to
+     *                             get timestamp and session information
+     *                             in the response
+     * @param boolean $wait_for_all  If true, wait until all
+     *                               servers responds (for debugging)
+     * @param string $sl           Sync level in percentage between 0
+     *                             and 100 or "fast" or "secure".
+     * @param int $timeout         Max number of seconds to wait
+     *                             for responses
+     * @return mixed               PEAR error on error, true otherwise
+     * @access public
+     */
+    function verify($token, $use_timestamp = null, $wait_for_all = False,
+            $sl = null, $timeout = null)
+    {
+        /* Construct parameters string */
+        $ret = $this->parsePasswordOTP($token);
+        if (!$ret) {
+        return PEAR::raiseError('Could not parse Yubikey OTP');
+        }
+        $params = array('id'=>$this->_id, 
+                'otp'=>$ret['otp'],
+                'nonce'=>md5(uniqid(rand())));
+        /* Take care of protocol version 2 parameters */
+        if ($use_timestamp) $params['timestamp'] = 1;
+        if ($sl) $params['sl'] = $sl;
+        if ($timeout) $params['timeout'] = $timeout;
+        ksort($params);
+        $parameters = '';
+        foreach ($params as $p=>$v) $parameters .= "&".$p."=".$v;
+        $parameters = ltrim($parameters, "&");
 	  
-	  /* Generate signature. */
-	  if ($this->_key <> "") {
-	    $signature = base64_encode(hash_hmac('sha1', $parameters,
-						 $this->_key, true));
-	    $signature = preg_replace('/\+/', '%2B', $signature);
-	    $parameters .= '&h='.$signature;
-	  }
-
-	  /* Generate and prepare request. */
-	  $this->_lastquery = null;
-	  $this->URLreset();
-	  $mh = curl_multi_init();
-	  $ch = array();
-	  while ($URLpart = $this->getNextURLpart()) 
-	    {
-	      /* Support https. */
-	      if ($this->_https) {
-		$query = "https://";
-	      } else {
-		$query = "http://";
-	      }
-	      $query .= $URLpart."?".$parameters;
-
-	      if ($this->_lastquery) { $this->_lastquery .= " "; }
-	      $this->_lastquery .= $query;
+        /* Generate signature. */
+        if ($this->_key <> "") {
+        $signature = base64_encode(hash_hmac('sha1', $parameters,
+                            $this->_key, true));
+        $signature = preg_replace('/\+/', '%2B', $signature);
+        $parameters .= '&h='.$signature;
+        }
+
+        /* Generate and prepare request. */
+        $this->_lastquery = null;
+        $this->URLreset();
+        $mh = curl_multi_init();
+        $ch = array();
+        while ($URLpart = $this->getNextURLpart()) 
+        {
+            /* Support https. */
+            if ($this->_https) {
+        $query = "https://";
+            } else {
+        $query = "http://";
+            }
+            $query .= $URLpart."?".$parameters;
+
+            if ($this->_lastquery) { $this->_lastquery .= " "; }
+            $this->_lastquery .= $query;
 	      
-	      $handle = curl_init($query);
-	      curl_setopt($handle, CURLOPT_USERAGENT, "PEAR Auth_Yubico");
-	      curl_setopt($handle, CURLOPT_RETURNTRANSFER, 1);
-	      if (!$this->_httpsverify) {
-		curl_setopt($handle, CURLOPT_SSL_VERIFYPEER, 0);
-		curl_setopt($handle, CURLOPT_SSL_VERIFYHOST, 0);
-	      }
-	      curl_setopt($handle, CURLOPT_FAILONERROR, true);
-	      /* If timeout is set, we better apply it here as well
+            $handle = curl_init($query);
+            curl_setopt($handle, CURLOPT_USERAGENT, "PEAR Auth_Yubico");
+            curl_setopt($handle, CURLOPT_RETURNTRANSFER, 1);
+            if (!$this->_httpsverify) {
+        curl_setopt($handle, CURLOPT_SSL_VERIFYPEER, 0);
+        curl_setopt($handle, CURLOPT_SSL_VERIFYHOST, 0);
+            }
+            curl_setopt($handle, CURLOPT_FAILONERROR, true);
+            /* If timeout is set, we better apply it here as well
 	         in case the validation server fails to follow it. 
 	      */ 
-	      if ($timeout) {
-	          curl_setopt($handle, CURLOPT_TIMEOUT, $timeout);
-	      }
-	      curl_multi_add_handle($mh, $handle);
+            if ($timeout) {
+                curl_setopt($handle, CURLOPT_TIMEOUT, $timeout);
+            }
+            curl_multi_add_handle($mh, $handle);
 	      
-	      $ch[(int) $handle] = $handle;
-	    }
-
-	  /* Execute and read request. */
-	  $this->_response = null;
-	  $replay = False;
-	  $valid = False;
-	  do {
-	    /* Let curl do its work. */
-	    while (($mrc = curl_multi_exec($mh, $active))
-		   == CURLM_CALL_MULTI_PERFORM)
-	      ;
-
-	    while ($info = curl_multi_info_read($mh)) {
-	      if ($info['result'] == CURLE_OK) {
-
-		/* We have a complete response from one server. */
-
-		$str = curl_multi_getcontent($info['handle']);
-		$cinfo = curl_getinfo($info['handle']);
+            $ch[(int) $handle] = $handle;
+        }
+
+        /* Execute and read request. */
+        $this->_response = null;
+        $replay = False;
+        $valid = False;
+        do {
+        /* Let curl do its work. */
+        while (($mrc = curl_multi_exec($mh, $active))
+            == CURLM_CALL_MULTI_PERFORM)
+            ;
+
+        while ($info = curl_multi_info_read($mh)) {
+            if ($info['result'] == CURLE_OK) {
+
+        /* We have a complete response from one server. */
+
+        $str = curl_multi_getcontent($info['handle']);
+        $cinfo = curl_getinfo($info['handle']);
 		
-		if ($wait_for_all) { # Better debug info
-		  $this->_response .= 'URL='.$cinfo['url']."\n"
-		    . $str."\n";
-		}
+        if ($wait_for_all) { # Better debug info
+            $this->_response .= 'URL='.$cinfo['url']."\n"
+            . $str."\n";
+        }
 
-		if (preg_match("/status=([a-zA-Z0-9_]+)/", $str, $out)) {
-		  $status = $out[1];
+        if (preg_match("/status=([a-zA-Z0-9_]+)/", $str, $out)) {
+            $status = $out[1];
 
-		  /* 
+            /* 
 		   * There are 3 cases.
 		   *
 		   * 1. OTP or Nonce values doesn't match - ignore

Spacing +14 added lines, -14 removed lines

@@ -389,7 +389,7 @@ 
             elseif ($this->_key <> "") {
             /* Case 2. Verify signature first */
             $rows = explode("\r\n", trim($str));
-            $response=array();
+            $response = array();
             while (list($key, $val) = each($rows)) {
                 /* = is also used in BASE64 encoding so we only replace the first = by # which is not used in BASE64 */
                 $val = preg_replace('/=/', '#', $val, 1);
@@ -397,13 +397,13 @@ 
                 $response[$row[0]] = $row[1];
             }
 		    
-            $parameters=array('nonce','otp', 'sessioncounter', 'sessionuse', 'sl', 'status', 't', 'timeout', 'timestamp');
+            $parameters = array('nonce', 'otp', 'sessioncounter', 'sessionuse', 'sl', 'status', 't', 'timeout', 'timestamp');
             sort($parameters);
-            $check=Null;
+            $check = Null;
             foreach ($parameters as $param) {
                 if (array_key_exists($param, $response)) {
-            if ($check) $check = $check . '&';
-            $check = $check . $param . '=' . $response[$param];
+            if ($check) $check = $check.'&';
+            $check = $check.$param.'='.$response[$param];
                 }
             }
 
@@ -411,25 +411,25 @@ 
                 base64_encode(hash_hmac('sha1', utf8_encode($check),
                             $this->_key, true));
 
-            if($response['h'] == $checksignature) {
+            if ($response['h'] == $checksignature) {
                 if ($status == 'REPLAYED_OTP') {
             if (!$wait_for_all) { $this->_response = $str; }
-            $replay=True;
+            $replay = True;
                 } 
                 if ($status == 'OK') {
             if (!$wait_for_all) { $this->_response = $str; }
-            $valid=True;
+            $valid = True;
                 }
             }
             } else {
             /* Case 3. We check the status directly */
             if ($status == 'REPLAYED_OTP') {
                 if (!$wait_for_all) { $this->_response = $str; }
-                $replay=True;
+                $replay = True;
             } 
             if ($status == 'OK') {
                 if (!$wait_for_all) { $this->_response = $str; }
-                $valid=True;
+                $valid = True;
             }
             }
         }
@@ -448,7 +448,7 @@ 
 		
         curl_multi_remove_handle($mh, $info['handle']);
         curl_close($info['handle']);
-        unset ($ch[(int)$info['handle']]);
+        unset ($ch[(int) $info['handle']]);
             }
             curl_multi_select($mh);
         }
@@ -460,10 +460,10 @@ 
 	   */
 
         foreach ($ch as $h) {
-        curl_multi_remove_handle ($mh, $h);
-        curl_close ($h);
+        curl_multi_remove_handle($mh, $h);
+        curl_close($h);
         }
-        curl_multi_close ($mh);
+        curl_multi_close($mh);
 	  
         if ($replay) return PEAR::raiseError('REPLAYED_OTP');
         if ($valid) return true;

Braces +38 added lines, -15 removed lines

@@ -148,15 +148,21 @@ 
 	 */
 	function getNextURLpart()
 	{
-	  if ($this->_url_list) $url_list = $this->_url_list;
-	  else $url_list = array('api.yubico.com/wsapi/2.0/verify',
+	  if ($this->_url_list) {
+	      $url_list = $this->_url_list;
+	  } else {
+	      $url_list = array('api.yubico.com/wsapi/2.0/verify',
 			       'api2.yubico.com/wsapi/2.0/verify', 
 			       'api3.yubico.com/wsapi/2.0/verify', 
 			       'api4.yubico.com/wsapi/2.0/verify',
 			       'api5.yubico.com/wsapi/2.0/verify');
+	  }
 	  
-	  if ($this->_url_index >= count($url_list)) return false;
-	  else return $url_list[$this->_url_index++];
+	  if ($this->_url_index >= count($url_list)) {
+	      return false;
+	  } else {
+	      return $url_list[$this->_url_index++];
+	  }
 	}
 
 	/**
@@ -291,12 +297,20 @@ 
 			  'otp'=>$ret['otp'],
 			  'nonce'=>md5(uniqid(rand())));
 	  /* Take care of protocol version 2 parameters */
-	  if ($use_timestamp) $params['timestamp'] = 1;
-	  if ($sl) $params['sl'] = $sl;
-	  if ($timeout) $params['timeout'] = $timeout;
+	  if ($use_timestamp) {
+	      $params['timestamp'] = 1;
+	  }
+	  if ($sl) {
+	      $params['sl'] = $sl;
+	  }
+	  if ($timeout) {
+	      $params['timeout'] = $timeout;
+	  }
 	  ksort($params);
 	  $parameters = '';
-	  foreach ($params as $p=>$v) $parameters .= "&".$p."=".$v;
+	  foreach ($params as $p=>$v) {
+	      $parameters .= "&".$p."=".$v;
+	  }
 	  $parameters = ltrim($parameters, "&");
 	  
 	  /* Generate signature. */
@@ -385,8 +399,7 @@ 
             if (!preg_match("/otp=".$params['otp']."/", $str) ||
               !preg_match("/nonce=".$params['nonce']."/", $str)) {
             /* Case 1. Ignore response. */
-            } 
-            elseif ($this->_key <> "") {
+            } elseif ($this->_key <> "") {
             /* Case 2. Verify signature first */
             $rows = explode("\r\n", trim($str));
             $response=array();
@@ -402,7 +415,9 @@ 
             $check=Null;
             foreach ($parameters as $param) {
                 if (array_key_exists($param, $response)) {
-            if ($check) $check = $check . '&';
+            if ($check) {
+                $check = $check . '&';
+            }
             $check = $check . $param . '=' . $response[$param];
                 }
             }
@@ -441,8 +456,12 @@ 
                 curl_close($h);
             }
             curl_multi_close($mh);
-            if ($replay) return PEAR::raiseError('REPLAYED_OTP');
-            if ($valid) return true;
+            if ($replay) {
+                return PEAR::raiseError('REPLAYED_OTP');
+            }
+            if ($valid) {
+                return true;
+            }
             return PEAR::raiseError($status);
             }
 		
@@ -465,8 +484,12 @@ 
         }
         curl_multi_close ($mh);
 	  
-        if ($replay) return PEAR::raiseError('REPLAYED_OTP');
-        if ($valid) return true;
+        if ($replay) {
+            return PEAR::raiseError('REPLAYED_OTP');
+        }
+        if ($valid) {
+            return true;
+        }
         return PEAR::raiseError('NO_VALID_ANSWER');
     }
 }

includes/libraries/Authentication/agses/axs/AXSILPortal_V1_Auth.php

Indentation +39 added lines, -39 removed lines

@@ -1,58 +1,58 @@
 <?php 
 class AXSILPortal_V1_Auth { 
-	var $server;
+    var $server;
 
-	private $url = "";
-	private $AAId = "";
-	private $apiKey = "";
+    private $url = "";
+    private $AAId = "";
+    private $apiKey = "";
 	
-	private $baseUrl = "";
+    private $baseUrl = "";
 	
-	function setUrl($url) {
-		$this->url = $url;
-	}
+    function setUrl($url) {
+        $this->url = $url;
+    }
 	
-	function setAAId($AAId) {
-		$this->AAId = $AAId;
-	}
+    function setAAId($AAId) {
+        $this->AAId = $AAId;
+    }
 	
-	function setApiKey($apiKey) {
-		$this->apiKey = $apiKey;
-	}
+    function setApiKey($apiKey) {
+        $this->apiKey = $apiKey;
+    }
 	
 	
-	// Verify that you can open the URL from the web server.
-	function create() { 
-		if ($this->url != "" && $this->AAId != "" && $this->apiKey != "") {
-			$this->baseUrl = $this->url."".$this->apiKey."/".$this->AAId;
-		} else {
-			die("Cannot initialize Agses webservice without credentials, please set them in settings");
-		}
-	}
+    // Verify that you can open the URL from the web server.
+    function create() { 
+        if ($this->url != "" && $this->AAId != "" && $this->apiKey != "") {
+            $this->baseUrl = $this->url."".$this->apiKey."/".$this->AAId;
+        } else {
+            die("Cannot initialize Agses webservice without credentials, please set them in settings");
+        }
+    }
 	
-	function createAuthenticationMessage($apn, $createFlickerCode, $returnPath, $authenticationLevel, $hedgeId) {
+    function createAuthenticationMessage($apn, $createFlickerCode, $returnPath, $authenticationLevel, $hedgeId) {
 		
-		$serviceCall = $this->baseUrl."/authmessage/".$apn."/create/".$hedgeId;
+        $serviceCall = $this->baseUrl."/authmessage/".$apn."/create/".$hedgeId;
 		
-		$json = file_get_contents($serviceCall);
-		$response = json_decode($json, true);		
+        $json = file_get_contents($serviceCall);
+        $response = json_decode($json, true);		
 		
-		return $response['flickerCode'];
-	}
-	
-	/**
-	 * @param string $response
-	 * @param string $hedgeId
-	 */
-	function verifyResponse($apn, $response, $hedgeId) {
+        return $response['flickerCode'];
+    }
+	
+    /**
+     * @param string $response
+     * @param string $hedgeId
+     */
+    function verifyResponse($apn, $response, $hedgeId) {
 		
-		$serviceCall = $this->baseUrl."/authmessage/".$apn."/verify/".$hedgeId."/".$response;
+        $serviceCall = $this->baseUrl."/authmessage/".$apn."/verify/".$hedgeId."/".$response;
 		
-		$json = file_get_contents($serviceCall);
-		$response = json_decode($json, true);
+        $json = file_get_contents($serviceCall);
+        $response = json_decode($json, true);
 		
-		return $response['response'];
-	}
+        return $response['response'];
+    }
 
 } 
 ?>
\ No newline at end of file

includes/libraries/Authentication/agses/axs/axs/code2gif.php

Spacing +9 added lines, -9 removed lines

@@ -52,21 +52,21 @@ 
     // get frame delay from GET request, default to "safe speed" if delay not
     // defined or invalid. delay is specified in ms in the request and needs
     // to be converted to 1/100s for use in GIF files
-    $delay = isset($_GET['delay']) ? ($_GET['delay']+0)/10 : 8;
+    $delay = isset($_GET['delay']) ? ($_GET['delay'] + 0) / 10 : 8;
     $delay = ($delay > 0) ? $delay : 8;
 
     // code string must only contain hex characters, code length is limited to
     // 1024 characters (512 frames)
     $codelen = strlen($code);
-    if ( ctype_xdigit($code) && $codelen < 1024 ) {
+    if (ctype_xdigit($code) && $codelen < 1024) {
 	
         // get prepared gif file header
-        $gif  = file_get_contents($path.'/head.bin');
+        $gif = file_get_contents($path.'/head.bin');
 		
         // build graphic control extension block
         // disposal method   = 0
         // transparent color = 255
-        $ext = "\x21\xf9\x04\x01".chr($delay&0xff).chr(($delay>>8)&0xff)."\xff\x00";
+        $ext = "\x21\xf9\x04\x01".chr($delay & 0xff).chr(($delay >> 8) & 0xff)."\xff\x00";
 		
         // output image header
         header('Content-type:image/gif');
@@ -74,28 +74,28 @@ 
 	
         // append image data blocks as necessary
         $size = filesize($path.'/data.bin');
-        $data = fopen($path.'/data.bin','r');
+        $data = fopen($path.'/data.bin', 'r');
         if ($data) {
 
             // load the index from the data file and unpack it into a PHP array.
             // the index array contains the file offsets of the 4096 delta and
             // base images inside the data file.
-            $index = unpack("V*", fread($data, 64*64*4));
+            $index = unpack("V*", fread($data, 64 * 64 * 4));
 
             // when a code is repeated (prev and curr have the same value) a
             // base image is inserted instead of a delta image. the first frame
             // in the animation must be a base image, so we peek at the flicker
             // code and set $prev to the first value in the string
             $prev = hexdec(substr($code, 0, 2));
-            for ($i = 0; $i < $codelen; $i+=2) {
+            for ($i = 0; $i < $codelen; $i += 2) {
 
                 // get current code
                 $curr = hexdec(substr($code, $i, 2));
 						
                 // locate image block in data file
-                $blockIdx = $prev*64+$curr+1;	// array starts at 1
+                $blockIdx = $prev * 64 + $curr + 1; // array starts at 1
                 $blockPos = $index[$blockIdx];
-                $blockLen = ($blockIdx < 4096 ? $index[$blockIdx+1] : $size) - $blockPos;
+                $blockLen = ($blockIdx < 4096 ? $index[$blockIdx + 1] : $size) - $blockPos;
 				
                 // output extension header
                 print($ext);