HexMakina / kadro

Auth/Operator.class.php

Indentation +29 added lines, -29 removed lines

@@ -12,12 +12,12 @@ 
 

   use Permissionability;

 

-	public function __toString()

+  public function __toString()

   {

     return $this->get('username');

   }

 

-	public function is_active() : bool

+  public function is_active() : bool

   {

     return !empty($this->get('active'));

   }

@@ -38,14 +38,14 @@ 
   }

 

   public function password_change($string)

-	{

-		$this->password = password_hash($string, PASSWORD_DEFAULT);

-	}

+  {

+    $this->password = password_hash($string, PASSWORD_DEFAULT);

+  }

 

-	public function password_verify($string) : bool

-	{

-		return password_verify($string, $this->password());

-	}

+  public function password_verify($string) : bool

+  {

+    return password_verify($string, $this->password());

+  }

 

   public function name()

   {

@@ -61,39 +61,39 @@ 
     return $this->get('phone');

   }

 

-	public function language_code()

+  public function language_code()

   {

     return $this->get('language_code');

   }

 

-	public static function query_retrieve($filters=[], $options=[]) : Select

-	{

-		$Query = static::table()->select();

-  	if(isset($options['eager']) && $options['eager'] === true)

-		{

+  public static function query_retrieve($filters=[], $options=[]) : Select

+  {

+    $Query = static::table()->select();

+    if(isset($options['eager']) && $options['eager'] === true)

+    {

       $Query->group_by('id');

 

       $Query->auto_join([ACL::table(), 'acl'], null, 'LEFT OUTER');

       $Query->auto_join([Permission::table(), 'kadro_permission'], null, 'LEFT OUTER');

-			$Query->select_also(["GROUP_CONCAT(DISTINCT kadro_permission.id) as permission_ids", "GROUP_CONCAT(DISTINCT kadro_permission.name) as permission_names"]);

-		}

+      $Query->select_also(["GROUP_CONCAT(DISTINCT kadro_permission.id) as permission_ids", "GROUP_CONCAT(DISTINCT kadro_permission.name) as permission_names"]);

+    }

 

-		if(isset($filters['model']) && !empty($filters['model']))

-		{

-			$model = $filters['model'];

-			$Query->join([static::otm('t'), static::otm('a')],[[static::otm('a'),static::otm('k'), 't_from','id']], 'INNER');

-			$Query->aw_fields_eq(['model_id' => $filters['model']->get_id(), 'model_type' => get_class($filters['model'])::model_type()], static::otm('a'));

-		}

+    if(isset($filters['model']) && !empty($filters['model']))

+    {

+      $model = $filters['model'];

+      $Query->join([static::otm('t'), static::otm('a')],[[static::otm('a'),static::otm('k'), 't_from','id']], 'INNER');

+      $Query->aw_fields_eq(['model_id' => $filters['model']->get_id(), 'model_type' => get_class($filters['model'])::model_type()], static::otm('a'));

+    }

 

     $Query->order_by([$Query->table_label(), 'name', 'ASC']);

 

 

-		return $Query;

-	}

+    return $Query;

+  }

 

-	public function immortal() : bool

-	{

-		return true; // never delete a user, always deactivate

-	}

+  public function immortal() : bool

+  {

+    return true; // never delete a user, always deactivate

+  }

 }

 

common.inc.php

Indentation +106 added lines, -106 removed lines

