Changeset 9759

Timestamp:

03/23/09 05:32:02 (3 years ago)

Author:

Anton Lesnikov

Message:

Improvements for BxDolTemplate?

1. CSS cache
2. methods to add CSS files into head section
3. methods to modify page's info(title, description, etc)
4. <bx_text:_language_key />
5. Fix for template cache

Necessary changes in Wall, News, Feedback modules and some common files.

Location:

trunk

Files:

• cache_public (added)
• inc/classes/BxDolAdminTools.php (modified) (1 diff)
• inc/classes/BxDolTemplate.php (modified) (33 diffs)
• inc/params.inc.php (modified) (1 diff)
• index.php (modified) (1 diff)
• install/index.php (modified) (2 diffs)
• modules/boonex/feedback/classes/BxFdbTemplate.php (modified) (4 diffs)
• modules/boonex/news/classes/BxNewsTemplate.php (modified) (4 diffs)
• modules/boonex/news/templates/base/view.html (modified) (1 diff)
• modules/boonex/wall/classes/BxWallModule.php (modified) (2 diffs)
• modules/boonex/wall/templates/base/css/post.css (modified) (1 diff)
• profile.php (modified) (2 diffs)
• templates/base/_header.html (modified) (2 diffs)
• templates/base/css/common.css (modified) (1 diff)
• templates/base/scripts/BxBaseCmtsView.php (modified) (1 diff)
• templates/base/scripts/BxBaseSearchResultSharedMedia.php (modified) (1 diff)
• templates/tmpl_uni/page_150.html (modified) (1 diff)

trunk/inc/classes/BxDolAdminTools.php

@@ -53 +53 @@
             'backup',
             'cache',
+            'cache_public',
             'inc',
             'langs',

trunk/inc/classes/BxDolTemplate.php

@@ -32 +32 @@
 
 class BxDolTemplate extends BxDolMistake {
-    var $_sCode;
-    var $_sPageWidth;
+    /**
+     * Main fields
+     */
+    var $_sCode;    
     var $_sKeyWrapperHtml;
     var $_aLocations;
@@ -41 +43 @@
     var $_sFolderIcons;
     var $_aTemplates;
+    
+    /**
+     * Cache related fields
+     */
     var $_bCacheEnable;
-    var $_sCacheFolder;
+    var $_sCacheFolderUrl;
+    var $_sCacheFolderPath;
+    var $_sCachePublicFolderUrl;
+    var $_sCachePublicFolderPath;
     var $_sCacheFilePrefix;
-    var $_sCacheTable;
-    
+    var $_bCssCollect;
+    var $_bCssArchive;
+    var $_sCssCachePrefix;
+
     /**
      * Constructor
@@ -52 +63 @@
         parent::BxDolMistake();
         
-        $this->_sCode = isset($_COOKIE['skin']) ? $_COOKIE['skin'] : BX_DOL_TEMPLATE_DEFAULT_CODE;
-        $this->_sPageWidth = getParam('main_div_width');
+        $this->_sCode = isset($_COOKIE['skin']) ? $_COOKIE['skin'] : BX_DOL_TEMPLATE_DEFAULT_CODE;      
         $this->_sKeyWrapperHtml = '__';
         $this->_sFolderHtml = '';
@@ -59 +69 @@
         $this->_sFolderImages = 'images/';
         $this->_sFolderIcons = 'images/icons/';
-        
+        $this->_aTemplates = array();
+
         $this->addLocation('system', BX_DIRECTORY_PATH_ROOT, BX_DOL_URL_ROOT);
         
-        $this->_aTemplates = array();
+        $this->_bCacheEnable = true;
+        $this->_sCacheFolderUrl = BX_DOL_URL_CACHE;
+        $this->_sCacheFolderPath = BX_DIRECTORY_PATH_CACHE;
+        $this->_sCachePublicFolderUrl = BX_DOL_URL_CACHE_PUBLIC;
+        $this->_sCachePublicFolderPath = BX_DIRECTORY_PATH_CACHE_PUBLIC;
+        $this->_sCacheFilePrefix = "bx_templ_";
         
-        $this->_bCacheEnable = false;
-        $this->_sCacheFolder = BX_DIRECTORY_PATH_CACHE;
-        $this->_sCacheFilePrefix = "bx_templ_";
-        $this->_sCacheTable = "BxDolTemplateCache";
+        $this->_bCssCache = true;
+        $this->_bCssArchive = $this->_bCssCollect && false;
+        $this->_sCssCachePrefix = $this->_sCacheFilePrefix . 'css_';
     }
     /**
@@ -81 +96 @@
     /**
      * Initialize template engine.
-     * Note. The method is executed with the system, you shouldn't execute it in your subclass.
+     * Note. The method is executed with the system, you shouldn't execute it in your subclasses.
      */
     function init() {
@@ -112 +127 @@
         
         $GLOBALS['BxDolTemplateInjections'] = $aInjections;
+        
+        //--- Load page elements related static variables ---//         
+        $GLOBALS['oSysTemplatePageWidth'] = getParam('main_div_width');
+        $GLOBALS['oSysTemplatePageTitle'] = '';             
+        $GLOBALS['oSysTemplatePageKeywords'] = array();
+        $GLOBALS['oSysTemplatePageDescription']  = '';
+        $GLOBALS['oSysTemplatePageMainBoxTitle'] = '';
     }
     /**
@@ -164 +186 @@
      */
     function getPageWidth() {
-        return $this->_sPageWidth;
+        return $GLOBALS['oSysTemplatePageWidth'];
     }
     /**
@@ -172 +194 @@
      */
     function setPageWidth($sWidth) {
-        $this->_sPageWidth = $sWidth;
-    }
+        $GLOBALS['oSysTemplatePageWidth'] = $sWidth;
+    }
+    function setPageTitle($sTitle) {
+        $GLOBALS['oSysTemplatePageTitle'] = $sTitle;
+    }
+    function setPageMainBoxTitle($sTitle) {
+        $GLOBALS['oSysTemplatePageMainBoxTitle'] = $sTitle;
+    }
+    function setPageDescription($sDescription) {
+        $GLOBALS['oSysTemplatePageDescription'] = $sDescription;
+    }
+    function addPageKeywords($mixedKeywords) {
+        if(is_string($mixedKeywords))
+            $mixedKeywords = strpos($mixedKeywords, ',') !== false ? explode(',', $mixedKeywords) : array($mixedKeywords);
+
+        foreach($mixedKeywords as $iKey => $sValue)
+            $mixedKeywords[$iKey] = trim($sValue);
+
+        $GLOBALS['oSysTemplatePageKeywords'] = array_merge($GLOBALS['oSysTemplatePageKeywords'], $mixedKeywords);
+    }   
     /**
      * Get template, which was loaded earlier. 
@@ -190 +230 @@
      * @return string full URL.
      */
