HexMakina / kadro

StorageManager/__DEL__FileManager.class.php

Spacing +4 added lines, -4 removed lines

@@ -12,7 +12,7 @@ 
   
   function __construct($file_manageable_model, $filetype)
   {
-    if(!is_subclass_of($file_manageable_model, '\HexMakina\Crudites\TightModel'))
+    if (!is_subclass_of($file_manageable_model, '\HexMakina\Crudites\TightModel'))
       throw new \Exception("__construct($file_manageable_model) // only Model items are manageable");
 
     $this->pmi = $file_manageable_model;
@@ -32,7 +32,7 @@ 
   public function download($url)
   {
     $filename = $this->build_filename();
-    $filename .= '.' . pathinfo($url, PATHINFO_EXTENSION);
+    $filename .= '.'.pathinfo($url, PATHINFO_EXTENSION);
 
     $filepath = $this->build_path_to_file($filename);
 
@@ -58,10 +58,10 @@ 
     return $this->pmi->get_id().'/';  
 
     $pmi_model_type = get_class($this->pmi)::model_type();
-    if(!isset($this->pmi) || is_null($this->get_type()))
+    if (!isset($this->pmi) || is_null($this->get_type()))
       throw new \Exception(__FUNCTION__." // undefined manageable item or picture type");
 
-    if(!isset($settings[$pmi_model_type][$this->get_type()]['import_directory']))
+    if (!isset($settings[$pmi_model_type][$this->get_type()]['import_directory']))
       throw new \Exception(__FUNCTION__." // undefined configuration for '".($pmi_model_type)."'>'".$this->get_type()."'>'import_directory'");
     
     // global $settings;

Braces +9 added lines, -6 removed lines

@@ -12,8 +12,9 @@ 
   
   function __construct($file_manageable_model, $filetype)
   {
-    if(!is_subclass_of($file_manageable_model, '\HexMakina\Crudites\TightModel'))
-      throw new \Exception("__construct($file_manageable_model) // only Model items are manageable");
+    if(!is_subclass_of($file_manageable_model, '\HexMakina\Crudites\TightModel')) {
+          throw new \Exception("__construct($file_manageable_model) // only Model items are manageable");
+    }
 
     $this->pmi = $file_manageable_model;
     $this->picture_type = $filetype;
@@ -58,11 +59,13 @@ 
     return $this->pmi->get_id().'/';  
 
     $pmi_model_type = get_class($this->pmi)::model_type();
-    if(!isset($this->pmi) || is_null($this->get_type()))
-      throw new \Exception(__FUNCTION__." // undefined manageable item or picture type");
+    if(!isset($this->pmi) || is_null($this->get_type())) {
+          throw new \Exception(__FUNCTION__." // undefined manageable item or picture type");
+    }
 
-    if(!isset($settings[$pmi_model_type][$this->get_type()]['import_directory']))
-      throw new \Exception(__FUNCTION__." // undefined configuration for '".($pmi_model_type)."'>'".$this->get_type()."'>'import_directory'");
+    if(!isset($settings[$pmi_model_type][$this->get_type()]['import_directory'])) {
+          throw new \Exception(__FUNCTION__." // undefined configuration for '".($pmi_model_type)."'>'".$this->get_type()."'>'import_directory'");
+    }
     
     // global $settings;
     // return $settings[$pmi_model_type][$this->get_type()]['import_directory'].$this->pmi->get_id().'/';

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/TradukoController.class.php

Spacing +8 added lines, -8 removed lines

@@ -19,15 +19,15 @@ 
     return $this->router()->prehop('traduko');
   }
 
-  public function update_file($lang='fra')
+  public function update_file($lang = 'fra')
   {
-    try{
+    try {
       $locale_path = $this->box('settings.locale.directory_path').'/'.$this->box('settings.locale.file_name');
       self::create_file($locale_path, $lang);
 
       $this->logger()->nice(L('KADRO_SYSTEM_FILE_UPDATED'));
     }
-    catch(\Exception $e)
+    catch (\Exception $e)
     {
       $this->logger()->notice(L('KADRO_SYSTEM_FILE_UPDATED'));
     }
@@ -38,11 +38,11 @@ 
   {
     $res = Traduko::filter(['lang' => $lang]);
     $assoc = [];
-    foreach($res as $id => $trad)
+    foreach ($res as $id => $trad)
     {
-      if(!isset($assoc[$trad->kategorio]))
+      if (!isset($assoc[$trad->kategorio]))
         $assoc[$trad->kategorio] = [];
-      if(!isset($assoc[$trad->kategorio][$trad->sekcio]))
+      if (!isset($assoc[$trad->kategorio][$trad->sekcio]))
         $assoc[$trad->kategorio][$trad->sekcio] = [];
 
       $assoc[$trad->kategorio][$trad->sekcio][$trad->referenco] = $trad->$lang;
@@ -57,8 +57,8 @@ 
   public static function init($locale_path)
   {
     $languages = array_keys(array_slice(Traduko::inspect(Traduko::table_name())->columns(), 4));
-    foreach($languages as $l)
-      self::create_file($locale_path,$l);
+    foreach ($languages as $l)
+      self::create_file($locale_path, $l);
 
     return $languages;
   }

Braces +10 added lines, -8 removed lines

@@ -26,8 +26,7 @@ 
       self::create_file($locale_path, $lang);
 
       $this->logger()->nice(L('KADRO_SYSTEM_FILE_UPDATED'));
-    }
-    catch(\Exception $e)
+    } catch(\Exception $e)
     {
       $this->logger()->notice(L('KADRO_SYSTEM_FILE_UPDATED'));
     }
@@ -40,10 +39,12 @@ 
     $assoc = [];
     foreach($res as $id => $trad)
     {
-      if(!isset($assoc[$trad->kategorio]))
-        $assoc[$trad->kategorio] = [];
-      if(!isset($assoc[$trad->kategorio][$trad->sekcio]))
-        $assoc[$trad->kategorio][$trad->sekcio] = [];
+      if(!isset($assoc[$trad->kategorio])) {
+              $assoc[$trad->kategorio] = [];
+      }
+      if(!isset($assoc[$trad->kategorio][$trad->sekcio])) {
+              $assoc[$trad->kategorio][$trad->sekcio] = [];
+      }
 
       $assoc[$trad->kategorio][$trad->sekcio][$trad->referenco] = $trad->$lang;
     }
@@ -57,8 +58,9 @@ 
   public static function init($locale_path)
   {
     $languages = array_keys(array_slice(Traduko::inspect(Traduko::table_name())->columns(), 4));
-    foreach($languages as $l)
-      self::create_file($locale_path,$l);
+    foreach($languages as $l) {
+          self::create_file($locale_path,$l);
+    }
 
     return $languages;
   }

Controllers/OperatorController.class.php

Spacing +9 added lines, -9 removed lines

@@ -12,7 +12,7 @@ 
 namespace HexMakina\kadro\Controllers;
 
 use \HexMakina\Crudites\Crudites;
-use \HexMakina\kadro\Auth\{Operator,OperatorInterface,ACL,AccessRefusedException};
+use \HexMakina\kadro\Auth\{Operator, OperatorInterface, ACL, AccessRefusedException};
 
 
 class OperatorController extends \HexMakina\kadro\Controllers\ORMController
@@ -23,7 +23,7 @@ 
     parent::edit();
 
     // do we create? or do we edit someone else ? must be admin
-    if(is_null($this->load_model) || $this->operator()->operator_id() !== $this->load_model->operator_id())
+    if (is_null($this->load_model) || $this->operator()->operator_id() !== $this->load_model->operator_id())
       $this->authorize('group_admin');
 
   }
@@ -35,7 +35,7 @@ 
 
   public function save()
   {
-    if($this->operator()->operator_id() !== $this->form_model->operator_id())
+    if ($this->operator()->operator_id() !== $this->form_model->operator_id())
       $this->authorize('group_admin');
 
     parent::save();
@@ -44,7 +44,7 @@ 
   public function before_save() : array
   {
     //------------------------------------------------------------- PASSWORDS
-    if($this->form_model->get('password') != $this->form_model->get('password_verification'))
+    if ($this->form_model->get('password') != $this->form_model->get('password_verification'))
     {
       $this->logger()->warning(L('KADRO_operator_ERR_PASSWORDS_MISMATCH'));
       return $this->edit();
@@ -58,7 +58,7 @@ 
   public function dashboard()
   {
     $real_operator_class = get_class($this->operator());
-    $this->viewport('users', $real_operator_class::filter([], ['order_by' => [null,'username', 'ASC']]));
+    $this->viewport('users', $real_operator_class::filter([], ['order_by' => [null, 'username', 'ASC']]));
   }
 
   public function destroy()
@@ -71,10 +71,10 @@ 
     parent::authorize('group_admin');
 
     $operator = Operator::one($this->router()->params());
-    if($operator->username() == $this->operator()->username())
+    if ($operator->username() == $this->operator()->username())
       throw new AccessRefusedException();
 
-    if(Operator::toggle_boolean(Operator::table_name(), 'active', $operator->operator_id()) === true)
+    if (Operator::toggle_boolean(Operator::table_name(), 'active', $operator->operator_id()) === true)
     {
       $confirmation_message = $operator->is_active() ? 'KADRO_operator_DISABLED' : 'KADRO_operator_ENABLED';
       $this->logger()->nice(L($confirmation_message, [$operator->name()]));
@@ -92,14 +92,14 @@ 
     parent::authorize('group_admin');
 
     $operator = Operator::one(['username' => $this->router()->params('username')]);
-    if($operator->username() == $this->operator()->username())
+    if ($operator->username() == $this->operator()->username())
       throw new AccessRefusedException();
 
     $permission_id = $this->router()->params('permission_id');
 
     $row_data = ['operator_id' => $operator->operator_id(), 'permission_id' => $permission_id];
     $row = ACL::table()->restore($row_data);
-    if($row->is_new())
+    if ($row->is_new())
     {
       $row = ACL::table()->produce($row_data);
       $res = $row->persist();

Braces +14 added lines, -12 removed lines

@@ -23,8 +23,9 @@ 
     parent::edit();
 
     // do we create? or do we edit someone else ? must be admin
-    if(is_null($this->load_model) || $this->operator()->operator_id() !== $this->load_model->operator_id())
-      $this->authorize('group_admin');
+    if(is_null($this->load_model) || $this->operator()->operator_id() !== $this->load_model->operator_id()) {
+          $this->authorize('group_admin');
+    }
 
   }
 
@@ -35,8 +36,9 @@ 
 
   public function save()
   {
-    if($this->operator()->operator_id() !== $this->form_model->operator_id())
-      $this->authorize('group_admin');
+    if($this->operator()->operator_id() !== $this->form_model->operator_id()) {
+          $this->authorize('group_admin');
+    }
 
     parent::save();
   }
@@ -71,15 +73,15 @@ 
     parent::authorize('group_admin');
 
     $operator = Operator::one($this->router()->params());
-    if($operator->username() == $this->operator()->username())
-      throw new AccessRefusedException();
+    if($operator->username() == $this->operator()->username()) {
+          throw new AccessRefusedException();
+    }
 
     if(Operator::toggle_boolean(Operator::table_name(), 'active', $operator->operator_id()) === true)
     {
       $confirmation_message = $operator->is_active() ? 'KADRO_operator_DISABLED' : 'KADRO_operator_ENABLED';
       $this->logger()->nice(L($confirmation_message, [$operator->name()]));
-    }
-    else
+    } else
     {
       $this->logger()->warning(L('CRUDITES_ERR_QUERY_FAILED'));
     }
@@ -92,8 +94,9 @@ 
     parent::authorize('group_admin');
 
     $operator = Operator::one(['username' => $this->router()->params('username')]);
-    if($operator->username() == $this->operator()->username())
-      throw new AccessRefusedException();
+    if($operator->username() == $this->operator()->username()) {
+          throw new AccessRefusedException();
+    }
 
     $permission_id = $this->router()->params('permission_id');
 
@@ -103,8 +106,7 @@ 
     {
       $row = ACL::table()->produce($row_data);
       $res = $row->persist();
-    }
-    else
+    } else
     {
       $row->wipe();
     }

Controllers/ReceptionController.class.php

Braces +12 added lines, -8 removed lines

@@ -18,8 +18,9 @@ 
   public function welcome(OperatorInterface $operator)
   {
 
-    if($this->router()->name() === 'identify')
-      $this->identify($operator);
+    if($this->router()->name() === 'identify') {
+          $this->identify($operator);
+    }
 
     $Controller = $this->router()->target_controller();
     $Controller = $this->box($Controller);
@@ -27,8 +28,9 @@ 
 
     if($Controller->requires_operator())
     {
-      if(is_null($operator = get_class($operator)::exists($this->box('StateAgent')->operator_id())))
-        $this->router()->hop('checkin');
+      if(is_null($operator = get_class($operator)::exists($this->box('StateAgent')->operator_id()))) {
+              $this->router()->hop('checkin');
+      }
 
       if(!$operator->is_active())
       {
@@ -62,11 +64,13 @@ 
 
       $operator = get_class($op)::exists(['username' => $username]);
 
-      if(is_null($operator) || !$operator->is_active())
-        throw new \Exception('ERR_DISABLED');
+      if(is_null($operator) || !$operator->is_active()) {
+              throw new \Exception('ERR_DISABLED');
+      }
 
-      if(!$operator->password_verify($password))
-        throw new \Exception('ERR_WRONG_LOGIN_OR_PASSWORD');
+      if(!$operator->password_verify($password)) {
+              throw new \Exception('ERR_WRONG_LOGIN_OR_PASSWORD');
+      }
 
       $this->box('StateAgent')->operator_id($operator->get_id());
       $this->logger()->nice(L('PAGE_CHECKIN_WELCOME', [$operator->name()]));

Spacing +8 added lines, -8 removed lines

@@ -2,8 +2,8 @@ 
 
 namespace HexMakina\kadro\Controllers;
 
-use HexMakina\kadro\Auth\{Operator,Permission,ACL};
-use HexMakina\kadro\Auth\{OperatorInterface,AccessRefusedException};
+use HexMakina\kadro\Auth\{Operator, Permission, ACL};
+use HexMakina\kadro\Auth\{OperatorInterface, AccessRefusedException};
 
 class ReceptionController extends KadroController
 {
@@ -15,19 +15,19 @@ 
   public function welcome(OperatorInterface $operator)
   {
 
-    if($this->router()->name() === 'identify')
+    if ($this->router()->name() === 'identify')
       $this->identify($operator);
 
     $Controller = $this->router()->target_controller();
     $Controller = $this->box($Controller);
 
 
-    if($Controller->requires_operator())
+    if ($Controller->requires_operator())
     {
-      if(is_null($operator = get_class($operator)::exists($this->box('StateAgent')->operator_id())))
+      if (is_null($operator = get_class($operator)::exists($this->box('StateAgent')->operator_id())))
         $this->router()->hop('checkin');
 
-      if(!$operator->is_active())
+      if (!$operator->is_active())
       {
         $this->checkout();
         throw new AccessRefusedException();
@@ -59,10 +59,10 @@ 
 
       $operator = get_class($op)::exists(['username' => $username]);
 
-      if(is_null($operator) || !$operator->is_active())
+      if (is_null($operator) || !$operator->is_active())
         throw new \Exception('ERR_DISABLED');
 
-      if(!$operator->password_verify($password))
+      if (!$operator->password_verify($password))
         throw new \Exception('ERR_WRONG_LOGIN_OR_PASSWORD');
 
       $this->box('StateAgent')->operator_id($operator->get_id());

common.inc.php

Spacing +18 added lines, -18 removed lines

@@ -14,7 +14,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/');

@@ -39,9 +39,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);

   }

@@ -57,9 +57,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);

@@ -68,7 +68,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'] ?? []));

@@ -92,24 +92,24 @@ 
   //---------------------------------------------------------------     ŝ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'));
 
@@ -124,7 +124,7 @@ 
   $lezer->init();
 
   $smarty->assign('language', $language);
-  if($cookies_enabled === true)
+  if ($cookies_enabled === true)
     setcookie('lang', $language, time()+(365 * 24 * 60 * 60), "/", "");
 
 }

Braces +6 added lines, -4 removed lines

@@ -92,8 +92,9 @@ 
   //---------------------------------------------------------------     ŝ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");
+  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);
@@ -124,7 +125,8 @@ 
   $lezer->init();
 
   $smarty->assign('language', $language);
-  if($cookies_enabled === true)
-    setcookie('lang', $language, time()+(365 * 24 * 60 * 60), "/", "");
+  if($cookies_enabled === true) {
+      setcookie('lang', $language, time()+(365 * 24 * 60 * 60), "/", "");
+  }
 
 }

Controllers/ORMController.class.php

Indentation +3 added lines, -3 removed lines

@@ -30,7 +30,7 @@ 
     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();
 
@@ -48,10 +48,10 @@ 
     }
 
     if(method_exists($this, 'conclude')) // conclude always executed, even with has_halting_messages
-    	$this->conclude();
+      $this->conclude();
 
     if(method_exists($this, 'display'))
-    	$this->display($custom_template); // ret value ignored..
+      $this->display($custom_template); // ret value ignored..
   }
 
   public function prepare()

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'))
     	$this->display($custom_template); // ret value ignored..
   }
 
@@ -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) && is_subclass_of($this->load_model, '\HexMakina\Crudites\Interfaces\TraceableInterface') && $this->load_model->traceable())
+    if (!is_null($this->load_model) && is_subclass_of($this->load_model, '\HexMakina\Crudites\Interfaces\TraceableInterface') && $this->load_model->traceable())
     {
       // $traces = $this->tracer()->traces_by_model($this->load_model);
       $traces = $this->tracer()->history_by_model($this->load_model);
@@ -99,7 +99,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);
@@ -112,12 +112,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(L('CRUDITES_INSTANCE_ALTERED', [L('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(L($error_msg, [$field]));
 
     return null;
@@ -128,12 +128,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);
@@ -144,24 +144,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));
       }
 
     }
