Changeset 1763

Timestamp:

01/21/2008 05:19:34 AM (12 months ago)

Author:

Geert

Message:

• Fixed and improved CSS compressing function.
  
  • Fix: the old _css_compress() function would break a rule like a { border: 1px solid red} because of the double space between 1px and solid.
    
  • Improvement: generating even smaller CSS files now because more whitespace is being stripped.
    
• Cleaning up code style: http://trac.kohanaphp.com/wiki/CodingStyle
  

Files:

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

trunk/modules/media/controllers/media.php

@@ -18 +18 @@
  */
 class Media_Controller extends Controller {
-        protected $use_cache = false;
+
+        protected $use_cache = FALSE;
         protected $cache_lifetime;
         
-        protected $pack_css = false;
-        protected $pack_js = false;
+        protected $pack_css = FALSE;
+        protected $pack_js = FALSE;
         
-        public function __construct() {
+        public function __construct()
+        {
                 parent::__construct();
                 
-                $cache = config::item('media.cache');
+                $cache = Config::item('media.cache');
                 $this->use_cache = ($cache > 0);
                 
-                if (is_int($cache)) {
+                if (is_int($cache))
+                {
                         $this->cache_lifetime = $cache;
-                } else {
+                }
+                else
+                {
                         $this->cache_lifetime = config::item('cache.lifetime') OR $this->cache_lifetime = 1800;
                 }
                 
-                if ($this->use_cache AND !isset($this->cache)) 
+                if ($this->use_cache AND ! isset($this->cache)) 
                 {
                         $this->load->library('cache');
                 }
                 
-                $this->pack_css = (bool)config::item('media.pack_css');
+                $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) $this->pack_js = 'Normal';
+                if ($this->pack_js === TRUE)
+                {
+                        $this->pack_js = 'Normal';
+                }
         }
         
-        public function css() {
+        public function css()
+        {
                 $filename = $orig_filename = $this->uri->segment(3);
-                if (substr($filename, -4) == ".css") {
+                if (substr($filename, -4) == '.css')
+                {
                         $filename = substr($filename, 0, -4);
                 }
                 
                 $mimetype = config::item('mimes.css');
-                $mimetype = (isset($mimetype[0]) ? $mimetype[0] : 'text/stylesheet');
-                                        
+                $mimetype = (isset($mimetype[0])) ? $mimetype[0] : 'text/stylesheet';
                 
                 $this->use_cache AND $data = $this->cache->get('media.css.'.$filename);
                 
-                if (!isset($data) OR empty($data))
+                if ( ! isset($data) OR empty($data))
                 {
                         try
                         {
-                                $view = new View('media/css/'.$filename, null, 'css');
+                                $view = new View('media/css/'.$filename, NULL, 'css');
                         }
                         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 (e.g. file.css.php) 
                                 try
                                 {
                                         $view = new View('media/css/'.$orig_filename);
-                                        
                                 }
                                 catch (Kohana_Exception $exception)
                                 {
-                                        // not found
+                                        // Not found
                                         unset($view);
                                 }
                         }
                         
-                        if (isset($view)) {
+                        if (isset($view))
+                        {
                                 $data = $view->render();
                                 
@@ -103 +112 @@
         }
 
-        public function js() {
+        public function js()
+        {
                 $filename = $orig_filename = $this->uri->segment(3);
-                if (substr($filename, -3) == ".js") {
+                if (substr($filename, -3) == '.js')
+                {
                         $filename = substr($filename, 0, -3);
                 }
                 
-                $mimetype = config::item('mimes.js');
-                $mimetype = (isset($mimetype[0]) ? $mimetype[0] : 'text/javascript');
+                $mimetype = Config::item('mimes.js');
+                $mimetype = (isset($mimetype[0])) ? $mimetype[0] : 'text/javascript';
 
                 
                 $this->use_cache AND $data = $this->cache->get('media.js.'.$filename);
                 
-                if (!isset($data) OR empty($data)) 
+                if ( ! isset($data) OR empty($data)) 
                 {
                         try
                         {
-                                $view = new View('media/js/'.$filename, null, 'js');
+                                $view = new View('media/js/'.$filename, NULL, 'js');
                         }
                         catch (Kohana_Exception $exception)
                         {
-                                // try to load the file as a php view (eg, file.js.php) 
+                                // Try to load the file as a php view (eg, file.js.php) 
                                 try
                                 {
@@ -130 +141 @@
                                 catch (Kohana_Exception $exception)
                                 {
-                                        // not found
+                                        // Not found
                                         unset($view);
                                 }
@@ -160 +171 @@
         }
         
-        public function _default() {
+        public function _default()
+        {
                 $type = $this->uri->segment(2);
                 $filename = $this->uri->segment(3);
-                //TODO: finish this for generic types
+                // TODO: finish this for generic types
                 /* issues: getting View to work with any types of files */
         }
-        
-        function _css_compress($data) {
-                // from http://www.ibloomstudios.com/articles/php_css_compressor/
+
+        // Based on http://www.ibloomstudios.com/articles/php_css_compressor/   
+        public function _css_compress($data)
+        {
+                // Remove comments
+                $data = preg_replace('!/\*[^*]*\*+([^/][^*]*\*+)*/!', '', $data);
                 
-                // remove comments
-                $data = preg_replace('!/\*[^*]*\*+([^/][^*]*\*+)*/!', '', $data);
-                // remove tabs, spaces, newlines, etc.
-                $data = str_replace(array("\r\n", "\r", "\n", "\t", '  ', '    ', '    '), '', $data);
+                // Remove tabs, spaces, newlines, etc.
+                $data = str_replace
+                (
+                        array("\r\n", "\r", "\n", "\t", '  ', ' {', '{ ', ' }', '} ', ' +', '+ ', ' >', '> ', ' :', ': ', ' ;', '; ', ' ,', ', ', ';}'),
+                        array(' ',    ' ',  ' ',  ' ',  ' ',  '{',  '{',  '}',  '}',  '+',  '+',  '>',  '>',  ':',  ':',  ';',  ';',  ',',  ',',  '}' ),
+                        $data
+                );
+                
                 return $data;
         }
+
 } // End Media_Controller
-
-