A lot fixes to templates and missing functions added, more rewrites

[mailer.git] / inc / rdf.class.php

diff --git a/inc/rdf.class.php b/inc/rdf.class.php
index beaf027feb99179938c2f5aec14eabba8e503833..477925a21e7ad0ef3df4062ba09818cd813765b1 100644 (file)
--- a/inc/rdf.class.php
+++ b/inc/rdf.class.php
@@ -1162,15 +1162,13 @@ class fase4_rdf {
         $dir = dir($this->_cache_dir);
         while($file=$dir->read()) {
             // Exclude directories
-            if (is_file($dir->path.$file) && substr($file, -6, 6) != ".cache")  {
+            if (is_file($dir->path.$file) && substr($file, -6, 6) != ".cache" && substr($file, -4, 4) != ".log")  {
                 if(!@unlink($dir->path.$file)) {
-                    $this->_throw_exception(
-                    "Unable to unlink ".$dir->path.$file
-                    ."<br /><br />Exception at Line: ".__LINE__ );
+                    $this->_throw_exception("Unable to unlink ".$dir->path.$file."<br />\n<br />\nException at Line: ".__LINE__ );
                     return false;
-                }
-            }
-        }
+                } // END - if
+            } // END - if
+        } // END - while
         $dir->close();
         return true;
     }   // END clear_cache()
@@ -1186,8 +1184,8 @@ class fase4_rdf {
     function _cut_string( $string, $str_len = "30" )
     {
         if(strlen(trim($string))>$str_len) {
-        $string = substr( trim($string) , 0, $str_len - 4);
-        $string .= " ...";
+            $string = substr( trim($string) , 0, $str_len - 4);
+            $string .= " ...";
         }
         return $string;
     }   // END _cut_string()
@@ -1202,12 +1200,12 @@ class fase4_rdf {
     function _garbage_collection()
     {
         srand((double) microtime() * 1000000);
-        if (rand(1, 100) <= $this->gc_probability) {
+        if (mt_rand(1, 100) <= $this->gc_probability) {
             $dir = dir($this->_cache_dir);
             while($file=$dir->read()) {
-                if (is_file($dir->path.$file) && substr($file, -6, 6) != ".cache" && filemtime($dir->path.$file) <= time() - $this->_refresh )  {
-                       @unlink($dir->path.$file);
-                }
+                if (is_file($dir->path.$file) && substr($file, -6, 6) != ".cache" && substr($file, -4, 4) != ".log" && filemtime($dir->path.$file) <= time() - $this->_refresh )  {
+                    @unlink($dir->path.$file);
+                } // END - if
         }
         $dir->close();
         }   // END if
@@ -1357,6 +1355,7 @@ class fase4_rdf {
                        fputs($fp, $request);
                        $reply = ""; $isContent = false; $dummy = "";
                        // Read reply
+                       $i=0;
                        while ( !feof($fp) ) {
                                $read = trim(fgets($fp, 4096));
                                if (substr($read, 0, 5) == "<?xml" || $isContent) {