HexMakina / kadro

StorageManager/PictureManager.class.php

Braces +62 added lines, -43 removed lines

@@ -29,8 +29,9 @@ 
   {
     $picture_directory = $this->build_path_to_directory();
     $thumbnail_directory = $picture_directory;
-		if(!file_exists($picture_directory) && mkdir($picture_directory) === false)
-			throw new PictureManagerException("directory '$picture_directory' does not exist");
+		if(!file_exists($picture_directory) && mkdir($picture_directory) === false) {
+					throw new PictureManagerException("directory '$picture_directory' does not exist");
+		}
 
     $filenames = self::preg_scandir($picture_directory, self::FILENAME_REGEX);
 
@@ -42,8 +43,9 @@ 
   {
     $filenames = $this->filenames($replace_by_thumbs_if_exists);
     $filepathes = [];
-    foreach($filenames as $filename)
-      $filepathes[] = $this->locate_thumbnail($filename);
+    foreach($filenames as $filename) {
+          $filepathes[] = $this->locate_thumbnail($filename);
+    }
 
     return $filepathes;
   }
@@ -52,8 +54,10 @@ 
   {
     $filenames = $this->filenames($replace_by_thumbs_if_exists);
     $uris = [];
-    foreach($filenames as $filename)
-      $uris[] = hopper::file_uri($this->locate_file($filename)); ;
+    foreach($filenames as $filename) {
+          $uris[] = hopper::file_uri($this->locate_file($filename));
+    }
+    ;
 
     return $uris;
   }
@@ -67,31 +71,37 @@ 
       'image/gif' => 'imagecreatefromgif',
     );
     $mime = mime_content_type($filepath);
-    if(array_key_exists($mime, $picture_mime_to_gd_create_function))
-      return true;
+    if(array_key_exists($mime, $picture_mime_to_gd_create_function)) {
+          return true;
+    }
     return $mime;
   }
 
 
   public function upload()
   {
-    if(!array_key_exists($this->get_type(), $_FILES))
-      throw new PictureManagerException($this->get_type()." not found in _FILES");
+    if(!array_key_exists($this->get_type(), $_FILES)) {
+          throw new PictureManagerException($this->get_type()." not found in _FILES");
+    }
 
-    if(!array_key_exists('size', $_FILES[$this->get_type()]) || $_FILES[$this->get_type()]['size'] == 0)
-      throw new PictureManagerException('uploaded file has no size');
+    if(!array_key_exists('size', $_FILES[$this->get_type()]) || $_FILES[$this->get_type()]['size'] == 0) {
+          throw new PictureManagerException('uploaded file has no size');
+    }
 
-    if(($file_type = self::is_picture_file($_FILES[$this->get_type()]['tmp_name'])) !== true)
-      throw new PictureManagerException('data sent is not an image but a '.$file_type.'');
+    if(($file_type = self::is_picture_file($_FILES[$this->get_type()]['tmp_name'])) !== true) {
+          throw new PictureManagerException('data sent is not an image but a '.$file_type.'');
+    }
 
     $filepath = $this->build_filename() . '.' . self::file_ext($_FILES[$this->get_type()]['name']);
     $filepath = $this->locate_file($filepath);
 
-		if(file_exists($filepath))
-      throw new PictureManagerException($this->get_type()." new path '$filepath' already exists");
+		if(file_exists($filepath)) {
+		      throw new PictureManagerException($this->get_type()." new path '$filepath' already exists");
+		}
 
-		if(copy($_FILES[$this->get_type()]['tmp_name'], $filepath) === false)
-			throw new PictureManagerException(" cant copy ".$_FILES[$this->get_type()]['name']." to ($filepath)");
+		if(copy($_FILES[$this->get_type()]['tmp_name'], $filepath) === false) {
+					throw new PictureManagerException(" cant copy ".$_FILES[$this->get_type()]['name']." to ($filepath)");
+		}
 
     $this->make_thumbnail($filepath);
   }