@@ -2,153 +2,153 @@
 

 namespace HexMakina\kadro

 {

-	use \HexMakina\LocalFS\FileSystem;

+  use \HexMakina\LocalFS\FileSystem;

 

-	define('KADRO_BASE', APP_BASE.'/lib/kadro/'); // this is project dependant, should be in settings

-	// define('QIVIVE_BASE', APP_BASE.'/lib/qivive/'); // this is project dependant, should be in settings

+  define('KADRO_BASE', APP_BASE.'/lib/kadro/'); // this is project dependant, should be in settings

+  // define('QIVIVE_BASE', APP_BASE.'/lib/qivive/'); // this is project dependant, should be in settings

 

-	set_include_path(implode(PATH_SEPARATOR, [get_include_path(), APP_BASE, APP_BASE.'/lib/', APP_BASE.'/vendor/', KADRO_BASE]));

+  set_include_path(implode(PATH_SEPARATOR, [get_include_path(), APP_BASE, APP_BASE.'/lib/', APP_BASE.'/vendor/', KADRO_BASE]));

 

-	//---------------------------------------------------------------     autoloader

+  //---------------------------------------------------------------     autoloader

   require APP_BASE.'vendor/autoload.php';

 

-	require 'PSR4Autoloader.class.php';

-	$loader=new PSR4Autoloader;

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

+  require 'PSR4Autoloader.class.php';

+  $loader=new PSR4Autoloader;

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

 

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

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

 

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

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

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

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

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

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

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

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

 

-	// $loader->addNamespace('HexMakina\kadro', KADRO_BASE);

-	// $loader->addNamespace('HexMakina\qivive', QIVIVE_BASE);

-	// $loader->addNamespace('HexMakina\LocalFS', __DIR__.'/Format/File');

-	$loader->addNamespaceTree(KADRO_BASE);

+  // $loader->addNamespace('HexMakina\kadro', KADRO_BASE);

+  // $loader->addNamespace('HexMakina\qivive', QIVIVE_BASE);

+  // $loader->addNamespace('HexMakina\LocalFS', __DIR__.'/Format/File');

+  $loader->addNamespaceTree(KADRO_BASE);

 

-	//---------------------------------------------------------------     erara raportado

-	error_reporting(E_ALL);

+  //---------------------------------------------------------------     erara raportado

+  error_reporting(E_ALL);

 

-	set_error_handler('\HexMakina\kadro\Logger\LogLaddy::error_handler');

-	set_exception_handler('\HexMakina\kadro\Logger\LogLaddy::exception_handler');

+  set_error_handler('\HexMakina\kadro\Logger\LogLaddy::error_handler');

+  set_exception_handler('\HexMakina\kadro\Logger\LogLaddy::exception_handler');

 

-	\HexMakina\Debugger\Debugger::init();

+  \HexMakina\Debugger\Debugger::init();

 

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

-	require_once APP_BASE.'configs/settings.php';

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

+  //---------------------------------------------------------------     parametroj

+  require_once APP_BASE.'configs/settings.php';

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

 

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

   {

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

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

   }

 

-	define('PRODUCTION', $_SERVER['HTTP_HOST'] === $box->get('settings.app.production_host'));

-	ini_set('display_errors', PRODUCTION ? 0 : 1);

+  define('PRODUCTION', $_SERVER['HTTP_HOST'] === $box->get('settings.app.production_host'));

+  ini_set('display_errors', PRODUCTION ? 0 : 1);

 

-	//---------------------------------------------------------------       logger

-	$box->register('LoggerInterface', new Logger\LogLaddy());

+  //---------------------------------------------------------------       logger

+  $box->register('LoggerInterface', new Logger\LogLaddy());

 

-	//---------------------------------------------------------------       router

-	$box->register('RouterInterface', new Router\hopper($box->get('settings.RouterInterface')));

+  //---------------------------------------------------------------       router

+  $box->register('RouterInterface', new Router\hopper($box->get('settings.RouterInterface')));

 

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

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

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

+  //---------------------------------------------------------------        kuketoj

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

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

 

-	if($cookies_enabled === false)

-	{

-		ini_set('session.use_cookies', 0);

-		ini_set('session.use_only_cookies', 0);

-		ini_set('session.use_trans_sid', 1);

-		ini_set('session.cache_limiter', 'nocache');

-	}

+  if($cookies_enabled === false)

+  {

+    ini_set('session.use_cookies', 0);

+    ini_set('session.use_only_cookies', 0);

+    ini_set('session.use_trans_sid', 1);

+    ini_set('session.cache_limiter', 'nocache');

+  }

 

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

-	$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'] ?? []));

+  $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'] ?? []));

 

-	$box->register('StateAgent', $StateAgent);

+  $box->register('StateAgent', $StateAgent);

 

 
-	//---------------------------------------------------------------     parametroj:signo
+  //---------------------------------------------------------------     parametroj:signo
 
-	ini_set('default_charset', $box->get('settings.default.charset'));
-	header('Content-type: text/html; charset='.strtolower($box->get('settings.default.charset')));
+  ini_set('default_charset', $box->get('settings.default.charset'));
+  header('Content-type: text/html; charset='.strtolower($box->get('settings.default.charset')));
 
-	//---------------------------------------------------------------     parametroj:linguo
-	putenv('LANG='.$box->get('settings.default.language'));
-	setlocale(LC_ALL, $box->get('settings.default.language'));
+  //---------------------------------------------------------------     parametroj:linguo
+  putenv('LANG='.$box->get('settings.default.language'));
+  setlocale(LC_ALL, $box->get('settings.default.language'));
 
-	//---------------------------------------------------------------     parametroj:datoj
-	date_default_timezone_set($box->get('settings.default.timezone'));
+  //---------------------------------------------------------------     parametroj:datoj
+  date_default_timezone_set($box->get('settings.default.timezone'));
 
 
-	//---------------------------------------------------------------     ŝ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')))
-			throw new \Exception("SMARTY CONFIG ERROR: missing parameters");
+  //---------------------------------------------------------------     ŝ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')))
+      throw new \Exception("SMARTY CONFIG ERROR: missing parameters");
 
-	$smarty=new \Smarty();
-	$box->register('template_engine', $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->setDebugging($box->get('settings.smarty.debug'));
+  $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'));
+  $smarty->assign('APP_NAME', $box->get('settings.app.name'));
 
-	//---------------------------------------------------------------     lingva
+  //---------------------------------------------------------------     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;
-
-	// changing / setting the language
-	if(isset($_GET['lang']))
-	{
-		if(isset($languages[$_GET['lang']]))
-		{
-			$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);
-		}
-		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'];
-
-	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');
-		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);
-		$i18n->init();
-		$smarty->assign('language', $language);
-	}
+  $language=null;
+
+  // changing / setting the language
+  if(isset($_GET['lang']))
+  {
+    if(isset($languages[$_GET['lang']]))
+    {
+      $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);
+    }
+    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'];
+
+  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');
+    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);
+    $i18n->init();
+    $smarty->assign('language', $language);
+  }
 }

 

 

