Changeset 136 for trunk/lib/CSS.inc.php

Timestamp:

Jun 3, 2006 7:47:48 PM (18 years ago)

Author:

scdev

Message:

Q - Merged branches/2.0singleton into trunk. Completed updating classes to use singleton methods. Implemented tests. Fixed some bugs. Changed some interfaces.

File:

• trunk/lib/CSS.inc.php (modified) (6 diffs)

trunk/lib/CSS.inc.php

@@ -28 +28 @@
     function setParam($params)
     {
+        $app =& App::getInstance();
+    
         if (isset($params) && is_array($params)) {
             // Merge new parameters with old overriding only those passed.
             $this->_params = array_merge($this->_params, $params);
         } else {
-            App::logMsg(sprintf('Parameters are not an array: %s', $params), LOG_ERR, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Parameters are not an array: %s', $params), LOG_ERR, __FILE__, __LINE__);
         }
     }
@@ -45 +47 @@
     function getParam($param)
     {
+        $app =& App::getInstance();
+    
         if (isset($this->_params[$param])) {
             return $this->_params[$param];
         } else {
-            App::logMsg(sprintf('Parameter is not set: %s', $param), LOG_DEBUG, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Parameter is not set: %s', $param), LOG_NOTICE, __FILE__, __LINE__);
             return null;
         }
@@ -58 +62 @@
      * @access  public
      * @param   string  $file   Include path to css files.
-     * @param   mixed   $apps   App name string or array of app names.
+     * @param   mixed   $realms   Realm name string or array of realm names.
      * @return  bool    True on success, false on failure.
      */
-    function setFile($file, $apps='')
+    function setFile($file, $realms='')
     {
-        if (!is_array($apps)) {
-            $apps = array($apps);
+        $app =& App::getInstance();
+    
+        if (!is_array($realms)) {
+            $realms = array($realms);
         }
 
         if ($fp = fopen($file, 'r', true)) {
-            foreach ($apps as $app) {
-                $app = '' == $app ? 'default' : $app;
-                $this->_css_files[$app][] = $file;
+            foreach ($realms as $realm) {
+                $realm = '' == $realm ? 'default' : $realm;
+                $this->_css_files[$realm][] = $file;
             }
             fclose($fp);
             return true;
         } else {
-            App::logMsg(sprintf('CSS file non-existent: %s', $file), LOG_ERR, __FILE__, __LINE__);
+            $app->logMsg(sprintf('CSS file non-existent: %s', $file), LOG_ERR, __FILE__, __LINE__);
             return false;
         }
@@ -87 +93 @@
      * @return  bool    False if no files have been set.
      */
-    function headers($app='')
+    function headers($realm='')
     {
-        $app = '' == $app ? 'default' : $app;
+        $app =& App::getInstance();
+    
+        $realm = '' == $realm ? 'default' : $realm;
 
-        if (empty($this->_css_files[$app])) {
-            App::logMsg(sprintf('CSS::headers called without specifying any files.', null), LOG_WARNING, __FILE__, __LINE__);
+        if (empty($this->_css_files[$realm])) {
+            $app->logMsg(sprintf('CSS::headers called without specifying any files.', null), LOG_WARNING, __FILE__, __LINE__);
             return false;
         }
@@ -98 +106 @@
         // Get time of latest modified file, including this class file.
         $files_mtime = array();
-        foreach (array_merge($this->_css_files[$app], array(__FILE__)) as $file) {
+        foreach (array_merge($this->_css_files[$realm], array(__FILE__)) as $file) {
             $files_mtime[] = statIncludePath($file, 'mtime');
         }
@@ -122 +130 @@
      * @return  bool    False if no files have been set.
      */
-    function output($app='')
+    function output($realm='')
     {
-        $app = '' == $app ? 'default' : $app;
+        $realm = '' == $realm ? 'default' : $realm;
 
-        if (empty($this->_css_files[$app])) {
-            App::logMsg(sprintf('CSS::output called without specifying any files.', null), LOG_WARNING, __FILE__, __LINE__);
+        if (empty($this->_css_files[$realm])) {
+            $app->logMsg(sprintf('CSS::output called without specifying any files.', null), LOG_WARNING, __FILE__, __LINE__);
             return false;
         }
 
-        foreach ($this->_css_files[$app] as $file) {
+        foreach ($this->_css_files[$realm] as $file) {
             include $file;
         }