@@ -154,19 +164,23 @@ 
   {
     $filenames = $this->filenames();
 
-    foreach($filenames as $filename)
-				$this->remove($filename);
+    foreach($filenames as $filename) {
+    				$this->remove($filename);
+    }
 
     $directory = $this->build_path_to_directory();
 		if(file_exists($directory) === true)
     {
-      if(is_dir($directory) === false)
-        throw new PictureManagerException($this->get_type()."' directory '$directory' is not a directory");
+      if(is_dir($directory) === false) {
+              throw new PictureManagerException($this->get_type()."' directory '$directory' is not a directory");
+      }
 
-   		if(rmdir($directory) === false)
-  			throw new PictureManagerException("rmdir($directory) failed like a bitch");
+   		if(rmdir($directory) === false) {
+   		  			throw new PictureManagerException("rmdir($directory) failed like a bitch");
+   		}
+    } else {
+      trigger_error($this->get_type()." $directory doesn't exist", E_USER_WARNING);
     }
-    else trigger_error($this->get_type()." $directory doesn't exist", E_USER_WARNING);
   }
 
   public function remove($picture_filename)
@@ -181,14 +195,15 @@ 
     foreach($pathes as $what => $path)
     {
       $error = null;
-  		if(!file_exists($path))
-        $error = 'file does not exist';
-      elseif(unlink($path)===false)
-        $error = 'unlink() failed';
-
-      if(is_null($error))
-        $deleted[]= $what;
-      else
+  		if(!file_exists($path)) {
+  		        $error = 'file does not exist';
+  		} elseif(unlink($path)===false) {
+              $error = 'unlink() failed';
+      }
+
+      if(is_null($error)) {
+              $deleted[]= $what;
+      } else
       {
         trigger_error(__FUNCTION__." '$picture_filename' ($what @ $path) impossible because ", E_USER_NOTICE);
         $still_walking[]=$what;
@@ -238,13 +253,15 @@ 
 		$pictures = $pi_manager->filenames();
 
     $item_model_type = get_class($item)::model_type();
-    if(count($pictures)===0)
-      return hopper::file_uri($settings[$item_model_type][$picture_type]['generic_picture']);
+    if(count($pictures)===0) {
+          return hopper::file_uri($settings[$item_model_type][$picture_type]['generic_picture']);
+    }
 
-		if($settings[$item_model_type][$picture_type]['cycle_on_load'])
-			$filename = $pictures[array_rand($pictures, 1)];
-		else
-			$filename = array_shift($pictures);
+		if($settings[$item_model_type][$picture_type]['cycle_on_load']) {
+					$filename = $pictures[array_rand($pictures, 1)];
+		} else {
+					$filename = array_shift($pictures);
+		}
 
     return hopper::file_uri( $thumbnail===true ? $pi_manager->locate_thumbnail($filename) : $pi_manager->locate_file($filename));
   }
@@ -255,8 +272,9 @@ 
     if(count($filenames = $this->filenames()) > 0)
     {
       $last_filename = array_pop($filenames); // last cover name FIXME sort should be done here, check cost if sort already done
-      if(preg_match('/[0-9]+\_([0-9]+)\.[a-z]+/', $last_filename, $last_index) !== 1)
-        throw new PictureManagerException("FAILED_COMPUTING_NEW_INDEX_USING_REGEX");
+      if(preg_match('/[0-9]+\_([0-9]+)\.[a-z]+/', $last_filename, $last_index) !== 1) {
+              throw new PictureManagerException("FAILED_COMPUTING_NEW_INDEX_USING_REGEX");
+      }
 
       $last_index = $last_index[1];
     }
@@ -271,8 +289,9 @@ 
 
   public function build_filename($index=null)
   {
-    if(is_null($index))
-      $index = $this->last_index()+1;
+    if(is_null($index)) {
+          $index = $this->last_index()+1;
+    }
 
     return $this->pmi->id.'_'.sprintf("%'.09d", $index); // prepend bean id
   }

StateAgent.class.php

Braces +14 added lines, -10 removed lines

@@ -34,27 +34,31 @@
 
   public function filters($filter_name=null, $value=null)
   {
-    if(is_null($filter_name))
-      return $_SESSION[$this->index_filter];
+    if(is_null($filter_name)) {
+          return $_SESSION[$this->index_filter];
+    }
 
-    if(!is_null($value))
-      $_SESSION[$this->index_filter][$filter_name] = $value;
+    if(!is_null($value)) {
+          $_SESSION[$this->index_filter][$filter_name] = $value;
+    }
 
     return $_SESSION[$this->index_filter][$filter_name] ?? null;
   }
 
   public function reset_filters($filter_name=null)
   {
-    if(is_null($filter_name))
-      $_SESSION[$this->index_filter]=[];
-    else
-      unset($_SESSION[$this->index_filter][$filter_name]);
+    if(is_null($filter_name)) {
+          $_SESSION[$this->index_filter]=[];
+    } else {
+          unset($_SESSION[$this->index_filter][$filter_name]);
+    }
   }
 
   public function operator_id($setter = null)
   {
-    if(!is_null($setter))
-      $_SESSION[$this->index_operator] = ['id' => $setter, 'set_on' => time()];
+    if(!is_null($setter)) {
+          $_SESSION[$this->index_operator] = ['id' => $setter, 'set_on' => time()];
+    }
 
     return $_SESSION[$this->index_operator]['id'] ?? null;
   }

Auth/ACL.class.php

Braces +6 added lines, -4 removed lines

@@ -37,8 +37,9 @@ 
     $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,8 +48,9 @@ 
   {
     $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))