Controllers/Interfaces/CRUDController.class.php

Indentation +6 added lines, -6 removed lines

@@ -4,14 +4,14 @@
 
 interface CRUDController
 {
-   public function dashboard();
-   public function edit();
-   public function save();
-   public function listing();
+    public function dashboard();
+    public function edit();
+    public function save();
+    public function listing();
 
-   public function destroy();
+    public function destroy();
 
-   public function errors() : array;
+    public function errors() : array;
 }
 
 

Controllers/ORMController.class.php

Spacing +50 added lines, -50 removed lines

@@ -27,19 +27,19 @@ 
     $custom_template = null;
     $method = $this->router()->target_method();
 
-    foreach(['prepare', "before_$method", $method, "after_$method"] as $step => $chainling)
+    foreach (['prepare', "before_$method", $method, "after_$method"] as $step => $chainling)
     {
       $this->search_and_execute_trait_methods($chainling);
-    	if(method_exists($this, $chainling) && empty($this->errors()))
+    	if (method_exists($this, $chainling) && empty($this->errors()))
       {
         $res = $this->$chainling();
 
-        if($this->logger()->has_halting_messages()) // logger handled a critical error during the chailing execution
+        if ($this->logger()->has_halting_messages()) // logger handled a critical error during the chailing execution
         {
           break; // dont go on with other
         }
 
-        if($chainling === $method)
+        if ($chainling === $method)
         {
 
           $custom_template = $res;
@@ -47,10 +47,10 @@ 
       }
     }
 
-    if(method_exists($this, 'conclude')) // conclude always executed, even with has_halting_messages
+    if (method_exists($this, 'conclude')) // conclude always executed, even with has_halting_messages
     	$this->conclude();
 
-    if(method_exists($this, 'display'))
+    if (method_exists($this, 'display'))
     	$template = $this->display($custom_template);
   }
 
@@ -58,7 +58,7 @@ 
   {
     parent::prepare();
 
-    if(!class_exists($this->model_class_name = $this->class_name()))
+    if (!class_exists($this->model_class_name = $this->class_name()))
       throw new \Exception("!class_exists($this->model_class_name)");
 
     $this->model_type = $this->model_class_name::model_type();
@@ -68,22 +68,22 @@ 
 
     $pk_values = [];
 
-    if($this->router()->submits())
+    if ($this->router()->submits())
     {
       $this->form_model->import($this->sanitize_post_data($this->router()->submitted()));
       $pk_values = $this->model_class_name::table()->primary_keys_match($this->router()->submitted());
 
       $this->load_model = $this->model_class_name::exists($pk_values);
     }
-    elseif($this->router()->requests())
+    elseif ($this->router()->requests())
     {
       $pk_values = $this->model_class_name::table()->primary_keys_match($this->router()->params());
 
-      if(!is_null($this->load_model = $this->model_class_name::exists($pk_values)))
+      if (!is_null($this->load_model = $this->model_class_name::exists($pk_values)))
         $this->form_model = clone $this->load_model;
     }
 
-    if(!is_null($this->load_model) && $this->load_model->traceable())
+    if (!is_null($this->load_model) && $this->load_model->traceable())
       $this->viewport('load_model_history', $this->load_model->traces() ?? []);
   }
 