-    function getIconUrl($sName) {
-        return $this->_getAbsoluteLocation('url', $this->_sFolderIcons, $sName);
+    function getIconUrl($sName, $sCheckIn = BX_DOL_TEMPLATE_CHECK_IN_BOTH) {
+        return $this->_getAbsoluteLocation('url', $this->_sFolderIcons, $sName, $sCheckIn);
     }
     /**
@@ -199 +239 @@
      * @return string absolute path.
      */
-    function getIconPath($sName) {
-        return $this->_getAbsoluteLocation('path', $this->_sFolderIcons, $sName);
+    function getIconPath($sName, $sCheckIn = BX_DOL_TEMPLATE_CHECK_IN_BOTH) {
+        return $this->_getAbsoluteLocation('path', $this->_sFolderIcons, $sName, $sCheckIn);
     }
     /**
@@ -208 +248 @@
      * @return string full URL.
      */
-    function getImageUrl($sName) {
-        return $this->_getAbsoluteLocation('url', $this->_sFolderImages, $sName);
+    function getImageUrl($sName, $sCheckIn = BX_DOL_TEMPLATE_CHECK_IN_BOTH) {
+        return $this->_getAbsoluteLocation('url', $this->_sFolderImages, $sName, $sCheckIn);
     }
     /**
@@ -217 +257 @@
      * @return string absolute path.
      */
-    function getImagePath($sName) {
-        return $this->_getAbsoluteLocation('path', $this->_sFolderImages, $sName);
+    function getImagePath($sName, $sCheckIn = BX_DOL_TEMPLATE_CHECK_IN_BOTH) {
+        return $this->_getAbsoluteLocation('path', $this->_sFolderImages, $sName, $sCheckIn);
     }
     /**
@@ -226 +266 @@
      * @return string full URL.
      */
-    function getCssUrl($sName) {        
-        return $this->_getAbsoluteLocation('url', $this->_sFolderCss, $sName);
+    function getCssUrl($sName, $sCheckIn = BX_DOL_TEMPLATE_CHECK_IN_BOTH) {     
+        return $this->_getAbsoluteLocation('url', $this->_sFolderCss, $sName, $sCheckIn);
+    }
+    /**
+     * Get full Path of CSS file.
+     *
+     * @param string $sName - CSS file name.
+     * @return string full URL.
+     */
+    function getCssPath($sName, $sCheckIn = BX_DOL_TEMPLATE_CHECK_IN_BOTH) {        
+        return $this->_getAbsoluteLocation('path', $this->_sFolderCss, $sName, $sCheckIn);
     }
     /**
@@ -314 +363 @@
      * @return string value associated with the key.
      */
-    function parseSystemKey($sKey) {
+    function parseSystemKey($sKey, $mixedKeyWrapperHtml = null) {
         global $site;               
         global $_page;
         global $oFunctions;
-        global $oTemplConfig;       
+        global $oTemplConfig;
+        
+        $aKeyWrappers = $this->_getKeyWrappers($mixedKeyWrapperHtml);
 
         $sRet = '';
         switch( $sKey ) {
-            case 'page_charset':
+            case 'include_css':             
+                $this->addCss($_page['css_name']);
+                $sRet = $this->includeCss();
+                break;
+            case 'page_charset':
                 $sRet = 'UTF-8'; 
                 break;
+            case 'page_keywords':
+                if(!empty($GLOBALS['oSysTemplatePageKeywords']) && is_array($GLOBALS['oSysTemplatePageKeywords']))
+                    $sRet = '<meta name="keywords" content="' . process_line_output(implode(',', $GLOBALS['oSysTemplatePageKeywords'])) . '" />';
+                break;
+            case 'page_description':                
+                if(!empty($GLOBALS['oSysTemplatePageDescription']) && is_string($GLOBALS['oSysTemplatePageDescription']))
+                    $sRet = '<meta name="description" content="' . process_line_output($GLOBALS['oSysTemplatePageDescription']) . '" />';
+                break;
+            case 'page_header':                
+                if(!empty($GLOBALS['oSysTemplatePageTitle']))
+                    $sRet = process_line_output($GLOBALS['oSysTemplatePageTitle']);
+                break;
+            case 'page_header_text':
+                if(!empty($GLOBALS['oSysTemplatePageMainBoxTitle']))
+                    $sRet = process_line_output($GLOBALS['oSysTemplatePageMainBoxTitle']);
+                break;
+            case 'main_div_width':                
+                if(!empty($GLOBALS['oSysTemplatePageWidth']))
+                    $sRet = process_line_output($GLOBALS['oSysTemplatePageWidth']);
+                break;
+                
+
+                
             case 'site_url':
                 $sRet = BX_DOL_URL_ROOT;
@@ -334 +412 @@
                 $sRet = $site['images'];
                 break;
+/*
             case 'css_dir':
                 $sRet = $site['css_dir'];
                 break;
+*/
             case 'base_menu_dir':
                 $sRet = "templates/base/menu/";
@@ -348 +428 @@
             case 'zodiac':
                 $sRet = $site['zodiac'];
-                break;
-            case 'switch_lang_block': 
-                $sRet = getLangSwitcher();
-                break;
+                break;          
             case 'main_logo':
                 $sRet = getMainLogo();
@@ -368 +445 @@
             case 'thumb_height':
                 $sRet = getParam('max_thumb_height');
-                break;
-            case 'main_div_width':
-                $sRet = $this->getPageWidth();
-                break;
+                break;          
+            case 'switch_lang_block': 
+                $sRet = getLangSwitcher();
+                break;
             case 'switch_skin_block':
                 $sRet = getParam("enable_template") ? templates_select_txt() : ''; 
@@ -381 +458 @@
                 $sRet = getDolLangCode();
                 break;
-            case 'meta_keywords':
-                $sMetaKeyWord = process_line_output( getParam("MetaKeyWords") );
-                if ($sMetaKeyWord != '' && strrchr($_SERVER['PHP_SELF'], '/') == '/index.php')
-                    $sRet = '<meta name="keywords" content="' . $sMetaKeyWord . '" />';
-            break;
-            case 'meta_description':
-                $sMetaDescription = process_line_output( getParam("MetaDescription") );
-                if ($sMetaDescription != '' && strrchr($_SERVER['PHP_SELF'], '/') == '/index.php')
-                    $sRet = '<meta name="description" content="'. $sMetaDescription . '" />';
-            break;          
             case 'top_menu':
                 $sRet = $GLOBALS['oTopMenu'] -> getCode();
@@ -396 +463 @@
             case 'extra_js':         
                 $sRet = $_page['extra_js'];
-                break;
+                break; 
+            /*
             case 'extra_css':
                 $sRet = $_page['extra_css'];
                 break;
-            case 'page_header':
-                $sRet = $_page['header'];
-                break;
-            case 'page_header_text':
-                $sRet = $_page['header_text'];
-                break;
+            case 'styles':
+                $sRet = $this->processStyles($_page['css_name']);
+                break;
+            */
+            
             case 'banner_top':
                 $sRet = banner_put_nv(1);
@@ -424 +491 @@
                 $sRet = _t( '_copyright',   date('Y') ) . getVersionComment(); 
                 break;
-            case 'styles':
-                $sRet = $this->processStyles($_page['css_name']);
-                break;
             case 'java_script':
                 if( strlen( $_page['js_name'] ) ) {
@@ -474 +538 @@
                 break;
             default:
-                $sRet = ($sTemplAdd = $oFunctions->TemplPageAddComponent($sKey)) !== false ? $sTemplAdd : '__' . $sKey . '__';
+                $sRet = ($sTemplAdd = $oFunctions->TemplPageAddComponent($sKey)) !== false ? $sTemplAdd : $aKeyWrappers['left'] . $sKey . $aKeyWrappers['right'];
             }
 
@@ -498 +562 @@
 
         $sCacheVariableName = "a";
-        $sCacheAbsolutePath = $this->_sCacheFolder . $this->_getCacheFileName($sAbsolutePath) . '.php';
+        $sCacheAbsolutePath = $this->_sCacheFolderPath . $this->_getCacheFileName('html', $sAbsolutePath) . '.php';
 
         $mixedWriteResult = false;
         $bExists = file_exists($sCacheAbsolutePath);
-        if(!$bExists && ($rHandler = fopen($sCacheAbsolutePath, 'w')) && ($sContent = file_get_contents($sAbsolutePath))) {
-            $mixedWriteResult = fwrite($rHandler, $this->_compileContent($sContent, "\$" . $sCacheVariableName, 1, $aVariables, $mixedKeyWrapperHtml));
-            fclose($rHandler);
-        }
+        if(!$bExists && ($sContent = file_get_contents($sAbsolutePath)) !== false && ($sContent = $this->_compileContent($sContent, "\$" . $sCacheVariableName, 1, $aVariables, $mixedKeyWrapperHtml)) !== false)
+            if(($rHandler = fopen($sCacheAbsolutePath, 'w')) !== false) {
+                $mixedWriteResult = fwrite($rHandler, $sContent);
+                fclose($rHandler);
+            }
 
         if($bExists || (!$bExists && $mixedWriteResult !== false)) {
@@ -519 +584 @@
 
         return false;
-    }
-    
-    /**
-     * Conver incomming CSS file/s into HTML representation.
-     *
-     * @param mixed $mixedFiles - single file name or array of file names.
-     * @return string the result of operation.
-     */
-    function processStyles($mixedFiles) {
-        if(empty($mixedFiles)) return '';
-
-        if(is_array($mixedFiles)) {
-            $sReturn = '';
-            foreach ($mixedFiles as $sFile)
-                $sReturn .= $this->_wrapInCssTag($sFile);
-        }
-        else if(is_string($mixedFiles))
-           $sReturn = $this->_wrapInCssTag($mixedFiles);
-
-        return $sReturn;
-    }
-    /**
-     * Include CSS file(s) in head section of current page.
-     *
-     * @param  mixed $mixedFiles - single file name or array of file names.
-     */
-    function includeStyles($mixedFiles) {
-        $sCss = $this->processStyles($mixedFiles);
-
-        BxDolTemplate::addInjection('styles', 'text', $sCss, 0);
+    }    
+    function addCss($mixedFiles){
+        return $this->_processCss('add', $mixedFiles);
+    }
+    function deleteCss($mixedFiles){
+        return $this->_processCss('delete', $mixedFiles);
+    }
+    /**
+     * Include CSS file(s) attached to the page in its head section.
+     * @see the method is system and would be called automatically.
+     * 
+     * @return string the result CSS code.
+     */
+    function includeCss() {
+        $aFiles = isset($GLOBALS['BxDolTemplateCss']) ? $GLOBALS['BxDolTemplateCss'] : array();
+        if(empty($aFiles) || !is_array($aFiles))
+            return "";
+
+        if(!$this->_bCssCache) 
+            return $this->_includeCss($aFiles);
+
+        //--- If cache already exists, return it ---//
+        ksort($aFiles);
+        
+        $sName = "";
+        foreach($aFiles as $aFile)
+            $sName .= $aFile['url'];
+        $sName = $this->_getCacheFileName('css', $sName);
+
+        $sCacheAbsoluteUrl = $this->_sCachePublicFolderUrl . $sName . '.css';
+        $sCacheAbsolutePath = $this->_sCachePublicFolderPath . $sName . '.css';     
+        if(file_exists($sCacheAbsolutePath))
+           return $this->_wrapInCssTag($sCacheAbsoluteUrl);
+                
+        //--- Collect all attached CSS in one file ---//
+        $sResult = "";
+        foreach($aFiles as $aFile) {
+            $aIncluded = array();
+            $aFileInfo = pathinfo($aFile['path']);
+            if(($sContent = $this->_compileCss($aFileInfo['dirname'] . '/', $aFileInfo['basename'], $aIncluded)) !== false)
+                $sResult .= $sContent;
+        }
+        
+        $mixedWriteResult = false;
+        if(!empty($sResult) && ($rHandler = fopen($sCacheAbsolutePath, 'w')) !== false) {
+            $mixedWriteResult = fwrite($rHandler, $sResult);
+            fclose($rHandler);
+        }
+        
+        if($mixedWriteResult === false)
+            return $this->_includeCss($aFiles);
+
+        //--- Archive the file if it's needed ---//
+        if($this->_bCssArchive) {
+            //TODO: process archiving.
+        }   
+
+        return $this->_wrapInCssTag($sCacheAbsoluteUrl);
+    }
+    /**
+     * Compile CSS files' structure(@see @import css_file_path) in one file.
+     *
+     * @param unknown_type $aFile
+     * @return unknown
+     */
+    function _compileCss($sPath, $sName, &$aIncluded) {
+        if(isset($aIncluded[$sPath . '_' . $sName]))
+           return '';
+
+        $sContent = file_get_contents($sPath . $sName);
+        if(empty($sContent))
+            return '';
+
+        $aIncluded[$sPath . '_' . $sName] = 1;
+        
+        $aSearch = array(
+            "'@import\s+url\s*\(\s*([a-zA-Z0-9\.\/_-]+)\s*\)\s*;'e",
+            "'background-image\s*:\s*url\s*\(\s*([a-zA-Z0-9\.\/_-]+)\s*\)\s*;'e",
+        );
+        $aReplace = array(
+            "\$this->_compileCss(realpath(\$sPath . dirname('\\1')) . '/', basename('\\1'), \$aIncluded)",
+            "'background-image:url(' . str_replace(BX_DIRECTORY_PATH_ROOT, BX_DOL_URL_ROOT, realpath(\$sPath . dirname('\\1')) . '/' . basename('\\1')) . ');'"
+        );
+        $sContent = preg_replace($aSearch, $aReplace, $sContent);
+        return $sContent;        
+    }
+    /**
+     * Include CSS files without caching.
+     *
+     * @param unknown_type $aFiles
+     * @return unknown
+     */
+    function _includeCss(&$aFiles) {
+        $sResult = "";
+        foreach($aFiles as $aFile)
+           $sResult .= $this->_wrapInCssTag($aFile['url']);
+
+        return $sResult;
+    }
+    /**
+     * Insert/Delete CSS file from output stack.
+     *
+     * @param unknown_type $sAction
+     * @param unknown_type $mixedFiles
+     * @return unknown
+     */
+    function _processCss($sAction, $mixedFiles) {
+        if(empty($mixedFiles))
+            return false;
+
+        if(is_string($mixedFiles))
+            $mixedFiles = array($mixedFiles);
+
+        foreach($mixedFiles as $sFile) {
+            $sUrl = $this->getCssUrl($sFile);
+            $sPath = $this->getCssPath($sFile);
+
+            if($sAction == 'add')
+                $GLOBALS['BxDolTemplateCss'][] = array('url' => $sUrl, 'path' => $sPath);
+            else if($sAction == 'delete')
+                foreach($GLOBALS['BxDolTemplateCss']  as $iKey => $aValue)
+                    if($aValue['url'] == $sUrl) {
+                        unset($GLOBALS['BxDolTemplateCss'][$iKey]);
+                        break;
+                    }
+        }
+        
+        return true;
     }
     
@@ -605 +768 @@
             "'<bx_include_base:([^\s]+) \/>'se",
             "'<bx_image_url:([^\s]+) \/>'se",
-            "'<bx_icon_url:([^\s]+) \/>'se"
+            "'<bx_icon_url:([^\s]+) \/>'se",
+            "'<bx_text:([^\s]+) \/>'se"
         ));
         $aValues = array_merge($aValues, array(
@@ -611 +775 @@
             "\$this->parseHtmlByName('\\1', \$aVariables, \$mixedKeyWrapperHtml, BX_DOL_TEMPLATE_CHECK_IN_BASE)",
             "\$this->getImageUrl('\\1')",
-            "\$this->getIconUrl('\\1')"
+            "\$this->getIconUrl('\\1')",
+            "_t('\\1')"
         ));
 
@@ -617 +782 @@
         $sContent = preg_replace($aKeys, $aValues, $sContent);
         //--- Parse System Keys ---//
-        $sContent = preg_replace( "'" . $aKeyWrappers['left'] . "([a-zA-Z0-9_-]+)" . $aKeyWrappers['right'] . "'e", "\$this->parseSystemKey('\\1')", $sContent);
+        $sContent = preg_replace( "'" . $aKeyWrappers['left'] . "([a-zA-Z0-9_-]+)" . $aKeyWrappers['right'] . "'e", "\$this->parseSystemKey('\\1', \$mixedKeyWrapperHtml)", $sContent);
 
         return $sContent;
@@ -647 +812 @@
                 $sValue = '';
                 if(isset($aMatches[1]) && !empty($aMatches[1])) {
-                    if(is_array($aValues[$i])) {
-                        $sIndex = "\$" . str_repeat("i", $iVarDepth);
-                        $sValue .= "<? for(" . $sIndex . "=0; " . $sIndex . "<count(" . $aVarName . "['" . $aKeys[$i] . "']); " . $sIndex . "++){ ?>";
-                        $sValue .= $this->_compileContent($aMatches[1], $aVarName . "['" . $aKeys[$i] . "'][" . $sIndex . "]", ++$iVarDepth, current($aValues[$i]), $mixedKeyWrapperHtml);
-                        $sValue .= "<?}?>";
-                    }
-                    else if(is_string($aValues[$i]))
-                        $sValue .= $aValues[$i];
+                    if(empty($aValues[$i]) || !is_array($aValues[$i]))
+                        return false;
+
+                    $sIndex = "\$" . str_repeat("i", $iVarDepth);                    
+                    $sValue .= "<? if(is_array(" . $aVarName . "['" . $aKeys[$i] . "'])) for(" . $sIndex . "=0; " . $sIndex . "<count(" . $aVarName . "['" . $aKeys[$i] . "']); " . $sIndex . "++){ ?>";
+                    if(($sInnerValue = $this->_compileContent($aMatches[1], $aVarName . "['" . $aKeys[$i] . "'][" . $sIndex . "]", ++$iVarDepth, current($aValues[$i]), $mixedKeyWrapperHtml)) === false)
+                        return false;
+                    $sValue .= $sInnerValue;
+                    $sValue .= "<?} else if(is_string(" . $aVarName . "['" . $aKeys[$i] . "'])) echo " . $aVarName . "['" . $aKeys[$i] . "']; ?>";
                 }
             }
@@ -665 +831 @@
                 $sValue = '';
                 if(isset($aMatches[1]) && !empty($aMatches[1]) && is_array($aValues[$i]) && isset($aValues[$i]['condition']) && isset($aValues[$i]['content'])) {
+                    if(empty($aValues[$i]['content']) || !is_array($aValues[$i]['content']))
+                        return false;
+
                     $sValue .= "<? if(" . $aVarName . "['" . $aKeys[$i] . "']['condition']){ ?>";
-                    $sValue .= $this->_compileContent($aMatches[1], $aVarName . "['" . $aKeys[$i] . "']['content']", $iVarDepth, $aValues[$i]['content'], $mixedKeyWrapperHtml);
+                    if(($sInnerValue = $this->_compileContent($aMatches[1], $aVarName . "['" . $aKeys[$i] . "']['content']", $iVarDepth, $aValues[$i]['content'], $mixedKeyWrapperHtml)) === false)
+                        return false;
+                    $sValue .= $sInnerValue;
                     $sValue .= "<?}?>";
                 }
@@ -683 +854 @@
             "'<bx_include_tmpl:([^\s]+) \/>'se",            
             "'<bx_image_url:([^\s]+) \/>'se",
-            "'<bx_icon_url:([^\s]+) \/>'se"
+            "'<bx_icon_url:([^\s]+) \/>'se",
+            "'<bx_text:([^\s]+) \/>'se"
         ));
         $aValues = array_merge($aValues, array(
@@ -689 +861 @@
             "\$this->getCached('\\1', \$aVarValues, BX_DOL_TEMPLATE_CHECK_IN_TMPL, false)",
             "\$this->getImageUrl('\\1')",
-            "\$this->getIconUrl('\\1')"
+            "\$this->getIconUrl('\\1')",
+            "_t('\\1')"
         ));
 
@@ -695 +868 @@
         $sContent = preg_replace($aKeys, $aValues, $sContent);
         //--- Parse System Keys ---//
-        $sContent = preg_replace( "'" . $aKeyWrappers['left'] . "([a-zA-Z0-9_-]+)" . $aKeyWrappers['right'] . "'", "<?=\$this->parseSystemKey('\\1');?>", $sContent);
+        $sContent = preg_replace( "'" . $aKeyWrappers['left'] . "([a-zA-Z0-9_-]+)" . $aKeyWrappers['right'] . "'", "<?=\$this->parseSystemKey('\\1', \$mixedKeyWrapperHtml);?>", $sContent);
 
         return $sContent;
@@ -753 +926 @@
      */
     function _wrapInCssTag($sFile) {
-        return '<link href="' . $this->getCssUrl($sFile) . '" rel="stylesheet" type="text/css" />';
+        return '<link href="' . $sFile . '" rel="stylesheet" type="text/css" />';
     }
     /**
@@ -771 +944 @@
      * @return string the result of operation.
      */
-    function _getCacheFileName($sAbsolutePath) {
-        return  $this->_sCacheFilePrefix . str_replace(array(BX_DIRECTORY_PATH_ROOT, '/'), array('', '_'), $sAbsolutePath);
+    function _getCacheFileName($sType, $sAbsolutePath) {
+        $sResult = "";
+        switch($sType) {
+            case 'html':
+                $sResult = $this->_sCacheFilePrefix . str_replace(array(BX_DIRECTORY_PATH_ROOT, '/'), array('', '_'), $sAbsolutePath);
+                break;
+            case 'css':
+                $sResult = $this->_sCssCachePrefix . md5($sAbsolutePath);
+                break;
+            case 'js':
+                $sResult = "";
+                break;
+        }
+
+        return $sResult;
     }
     

trunk/inc/params.inc.php

@@ -26 +26 @@
 $oSysTemplate = new BxDolTemplate();
 $oSysTemplate->init();
+$oSysTemplate->addCss(array('general.css', 'anchor.css'));
 
 /**

trunk/index.php

@@ -61 +61 @@
 
 $_page['name_index']    = 1;
-$_page['header']        = $site['title'];
-$_page['header_text']   = $site['title'];
-$_page['css_name']      = 'index.css';
+
+$oSysTemplate->setPageTitle($site['title']);
+$oSysTemplate->setPageDescription(getParam("MetaDescription"));
+$oSysTemplate->setPageMainBoxTitle($site['title']);
+$oSysTemplate->addPageKeywords(getParam("MetaKeyWords"));
+$oSysTemplate->addCss('index.css');
 
 $oIPV = new BxTemplIndexPageView();

trunk/install/index.php

@@ -121 +121 @@
 define('BX_DOL_URL_PROFILE_BACKGROUNDS', \$site['profileBackground']);
 define('BX_DOL_URL_MODULES', \$site['url'] . 'modules/' );
+define('BX_DOL_URL_CACHE_PUBLIC', \$site['url'] . 'cache_public/');
 
 define('BX_DIRECTORY_PATH_INC', \$dir['inc']);
@@ -130 +131 @@
 define('BX_DIRECTORY_PATH_DBCACHE', \$dir['cache']);
 define('BX_DIRECTORY_PATH_MODULES', \$dir['root'] . 'modules/' );
+define('BX_DIRECTORY_PATH_CACHE_PUBLIC', \$dir['root'] . 'cache_public/' );
 
 define('DATABASE_HOST', \$db['host']);

trunk/modules/boonex/feedback/classes/BxFdbTemplate.php

@@ -59 +59 @@
         );
         $aResult = array(
+            'include_css' => $this->_processCss('add', array('view.css', 'cmts.css')),
             'filter' => $oSearchResult->showAdminFilterPanel($aParams['filter_value'], 'feedback-filter-txt', 'feedback-filter-chb', 'feedback-filter'),
             'content' => $this->displayList($aParams),
@@ -64 +65 @@
         );
         $aResult = array_merge($aResult, $this->_getViewJs());
-        $aResult = array_merge($aResult, $this->_getViewCss());
                 
         return $this->parseHtmlByName('admin.html', $aResult);
@@ -73 +73 @@
         );
         $aResult = array_merge($aResult, $this->_getViewJs());
-        $aResult = array_merge($aResult, $this->_getViewCss());
-                
+
+        $this->addCss(array('view.css', 'cmts.css'));
         return $this->parseHtmlByName('view.html', $aResult);
     }
@@ -177 +177 @@
         );
     }
-    /**
-     * Prepare CSS paramaters.
-     */
-    function _getViewCss() {
-        return array(
-           'include_css' => $this->processStyles(array('view.css', 'cmts.css', 'forms_adv.css'))
-        );
-    }
 }
 ?>

trunk/modules/boonex/news/classes/BxNewsTemplate.php

@@ -63 +63 @@
         );
         $aResult = array(
+            'include_css' => $this->_processCss('add', array('view.css', 'cmts.css')),
             'filter' => $oSearchResult->showAdminFilterPanel($aParams['filter_value'], 'news-filter-txt', 'news-filter-chb', 'news-filter'),
             'content' => $this->displayList($aParams),
@@ -68 +69 @@
         );
         $aResult = array_merge($aResult, $this->_getViewJs());
-        $aResult = array_merge($aResult, $this->_getViewCss());
                 
         return $this->parseHtmlByName('admin.html', $aResult);
@@ -77 +77 @@
         );
         $aResult = array_merge($aResult, $this->_getViewJs());
-        $aResult = array_merge($aResult, $this->_getViewCss());
-                
+        
+        $this->addCss(array('view.css', 'cmts.css'));
         return $this->parseHtmlByName('view.html', $aResult);
     }
