HexMakina / kadro

Logger/LogLaddy.class.php

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

Controllers/TradukoController.class.php

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

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

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) && is_subclass_of($this->load_model, '\HexMakina\Crudites\Interfaces\TraceableInterface') && $this->load_model->traceable())
-      $this->viewport('load_model_history', $this->tracer()->traces_by_model($this->load_model));
+    if(!is_null($this->load_model) && is_subclass_of($this->load_model, '\HexMakina\Crudites\Interfaces\TraceableInterface') && $this->load_model->traceable()) {
+          $this->viewport('load_model_history', $this->tracer()->traces_by_model($this->load_model));
+    }
   }
 
   public function has_load_model()
@@ -112,8 +120,9 @@ 
       $this->logger()->nice(L('CRUDITES_INSTANCE_ALTERED', ['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;
   }
@@ -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(L('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(L('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(L('CRUDITES_ERR_INSTANCE_IS_UNDELETABLE', [''.$this->load_model]));
       $this->route_back($this->load_model);
-    }
-    else
+    } else
     {
       $this->logger()->nice(L('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);
   }

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

common.inc.php

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

Braces +21 added lines, -27 removed lines

@@ -11,18 +11,16 @@ 
     if(property_exists($this, 'permission_names'))
     {
       return explode(',', $this->permission_names);
-    }
-    elseif(property_exists($this, 'permission_ids'))
+    } elseif(property_exists($this, 'permission_ids'))
     {
       $ids = explode(',', $this->permission_ids);
       $ret = [];
       $permissions = Permission::get_many_by_AIPK($ids);
-      foreach($permissions as $id => $p)
-        $ret[]="$p";
+      foreach($permissions as $id => $p) {
+              $ret[]="$p";
+      }
       return $ret;
-    }
-
-    else
+    } else
     {
       return ACL::permissions_names_for($this);
     }
@@ -31,21 +29,20 @@ 
   public function permissions()
   {
 
-    if(!is_null($this->permissions))
-      return $this->permissions;
+    if(!is_null($this->permissions)) {
+          return $this->permissions;
+    }
     $permission_unique_keys = null;
     if(property_exists($this, 'permission_names'))
     {
       $permission_unique_keys = explode(',', $this->permission_names);
       // vd(Permission::table()->select());
       $this->permissions = Permission::retrieve(Permission::table()->select()->aw_string_in('name', $permission_unique_keys));
-    }
-    elseif(property_exists($this, 'permission_ids'))
+    } elseif(property_exists($this, 'permission_ids'))
     {
       $permission_unique_keys = explode(',', $this->permission_ids);
       $this->permissions = Permission::retrieve(Permission::table()->select()->aw_numeric_in('id', $permission_unique_keys));
-    }
-    else
+    } else
     {
       $this->permissions = ACL::permissions_for($this);
     }
@@ -56,39 +53,36 @@ 
   public function has_permission($p) : bool
   {
     // new instances or inactive operators, none shall pass
-    if($this->is_new() === true || $this->is_active()  === false)
-      return false;
+    if($this->is_new() === true || $this->is_active()  === false) {
+          return false;
+    }
 
     $permission_name = $permission_id = null;
     if(is_subclass_of($p, '\HexMakina\kadro\Auth\Permission'))
     {
       $permission_name = $p->get('name');
       $permission_id = $p->get_id();
+    } elseif(preg_match('/[0-9]+/', $p)) {
+          $permission_id = $p;
+    } else {
+          $permission_name = $p;
     }
-    elseif(preg_match('/[0-9]+/', $p))
-      $permission_id = $p;
-    else
-      $permission_name = $p;
 
     if(!is_null($this->get('permission_names')) && !is_null($permission_name))
     {
       return strpos($this->get('permission_names'), $permission_name) !== false;
-    }
-    elseif(!is_null($this->get('permission_ids')) && !is_null($permission_id))
+    } elseif(!is_null($this->get('permission_ids')) && !is_null($permission_id))
     {
       return strpos($this->get('permission_ids'), $permission_id) !== false;
-    }
-    elseif(!is_null($permission_name))
+    } elseif(!is_null($permission_name))
     {
       if(method_exists($this, $permission_name) && $this->$permission_name() == true)
       {
         return true;
-      }
-      elseif(property_exists($this, $permission_name) && $this->$permission_name == true)
+      } elseif(property_exists($this, $permission_name) && $this->$permission_name == true)
       {
         return true;
-      }
-      elseif(ACL::match($this, $permission_name) === true)
+      } elseif(ACL::match($this, $permission_name) === true)
       {
         return true;
       }