Changeset 26

Timestamp:

Dec 3, 2005 11:23:27 PM (18 years ago)

Author:

scdev

Message:

Updated CSS.inc.php to: 1. set different css files attached to an app with /css.php?app=name; 2. use file pointer from fopen() opening file from include path to get mtime.

Location:

trunk

Files:

• lib/CSS.inc.php (modified) (4 diffs)
• lib/Utilities.inc.php (modified) (1 diff)
• tests/EmailTest.php (added)

trunk/lib/CSS.inc.php

@@ -7 +7 @@
  *
  * @author  Quinn Comendant <quinn@strangecode.com>
- * @version 1.1
- * TODO: set different css files attached to an app with /css.php?app=name
- * TODO: 
+ * @version 1.2
  */
 class CSS {
 
     // Include these style sheets.
-    var $_css_files = array();
+    var $_css_files = array('_default' => array());
     
     // Cache style sheets?
@@ -64 +62 @@
      * @return  bool    True on success, false on failure.
      */
-    function setFile($file)
+    function setFile($file, $app='_default')
     {
-        if (file_exists($file)) {
-            $this->_css_files[] = $file;
+        if ($fp = fopen($file, 'r', true)) {
+            $this->_css_files[$app][] = $file;
+            fclose($fp);
             return true;
         } else {
@@ -82 +81 @@
      * @return  bool    False if no files have been set.
      */
-    function headers()
+    function headers($app='_default')
     {
-        if (empty($this->_css_files)) {
+        if (empty($this->_css_files[$app])) {
             App::logMsg(sprintf('CSS::headers called without specifying any files.', null), LOG_WARNING, __FILE__, __LINE__);
             return false;
         }
-        
+
         // Get time of latest modified file, including this class file.
-        $files_mtime = array_map('filemtime', array_merge($this->_css_files, array(__FILE__)));
+        $files_mtime = array();
+        foreach (array_merge($this->_css_files[$app], array(__FILE__)) as $file) {
+            $files_mtime[] = statIncludePath($file, 'mtime');
+        }
         sort($files_mtime, SORT_NUMERIC);
-        $mtime = array_pop($files_mtime);
+        $latest_mtime = array_pop($files_mtime);
         
         if ($this->_params['cache_css']) {
-            header('Last-Modified: ' . gmdate('D, d M Y H:i:s', $mtime) . ' GMT');
+            header('Last-Modified: ' . gmdate('D, d M Y H:i:s', $latest_mtime) . ' GMT');
             header('Cache-Control: public, max-age=86400');
         } else {
@@ -112 +114 @@
      * @return  bool    False if no files have been set.
      */
-    function output()
+    function output($app='_default')
     {
-        if (empty($this->_css_files)) {
+        if (empty($this->_css_files[$app])) {
             App::logMsg(sprintf('CSS::output called without specifying any files.', null), LOG_WARNING, __FILE__, __LINE__);
             return false;
         }
-        
-        foreach ($this->_css_files as $file) {
-            include $file;
-        }
     }
+    
 }
 ?>

trunk/lib/Utilities.inc.php

@@ -234 +234 @@
   
     return sprintf($format, $size, $units[$i]);
+}
+
+/**
+ * Returns stats of a file from the include path.
+ *
+ * @param   string  $file   File in include path.
+ * @return  mixed   Value of requested key from fstat(), or false on error.
+ * @author  Quinn Comendant <quinn@strangecode.com>
+ * @since   03 Dec 2005 14:23:26
+ */
+function statIncludePath($file, $stat)
+{
+    // Open file pointer read-only using include path.
+    if ($fp = fopen($file, 'r', true)) {
+        // File opend successfully, get stats.
+        $stats = fstat($fp);
+        fclose($fp);
+        // Return specified stats.
+        return $stats[$stat];
+    } else {
+        return false;
+    }
 }