Fixes bugs and adds additional packages to package manager

Author: SourceCode

system/core/controller.php

@@ -60,14 +60,20 @@ public function getModel($model, $app, $namespace = 'Strider')
     public function render($view, Template $template)
     {
         $templateData = $template->toArray();
-        $twigLoader = new \Twig_Loader_Filesystem(Config::$viewStorage);
+        $app = Globals::app();
+        $controller = Globals::controller(); 
+        if ($app == null) $app = 'init';
+        if ($controller == null) $controller = $app;
+        $twigLoader = new \Twig_Loader_Filesystem(Config::$filePath . Config::$appStorage . $app . '/' . Config::$viewStorage);
         $twig = new \Twig_Environment($twigLoader, array('debug' => Config::$debugMode));
         if (Config::$debugMode)
         {
             $twig->addExtension(new \Twig_Extension_Debug());
         }
-        if (Config::$debugMode) $dataArray['sessionData'] = $_SESSION;
-        array_push($templateData, $templateData->toArray());
+        
+        $globals = Globals::toArray();
+        $templateData = array_merge($templateData, $globals);
+        dBug($templateData);
         echo $twig->render($view . '.' . Config::$viewFileType, $templateData);     
     }
 }

system/core/package.php

@@ -67,13 +67,29 @@ public function __construct()
                     'public/components/select2/select2-bootstrap.css'
                 )    
             ),
+            'metismenu' => array(
+                'js' => array(
+                    'public/components/metismenu/dist/metisMenu.min.js'
+                ),
+                'css' => array(
+                    'public/components/metismenu/dist/metisMenu.min.css'
+                )    
+            ),
             'tinymce' => array(
                 'js' => array(
                     'public/components/tinymce-dist/jquery.tinymce.min.js',
                     'public/components/tinymce-dist/tinymce.min.js'
                 ),
                 'css' => array(
-                    'public/components/tinymce-dist/themes/modern/theme.min.js'
+                    'public/components/tinymce-dist/themes/modern/theme.min.css'
+                )    
+            ),
+            'sbadmin2' => array(
+                'js' => array(
+                    'public/components/startbootstrap-sb-admin-2/dist/js/sb-admin-2.js'
+                ),
+                'css' => array(
+                    'public/components/startbootstrap-sb-admin-2/dist/css/sb-admin-2.css'
                 )    
             ),
         );        
@@ -103,8 +119,8 @@ public function getPackages(array $packageList)
             $item = $this->getPackage($package);
             if ($item != false)
             {
-                if (is_array($item['css'])) $css = array_merge($css, $item['css']);
-                if (is_array($item['js'])) $js = array_merge($js, $item['js']);
+                if (isset($item['css']) && is_array($item['css'])) $css = array_merge($css, $item['css']);
+                if (isset($item['js']) && is_array($item['js'])) $js = array_merge($js, $item['js']);
             }   
         }
 

system/core/template.php

@@ -36,7 +36,7 @@ public static function existValue($key)
 
     /**
     * Adds a JavaScript file to the JavaScript file list
-    * @param $file Adds a file to the JavaScript include list
+    * @param string $file The file to be added
     * @return bool Returns true if file was added, false if not
     */
     public static function addJs($file)
@@ -49,6 +49,24 @@ public static function addJs($file)
         return false;    
     }
 
+    /**
+    * Adds a list of JavaScript files to the JavaScript file list
+    * @param array $array List of files to be added
+    * @return bool Returns true if files were added, false if not
+    */
+    public static function addJsFiles(array $array)
+    {
+        if (!is_array($array)) return false;
+        foreach($array as $include)
+        {
+            if (!in_array($include, self::$jsIncludes))
+            {
+                self::$jsIncludes[] = $include;
+            }  
+        }
+        return true;  
+    }
+    
     /**
     * Adds a CSS file to the CSS file list
     * @param $file Adds a file to the CSS include list
@@ -64,6 +82,24 @@ public static function addCSS($file)
         return false;  
     }
 
+    /**
+    * Adds a CSS file to the CSS file list
+    * @param $file Adds a file to the CSS include list
+    * @return bool Returns true if file was added, false if not
+    */
+    public static function addCSSFiles(array $array)
+    {
+        if (!is_array($array)) return false;
+        foreach($array as $include)
+        {
+            if (!in_array($include, self::$cssIncludes))
+            {
+                self::$cssIncludes[] = $include;
+            }  
+        }
+        return true;  
+    }
+    
     /**
     * Returns the JavaScript include list as injectable HTML
     * @return string|null Returns a HTML rendered include list or null if no includes exist