HexMakina / kadro

Controllers/ORMController.class.php

Spacing +50 added lines, -50 removed lines

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

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;

Auth/ACL.class.php

Spacing +9 added lines, -9 removed lines

@@ -18,14 +18,14 @@ 
     return in_array($permission_name, self::permissions_names_for($op));
   }
 
-  public static function query_retrieve($filters=[], $options=[]) : Select
+  public static function query_retrieve($filters = [], $options = []) : Select
   {
     $options['eager'] = false;
-    $ret = parent::query_retrieve($filters,$options);
+    $ret = parent::query_retrieve($filters, $options);
     $eager_params = [];
-    $eager_params[Permission::table_name()]=Permission::table_alias();
-    $eager_params[Operator::table_name()]=Operator::table_alias();
-    $eager_params[ACL::table_name()]=ACL::table_alias();
+    $eager_params[Permission::table_name()] = Permission::table_alias();
+    $eager_params[Operator::table_name()] = Operator::table_alias();
+    $eager_params[ACL::table_name()] = ACL::table_alias();
 
     $ret->eager($eager_params);
 
@@ -37,8 +37,8 @@ 
     $res = self::any(['operator_id'=>$op->get_id()]);
 
     $permission_ids = [];
-    foreach($res as $r)
-      $permission_ids[]=$r->get('permission_id');
+    foreach ($res as $r)
+      $permission_ids[] = $r->get('permission_id');
 
     $ret = Permission::filter(['ids'=>$permission_ids]);
     return $ret;
@@ -47,10 +47,10 @@ 
   {
     $operator_with_perms = get_class($op)::exists($op->operator_id());
     // $operator_with_perms = get_class($op)::retrieve($operator_with_perms);
-    if(is_null($operator_with_perms))
+    if (is_null($operator_with_perms))
       return [];
 
-    return explode(',',$operator_with_perms->get('permission_names'));
+    return explode(',', $operator_with_perms->get('permission_names'));
   }
 
   public static function allow_in(OperatorInterface $op, Permission $p)

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

 		}

 

TableToForm.class.php

Spacing +44 added lines, -44 removed lines

@@ -3,26 +3,26 @@ 
 namespace HexMakina\kadro;
 
 use \HexMakina\Crudites\Interfaces\ModelInterface;