-      return [];
+    if(is_null($operator_with_perms)) {
+          return [];
+    }
 
     return explode(',',$operator_with_perms->get('permission_names'));
   }

Auth/Operatorability.class.php

Braces +15 added lines, -9 removed lines

@@ -17,8 +17,10 @@ 
 
   public function load_operator($id = null)
   {
-    if(!is_null($operator_id = $id ?? $this->get('operator_id'))) // extraction failed but we have an fk
+    if(!is_null($operator_id = $id ?? $this->get('operator_id'))) {
+      // extraction failed but we have an fk
       $this->operator = Operator::exists($operator_id);
+    }
   }
 
   public function operator() : ?OperatorInterface
@@ -28,9 +30,10 @@ 
       $extract_attempt = $this->extract(new Operator(), true);
       if(!is_null($extract_attempt))
       {
-        foreach(['permission_names', 'permission_ids'] as $permission_marker)
-          if(property_exists($this, $permission_marker))
+        foreach(['permission_names', 'permission_ids'] as $permission_marker) {
+                  if(property_exists($this, $permission_marker))
             $extract_attempt->set($permission_marker, $this->$permission_marker);
+        }
 
         $this->operator = $extract_attempt;
       }
@@ -55,14 +58,17 @@ 
 
     $Query->select_also(['operator.name as operator_name', 'operator.active as operator_active']);
 
-    if(isset($filters['username']))
-      $Query->aw_eq('username', $filters['username'], 'operator');
+    if(isset($filters['username'])) {
+          $Query->aw_eq('username', $filters['username'], 'operator');
+    }
 
-    if(isset($filters['email']))
-      $Query->aw_eq('email', $filters['email'], 'operator');
+    if(isset($filters['email'])) {
+          $Query->aw_eq('email', $filters['email'], 'operator');
+    }
 
-    if(isset($filters['active']))
-      $Query->aw_eq('active', $filters['active'], 'operator');
+    if(isset($filters['active'])) {
+          $Query->aw_eq('active', $filters['active'], 'operator');
+    }
 
     return $Query;
   }

