Changeset 2085

Timestamp:

02/20/2008 08:43:34 AM (11 months ago)

Author:

armen

Message:

Code cleanup.

Files:

• trunk/modules/media/controllers/media.php (modified) (13 diffs)

trunk/modules/media/controllers/media.php

@@ -27 +27 @@
                 parent::__construct();
 
-                $cache = Config::item('media.cache');
+                $cache           = Config::item('media.cache');
                 $this->use_cache = ($cache > 0);
 
@@ -36 +36 @@
                 else
                 {
-                        $this->cache_lifetime = config::item('cache.lifetime') OR $this->cache_lifetime = 1800;
+                        Config::item('cache.lifetime') OR $this->cache_lifetime = 1800;
                 }
 
@@ -45 +45 @@
 
                 $this->pack_css = (bool) Config::item('media.pack_css');
-                $this->pack_js = Config::item('media.pack_js');
+                $this->pack_js  = Config::item('media.pack_js');
 
                 if ($this->pack_js === TRUE)
@@ -53 +53 @@
         }
 
-        public function css($querystr) {
-                // find all the individual files
-                $files = explode("+", $querystr);
+        public function css($querystr) 
+        {
+                // Find all the individual files
+                $files = explode('+', $querystr);
 
                 $mimetype = config::item('mimes.css');
@@ -65 +66 @@
                 {
                         $data = '';
-                        foreach ($files as $orig_filename) {
+                        foreach ($files as $orig_filename) 
+                        {
                                 $filename = $orig_filename;
+
                                 if (substr($filename, -4) == ".css")
                                 {
@@ -78 +81 @@
                                 catch (Kohana_Exception $exception)
                                 {
-                                        // try to load the file as a php view (eg, file.css.php)
+                                        // Try to load the file as a php view (eg, file.css.php)
                                         try
                                         {
                                                 $view = new View('media/css/'.$orig_filename);
-
                                         }
                                         catch (Kohana_Exception $exception)
                                         {
-                                                // not found
+                                                // Not found
                                                 unset($view);
                                         }
@@ -94 +96 @@
                                         $filedata = $view->render();
 
-                                        ($this->pack_css) and $filedata = $this->_css_compress($filedata);
+                                        ($this->pack_css) AND $filedata = $this->_css_compress($filedata);
 
                                         $data .= $filedata;
@@ -104 +106 @@
                         }
 
-                        ($this->use_cache) and $this->cache->set('media.css.'.$querystr, $data, array('media'), $this->cache_lifetime);
+                        ($this->use_cache) AND $this->cache->set('media.css.'.$querystr, $data, array('media'), $this->cache_lifetime);
                 }
 
@@ -111 +113 @@
         }
 
-        public function js($orig_filename) {
+        public function js($orig_filename) 
+        {
                 $filename = $orig_filename;
+
                 if (substr($filename, -3) == '.js')
                 {
@@ -121 +125 @@
                 $mimetype = (isset($mimetype[0])) ? $mimetype[0] : 'text/javascript';
 
-
                 $this->use_cache AND $data = $this->cache->get('media.js.'.$filename);
 
@@ -154 +157 @@
                                 }
 
-                                ($this->use_cache) and $this->cache->set('media.js.'.$filename, $data, array('media'), $this->cache_lifetime);
+                                ($this->use_cache) AND $this->cache->set('media.js.'.$filename, $data, array('media'), $this->cache_lifetime);
                         }
                         else
@@ -170 +173 @@
                 $type = $this->uri->segment(2);
                 $filename = $this->uri->segment(3);
-                // TODO: finish this for generic types
-                /* issues: getting View to work with any types of files */
+                // TODO:   Finish this for generic types
+                // ISSUES: Getting View to work with any types of files
 
                 try
@@ -183 +186 @@
         }
 
-        // Based on http://www.ibloomstudios.com/articles/php_css_compressor/
+        /**
+         * @based_on   http://www.ibloomstudios.com/articles/php_css_compressor/
+         */
         public function _css_compress($data)
         {