HexMakina / kadro

common.inc.php

Spacing +30 added lines, -30 removed lines

@@ -13,7 +13,7 @@ 
   require APP_BASE.'vendor/autoload.php';

 

 	require 'PSR4Autoloader.class.php';

-	$loader=new PSR4Autoloader;

+	$loader = new PSR4Autoloader;

 	$loader->register(); //Register loader with SPL autoloader stack.

 

 	$loader->addNamespace('HexMakina', APP_BASE.'/lib/');

@@ -38,9 +38,9 @@ 
 

 	//---------------------------------------------------------------     parametroj

 	require_once APP_BASE.'configs/settings.php';

-	$box=new Container\LeMarchand($settings);

+	$box = new Container\LeMarchand($settings);

 

-  foreach($box->get('settings.app.namespaces') as $namespace => $path)

+  foreach ($box->get('settings.app.namespaces') as $namespace => $path)

   {

   	$loader->addNamespace($namespace, $path);

   }

@@ -56,9 +56,9 @@ 
 

 	//---------------------------------------------------------------        kuketoj

 	setcookie('cookie_test', 'test_value', time()+(365 * 24 * 60 * 60), "/", "");

-	$cookies_enabled=isset($_COOKIE['cookie_test']); // houston, do we have cookies ?

+	$cookies_enabled = isset($_COOKIE['cookie_test']); // houston, do we have cookies ?

 

-	if($cookies_enabled === false)

+	if ($cookies_enabled === false)

 	{

 		ini_set('session.use_cookies', 0);

 		ini_set('session.use_only_cookies', 0);

@@ -67,7 +67,7 @@ 
 	}

 

 //---------------------------------------------------------------        Session Management

-	$StateAgent=new StateAgent($box->get('settings.app.session_start_options') ?? []);

+	$StateAgent = new StateAgent($box->get('settings.app.session_start_options') ?? []);

 	$StateAgent->add_runtime_filters((array)$box->get('settings.filter'));

 	$StateAgent->add_runtime_filters((array)($_SESSION['filter'] ?? []));

 	$StateAgent->add_runtime_filters((array)($_REQUEST['filter'] ?? []));

@@ -91,42 +91,42 @@ 
 	//---------------------------------------------------------------     ŝablonoj
 	require_once 'smarty/smarty/libs/Smarty.class.php';
 	// Load smarty template parser
-	if(is_null($box->get('settings.smarty.template_path')) || is_null($box->get('settings.smarty.compiled_path')))
+	if (is_null($box->get('settings.smarty.template_path')) || is_null($box->get('settings.smarty.compiled_path')))
 			throw new \Exception("SMARTY CONFIG ERROR: missing parameters");
 
-	$smarty=new \Smarty();
+	$smarty = new \Smarty();
 	$box->register('template_engine', $smarty);
 
-	$smarty->setTemplateDir($box->get('RouterInterface')->file_root() . $box->get('settings.smarty.template_path').'app');
-	$smarty->addTemplateDir($box->get('RouterInterface')->file_root() . $box->get('settings.smarty.template_path'));
-	$smarty->addTemplateDir(KADRO_BASE . 'Views/');
+	$smarty->setTemplateDir($box->get('RouterInterface')->file_root().$box->get('settings.smarty.template_path').'app');
+	$smarty->addTemplateDir($box->get('RouterInterface')->file_root().$box->get('settings.smarty.template_path'));
+	$smarty->addTemplateDir(KADRO_BASE.'Views/');
 
-	$smarty->setCompileDir(APP_BASE . $box->get('settings.smarty.compiled_path'));
+	$smarty->setCompileDir(APP_BASE.$box->get('settings.smarty.compiled_path'));
 	$smarty->setDebugging($box->get('settings.smarty.debug'));
 
-	$smarty->registerClass('Lezer', 			'\HexMakina\Lezer\Lezer');
-	$smarty->registerClass('Marker', 			'\HexMakina\Format\HTML\Marker');
-	$smarty->registerClass('Form', 				'\HexMakina\Format\HTML\Form');
-	$smarty->registerClass('TableToForm',	'\HexMakina\kadro\TableToForm');
-	$smarty->registerClass('Dato', 				'\HexMakina\Format\Tempo\Dato');
+	$smarty->registerClass('Lezer', '\HexMakina\Lezer\Lezer');
+	$smarty->registerClass('Marker', '\HexMakina\Format\HTML\Marker');
+	$smarty->registerClass('Form', '\HexMakina\Format\HTML\Form');
+	$smarty->registerClass('TableToForm', '\HexMakina\kadro\TableToForm');
+	$smarty->registerClass('Dato', '\HexMakina\Format\Tempo\Dato');
 
 	$smarty->assign('APP_NAME', $box->get('settings.app.name'));
 
 	//---------------------------------------------------------------     lingva
 
-	$languages=\HexMakina\Lezer\Lezer::languages_by_file(APP_BASE.'locale/');
+	$languages = \HexMakina\Lezer\Lezer::languages_by_file(APP_BASE.'locale/');
 
   $smarty->assign('languages', $languages);
 
-	$language=null;
+	$language = null;
 
 	// changing / setting the language
-	if(isset($_GET['lang']))
+	if (isset($_GET['lang']))
 	{
-		if(isset($languages[$_GET['lang']]))
+		if (isset($languages[$_GET['lang']]))
 		{
-			$language=$_GET['lang'];
-			if($cookies_enabled === true)
+			$language = $_GET['lang'];
+			if ($cookies_enabled === true)
 				setcookie('lang', $language, time()+(365 * 24 * 60 * 60), "/", "");
 			else
 				trigger_error('KADRO_SYSTEM_ERR_COOKIES_ARE_DISABLED_LANGUAGE_CANNOT_BE_STORED', E_USER_WARNING);
@@ -134,15 +134,15 @@ 
 		else
 			throw new \Exception('KADRO_SYSTEM_ERR_INVALID_PARAMETER');
 	}
-	else if($cookies_enabled === true && array_key_exists('lang', $_COOKIE) && array_key_exists($_COOKIE['lang'], $languages))
-		$language=$_COOKIE['lang'];
+	else if ($cookies_enabled === true && array_key_exists('lang', $_COOKIE) && array_key_exists($_COOKIE['lang'], $languages))
+		$language = $_COOKIE['lang'];
 
-	if(is_null($language) && !empty($languages))
+	if (is_null($language) && !empty($languages))
 	{
-		if(count($languages) === 1)
-			$language=key($languages);
-		elseif(array_key_exists($box->get('settings.default.language'), $languages))
-			$language=$box->get('settings.default.language');
+		if (count($languages) === 1)
+			$language = key($languages);
+		elseif (array_key_exists($box->get('settings.default.language'), $languages))
+			$language = $box->get('settings.default.language');
 		else
 			throw new \Exception('FALLBACK_TO_DEFAULT_LANGUAGE_FAILED');
 		$i18n = new \HexMakina\Lezer\Lezer(APP_BASE.'locale/'.$language.'/user_interface.json', APP_BASE.'locale/cache/', $language);