@@ -183,13 +183,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
     {
@@ -200,21 +200,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(L('CRUDITES_ERR_INSTANCE_NOT_FOUND', [L('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(L('CRUDITES_ERR_INSTANCE_NOT_FOUND', [L('MODEL_'.$this->model_type.'_INSTANCE')]));
       $this->router()->hop($this->model_type);
@@ -227,12 +227,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(L('CRUDITES_ERR_INSTANCE_NOT_FOUND', [L('MODEL_'.$this->model_type.'_INSTANCE')]));
       $this->router()->hop($this->model_type);
     }
-    elseif($this->load_model->immortal())
+    elseif ($this->load_model->immortal())
     {
 
       $this->logger()->warning(L('CRUDITES_ERR_INSTANCE_IS_IMMORTAL', [L('MODEL_'.$this->model_type.'_INSTANCE')]));
@@ -242,10 +242,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(L('CRUDITES_ERR_INSTANCE_IS_UNDELETABLE', [''.$this->load_model]));
       $this->route_back($this->load_model);
@@ -268,10 +268,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);
   }
 
@@ -283,15 +283,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);
 
@@ -301,7 +301,7 @@ 
   public function export()
   {
     $format = $this->router()->params('format');
-    switch($format)
+    switch ($format)
     {
       case null:
         $filename = $this->model_type;
@@ -330,33 +330,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 +58 added lines, -41 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,24 @@ 
       }
     }
 
-    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'))
-    	$this->display($custom_template); // ret value ignored..
+    if(method_exists($this, 'display')) {
+        	$this->display($custom_template);
+    }
+    // ret value ignored..
   }
 
   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,13 +82,13 @@ 
       $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) && is_subclass_of($this->load_model, '\HexMakina\Crudites\Interfaces\TraceableInterface') && $this->load_model->traceable())