-use \HexMakina\Format\HTML\{Form,Element};
+use \HexMakina\Format\HTML\{Form, Element};
 
 class TableToForm
 {
-  private static function compute_field_value($model,$field_name)
+  private static function compute_field_value($model, $field_name)
   {
-    if(method_exists($model,$field_name))
+    if (method_exists($model, $field_name))
       return $model->$field_name();
 
-    if(property_exists($model,$field_name))
+    if (property_exists($model, $field_name))
       return $model->$field_name;
 
     return '';
   }
 
-  public static function label($model,$field_name,$attributes=[],$errors=[])
+  public static function label($model, $field_name, $attributes = [], $errors = [])
   {
     $label_content = $field_name;
 
-    if(isset($attributes['label']))
+    if (isset($attributes['label']))
     {
       $label_content = $attributes['label'];
       unset($attributes['label']);
@@ -44,66 +44,66 @@ 
     return $ret;
   }
 
-  public static function field(ModelInterface $model,$field_name,$attributes=[],$errors=[]) : string
+  public static function field(ModelInterface $model, $field_name, $attributes = [], $errors = []) : string
   {
-    $field_value = $attributes['value'] ?? self::compute_field_value($model,$field_name);
+    $field_value = $attributes['value'] ?? self::compute_field_value($model, $field_name);
     $attributes['name'] = $attributes['name'] ?? $field_name;
 
     $table = get_class($model)::table();
 
-    if(is_null($table->column($field_name)))
-      return Form::input($field_name,$field_value,$attributes,$errors);
+    if (is_null($table->column($field_name)))
+      return Form::input($field_name, $field_value, $attributes, $errors);
 
     $ret = '';
 
     $field = $table->column($field_name);
 
 
-    if(isset($attributes['required']) && $attributes['required'] === false)
+    if (isset($attributes['required']) && $attributes['required'] === false)
       unset($attributes['required']);
 
-    elseif(!$field->is_nullable())
+    elseif (!$field->is_nullable())
       $attributes[] = 'required';
 
-    if($field->is_auto_incremented())
+    if ($field->is_auto_incremented())
     {
-      $ret .= Form::hidden($field->name(),$field_value);
+      $ret .= Form::hidden($field->name(), $field_value);
     }
-    elseif($field->type()->is_boolean())
+    elseif ($field->type()->is_boolean())
     {
       $option_list = $attributes['values'] ?? [0 => 0, 1 => 1];
-      $ret .= Form::select($field->name(), $option_list ,$field_value, $attributes); //
+      $ret .= Form::select($field->name(), $option_list, $field_value, $attributes); //
     }
-    elseif($field->type()->is_integer())
+    elseif ($field->type()->is_integer())
     {
-      $ret .= Form::input($field->name(),$field_value,$attributes,$errors);
+      $ret .= Form::input($field->name(), $field_value, $attributes, $errors);
     }
-    elseif($field->type()->is_year())
+    elseif ($field->type()->is_year())
     {
       $attributes['size'] = $attributes['maxlength'] = 4;
-      $ret .= Form::input($field->name(),$field_value,$attributes,$errors);
+      $ret .= Form::input($field->name(), $field_value, $attributes, $errors);
     }
-    elseif($field->type()->is_date())
+    elseif ($field->type()->is_date())
     {
-      $ret .= Form::date($field->name(),$field_value,$attributes,$errors);
+      $ret .= Form::date($field->name(), $field_value, $attributes, $errors);
     }
-    elseif($field->type()->is_time())
+    elseif ($field->type()->is_time())
     {
-      $ret .= Form::time($field->name(),$field_value,$attributes,$errors);
+      $ret .= Form::time($field->name(), $field_value, $attributes, $errors);
     }
-    elseif($field->type()->is_datetime())
+    elseif ($field->type()->is_datetime())
     {
-      $ret .= Form::datetime($field->name(),$field_value,$attributes,$errors);
+      $ret .= Form::datetime($field->name(), $field_value, $attributes, $errors);
     }
-    elseif($field->type()->is_text())
+    elseif ($field->type()->is_text())
     {
-      $ret .= Form::textarea($field->name(),$field_value,$attributes,$errors);
+      $ret .= Form::textarea($field->name(), $field_value, $attributes, $errors);
     }
-    elseif($field->type()->is_enum())
+    elseif ($field->type()->is_enum())
     {
 
       $enum_values = [];
-      foreach($field->type()->enum_values() as $e_val)
+      foreach ($field->type()->enum_values() as $e_val)
         $enum_values[$e_val] = $e_val;
 
       $selected = $attributes['value'] ?? $field_value ?? '';
@@ -112,50 +112,50 @@ 
 
       // throw new \Exception('ENUM IS NOT HANDLED BY TableToFom');
     }
-    elseif($field->type()->is_string())
+    elseif ($field->type()->is_string())
     {
       $max_length = $field->type()->length();
       $attributes['size'] = $attributes['maxlength'] = $max_length;
-      $ret .= Form::input($field->name(),$field_value,$attributes,$errors);
+      $ret .= Form::input($field->name(), $field_value, $attributes, $errors);
     }
     else
     {
-      $ret .= Form::input($field->name(),$field_value,$attributes,$errors);
+      $ret .= Form::input($field->name(), $field_value, $attributes, $errors);
     }
 
 
     return $ret;
   }
 
-  public static function field_with_label($model,$field_name,$attributes=[],$errors=[]) : string
+  public static function field_with_label($model, $field_name, $attributes = [], $errors = []) : string
   {
     $field_attributes = $attributes;
-    if(isset($attributes['label']))
+    if (isset($attributes['label']))
       unset($field_attributes['label']);
 
-    return sprintf('%s %s', self::label($model,$field_name,$attributes,$errors), self::field($model,$field_name,$field_attributes,$errors));
+    return sprintf('%s %s', self::label($model, $field_name, $attributes, $errors), self::field($model, $field_name, $field_attributes, $errors));
   }
 
 
-  public static function fields(ModelInterface $model,$group_class=null) : string
+  public static function fields(ModelInterface $model, $group_class = null) : string
   {
     $table = get_class($model)::table();
     $ret = '';
-    foreach($table->columns() as $column_name => $column)
+    foreach ($table->columns() as $column_name => $column)
     {
       // vd($column_name);
 
       $form_field = '';
-      if($column->is_auto_incremented())
+      if ($column->is_auto_incremented())
       {
-        if(!$model->is_new())
-          $form_field = self::field($model,$column_name);
+        if (!$model->is_new())
+          $form_field = self::field($model, $column_name);
       }
       else
       {
-        $form_field = self::field_with_label($model,$column_name);
-        if(!is_null($group_class))
-          $form_field = new Element('div',$form_field, ['class' => $group_class]);
+        $form_field = self::field_with_label($model, $column_name);
+        if (!is_null($group_class))
+          $form_field = new Element('div', $form_field, ['class' => $group_class]);
       }
       $ret .= PHP_EOL.$form_field;
     }

Models/Traduko.class.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
     return false;
   }
   
-  public static function query_retrieve($filters=[], $options=[]) : Select
+  public static function query_retrieve($filters = [], $options = []) : Select
   {
     $Query = static::table()->select();
     $Query->order_by(['kategorio', 'ASC']);

Router/hopper.class.php

Spacing +28 added lines, -28 removed lines

@@ -10,14 +10,14 @@ 
 
 class hopper extends \AltoRouter implements RouterInterface
 {
-  private $match=null;
-  private $file_root=null;
+  private $match = null;
+  private $file_root = null;
   private $controller_namespaces = null;
 
   //----------------------------------------------------------- INITIALISATION
   public function __construct($settings)
   {
-    if(!isset($settings['route_home']))
+    if (!isset($settings['route_home']))
       throw new RouterException('ROUTE_HOME_UNDEFINED');
 
     parent::__construct();
@@ -44,15 +44,15 @@ 
   {
     $this->match = parent::match($requestUrl, $requestMethod);
 
-    if($this->match === false)
+    if ($this->match === false)
       throw new RouterException('ROUTE_MATCH_FALSE');
 
     $res = explode('::', self::target());
 
-    if($res === false || !isset($res[1]) || isset($ret[2]))
+    if ($res === false || !isset($res[1]) || isset($ret[2]))
       throw new RouterException('INVALID_TARGET');
 
-    if($this->match['name'] === 'akadok_controller_method')
+    if ($this->match['name'] === 'akadok_controller_method')
       $res = [ucfirst(self::params('controller')).'Controller', ucfirst(self::params('method'))];
 
 
@@ -60,11 +60,11 @@ 
     $target_method = $res[1];
     $found = false;
 
-    foreach($this->controller_namespaces as $controller_ns)
-      if($found = class_exists($controller_class_name = "$controller_ns$target_controller"))
+    foreach ($this->controller_namespaces as $controller_ns)
+      if ($found = class_exists($controller_class_name = "$controller_ns$target_controller"))
         break;
 
-    if($found === false)
+    if ($found === false)
       throw new RouterException('INVALID_CONTROLLER_NAME');
 
     $this->match['target_controller'] = $controller_class_name;
@@ -73,29 +73,29 @@ 
     return [$controller_class_name, $target_method];
   }
 
-  public function params($param_name=null)
+  public function params($param_name = null)
   {
     return $this->extract_request($this->match['params'] ?? [], $param_name);
   }
 
-  public function submitted($param_name=null)
+  public function submitted($param_name = null)
   {
     return $this->extract_request($_POST, $param_name);
   }
 
-  private function extract_request($dat_ass, $key=null)
+  private function extract_request($dat_ass, $key = null)
   {
 
     // $key is null, returns $dat_ass or empty array
-    if(is_null($key))
+    if (is_null($key))
       return $dat_ass ?? [];
 
     // $dat_ass[$key] not set, returns null
-    if(!isset($dat_ass[$key]))
+    if (!isset($dat_ass[$key]))
       return null;
 
     // $dat_ass[$key] is a string, returns decoded value
-    if(is_string($dat_ass[$key]))
+    if (is_string($dat_ass[$key]))
       return urldecode($dat_ass[$key]);
 
     // $dat_ass[$key] is not a string, return match[$key]
@@ -142,18 +142,18 @@ 
    *  - an assoc_array of url params (strongly AltoRouter-based)
    * returns: something to put in a href="", action="" or header('Location:');
    */
-  public function prehop($route, $route_params=[])
+  public function prehop($route, $route_params = [])
   {
-    try{
+    try {
       $url = $this->generate($route, $route_params);
-    }catch(\Exception $e){
+    } catch (\Exception $e) {
       $url = $this->prehop(self::ROUTE_HOME_NAME);
     }
 
     return $url;
   }
 
-  public function prehop_here($url=null)
+  public function prehop_here($url = null)
   {
     return $url ?? $_SERVER['REQUEST_URI'];
   }
@@ -165,13 +165,13 @@ 
    *    - a url, go there
    * @params $route_params, assoc_data for url creation (i:id, a:format, ..)
    */
-  public function hop($route=null, $route_params=[])
+  public function hop($route = null, $route_params = [])
   {
     $url = null;
 
-    if(is_null($route))
+    if (is_null($route))
       $url = $this->prehop(self::ROUTE_HOME_NAME, $route_params);
-    elseif(is_string($route) && $this->route_exists($route))
+    elseif (is_string($route) && $this->route_exists($route))
       $url = $this->prehop($route, $route_params);
     else
       $url = $route;
@@ -182,7 +182,7 @@ 
   // hops back to previous page (referer()), or home if no referer
   public function hop_back()
   {
-    if(!is_null($back = $this->referer()))
+    if (!is_null($back = $this->referer()))
       $this->hop_url($back);
 
     $this->hop();
@@ -200,7 +200,7 @@ 
   // returns null if same as current URL (prevents endless redirection loop)
   public function referer()
   {
-    if(isset($_SERVER['HTTP_REFERER']) && $_SERVER['HTTP_REFERER'] != $this->web_host() .$_SERVER['REQUEST_URI'])
+    if (isset($_SERVER['HTTP_REFERER']) && $_SERVER['HTTP_REFERER'] != $this->web_host().$_SERVER['REQUEST_URI'])
       return $_SERVER['HTTP_REFERER'];
 
     return null;
@@ -208,7 +208,7 @@ 
 
   public function send_file($file_path)
   {
-    if(!file_exists($file_path))
+    if (!file_exists($file_path))
       throw new RouterException('SENDING_NON_EXISTING_FILE');
 
     $file_name = basename($file_path);
@@ -216,7 +216,7 @@ 
     //Get file type and set it as Content Type
     $finfo = finfo_open(FILEINFO_MIME_TYPE);
 
-    header('Content-Type: ' . finfo_file($finfo, $file_path));
+    header('Content-Type: '.finfo_file($finfo, $file_path));
 
     finfo_close($finfo);
 
@@ -229,7 +229,7 @@ 
     header('Pragma: public');
 
     //Define file size
-    header('Content-Length: ' . filesize($file_path));
+    header('Content-Length: '.filesize($file_path));
 
     ob_clean();
     flush();
@@ -255,7 +255,7 @@ 
 
   public function web_root() : string
   {
-    return $this->web_host() . $this->web_base();
+    return $this->web_host().$this->web_base();
   }
 
   public function web_base() : string

common.inc.php

Spacing +30 added lines, -30 removed lines

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

 

 	require 'PSR4Autoloader.class.php';

-	$loader=new PSR4Autoloader;

+	$loader = new PSR4Autoloader;

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

 

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

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

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

 	require_once APP_BASE.'configs/settings.php';

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

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

 

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

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

   {

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

   }

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

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

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

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

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

 

-	if($cookies_enabled === false)

+	if ($cookies_enabled === false)

 	{

 		ini_set('session.use_cookies', 0);

 		ini_set('session.use_only_cookies', 0);

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

 

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

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

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

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

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

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

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