fixes to system language and template

Author: webdevlabs

app/HomeController.php

@@ -12,7 +12,12 @@ public function __construct (Template $template) {
    public function showIndex()
     {
         $msg='Welcome';
-        $this->template->assign('page_title',$msg);
+        $title="webdevlabs";
+
+        $this->template->assign([
+            'page_title'=>$title,
+            'page_content'=>$msg
+        ]);
         return $this->template->display('layout.tpl');
     }    
 

app/views/layout.tpl

@@ -38,11 +38,13 @@
           <div class="masthead clearfix">
             <div class="inner">
               <h3 class="masthead-brand">{$page_title}</h3>
-              <nav>
+              <nav>{$requestURI}
                 <ul class="nav masthead-nav">
-                  <li class="active"><a href="#">Home</a></li>
-                  <li><a href="#features">Features</a></li>
-                  <li><a href="#contact">Contact</a></li>
+                  <li {if $requestURI eq '/'}class="active"{/if}><a href="{$BASE_URL}">Home</a></li>
+                  <li {if $requestURI eq '/admin'}class="active"{/if}><a href="{$BASE_URL}/admin">Admin</a></li>
+                  <li {if $requestURI eq '/admin/dashboard'}class="active"{/if}><a href="{$BASE_URL}/admin/dashboard">Dashboard</a></li>
+                  <li {if $requestURI eq '/test'}class="active"{/if}><a href="{$BASE_URL}/test">test</a></li>
+                  <li><a href="#">({$language})</a></li>
                 </ul>
               </nav>
             </div>
@@ -56,19 +58,19 @@
               <div class="features">
               <dl class="dl-horizontal">
                 <dt><a href="https://github.com/mrjgreen/phroute">Phroute</a></dt>
-                <dd>URL Routing</dd>
+                <dd>URL Router</dd>
               </dl>
               <dl class="dl-horizontal">
                 <dt><a href="https://github.com/PHP-DI/PHP-DI">PHP-DI</a></dt>
                 <dd>Dependency Injection Container</dd>
               </dl>
               <dl class="dl-horizontal">
                 <dt><a href="https://github.com/smarty-php/smarty">Smarty</a></dt>
-                <dd>template engine</dd>
+                <dd>Template Engine</dd>
               </dl>
               <dl class="dl-horizontal">
                 <dt><a href="https://github.com/tedious/www.stashphp.com">Stash</a></dt>
-                <dd>caching library</dd>
+                <dd>Caching Library</dd>
               </dl>
               </div>
             </p>
@@ -77,6 +79,10 @@
             </p>
           </div>
 
+          <div class="inner">
+          <h3>{$page_content}</h3>
+          </div>
+
           <div class="mastfoot">
             <div class="inner">
               <p>Cover template for <a href="http://getbootstrap.com">Bootstrap</a>, by <a href="https://twitter.com/mdo">@mdo</a>.</p>

bootstrap.php

@@ -11,6 +11,8 @@
  * 
  */
 
+error_reporting(1);
+
 include __DIR__ . '/config/system.php';
 include __DIR__ . '/config/cache.php';
 include __DIR__ . '/config/database.php';
@@ -51,9 +53,9 @@
 $URIparts = explode("/", $requestURI);
 // check if language is set by url
 if (in_array($URIparts[1], $language->available_languages)) {
-    $language->load($URIparts[1]);
     // rewrite requestURI
     $requestURI=after($URIparts[1],$requestURI);
+    $language->load($URIparts[1]);
 }else {
     $language->load('default');
 }
@@ -71,7 +73,9 @@
  */
  $session = $container->get('\System\Session');
  $session->start();
- 
+ $session->set('admin_id',1);
+ $session->set('requestURI',$requestURI);
+
  /**
   * Load System \System\Modules
   */

modules/admin/controllers/Dashboard.php

@@ -7,17 +7,18 @@ class Dashboard {
     private $template;
     public function __construct (Template $template) {
         $this->template = $template;
+        $this->template->assign('page_title','Admin Panel');
     }
 
    public function anyIndex() {
         $msg='Welcome Admin!';
-        $this->template->assign('page_title',$msg);
+        $this->template->assign('page_content',$msg);
         return $this->template->display('layout.tpl');
     }    
 
    public function getDashboard() {
         $msg='Welcome Admin! This is your dashboard';
-        $this->template->assign('page_title',$msg);
+        $this->template->assign('page_content',$msg);
         return $this->template->display('layout.tpl');
     }    
 

modules/test/front/controllers/Main.php

@@ -19,7 +19,8 @@ public function __construct (Template $template, Model $model) {
    public function showIndex()
     {
         $msg = $this->model->getMsg();
-        $this->template->assign('page_title',$msg);
+        $this->template->assign('page_title','Test title');
+        $this->template->assign('page_content',$msg);
         return $this->template->display('layout.tpl');
     }    
 

storage/cache/stash/.gitkeep

@@ -2,17 +2,16 @@
 namespace System;
 
 class Language {
-    
+    public $current;    
     public $available_languages = array('en', 'it', 'de', 'fr','bg');
 
-    public function __construct (Config $conf, Template $template) {
+    public function __construct (Config $conf) {
         $this->conf = $conf;
-        $this->template = $template;
     }
 
     public function load ($lang='default') {
         if ($lang=='default') { $lang='en'; }
-        $this->template->assign('language',$lang);
+        $this->current = $lang;
     }
 
 }

system/Language.php

@@ -11,18 +11,20 @@
  */
 
 namespace System;
+use DI\Container;
 
 class Template extends \Smarty {
 	private $req;
 	private $conf;
 
-	public function __construct (Config $conf) {
+	public function __construct (Config $conf, Language $language) {
 		parent::__construct();
 		$this->conf = $conf;
-
 		$this->setCompileCheck(true); // set true to require smarty check if the template file is modified
 		$this->force_compile = false; // set true only for debugging purposes
-
+		$requestURI = $_SESSION['requestURI'];
+		$this->assign('requestURI',$requestURI);
+		$this->assign('language',$language->current);
 		$this->setTemplateDir(ROOT_DIR.'/App/views/')
 		->setCompileDir(ROOT_DIR."/storage/cache/smarty")
 		->setCacheDir(ROOT_DIR."/storage/cache/smarty")
@@ -35,7 +37,7 @@ public function __construct (Config $conf) {
 		$this->registerPlugin('modifier', "roundmoney", array($this, 'roundmoney'));
 //		$this->registerPlugin('modifier', "ago", 'ago');
 		// if not logged in as admin
-		if (!$_SESSION['admin_id'] > "0") {
+		if (!$session->admin_id > "0") {
 			if ($this->conf->encode_output_emails == '1') {
 				$this->registerFilter("output", array($this, 'protect_email')); // encode email addresses
 			}