@@ -177 +177 @@
         );
     }
-    /**
-     * Prepare CSS paramaters.
-     */
-    function _getViewCss() {
-        return array(
-           'include_css' => $this->processStyles(array('view.css', 'cmts.css'))
-        );
-    }
 }
 ?>

trunk/modules/boonex/news/templates/base/view.html

@@ -1 @@
-__include_css__
 <div class="news-view">
     <script language="javascript" type="text/javascript" src="__include_js_url__"></script>

trunk/modules/boonex/wall/classes/BxWallModule.php

@@ -298 +298 @@
         );                
         
-        $this->_oTemplate->includeStyles('post.css');
+        $this->_oTemplate->addCss('post.css');
         $sRes = array($this->_oTemplate->parseHtmlByName('post.html', $aVariables), $aTopMenu, array(), true, 'getBlockCaptionMenu');
         return $sRes;
@@ -346 +346 @@
         );
 
-        $this->_oTemplate->includeStyles('view.css');
+        $this->_oTemplate->addCss('view.css');
         return array($this->_oTemplate->parseHtmlByName('view.html', $aVariables), $aTopMenu, array(), true, 'getBlockCaptionMenu');
     }

trunk/modules/boonex/wall/templates/base/css/post.css

@@ -1 @@
-div.wall-post {    
+div.wall-post {
     position: relative;
 }

trunk/profile.php

@@ -66 +66 @@
 $oProfile = new BxBaseProfileGenerator( $profileID );
 
+$oProfile->oCmtsView->getExtraCss();
+
 $_page['extra_js']  =
     $oTemplConfig -> sTinyMceEditorMiniJS .
@@ -72 +74 @@
     '<script type="text/javascript">urlIconLoading = "'.getTemplateIcon('loading.gif').'";</script>';
 
-$_page['extra_css'] = $oProfile -> genProfileCSS( $profileID ) . $oProfile->oCmtsView->getExtraCss();
+$_page['extra_css'] = $oProfile -> genProfileCSS( $profileID );
 $p_arr              = $oProfile -> _aProfile;
 

trunk/templates/base/_header.html

@@ -5 +5 @@
     <base href="__site_url__" />
     <meta http-equiv="Content-Type" content="text/html; charset=__page_charset__" />
-
-    __meta_description__
-    __meta_keywords__
-
+    __page_description__
+    __page_keywords__
     <meta http-equiv="Content-Style-Type" content="text/css" />
     <style>
@@ -15 +13 @@
         }
     </style>
