Changeset 8222 for sandbox/2.5.1-evolucao/phpgwapi/inc/adodb/adodb-xmlschema03.inc.php

Timestamp:

09/26/13 15:41:49 (11 years ago)

Author:

angelo

Message:

Ticket #3491 - Compatibilizar Expresso com novas versoes do PHP

File:

• sandbox/2.5.1-evolucao/phpgwapi/inc/adodb/adodb-xmlschema03.inc.php (modified) (15 diffs)

sandbox/2.5.1-evolucao/phpgwapi/inc/adodb/adodb-xmlschema03.inc.php

@@ -11 +11 @@
  * XML schema.
  *
- * Last Editor: $Author$
+ * Last Editor: $Author: jlim $
  * @author Richard Tango-Lowy & Dan Cech
- * @version $Revision$
+ * @version $Revision: 1.62 $
  *
  * @package axmls
@@ -138 +138 @@
         */
         function dbObject( &$parent, $attributes = NULL ) {
-                $this->parent =& $parent;
+                $this->parent = $parent;
         }
         
@@ -168 +168 @@
         }
         
-        function create() {
+        function create(&$xmls) {
                 return array();
         }
@@ -275 +275 @@
         */
         function dbTable( &$parent, $attributes = NULL ) {
-                $this->parent =& $parent;
+                $this->parent = $parent;
                 $this->name = $this->prefix($attributes['NAME']);
         }
@@ -400 +400 @@
         * @return object dbIndex object
         */
-        function &addIndex( $attributes ) {
+        function addIndex( $attributes ) {
                 $name = strtoupper( $attributes['NAME'] );
-                $this->indexes[$name] =& new dbIndex( $this, $attributes );
+                $this->indexes[$name] = new dbIndex( $this, $attributes );
                 return $this->indexes[$name];
         }
@@ -412 +412 @@
         * @return object dbData object
         */
-        function &addData( $attributes ) {
+        function addData( $attributes ) {
                 if( !isset( $this->data ) ) {
-                        $this->data =& new dbData( $this, $attributes );
+                        $this->data = new dbData( $this, $attributes );
                 }
                 return $this->data;
@@ -505 +505 @@
         */
         function addTableOpt( $opt ) {
-                if( $this->currentPlatform ) {
-                $this->opts[] = $opt;
+                if(isset($this->currentPlatform)) {
+                        $this->opts[$this->parent->db->databaseType] = $opt;
                 }
                 return $this->opts;
         }
+
         
         /**
@@ -684 +685 @@
         */
         function dbIndex( &$parent, $attributes = NULL ) {
-                $this->parent =& $parent;
+                $this->parent = $parent;
                 
                 $this->name = $this->prefix ($attributes['NAME']);
@@ -829 +830 @@
         */
         function dbData( &$parent, $attributes = NULL ) {
-                $this->parent =& $parent;
+                $this->parent = $parent;
         }
         
@@ -1085 +1086 @@
         */
         function dbQuerySet( &$parent, $attributes = NULL ) {
-                $this->parent =& $parent;
+                $this->parent = $parent;
                         
                 // Overrides the manual prefix key
@@ -1310 +1311 @@
 *
 * @author Richard Tango-Lowy & Dan Cech
-* @version $Revision$
+* @version $Revision: 1.62 $
 *
 * @package axmls
@@ -1405 +1406 @@
         * @param object $db ADOdb database connection object.
         */
-        function adoSchema( &$db ) {
+        function adoSchema( $db ) {
                 // Initialize the environment
                 $this->mgq = get_magic_quotes_runtime();
-                set_magic_quotes_runtime(0);
-                
-                $this->db =& $db;
+                #set_magic_quotes_runtime(0);
+                ini_set("magic_quotes_runtime", 0);
+                
+                $this->db = $db;
                 $this->debug = $this->db->debug;
                 $this->dict = NewDataDictionary( $this->db );
@@ -1498 +1500 @@
                                         break;
                                 default:
-                                        $mode = XMLS_EXISITNG_DATA;
+                                        $mode = XMLS_EXISTING_DATA;
                                         break;
                         }
@@ -1786 +1788 @@
         * @access private
         */
-        function &create_parser() {
+        function create_parser() {
                 // Create the parser
                 $xmlParser = xml_parser_create();
@@ -2374 +2376 @@
         */
         function Destroy() {
-                set_magic_quotes_runtime( $this->mgq );
+                ini_set("magic_quotes_runtime", $this->mgq );
+                #set_magic_quotes_runtime( $this->mgq );
                 unset( $this );
         }