HexMakina / kadro

TableToForm.class.php

Braces +37 added lines, -41 removed lines

@@ -9,11 +9,13 @@ 
 {
   private static function compute_field_value($model,$field_name)
   {
-    if(method_exists($model,$field_name))
-      return $model->$field_name();
+    if(method_exists($model,$field_name)) {
+          return $model->$field_name();
+    }
 
-    if(property_exists($model,$field_name))
-      return $model->$field_name;
+    if(property_exists($model,$field_name)) {
+          return $model->$field_name;
+    }
 
     return '';
   }
@@ -51,74 +53,66 @@ 
 
     $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)
-      unset($attributes['required']);
-
-    elseif(!$field->is_nullable())
-      $attributes[] = 'required';
+    if(isset($attributes['required']) && $attributes['required'] === false) {
+          unset($attributes['required']);
+    } elseif(!$field->is_nullable()) {
+          $attributes[] = 'required';
+    }
 
     if($field->is_auto_incremented())
     {
       $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); //
-    }
-    elseif($field->type()->is_integer())
+    } elseif($field->type()->is_integer())
     {
       $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);
-    }
-    elseif($field->type()->is_date())
+    } elseif($field->type()->is_date())
     {
       $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);
-    }
-    elseif($field->type()->is_datetime())
+    } elseif($field->type()->is_datetime())
     {
       $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);
-    }
-    elseif($field->type()->is_enum())
+    } elseif($field->type()->is_enum())
     {
 
       $enum_values = [];
-      foreach($field->type()->enum_values() as $e_val)
-        $enum_values[$e_val] = $e_val;
+      foreach($field->type()->enum_values() as $e_val) {
+              $enum_values[$e_val] = $e_val;
+      }
 
       $selected = $attributes['value'] ?? $field_value ?? '';
       // foreach($field->)
       $ret .= Form::select($field->name(), $enum_values, $selected, $attributes); //
 
       // 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);
-    }
-    else
+    } else
     {
       $ret .= Form::input($field->name(),$field_value,$attributes,$errors);
     }
@@ -130,8 +124,9 @@ 
   public static function field_with_label($model,$field_name,$attributes=[],$errors=[]) : string
   {
     $field_attributes = $attributes;
-    if(isset($attributes['label']))
-      unset($field_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));
   }
@@ -148,14 +143,15 @@ 
       $form_field = '';
       if($column->is_auto_incremented())
       {
-        if(!$model->is_new())
-          $form_field = self::field($model,$column_name);
-      }
-      else
+        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]);
+        if(!is_null($group_class)) {
+                  $form_field = new Element('div',$form_field, ['class' => $group_class]);
+        }
       }
       $ret .= PHP_EOL.$form_field;
     }

Spacing +44 added lines, -44 removed lines

@@ -3,26 +3,26 @@ 
 namespace HexMakina\kadro;
 
 use \HexMakina\Crudites\Interfaces\ModelInterface;
-use \HexMakina\Marker\{Form,Element};
+use \HexMakina\Marker\{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/Lingvo.class.php

Indentation +7 added lines, -7 removed lines

@@ -31,10 +31,10 @@ 
     return $this->iso_name().' ('.$this->Part3.')';
   }
 
-	public function traceable() : bool
-	{
-		return false;
-	}
+  public function traceable() : bool
+  {
+    return false;
+  }
 
   public function iso_name()
   {
@@ -102,9 +102,9 @@ 
   public static function search_language($term, $authority=null)
   {
     $rows = self::query_retrieve(['term' => $term, 'requires_authority' => $authority])->ret_ass();
-		$ret = [];
-		foreach($rows as $row)
-		   $ret[$row[self::ISO_3]] = $row[self::ISO_NAME];
+    $ret = [];
+    foreach($rows as $row)
+        $ret[$row[self::ISO_3]] = $row[self::ISO_NAME];
 
     return $ret;
   }

Braces +6 added lines, -3 removed lines

@@ -103,8 +103,9 @@ 
   {
     $rows = self::query_retrieve(['term' => $term, 'requires_authority' => $authority])->ret_ass();
 		$ret = [];
-		foreach($rows as $row)
-		   $ret[$row[self::ISO_3]] = $row[self::ISO_NAME];
+		foreach($rows as $row) {
+				   $ret[$row[self::ISO_3]] = $row[self::ISO_NAME];
+		}
 
     return $ret;
   }
@@ -115,8 +116,10 @@ 
     $Query->aw_eq(self::ISO_3, $code);
     $rows = $Query->ret_col();
 
-    if(isset($rows[0])) // only 1 result
+    if(isset($rows[0])) {
+      // only 1 result
       return current($rows);
+    }
 
     return null; // no results
   }

Spacing +10 added lines, -10 removed lines

@@ -52,39 +52,39 @@ 
   }
 
 
-  public static function query_retrieve($filter=[], $options=[]) : SelectInterface
+  public static function query_retrieve($filter = [], $options = []) : SelectInterface
   {
 
     $searchable_fields = [self::ISO_NAME, self::ISO_3, self::ISO_2B, self::ISO_2T, self::ISO_1];
 
     $Query = static::table()->select();
 
-    if(isset($filter['name']))
+    if (isset($filter['name']))
     {
 
     }
 
-    if(isset($filter['code']))
+    if (isset($filter['code']))
     {
 
     }
 
-    if(isset($filter['term']))
+    if (isset($filter['term']))
     {
       $Query->aw_filter_content(['term' => $filter['term'], 'fields' => $searchable_fields], $Query->table_label(), 'OR');
     }
 
-    if(isset($filter['requires_authority']) && isset(self::ISO_SETS[$filter['requires_authority']]))
+    if (isset($filter['requires_authority']) && isset(self::ISO_SETS[$filter['requires_authority']]))
     {
       $Query->aw_not_empty($filter['requires_authority']);
     }
 
-    if(isset($filter['types']))
+    if (isset($filter['types']))
     {
       $wc = sprintf('AND Type IN (\'%s\') ', implode('\', \'', array_keys(self::types())));
       $Query->and_where($wc);
     }
-    if(isset($filter['scopes']))
+    if (isset($filter['scopes']))
     {
       $wc = sprintf('AND Scope IN (\'%s\') ', implode('\', \'', array_keys(self::scopes())));
       $Query->and_where($wc);
@@ -99,11 +99,11 @@ 
     return $Query;
   }
 
-  public static function search_language($term, $authority=null)
+  public static function search_language($term, $authority = null)
   {
     $rows = self::query_retrieve(['term' => $term, 'requires_authority' => $authority])->ret_ass();
 		$ret = [];
-		foreach($rows as $row)
+		foreach ($rows as $row)
 		   $ret[$row[self::ISO_3]] = $row[self::ISO_NAME];
 
     return $ret;
@@ -115,7 +115,7 @@ 
     $Query->aw_eq(self::ISO_3, $code);
     $rows = $Query->ret_col();
 
-    if(isset($rows[0])) // only 1 result
+    if (isset($rows[0])) // only 1 result
       return current($rows);
 
     return null; // no results

Models/Traduko.class.php

Indentation +4 added lines, -4 removed lines

@@ -10,10 +10,10 @@
   const TABLE_NAME = 'kadro_traduki';
   const TABLE_ALIAS = 'traduko';
 
-	public function traceable() : bool
-	{
-		return false;
-	}
+  public function traceable() : bool
+  {
+    return false;
+  }
   
   public function immortal() : bool
   {

Spacing +1 added lines, -1 removed lines

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

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

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

Spacing +11 added lines, -11 removed lines

@@ -16,7 +16,7 @@ 
   public function __debugInfo() : array
   {
     $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;

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