Mambo > Projects > Mambo CMS > SVN

Diff of /mambo/branches/4.6/includes/database.php

-revision 213, Tue Jan 31 12:11:42 2006 UTC
+revision 417, Tue Mar 21 18:06:53 2006 UTC
 Line 1
  <?php
+ /**
+ * @package Mambo Open Source
+ * @subpackage Database
+ * @copyright (C) 2005 - 2006 Mambo Foundation Inc.
+ * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+ *
+ * Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+ * that Mambo remained free Open Source software owned and managed by the community.
+ * Mambo is Free Software
+ */
  /**
  * Database connector class
- * @subpackage Database
- * @package Mambo
  */
  class database {
          /** @var string Internal variable to hold the query sql */
-Line 22
+Line 30
          var $_debug=0;
          /** @var array A log of queries */
          var $_log=array();
+         /** @var string Null date */
+         var $_null_date='0000-00-00 00:00:00';
          /**
          * Database object constructor
-Line 46
+Line 56
                          include $basePath . '/../offline.php';
                          exit();
          }
+         function getNullDate () {
+             return $this->_null_date;
+         }
          /**
          * @param int
          */
-Line 114
+Line 128
          function replacePrefix ($sql, $prefix='#__') {
                  $done = '';
                  while (strlen($sql)) {
-                         if ($double = preg_match('/\"([^\\\"]|\\.)*"/', $sql,$matches_double,PREG_OFFSET_CAPTURE) OR
+                         $single = preg_match("/\'([^\\\']|\\.)*'/", $sql,$matches_single,PREG_OFFSET_CAPTURE);
-                         $single = preg_match("/\'([^\\\']|\\.)*'/", $sql,$matches_single,PREG_OFFSET_CAPTURE)) {
+                         if ($double = preg_match('/\"([^\\\"]|\\.)*"/', $sql,$matches_double,PREG_OFFSET_CAPTURE) OR $single) {
                                  if ($single == 0 OR ($double AND $matches_double[0][1] < $matches_single[0][1])) {
                                          $done .= str_replace($prefix, $this->_table_prefix, substr($sql,0,$matches_double[0][1])).$matches_double[0][0];
                                          $sql = substr($sql,$matches_double[0][1]+strlen($matches_double[0][0]));
-Line 209
+Line 223
                  return "<div style=\"background-color:#FFFFCC\" align=\"left\">$buf</div>";
          }
          /**
-         * @return int The number of rows returned from the most recent query.
+         * @return int The number of rows returned from the most recent query - SELECT only
          */
          function getNumRows( $cur=null ) {
                  return mysql_num_rows( $cur ? $cur : $this->_cursor );
          }
          /**
+         * @return int The number of rows affected by the most recent query - INSERT, UPDATE, DELETE
+         */
+         function getAffectedRows(  ) {
+                 return mysql_affected_rows( $this->_resource );
+         }
+         /**
          * Load an array of retrieved database objects or values
          * @param int Database cursor
          * @param string The field name of a primary key
-Line 539
+Line 560
          }
  }
  /**
- * mosDBTable Abstract Class.
+ * mosDBAbstractRow Abstract Class.
  * @abstract
  * @package Mambo
  * @subpackage Database
-Line 549
+Line 569
  * Parent classes to all database derived objects.  Customisation will generally
  * not involve tampering with this object.
  * @package Mambo
- * @author Andrew Eddie <eddieajau@users.sourceforge.net
+ * @author Martin Brampton counterpoint@mambo-foundation.org
  */
- class mosDBTable {
+ class mosDBAbstractRow {
          /** @var string Name of the table in the db schema relating to child class */
          var $_tbl = '';
          /** @var string Name of the primary key field in the table */
          var $_tbl_key = '';
          /** @var string Error message */
          var $_error = '';
-         /** @var mosDatabase Database connector */
-         var $_db = null;
          /**
          *       Object constructor to set table and key field
-Line 568
+Line 586
          *       @param string $table name of the table in the db schema relating to child class
          *       @param string $key name of the primary key field in the table
          */
-         function mosDBTable( $table, $key, &$db ) {
+         function mosDBAbstractRow ($table='', $keyname='id', $db='') {
-                 $this->_tbl = $table;
+                 if ($table) $this->_tbl = $table;
-                 $this->_tbl_key = $key;
+                 else $this->_tbl = $this->tableName();
-                 $this->_db =& $db;
+                 $this->_tbl_key = $keyname;
+                 if (is_object($db)) $this->_db = $db;
+         }
+         /**
+         *       generic check method
+         *
+         *       can be overloaded/supplemented by the child class
+         *       @return boolean True if the object is ok
+         */
+         function check() {
+                 return true;
+         }
+         /**
+         * Checks if this object lacks the property given by the parameter
+         * @param string The name of the property
+         * @return bool
+         */
+         function lacks( $property ) {
+                 $thisclass = get_class($this);
+                 if (array_key_exists( $property, get_class_vars($thisclass) )) return false;
+                 $this->_error = T_(sprintf('WARNING: %s does not support %s.', $thisclass, $property));
+                 return true;
+         }
+         /**
+         /* Move a database row object up or down through the ordering
+         /* @param int positive to move up, negative to move down
+         /* @param string Additional conditions on the WHERE clause to limit the effect
+         */
+         function move( $direction, $where='' ) {
+                 $compops = array (-1 => '<', 0 => '=', 1 => '>');
+                 $relation = $compops[($direction>0)-($direction<0)];
+                 $ordering = ($relation == '<' ? 'DESC' : 'ASC');
+                 $k = $this->_tbl_key;
+                 $o1 = $this->ordering;
+                 $k1 = $this->$k;
+                 $database = isset($this->_db) ? $this->_db : mamboDatabase::getInstance();
+                 $sql = "SELECT $k, ordering FROM $this->_tbl WHERE ordering $relation $o1";
+                 $sql .= ($where ? "\n AND $where" : '').' ORDER BY ordering '.$ordering.' LIMIT 1';
+                 $database->setQuery( $sql );
+                 if ($database->loadObject($row)) {
+                         $o2 = $row->ordering;
+                         $k2 = $row->$k;
+                         $sql = "UPDATE $this->_tbl SET ordering = (ordering=$o1)*$o2 + (ordering=$o2)*$o1 WHERE $k = $k1 OR $k = $k2";
+                         $database->doSQL($sql);
+                 }
          }
+         /**
+         * Compacts the ordering sequence of the selected records
+         * @param string Additional conditions on WHERE clause to limit ordering to a particular subset of records
+         */
+         function updateOrder( $where='', $cfid=null, $order=null ) {
+                 if ($this->lacks('ordering')) return false;
+                 $k = $this->_tbl_key;
+                 if ($this->_tbl == "#__content_frontpage") $order2 = ", content_id DESC";
+                 else $order2 = "";
+                 $database = isset($this->_db) ? $this->_db : mamboDatabase::getInstance();
+                 if (!is_null($cfid) AND !is_null($order)) {
+                         foreach ($cfid as $i=>$id) {
+                                 $o = intval($order[$i]);
+                                 $set[] = "(id=$id)*$o";
+                         }
+                         $sql = "UPDATE $this->_tbl SET ordering = ".implode(' + ', $set).' WHERE id IN ('.implode(',', $cfid).')';
+                         $database->doSQL($sql);
+                 }
+                 $sql = "SELECT $k, ordering FROM $this->_tbl "
+                 . ($where ? "\nWHERE $where" : '')
+                 . "\nORDER BY ordering$order2";
+                 $database->setQuery($sql);
+                 if (!$rows = $database->loadObjectList()) {
+                         $this->_error = $database->getErrorMsg();
+                         return false;
+                 }
+                 $i = 1;
+                 foreach ($rows as $row) {
+                         $sql = "UPDATE $this->_tbl SET ordering=$i WHERE $k = ".$row->$k;
+                         $database->doSQL($sql);
+                         $i++;
+                 }
+                 return true;
+         }
+ }
+ /**
+ * mosDBTable Abstract Class.
+ * @abstract
+ * @package Mambo
+ * @subpackage Database
+ *
+ * Parent classes to all database derived objects.  Customisation will generally
+ * not involve tampering with this object.
+ * @package Mambo
+ * @author Andrew Eddie <eddieajau@users.sourceforge.net
+ */
+ class mosDBTable extends mosDBAbstractRow {
+         /** @var mosDatabase Database connector */
+         var $_db = null;
          /**
           *      @return bool True if DB query failed.  Sets the error message
-Line 589
+Line 709
           */
          function filter( $ignoreList=null ) {
                  $callcheck = array('InputFilter', 'process');
-                 if (!is_callable($callcheck)) require_once(mamboCore::get('mosConfig_absolute_path').'/includes/phpinputfilter/class.inputfilter.php');
+                 if (!is_callable($callcheck)) require_once(mamboCore::get('mosConfig_absolute_path').'/includes/phpInputFilter/class.inputfilter.php');
                  // specific filters
                  $iFilter =& new InputFilter();
                  if (is_array($ignoreList)) foreach ($this->getPublicProperties() as $k) {
-Line 629
+Line 749
                  return $cache;
          }
          /**
-         * Checks if this object lacks the property given by the parameter
-         * @param string The name of the property
-         * @return bool
-         */
-         function lacks( $property ) {
-                 $thisclass = strtolower(get_class($this));
-                 if (!array_key_exists( $property, get_class_vars($thisclass) )) {
-                         $this->_error = "WARNING: $thisclass does not support $property.";
-                         return true;
-                 }
-                 return false;
-         }
-         /**
          * Set the value of the class variable
          * @param string The name of the class variable
          * @param mixed The value to assign to the variable
-Line 657
+Line 764
          *       @return null|string     null is operation was satisfactory, otherwise returns an error
          */
          function bind( $array, $ignore="" ) {
-                 $database = mamboDatabase::getInstance();
+                 $database =& mamboDatabase::getInstance();
                  if (is_array($array)) return $database->mosBindArrayToObject($array, $this, $ignore);
                  $this->_error = strtolower(get_class( $this ))."::bind failed.";
                  return false;
-Line 677
+Line 784
          }
          /**
-         *       generic check method
-         *
-         *       can be overloaded/supplemented by the child class
-         *       @return boolean True if the object is ok
-         */
-         function check() {
-                 return true;
-         }
-         /**
          * Inserts a new row if id is zero or updates an existing row in the database table
          *
          * Can be overloaded/supplemented by the child class
-Line 705
+Line 802
          }
          /**
-         * Determine from the direction parameter which operator and order to use in SQL
-         */
-         function orderCodes ($direction) {
-                 if ($direction < 0) {
-                         $relation = '<';
-                         $ordering = ' ORDER BY ordering DESC';
-                 }
-                 elseif ($direction > 0) {
-                         $relation = '>';
-                         $ordering = ' ORDER BY ordering ASC';
-                 }
-                 else {
-                         $relation = '=';
-                         $ordering = '';
-                 }
-                 return array ($relation, $ordering);
-         }
-         /**
-         */
-         function move( $direction, $where='' ) {
-                 $k = $this->_tbl_key;
-                 list ($relation, $ordering) = $this->orderCodes($direction);
-                 $sql = "SELECT $this->_tbl_key, ordering FROM $this->_tbl WHERE ordering $relation $this->ordering";
-                 $sql .= ($where ? "\n AND $where" : '').$ordering.' LIMIT 1';
-                 $this->_db->setQuery( $sql );
-                 $row = null;
-                 if ($this->_db->loadObject($row)) {
-                         $sql = "UPDATE $this->_tbl SET ordering='$row->ordering' WHERE $this->_tbl_key='".$this->$k."'";
-                         $this->_db->doSQL($sql);
-                 }
-                 $sql = "UPDATE $this->_tbl SET ordering='$this->ordering' WHERE $this->_tbl_key='".$row->$k."'";
-                 if ($row) $this->ordering = $row->ordering;
-                 $this->_db->doSQL($sql);
-         }
-         /**
-         * Compacts the ordering sequence of the selected records
-         * @param string Additional where query to limit ordering to a particular subset of records
-         */
-         function updateOrder( $where='' ) {
-                 if ($this->lacks('ordering')) return false;
-                 $k = $this->_tbl_key;
-                 if ($this->_tbl == "#__content_frontpage") $order2 = ", content_id DESC";
-                 else $order2 = "";
-                 $sql = "SELECT $k, ordering FROM $this->_tbl "
-                 . ($where ? "\nWHERE $where" : '')
-                 . "\nORDER BY ordering$order2";
-                 $this->_db->setQuery($sql);
-                 if (!$rows = $this->_db->loadObjectList()) {
-                         $this->_error = $this->_db->getErrorMsg();
-                         return false;
-                 }
-                 $neworder = max(min($this->ordering, count($rows)), 1);
-                 $i = 1;
-                 foreach ($rows as $row) {
-                         $key = $row->$k;
-                         if ($i == $neworder) $i++;
-                         if ($key == $this->$k) {
-                                 $i--;
-                                 $ordering = $neworder;
-                         }
-                         else $ordering = $i;
-                         $sql = "UPDATE $this->_tbl SET ordering=$ordering WHERE $k = $key ";
-                         $this->_db->doSQL($sql);
-                         $i++;
-                 }
-                 return true;
-         }
-         /**
          *       Default delete method
          *
          *       can be overloaded/supplemented by the child class
-Line 910
+Line 937
  *  of a field that will have a timestamp placed in it whenever the DB is written.
  */
- class mosDBTableEntry {
+ class mosTableEntry extends mosDBAbstractRow {
-         /** @var int ID for file record in database */
-         var $id = 0;
-         var $database = '';
-         function mosDBTableEntry () {
-                 die ('Cannot instantiate mosDBTableEntry');
-         }
-         function getDatabase () {
-                 if (!is_object($this->database)) $this->database = mamboDatabase::getInstance();
-                 return $this->database;
-         }
          /* Stores all POST data where the name matches an object variable name */
          function addPostData () {
                  foreach (get_class_vars(get_class($this)) as $field=>$value) {
-                         if ($field!='id' AND isset($_POST[$field])) {
+                         if ($field!='id' AND $field[1] != '_' AND isset($_POST[$field])) {
                                  $this->$field = trim($_POST[$field]);
                          }
                  }
-Line 943
+Line 958
          /* Updates an existing DB entry with the object's current values */
          function updateObjectDB () {
                  $this->prepareValues();
-                 $database = $this->getDatabase();
+                 $database = mamboDatabase::getInstance();
                  $database->doSQL($this->updateSQL());
          }
-Line 951
+Line 966
          function delete () {
                  $table = $this->tableName();
                  $sql = "DELETE FROM $table WHERE id=$this->id";
-                 $database = $this->getDatabase();
+                 $database = mamboDatabase::getInstance();
                  $database->doSQL($sql);
          }
-Line 966
+Line 981
                  $sql = "UPDATE $tabname SET %s WHERE id=$this->id";
                  $exclude = $this->notSQL();
                  foreach (get_class_vars(get_class($this)) as $field=>$value) {
-                         if (!in_array($field,$exclude)) $setter[] = $field."='".$this->$field."'";
+                         if (!in_array($field,$exclude) AND $field[0] != '_') $setter[] = $field."='".$this->$field."'";
                  }
                  $timestamp = $this->timeStampField();
                  if ($timestamp) $setter[] = $timestamp."='".date('Y-m-d H:i:s')."'";
-Line 985
+Line 1000
                  $sql = "INSERT INTO $tabname (%s) VALUES (%s)";
                  $exclude = $this->notSQL();
                  foreach (get_class_vars(get_class($this)) as $field=>$value) {
-                         if (!in_array($field,$exclude)) {
+                         if (!in_array($field,$exclude) AND $field[0] != '_') {
                                  $infields[] = $field;
                                  $values[] = "'".$this->$field."'";
                          }
-Line 1007
+Line 1022
          /* Ensures values can safely be written to DB; assumes magic quotes forced off */
          function prepareValues () {
-                 $database = $this->getDatabase();
+                 $database = mamboDatabase::getInstance();
                  foreach (get_class_vars(get_class($this)) as $field=>$value) {
-                         if (!is_numeric($this->$field)) $this->$field = $database->getEscaped($this->$field);
+                         if (!is_numeric($this->$field) AND is_string($this->$field)) $this->$field = $database->getEscaped($this->$field);
                  }
          }
          /* Takes some arbitrary SELECT type SQL and places the first or only result into the current object */
          function readDataBase($sql) {
-                 $database = $this->getDatabase();
+                 $database = mamboDatabase::getInstance();
                  $database->setQuery( $sql );
                  if (!$database->loadObject($this)) $this->id = 0;
          }

 Legend:



Removed from v.213
 


changed lines


 
Added in v.417
 Legend:



Removed from v.213
 


changed lines


 
Added in v.417
-Removed from v.213
+Added in v.417

	ViewVC Help
Powered by ViewVC 1.0.0

Web Hosting provided by Network Redux.

MyGforge Home

Mambo CMS

Diff of /mambo/branches/4.6/includes/database.php