-    
-    <link href="__css_dir__general.css" rel="stylesheet" type="text/css" />
-    <link href="__css_dir__anchor.css" rel="stylesheet" type="text/css" />
+    __include_css__
 
     __menu_css__
+    <!--
     __styles__
     __extra_css__
-
+    -->
     __java_script__
     __dol_images__

trunk/templates/base/css/common.css

@@ -255 +255 @@
     height: 28px;
     line-height: 28px;
-    /*position:relative;*/
+    position:relative;
     font-weight: normal;
 }

trunk/templates/base/scripts/BxBaseCmtsView.php

@@ -183 +183 @@
     function getExtraCss ()
     {
-        global $site;
-        global $tmpl;
-        return '<link href="'.$site['url'].'templates/tmpl_'.$tmpl.'/css/cmts.css" rel="stylesheet" type="text/css" />';
+        $GLOBALS['oSysTemplate']->addCss('cmts.css');
     }
 

trunk/templates/base/scripts/BxBaseSearchResultSharedMedia.php

@@ -368 +368 @@
             $sModulePart = $this->getModuleFolder() . '/';
             $oSysTemplate->addLocation($this->aCurrent['name'], BX_DIRECTORY_PATH_MODULES . $sModulePart, BX_DOL_URL_MODULES . $sModulePart);
-            return $sCode = $oSysTemplate->processStyles(array('search.css'));
+            $oSysTemplate->addCss(array('search.css'));
+            return '';
         }
     }

trunk/templates/tmpl_uni/page_150.html

@@ -4 +4 @@
     <title>__page_header__</title>
     <meta http-equiv="Content-Type" content="text/html; charset=__page_charset__" />
-    <meta http-equiv="refresh" content="1;URL=__url_relocate__" />
-    
+    <meta http-equiv="refresh" content="1;URL=__url_relocate__" />  
     <meta http-equiv="Content-Style-Type" content="text/css" />
-    <link href="__css_dir__general.css" rel="stylesheet" type="text/css" />
-    <link href="__css_dir__anchor.css" rel="stylesheet" type="text/css" />
-    __styles__
+    __include_css__
     <script src="inc/js/functions.js" type="text/javascript" language="javascript"></script>
     <script src="plugins/jquery/jquery.js" type="text/javascript" language="javascript"></script>