HexMakina / kadro

Models/Abilities/Event.class.php

Indentation +12 added lines, -12 removed lines

@@ -23,22 +23,22 @@
 
   public static function today($format=Dato::FORMAT)
   {
-		return Dato::today($format);
-	}
+    return Dato::today($format);
+  }
 
   public static function date($date=null, $format=Dato::FORMAT) : string
-	{
-		return Dato::format($date);
-	}
+  {
+    return Dato::format($date);
+  }
   //
   // //------------------------------------------------------------  MySQL DateTime helpers
   // public static function year($date=null) : string
-	// {
-	// 	return Dato::format($date, Dato::FORMAT_YEAR);
-	// }
+  // {
+  // 	return Dato::format($date, Dato::FORMAT_YEAR);
+  // }
   //
-	// public static function datetime($date=null) : string
-	// {
-	// 	return DatoTempo::format($date);
-	// }
+  // public static function datetime($date=null) : string
+  // {
+  // 	return DatoTempo::format($date);
+  // }
 }

Spacing +2 added lines, -2 removed lines

@@ -21,12 +21,12 @@
     return $this->__toString();
   }
 
-  public static function today($format=Dato::FORMAT)
+  public static function today($format = Dato::FORMAT)
   {
 		return Dato::today($format);
 	}
 
-  public static function date($date=null, $format=Dato::FORMAT) : string
+  public static function date($date = null, $format = Dato::FORMAT) : string
 	{
 		return Dato::format($date);
 	}

Container/LeMarchand.class.php

Spacing +11 added lines, -11 removed lines

@@ -16,7 +16,7 @@ 
   public function __debugInfo()
   {
     $dbg = get_object_vars($this);
-    $dbg['configurations']['template_engine'] = isset($dbg['configurations']['template_engine'])? get_class($dbg['configurations']['template_engine']) : 'NOT SET';
+    $dbg['configurations']['template_engine'] = isset($dbg['configurations']['template_engine']) ? get_class($dbg['configurations']['template_engine']) : 'NOT SET';
 
     return $dbg;
   }
@@ -34,45 +34,45 @@ 
   public function get($configuration)
   {
     
-    if(!is_string($configuration))
+    if (!is_string($configuration))
       throw new LamentException($configuration);
 
-    if($this->has($configuration))
+    if ($this->has($configuration))
       return $this->configurations[$configuration];
 
     
     // fallbacks
-    if(preg_match('/^settings\./', $configuration, $m) === 1)
+    if (preg_match('/^settings\./', $configuration, $m) === 1)
     {
       $ret = $this->configurations;
-      foreach(explode('.', $configuration) as $k)
+      foreach (explode('.', $configuration) as $k)
       {
-        if(!isset($ret[$k]))
+        if (!isset($ret[$k]))
           throw new ConfigurationException($configuration);
         $ret = $ret[$k];
       }
 
       return $ret;
     }
-    elseif(class_exists($configuration)) // auto create instances
+    elseif (class_exists($configuration)) // auto create instances
     {
       
       $rc = new \ReflectionClass($configuration);
 
       $construction_args = [];
       $instance = null;
-      if(!is_null($rc->getConstructor()))
+      if (!is_null($rc->getConstructor()))
       {
-        foreach($rc->getConstructor()->getParameters() as $param)
+        foreach ($rc->getConstructor()->getParameters() as $param)
         {
-          $construction_args []= $this->get($param->getType().'');
+          $construction_args [] = $this->get($param->getType().'');
         }
         $instance = $rc->newInstanceArgs($construction_args);
       }
       else 
         $instance = $rc->newInstanceArgs();
 
-      if($rc->hasMethod('set_container'))
+      if ($rc->hasMethod('set_container'))
         $instance->set_container($this);
       
       return $instance;

Braces +17 added lines, -12 removed lines

@@ -34,11 +34,13 @@ 
   public function get($configuration)
   {
     
-    if(!is_string($configuration))
-      throw new LamentException($configuration);
+    if(!is_string($configuration)) {
+          throw new LamentException($configuration);
+    }
 
-    if($this->has($configuration))
-      return $this->configurations[$configuration];
+    if($this->has($configuration)) {
+          return $this->configurations[$configuration];
+    }
 
     
     // fallbacks
@@ -47,17 +49,19 @@ 
       $ret = $this->configurations;
       foreach(explode('.', $configuration) as $k)
       {
-        if(!isset($ret[$k]))
-          throw new ConfigurationException($configuration);
+        if(!isset($ret[$k])) {
+                  throw new ConfigurationException($configuration);
+        }
         $ret = $ret[$k];
       }
 
       return $ret;
-    }
-    elseif(class_exists($configuration)) // auto create instances
+    } elseif(class_exists($configuration)) {
+      // auto create instances
     {
       
       $rc = new \ReflectionClass($configuration);
+    }
 
       $construction_args = [];
       $instance = null;
@@ -68,12 +72,13 @@ 
           $construction_args []= $this->get($param->getType().'');
         }
         $instance = $rc->newInstanceArgs($construction_args);
+      } else {
+              $instance = $rc->newInstanceArgs();
       }
-      else 
-        $instance = $rc->newInstanceArgs();
 
-      if($rc->hasMethod('set_container'))
-        $instance->set_container($this);
+      if($rc->hasMethod('set_container')) {
+              $instance->set_container($this);
+      }
       
       return $instance;
     }

Logger/LogLaddy.class.php

Indentation +1 added lines, -1 removed lines

@@ -265,7 +265,7 @@
    * const NOTICE    = 'notice'; // Normal but significant events.
    * const INFO      = 'info'; // Interesting events. User logs in, SQL logs.
    * const DEBUG     = 'debug'; // Detailed debug information.
-  */
+   */
   private static function map_error_level_to_log_level($level) : string
   {
     // http://php.net/manual/en/errorfunc.constants.php

Spacing +21 added lines, -21 removed lines

@@ -13,8 +13,8 @@ 
 
 class LogLaddy implements LoggerInterface
 {
-  use \Psr\Log\LoggerTrait;           // PSR implementation
-  use \HexMakina\Debugger\Debugger;   // Debugger
+  use \Psr\Log\LoggerTrait; // PSR implementation
+  use \HexMakina\Debugger\Debugger; // Debugger
 
   const REPORTING_USER = 'user_messages';
   const INTERNAL_ERROR = 'error';
@@ -55,9 +55,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
     {
@@ -68,7 +68,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 = self::format_throwable_message($context['class'], $context['code'], $context['file'], $context['line'], $context['text']);
       error_log($display_error);
-      $display_error.= self::format_trace($context['trace'], false);
+      $display_error .= self::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, self::format_file($context['file']), $context['line'], $message);
       error_log($display_error);
-      $display_error.= self::format_trace($context['trace'], true);
+      $display_error .= self::format_trace($context['trace'], true);
       self::HTTP_500($display_error);
     }
     else
@@ -128,10 +128,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];
@@ -163,21 +163,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

@@ -55,11 +55,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.= self::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, self::format_file($context['file']), $context['line'], $message);
+    }
       error_log($display_error);
       $display_error.= self::format_trace($context['trace'], true);
       self::HTTP_500($display_error);
-    }
-    else
+    } else
     {// --- Handles user messages, through SESSION storage
       $this->report_to_user($level, $message, $context);
     }
@@ -128,11 +128,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];
   }
@@ -177,8 +179,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");
   }

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();
     }

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), "/", "");
+  }
 
 }

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

     {

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

     }