Router/AltoRouter.php

Braces +6 added lines, -2 removed lines

@@ -193,7 +193,9 @@ 
 			$method_match = (stripos($methods, $requestMethod) !== false);
 
 			// Method did not match, continue to next route.
-			if (!$method_match) continue;
+			if (!$method_match) {
+			  continue;
+			}
 
 			if ($route === '*') {
 				// * wildcard (matches all)
@@ -218,7 +220,9 @@ 
 
 				if ($params) {
 					foreach($params as $key => $value) {
-						if(is_numeric($key)) unset($params[$key]);
+						if(is_numeric($key)) {
+						  unset($params[$key]);
+						}
 					}
 				}
 

Controllers/Paginator.class.php

Braces +12 added lines, -6 removed lines

@@ -15,25 +15,31 @@
 
     // are we paginating ?
 
-    if(is_null($this->box('StateAgent')->filters('results_per_page')))
-      return;
+    if(is_null($this->box('StateAgent')->filters('results_per_page'))) {
+          return;
+    }
 
     $pages_range    = intval($this->box('StateAgent')->filters('results_per_page'));
     $pages_total    = $pages_range > 0 ? intval(ceil($records_total / $pages_range)) : 1;
     $pages_current  = intval($this->box('StateAgent')->filters('page'));
 
-    if($pages_current >= $pages_total)
-      $pages_current = $pages_total;
+    if($pages_current >= $pages_total) {
+          $pages_current = $pages_total;
+    }
 
     $pages_first = ($pages_current <= $pages_max_on_each_side)? 1 : $pages_current - $pages_max_on_each_side;
 
     $pages_last = $pages_current + $pages_max_on_each_side;
 
-    if($pages_last < $pages_max_displayed) // add the missing pages to fullfill $pages_max_displayed
+    if($pages_last < $pages_max_displayed) {
+      // add the missing pages to fullfill $pages_max_displayed
       $pages_last += $pages_max_displayed-$pages_last;
+    }
 
-    if($pages_last > $pages_total) // $pages_max_displayed greater than the total of pages
+    if($pages_last > $pages_total) {
+      // $pages_max_displayed greater than the total of pages
       $pages_last = $pages_total;
+    }
 
   	$this->viewport("pages_total",     $pages_total);
   	$this->viewport("pages_first",     $pages_first);

Controllers/KadroController.class.php

Braces +49 added lines, -33 removed lines

@@ -31,8 +31,9 @@ 
   // shortcut for (un)boxing
   public function box($key, $instance=null)
   {
-    if(!is_null($instance))
-      $this->container->register($key, $instance);
+    if(!is_null($instance)) {
+          $this->container->register($key, $instance);
+    }
 
     // dd($this->container->get($key));
     return $this->container->get($key);
@@ -64,15 +65,18 @@ 
   public function authorize($permission=null)
   {
     // if(!$this->requires_operator() || is_null($permission))
-    if(!$this->requires_operator())
-      return true;
+    if(!$this->requires_operator()) {
+          return true;
+    }
 
     $operator = $this->operator();
-    if(is_null($operator) || $operator->is_new() || !$operator->is_active())
-      throw new AccessRefusedException();
+    if(is_null($operator) || $operator->is_new() || !$operator->is_active()) {
+          throw new AccessRefusedException();
+    }
 
-    if(!is_null($permission) && !$operator->has_permission($permission))
-      throw new AccessRefusedException();
+    if(!is_null($permission) && !$operator->has_permission($permission)) {
+          throw new AccessRefusedException();
+    }
 
     return true;
   }
@@ -80,22 +84,26 @@ 
   public function viewport($key=null, $value=null, $coercion=false)
   {
     // no key, returns all
-    if(is_null($key))
-      return $this->template_variables;
+    if(is_null($key)) {
+          return $this->template_variables;
+    }
 
     // got key, got null value, returns $[$key]
     if(is_null($value))
     {
-      if($coercion === true) // break rule 1 ?
+      if($coercion === true) {
+        // break rule 1 ?
         $this->template_variables[$key] = null;
+      }
 
       return $this->template_variables[$key] ?? null;
     }
 
     // got key, got value
     // sets or coerces $[$key]=$value and returns $[$key]
-    if(!isset($this->template_variables[$key]) || $coercion === true)
-      $this->template_variables[$key] = $value;
+    if(!isset($this->template_variables[$key]) || $coercion === true) {
+          $this->template_variables[$key] = $value;
+    }
 
     return $this->template_variables[$key] ?? null;
   }
@@ -106,19 +114,22 @@ 
 
     $custom_template = null;
 
-    if(method_exists($this, 'prepare'))
-    	$this->prepare();
+    if(method_exists($this, 'prepare')) {
+        	$this->prepare();
+    }
 
   	if(method_exists($this, $method = $this->router()->target_method()))
     {
       $custom_template = $this->$method();
     }
 
-    if(method_exists($this, 'conclude'))
-    	$this->conclude();
+    if(method_exists($this, 'conclude')) {
+        	$this->conclude();
+    }
 
-    if(method_exists($this, 'display'))
-    	$template = $this->display($custom_template);
+    if(method_exists($this, 'display')) {
+        	$template = $this->display($custom_template);
+    }
   }
 
   public function conclude(){}
@@ -133,8 +144,10 @@ 
     array_walk_recursive($_GET, function(&$value){$value = trim($value);});
     array_walk_recursive($_REQUEST, function(&$value){$value = trim($value);});
 
-    if($this->router()->submits())
-      array_walk_recursive($_POST, function(&$value){$value = trim($value);});
+    if($this->router()->submits()) {
+          array_walk_recursive($_POST, function(&$value){$value = trim($value);
+    }
+    });
   }
 
   public function display($custom_template = null, $standalone=false)
