Changeset 1631 in subversion

Timestamp:

Aug 6, 2008 5:25:45 AM (5 years ago)

Author:

alec

Message:

• fread() replaced by file_get_contents(), see comments in #1484880

Location:

trunk/roundcubemail/program

Files:

• include/rcube_mdb2.php (modified) (1 diff)
• include/rcube_template.php (modified) (3 diffs)
• lib/html2text.php (modified) (1 diff)

trunk/roundcubemail/program/include/rcube_mdb2.php

@@ -567 +567 @@
       return;
 
-    $data = '';
-    if ($fd = fopen($file_name, 'r'))
-      {
-      $data = fread($fd, filesize($file_name));
-      fclose($fd);
-      }
+    $data = file_get_contents($file_name);
 
     if (strlen($data))

trunk/roundcubemail/program/include/rcube_template.php

@@ -300 +300 @@
     {
         $skin_path = $this->config['skin_path'];
+        $path = "$skin_path/templates/$name.html";
 
         // read template file
-        $templ = '';
-        $path = "$skin_path/templates/$name.html";
-
-        if (($fp = fopen($path, 'r')) === false) {
-            $message = '';
+        if (($templ = file_get_contents($path)) === false) {
             ob_start();
-            fopen($path, 'r');
-            $message.= ob_get_contents();
+            file_get_contents($path);
+            $message = ob_get_contents();
             ob_end_clean();
             raise_error(array(
@@ -320 +317 @@
             return false;
         }
-        $templ = fread($fp, filesize($path));
-        fclose($fp);
 
         // parse for specialtags
@@ -530 +525 @@
             case 'include':
                 $path = realpath($this->config['skin_path'].$attrib['file']);
-                if ($fsize = filesize($path)) {
+                if (is_readable($path)) {
                     if ($this->config['skin_include_php']) {
                         $incl = $this->include_php($path);
                     }
-                    else if ($fp = fopen($path, 'r')) {
-                        $incl = fread($fp, $fsize);
-                        fclose($fp);
-                    }
+                    else {
+                        $incl = file_get_contents($path);
+                    }
                     return $this->parse_xml($incl);
                 }

trunk/roundcubemail/program/lib/html2text.php

@@ -275 +275 @@
     function set_html( $source, $from_file = false )
     {
-        $this->html = $source;
-
         if ( $from_file && file_exists($source) ) {
-            $fp = fopen($source, 'r');
-            $this->html = fread($fp, filesize($source));
-            fclose($fp);
-        }
+            $this->html = file_get_contents($source);
+        }
+        else
+            $this->html = $source;
 
         $this->_converted = false;