@@ -94,7 +94,7 @@ 
   // ----------- META -----------
   public function class_name() : string
   {
-    if(is_null($this->model_class_name))
+    if (is_null($this->model_class_name))
     {
       $this->model_class_name = get_called_class();
       $this->model_class_name = str_replace('\Controllers\\', '\Models\\', $this->model_class_name);
@@ -107,12 +107,12 @@ 
   public function persist_model($model) : ?ModelInterface
   {
     $this->errors = $model->save($this->operator()->operator_id(), $this->tracer()); // returns [errors]
-    if(empty($this->errors()))
+    if (empty($this->errors()))
     {
       $this->logger()->nice('CRUDITES_INSTANCE_ALTERED', ['MODEL_'.get_class($model)::model_type().'_INSTANCE']);
       return $model;
     }
-    foreach($this->errors() as $field => $error_msg)
+    foreach ($this->errors() as $field => $error_msg)
       $this->logger()->warning($error_msg, [$field]);
 
     return null;
@@ -123,12 +123,12 @@ 
     return $this->listing(); //default dashboard is a listing
   }
 
-  public function listing($model=null,$filters=[],$options=[])
+  public function listing($model = null, $filters = [], $options = [])
   {
     $class_name = is_null($model) ? $this->model_class_name : get_class($model);
 
-    if(!isset($filters['date_start']))  $filters['date_start'] = $this->box('StateAgent')->filters('date_start');
-    if(!isset($filters['date_stop']))   $filters['date_stop'] = $this->box('StateAgent')->filters('date_stop');
+    if (!isset($filters['date_start']))  $filters['date_start'] = $this->box('StateAgent')->filters('date_start');
+    if (!isset($filters['date_stop']))   $filters['date_stop'] = $this->box('StateAgent')->filters('date_stop');
 
     // dd($filters);
     $listing = $class_name::filter($filters);
@@ -139,24 +139,24 @@ 
   public function viewport_listing($class_name, $listing, $listing_template)
   {
     $listing_fields = [];
-    if(empty($listing))
+    if (empty($listing))
     {
-      foreach($class_name::table()->columns() as $column)
+      foreach ($class_name::table()->columns() as $column)
       {
 
-        if(!$column->is_auto_incremented() && !$column->is_hidden())
-          $listing_fields[$column->name()]=L(sprintf('MODEL_%s_FIELD_%s', $class_name::model_type(), $column->name()));
+        if (!$column->is_auto_incremented() && !$column->is_hidden())
+          $listing_fields[$column->name()] = L(sprintf('MODEL_%s_FIELD_%s', $class_name::model_type(), $column->name()));
       }
     }
     else
     {
       $current = current($listing);
-      if(is_object($current))
+      if (is_object($current))
         $current = get_object_vars($current);
 
-      foreach(array_keys($current) as $field)
+      foreach (array_keys($current) as $field)
       {
-        $listing_fields[$field]=L(sprintf('MODEL_%s_FIELD_%s', $class_name::model_type(), $field));
+        $listing_fields[$field] = L(sprintf('MODEL_%s_FIELD_%s', $class_name::model_type(), $field));
       }
 
     }
@@ -178,13 +178,13 @@ 
     $this->edit();
   }
 
-  public function edit(){}
+  public function edit() {}
 
   public function save()
   {
     $model = $this->persist_model($this->form_model);
 
-    if(empty($this->errors()))
+    if (empty($this->errors()))
       $this->route_back($model);
     else
     {
@@ -195,21 +195,21 @@ 
 
   public function before_edit()
   {
-    if(!is_null($this->router()->params('id')) && is_null($this->load_model))
+    if (!is_null($this->router()->params('id')) && is_null($this->load_model))
     {
       $this->logger()->warning('CRUDITES_ERR_INSTANCE_NOT_FOUND', ['MODEL_'.$this->model_class_name::model_type().'_INSTANCE']);
       $this->router()->hop($this->model_class_name::model_type());
     }
   }
 
-  public function before_save() : array { return [];}
+  public function before_save() : array { return []; }
 
   // default: hop to altered object
-  public function after_save() {$this->router()->hop($this->route_back());}
+  public function after_save() {$this->router()->hop($this->route_back()); }
 
   public function destroy_confirm()
   {
-    if(is_null($this->load_model))
+    if (is_null($this->load_model))
     {
       $this->logger()->warning('CRUDITES_ERR_INSTANCE_NOT_FOUND', ['MODEL_'.$this->model_type.'_INSTANCE']);
       $this->router()->hop($this->model_type);
@@ -222,12 +222,12 @@ 
 
   public function before_destroy() // default: checks for load_model and immortality, hops back to object on failure
   {
-    if(is_null($this->load_model))
+    if (is_null($this->load_model))
     {
       $this->logger()->warning('CRUDITES_ERR_INSTANCE_NOT_FOUND', ['MODEL_'.$this->model_type.'_INSTANCE']);
       $this->router()->hop($this->model_type);
     }
-    elseif($this->load_model->immortal())
+    elseif ($this->load_model->immortal())
     {
 
       $this->logger()->warning('CRUDITES_ERR_INSTANCE_IS_IMMORTAL', ['MODEL_'.$this->model_type.'_INSTANCE']);
@@ -237,10 +237,10 @@ 
 
   public function destroy()
   {
-    if(!$this->router()->submits())
+    if (!$this->router()->submits())
       throw new \Exception('KADRO_ROUTER_MUST_SUBMIT');
 
-    if($this->load_model->destroy($this->operator()->operator_id(), $this->tracer()) === false)
+    if ($this->load_model->destroy($this->operator()->operator_id(), $this->tracer()) === false)
     {
       $this->logger()->info('CRUDITES_ERR_INSTANCE_IS_UNDELETABLE', [''.$this->load_model]);
       $this->route_back($this->load_model);
@@ -263,10 +263,10 @@ 
 
     $this->viewport('form_model_type', $this->model_type);
 
-    if(isset($this->load_model))
+    if (isset($this->load_model))
       $this->viewport('load_model', $this->load_model);
 
-    if(isset($this->form_model))
+    if (isset($this->form_model))
       $this->viewport('form_model', $this->form_model);
   }
 
@@ -278,15 +278,15 @@ 
 
     $header = false;
 
-    foreach($collection as $line)
+    foreach ($collection as $line)
     {
       $line = get_object_vars($line);
-      if($header === false)
+      if ($header === false)
       {
-        fputcsv($fp,array_keys($line));
+        fputcsv($fp, array_keys($line));
         $header = true;
       }
-      fputcsv($fp,$line);
+      fputcsv($fp, $line);
     }
     fclose($fp);
 
@@ -296,7 +296,7 @@ 
   public function export()
   {
     $format = $this->router()->params('format');
-    switch($format)
+    switch ($format)
     {
       case null:
         $filename = $this->model_type;
@@ -325,33 +325,33 @@ 
     $route_params = [];
 
     $route_name = get_class($model)::model_type().'_';
-    if($model->is_new())
-      $route_name.= 'new';
+    if ($model->is_new())
+      $route_name .= 'new';
     else
     {
-      $route_name.= 'default';
+      $route_name .= 'default';
       $route_params = ['id' => $model->get_id()];
     }
     $res = $this->router()->prehop($route_name, $route_params);
     return $res;
   }
 
-  public function route_factory($route=null, $route_params=[]) : string
+  public function route_factory($route = null, $route_params = []) : string
   {
-    if(is_null($route) && $this->router()->submits())
+    if (is_null($route) && $this->router()->submits())
       $route = $this->form_model;
 
-    if(!is_null($route) && is_subclass_of($route, '\HexMakina\Crudites\Interfaces\ModelInterface'))
+    if (!is_null($route) && is_subclass_of($route, '\HexMakina\Crudites\Interfaces\ModelInterface'))
       $route = $this->route_model($route);
 
     return parent::route_factory($route, $route_params);
   }
 
-  private function sanitize_post_data($post_data=[])
+  private function sanitize_post_data($post_data = [])
   {
-    foreach($this->model_class_name::table()->columns() as $col)
+    foreach ($this->model_class_name::table()->columns() as $col)
     {
-      if($col->type()->is_boolean())
+      if ($col->type()->is_boolean())
       {
           $post_data[$col->name()] = !empty($post_data[$col->name()]);
       }

Braces +60 added lines, -43 removed lines

@@ -34,9 +34,12 @@ 
       {
         $res = $this->$chainling();
 
-        if($this->logger()->has_halting_messages()) // logger handled a critical error during the chailing execution
+        if($this->logger()->has_halting_messages()) {
+          // logger handled a critical error during the chailing execution
         {
-          break; // dont go on with other
+          break;
+        }
+        // dont go on with other
         }
 
         if($chainling === $method)
@@ -47,19 +50,23 @@ 
       }
     }
 
-    if(method_exists($this, 'conclude')) // conclude always executed, even with has_halting_messages
+    if(method_exists($this, 'conclude')) {
+      // conclude always executed, even with has_halting_messages
     	$this->conclude();
+    }
 
-    if(method_exists($this, 'display'))
-    	$template = $this->display($custom_template);
+    if(method_exists($this, 'display')) {
+        	$template = $this->display($custom_template);
+    }
   }
 
   public function prepare()
   {
     parent::prepare();
 
-    if(!class_exists($this->model_class_name = $this->class_name()))
-      throw new \Exception("!class_exists($this->model_class_name)");
+    if(!class_exists($this->model_class_name = $this->class_name())) {
+          throw new \Exception("!class_exists($this->model_class_name)");
+    }
 
     $this->model_type = $this->model_class_name::model_type();
 
@@ -74,17 +81,18 @@ 
       $pk_values = $this->model_class_name::table()->primary_keys_match($this->router()->submitted());
 
       $this->load_model = $this->model_class_name::exists($pk_values);
-    }
-    elseif($this->router()->requests())
+    } elseif($this->router()->requests())
     {
       $pk_values = $this->model_class_name::table()->primary_keys_match($this->router()->params());
 
-      if(!is_null($this->load_model = $this->model_class_name::exists($pk_values)))
-        $this->form_model = clone $this->load_model;
+      if(!is_null($this->load_model = $this->model_class_name::exists($pk_values))) {
+              $this->form_model = clone $this->load_model;
+      }
     }
 
-    if(!is_null($this->load_model) && $this->load_model->traceable())
-      $this->viewport('load_model_history', $this->load_model->traces() ?? []);
+    if(!is_null($this->load_model) && $this->load_model->traceable()) {
+          $this->viewport('load_model_history', $this->load_model->traces() ?? []);
+    }
   }
 
   public function has_load_model()
@@ -112,8 +120,9 @@ 
       $this->logger()->nice('CRUDITES_INSTANCE_ALTERED', ['MODEL_'.get_class($model)::model_type().'_INSTANCE']);
       return $model;
     }
-    foreach($this->errors() as $field => $error_msg)
-      $this->logger()->warning($error_msg, [$field]);
+    foreach($this->errors() as $field => $error_msg) {
+          $this->logger()->warning($error_msg, [$field]);
+    }
 
     return null;
   }
@@ -127,8 +136,12 @@ 
   {
     $class_name = is_null($model) ? $this->model_class_name : get_class($model);
 
-    if(!isset($filters['date_start']))  $filters['date_start'] = $this->box('StateAgent')->filters('date_start');
-    if(!isset($filters['date_stop']))   $filters['date_stop'] = $this->box('StateAgent')->filters('date_stop');
+    if(!isset($filters['date_start'])) {
+      $filters['date_start'] = $this->box('StateAgent')->filters('date_start');
+    }
+    if(!isset($filters['date_stop'])) {
+      $filters['date_stop'] = $this->box('StateAgent')->filters('date_stop');
+    }
 
     // dd($filters);
     $listing = $class_name::filter($filters);
@@ -144,15 +157,16 @@ 
       foreach($class_name::table()->columns() as $column)
       {
 
-        if(!$column->is_auto_incremented() && !$column->is_hidden())
-          $listing_fields[$column->name()]=L(sprintf('MODEL_%s_FIELD_%s', $class_name::model_type(), $column->name()));
+        if(!$column->is_auto_incremented() && !$column->is_hidden()) {
+                  $listing_fields[$column->name()]=L(sprintf('MODEL_%s_FIELD_%s', $class_name::model_type(), $column->name()));
+        }
       }
-    }
-    else
+    } else
     {
       $current = current($listing);
-      if(is_object($current))
-        $current = get_object_vars($current);
+      if(is_object($current)) {
+              $current = get_object_vars($current);
+      }
 
       foreach(array_keys($current) as $field)
       {
@@ -184,9 +198,9 @@ 
   {
     $model = $this->persist_model($this->form_model);
 
-    if(empty($this->errors()))
-      $this->route_back($model);
-    else
+    if(empty($this->errors())) {
+          $this->route_back($model);
+    } else
     {
       $this->edit();
       return 'edit';
@@ -226,8 +240,7 @@ 
     {
       $this->logger()->warning('CRUDITES_ERR_INSTANCE_NOT_FOUND', ['MODEL_'.$this->model_type.'_INSTANCE']);
       $this->router()->hop($this->model_type);
-    }
-    elseif($this->load_model->immortal())
+    } elseif($this->load_model->immortal())
     {
 
       $this->logger()->warning('CRUDITES_ERR_INSTANCE_IS_IMMORTAL', ['MODEL_'.$this->model_type.'_INSTANCE']);
@@ -237,15 +250,15 @@ 
 
   public function destroy()
   {
-    if(!$this->router()->submits())
-      throw new \Exception('KADRO_ROUTER_MUST_SUBMIT');
+    if(!$this->router()->submits()) {
+          throw new \Exception('KADRO_ROUTER_MUST_SUBMIT');
+    }
 
     if($this->load_model->destroy($this->operator()->operator_id(), $this->tracer()) === false)
     {
       $this->logger()->info('CRUDITES_ERR_INSTANCE_IS_UNDELETABLE', [''.$this->load_model]);
       $this->route_back($this->load_model);
-    }
-    else
+    } else
     {
       $this->logger()->nice('CRUDITES_INSTANCE_DESTROYED', ['MODEL_'.$this->model_type.'_INSTANCE']);
       $this->route_back($this->model_type);
@@ -263,11 +276,13 @@ 
 
     $this->viewport('form_model_type', $this->model_type);
 
-    if(isset($this->load_model))
-      $this->viewport('load_model', $this->load_model);
+    if(isset($this->load_model)) {
+          $this->viewport('load_model', $this->load_model);
+    }
 
-    if(isset($this->form_model))
-      $this->viewport('form_model', $this->form_model);
+    if(isset($this->form_model)) {
+          $this->viewport('form_model', $this->form_model);
+    }
   }
 
   public function collection_to_csv($collection, $filename)
@@ -325,9 +340,9 @@ 
     $route_params = [];
 
     $route_name = get_class($model)::model_type().'_';
-    if($model->is_new())
-      $route_name.= 'new';
-    else
+    if($model->is_new()) {
+          $route_name.= 'new';
+    } else
     {
       $route_name.= 'default';
       $route_params = ['id' => $model->get_id()];
@@ -338,11 +353,13 @@ 
 
   public function route_factory($route=null, $route_params=[]) : string
   {
-    if(is_null($route) && $this->router()->submits())
-      $route = $this->form_model;
+    if(is_null($route) && $this->router()->submits()) {
+          $route = $this->form_model;
+    }
 
-    if(!is_null($route) && is_subclass_of($route, '\HexMakina\Crudites\Interfaces\ModelInterface'))
-      $route = $this->route_model($route);
+    if(!is_null($route) && is_subclass_of($route, '\HexMakina\Crudites\Interfaces\ModelInterface')) {
+          $route = $this->route_model($route);
+    }
 
     return parent::route_factory($route, $route_params);
   }

Logger/LogLaddy.class.php

Spacing +19 added lines, -19 removed lines

@@ -54,9 +54,9 @@ 
     $context['class'] = get_class($throwable);
     $context['trace'] = $throwable->getTrace();
 
-    if(is_subclass_of($throwable, 'Error') || get_class($throwable) === 'Error')
+    if (is_subclass_of($throwable, 'Error') || get_class($throwable) === 'Error')
       (new LogLaddy())->alert(self::INTERNAL_ERROR, $context);
-    elseif(is_subclass_of($throwable, 'Exception') || get_class($throwable) === 'Exception')
+    elseif (is_subclass_of($throwable, 'Exception') || get_class($throwable) === 'Exception')
       (new LogLaddy())->notice(self::USER_EXCEPTION, $context);
     else
     {
@@ -67,7 +67,7 @@ 
 
   public function system_halted($level)
   {
-    switch($level)
+    switch ($level)
     {
       case LogLevel::ERROR:
       case LogLevel::CRITICAL:
@@ -86,19 +86,19 @@ 
     $display_error = null;
 
     // --- Handles Throwables (exception_handler())
-    if($message==self::INTERNAL_ERROR || $message== self::USER_EXCEPTION)
+    if ($message == self::INTERNAL_ERROR || $message == self::USER_EXCEPTION)
     {
       $this->has_halting_messages = true;
       $display_error = \HexMakina\Debugger\Debugger::format_throwable_message($context['class'], $context['code'], $context['file'], $context['line'], $context['text']);
       error_log($display_error);
-      $display_error.= \HexMakina\Debugger\Debugger::format_trace($context['trace'], false);
+      $display_error .= \HexMakina\Debugger\Debugger::format_trace($context['trace'], false);
       self::HTTP_500($display_error);
     }
-    elseif($this->system_halted($level)) // analyses error level
+    elseif ($this->system_halted($level)) // analyses error level
     {
       $display_error = sprintf(PHP_EOL.'%s in file %s:%d'.PHP_EOL.'%s', $level, \HexMakina\Debugger\Debugger::format_file($context['file']), $context['line'], $message);
       error_log($display_error);
-      $display_error.= \HexMakina\Debugger\Debugger::format_trace($context['trace'], false);
+      $display_error .= \HexMakina\Debugger\Debugger::format_trace($context['trace'], false);
       self::HTTP_500($display_error);
     }
     else
@@ -150,10 +150,10 @@ 
   // ----------------------------------------------------------- User messages:add one
   public function report_to_user($level, $message, $context = [])
   {
-    if(!isset($_SESSION[self::REPORTING_USER]))
+    if (!isset($_SESSION[self::REPORTING_USER]))
       $_SESSION[self::REPORTING_USER] = [];
 
-    if(!isset($_SESSION[self::REPORTING_USER][$level]))
+    if (!isset($_SESSION[self::REPORTING_USER][$level]))
       $_SESSION[self::REPORTING_USER][$level] = [];
 
     $_SESSION[self::REPORTING_USER][$level][] = [$message, $context];
@@ -185,21 +185,21 @@ 
   private static function map_error_level_to_log_level($level) : string
   {
     // http://php.net/manual/en/errorfunc.constants.php
-    $m=[];
+    $m = [];
 
-    $m[E_ERROR]=$m[E_PARSE]=$m[E_CORE_ERROR]=$m[E_COMPILE_ERROR]=$m[E_USER_ERROR]=$m[E_RECOVERABLE_ERROR]=LogLevel::ALERT;
-    $m[1]=$m[4]=$m[16]=$m[64]=$m[256]=$m[4096]=LogLevel::ALERT;
+    $m[E_ERROR] = $m[E_PARSE] = $m[E_CORE_ERROR] = $m[E_COMPILE_ERROR] = $m[E_USER_ERROR] = $m[E_RECOVERABLE_ERROR] = LogLevel::ALERT;
+    $m[1] = $m[4] = $m[16] = $m[64] = $m[256] = $m[4096] = LogLevel::ALERT;
 
-    $m[E_WARNING]=$m[E_CORE_WARNING]=$m[E_COMPILE_WARNING]=$m[E_USER_WARNING]=LogLevel::CRITICAL;
-    $m[2]=$m[32]=$m[128]=$m[512]=LogLevel::CRITICAL;
+    $m[E_WARNING] = $m[E_CORE_WARNING] = $m[E_COMPILE_WARNING] = $m[E_USER_WARNING] = LogLevel::CRITICAL;
+    $m[2] = $m[32] = $m[128] = $m[512] = LogLevel::CRITICAL;
 
-    $m[E_NOTICE]=$m[E_USER_NOTICE]=LogLevel::ERROR;
-    $m[8]=$m[1024]=LogLevel::ERROR;
+    $m[E_NOTICE] = $m[E_USER_NOTICE] = LogLevel::ERROR;
+    $m[8] = $m[1024] = LogLevel::ERROR;
 
-    $m[E_STRICT]=$m[E_DEPRECATED]=$m[E_USER_DEPRECATED]=$m[E_ALL]=LogLevel::DEBUG;
-    $m[2048]=$m[8192]=$m[16384]=$m[32767]=LogLevel::DEBUG;
+    $m[E_STRICT] = $m[E_DEPRECATED] = $m[E_USER_DEPRECATED] = $m[E_ALL] = LogLevel::DEBUG;
+    $m[2048] = $m[8192] = $m[16384] = $m[32767] = LogLevel::DEBUG;
 
-    if(isset($m[$level]))
+    if (isset($m[$level]))
       return $m[$level];
 
     throw new \Exception(__FUNCTION__."($level): $level is unknown");

Braces +18 added lines, -15 removed lines

@@ -54,11 +54,11 @@ 
     $context['class'] = get_class($throwable);
     $context['trace'] = $throwable->getTrace();
 
-    if(is_subclass_of($throwable, 'Error') || get_class($throwable) === 'Error')
-      (new LogLaddy())->alert(self::INTERNAL_ERROR, $context);
-    elseif(is_subclass_of($throwable, 'Exception') || get_class($throwable) === 'Exception')
-      (new LogLaddy())->notice(self::USER_EXCEPTION, $context);
-    else
+    if(is_subclass_of($throwable, 'Error') || get_class($throwable) === 'Error') {
+          (new LogLaddy())->alert(self::INTERNAL_ERROR, $context);
+    } elseif(is_subclass_of($throwable, 'Exception') || get_class($throwable) === 'Exception') {
+          (new LogLaddy())->notice(self::USER_EXCEPTION, $context);
+    } else
     {
       die('This Throwable is not an Error or an Exception. This is unfortunate.');
     }
@@ -93,15 +93,15 @@ 
       error_log($display_error);
       $display_error.= \HexMakina\Debugger\Debugger::format_trace($context['trace'], false);
       self::HTTP_500($display_error);
-    }
-    elseif($this->system_halted($level)) // analyses error level
+    } elseif($this->system_halted($level)) {
+      // analyses error level
     {
       $display_error = sprintf(PHP_EOL.'%s in file %s:%d'.PHP_EOL.'%s', $level, \HexMakina\Debugger\Debugger::format_file($context['file']), $context['line'], $message);
+    }
       error_log($display_error);
       $display_error.= \HexMakina\Debugger\Debugger::format_trace($context['trace'], false);
       self::HTTP_500($display_error);
-    }
-    else
+    } else
     {// --- Handles user messages, through SESSION storage
       $this->report_to_user($level, $message, $context);
     }
@@ -150,11 +150,13 @@ 
   // ----------------------------------------------------------- User messages:add one
   public function report_to_user($level, $message, $context = [])
   {
-    if(!isset($_SESSION[self::REPORTING_USER]))
-      $_SESSION[self::REPORTING_USER] = [];
+    if(!isset($_SESSION[self::REPORTING_USER])) {
+          $_SESSION[self::REPORTING_USER] = [];
+    }
 
-    if(!isset($_SESSION[self::REPORTING_USER][$level]))
-      $_SESSION[self::REPORTING_USER][$level] = [];
+    if(!isset($_SESSION[self::REPORTING_USER][$level])) {
+          $_SESSION[self::REPORTING_USER][$level] = [];
+    }
 
     $_SESSION[self::REPORTING_USER][$level][] = [$message, $context];
   }
@@ -199,8 +201,9 @@ 
     $m[E_STRICT]=$m[E_DEPRECATED]=$m[E_USER_DEPRECATED]=$m[E_ALL]=LogLevel::DEBUG;
     $m[2048]=$m[8192]=$m[16384]=$m[32767]=LogLevel::DEBUG;
 
-    if(isset($m[$level]))
-      return $m[$level];
+    if(isset($m[$level])) {
+          return $m[$level];
+    }
 
     throw new \Exception(__FUNCTION__."($level): $level is unknown");
   }