Ticket #1249

inc/classes/BxDolPreloader.php

@@ -0,0 +1,119 @@
+<?php defined('BX_DOL') or die('hack attempt');
+/**
+ * Copyright (c) UNA, Inc - https://una.io
+ * MIT License - https://opensource.org/licenses/MIT
+ *
+ * @defgroup    UnaCore UNA Core
+ * @{
+ */
+
+bx_import('BxDolLanguages');
+
+define('BX_PRELOADER_TYPE_CSS', 'css_system');
+define('BX_PRELOADER_TYPE_JS', 'js_system');
+define('BX_PRELOADER_TYPE_JS_OPTION', 'js_option');
+define('BX_PRELOADER_TYPE_JS_TRANSLATION', 'js_translation');
+define('BX_PRELOADER_TYPE_JS_IMAGE', 'js_image');
+
+class BxDolPreloader extends BxDolFactory implements iBxDolSingleton
+{
+	protected $_oDb;
+
+	protected $_aEntries;
+
+	protected $_aTypes;
+	protected $_aMarkers;
+
+    protected function __construct()
+    {
+        parent::__construct();
+
+        $this->_oDb = new BxDolPreloaderQuery();
+
+        $this->_aEntries = $this->_oDb->getEntries();
+
+        $this->_aTypes = array(
+            BX_PRELOADER_TYPE_CSS => '', 
+            BX_PRELOADER_TYPE_JS => '', 
+            BX_PRELOADER_TYPE_JS_OPTION => '',
+            BX_PRELOADER_TYPE_JS_TRANSLATION => '',
+            BX_PRELOADER_TYPE_JS_IMAGE => ''
+        );
+        foreach($this->_aTypes as $sType => $sValue)
+            $this->_aTypes[$sType] = bx_gen_method_name('add_' . $sType);
+
+        $this->_aMarkers = array(
+            'dir_plugins_public' => BX_DIRECTORY_PATH_PLUGINS_PUBLIC
+        );
+    }
+
+    public function __clone()
+    {
+        if (isset($GLOBALS['bxDolClasses'][get_class($this)]))
+            trigger_error('Clone is not allowed for the class: ' . get_class($this), E_USER_ERROR);
+    }
+
+	public static function getInstance()
+    {
+        if(!isset($GLOBALS['bxDolClasses'][__CLASS__]))
+        	$GLOBALS['bxDolClasses'][__CLASS__] = new BxDolPreloader();
+
+		return $GLOBALS['bxDolClasses'][__CLASS__];
+    }
+
+    public function perform()
+    {
+        $oTemplate = BxDolTemplate::getInstance();
+        $aTypesAvail = array_keys($this->_aTypes);
+
+        $aLoader = array();
+        foreach($this->_aEntries as $aEntry) {
+            $sType = $aEntry['type'];
+            if(!in_array($sType, $aTypesAvail))
+                continue;
+
+            $sModule = $aEntry['module'];
+            $aLoader[$sModule][$sType][] = bx_replace_markers($aEntry['content'], $this->_aMarkers);
+        }
+
+        foreach($aLoader as $sModule => $aTypes) {
+            $sLocKey = '';
+            $bLocRemove = false;
+            $bLocRemoveJs = false;
+
+            $bModule = $sModule != 'system';
+            $oModule = $bModule ? BxDolModule::getInstance($sModule) : null;
+            if($bModule && !$oModule)
+                continue;
+
+            if($bModule) {
+                $sLocKey = $oModule->_oConfig->getName();
+                $sHomePath = $oModule->_oConfig->getHomePath();
+                $sHomeUrl = $oModule->_oConfig->getHomeUrl();
+
+                if(!$oTemplate->isLocation($sLocKey)) {
+                    $sLocKey = $oTemplate->addLocation($sLocKey, $sHomePath, $sHomeUrl);
+                    $bLocRemove = true;
+                }
+
+                if(!$oTemplate->isLocationJs($sLocKey)) {
+                    $sLocKey = $oTemplate->addLocationJs($sLocKey, $sHomePath . 'js/', $sHomeUrl . 'js/');
+                    $bLocRemoveJs = true;
+                }
+            }
+
+            foreach($aTypes as $sType => $aEntries)
+                 $oTemplate->{$this->_aTypes[$sType]}($aEntries);
+
+            if($bModule && $sLocKey != '') {
+                if($bLocRemove)
+                    $oTemplate->removeLocation($sLocKey);
+                
+                if($bLocRemoveJs)
+                    $oTemplate->removeLocationJs($sLocKey);
+            }
+        }
+    }
+}
+
+/** @} */

inc/classes/BxDolPreloaderQuery.php

@@ -0,0 +1,32 @@
+<?php defined('BX_DOL') or die('hack attempt');
+/**
+ * Copyright (c) UNA, Inc - https://una.io
+ * MIT License - https://opensource.org/licenses/MIT
+ *
+ * @defgroup    UnaCore UNA Core
+ * @{
+ */
+
+/**
+ * @see BxDolPreloader
+ */
+class BxDolPreloaderQuery extends BxDolDb
+{
+	public function __construct()
+    {
+    	parent::__construct();
+    }
+
+    public function &getEntries()
+    {
+        $sKey = 'bx_dol_cache_memory_preloader_entries';
+
+        if(!isset($GLOBALS[$sKey]))
+            $GLOBALS[$sKey] = $this->fromCache('sys_preloader_entries', 'getAll', "SELECT * FROM `sys_preloader` WHERE `active`='1'");
+
+        return $GLOBALS[$sKey];
+    }
+    
+}
+
+/** @} */

inc/classes/BxDolTemplate.php

@@ -436,50 +436,8 @@ class BxDolTemplate extends BxDolFactory implements iBxDolSingleton
             'injections' => array()
         );
 
-        //--- Load default CSS ---//
-        $this->addCssSystem(array(
-            'common.css',
-            'default.less',
-            'general.css',
-            'icons.css',
-            'colors.css',
-            'forms.css',
-            'media-desktop.css',
-            'media-tablet.css',
-            'media-phone.css',
-            'media-print.css',
-            BX_DIRECTORY_PATH_PLUGINS_PUBLIC . 'marka/|marka.min.css',
-            BX_DIRECTORY_PATH_PLUGINS_PUBLIC . 'at.js/css/|jquery.atwho.min.css',
-            BX_DIRECTORY_PATH_PLUGINS_PUBLIC . 'prism/|prism.css',
-        ));
-
-        //--- Load default JS ---//
-        $this->addJsSystem(array(
-            'jquery/jquery.min.js',
-            'jquery/jquery-migrate.min.js',
-            'jquery-ui/jquery.ui.position.min.js',
-            'spin.min.js',
-            'jquery.easing.js',
-            'jquery.cookie.min.js',
-            'moment-with-locales.min.js',
-            'functions.js',
-            'jquery.webForms.js',
-            'jquery.dolPopup.js',
-        	'jquery.dolConverLinks.js',
-            'marka/marka.min.js',
-            'headroom.min.js',
-            'at.js/js/jquery.atwho.min.js',
-            'prism/prism.js',
-        ));
-
-        //--- Load translations in JS ---//
-        bx_import('BxDolLanguages');
-        $this->addJsTranslation(array(
-            '_Are_you_sure',
-            '_error occured',
-            '_sys_loading',
-            '_copyright'
-        ));
+        //--- Load default CSS, JS, etc ---//
+        BxDolPreloader::getInstance()->perform();
 
         //--- Load injection's cache ---//
         if (getParam('sys_db_cache_enable')) {