nilsteampassnet / TeamPass

includes/libraries/LDAP/adLDAP/adLDAP.php

Indentation +14 added lines, -14 removed lines

@@ -755,11 +755,11 @@ 
     }
 
     /**
-    * Returns objectClass in an array
-    *
-    * @param string $distinguishedName The full DN of a contact
-    * @return array
-    */
+     * Returns objectClass in an array
+     *
+     * @param string $distinguishedName The full DN of a contact
+     * @return array
+     */
     public function getObjectClass($distinguishedName) {
         if ($distinguishedName === NULL) { return false; }
         if (!$this->getLdapBind()) { return false; }
@@ -778,21 +778,21 @@ 
     }
 
     /**
-    * Find the Base DN of your domain controller
-    * 
-    * @return string
-    */
+     * Find the Base DN of your domain controller
+     * 
+     * @return string
+     */
     public function findBaseDn() {
         $namingContext = $this->getRootDse(array('defaultnamingcontext'));   
         return $namingContext[0]['defaultnamingcontext'][0];
     }
     
     /**
-    * Get the RootDSE properties from a domain controller
-    * 
-    * @param string[] $attributes The attributes you wish to query e.g. defaultnamingcontext
-    * @return array
-    */
+     * Get the RootDSE properties from a domain controller
+     * 
+     * @param string[] $attributes The attributes you wish to query e.g. defaultnamingcontext
+     * @return array
+     */
     public function getRootDse($attributes = array("*", "+")) {
         if (!$this->ldapBind) { return (false); }
         

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

Indentation +52 added lines, -52 removed lines

@@ -54,25 +54,25 @@ 
     }
     
     /**
-    * Validate a user's login credentials
-    * 
-    * @param string $username A user's AD username
-    * @param string $password A user's AD password
-    * @param bool optional $prevent_rebind
-    * @return bool
-    */
+     * Validate a user's login credentials
+     * 
+     * @param string $username A user's AD username
+     * @param string $password A user's AD password
+     * @param bool optional $prevent_rebind
+     * @return bool
+     */
     public function authenticate($username, $password, $preventRebind = false) {
         return $this->adldap->authenticate($username, $password, $preventRebind);
     }
     
     /**
-    * Create a user
-    * 
-    * If you specify a password here, this can only be performed over SSL
-    * 
-    * @param array $attributes The attributes to set to the user account
-    * @return string|boolean
-    */
+     * Create a user
+     * 
+     * If you specify a password here, this can only be performed over SSL
+     * 
+     * @param array $attributes The attributes to set to the user account
+     * @return string|boolean
+     */
     public function create($attributes) {
         // Check for compulsory fields
         if (!array_key_exists("username", $attributes)) { return "Missing compulsory field [username]"; }
@@ -122,11 +122,11 @@ 
     }
     
     /**
-    * Account control options
-    *
-    * @param string[] $options The options to convert to int 
-    * @return int
-    */
+     * Account control options
+     *
+     * @param string[] $options The options to convert to int 
+     * @return int
+     */
     protected function accountControl($options) {
         $val = 0;
 
@@ -158,12 +158,12 @@ 
     }
     
     /**
-    * Delete a user account
-    * 
-    * @param string $username The username to delete (please be careful here!)
-    * @param bool $isGUID Is the username a GUID or a samAccountName
-    * @return boolean
-    */
+     * Delete a user account
+     * 
+     * @param string $username The username to delete (please be careful here!)
+     * @param bool $isGUID Is the username a GUID or a samAccountName
+     * @return boolean
+     */
     public function delete($username, $isGUID = false) {      
         $userinfo = $this->info($username, array("*"), $isGUID);
         $dn = $userinfo[0]['distinguishedname'][0];
@@ -370,13 +370,13 @@ 
     }
     
     /**
-    * Modify a user
-    * 
-    * @param string $username The username to query
-    * @param array $attributes The attributes to modify.  Note if you set the enabled attribute you must not specify any other attributes
-    * @param bool $isGUID Is the username passed a GUID or a samAccountName
-    * @return string|boolean
-    */
+     * Modify a user
+     * 
+     * @param string $username The username to query
+     * @param array $attributes The attributes to modify.  Note if you set the enabled attribute you must not specify any other attributes
+     * @param bool $isGUID Is the username passed a GUID or a samAccountName
+     * @return string|boolean
+     */
     public function modify($username, $attributes, $isGUID = false) {
         if ($username === NULL) { return "Missing compulsory field [username]"; }
         if (array_key_exists("password", $attributes) && !$this->adldap->getUseSSL() && !$this->adldap->getUseTLS()) { 
@@ -416,12 +416,12 @@ 
     }
     
     /**
-    * Disable a user account
-    * 
-    * @param string $username The username to disable
-    * @param bool $isGUID Is the username passed a GUID or a samAccountName
-    * @return string|boolean
-    */
+     * Disable a user account
+     * 
+     * @param string $username The username to disable
+     * @param bool $isGUID Is the username passed a GUID or a samAccountName
+     * @return string|boolean
+     */
     public function disable($username, $isGUID = false) {
         if ($username === NULL) { return "Missing compulsory field [username]"; }
         $attributes = array("enabled" => 0);
@@ -432,12 +432,12 @@ 
     }
     
     /**
-    * Enable a user account
-    * 
-    * @param string $username The username to enable
-    * @param bool $isGUID Is the username passed a GUID or a samAccountName
-    * @return string|boolean
-    */
+     * Enable a user account
+     * 
+     * @param string $username The username to enable
+     * @param bool $isGUID Is the username passed a GUID or a samAccountName
+     * @return string|boolean
+     */
     public function enable($username, $isGUID = false) {
         if ($username === NULL) { return "Missing compulsory field [username]"; }
         $attributes = array("enabled" => 1);
@@ -605,19 +605,19 @@ 
             }
         }
         if ($sorted) { 
-          asort($usersArray); 
+            asort($usersArray); 
         }
         return ($usersArray);
     }
     
     /**
-    * Move a user account to a different OU
-    *
-    * @param string $username The username to move (please be careful here!)
-    * @param array $container The container or containers to move the user to (please be careful here!).
-    * accepts containers in 1. parent 2. child order
-    * @return string|boolean
-    */
+     * Move a user account to a different OU
+     *
+     * @param string $username The username to move (please be careful here!)
+     * @param array $container The container or containers to move the user to (please be careful here!).
+     * accepts containers in 1. parent 2. child order
+     * @return string|boolean
+     */
     public function move($username, $container) {
         if (!$this->adldap->getLdapBind()) { return false; }
         if ($username === null) { return "Missing compulsory field [username]"; }

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

Indentation +11 added lines, -11 removed lines

@@ -151,11 +151,11 @@ 
     }
 
     /**
-    * Create a group
-    * 
-    * @param array $attributes Default attributes of the group
-    * @return string|boolean
-    */
+     * Create a group
+     * 
+     * @param array $attributes Default attributes of the group
+     * @return string|boolean
+     */
     public function create($attributes) {
         if (!is_array($attributes)) { return "Attributes must be an array"; }
         if (!array_key_exists("group_name", $attributes)) { return "Missing compulsory field [group_name]"; }
@@ -184,12 +184,12 @@ 
     }
     
     /**
-    * Delete a group account 
-    * 
-    * @param string $group The group to delete (please be careful here!) 
-    * 
-    * @return string|boolean 
-    */
+     * Delete a group account 
+     * 
+     * @param string $group The group to delete (please be careful here!) 
+     * 
+     * @return string|boolean 
+     */
     public function delete($group) {
         if (!$this->adldap->getLdapBind()) { return false; }
         if ($group === null) { return "Missing compulsory field [group]"; }

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

Indentation +51 added lines, -51 removed lines

@@ -53,18 +53,18 @@ 
     }
     
     /**
-    * Create an Exchange account
-    * 
-    * @param string $username The username of the user to add the Exchange account to
-    * @param array $storageGroup The mailbox, Exchange Storage Group, for the user account, this must be a full CN
-    *                            If the storage group has a different base_dn to the adLDAP configuration, set it using $base_dn
-    * @param string $emailAddress The primary email address to add to this user
-    * @param string $mailNickname The mail nick name.  If mail nickname is blank, the username will be used
-    * @param bool $useDefaults Indicates whether the store should use the default quota, rather than the per-mailbox quota.
-    * @param string $baseDn Specify an alternative base_dn for the Exchange storage group
-    * @param bool $isGUID Is the username passed a GUID or a samAccountName
-    * @return string|boolean
-    */
+     * Create an Exchange account
+     * 
+     * @param string $username The username of the user to add the Exchange account to
+     * @param array $storageGroup The mailbox, Exchange Storage Group, for the user account, this must be a full CN
+     *                            If the storage group has a different base_dn to the adLDAP configuration, set it using $base_dn
+     * @param string $emailAddress The primary email address to add to this user
+     * @param string $mailNickname The mail nick name.  If mail nickname is blank, the username will be used
+     * @param bool $useDefaults Indicates whether the store should use the default quota, rather than the per-mailbox quota.
+     * @param string $baseDn Specify an alternative base_dn for the Exchange storage group
+     * @param bool $isGUID Is the username passed a GUID or a samAccountName
+     * @return string|boolean
+     */
     public function createMailbox($username, $storageGroup, $emailAddress, $mailNickname = NULL, $useDefaults = TRUE, $baseDn = NULL, $isGUID = false) {
         if ($username === NULL) {  return "Missing compulsory field [username]"; }     
         if ($storageGroup === NULL) { return "Missing compulsory array [storagegroup]"; }
@@ -96,20 +96,20 @@ 
     }
     
     /**
-    * Add an X400 address to Exchange
-    * See http://tools.ietf.org/html/rfc1685 for more information.
-    * An X400 Address looks similar to this X400:c=US;a= ;p=Domain;o=Organization;s=Doe;g=John;
-    * 
-    * @param string $username The username of the user to add the X400 to to
-    * @param string $country Country
-    * @param string $admd Administration Management Domain
-    * @param string $pdmd Private Management Domain (often your AD domain)
-    * @param string $org Organization
-    * @param string $surname Surname
-    * @param string $givenName Given name
-    * @param bool $isGUID Is the username passed a GUID or a samAccountName
-    * @return string|boolean
-    */
+     * Add an X400 address to Exchange
+     * See http://tools.ietf.org/html/rfc1685 for more information.
+     * An X400 Address looks similar to this X400:c=US;a= ;p=Domain;o=Organization;s=Doe;g=John;
+     * 
+     * @param string $username The username of the user to add the X400 to to
+     * @param string $country Country
+     * @param string $admd Administration Management Domain
+     * @param string $pdmd Private Management Domain (often your AD domain)
+     * @param string $org Organization
+     * @param string $surname Surname
+     * @param string $givenName Given name
+     * @param bool $isGUID Is the username passed a GUID or a samAccountName
+     * @return string|boolean
+     */
     public function addX400($username, $country, $admd, $pdmd, $org, $surname, $givenName, $isGUID = false) {
         if ($username === NULL) { return "Missing compulsory field [username]"; }     
         
@@ -139,14 +139,14 @@ 
     }
     
     /**
-    * Add an address to Exchange
-    * 
-    * @param string $username The username of the user to add the Exchange account to
-    * @param string $emailAddress The email address to add to this user
-    * @param bool $default Make this email address the default address, this is a bit more intensive as we have to demote any existing default addresses
-    * @param bool $isGUID Is the username passed a GUID or a samAccountName
-    * @return string|boolean
-    */
+     * Add an address to Exchange
+     * 
+     * @param string $username The username of the user to add the Exchange account to
+     * @param string $emailAddress The email address to add to this user
+     * @param bool $default Make this email address the default address, this is a bit more intensive as we have to demote any existing default addresses
+     * @param bool $isGUID Is the username passed a GUID or a samAccountName
+     * @return string|boolean
+     */
     public function addAddress($username, $emailAddress, $default = FALSE, $isGUID = false) {
         if ($username === NULL) { return "Missing compulsory field [username]"; }     
         if ($emailAddress === NULL) { return "Missing compulsory fields [emailAddress]"; }
@@ -202,15 +202,15 @@ 
     }
     
     /**
-    * Remove an address to Exchange
-    * If you remove a default address the account will no longer have a default, 
-    * we recommend changing the default address first
-    * 
-    * @param string $username The username of the user to add the Exchange account to
-    * @param string $emailAddress The email address to add to this user
-    * @param bool $isGUID Is the username passed a GUID or a samAccountName
-    * @return string|boolean
-    */
+     * Remove an address to Exchange
+     * If you remove a default address the account will no longer have a default, 
+     * we recommend changing the default address first
+     * 
+     * @param string $username The username of the user to add the Exchange account to
+     * @param string $emailAddress The email address to add to this user
+     * @param bool $isGUID Is the username passed a GUID or a samAccountName
+     * @return string|boolean
+     */
     public function deleteAddress($username, $emailAddress, $isGUID = false) {
         if ($username === NULL) { return "Missing compulsory field [username]"; }     
         if ($emailAddress === NULL) { return "Missing compulsory fields [emailAddress]"; }
@@ -280,14 +280,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) {
         if ($distinguishedName === NULL) { return "Missing compulsory field [distinguishedName]"; }   
         if ($emailAddress === NULL) { return "Missing compulsory field [emailAddress]"; }  

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

Indentation +11 added lines, -11 removed lines

@@ -241,23 +241,23 @@
     }  
     
     /**
-    * Get the current class version number
-    * 
-    * @return string
-    */
+     * Get the current class version number
+     * 
+     * @return string
+     */
     public function getVersion() {
         return self::ADLDAP_VERSION;
     }
     
     /**
-    * Round a Windows timestamp down to seconds and remove the seconds between 1601-01-01 and 1970-01-01
-    * 
-    * @param long $windowsTime
-    * @return double $unixTime
-    */
+     * Round a Windows timestamp down to seconds and remove the seconds between 1601-01-01 and 1970-01-01
+     * 
+     * @param long $windowsTime
+     * @return double $unixTime
+     */
     public static function convertWindowsTimeToUnixTime($windowsTime) {
-      $unixTime = round($windowsTime / 10000000) - 11644473600; 
-      return $unixTime; 
+        $unixTime = round($windowsTime / 10000000) - 11644473600; 
+        return $unixTime; 
     }
 
     /**

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; }

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."; }

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();