evolution-cms / evolution

manager/includes/extenders/dbapi.mysql.class.inc.php

Indentation +496 added lines, -496 removed lines

@@ -7,187 +7,187 @@ 
 
 class DBAPI {
 
-   var $conn;
-   var $config;
-   var $lastQuery;
-   var $isConnected;
+    var $conn;
+    var $config;
+    var $lastQuery;
+    var $isConnected;
 
-   /**
-    * @name:  DBAPI
-    *
-    */
-   function __construct($host='',$dbase='', $uid='',$pwd='',$pre=NULL,$charset='',$connection_method='SET CHARACTER SET') {
-      $this->config['host'] = $host ? $host : $GLOBALS['database_server'];
-      $this->config['dbase'] = $dbase ? $dbase : $GLOBALS['dbase'];
-      $this->config['user'] = $uid ? $uid : $GLOBALS['database_user'];
-      $this->config['pass'] = $pwd ? $pwd : $GLOBALS['database_password'];
-      $this->config['charset'] = $charset ? $charset : $GLOBALS['database_connection_charset'];
-      $this->config['connection_method'] =  $this->_dbconnectionmethod = (isset($GLOBALS['database_connection_method']) ? $GLOBALS['database_connection_method'] : $connection_method);
-      $this->config['table_prefix'] = ($pre !== NULL) ? $pre : $GLOBALS['table_prefix'];
-      $this->initDataTypes();
-   }
+    /**
+     * @name:  DBAPI
+     *
+     */
+    function __construct($host='',$dbase='', $uid='',$pwd='',$pre=NULL,$charset='',$connection_method='SET CHARACTER SET') {
+        $this->config['host'] = $host ? $host : $GLOBALS['database_server'];
+        $this->config['dbase'] = $dbase ? $dbase : $GLOBALS['dbase'];
+        $this->config['user'] = $uid ? $uid : $GLOBALS['database_user'];
+        $this->config['pass'] = $pwd ? $pwd : $GLOBALS['database_password'];
+        $this->config['charset'] = $charset ? $charset : $GLOBALS['database_connection_charset'];
+        $this->config['connection_method'] =  $this->_dbconnectionmethod = (isset($GLOBALS['database_connection_method']) ? $GLOBALS['database_connection_method'] : $connection_method);
+        $this->config['table_prefix'] = ($pre !== NULL) ? $pre : $GLOBALS['table_prefix'];
+        $this->initDataTypes();
+    }
 
-   /**
-    * @name:  initDataTypes
-    * @desc:  called in the constructor to set up arrays containing the types
-    *         of database fields that can be used with specific PHP types
-    */
-   function initDataTypes() {
-      $this->dataTypes['numeric'] = array (
-         'INT',
-         'INTEGER',
-         'TINYINT',
-         'BOOLEAN',
-         'DECIMAL',
-         'DEC',
-         'NUMERIC',
-         'FLOAT',
-         'DOUBLE PRECISION',
-         'REAL',
-         'SMALLINT',
-         'MEDIUMINT',
-         'BIGINT',
-         'BIT'
-      );
-      $this->dataTypes['string'] = array (
-         'CHAR',
-         'VARCHAR',
-         'BINARY',
-         'VARBINARY',
-         'TINYBLOB',
-         'BLOB',
-         'MEDIUMBLOB',
-         'LONGBLOB',
-         'TINYTEXT',
-         'TEXT',
-         'MEDIUMTEXT',
-         'LONGTEXT',
-         'ENUM',
-         'SET'
-      );
-      $this->dataTypes['date'] = array (
-         'DATE',
-         'DATETIME',
-         'TIMESTAMP',
-         'TIME',
-         'YEAR'
-      );
-   }
+    /**
+     * @name:  initDataTypes
+     * @desc:  called in the constructor to set up arrays containing the types
+     *         of database fields that can be used with specific PHP types
+     */
+    function initDataTypes() {
+        $this->dataTypes['numeric'] = array (
+            'INT',
+            'INTEGER',
+            'TINYINT',
+            'BOOLEAN',
+            'DECIMAL',
+            'DEC',
+            'NUMERIC',
+            'FLOAT',
+            'DOUBLE PRECISION',
+            'REAL',
+            'SMALLINT',
+            'MEDIUMINT',
+            'BIGINT',
+            'BIT'
+        );
+        $this->dataTypes['string'] = array (
+            'CHAR',
+            'VARCHAR',
+            'BINARY',
+            'VARBINARY',
+            'TINYBLOB',
+            'BLOB',
+            'MEDIUMBLOB',
+            'LONGBLOB',
+            'TINYTEXT',
+            'TEXT',
+            'MEDIUMTEXT',
+            'LONGTEXT',
+            'ENUM',
+            'SET'
+        );
+        $this->dataTypes['date'] = array (
+            'DATE',
+            'DATETIME',
+            'TIMESTAMP',
+            'TIME',
+            'YEAR'
+        );
+    }
 
-   /**
-    * @name:  connect
-    *
-    */
-   function connect($host = '', $dbase = '', $uid = '', $pwd = '', $persist = 0) {
-      global $modx;
-      $uid = $uid ? $uid : $this->config['user'];
-      $pwd = $pwd ? $pwd : $this->config['pass'];
-      $host = $host ? $host : $this->config['host'];
-      $dbase = $dbase ? $dbase : $this->config['dbase'];
-      $charset = $this->config['charset'];
-      $connection_method = $this->config['connection_method'];
-      $tstart = $modx->getMicroTime();
-      $safe_count = 0;
-      while(!$this->conn && $safe_count<3)
-      {
-          if($persist!=0) $this->conn = mysql_pconnect($host, $uid, $pwd);
-          else            $this->conn = mysql_connect($host, $uid, $pwd, true);
+    /**
+     * @name:  connect
+     *
+     */
+    function connect($host = '', $dbase = '', $uid = '', $pwd = '', $persist = 0) {
+        global $modx;
+        $uid = $uid ? $uid : $this->config['user'];
+        $pwd = $pwd ? $pwd : $this->config['pass'];
+        $host = $host ? $host : $this->config['host'];
+        $dbase = $dbase ? $dbase : $this->config['dbase'];
+        $charset = $this->config['charset'];
+        $connection_method = $this->config['connection_method'];
+        $tstart = $modx->getMicroTime();
+        $safe_count = 0;
+        while(!$this->conn && $safe_count<3)
+        {
+            if($persist!=0) $this->conn = mysql_pconnect($host, $uid, $pwd);
+            else            $this->conn = mysql_connect($host, $uid, $pwd, true);
           
-          if(!$this->conn)
-          {
+            if(!$this->conn)
+            {
             if(isset($modx->config['send_errormail']) && $modx->config['send_errormail'] !== '0')
             {
-               if($modx->config['send_errormail'] <= 2)
-               {
-                  $logtitle    = 'Failed to create the database connection!';
-                  $request_uri = $modx->htmlspecialchars($_SERVER['REQUEST_URI']);
-                  $ua          = $modx->htmlspecialchars($_SERVER['HTTP_USER_AGENT']);
-                  $referer     = $modx->htmlspecialchars($_SERVER['HTTP_REFERER']);
+                if($modx->config['send_errormail'] <= 2)
+                {
+                    $logtitle    = 'Failed to create the database connection!';
+                    $request_uri = $modx->htmlspecialchars($_SERVER['REQUEST_URI']);
+                    $ua          = $modx->htmlspecialchars($_SERVER['HTTP_USER_AGENT']);
+                    $referer     = $modx->htmlspecialchars($_SERVER['HTTP_REFERER']);
 
-                  $modx->sendmail(array(
-					  'subject' => 'Missing to create the database connection! from ' . $modx->config['site_name'],
-					  'body' => "{$logtitle}\n{$request_uri}\n{$ua}\n{$referer}",
-					  'type' => 'text')
-				  );
-               }
+                    $modx->sendmail(array(
+                        'subject' => 'Missing to create the database connection! from ' . $modx->config['site_name'],
+                        'body' => "{$logtitle}\n{$request_uri}\n{$ua}\n{$referer}",
+                        'type' => 'text')
+                    );
+                }
             }
             sleep(1);
             $safe_count++;
-          }
-      }
-      if (!$this->conn) {
-         $modx->messageQuit("Failed to create the database connection!");
-         exit;
-      } else {
-         $dbase = trim($dbase,'`'); // remove the `` chars
-         if (!@ mysql_select_db($dbase, $this->conn)) {
+            }
+        }
+        if (!$this->conn) {
+            $modx->messageQuit("Failed to create the database connection!");
+            exit;
+        } else {
+            $dbase = trim($dbase,'`'); // remove the `` chars
+            if (!@ mysql_select_db($dbase, $this->conn)) {
             $modx->messageQuit("Failed to select the database '" . $dbase . "'!");
             exit;
-         }
-         @mysql_query("{$connection_method} {$charset}", $this->conn);
-         $tend = $modx->getMicroTime();
-         $totaltime = $tend - $tstart;
-         if ($modx->dumpSQL) {
+            }
+            @mysql_query("{$connection_method} {$charset}", $this->conn);
+            $tend = $modx->getMicroTime();
+            $totaltime = $tend - $tstart;
+            if ($modx->dumpSQL) {
             $modx->queryCode .= "<fieldset style='text-align:left'><legend>Database connection</legend>" . sprintf("Database connection was created in %2.4f s", $totaltime) . "</fieldset><br />";
-         }
+            }
             if (function_exists('mysql_set_charset')) {
                 mysql_set_charset($this->config['charset']);
             } else {
                 @mysql_query("SET NAMES {$this->config['charset']}", $this->conn);
             }
-         $this->isConnected = true;
-         // FIXME (Fixed by line below):
-         // this->queryTime = this->queryTime + $totaltime;
-         $modx->queryTime += $totaltime;
-      }
-   }
+            $this->isConnected = true;
+            // FIXME (Fixed by line below):
+            // this->queryTime = this->queryTime + $totaltime;
+            $modx->queryTime += $totaltime;
+        }
+    }
 
-   /**
-    * @name:  disconnect
-    *
-    */
-   function disconnect() {
-      @ mysql_close($this->conn);
-      $this->conn = null;
-      $this->isConnected = false;
-   }
+    /**
+     * @name:  disconnect
+     *
+     */
+    function disconnect() {
+        @ mysql_close($this->conn);
+        $this->conn = null;
+        $this->isConnected = false;
+    }
 
-   function escape($s, $safecount=0) {
+    function escape($s, $safecount=0) {
       
-      $safecount++;
-      if(1000<$safecount) exit("Too many loops '{$safecount}'");
+        $safecount++;
+        if(1000<$safecount) exit("Too many loops '{$safecount}'");
       
-      if (empty ($this->conn) || !is_resource($this->conn)) {
-         $this->connect();
-       }
+        if (empty ($this->conn) || !is_resource($this->conn)) {
+            $this->connect();
+        }
        
-      if(is_array($s)) {
-          if(count($s) === 0) $s = '';
-          else {
-              foreach($s as $i=>$v) {
-                  $s[$i] = $this->escape($v,$safecount);
-              }
-          }
-      }
-      else $s = mysql_real_escape_string($s, $this->conn);
-          return $s;
-   }
+        if(is_array($s)) {
+            if(count($s) === 0) $s = '';
+            else {
+                foreach($s as $i=>$v) {
+                    $s[$i] = $this->escape($v,$safecount);
+                }
+            }
+        }
+        else $s = mysql_real_escape_string($s, $this->conn);
+            return $s;
+    }
 
-   /**
-    * @name:  query
-    * @desc:  Mainly for internal use.
-    * Developers should use select, update, insert, delete where possible
-    */
-   function query($sql,$watchError=true) {
-      global $modx;
-      if (empty ($this->conn) || !is_resource($this->conn)) {
-         $this->connect();
-      }
-      $tstart = $modx->getMicroTime();
-      if(is_array($sql)) $sql = join("\n", $sql);
-      $this->lastQuery = $sql;
-      if (!$result = @ mysql_query($sql, $this->conn)) {
-         if(!$watchError) return;
+    /**
+     * @name:  query
+     * @desc:  Mainly for internal use.
+     * Developers should use select, update, insert, delete where possible
+     */
+    function query($sql,$watchError=true) {
+        global $modx;
+        if (empty ($this->conn) || !is_resource($this->conn)) {
+            $this->connect();
+        }
+        $tstart = $modx->getMicroTime();
+        if(is_array($sql)) $sql = join("\n", $sql);
+        $this->lastQuery = $sql;
+        if (!$result = @ mysql_query($sql, $this->conn)) {
+            if(!$watchError) return;
             switch(mysql_errno()) {
                 case 1054:
                 case 1060:
@@ -198,11 +198,11 @@ 
                 default:
                     $modx->messageQuit('Execution of a query to the database failed - ' . $this->getLastError(), $sql);
             }
-      } else {
-         $tend = $modx->getMicroTime();
-         $totaltime = $tend - $tstart;
-         $modx->queryTime = $modx->queryTime + $totaltime;
-         if ($modx->dumpSQL) {
+        } else {
+            $tend = $modx->getMicroTime();
+            $totaltime = $tend - $tstart;
+            $modx->queryTime = $modx->queryTime + $totaltime;
+            if ($modx->dumpSQL) {
             $debug = debug_backtrace();
             array_shift($debug);	
             $debug_path = array();
@@ -217,124 +217,124 @@ 
             else $modx->queryCode .= 'Affected Rows => ' . $this->getAffectedRows() . '<br>';
             $modx->queryCode .= 'Functions Path => ' . $debug_path . '<br>';
             $modx->queryCode .= "</fieldset><br />";
-         }
-         $modx->executedQueries = $modx->executedQueries + 1;
-         return $result;
-      }
-   }
+            }
+            $modx->executedQueries = $modx->executedQueries + 1;
+            return $result;
+        }
+    }
 
-   /**
-    * @name:  delete
-    *
-    */
-   function delete($from, $where='', $orderby='', $limit = '') {
-      global $modx;
-      if (!$from)
-         $modx->messageQuit("Empty \$from parameters in DBAPI::delete().");
-      else {
-         $from = $this->replaceFullTableName($from);
-         $where   = trim($where);
-         $orderby = trim($orderby);
-         $limit   = trim($limit);
-         if($where!==''   && stripos($where,   'WHERE')!==0)    $where   = "WHERE {$where}";
-         if($orderby!=='' && stripos($orderby, 'ORDER BY')!==0) $orderby = "ORDER BY {$orderby}";
-         if($limit!==''   && stripos($limit,   'LIMIT')!==0)    $limit   = "LIMIT {$limit}";
-         return $this->query("DELETE FROM {$from} {$where} {$orderby} {$limit}");
-      }
-   }
+    /**
+     * @name:  delete
+     *
+     */
+    function delete($from, $where='', $orderby='', $limit = '') {
+        global $modx;
+        if (!$from)
+            $modx->messageQuit("Empty \$from parameters in DBAPI::delete().");
+        else {
+            $from = $this->replaceFullTableName($from);
+            $where   = trim($where);
+            $orderby = trim($orderby);
+            $limit   = trim($limit);
+            if($where!==''   && stripos($where,   'WHERE')!==0)    $where   = "WHERE {$where}";
+            if($orderby!=='' && stripos($orderby, 'ORDER BY')!==0) $orderby = "ORDER BY {$orderby}";
+            if($limit!==''   && stripos($limit,   'LIMIT')!==0)    $limit   = "LIMIT {$limit}";
+            return $this->query("DELETE FROM {$from} {$where} {$orderby} {$limit}");
+        }
+    }
 
-   /**
-    * @name:  select
-    *
-    */
-   function select($fields = "*", $from = "", $where = "", $orderby = "", $limit = "") {
-      global $modx;
+    /**
+     * @name:  select
+     *
+     */
+    function select($fields = "*", $from = "", $where = "", $orderby = "", $limit = "") {
+        global $modx;
       
-      if(is_array($fields)) $fields = $this->_getFieldsStringFromArray($fields);
-      if(is_array($from))   $from   = $this->_getFromStringFromArray($from);
-      if(is_array($where))  $where  = join(' ', $where);
+        if(is_array($fields)) $fields = $this->_getFieldsStringFromArray($fields);
+        if(is_array($from))   $from   = $this->_getFromStringFromArray($from);
+        if(is_array($where))  $where  = join(' ', $where);
       
-      if (!$from) {
-         $modx->messageQuit("Empty \$from parameters in DBAPI::select().");
-         exit;
-      }
+        if (!$from) {
+            $modx->messageQuit("Empty \$from parameters in DBAPI::select().");
+            exit;
+        }
       
-      $fields = $this->replaceFullTableName($fields);
-      $from = $this->replaceFullTableName($from);
-      $where   = trim($where);
-      $orderby = trim($orderby);
-      $limit   = trim($limit);
-      if($where!==''   && stripos($where,'WHERE')!==0)   $where   = "WHERE {$where}";
-      if($orderby!=='' && stripos($orderby,'ORDER')!==0) $orderby = "ORDER BY {$orderby}";
-      if($limit!==''   && stripos($limit,'LIMIT')!==0)   $limit   = "LIMIT {$limit}";
-      return $this->query("SELECT {$fields} FROM {$from} {$where} {$orderby} {$limit}");
-   }
+        $fields = $this->replaceFullTableName($fields);
+        $from = $this->replaceFullTableName($from);
+        $where   = trim($where);
+        $orderby = trim($orderby);
+        $limit   = trim($limit);
+        if($where!==''   && stripos($where,'WHERE')!==0)   $where   = "WHERE {$where}";
+        if($orderby!=='' && stripos($orderby,'ORDER')!==0) $orderby = "ORDER BY {$orderby}";
+        if($limit!==''   && stripos($limit,'LIMIT')!==0)   $limit   = "LIMIT {$limit}";
+        return $this->query("SELECT {$fields} FROM {$from} {$where} {$orderby} {$limit}");
+    }
 
-   /**
-    * @name:  update
-    *
-    */
-   function update($fields, $table, $where = "") {
-      global $modx;
-      if (!$table)
-         $modx->messageQuit("Empty \$table parameter in DBAPI::update().");
-      else {
-         $table = $this->replaceFullTableName($table);
-         if (is_array($fields)) {
-			 foreach ($fields as $key => $value) {
-				 if(is_null($value) || strtolower($value) === 'null'){
-					 $flds = 'NULL';
-				 }else{
-					 $flds = "'" . $value . "'";
-				 }
-				 $fields[$key] = "`{$key}` = ".$flds;
-			 }
+    /**
+     * @name:  update
+     *
+     */
+    function update($fields, $table, $where = "") {
+        global $modx;
+        if (!$table)
+            $modx->messageQuit("Empty \$table parameter in DBAPI::update().");
+        else {
+            $table = $this->replaceFullTableName($table);
+            if (is_array($fields)) {
+                foreach ($fields as $key => $value) {
+                    if(is_null($value) || strtolower($value) === 'null'){
+                        $flds = 'NULL';
+                    }else{
+                        $flds = "'" . $value . "'";
+                    }
+                    $fields[$key] = "`{$key}` = ".$flds;
+                }
             $fields = implode(",", $fields);
-         }
-         $where = trim($where);
-         if($where!=='' && stripos($where, 'WHERE')!==0) $where = "WHERE {$where}";
-         return $this->query("UPDATE {$table} SET {$fields} {$where}");
-      }
-   }
+            }
+            $where = trim($where);
+            if($where!=='' && stripos($where, 'WHERE')!==0) $where = "WHERE {$where}";
+            return $this->query("UPDATE {$table} SET {$fields} {$where}");
+        }
+    }
 
-   /**
-    * @name:  insert
-    * @desc:  returns either last id inserted or the result from the query
-    */
-   function insert($fields, $intotable, $fromfields = "*", $fromtable = "", $where = "", $limit = "") {
-      global $modx;
-      if (!$intotable)
-         $modx->messageQuit("Empty \$intotable parameters in DBAPI::insert().");
-      else {
-         $intotable = $this->replaceFullTableName($intotable);
-         if (!is_array($fields)) {
+    /**
+     * @name:  insert
+     * @desc:  returns either last id inserted or the result from the query
+     */
+    function insert($fields, $intotable, $fromfields = "*", $fromtable = "", $where = "", $limit = "") {
+        global $modx;
+        if (!$intotable)
+            $modx->messageQuit("Empty \$intotable parameters in DBAPI::insert().");
+        else {
+            $intotable = $this->replaceFullTableName($intotable);
+            if (!is_array($fields)) {
             $this->query("INSERT INTO {$intotable} {$fields}");
-         } else {
+            } else {
             if (empty($fromtable)) {
-               $fields = "(`".implode("`, `", array_keys($fields))."`) VALUES('".implode("', '", array_values($fields))."')";
-               $rt = $this->query("INSERT INTO {$intotable} {$fields}");
+                $fields = "(`".implode("`, `", array_keys($fields))."`) VALUES('".implode("', '", array_values($fields))."')";
+                $rt = $this->query("INSERT INTO {$intotable} {$fields}");
             } else {
-               if (version_compare($this->getVersion(),"4.0.14")>=0) {
-                  $fromtable = $this->replaceFullTableName($fromtable);
-                  $fields = "(".implode(",", array_keys($fields)).")";
-                  $where = trim($where);
-                  $limit = trim($limit);
-                  if($where!=='' && stripos($where, 'WHERE')!==0) $where = "WHERE {$where}";
-                  if($limit!=='' && stripos($limit, 'LIMIT')!==0) $limit = "LIMIT {$limit}";
-                  $rt = $this->query("INSERT INTO {$intotable} {$fields} SELECT {$fromfields} FROM {$fromtable} {$where} {$limit}");
-               } else {
-                  $ds = $this->select($fromfields, $fromtable, $where, '', $limit);
-                  while ($row = $this->getRow($ds)) {
-                     $fields = "(".implode(",", array_keys($fields)).") VALUES('".implode("', '", $row)."')";
-                     $rt = $this->query("INSERT INTO {$intotable} {$fields}");
-                  }
-               }
+                if (version_compare($this->getVersion(),"4.0.14")>=0) {
+                    $fromtable = $this->replaceFullTableName($fromtable);
+                    $fields = "(".implode(",", array_keys($fields)).")";
+                    $where = trim($where);
+                    $limit = trim($limit);
+                    if($where!=='' && stripos($where, 'WHERE')!==0) $where = "WHERE {$where}";
+                    if($limit!=='' && stripos($limit, 'LIMIT')!==0) $limit = "LIMIT {$limit}";
+                    $rt = $this->query("INSERT INTO {$intotable} {$fields} SELECT {$fromfields} FROM {$fromtable} {$where} {$limit}");
+                } else {
+                    $ds = $this->select($fromfields, $fromtable, $where, '', $limit);
+                    while ($row = $this->getRow($ds)) {
+                        $fields = "(".implode(",", array_keys($fields)).") VALUES('".implode("', '", $row)."')";
+                        $rt = $this->query("INSERT INTO {$intotable} {$fields}");
+                    }
+                }
+            }
             }
-         }
-         if (($lid = $this->getInsertId())===false) $modx->messageQuit("Couldn't get last insert key!");
-         return $lid;
-      }
-   }
+            if (($lid = $this->getInsertId())===false) $modx->messageQuit("Couldn't get last insert key!");
+            return $lid;
+        }
+    }
    
     function save($fields, $table, $where='') {
         
@@ -346,277 +346,277 @@ 
         else                 return $this->update($fields, $table, $where);
     }
     
-   /**
-    * @name:  isResult
-    *
-    */
-   function isResult($rs) {
-      return is_resource($rs);
-   }
+    /**
+     * @name:  isResult
+     *
+     */
+    function isResult($rs) {
+        return is_resource($rs);
+    }
 
-   /**
-    * @name:  freeResult
-    *
-    */
-   function freeResult($rs) {
-      mysql_free_result($rs);
-   }
+    /**
+     * @name:  freeResult
+     *
+     */
+    function freeResult($rs) {
+        mysql_free_result($rs);
+    }
    
-   /**
-    * @name:  numFields
-    *
-    */
-   function numFields($rs) {
-      return mysql_num_fields($rs);
-   }
+    /**
+     * @name:  numFields
+     *
+     */
+    function numFields($rs) {
+        return mysql_num_fields($rs);
+    }
    
-   /**
-    * @name:  fieldName
-    *
-    */
-   function fieldName($rs,$col=0) {
-      return mysql_field_name($rs,$col);
-   }
+    /**
+     * @name:  fieldName
+     *
+     */
+    function fieldName($rs,$col=0) {
+        return mysql_field_name($rs,$col);
+    }
    
     /**
-    * @name:  selectDb
-    *
-    */
-   function selectDb($name) {
-      mysql_select_db($name);
-   }
+     * @name:  selectDb
+     *
+     */
+    function selectDb($name) {
+        mysql_select_db($name);
+    }
    
 
-   /**
-    * @name:  getInsertId
-    *
-    */
-   function getInsertId($conn=NULL) {
-      if( !is_resource($conn)) $conn =& $this->conn;
-      return mysql_insert_id($conn);
-   }
+    /**
+     * @name:  getInsertId
+     *
+     */
+    function getInsertId($conn=NULL) {
+        if( !is_resource($conn)) $conn =& $this->conn;
+        return mysql_insert_id($conn);
+    }
 
-   /**
-    * @name:  getAffectedRows
-    *
-    */
-   function getAffectedRows($conn=NULL) {
-      if (!is_resource($conn)) $conn =& $this->conn;
-      return mysql_affected_rows($conn);
-   }
+    /**
+     * @name:  getAffectedRows
+     *
+     */
+    function getAffectedRows($conn=NULL) {
+        if (!is_resource($conn)) $conn =& $this->conn;
+        return mysql_affected_rows($conn);
+    }
 
-   /**
-    * @name:  getLastError
-    *
-    */
-   function getLastError($conn=NULL) {
-      if (!is_resource($conn)) $conn =& $this->conn;
-      return mysql_error($conn);
-   }
+    /**
+     * @name:  getLastError
+     *
+     */
+    function getLastError($conn=NULL) {
+        if (!is_resource($conn)) $conn =& $this->conn;
+        return mysql_error($conn);
+    }
 
-   /**
-    * @name:  getRecordCount
-    *
-    */
-   function getRecordCount($ds) {
-      return (is_resource($ds)) ? mysql_num_rows($ds) : 0;
-   }
+    /**
+     * @name:  getRecordCount
+     *
+     */
+    function getRecordCount($ds) {
+        return (is_resource($ds)) ? mysql_num_rows($ds) : 0;
+    }
 
-   /**
-    * @name:  getRow
-    * @desc:  returns an array of column values
-    * @param: $dsq - dataset
-    *
-    */
-   function getRow($ds, $mode = 'assoc') {
-      if (is_resource($ds)) {
-         if ($mode == 'assoc') {
+    /**
+     * @name:  getRow
+     * @desc:  returns an array of column values
+     * @param: $dsq - dataset
+     *
+     */
+    function getRow($ds, $mode = 'assoc') {
+        if (is_resource($ds)) {
+            if ($mode == 'assoc') {
             return mysql_fetch_assoc($ds);
-         }
-         elseif ($mode == 'num') {
+            }
+            elseif ($mode == 'num') {
             return mysql_fetch_row($ds);
-         }
-		 elseif ($mode == 'object') {
+            }
+            elseif ($mode == 'object') {
             return mysql_fetch_object($ds);
-         }
-         elseif ($mode == 'both') {
+            }
+            elseif ($mode == 'both') {
             return mysql_fetch_array($ds, MYSQL_BOTH);
-         } else {
+            } else {
             global $modx;
             $modx->messageQuit("Unknown get type ($mode) specified for fetchRow - must be empty, 'assoc', 'num' or 'both'.");
-         }
-      }
-   }
+            }
+        }
+    }
 
-   /**
-    * @name:  getColumn
-    * @desc:  returns an array of the values found on colun $name
-    * @param: $dsq - dataset or query string
-    */
-   function getColumn($name, $dsq) {
-      if (!is_resource($dsq))
-         $dsq = $this->query($dsq);
-      if ($dsq) {
-         $col = array ();
-         while ($row = $this->getRow($dsq)) {
+    /**
+     * @name:  getColumn
+     * @desc:  returns an array of the values found on colun $name
+     * @param: $dsq - dataset or query string
+     */
+    function getColumn($name, $dsq) {
+        if (!is_resource($dsq))
+            $dsq = $this->query($dsq);
+        if ($dsq) {
+            $col = array ();
+            while ($row = $this->getRow($dsq)) {
             $col[] = $row[$name];
-         }
-         return $col;
-      }
-   }
+            }
+            return $col;
+        }
+    }
 
-   /**
-    * @name:  getColumnNames
-    * @desc:  returns an array containing the column $name
-    * @param: $dsq - dataset or query string
-    */
-   function getColumnNames($dsq) {
-      if (!is_resource($dsq))
-         $dsq = $this->query($dsq);
-      if ($dsq) {
-         $names = array ();
-         $limit = mysql_num_fields($dsq);
-         for ($i = 0; $i < $limit; $i++) {
+    /**
+     * @name:  getColumnNames
+     * @desc:  returns an array containing the column $name
+     * @param: $dsq - dataset or query string
+     */
+    function getColumnNames($dsq) {
+        if (!is_resource($dsq))
+            $dsq = $this->query($dsq);
+        if ($dsq) {
+            $names = array ();
+            $limit = mysql_num_fields($dsq);
+            for ($i = 0; $i < $limit; $i++) {
             $names[] = mysql_field_name($dsq, $i);
-         }
-         return $names;
-      }
-   }
+            }
+            return $names;
+        }
+    }
 
-   /**
-    * @name:  getValue
-    * @desc:  returns the value from the first column in the set
-    * @param: $dsq - dataset or query string
-    */
-   function getValue($dsq) {
-      if (!is_resource($dsq))
-         $dsq = $this->query($dsq);
-      if ($dsq) {
-         $r = $this->getRow($dsq, "num");
-         return $r[0];
-      }
-   }
+    /**
+     * @name:  getValue
+     * @desc:  returns the value from the first column in the set
+     * @param: $dsq - dataset or query string
+     */
+    function getValue($dsq) {
+        if (!is_resource($dsq))
+            $dsq = $this->query($dsq);
+        if ($dsq) {
+            $r = $this->getRow($dsq, "num");
+            return $r[0];
+        }
+    }
 
-   /**
-    * @name:  getTableMetaData
-    * @desc:  returns an array of MySQL structure detail for each column of a
-    *         table
-    * @param: $table: the full name of the database table
-    */
-   function getTableMetaData($table) {
-      $metadata = false;
-      if (!empty ($table)) {
-         $sql = "SHOW FIELDS FROM $table";
-         if ($ds = $this->query($sql)) {
+    /**
+     * @name:  getTableMetaData
+     * @desc:  returns an array of MySQL structure detail for each column of a
+     *         table
+     * @param: $table: the full name of the database table
+     */
+    function getTableMetaData($table) {
+        $metadata = false;
+        if (!empty ($table)) {
+            $sql = "SHOW FIELDS FROM $table";
+            if ($ds = $this->query($sql)) {
             while ($row = $this->getRow($ds)) {
-               $fieldName = $row['Field'];
-               $metadata[$fieldName] = $row;
+                $fieldName = $row['Field'];
+                $metadata[$fieldName] = $row;
+            }
             }
-         }
-      }
-      return $metadata;
-   }
+        }
+        return $metadata;
+    }
 
-   /**
-    * @name:  prepareDate
-    * @desc:  prepares a date in the proper format for specific database types
-    *         given a UNIX timestamp
-    * @param: $timestamp: a UNIX timestamp
-    * @param: $fieldType: the type of field to format the date for
-    *         (in MySQL, you have DATE, TIME, YEAR, and DATETIME)
-    */
-   function prepareDate($timestamp, $fieldType = 'DATETIME') {
-      $date = '';
-      if (!$timestamp === false && $timestamp > 0) {
-         switch ($fieldType) {
+    /**
+     * @name:  prepareDate
+     * @desc:  prepares a date in the proper format for specific database types
+     *         given a UNIX timestamp
+     * @param: $timestamp: a UNIX timestamp
+     * @param: $fieldType: the type of field to format the date for
+     *         (in MySQL, you have DATE, TIME, YEAR, and DATETIME)
+     */
+    function prepareDate($timestamp, $fieldType = 'DATETIME') {
+        $date = '';
+        if (!$timestamp === false && $timestamp > 0) {
+            switch ($fieldType) {
             case 'DATE' :
                $date = date('Y-m-d', $timestamp);
-               break;
+                break;
             case 'TIME' :
                $date = date('H:i:s', $timestamp);
-               break;
+                break;
             case 'YEAR' :
                $date = date('Y', $timestamp);
-               break;
+                break;
             default :
                $date = date('Y-m-d H:i:s', $timestamp);
-               break;
-         }
-      }
-      return $date;
-   }
+                break;
+            }
+        }
+        return $date;
+    }
 
-   /**
-   * @name:  makeArray
-   * @desc:  turns a recordset into a multidimensional array
-   * @return: an array of row arrays from recordset, or empty array
-   *          if the recordset was empty, returns false if no recordset
-   *          was passed
-   * @param: $rs Recordset to be packaged into an array
-   */
-	function makeArray($rs='',$index=false){
-		if (!$rs) return false;
-		$rsArray = array();
-		$iterator = 0;
-		while ($row = $this->getRow($rs)) {
-			$returnIndex = $index !== false && isset($row[$index]) ? $row[$index] : $iterator;
-			$rsArray[$returnIndex] = $row;
-			$iterator++;
-		}
-		return $rsArray;
-	}
+    /**
+     * @name:  makeArray
+     * @desc:  turns a recordset into a multidimensional array
+     * @return: an array of row arrays from recordset, or empty array
+     *          if the recordset was empty, returns false if no recordset
+     *          was passed
+     * @param: $rs Recordset to be packaged into an array
+     */
+    function makeArray($rs='',$index=false){
+        if (!$rs) return false;
+        $rsArray = array();
+        $iterator = 0;
+        while ($row = $this->getRow($rs)) {
+            $returnIndex = $index !== false && isset($row[$index]) ? $row[$index] : $iterator;
+            $rsArray[$returnIndex] = $row;
+            $iterator++;
+        }
+        return $rsArray;
+    }
    
-   /**
-    * @name	getVersion
-    * @desc	returns a string containing the database server version
-    *
-    * @return string
-    */
-   function getVersion() {
-       return mysql_get_server_info();
-   }
+    /**
+     * @name	getVersion
+     * @desc	returns a string containing the database server version
+     *
+     * @return string
+     */
+    function getVersion() {
+        return mysql_get_server_info();
+    }
    
-   /**
-    * @name replaceFullTableName
-    * @desc  Get full table name. Append table name and table prefix.
-    * 
-    * @param string $str
-    * @return string 
-    */
-   function replaceFullTableName($str,$force=null) {
+    /**
+     * @name replaceFullTableName
+     * @desc  Get full table name. Append table name and table prefix.
+     * 
+     * @param string $str
+     * @return string 
+     */
+    function replaceFullTableName($str,$force=null) {
        
-       $str = trim($str);
-       $dbase  = trim($this->config['dbase'],'`');
-       $prefix = $this->config['table_prefix'];
-       if(!empty($force))
-       {
-           $result = "`{$dbase}`.`{$prefix}{$str}`";
-       }
-       elseif(strpos($str,'[+prefix+]')!==false)
-       {
-           $result = preg_replace('@\[\+prefix\+\]([0-9a-zA-Z_]+)@', "`{$dbase}`.`{$prefix}$1`", $str);
-       }
-       else $result = $str;
+        $str = trim($str);
+        $dbase  = trim($this->config['dbase'],'`');
+        $prefix = $this->config['table_prefix'];
+        if(!empty($force))
+        {
+            $result = "`{$dbase}`.`{$prefix}{$str}`";
+        }
+        elseif(strpos($str,'[+prefix+]')!==false)
+        {
+            $result = preg_replace('@\[\+prefix\+\]([0-9a-zA-Z_]+)@', "`{$dbase}`.`{$prefix}$1`", $str);
+        }
+        else $result = $str;
        
-       return $result;
-   }
+        return $result;
+    }
    
-   function optimize($table_name)
-   {
-       $rs = $this->query("OPTIMIZE TABLE {$table_name}");
-       if($rs) $rs = $this->query("ALTER TABLE {$table_name}");
-       return $rs;
-   }
+    function optimize($table_name)
+    {
+        $rs = $this->query("OPTIMIZE TABLE {$table_name}");
+        if($rs) $rs = $this->query("ALTER TABLE {$table_name}");
+        return $rs;
+    }
    
-   function truncate($table_name)
-   {
-       $rs = $this->query("TRUNCATE {$table_name}");
-       return $rs;
-   }
+    function truncate($table_name)
+    {
+        $rs = $this->query("TRUNCATE {$table_name}");
+        return $rs;
+    }
 
-  function dataSeek($result, $row_number) {
+    function dataSeek($result, $row_number) {
     return mysql_data_seek($result, $row_number);
-  }
+    }
   
     function _getFieldsStringFromArray($fields=array()) {
         

manager/includes/extenders/export.class.inc.php

Indentation +213 added lines, -213 removed lines

@@ -1,258 +1,258 @@ 
 <?php
 class EXPORT_SITE
 {
-	var $targetDir;
-	var $generate_mode;
-	var $total;
-	var $count;
-	var $ignore_ids;
-	var $exportstart;
-	var $repl_before;
-	var $repl_after;
-	var $output = array();
+    var $targetDir;
+    var $generate_mode;
+    var $total;
+    var $count;
+    var $ignore_ids;
+    var $exportstart;
+    var $repl_before;
+    var $repl_after;
+    var $output = array();
 	
-	function __construct()
-	{
-		global $modx;
+    function __construct()
+    {
+        global $modx;
 		
-		if(!defined('MODX_BASE_PATH'))  return false;
-		$this->exportstart = $this->get_mtime();
-		$this->count = 0;
-		$this->setUrlMode();
-		$this->dirCheckCount = 0;
-		$this->generate_mode = 'crawl';
-		$this->targetDir = $modx->config['base_path'] . 'temp/export';
-		if(!isset($this->total)) $this->getTotal();
-	}
+        if(!defined('MODX_BASE_PATH'))  return false;
+        $this->exportstart = $this->get_mtime();
+        $this->count = 0;
+        $this->setUrlMode();
+        $this->dirCheckCount = 0;
+        $this->generate_mode = 'crawl';
+        $this->targetDir = $modx->config['base_path'] . 'temp/export';
+        if(!isset($this->total)) $this->getTotal();
+    }
 	
-	function setExportDir($dir)
-	{
-		$dir = str_replace('\\','/',$dir);
-		$dir = rtrim($dir, '/');
-		$this->targetDir = $dir;
-	}
+    function setExportDir($dir)
+    {
+        $dir = str_replace('\\','/',$dir);
+        $dir = rtrim($dir, '/');
+        $this->targetDir = $dir;
+    }
 	
-	function get_mtime()
-	{
-		$mtime = microtime();
-		$mtime = explode(' ', $mtime);
-		$mtime = $mtime[1] + $mtime[0];
-		return $mtime;
-	}
+    function get_mtime()
+    {
+        $mtime = microtime();
+        $mtime = explode(' ', $mtime);
+        $mtime = $mtime[1] + $mtime[0];
+        return $mtime;
+    }
 	
-	function setUrlMode()
-	{
-		global $modx;
+    function setUrlMode()
+    {
+        global $modx;
 		
-		if($modx->config['friendly_urls']==0)
-		{
-			$modx->config['friendly_urls']  = 1;
-			$modx->config['use_alias_path'] = 1;
-			$modx->clearCache('full');
-		}
-		$modx->config['make_folders'] = '1';
-	}
+        if($modx->config['friendly_urls']==0)
+        {
+            $modx->config['friendly_urls']  = 1;
+            $modx->config['use_alias_path'] = 1;
+            $modx->clearCache('full');
+        }
+        $modx->config['make_folders'] = '1';
+    }
 	
-	function getTotal($ignore_ids='', $noncache='0')
-	{
-		global $modx;
-		$tbl_site_content = $modx->getFullTableName('site_content');
+    function getTotal($ignore_ids='', $noncache='0')
+    {
+        global $modx;
+        $tbl_site_content = $modx->getFullTableName('site_content');
 		
-		$ignore_ids = array_filter(array_map('intval', explode(',', $ignore_ids)));
-		if(count($ignore_ids)>0)
-		{
-			$ignore_ids = "AND NOT id IN ('".implode("','", $ignore_ids)."')";
-		} else {
-			$ignore_ids = '';
-		}
+        $ignore_ids = array_filter(array_map('intval', explode(',', $ignore_ids)));
+        if(count($ignore_ids)>0)
+        {
+            $ignore_ids = "AND NOT id IN ('".implode("','", $ignore_ids)."')";
+        } else {
+            $ignore_ids = '';
+        }
 		
-		$this->ignore_ids = $ignore_ids;
+        $this->ignore_ids = $ignore_ids;
 		
-		$noncache = ($noncache == 1) ? '' : 'AND cacheable=1';
-		$where = "deleted=0 AND ((published=1 AND type='document') OR (isfolder=1)) {$noncache} {$ignore_ids}";
-		$rs  = $modx->db->select('count(id)',$tbl_site_content,$where);
-		$this->total = $modx->db->getValue($rs);
-		return $this->total;
-	}
+        $noncache = ($noncache == 1) ? '' : 'AND cacheable=1';
+        $where = "deleted=0 AND ((published=1 AND type='document') OR (isfolder=1)) {$noncache} {$ignore_ids}";
+        $rs  = $modx->db->select('count(id)',$tbl_site_content,$where);
+        $this->total = $modx->db->getValue($rs);
+        return $this->total;
+    }
 	
-	function removeDirectoryAll($directory='')
-	{
-		if(empty($directory)) $directory = $this->targetDir;
-		$directory = rtrim($directory,'/');
-		// if the path is not valid or is not a directory ...
-		if(empty($directory)) return false;
-		if(strpos($directory,MODX_BASE_PATH)===false) return FALSE;
+    function removeDirectoryAll($directory='')
+    {
+        if(empty($directory)) $directory = $this->targetDir;
+        $directory = rtrim($directory,'/');
+        // if the path is not valid or is not a directory ...
+        if(empty($directory)) return false;
+        if(strpos($directory,MODX_BASE_PATH)===false) return FALSE;
 		
-		if(!is_dir($directory))          return FALSE;
-		elseif(!is_readable($directory)) return FALSE;
-		else
-		{
-			$files = glob($directory . '/*');
-			if(!empty($files))
-			{
-    			foreach($files as $path)
-    			{
-    				if(is_dir($path)) $this->removeDirectoryAll($path);
-    				else              $rs = unlink($path);
-    			}
-			}
-		}
-		if($directory !== $this->targetDir) $rs = rmdir($directory);
+        if(!is_dir($directory))          return FALSE;
+        elseif(!is_readable($directory)) return FALSE;
+        else
+        {
+            $files = glob($directory . '/*');
+            if(!empty($files))
+            {
+                foreach($files as $path)
+                {
+                    if(is_dir($path)) $this->removeDirectoryAll($path);
+                    else              $rs = unlink($path);
+                }
+            }
+        }
+        if($directory !== $this->targetDir) $rs = rmdir($directory);
 		
-		return $rs;
-	}
+        return $rs;
+    }
 
-	function makeFile($docid, $filepath)
-	{
-		global  $modx,$_lang;
-		$file_permission = octdec($modx->config['new_file_permissions']);
-		if($this->generate_mode==='direct')
-		{
-			$back_lang = $_lang;
-			$src = $modx->executeParser($docid);
+    function makeFile($docid, $filepath)
+    {
+        global  $modx,$_lang;
+        $file_permission = octdec($modx->config['new_file_permissions']);
+        if($this->generate_mode==='direct')
+        {
+            $back_lang = $_lang;
+            $src = $modx->executeParser($docid);
 			
-			$_lang = $back_lang;
-		}
-		else $src = $this->curl_get_contents(MODX_SITE_URL . "index.php?id={$docid}");
+            $_lang = $back_lang;
+        }
+        else $src = $this->curl_get_contents(MODX_SITE_URL . "index.php?id={$docid}");
 		
 		
-		if($src !== false)
-		{
-			if($this->repl_before!==$this->repl_after) $src = str_replace($this->repl_before,$this->repl_after,$src);
-			$result = file_put_contents($filepath,$src);
-			if($result!==false) @chmod($filepath, $file_permission);
+        if($src !== false)
+        {
+            if($this->repl_before!==$this->repl_after) $src = str_replace($this->repl_before,$this->repl_after,$src);
+            $result = file_put_contents($filepath,$src);
+            if($result!==false) @chmod($filepath, $file_permission);
 			
-			if($result !== false) return 'success';
-			else                  return 'failed_no_write';
-		}
-		else                      return 'failed_no_retrieve';
-	}
+            if($result !== false) return 'success';
+            else                  return 'failed_no_write';
+        }
+        else                      return 'failed_no_retrieve';
+    }
 
-	function getFileName($docid, $alias='', $prefix, $suffix)
-	{
-		global $modx;
+    function getFileName($docid, $alias='', $prefix, $suffix)
+    {
+        global $modx;
 		
-		if($alias==='') $filename = $prefix.$docid.$suffix;
-		else
-		{
-			if($modx->config['suffix_mode']==='1' && strpos($alias, '.')!==false)
-			{
-				$suffix = '';
-			}
-			$filename = $prefix.$alias.$suffix;
-		}
-		return $filename;
-	}
+        if($alias==='') $filename = $prefix.$docid.$suffix;
+        else
+        {
+            if($modx->config['suffix_mode']==='1' && strpos($alias, '.')!==false)
+            {
+                $suffix = '';
+            }
+            $filename = $prefix.$alias.$suffix;
+        }
+        return $filename;
+    }
 
-	function run($parent=0)
-	{
-		global $_lang;
-		global $modx;
+    function run($parent=0)
+    {
+        global $_lang;
+        global $modx;
 		
-		$tbl_site_content = $modx->getFullTableName('site_content');
+        $tbl_site_content = $modx->getFullTableName('site_content');
 		
-		$ignore_ids = $this->ignore_ids;
-		$dirpath = $this->targetDir . '/';
+        $ignore_ids = $this->ignore_ids;
+        $dirpath = $this->targetDir . '/';
 		
-		$prefix = $modx->config['friendly_url_prefix'];
-		$suffix = $modx->config['friendly_url_suffix'];
+        $prefix = $modx->config['friendly_url_prefix'];
+        $suffix = $modx->config['friendly_url_suffix'];
 		
-		$tpl = ' <span class="[+status+]">[+msg1+]</span> [+msg2+]</span>';
-		$ph = array();
+        $tpl = ' <span class="[+status+]">[+msg1+]</span> [+msg2+]</span>';
+        $ph = array();
 		
-		$ph['status'] = 'fail';
-		$ph['msg1']   = $_lang['export_site_failed'];
-		$ph['msg2']   = $_lang["export_site_failed_no_write"] . ' - ' . $dirpath;
-		$msg_failed_no_write    = $this->parsePlaceholder($tpl,$ph);
+        $ph['status'] = 'fail';
+        $ph['msg1']   = $_lang['export_site_failed'];
+        $ph['msg2']   = $_lang["export_site_failed_no_write"] . ' - ' . $dirpath;
+        $msg_failed_no_write    = $this->parsePlaceholder($tpl,$ph);
 		
-		$ph['msg2']   = $_lang["export_site_failed_no_retrieve"];
-		$msg_failed_no_retrieve = $this->parsePlaceholder($tpl,$ph);
+        $ph['msg2']   = $_lang["export_site_failed_no_retrieve"];
+        $msg_failed_no_retrieve = $this->parsePlaceholder($tpl,$ph);
 		
-		$ph['status'] = 'success';
-		$ph['msg1']   = $_lang['export_site_success'];
-		$ph['msg2']   = '';
-		$msg_success            = $this->parsePlaceholder($tpl,$ph);
+        $ph['status'] = 'success';
+        $ph['msg1']   = $_lang['export_site_success'];
+        $ph['msg2']   = '';
+        $msg_success            = $this->parsePlaceholder($tpl,$ph);
 		
-		$ph['msg2']   = $_lang['export_site_success_skip_doc'];
-		$msg_success_skip_doc = $this->parsePlaceholder($tpl,$ph);
+        $ph['msg2']   = $_lang['export_site_success_skip_doc'];
+        $msg_success_skip_doc = $this->parsePlaceholder($tpl,$ph);
 		
-		$ph['msg2']   = $_lang['export_site_success_skip_dir'];
-		$msg_success_skip_dir = $this->parsePlaceholder($tpl,$ph);
+        $ph['msg2']   = $_lang['export_site_success_skip_dir'];
+        $msg_success_skip_dir = $this->parsePlaceholder($tpl,$ph);
 		
-		$fields = "id, alias, pagetitle, isfolder, (content = '' AND template = 0) AS wasNull, published";
-		$noncache = $_POST['includenoncache']==1 ? '' : 'AND cacheable=1';
-		$where = "parent = '{$parent}' AND deleted=0 AND ((published=1 AND type='document') OR (isfolder=1)) {$noncache} {$ignore_ids}";
-		$rs = $modx->db->select($fields,$tbl_site_content,$where);
+        $fields = "id, alias, pagetitle, isfolder, (content = '' AND template = 0) AS wasNull, published";
+        $noncache = $_POST['includenoncache']==1 ? '' : 'AND cacheable=1';
+        $where = "parent = '{$parent}' AND deleted=0 AND ((published=1 AND type='document') OR (isfolder=1)) {$noncache} {$ignore_ids}";
+        $rs = $modx->db->select($fields,$tbl_site_content,$where);
 		
-		$ph = array();
-		$ph['total']     = $this->total;
-		$folder_permission = octdec($modx->config['new_folder_permissions']);
-		while($row = $modx->db->getRow($rs))
-		{
-			$this->count++;
+        $ph = array();
+        $ph['total']     = $this->total;
+        $folder_permission = octdec($modx->config['new_folder_permissions']);
+        while($row = $modx->db->getRow($rs))
+        {
+            $this->count++;
 			
-			$row['count']     = $this->count;
-			$row['url'] = $modx->makeUrl($row['id']);
+            $row['count']     = $this->count;
+            $row['url'] = $modx->makeUrl($row['id']);
 			
-			if (!$row['wasNull'])
-			{ // needs writing a document
-				$docname = $this->getFileName($row['id'], $row['alias'], $prefix, $suffix);
-				$filename = $dirpath.$docname;
-				if (!is_file($filename))
-				{
-					if($row['published']==='1')
-					{
-						$status = $this->makeFile($row['id'], $filename);
-						switch($status)
-						{
-							case 'failed_no_write'   :
+            if (!$row['wasNull'])
+            { // needs writing a document
+                $docname = $this->getFileName($row['id'], $row['alias'], $prefix, $suffix);
+                $filename = $dirpath.$docname;
+                if (!is_file($filename))
+                {
+                    if($row['published']==='1')
+                    {
+                        $status = $this->makeFile($row['id'], $filename);
+                        switch($status)
+                        {
+                            case 'failed_no_write'   :
                                                             $row['status'] = $msg_failed_no_write;
                                                             break;
-							case 'failed_no_retrieve':
+                            case 'failed_no_retrieve':
                                                             $row['status'] = $msg_failed_no_retrieve;
                                                             break;
-							default:
+                            default:
                                                             $row['status'] = $msg_success;
-						}
-					}
-					else $row['status'] = $msg_failed_no_retrieve;
-				}
-				else     $row['status'] = $msg_success_skip_doc;
-				$this->output[] = $this->parsePlaceholder($_lang['export_site_exporting_document'], $row);
-			}
-			else
-			{
-				$row['status'] = $msg_success_skip_dir;
-				$this->output[] = $this->parsePlaceholder($_lang['export_site_exporting_document'], $row);
-			}
-			if ($row['isfolder']==='1' && ($modx->config['suffix_mode']!=='1' || strpos($row['alias'],'.')===false))
-			{ // needs making a folder
-				$end_dir = ($row['alias']!=='') ? $row['alias'] : $row['id'];
-				$dir_path = $dirpath . $end_dir;
-				if(strpos($dir_path,MODX_BASE_PATH)===false) return FALSE;
-				if (!is_dir($dir_path))
-				{
-					if (is_file($dir_path)) @unlink($dir_path);
-					mkdir($dir_path);
-					@chmod($dir_path, $folder_permission);
+                        }
+                    }
+                    else $row['status'] = $msg_failed_no_retrieve;
+                }
+                else     $row['status'] = $msg_success_skip_doc;
+                $this->output[] = $this->parsePlaceholder($_lang['export_site_exporting_document'], $row);
+            }
+            else
+            {
+                $row['status'] = $msg_success_skip_dir;
+                $this->output[] = $this->parsePlaceholder($_lang['export_site_exporting_document'], $row);
+            }
+            if ($row['isfolder']==='1' && ($modx->config['suffix_mode']!=='1' || strpos($row['alias'],'.')===false))
+            { // needs making a folder
+                $end_dir = ($row['alias']!=='') ? $row['alias'] : $row['id'];
+                $dir_path = $dirpath . $end_dir;
+                if(strpos($dir_path,MODX_BASE_PATH)===false) return FALSE;
+                if (!is_dir($dir_path))
+                {
+                    if (is_file($dir_path)) @unlink($dir_path);
+                    mkdir($dir_path);
+                    @chmod($dir_path, $folder_permission);
 					
-				}
+                }
 				
 				
-				if($modx->config['make_folders']==='1' && $row['published']==='1')
-				{
-					if(is_file($filename)) rename($filename,$dir_path . '/index.html');
-				}
-				$this->targetDir = $dir_path;
-				$this->run($row['id']);
-			}
-		}
-		return implode("\n", $this->output);
-	}
+                if($modx->config['make_folders']==='1' && $row['published']==='1')
+                {
+                    if(is_file($filename)) rename($filename,$dir_path . '/index.html');
+                }
+                $this->targetDir = $dir_path;
+                $this->run($row['id']);
+            }
+        }
+        return implode("\n", $this->output);
+    }
 	
     function curl_get_contents($url, $timeout = 30 )
     {
-    	if(!function_exists('curl_init')) return @file_get_contents($url);
+        if(!function_exists('curl_init')) return @file_get_contents($url);
 
         $ch = curl_init();
         curl_setopt($ch, CURLOPT_URL, $url);
@@ -269,12 +269,12 @@ 
 
     function parsePlaceholder($tpl,$ph=array())
     {
-    	foreach($ph as $k=>$v)
-    	{
-    		$k = "[+{$k}+]";
-    		$tpl = str_replace($k,$v,$tpl);
-    	}
-    	return $tpl;
+        foreach($ph as $k=>$v)
+        {
+            $k = "[+{$k}+]";
+            $tpl = str_replace($k,$v,$tpl);
+        }
+        return $tpl;
     }
 
 }

manager/includes/extenders/manager.api.class.inc.php

Indentation +183 added lines, -183 removed lines

@@ -10,215 +10,215 @@
 // Content manager wrapper class
 class ManagerAPI {
 	
-	var $action; // action directive
+    var $action; // action directive
 
-	function __construct(){
-		global $action;
-		$this->action = $action; // set action directive
-	}
+    function __construct(){
+        global $action;
+        $this->action = $action; // set action directive
+    }
 	
-	function initPageViewState($id=0){
-		global $_PAGE;
-		$vsid = isset($_SESSION["mgrPageViewSID"]) ? $_SESSION["mgrPageViewSID"] : '';
-		if($vsid!=$this->action) {
-			$_SESSION["mgrPageViewSDATA"] = array(); // new view state
-			$_SESSION["mgrPageViewSID"] = $id>0 ? $id:$this->action; // set id
-		}
-		$_PAGE['vs'] = &$_SESSION["mgrPageViewSDATA"]; // restore viewstate
-	}
+    function initPageViewState($id=0){
+        global $_PAGE;
+        $vsid = isset($_SESSION["mgrPageViewSID"]) ? $_SESSION["mgrPageViewSID"] : '';
+        if($vsid!=$this->action) {
+            $_SESSION["mgrPageViewSDATA"] = array(); // new view state
+            $_SESSION["mgrPageViewSID"] = $id>0 ? $id:$this->action; // set id
+        }
+        $_PAGE['vs'] = &$_SESSION["mgrPageViewSDATA"]; // restore viewstate
+    }
 
-	// save page view state - not really necessary,
-	function savePageViewState($id=0){
-		global $_PAGE;
-		$_SESSION["mgrPageViewSDATA"] = $_PAGE['vs'];
-		$_SESSION["mgrPageViewSID"] = $id>0 ? $id:$this->action;
-	}
+    // save page view state - not really necessary,
+    function savePageViewState($id=0){
+        global $_PAGE;
+        $_SESSION["mgrPageViewSDATA"] = $_PAGE['vs'];
+        $_SESSION["mgrPageViewSID"] = $id>0 ? $id:$this->action;
+    }
 	
-	// check for saved form
-	function hasFormValues() {
-		if(isset($_SESSION["mgrFormValueId"])) {		
-			if($this->action==$_SESSION["mgrFormValueId"]) {
-				return true;
-			}
-			else {
-				$this->clearSavedFormValues();
-			}
-		}
-		return false;
-	}	
-	// saved form post from $_POST
-	function saveFormValues($id=0){
-		$_SESSION["mgrFormValues"] = $_POST;
-		$_SESSION["mgrFormValueId"] = $id>0 ? $id:$this->action;
-	}		
-	// load saved form values into $_POST
-	function loadFormValues(){
+    // check for saved form
+    function hasFormValues() {
+        if(isset($_SESSION["mgrFormValueId"])) {		
+            if($this->action==$_SESSION["mgrFormValueId"]) {
+                return true;
+            }
+            else {
+                $this->clearSavedFormValues();
+            }
+        }
+        return false;
+    }	
+    // saved form post from $_POST
+    function saveFormValues($id=0){
+        $_SESSION["mgrFormValues"] = $_POST;
+        $_SESSION["mgrFormValueId"] = $id>0 ? $id:$this->action;
+    }		
+    // load saved form values into $_POST
+    function loadFormValues(){
 		
-		if(!$this->hasFormValues()) return false;
+        if(!$this->hasFormValues()) return false;
 		
-		$p = $_SESSION["mgrFormValues"];
-		$this->clearSavedFormValues();
-		foreach($p as $k=>$v) {
-			$_POST[$k]=$v;
-		}
-		return true;
-	}
-	// clear form post
-	function clearSavedFormValues(){
-		unset($_SESSION["mgrFormValues"]);
-		unset($_SESSION["mgrFormValueId"]);	
-	}
+        $p = $_SESSION["mgrFormValues"];
+        $this->clearSavedFormValues();
+        foreach($p as $k=>$v) {
+            $_POST[$k]=$v;
+        }
+        return true;
+    }
+    // clear form post
+    function clearSavedFormValues(){
+        unset($_SESSION["mgrFormValues"]);
+        unset($_SESSION["mgrFormValueId"]);	
+    }
 	
-	function getHashType($db_value='') { // md5 | v1 | phpass
-		$c = substr($db_value,0,1);
-		if($c==='$')                                      return 'phpass';
-		elseif(strlen($db_value)===32)                    return 'md5';
-		elseif($c!=='$' && strpos($db_value,'>')!==false) return 'v1';
-		else                                              return 'unknown';
-	}
+    function getHashType($db_value='') { // md5 | v1 | phpass
+        $c = substr($db_value,0,1);
+        if($c==='$')                                      return 'phpass';
+        elseif(strlen($db_value)===32)                    return 'md5';
+        elseif($c!=='$' && strpos($db_value,'>')!==false) return 'v1';
+        else                                              return 'unknown';
+    }
 	
-	function genV1Hash($password, $seed='1')
-	{ // $seed is user_id basically
-		global $modx;
+    function genV1Hash($password, $seed='1')
+    { // $seed is user_id basically
+        global $modx;
 		
-		if(isset($modx->config['pwd_hash_algo']) && !empty($modx->config['pwd_hash_algo']))
-			$algorithm = $modx->config['pwd_hash_algo'];
-		else $algorithm = 'UNCRYPT';
+        if(isset($modx->config['pwd_hash_algo']) && !empty($modx->config['pwd_hash_algo']))
+            $algorithm = $modx->config['pwd_hash_algo'];
+        else $algorithm = 'UNCRYPT';
 		
-		$salt = md5($password . $seed);
+        $salt = md5($password . $seed);
 		
-		switch($algorithm)
-		{
-			case 'BLOWFISH_Y':
-				$salt = '$2y$07$' . substr($salt,0,22);
-				break;
-			case 'BLOWFISH_A':
-				$salt = '$2a$07$' . substr($salt,0,22);
-				break;
-			case 'SHA512':
-				$salt = '$6$' . substr($salt,0,16);
-				break;
-			case 'SHA256':
-				$salt = '$5$' . substr($salt,0,16);
-				break;
-			case 'MD5':
-				$salt = '$1$' . substr($salt,0,8);
-				break;
-		}
+        switch($algorithm)
+        {
+            case 'BLOWFISH_Y':
+                $salt = '$2y$07$' . substr($salt,0,22);
+                break;
+            case 'BLOWFISH_A':
+                $salt = '$2a$07$' . substr($salt,0,22);
+                break;
+            case 'SHA512':
+                $salt = '$6$' . substr($salt,0,16);
+                break;
+            case 'SHA256':
+                $salt = '$5$' . substr($salt,0,16);
+                break;
+            case 'MD5':
+                $salt = '$1$' . substr($salt,0,8);
+                break;
+        }
 		
-		if($algorithm!=='UNCRYPT')
-		{
-			$password = sha1($password) . crypt($password,$salt);
-		}
-		else $password = sha1($salt.$password);
+        if($algorithm!=='UNCRYPT')
+        {
+            $password = sha1($password) . crypt($password,$salt);
+        }
+        else $password = sha1($salt.$password);
 		
-		$result = strtolower($algorithm) . '>' . md5($salt.$password) . substr(md5($salt),0,8);
+        $result = strtolower($algorithm) . '>' . md5($salt.$password) . substr(md5($salt),0,8);
 		
-		return $result;
-	}
+        return $result;
+    }
 	
-	function getV1UserHashAlgorithm($uid)
-	{
-		global $modx;
-		$tbl_manager_users = $modx->getFullTableName('manager_users');
-		$rs = $modx->db->select('password',$tbl_manager_users,"id='{$uid}'");
-		$password = $modx->db->getValue($rs);
+    function getV1UserHashAlgorithm($uid)
+    {
+        global $modx;
+        $tbl_manager_users = $modx->getFullTableName('manager_users');
+        $rs = $modx->db->select('password',$tbl_manager_users,"id='{$uid}'");
+        $password = $modx->db->getValue($rs);
 		
-		if(strpos($password,'>')===false) $algo = 'NOSALT';
-		else
-		{
-			$algo = substr($password,0,strpos($password,'>'));
-		}
-		return strtoupper($algo);
-	}
+        if(strpos($password,'>')===false) $algo = 'NOSALT';
+        else
+        {
+            $algo = substr($password,0,strpos($password,'>'));
+        }
+        return strtoupper($algo);
+    }
 	
-	function checkHashAlgorithm($algorithm='')
-	{
-		$result = false;
-		if (!empty($algorithm))
-		{
-			switch ($algorithm)
-			{
-				case 'BLOWFISH_Y':
-					if (defined('CRYPT_BLOWFISH') && CRYPT_BLOWFISH == 1)
-					{
-						if (version_compare('5.3.7', PHP_VERSION) <= 0) $result = true;
-					}
-					break;
-				case 'BLOWFISH_A':
-					if (defined('CRYPT_BLOWFISH') && CRYPT_BLOWFISH == 1) $result = true;
-					break;
-				case 'SHA512':
-					if (defined('CRYPT_SHA512') && CRYPT_SHA512 == 1) $result = true;
-					break;
-				case 'SHA256':
-					if (defined('CRYPT_SHA256') && CRYPT_SHA256 == 1) $result = true;
-					break;
-				case 'MD5':
-					if (defined('CRYPT_MD5') && CRYPT_MD5 == 1 && PHP_VERSION != '5.3.7') $result = true;
-					break;
-				case 'UNCRYPT':
-					$result = true;
-					break;
-			}
-		}
-		return $result;
-	}
+    function checkHashAlgorithm($algorithm='')
+    {
+        $result = false;
+        if (!empty($algorithm))
+        {
+            switch ($algorithm)
+            {
+                case 'BLOWFISH_Y':
+                    if (defined('CRYPT_BLOWFISH') && CRYPT_BLOWFISH == 1)
+                    {
+                        if (version_compare('5.3.7', PHP_VERSION) <= 0) $result = true;
+                    }
+                    break;
+                case 'BLOWFISH_A':
+                    if (defined('CRYPT_BLOWFISH') && CRYPT_BLOWFISH == 1) $result = true;
+                    break;
+                case 'SHA512':
+                    if (defined('CRYPT_SHA512') && CRYPT_SHA512 == 1) $result = true;
+                    break;
+                case 'SHA256':
+                    if (defined('CRYPT_SHA256') && CRYPT_SHA256 == 1) $result = true;
+                    break;
+                case 'MD5':
+                    if (defined('CRYPT_MD5') && CRYPT_MD5 == 1 && PHP_VERSION != '5.3.7') $result = true;
+                    break;
+                case 'UNCRYPT':
+                    $result = true;
+                    break;
+            }
+        }
+        return $result;
+    }
 
-	function getSystemChecksum($check_files) {
-		$_ = array();
-		$check_files = trim($check_files);
-		$check_files = explode("\n", $check_files);
-		foreach($check_files as $file) {
-			$file = trim($file);
-			$file = MODX_BASE_PATH . $file;
-			if(!is_file($file)) continue;
-			$_[$file]= md5_file($file);
-		}
-		return serialize($_);
-	}
+    function getSystemChecksum($check_files) {
+        $_ = array();
+        $check_files = trim($check_files);
+        $check_files = explode("\n", $check_files);
+        foreach($check_files as $file) {
+            $file = trim($file);
+            $file = MODX_BASE_PATH . $file;
+            if(!is_file($file)) continue;
+            $_[$file]= md5_file($file);
+        }
+        return serialize($_);
+    }
 
-	function getModifiedSystemFilesList($check_files, $checksum) {
-		$_ = array();
-		$check_files = trim($check_files);
-		$check_files = explode("\n", $check_files);
-		$checksum = unserialize($checksum);
-		foreach($check_files as $file) {
-			$file = trim($file);
-			$filePath = MODX_BASE_PATH . $file;
-			if(!is_file($filePath)) continue;
-			if(md5_file($filePath) != $checksum[$filePath]) $_[] = $file;
-		}
-		return $_;
-	}
+    function getModifiedSystemFilesList($check_files, $checksum) {
+        $_ = array();
+        $check_files = trim($check_files);
+        $check_files = explode("\n", $check_files);
+        $checksum = unserialize($checksum);
+        foreach($check_files as $file) {
+            $file = trim($file);
+            $filePath = MODX_BASE_PATH . $file;
+            if(!is_file($filePath)) continue;
+            if(md5_file($filePath) != $checksum[$filePath]) $_[] = $file;
+        }
+        return $_;
+    }
 
-	function setSystemChecksum($checksum) {
-		global $modx;
-		$tbl_system_settings = $modx->getFullTableName('system_settings');
-		$sql = "REPLACE INTO {$tbl_system_settings} (setting_name, setting_value) VALUES ('sys_files_checksum','" . $modx->db->escape($checksum) . "')";
+    function setSystemChecksum($checksum) {
+        global $modx;
+        $tbl_system_settings = $modx->getFullTableName('system_settings');
+        $sql = "REPLACE INTO {$tbl_system_settings} (setting_name, setting_value) VALUES ('sys_files_checksum','" . $modx->db->escape($checksum) . "')";
         $modx->db->query($sql);
-	}
+    }
 	
-	function checkSystemChecksum() {
-		global $modx;
+    function checkSystemChecksum() {
+        global $modx;
 
-		if(!isset($modx->config['check_files_onlogin']) || empty($modx->config['check_files_onlogin'])) return '0';
+        if(!isset($modx->config['check_files_onlogin']) || empty($modx->config['check_files_onlogin'])) return '0';
 		
-		$current = $this->getSystemChecksum($modx->config['check_files_onlogin']);
-		if(empty($current)) return '0';
+        $current = $this->getSystemChecksum($modx->config['check_files_onlogin']);
+        if(empty($current)) return '0';
 		
-		if(!isset($modx->config['sys_files_checksum']) || empty($modx->config['sys_files_checksum']))
-		{
-			$this->setSystemChecksum($current);
-			return '0';
-		}
-		if($current===$modx->config['sys_files_checksum']) $result = '0';
-		else {
-			$result = $this->getModifiedSystemFilesList($modx->config['check_files_onlogin'], $modx->config['sys_files_checksum']);
-		} 
+        if(!isset($modx->config['sys_files_checksum']) || empty($modx->config['sys_files_checksum']))
+        {
+            $this->setSystemChecksum($current);
+            return '0';
+        }
+        if($current===$modx->config['sys_files_checksum']) $result = '0';
+        else {
+            $result = $this->getModifiedSystemFilesList($modx->config['check_files_onlogin'], $modx->config['sys_files_checksum']);
+        } 
 
-		return $result;
-	}
+        return $result;
+    }
 
     function getLastUserSetting($key=false) {
         global $modx;

manager/includes/extenders/phpcompat.class.inc.php

Indentation +16 added lines, -16 removed lines

@@ -2,26 +2,26 @@
 // todo file_put_contents(), strftime(), mb_*()
 class PHPCOMPAT
 {
-	function __construct()
-	{
-	}
+    function __construct()
+    {
+    }
 	
-	function htmlspecialchars($str='', $flags = ENT_COMPAT, $encode='')
-	{
-		global $modx;
+    function htmlspecialchars($str='', $flags = ENT_COMPAT, $encode='')
+    {
+        global $modx;
 		
-		if($str=='') return '';
+        if($str=='') return '';
 		
-		if($encode=='') $encode = $modx->config['modx_charset'];
+        if($encode=='') $encode = $modx->config['modx_charset'];
 		
-		$ent_str = htmlspecialchars($str, $flags, $encode);
+        $ent_str = htmlspecialchars($str, $flags, $encode);
 		
-		if(!empty($str) && empty($ent_str))
-		{
-			$detect_order = implode(',', mb_detect_order());
-			$ent_str = mb_convert_encoding($str, $encode, $detect_order); 
-		}
+        if(!empty($str) && empty($ent_str))
+        {
+            $detect_order = implode(',', mb_detect_order());
+            $ent_str = mb_convert_encoding($str, $encode, $detect_order); 
+        }
 		
-		return $ent_str;
-	}
+        return $ent_str;
+    }
 }

manager/includes/extenders/modifiers.class.inc.php

Indentation +2 added lines, -2 removed lines

@@ -598,7 +598,7 @@ 
                     else               $opt = true;
                 }
                 elseif(isset($modx->config['mce_element_format'])&&$modx->config['mce_element_format']==='html')
-                                       $opt = false;
+                                        $opt = false;
                 else                   $opt = true;
                 return nl2br($value,$opt);
             case 'ltrim':
@@ -1022,7 +1022,7 @@ 
         {
             $bt = $content;
             if(strpos($content,'[*')!==false && $modx->documentIdentifier)
-                                              $content = $modx->mergeDocumentContent($content);
+                                                $content = $modx->mergeDocumentContent($content);
             if(strpos($content,'[(')!==false) $content = $modx->mergeSettingsContent($content);
             if(strpos($content,'{{')!==false) $content = $modx->mergeChunkContent($content);
             if(strpos($content,'[!')!==false) $content = str_replace(array('[!','!]'),array('[[',']]'),$content);

install/actions/action_summary.php

Indentation +2 added lines, -2 removed lines

@@ -248,9 +248,9 @@
         echo '<span class="notok">' . $_lang['failed'] . '</span></b>' . $_lang['table_prefix_not_exist'] . '</p>';
         $errors++;
         echo '<p>' . $_lang['table_prefix_not_exist_note'] . '</p>';
-  } else {
+    } else {
         echo '<span class="ok">' . $_lang['ok'] . '</span></p>';
-  }
+    }
 }
 
 // check mysql version

manager/includes/user_settings.inc.php

Indentation +13 added lines, -13 removed lines

@@ -3,23 +3,23 @@
 
 // START HACK
 if (isset ($modx)) {
-	$user_id = $modx->getLoginUserID();
+    $user_id = $modx->getLoginUserID();
 } else {
-	$user_id = $_SESSION['mgrInternalKey'];
+    $user_id = $_SESSION['mgrInternalKey'];
 }
 // END HACK
 
 if (!empty($user_id)) {
-	// Raymond: grab the user settings from the database.
-	$rs = $modx->db->select('setting_name, setting_value', $modx->getFullTableName('user_settings'), "user=".$modx->getLoginUserID());
+    // Raymond: grab the user settings from the database.
+    $rs = $modx->db->select('setting_name, setting_value', $modx->getFullTableName('user_settings'), "user=".$modx->getLoginUserID());
 
-	$which_browser_default = $which_browser;
-	while ($row = $modx->db->getRow($rs)) {
-		if($row['setting_name'] == 'which_browser' && $row['setting_value'] == 'default') $row['setting_value'] = $which_browser_default;
-		$settings[$row['setting_name']] = $row['setting_value'];
-		if (isset($modx->config)) {
-			$modx->config[$row['setting_name']] = $row['setting_value'];
-		}
-	}
-	extract($settings, EXTR_OVERWRITE);
+    $which_browser_default = $which_browser;
+    while ($row = $modx->db->getRow($rs)) {
+        if($row['setting_name'] == 'which_browser' && $row['setting_value'] == 'default') $row['setting_value'] = $which_browser_default;
+        $settings[$row['setting_name']] = $row['setting_value'];
+        if (isset($modx->config)) {
+            $modx->config[$row['setting_name']] = $row['setting_value'];
+        }
+    }
+    extract($settings, EXTR_OVERWRITE);
 }

manager/includes/rss.inc.php

Indentation +32 added lines, -32 removed lines

@@ -1,5 +1,5 @@ 
 <?php
- /*
+    /*
  *  MODX Manager Home Page Implmentation by pixelchutes (www.pixelchutes.com)
  *  Based on kudo's kRSS Module v1.0.72
  *
@@ -30,43 +30,43 @@ 
 require_once(MODX_MANAGER_PATH.'media/rss/rss_fetch.inc');
 // Convert relative path into absolute url
 function rel2abs( $rel, $base ) {
-	// parse base URL  and convert to local variables: $scheme, $host,  $path
-	extract( parse_url( $base ) );
-	if ( strpos( $rel,"//" ) === 0 ) {
-		return $scheme . ':' . $rel;
-	}
-	// return if already absolute URL
-	if ( parse_url( $rel, PHP_URL_SCHEME ) != '' ) {
-		return $rel;
-	}
-	// queries and anchors
-	if ( $rel[0] == '#' || $rel[0] == '?' ) {
-		return $base . $rel;
-	}
-	// remove non-directory element from path
-	$path = preg_replace( '#/[^/]*$#', '', $path );
-	// destroy path if relative url points to root
-	if ( $rel[0] ==  '/' ) {
-		$path = '';
-	}
-	// dirty absolute URL
-	$abs = $host . $path . "/" . $rel;
-	// replace '//' or  '/./' or '/foo/../' with '/'
-	$abs = preg_replace( "/(\/\.?\/)/", "/", $abs );
-	$abs = preg_replace( "/\/(?!\.\.)[^\/]+\/\.\.\//", "/", $abs );
-	// absolute URL is ready!
-	return $scheme . '://' . $abs;
+    // parse base URL  and convert to local variables: $scheme, $host,  $path
+    extract( parse_url( $base ) );
+    if ( strpos( $rel,"//" ) === 0 ) {
+        return $scheme . ':' . $rel;
+    }
+    // return if already absolute URL
+    if ( parse_url( $rel, PHP_URL_SCHEME ) != '' ) {
+        return $rel;
+    }
+    // queries and anchors
+    if ( $rel[0] == '#' || $rel[0] == '?' ) {
+        return $base . $rel;
+    }
+    // remove non-directory element from path
+    $path = preg_replace( '#/[^/]*$#', '', $path );
+    // destroy path if relative url points to root
+    if ( $rel[0] ==  '/' ) {
+        $path = '';
+    }
+    // dirty absolute URL
+    $abs = $host . $path . "/" . $rel;
+    // replace '//' or  '/./' or '/foo/../' with '/'
+    $abs = preg_replace( "/(\/\.?\/)/", "/", $abs );
+    $abs = preg_replace( "/\/(?!\.\.)[^\/]+\/\.\.\//", "/", $abs );
+    // absolute URL is ready!
+    return $scheme . '://' . $abs;
 }
 $feedData = array();
 
 // create Feed
 foreach ($urls as $section=>$url) {
-	$output = '';
+    $output = '';
     $rss = @fetch_rss($url);
     if( !$rss ){
-    	$feedData[$section] = 'Failed to retrieve ' . $url;
-    	continue;
-	}
+        $feedData[$section] = 'Failed to retrieve ' . $url;
+        continue;
+    }
     $output .= '<ul>';
 
     $items = array_slice($rss->items, 0, $itemsNumber);
@@ -84,5 +84,5 @@ 
     }
 
     $output .= '</ul>';
-	$feedData[$section] = $output;
+    $feedData[$section] = $output;
 }

manager/includes/extenders/maketable.class.php

Indentation +494 added lines, -494 removed lines

@@ -9,366 +9,366 @@ 
  * @author Jason Coward <jason@opengeek.com> (MODX)
  */
 class MakeTable {
-	var $actionField;
-	var $cellAction;
-	var $linkAction;
-	var $tableWidth;
-	var $tableClass;
-	var $tableID;
-	var $thClass;
-	var $rowHeaderClass;
-	var $columnHeaderClass;
-	var $rowRegularClass;
-	var $rowAlternateClass;
-	var $formName;
-	var $formAction;
-	var $formElementType;
-	var $formElementName;
-	var $rowAlternatingScheme;
-	var $excludeFields;
-	var $allOption;
-	var $pageNav;
-	var $columnWidths;
-	var $selectedValues;
-
-	function __construct() {
-		$this->fieldHeaders= array();
-		$this->excludeFields= array();
-		$this->actionField= '';
-		$this->cellAction= '';
-		$this->linkAction= '';
-		$this->tableWidth= '';
-		$this->tableClass= '';
-		$this->rowHeaderClass= '';
-		$this->columnHeaderClass= '';
-		$this->rowRegularClass= '';
-		$this->rowAlternateClass= 'alt';
-		$this->formName= 'tableForm';
-		$this->formAction= '[~[*id*]~]';
-		$this->formElementName= '';
-		$this->formElementType= '';
-		$this->rowAlternatingScheme= 'EVEN';
-		$this->allOption= 0;
-		$this->selectedValues= array();
-		$this->extra= '';
-	}
-
-	/**
-	 * Sets the default link href for all cells in the table.
-	 *
-	 * @param $value A URL to execute when table cells are clicked.
-	 */
-	function setCellAction($value) {
-		$this->cellAction= $this->prepareLink($value);
-	}
-
-	/**
-	 * Sets the default link href for the text presented in a cell.
-	 *
-	 * @param $value A URL to execute when text within table cells are clicked.
-	 */
-	function setLinkAction($value) {
-		$this->linkAction= $this->prepareLink($value);
-	}
-
-	/**
-	 * Sets the width attribute of the main HTML TABLE.
-	 *
-	 * @param $value A valid width attribute for the HTML TABLE tag
-	 */
-	function setTableWidth($value) {
-		$this->tableWidth= $value;
-	}
-
-	/**
-	 * Sets the class attribute of the main HTML TABLE.
-	 *
-	 * @param $value A class for the main HTML TABLE.
-	 */
-	function setTableClass($value) {
-		$this->tableClass= $value;
-	}
-
-	/**
-	 * Sets the id attribute of the main HTML TABLE.
-	 *
-	 * @param $value A class for the main HTML TABLE.
-	 */
-	function setTableID($value) {
-		$this->tableID= $value;
-	}
-
-	/**
-	 * Sets the class attribute of the table header row.
-	 *
-	 * @param $value A class for the table header row.
-	 */
-	function setRowHeaderClass($value) {
-		$this->rowHeaderClass= $value;
-	}
-
-		/**
-	 * Sets the class attribute of the table header row.
-	 *
-	 * @param $value A class for the table header row.
-	 */
-	function setThHeaderClass($value) {
-		$this->thClass= $value;
-	}
-
-	/**
-	 * Sets the class attribute of the column header row.
-	 *
-	 * @param $value A class for the column header row.
-	 */
-	function setColumnHeaderClass($value) {
-		$this->columnHeaderClass= $value;
-	}
-
-	/**
-	 * Sets the class attribute of regular table rows.
-	 *
-	 * @param $value A class for regular table rows.
-	 */
-	function setRowRegularClass($value) {
-		$this->rowRegularClass= $value;
-	}
-
-	/**
-	 * Sets the class attribute of alternate table rows.
-	 *
-	 * @param $value A class for alternate table rows.
-	 */
-	function setRowAlternateClass($value) {
-		$this->rowAlternateClass= $value;
-	}
-
-	/**
-	 * Sets the type of INPUT form element to be presented as the first column.
-	 *
-	 * @param $value Indicates the INPUT form element type attribute.
-	 */
-	function setFormElementType($value) {
-		$this->formElementType= $value;
-	}
-
-	/**
-	 * Sets the name of the INPUT form element to be presented as the first column.
-	 *
-	 * @param $value Indicates the INPUT form element name attribute.
-	 */
-	function setFormElementName($value) {
-		$this->formElementName= $value;
-	}
-
-	/**
-	 * Sets the name of the FORM to wrap the table in when a form element has
-	 * been indicated.
-	 *
-	 * @param $value Indicates the FORM name attribute.
-	 */
-	function setFormName($value) {
-		$this->formName= $value;
-	}
-
-	/**
-	 * Sets the action of the FORM element.
-	 *
-	 * @param $value Indicates the FORM action attribute.
-	 */
-	function setFormAction($value) {
-		$this->formAction= $value;
-	}
-
-	/**
-	 * Excludes fields from the table by array key.
-	 *
-	 * @param $value An Array of field keys to exclude from the table.
-	 */
-	function setExcludeFields($value) {
-		$this->excludeFields= $value;
-	}
-
-	/**
-	 * Sets the table to provide alternate row colors using ODD or EVEN rows
-	 *
-	 * @param $value 'ODD' or 'EVEN' to indicate the alternate row scheme.
-	 */
-	function setRowAlternatingScheme($value) {
-		$this->rowAlternatingScheme= $value;
-	}
-
-	/**
-	 * Sets the default field value to be used when appending query parameters
-	 * to link actions.
-	 *
-	 * @param $value The key of the field to add as a query string parameter.
-	 */
-	function setActionFieldName($value) {
-		$this->actionField= $value;
-	}
-
-	/**
-	 * Sets the width attribute of each column in the array.
-	 *
-	 * @param $value An Array of column widths in the order of the keys in the
-	 * 			source table array.
-	 */
-	function setColumnWidths($widthArray) {
-		$this->columnWidths= $widthArray;
-	}
-
-	/**
-	 * An optional array of values that can be preselected when using
-	 *
-	 * @param $value Indicates the INPUT form element type attribute.
-	 */
-	function setSelectedValues($valueArray) {
-		$this->selectedValues= $valueArray;
-	}
-
-	/**
-	 * Sets extra content to be presented following the table (but within
-	 * the form, if a form is being rendered with the table).
-	 *
-	 * @param $value A string of additional content.
-	 */
-	function setExtra($value) {
-		$this->extra= $value;
-	}
-
-	/**
-	 * Retrieves the width of a specific table column by index position.
-	 *
-	 * @param $columnPosition The index of the column to get the width for.
-	 */
-	function getColumnWidth($columnPosition) {
-		$currentWidth= '';
-		if (is_array($this->columnWidths)) {
-			$currentWidth= $this->columnWidths[$columnPosition] ? ' width="'.$this->columnWidths[$columnPosition].'" ' : '';
-		}
-		return $currentWidth;
-	}
-
-	/**
-	 * Determines what class the current row should have applied.
-	 *
-	 * @param $value The position of the current row being rendered.
-	 */
-	function determineRowClass($position) {
-		switch ($this->rowAlternatingScheme) {
-			case 'ODD' :
-				$modRemainder= 1;
-				break;
-			case 'EVEN' :
-				$modRemainder= 0;
-				break;
-		}
-		if ($position % 2 == $modRemainder) {
-			$currentClass= $this->rowRegularClass;
-		} else {
-			$currentClass= $this->rowAlternateClass;
-		}
-		return ' class="'.$currentClass.'"';
-	}
-
-	/**
-	 * Generates an onclick action applied to the current cell, to execute
-	 * any specified cell actions.
-	 *
-	 * @param $value Indicates the INPUT form element type attribute.
-	 */
-	function getCellAction($currentActionFieldValue) {
-		if ($this->cellAction) {
-			$cellAction= ' onClick="javascript:window.location=\''.$this->cellAction.$this->actionField.'='.urlencode($currentActionFieldValue).'\'" ';
-		}
-		return $cellAction;
-	}
-
-	/**
-	 * Generates the cell content, including any specified action fields values.
-	 *
-	 * @param $currentActionFieldValue The value to be applied to the link action.
-	 * @param $value The value of the cell.
-	 */
-	function createCellText($currentActionFieldValue, $value) {
-		$cell .= $value;
-		if ($this->linkAction) {
-			$cell= '<a href="'.$this->linkAction.$this->actionField.'='.urlencode($currentActionFieldValue).'">'.$cell.'</a>';
-		}
-		return $cell;
-	}
-
-	/**
-	 * Sets an option to generate a check all link when checkbox is indicated
-	 * as the table formElementType.
-	 */
-	function setAllOption() {
-		$this->allOption= 1;
-	}
-
-	/**
-	 * Function to prepare a link generated in the table cell/link actions.
-	 *
-	 * @param $value Indicates the INPUT form element type attribute.
-	 */
-	function prepareLink($link) {
-		if (strstr($link, '?')) {
-			$end= '&';
-		} else {
-			$end= '?';
-		}
-		return $link.$end;
-	}
-
-	/**
-	 * Generates the table content.
-	 *
-	 * @param $fieldsArray The associative array representing the table rows
-	 * and columns.
-	 * @param $fieldHeadersArray An optional array of values for providing
-	 * alternative field headers; this is an associative arrays of keys from
-	 * the $fieldsArray where the values represent the alt heading content
-	 * for each column.
-	 */
-	function create($fieldsArray, $fieldHeadersArray=array(),$linkpage="") {
-	global $_lang;
-		if (is_array($fieldsArray)) {
-			$i= 0;
-			foreach ($fieldsArray as $fieldName => $fieldValue) {
-				$table .= "\t<tr".$this->determineRowClass($i).">\n";
-				$currentActionFieldValue= $fieldValue[$this->actionField];
-				if (is_array($this->selectedValues)) {
-					$isChecked= array_search($currentActionFieldValue, $this->selectedValues)===false? 0 : 1;
-				} else {
-					$isChecked= false;
-				}
-				$table .= $this->addFormField($currentActionFieldValue, $isChecked);
-				$colPosition= 0;
-				foreach ($fieldValue as $key => $value) {
-					if (!in_array($key, $this->excludeFields)) {
-						$table .= "\t\t<td".$this->getCellAction($currentActionFieldValue).">";
-						$table .= $this->createCellText($currentActionFieldValue, $value);
-						$table .= "</td>\n";
-						if ($i == 0) {
-							if (empty ($header) && $this->formElementType) {
-								$header .= "\t\t<th style=\"width:32px\" ".($this->thClass ? 'class="'.$this->thClass.'"' : '').">". ($this->allOption ? '<a href="javascript:clickAll()">all</a>' : '')."</th>\n";
-							}
-							$headerText= array_key_exists($key, $fieldHeadersArray)? $fieldHeadersArray[$key]: $key;
-							$header .= "\t\t<th".$this->getColumnWidth($colPosition).($this->thClass ? ' class="'.$this->thClass.'" ' : '').">".$headerText."</th>\n";
-						}
-						$colPosition ++;
-					}
-				}
-				$i ++;
-				$table .= "\t</tr>\n";
-			}
-			$table= "\n".'<table'. ($this->tableWidth ? ' width="'.$this->tableWidth.'"' : ''). ($this->tableClass ? ' class="'.$this->tableClass.'"' : ''). ($this->tableID ? ' id="'.$this->tableID.'"' : '').">\n". ($header ? "\t<thead>\n\t<tr class=\"".$this->rowHeaderClass."\">\n".$header."\t</tr>\n\t</thead>\n" : '').$table."</table>\n";
-			if ($this->formElementType) {
-				$table= "\n".'<form id="'.$this->formName.'" name="'.$this->formName.'" action="'.$this->formAction.'" method="POST">'.$table;
-			}
-			if (strlen($this->pageNav) > 1) {//changed to display the pagination if exists.
-				/* commented this part because of cookie
+    var $actionField;
+    var $cellAction;
+    var $linkAction;
+    var $tableWidth;
+    var $tableClass;
+    var $tableID;
+    var $thClass;
+    var $rowHeaderClass;
+    var $columnHeaderClass;
+    var $rowRegularClass;
+    var $rowAlternateClass;
+    var $formName;
+    var $formAction;
+    var $formElementType;
+    var $formElementName;
+    var $rowAlternatingScheme;
+    var $excludeFields;
+    var $allOption;
+    var $pageNav;
+    var $columnWidths;
+    var $selectedValues;
+
+    function __construct() {
+        $this->fieldHeaders= array();
+        $this->excludeFields= array();
+        $this->actionField= '';
+        $this->cellAction= '';
+        $this->linkAction= '';
+        $this->tableWidth= '';
+        $this->tableClass= '';
+        $this->rowHeaderClass= '';
+        $this->columnHeaderClass= '';
+        $this->rowRegularClass= '';
+        $this->rowAlternateClass= 'alt';
+        $this->formName= 'tableForm';
+        $this->formAction= '[~[*id*]~]';
+        $this->formElementName= '';
+        $this->formElementType= '';
+        $this->rowAlternatingScheme= 'EVEN';
+        $this->allOption= 0;
+        $this->selectedValues= array();
+        $this->extra= '';
+    }
+
+    /**
+     * Sets the default link href for all cells in the table.
+     *
+     * @param $value A URL to execute when table cells are clicked.
+     */
+    function setCellAction($value) {
+        $this->cellAction= $this->prepareLink($value);
+    }
+
+    /**
+     * Sets the default link href for the text presented in a cell.
+     *
+     * @param $value A URL to execute when text within table cells are clicked.
+     */
+    function setLinkAction($value) {
+        $this->linkAction= $this->prepareLink($value);
+    }
+
+    /**
+     * Sets the width attribute of the main HTML TABLE.
+     *
+     * @param $value A valid width attribute for the HTML TABLE tag
+     */
+    function setTableWidth($value) {
+        $this->tableWidth= $value;
+    }
+
+    /**
+     * Sets the class attribute of the main HTML TABLE.
+     *
+     * @param $value A class for the main HTML TABLE.
+     */
+    function setTableClass($value) {
+        $this->tableClass= $value;
+    }
+
+    /**
+     * Sets the id attribute of the main HTML TABLE.
+     *
+     * @param $value A class for the main HTML TABLE.
+     */
+    function setTableID($value) {
+        $this->tableID= $value;
+    }
+
+    /**
+     * Sets the class attribute of the table header row.
+     *
+     * @param $value A class for the table header row.
+     */
+    function setRowHeaderClass($value) {
+        $this->rowHeaderClass= $value;
+    }
+
+        /**
+         * Sets the class attribute of the table header row.
+         *
+         * @param $value A class for the table header row.
+         */
+    function setThHeaderClass($value) {
+        $this->thClass= $value;
+    }
+
+    /**
+     * Sets the class attribute of the column header row.
+     *
+     * @param $value A class for the column header row.
+     */
+    function setColumnHeaderClass($value) {
+        $this->columnHeaderClass= $value;
+    }
+
+    /**
+     * Sets the class attribute of regular table rows.
+     *
+     * @param $value A class for regular table rows.
+     */
+    function setRowRegularClass($value) {
+        $this->rowRegularClass= $value;
+    }
+
+    /**
+     * Sets the class attribute of alternate table rows.
+     *
+     * @param $value A class for alternate table rows.
+     */
+    function setRowAlternateClass($value) {
+        $this->rowAlternateClass= $value;
+    }
+
+    /**
+     * Sets the type of INPUT form element to be presented as the first column.
+     *
+     * @param $value Indicates the INPUT form element type attribute.
+     */
+    function setFormElementType($value) {
+        $this->formElementType= $value;
+    }
+
+    /**
+     * Sets the name of the INPUT form element to be presented as the first column.
+     *
+     * @param $value Indicates the INPUT form element name attribute.
+     */
+    function setFormElementName($value) {
+        $this->formElementName= $value;
+    }
+
+    /**
+     * Sets the name of the FORM to wrap the table in when a form element has
+     * been indicated.
+     *
+     * @param $value Indicates the FORM name attribute.
+     */
+    function setFormName($value) {
+        $this->formName= $value;
+    }
+
+    /**
+     * Sets the action of the FORM element.
+     *
+     * @param $value Indicates the FORM action attribute.
+     */
+    function setFormAction($value) {
+        $this->formAction= $value;
+    }
+
+    /**
+     * Excludes fields from the table by array key.
+     *
+     * @param $value An Array of field keys to exclude from the table.
+     */
+    function setExcludeFields($value) {
+        $this->excludeFields= $value;
+    }
+
+    /**
+     * Sets the table to provide alternate row colors using ODD or EVEN rows
+     *
+     * @param $value 'ODD' or 'EVEN' to indicate the alternate row scheme.
+     */
+    function setRowAlternatingScheme($value) {
+        $this->rowAlternatingScheme= $value;
+    }
+
+    /**
+     * Sets the default field value to be used when appending query parameters
+     * to link actions.
+     *
+     * @param $value The key of the field to add as a query string parameter.
+     */
+    function setActionFieldName($value) {
+        $this->actionField= $value;
+    }
+
+    /**
+     * Sets the width attribute of each column in the array.
+     *
+     * @param $value An Array of column widths in the order of the keys in the
+     * 			source table array.
+     */
+    function setColumnWidths($widthArray) {
+        $this->columnWidths= $widthArray;
+    }
+
+    /**
+     * An optional array of values that can be preselected when using
+     *
+     * @param $value Indicates the INPUT form element type attribute.
+     */
+    function setSelectedValues($valueArray) {
+        $this->selectedValues= $valueArray;
+    }
+
+    /**
+     * Sets extra content to be presented following the table (but within
+     * the form, if a form is being rendered with the table).
+     *
+     * @param $value A string of additional content.
+     */
+    function setExtra($value) {
+        $this->extra= $value;
+    }
+
+    /**
+     * Retrieves the width of a specific table column by index position.
+     *
+     * @param $columnPosition The index of the column to get the width for.
+     */
+    function getColumnWidth($columnPosition) {
+        $currentWidth= '';
+        if (is_array($this->columnWidths)) {
+            $currentWidth= $this->columnWidths[$columnPosition] ? ' width="'.$this->columnWidths[$columnPosition].'" ' : '';
+        }
+        return $currentWidth;
+    }
+
+    /**
+     * Determines what class the current row should have applied.
+     *
+     * @param $value The position of the current row being rendered.
+     */
+    function determineRowClass($position) {
+        switch ($this->rowAlternatingScheme) {
+            case 'ODD' :
+                $modRemainder= 1;
+                break;
+            case 'EVEN' :
+                $modRemainder= 0;
+                break;
+        }
+        if ($position % 2 == $modRemainder) {
+            $currentClass= $this->rowRegularClass;
+        } else {
+            $currentClass= $this->rowAlternateClass;
+        }
+        return ' class="'.$currentClass.'"';
+    }
+
+    /**
+     * Generates an onclick action applied to the current cell, to execute
+     * any specified cell actions.
+     *
+     * @param $value Indicates the INPUT form element type attribute.
+     */
+    function getCellAction($currentActionFieldValue) {
+        if ($this->cellAction) {
+            $cellAction= ' onClick="javascript:window.location=\''.$this->cellAction.$this->actionField.'='.urlencode($currentActionFieldValue).'\'" ';
+        }
+        return $cellAction;
+    }
+
+    /**
+     * Generates the cell content, including any specified action fields values.
+     *
+     * @param $currentActionFieldValue The value to be applied to the link action.
+     * @param $value The value of the cell.
+     */
+    function createCellText($currentActionFieldValue, $value) {
+        $cell .= $value;
+        if ($this->linkAction) {
+            $cell= '<a href="'.$this->linkAction.$this->actionField.'='.urlencode($currentActionFieldValue).'">'.$cell.'</a>';
+        }
+        return $cell;
+    }
+
+    /**
+     * Sets an option to generate a check all link when checkbox is indicated
+     * as the table formElementType.
+     */
+    function setAllOption() {
+        $this->allOption= 1;
+    }
+
+    /**
+     * Function to prepare a link generated in the table cell/link actions.
+     *
+     * @param $value Indicates the INPUT form element type attribute.
+     */
+    function prepareLink($link) {
+        if (strstr($link, '?')) {
+            $end= '&';
+        } else {
+            $end= '?';
+        }
+        return $link.$end;
+    }
+
+    /**
+     * Generates the table content.
+     *
+     * @param $fieldsArray The associative array representing the table rows
+     * and columns.
+     * @param $fieldHeadersArray An optional array of values for providing
+     * alternative field headers; this is an associative arrays of keys from
+     * the $fieldsArray where the values represent the alt heading content
+     * for each column.
+     */
+    function create($fieldsArray, $fieldHeadersArray=array(),$linkpage="") {
+    global $_lang;
+        if (is_array($fieldsArray)) {
+            $i= 0;
+            foreach ($fieldsArray as $fieldName => $fieldValue) {
+                $table .= "\t<tr".$this->determineRowClass($i).">\n";
+                $currentActionFieldValue= $fieldValue[$this->actionField];
+                if (is_array($this->selectedValues)) {
+                    $isChecked= array_search($currentActionFieldValue, $this->selectedValues)===false? 0 : 1;
+                } else {
+                    $isChecked= false;
+                }
+                $table .= $this->addFormField($currentActionFieldValue, $isChecked);
+                $colPosition= 0;
+                foreach ($fieldValue as $key => $value) {
+                    if (!in_array($key, $this->excludeFields)) {
+                        $table .= "\t\t<td".$this->getCellAction($currentActionFieldValue).">";
+                        $table .= $this->createCellText($currentActionFieldValue, $value);
+                        $table .= "</td>\n";
+                        if ($i == 0) {
+                            if (empty ($header) && $this->formElementType) {
+                                $header .= "\t\t<th style=\"width:32px\" ".($this->thClass ? 'class="'.$this->thClass.'"' : '').">". ($this->allOption ? '<a href="javascript:clickAll()">all</a>' : '')."</th>\n";
+                            }
+                            $headerText= array_key_exists($key, $fieldHeadersArray)? $fieldHeadersArray[$key]: $key;
+                            $header .= "\t\t<th".$this->getColumnWidth($colPosition).($this->thClass ? ' class="'.$this->thClass.'" ' : '').">".$headerText."</th>\n";
+                        }
+                        $colPosition ++;
+                    }
+                }
+                $i ++;
+                $table .= "\t</tr>\n";
+            }
+            $table= "\n".'<table'. ($this->tableWidth ? ' width="'.$this->tableWidth.'"' : ''). ($this->tableClass ? ' class="'.$this->tableClass.'"' : ''). ($this->tableID ? ' id="'.$this->tableID.'"' : '').">\n". ($header ? "\t<thead>\n\t<tr class=\"".$this->rowHeaderClass."\">\n".$header."\t</tr>\n\t</thead>\n" : '').$table."</table>\n";
+            if ($this->formElementType) {
+                $table= "\n".'<form id="'.$this->formName.'" name="'.$this->formName.'" action="'.$this->formAction.'" method="POST">'.$table;
+            }
+            if (strlen($this->pageNav) > 1) {//changed to display the pagination if exists.
+                /* commented this part because of cookie
 				$table .= '<div id="max-display-records" ><select style="display:inline" onchange="javascript:updatePageSize(this[this.selectedIndex].value);">';
 				$pageSizes= array (10, 25, 50, 100, 250);
 				for ($i= 0; $i < count($pageSizes); $i ++) {
@@ -379,12 +379,12 @@ 
 
 				$table .= '</select>'.$_lang["pagination_table_perpage"].'</div>';
 				*/
-				$table .= '<div id="pagination" class="paginate">'.$_lang["pagination_table_gotopage"].'<ul>'.$this->pageNav.'</ul></div>';
-				//$table .= '<script language="javascript">function updatePageSize(size){window.location = \''.$this->prepareLink($linkpage).'pageSize=\'+size;}</script>';
+                $table .= '<div id="pagination" class="paginate">'.$_lang["pagination_table_gotopage"].'<ul>'.$this->pageNav.'</ul></div>';
+                //$table .= '<script language="javascript">function updatePageSize(size){window.location = \''.$this->prepareLink($linkpage).'pageSize=\'+size;}</script>';
 
-			}
-			if ($this->allOption) {
-				$table .= '
+            }
+            if ($this->allOption) {
+                $table .= '
 <script language="javascript">
 	toggled = 0;
 	function clickAll() {
@@ -397,134 +397,134 @@ 
 		toggled = (toggled?0:1);
 	}
 </script>';
-			}
-			if ($this->formElementType) {
-				if ($this->extra) {
-					$table.= "\n".$this->extra."\n";
-				}
-				$table.= "\n".'</form>'."\n";
-			}
-			return $table;
-		}
-	}
-
-	/**
-	 * Generates optional paging navigation controls for the table.
-	 *
-	 * @param $numRecords The number of records to show per page.
-	 * @param $qs An optional query string to be appended to the paging links
-	 */
-	function createPagingNavigation($numRecords, $qs='') {
-		global $_lang;
-		$currentPage= (is_numeric($_GET['page']) ? $_GET['page'] : 1);
-		$numPages= ceil($numRecords / MAX_DISPLAY_RECORDS_NUM);
-		if ($numPages > 1) {
-			$currentURL= empty($qs)? '': '?'.$qs;
-			if ($currentPage > 6) {
-				$nav .= $this->createPageLink($currentURL, 1, $_lang["pagination_table_first"]);
-			}
-			if ($currentPage != 1) {
-				$nav .= $this->createPageLink($currentURL, $currentPage -1, '&lt;&lt;');
-			}
-			$offset= -4 + ($currentPage < 5 ? (5 - $currentPage) : 0);
-			$i= 1;
-			while ($i < 10 && ($currentPage + $offset <= $numPages)) {
-				if ($currentPage == $currentPage + $offset)
-					$nav .= $this->createPageLink($currentURL, $currentPage + $offset, $currentPage + $offset, true);
-				else
-					$nav .= $this->createPageLink($currentURL, $currentPage + $offset, $currentPage + $offset);
-				$i ++;
-				$offset ++;
-			}
-			if ($currentPage < $numPages) {
-				$nav .= $this->createPageLink($currentURL, $currentPage +1, '&gt;&gt;');
-			}
-			if ($currentPage != $numPages) {
-				$nav .= $this->createPageLink($currentURL, $numPages, $_lang["pagination_table_last"]);
-			}
-		}
-		$this->pageNav= ' '.$nav;
-	}
-
-	/**
-	 * Creates an individual page link for the paging navigation.
-	 *
-	 * @param $link The link for the page, defaulted to the current document.
-	 * @param $pageNum The page number of the link.
-	 * @param $displayText The text of the link.
-	 * @param $currentPage Indicates if the link is to the current page.
-	 * @param $qs And optional query string to be appended to the link.
-	 */
-	function createPageLink($link='', $pageNum, $displayText, $currentPage=false, $qs='') {
-		global $modx;
-		$orderBy= !empty($_GET['orderby'])? '&orderby=' . $_GET['orderby']: '';
-		$orderDir= !empty($_GET['orderdir'])? '&orderdir=' . $_GET['orderdir']: '';
-		if (!empty($qs)) $qs= "?$qs";
-		$link= empty($link)? $modx->makeUrl($modx->documentIdentifier, $modx->documentObject['alias'], $qs . "page=$pageNum$orderBy$orderDir"): $this->prepareLink($link) . "page=$pageNum";
-		$nav .= '<li'.($currentPage? ' class="currentPage"': '').'><a'.($currentPage? ' class="currentPage"': '').' href="'.$link.'">'.$displayText.'</a></li>'."\n";
-		return $nav;
-	}
-
-	/**
-	 * Adds an INPUT form element column to the table.
-	 *
-	 * @param $value The value attribute of the element.
-	 * @param $isChecked Indicates if the checked attribute should apply to the
-	 * element.
-	 */
-	function addFormField($value, $isChecked) {
-		if ($this->formElementType) {
-			$checked= $isChecked? "checked ": "";
-			$field= "\t\t".'<td><input type="'.$this->formElementType.'" name="'. ($this->formElementName ? $this->formElementName : $value).'"  value="'.$value.'" '.$checked.'/></td>'."\n";
-		}
-		return $field;
-	}
-
-	/**
-	 * Generates the proper LIMIT clause for queries to retrieve paged results in
-	 * a MakeTable $fieldsArray.
-	 */
-	function handlePaging() {
-		$offset= (is_numeric($_GET['page']) && $_GET['page'] > 0) ? $_GET['page'] - 1 : 0;
-		$limitClause= ' LIMIT '. ($offset * MAX_DISPLAY_RECORDS_NUM).', '.MAX_DISPLAY_RECORDS_NUM;
-		return $limitClause;
-	}
-
-	/**
-	 * Generates the SORT BY clause for queries used to retrieve a MakeTable
-	 * $fieldsArray
-	 *
-	 * @param $natural_order If true, the results are returned in natural order.
-	 */
-	function handleSorting($natural_order=false) {
-		$orderByClause= '';
-		if (!$natural_order) {
-			$orderby= !empty($_GET['orderby'])? $_GET['orderby']: "id";
-			$orderdir= !empty($_GET['orderdir'])? $_GET['orderdir']: "DESC";
-			$orderbyClause= !empty($orderby)? ' ORDER BY ' . $orderby . ' ' . $orderdir . ' ': "";
-		}
-		return $orderbyClause;
-	}
-
-	/**
-	 * Generates a link to order by a specific $fieldsArray key; use to generate
-	 * sort by links in the MakeTable $fieldHeadingsArray values.
-	 *
-	 * @param $key The $fieldsArray key for the column to sort by.
-	 * @param $text The text for the link (e.g. table column header).
-	 * @param $qs An optional query string to append to the order by link.
-	 */
-	function prepareOrderByLink($key, $text, $qs='') {
-		global $modx;
-		if (!empty($_GET['orderdir'])) {
-			$orderDir= strtolower($_GET['orderdir'])=='desc'? '&orderdir=asc': '&orderdir=desc';
-		} else {
-			$orderDir= '&orderdir=asc';
-		}
-		if (!empty($qs)) {
-			if (!strrpos($qs, '&')==strlen($qs)-1) $qs.= '&';
-		}
-		return '<a href="[~'.$modx->documentIdentifier.'~]?'.$qs.'orderby='.$key.$orderDir.'">'.$text.'</a>';
-	}
+            }
+            if ($this->formElementType) {
+                if ($this->extra) {
+                    $table.= "\n".$this->extra."\n";
+                }
+                $table.= "\n".'</form>'."\n";
+            }
+            return $table;
+        }
+    }
+
+    /**
+     * Generates optional paging navigation controls for the table.
+     *
+     * @param $numRecords The number of records to show per page.
+     * @param $qs An optional query string to be appended to the paging links
+     */
+    function createPagingNavigation($numRecords, $qs='') {
+        global $_lang;
+        $currentPage= (is_numeric($_GET['page']) ? $_GET['page'] : 1);
+        $numPages= ceil($numRecords / MAX_DISPLAY_RECORDS_NUM);
+        if ($numPages > 1) {
+            $currentURL= empty($qs)? '': '?'.$qs;
+            if ($currentPage > 6) {
+                $nav .= $this->createPageLink($currentURL, 1, $_lang["pagination_table_first"]);
+            }
+            if ($currentPage != 1) {
+                $nav .= $this->createPageLink($currentURL, $currentPage -1, '&lt;&lt;');
+            }
+            $offset= -4 + ($currentPage < 5 ? (5 - $currentPage) : 0);
+            $i= 1;
+            while ($i < 10 && ($currentPage + $offset <= $numPages)) {
+                if ($currentPage == $currentPage + $offset)
+                    $nav .= $this->createPageLink($currentURL, $currentPage + $offset, $currentPage + $offset, true);
+                else
+                    $nav .= $this->createPageLink($currentURL, $currentPage + $offset, $currentPage + $offset);
+                $i ++;
+                $offset ++;
+            }
+            if ($currentPage < $numPages) {
+                $nav .= $this->createPageLink($currentURL, $currentPage +1, '&gt;&gt;');
+            }
+            if ($currentPage != $numPages) {
+                $nav .= $this->createPageLink($currentURL, $numPages, $_lang["pagination_table_last"]);
+            }
+        }
+        $this->pageNav= ' '.$nav;
+    }
+
+    /**
+     * Creates an individual page link for the paging navigation.
+     *
+     * @param $link The link for the page, defaulted to the current document.
+     * @param $pageNum The page number of the link.
+     * @param $displayText The text of the link.
+     * @param $currentPage Indicates if the link is to the current page.
+     * @param $qs And optional query string to be appended to the link.
+     */
+    function createPageLink($link='', $pageNum, $displayText, $currentPage=false, $qs='') {
+        global $modx;
+        $orderBy= !empty($_GET['orderby'])? '&orderby=' . $_GET['orderby']: '';
+        $orderDir= !empty($_GET['orderdir'])? '&orderdir=' . $_GET['orderdir']: '';
+        if (!empty($qs)) $qs= "?$qs";
+        $link= empty($link)? $modx->makeUrl($modx->documentIdentifier, $modx->documentObject['alias'], $qs . "page=$pageNum$orderBy$orderDir"): $this->prepareLink($link) . "page=$pageNum";
+        $nav .= '<li'.($currentPage? ' class="currentPage"': '').'><a'.($currentPage? ' class="currentPage"': '').' href="'.$link.'">'.$displayText.'</a></li>'."\n";
+        return $nav;
+    }
+
+    /**
+     * Adds an INPUT form element column to the table.
+     *
+     * @param $value The value attribute of the element.
+     * @param $isChecked Indicates if the checked attribute should apply to the
+     * element.
+     */
+    function addFormField($value, $isChecked) {
+        if ($this->formElementType) {
+            $checked= $isChecked? "checked ": "";
+            $field= "\t\t".'<td><input type="'.$this->formElementType.'" name="'. ($this->formElementName ? $this->formElementName : $value).'"  value="'.$value.'" '.$checked.'/></td>'."\n";
+        }
+        return $field;
+    }
+
+    /**
+     * Generates the proper LIMIT clause for queries to retrieve paged results in
+     * a MakeTable $fieldsArray.
+     */
+    function handlePaging() {
+        $offset= (is_numeric($_GET['page']) && $_GET['page'] > 0) ? $_GET['page'] - 1 : 0;
+        $limitClause= ' LIMIT '. ($offset * MAX_DISPLAY_RECORDS_NUM).', '.MAX_DISPLAY_RECORDS_NUM;
+        return $limitClause;
+    }
+
+    /**
+     * Generates the SORT BY clause for queries used to retrieve a MakeTable
+     * $fieldsArray
+     *
+     * @param $natural_order If true, the results are returned in natural order.
+     */
+    function handleSorting($natural_order=false) {
+        $orderByClause= '';
+        if (!$natural_order) {
+            $orderby= !empty($_GET['orderby'])? $_GET['orderby']: "id";
+            $orderdir= !empty($_GET['orderdir'])? $_GET['orderdir']: "DESC";
+            $orderbyClause= !empty($orderby)? ' ORDER BY ' . $orderby . ' ' . $orderdir . ' ': "";
+        }
+        return $orderbyClause;
+    }
+
+    /**
+     * Generates a link to order by a specific $fieldsArray key; use to generate
+     * sort by links in the MakeTable $fieldHeadingsArray values.
+     *
+     * @param $key The $fieldsArray key for the column to sort by.
+     * @param $text The text for the link (e.g. table column header).
+     * @param $qs An optional query string to append to the order by link.
+     */
+    function prepareOrderByLink($key, $text, $qs='') {
+        global $modx;
+        if (!empty($_GET['orderdir'])) {
+            $orderDir= strtolower($_GET['orderdir'])=='desc'? '&orderdir=asc': '&orderdir=desc';
+        } else {
+            $orderDir= '&orderdir=asc';
+        }
+        if (!empty($qs)) {
+            if (!strrpos($qs, '&')==strlen($qs)-1) $qs.= '&';
+        }
+        return '<a href="[~'.$modx->documentIdentifier.'~]?'.$qs.'orderby='.$key.$orderDir.'">'.$text.'</a>';
+    }
 
 }