@@ -154,14 +167,14 @@ 
   	$this->viewport('view_url', $this->router()->web_root() . $this->box('settings.smarty.template_path'));
   	$this->viewport('images_url', $this->router()->web_root() . $this->box('settings.smarty.template_path') . 'images/');
 
-    foreach($this->viewport() as $template_var_name => $value)
-      $smarty->assign($template_var_name, $value);
+    foreach($this->viewport() as $template_var_name => $value) {
+          $smarty->assign($template_var_name, $value);
+    }
 
     if($standalone === false)
     {
       $smarty->display(sprintf('%s|%s', $this->box('settings.smarty.template_inclusion_path'), $template));
-    }
-    else
+    } else
     {
       $smarty->display($template);
     }
@@ -205,8 +218,9 @@ 
 
     while(!is_null($tpl_path = array_shift($templates)))
     {
-      if($smarty->templateExists($tpl_path))
-        return $tpl_path;
+      if($smarty->templateExists($tpl_path)) {
+              return $tpl_path;
+      }
     }
 
     throw new \Exception('KADRO_ERR_NO_TEMPLATE_TO_DISPLAY');
@@ -228,8 +242,9 @@ 
    */
   public function route_back($route_name=null, $route_params=[]) : string
 	{
-    if(is_null($route_name))
-		  return $this->route_back ?? $this->router()->prehop(RouterInterface::ROUTE_HOME_NAME);
+    if(is_null($route_name)) {
+    		  return $this->route_back ?? $this->router()->prehop(RouterInterface::ROUTE_HOME_NAME);
+    }
 
     return $this->route_back = $this->route_factory($route_name, $route_params);
 	}
@@ -240,10 +255,11 @@ 
 
     if(is_string($route_name) && !empty($route_name))
     {
-      if($this->router()->route_exists($route_name))
-        $route = $this->router()->prehop($route_name, $route_params);
-      else
-        $route = $route_name;
+      if($this->router()->route_exists($route_name)) {
+              $route = $this->router()->prehop($route_name, $route_params);
+      } else {
+              $route = $route_name;
+      }
 
       return $route;
     }