@@ -117,8 +125,9 @@ 
       $this->logger()->nice(L('CRUDITES_INSTANCE_ALTERED', [L('MODEL_'.get_class($model)::model_type().'_INSTANCE')]));
       return $model;
     }
-    foreach($this->errors() as $field => $error_msg)
-      $this->logger()->warning(L($error_msg, [$field]));
+    foreach($this->errors() as $field => $error_msg) {
+          $this->logger()->warning(L($error_msg, [$field]));
+    }
 
     return null;
   }
@@ -132,8 +141,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);
@@ -149,15 +162,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)
       {
@@ -189,9 +203,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';
@@ -231,8 +245,7 @@ 
     {
       $this->logger()->warning(L('CRUDITES_ERR_INSTANCE_NOT_FOUND', [L('MODEL_'.$this->model_type.'_INSTANCE')]));
       $this->router()->hop($this->model_type);
-    }
-    elseif($this->load_model->immortal())
+    } elseif($this->load_model->immortal())
     {
 
       $this->logger()->warning(L('CRUDITES_ERR_INSTANCE_IS_IMMORTAL', [L('MODEL_'.$this->model_type.'_INSTANCE')]));
@@ -242,15 +255,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(L('CRUDITES_ERR_INSTANCE_IS_UNDELETABLE', [''.$this->load_model]));
       $this->route_back($this->load_model);
-    }
-    else
+    } else
     {
       $this->logger()->nice(L('CRUDITES_INSTANCE_DESTROYED', [L('MODEL_'.$this->model_type.'_INSTANCE')]));
       $this->route_back($this->model_type);
@@ -268,11 +281,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)
@@ -330,9 +345,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()];
@@ -343,11 +358,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);
   }

Auth/Operator.class.php

Spacing +4 added lines, -4 removed lines

@@ -66,10 +66,10 @@ 
     return $this->get('language_code');

   }

 

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

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

   {

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

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

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

     {

       $Query->group_by('id');

 

@@ -78,9 +78,9 @@ 
       $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']))

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

     {

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

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

     }

 

Router/RouterInterface.class.php

Spacing +3 added lines, -3 removed lines

@@ -13,17 +13,17 @@
   public function match($requestUrl = null, $requestMethod = null);
 
   // generates URL for href and location
-  public function prehop($route, $route_params=[]);
+  public function prehop($route, $route_params = []);
 
   // heads to another location
-  public function hop($route, $route_params=[]);
+  public function hop($route, $route_params = []);
 
   // do you GET it ?
   public function requests() : bool;
 
   // have you POSTed it ?
   public function submits() : bool;
-  public function submitted($param_name=null);
+  public function submitted($param_name = null);
 
   public function send_file($file_path);