system update

Author: webdevlabs

system/Language.php

@@ -8,8 +8,7 @@ class Language {
     public function __construct (Config $conf) {
         $this->conf = $conf;
         $this->default = 'en';
-        $this->current = $this->default;
-//        print_r(DB::fetch('SELECT * from `languages`'));
+        //$this->current = $this->default; // moved to middleware
     }
 
 }

system/Template.php

@@ -26,22 +26,15 @@ public function loadSystem () {
         $this->force_compile = true; // set true only for debugging purposes
 
         $this->assign('requestURI',$_SESSION['requestURI']);
-        $this->assign('language',$this->language->current);
-        if ($this->language->default !== $this->language->current) {
-            $baseurl = BASE_URL.'/'.$this->language->current;
-        }else {
-            $baseurl = BASE_URL;
-        }		
-        $this->assign('baseurl',$baseurl);
 
         $this->setTemplateDir($this->conf->template['template_dir'])
         ->setCompileDir($this->conf->template['compile_dir'])
         ->setCacheDir($this->conf->template['cache_dir'])
         ->setConfigDir($this->conf->template['languages_dir'])
         ->addPluginsDir($this->conf->template['plugins_dir']);
-
         $this->applyCacheSettings();
-
+        $this->assignLanguage();
+        
         $this->loadFilter('output', 'trimwhitespace'); // enable smarty internal html minifier
 
         // Set template variables
@@ -54,6 +47,22 @@ public function loadSystem () {
         }
     }
 
+    public function assignLanguage()
+    {
+        $this->assign('language',$this->language->current);
+        $this->assign('defaultLang',$this->language->default);
+        if ($this->language->default !== $this->language->current) {
+            $baseurl = BASE_URL.'/'.$this->language->current;
+        }else {
+            $baseurl = BASE_URL;
+        }		
+        $this->assign('baseurl',$baseurl);
+        $langfile = ROOT_DIR.'/storage/languages/'.$this->language->current.'.ini';
+        if (is_file($langfile)) {
+            $this->configLoad($langfile);
+            $this->language->vars = parse_ini_file($langfile);		    
+        }
+    }
     /**
      * Override Smarty's built-in 'display' function
      *

system/functions.php

@@ -17,9 +17,29 @@
 function lang ($value) {
   $grp=before('.',$value);
   $val=after('.',$value);
-  return \System\lang::$lang_vars[$grp][$val];
+  return \System\Language::$lang_vars[$grp][$val];
 }
 
+	/**
+	 * Send Redirect request to browser
+	 *
+	 * @param string $url
+	 * @return mixed
+	 */
+ function redirect($url, $type = 'header') {
+		if (!headers_sent() and $type == 'header') {
+			header('Location: '.$url);
+      flush();
+		} else {
+			echo '<script type="text/javascript">';
+			echo 'window.location.href="'.$url.'";';
+			echo '</script>';
+			echo '<noscript>';
+			echo '<meta http-equiv="refresh" content="0;url='.$url.'" />';
+			echo '</noscript>';
+		}
+	}
+
 /**
  * Convert size format to bytes
  *

system/middlewares/LanguageDetect.php

@@ -45,6 +45,9 @@ public function __invoke(ServerRequestInterface $request, ResponseInterface $res
                 //remove the language in the path
                 $request = $request->withUri($uri->withPath('/'.array_shift($dirs)));
                 $this->language->current = $language;
+            }else {
+                $this->language->current = $this->language->default;
+                $this->language->notOrigin = true;
             }
         return $next($request, $response);
     }

system/middlewares/Phroute.php

@@ -40,10 +40,10 @@ public function __invoke(ServerRequestInterface $request, ResponseInterface $res
         try {
             $_SESSION['requestURI']=$request->getUri()->getPath();
             ob_start();
-            $this->router->dispatch($request->getMethod(), $request->getUri()->getPath());
-            $bufferedBody = ob_get_clean();
-            $response->getBody()->write($bufferedBody);
-            $response = $response->withStatus(200);
+             $route = $this->router->dispatch($request->getMethod(), $request->getUri()->getPath());
+             $bufferedBody = ob_get_clean();
+             $response->getBody()->write($bufferedBody);
+             $response = $response->withStatus(200);
         }
         catch (HttpRouteNotFoundException $e) {
                 return $response->withStatus(404);