Changeset 8222 for sandbox/2.5.1-evolucao/phpgwapi/inc/adodb/adodb-csvlib.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-csvlib.inc.php (modified) (8 diffs)

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

@@ -9 +9 @@
 /* 
 
-  V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V5.18 3 Sep 2012   (c) 2000-2012 John Lim (jlim#natsoft.com). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
@@ -55 +55 @@
                 
                 if ($rs->databaseType == 'array') {
-                        $rows =& $rs->_array;
+                        $rows = $rs->_array;
                 } else {
                         $rows = array();
@@ -65 +65 @@
                 
                 for($i=0; $i < $max; $i++) {
-                        $o =& $rs->FetchField($i);
+                        $o = $rs->FetchField($i);
                         $flds[] = $o;
                 }
@@ -72 +72 @@
                 $class = $rs->connection->arrayClass;
                 $rs2 = new $class();
+                $rs2->timeCreated = $rs->timeCreated; # memcache fix
                 $rs2->sql = $rs->sql;
                 $rs2->oldProvider = $rs->dataProvider; 
@@ -91 +92 @@
 *                       empty recordset is returned
 */
-        function &csv2rs($url,&$err,$timeout=0, $rsclass='ADORecordSet_array')
+        function csv2rs($url,&$err,$timeout=0, $rsclass='ADORecordSet_array')
         {
                 $false = false;
@@ -262 +263 @@
         /**
         * Save a file $filename and its $contents (normally for caching) with file locking
+        * Returns true if ok, false if fopen/fwrite error, 0 if rename error (eg. file is locked)
         */
         function adodb_write_file($filename, $contents,$debug=false)
@@ -281 +283 @@
                         // getmypid() actually returns 0 on Win98 - never mind!
                         $tmpname = $filename.uniqid($mtime).getmypid();
-                        if (!($fd = @fopen($tmpname,'a'))) return false;
-                        $ok = ftruncate($fd,0);                 
-                        if (!fwrite($fd,$contents)) $ok = false;
+                        if (!($fd = @fopen($tmpname,'w'))) return false;
+                        if (fwrite($fd,$contents)) $ok = true;
+                        else $ok = false;
                         fclose($fd);
-                        chmod($tmpname,0644);
-                        // the tricky moment
-                        @unlink($filename);
-                        if (!@rename($tmpname,$filename)) {
-                                unlink($tmpname);
-                                $ok = false;
-                        }
-                        if (!$ok) {
-                                if ($debug) ADOConnection::outp( " Rename $tmpname ".($ok? 'ok' : 'failed'));
+                        
+                        if ($ok) {
+                                @chmod($tmpname,0644);
+                                // the tricky moment
+                                @unlink($filename);
+                                if (!@rename($tmpname,$filename)) {
+                                        unlink($tmpname);
+                                        $ok = 0;
+                                }
+                                if (!$ok) {
+                                        if ($debug) ADOConnection::outp( " Rename $tmpname ".($ok? 'ok' : 'failed'));
+                                }
                         }
                         return $ok;
@@ -299 +304 @@
                 if (!($fd = @fopen($filename, 'a'))) return false;
                 if (flock($fd, LOCK_EX) && ftruncate($fd, 0)) {
-                        $ok = fwrite( $fd, $contents );
+                        if (fwrite( $fd, $contents )) $ok = true;
+                        else $ok = false;
                         fclose($fd);
-                        chmod($filename,0644);
+                        @chmod($filename,0644);
                 }else {
                         fclose($fd);