Changeset 516 in t29-www

Timestamp:

Feb 19, 2014, 12:39:35 PM (9 years ago)

Author:

sven

Message:

Bug #51 gefixt (​http://labs.technikum29.de/ticket/51).
Jetzt sollten neue Pagestyles gleich beim Erstellen erkannt werden.

Location:

lib

Files:

• cache.php (modified) (3 diffs)
• host.php (modified) (4 diffs)
• loader.php (modified) (1 diff)
• ressourceloader.php (modified) (2 diffs)
• technikum29.php (modified) (1 diff)
• template.php (modified) (1 diff)

lib/cache.php

@@ -34 +34 @@
         public $cache_file; // must be set!
         public $test_files = array(); // must be set!
+        public $test_conditions = array(); // can be filled with booleans
 
         private $mtime_cache_file = null; // needed for cache header output
@@ -78 +79 @@
                         print 'Cache file: '; var_dump($this->cache_file);
                         print 'Test files: '; var_dump($this->test_files);
+                        print 'Test conditions: '; var_dump($this->test_conditions);
                 }
 
@@ -85 +87 @@
                         $this->test_files);
                 $mtime_test_max = array_reduce($mtime_test_files, 'max');
+                // new feature: Testing boolean conditions. If $this->test_conditions is
+                // an empty array, the calculation gives true.
+                $test_conditions = array_reduce($this->test_conditions, function($a,$b){ return $a && $b; }, true);
                 $this->is_valid = $this->mtime_cache_file