Controllers/Abilities/__DEL__PictureManager.class.php

Braces +61 added lines, -43 removed lines

@@ -16,8 +16,9 @@ 
     $picture_directory = $this->build_path_to_directory();
     $thumbnail_directory = $picture_directory;
 
-		if(!file_exists($picture_directory) && mkdir($picture_directory) === false)
-			return [];
+		if(!file_exists($picture_directory) && mkdir($picture_directory) === false) {
+					return [];
+		}
 
     $filenames = self::preg_scandir($picture_directory, '/^[0-9]+_[0-9]+\.[a-zA-Z]+/');// ID_SEQUENCENUMBER.ext
 
@@ -29,8 +30,9 @@ 
   {
     $filenames = $this->filenames($replace_by_thumbs_if_exists);
     $filepathes = [];
-    foreach($filenames as $filename)
-      $filepathes[] = $this->locate_thumbnail($filename);
+    foreach($filenames as $filename) {
+          $filepathes[] = $this->locate_thumbnail($filename);
+    }
 
     return $filepathes;
   }
@@ -39,8 +41,9 @@ 
   {
     $filenames = $this->filenames($replace_by_thumbs_if_exists);
     $uris = [];
-    foreach($filenames as $filename)
-      $uris[] = $this->locate_file($filename);
+    foreach($filenames as $filename) {
+          $uris[] = $this->locate_file($filename);
+    }
 
     dd($uris);
     return $uris;
@@ -55,31 +58,37 @@ 
       'image/gif' => 'imagecreatefromgif',
     );
     $mime = mime_content_type($filepath);
-    if(array_key_exists($mime, $picture_mime_to_gd_create_function))
-      return true;
+    if(array_key_exists($mime, $picture_mime_to_gd_create_function)) {
+          return true;
+    }
     return $mime;
   }
 
 
   public function upload()
   {
-    if(!array_key_exists($this->get_type(), $_FILES))
-      throw new \Exception($this->get_type()." not found in _FILES");
+    if(!array_key_exists($this->get_type(), $_FILES)) {
+          throw new \Exception($this->get_type()." not found in _FILES");
+    }
 
-    if(!array_key_exists('size', $_FILES[$this->get_type()]) || $_FILES[$this->get_type()]['size'] == 0)
-      throw new \Exception('uploaded file has no size');
+    if(!array_key_exists('size', $_FILES[$this->get_type()]) || $_FILES[$this->get_type()]['size'] == 0) {
+          throw new \Exception('uploaded file has no size');
+    }
 
-    if(($file_type = self::is_picture_file($_FILES[$this->get_type()]['tmp_name'])) !== true)
-      throw new \Exception('data sent is not an image but a '.$file_type.'');
+    if(($file_type = self::is_picture_file($_FILES[$this->get_type()]['tmp_name'])) !== true) {
+          throw new \Exception('data sent is not an image but a '.$file_type.'');
+    }
 
     $filepath = $this->build_filename() . '.' . self::file_ext($_FILES[$this->get_type()]['name']);
     $filepath = $this->locate_file($filepath);
 
-		if(file_exists($filepath))
-      throw new \Exception($this->get_type()." new path '$filepath' already exists");
+		if(file_exists($filepath)) {
+		      throw new \Exception($this->get_type()." new path '$filepath' already exists");
+		}
 
-		if(copy($_FILES[$this->get_type()]['tmp_name'], $filepath) === false)
-			throw new \Exception(" cant copy ".$_FILES[$this->get_type()]['name']." to ($filepath)");
+		if(copy($_FILES[$this->get_type()]['tmp_name'], $filepath) === false) {
+					throw new \Exception(" cant copy ".$_FILES[$this->get_type()]['name']." to ($filepath)");
+		}
 
     $this->make_thumbnail($filepath);
   }