-                        && $mtime_test_max < $this->mtime_cache_file;
+                        && $mtime_test_max < $this->mtime_cache_file && $test_conditions;
                         
                 if($this->debug) {

lib/host.php

@@ -49 +49 @@
         /// This value is computed by setup().
         public $script_filename;
-        
+
+        /// $ressources: CSS and JavaScript file paths ("Assets"), as used by the RessourceLoader,
+        ///              the loader.php and technikum29.php entry points and the Template.
+        private function ressources_array($webroot='') {
+                // this is implemented as method, because of
+                // 1. "$webbroot/..." like strings. This isn't a good idea anyway (e.g. in ressourceloader: $module_dir_rel2webroot
+                // 2. Closures: function($conf){...} doesn't work as class attribute.
+                // This is rather dirty, but anyway the supposed way to access these data is the public get_ressources().
+                $ressources = array(
+                        'cache_file' => array('compressed.js', 'style.css'),
+                        'module_dir' => array("$webroot/shared/js-v6/modules", "$webroot/shared/css-v6/modules"),
+                        'page_dir' => array("$webroot/shared/js-v6/pagescripts", "$webroot/shared/css-v6/pagestyles"),
+                        'glob_pattern' => array('*.js', '*.css'),
+                        'content_types' => array('application/javascript', 'text/css'),
+                        'class' => array('t29JavaScriptRessourceLoader', 't29StyleSheetRessourceLoader'),
+                        'modules' => function($conf){ return glob($conf['module_dir'] . '/' . $conf['glob_pattern']); },
+                );
+                return $ressources;
+        }
+
+        /// $ressources_types: The Ressources array above consists of numeric arrays. This array
+        ///                    maps those positions (numeric keys) to $conf array positions.
+        ///                    Use get_ressources() to resolve this mapping.
+        private $ressources_types = array('js', 'css');
+
+        public function get_ressources($type, $webroot, $debug_flag=false) {
+                $typepos = array_search($type, $this->ressources_types);
+                if($typepos === FALSE) return null;
+                $conf = array_map(function($val) use($typepos) 
+                        { return is_array($val) ? $val[$typepos] : $val; },
+                        $this->ressources_array($webroot));
+                $conf['type'] = $type;
+                // callback functions need the $conf we built.
+                $conf['modules'] = call_user_func($conf['modules'], $conf);
+                $conf['debug'] = $debug_flag; // skip cache and just concat everything
+                return $conf;
+        }
+
+        /**
+         * A special helper class, used by t29Template and technikum29.php entry point.
+         * The general (clean) way would be querying get_ressources().
+         * There is also t29RessourceLoader::get_page_specific_urls() which basically does
+         * the same, just using the global conf array.
+         **/ 
+        public function ressources_get_pagestyle($seiten_id) {
+                // We address the css property directly with the [1] index. Bad!
+                return $this->ressources_array()['page_dir'][1] . '/' . $seiten_id . '.css';
+        }
+
+        /// Singleton fun for detect()
+        private static $instance;
+        private static function new_singleton($classname) {
+                if(!isset(self::$instance))
+                        self::$instance = new $classname;
+                return self::$instance;
+        }
+
         /**
          * Factory for creating a t29Host instance automatically
          * from the current host. This method will decide which 
          * subclass has to be taken.
+         * This function als implements the Singleton pattern, so
+         * you can call it frequently.
          **/
         static function detect() {
@@ -64 +122 @@
                         if(class_exists(self::webroot_local_host_classname)) {
                                 $x = self::webroot_local_host_classname;
-                                $host = new $x;
+                                $host = self::new_singleton($x);
                                 $host->setup();
                                 return $host;
@@ -76 +134 @@
                         case 'heribert':
                         case 'localhost':
-                                $localhost = new t29HeribertHost;
+                                $localhost = self::new_singleton('t29HeribertHost');
                                 $localhost->setup();
                                 return $localhost;
                 }
                 
-                $publichost = new t29PublicHost;
+                $publichost = self::new_singleton('t29PublicHost');
                 $publichost->setup();
                 return $publichost;
@@ -96 +154 @@
          *   2. if this host is *not* installed in its own virtualhost (i.e. on docroot). 
          **/
-        function setup() {
+        private function setup() {
                 $this->is_rewriting_host = isset($_SERVER[self::env_hidesuffix_name]);
                 

lib/loader.php

@@ -9 +9 @@
  *
  **/
- 
-if(!defined('T29_GRAB_LOADER_DEFS')) {
-        $lib = dirname(__FILE__);
-        $webroot = realpath("$lib/../");  # file path to root of t29 web installation
 
-        if(!isset($_GET['type'])) {
-                print "<html><pre>The t29v6 Ressource loader.\n";
-                print "Provide ?type=js or ?type=css.\n";
-                print '<a href="https://labs.technikum29.de/browser/technikum29%20Website/lib/loader.php">Read my sourcecode</a>';
-                exit;
-        }
-}
+$lib = dirname(__FILE__);
+$webroot = realpath("$lib/../");  # file path to root of t29 web installation
 
-$types = array('js', 'css'); // mapping position (numeric key) => $conf array position
-$conf = array(
-        'cache_file' => array('compressed.js', 'style.css'),
-        'module_dir' => array("$webroot/shared/js-v6/modules", "$webroot/shared/css-v6/modules"),
-        'page_dir' => array("$webroot/shared/js-v6/pagescripts", "$webroot/shared/css-v6/pagestyles"),
-        'glob_pattern' => array('*.js', '*.css'),
-        'content_types' => array('application/javascript', 'text/css'),
-        'class' => array('t29JavaScriptRessourceLoader', 't29StyleSheetRessourceLoader'),
-        'modules' => function($conf){ return glob($conf['module_dir'] . '/' . $conf['glob_pattern']); },
-);
-$conf_for_type = function($type, $debug_flag=false) use ($conf, $types) {
-        $typepos = array_search($type, $types);
-        if($typepos === FALSE) return null;
-        array_walk($conf, function(&$val, $key) use($typepos) { if(is_array($val)) $val = $val[$typepos]; });
-        $conf['type'] = $type;
-        $conf['modules'] = call_user_func($conf['modules'], $conf);
-        $conf['debug'] = $debug_flag; // skip cache and just concat everything
-        return $conf;
-};
+require_once "$lib/host.php";
+$host = t29Host::detect();
 
-if(defined('T29_GRAB_LOADER_DEFS')) {
-        return; // just grab the vars in the local scope
+if(!isset($_GET['type'])) {
+        print "<html><pre>The t29v6 Ressource loader.\n";
+        print "Provide ?type=js or ?type=css.\n";
+        print '<a href="https://labs.technikum29.de/browser/technikum29%20Website/lib/loader.php">Read my sourcecode</a>';
+        exit;
 }
 
 $type = $_GET['type'];
-$conf = $conf_for_type($type, isset($_GET['debug']));
+$conf = $host->get_ressources($type, $webroot, isset($_GET['debug']));  //$conf_for_type($type, isset($_GET['debug']));
 if($conf == null)
         die("Illegal type. Valid types are: ". implode($types));

lib/ressourceloader.php

@@ -48 +48 @@
         }
         
-        private static $conf_for_type;
         static function create_from_type($type, $baseconf=null) {
-                global $lib, $webroot;
-                if(!self::$conf_for_type) {
-                        define('T29_GRAB_LOADER_DEFS', true);
-                        include "$lib/loader.php";
-                        self::$conf_for_type = $conf_for_type;
-                }
-
-                $conf = call_user_func(self::$conf_for_type, $type, isset($baseconf['debug']) && $baseconf['debug']);
+                global $lib, $webroot, $host;
+                $conf = $host->get_ressources($type, $webroot, isset($baseconf['debug']) && $baseconf['debug']);
                 if($conf === null) return null;
-                
-                return new $conf['class']($conf);
+        
+                return new $conf['class']($conf);               
         }
         
@@ -241 +234 @@
 
         function compression_filter($code) {
-                global $lib;
-                require "$lib/host.php";
-                $host = t29Host::detect();
+                global $lib, $host;
                 if($host->has_web_prefix)
                         // rewrite CSS image includes

lib/technikum29.php

@@ -79 +79 @@
         "$webroot$lang_path/navigation.xml",
         "$webroot$lang_path/news.php",
+        $webroot.$host->ressources_get_pagestyle($seiten_id),
 );
 

lib/template.php

@@ -114 +114 @@
                 $this->current_link_classes = $this->menu->get_link_classes();
                 
-                // check and load additional css
-                $this->conf['pagecss'] = '/shared/css-v6/pagestyles/'.$this->conf['seiten_id'].'.css';
+                // check and load additional css.
+                // #51: This is now checked by the site caching in technikum29.php.
+                $this->conf['pagecss'] = $this->conf['host']->ressources_get_pagestyle($this->conf['seiten_id']);
                 $this->conf['has_pagecss'] = file_exists($this->conf['webroot'].$this->conf['pagecss']);
-                // FIXME: There is no caching check yet for this setting
-                //        (new pagecss file won't be detected and wont purge the tmpl cache)
                 
                 // setup html title