@@ -142,19 +151,23 @@ 
   {
     $filenames = $this->filenames();
 
-    foreach($filenames as $filename)
-				$this->remove($filename);
+    foreach($filenames as $filename) {
+    				$this->remove($filename);
+    }
 
     $directory = $this->build_path_to_directory();
 		if(file_exists($directory) === true)
     {
-      if(is_dir($directory) === false)
-        throw new \Exception($this->get_type()."' directory '$directory' is not a directory");
+      if(is_dir($directory) === false) {
+              throw new \Exception($this->get_type()."' directory '$directory' is not a directory");
+      }
 
-   		if(rmdir($directory) === false)
-  			throw new \Exception("rmdir($directory) failed like a bitch");
+   		if(rmdir($directory) === false) {
+   		  			throw new \Exception("rmdir($directory) failed like a bitch");
+   		}
+    } else {
+      trigger_error($this->get_type()." $directory doesn't exist", E_USER_WARNING);
     }
-    else trigger_error($this->get_type()." $directory doesn't exist", E_USER_WARNING);
   }
 
   public function remove($picture_filename)
@@ -169,14 +182,15 @@ 
     foreach($pathes as $what => $path)
     {
       $error = null;
-  		if(!file_exists($path))
-        $error = 'file does not exist';
-      elseif(unlink($path)===false)
-        $error = 'unlink() failed';
-
-      if(is_null($error))
-        $deleted[]= $what;
-      else
+  		if(!file_exists($path)) {
+  		        $error = 'file does not exist';
+  		} elseif(unlink($path)===false) {
+              $error = 'unlink() failed';
+      }
+
+      if(is_null($error)) {
+              $deleted[]= $what;
+      } else
       {
         trigger_error(__FUNCTION__." '$picture_filename' ($what @ $path) impossible because ", E_USER_NOTICE);
         $still_walking[]=$what;
@@ -226,13 +240,15 @@ 
 		$pictures = $pi_manager->filenames();
 
     $item_model_type = get_class($item)::model_type();
-    if(count($pictures)===0)
-      return $settings[$item_model_type][$picture_type]['generic_picture'];
+    if(count($pictures)===0) {
+          return $settings[$item_model_type][$picture_type]['generic_picture'];
+    }
 
-		if($settings[$item_model_type][$picture_type]['cycle_on_load'])
-			$filename = $pictures[array_rand($pictures, 1)];
-		else
-			$filename = array_shift($pictures);
+		if($settings[$item_model_type][$picture_type]['cycle_on_load']) {
+					$filename = $pictures[array_rand($pictures, 1)];
+		} else {
+					$filename = array_shift($pictures);
+		}
 
     return $thumbnail===true ? $pi_manager->locate_thumbnail($filename) : $pi_manager->locate_file($filename);
   }
@@ -243,8 +259,9 @@ 
     if(count($filenames = $this->filenames()) > 0)
     {
       $last_filename = array_pop($filenames); // last cover name FIXME sort should be done here, check cost if sort already done
-      if(preg_match('/[0-9]+\_([0-9]+)\.[a-z]+/', $last_filename, $last_index) !== 1)
-        throw new \Exception("FAILED_COMPUTING_NEW_INDEX_USING_REGEX");
+      if(preg_match('/[0-9]+\_([0-9]+)\.[a-z]+/', $last_filename, $last_index) !== 1) {
+              throw new \Exception("FAILED_COMPUTING_NEW_INDEX_USING_REGEX");
+      }
 
       $last_index = $last_index[1];
     }
@@ -259,8 +276,9 @@ 
 
   public function build_filename($index=null)
   {
-    if(is_null($index))
-      $index = $this->last_index()+1;
+    if(is_null($index)) {
+          $index = $this->last_index()+1;
+    }
 
     return $this->pmi->id.'_'.sprintf("%'.09d", $index); // prepend bean id
   }

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