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

Braces +21 added lines, -27 removed lines

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

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

common.inc.php

Braces +19 added lines, -16 removed lines

@@ -91,8 +91,9 @@ 
 	//---------------------------------------------------------------     ŝablonoj
 	require_once 'smarty/smarty/libs/Smarty.class.php';
 	// Load smarty template parser
-	if(is_null($box->get('settings.smarty.template_path')) || is_null($box->get('settings.smarty.compiled_path')))
-			throw new \Exception("SMARTY CONFIG ERROR: missing parameters");
+	if(is_null($box->get('settings.smarty.template_path')) || is_null($box->get('settings.smarty.compiled_path'))) {
+				throw new \Exception("SMARTY CONFIG ERROR: missing parameters");
+	}
 
 	$smarty=new \Smarty();
 	$box->register('template_engine', $smarty);
@@ -126,25 +127,27 @@ 
 		if(isset($languages[$_GET['lang']]))
 		{
 			$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);
+			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);
+			}
+		} else {
+					throw new \Exception('KADRO_SYSTEM_ERR_INVALID_PARAMETER');
 		}
-		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(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');
+		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);
 		$i18n->init();
 		$smarty->assign('language', $language);

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

Braces +14 added lines, -12 removed lines

@@ -23,8 +23,9 @@ 
     parent::edit();
 
     // do we create? or do we edit someone else ? must be admin
-    if(is_null($this->load_model) || $this->operator()->operator_id() !== $this->load_model->operator_id())
-      $this->authorize('group_admin');
+    if(is_null($this->load_model) || $this->operator()->operator_id() !== $this->load_model->operator_id()) {
+          $this->authorize('group_admin');
+    }
 
   }
 
@@ -35,8 +36,9 @@ 
 
   public function save()
   {
-    if($this->operator()->operator_id() !== $this->form_model->operator_id())
-      $this->authorize('group_admin');
+    if($this->operator()->operator_id() !== $this->form_model->operator_id()) {
+          $this->authorize('group_admin');
+    }
 
     parent::save();
   }
@@ -71,15 +73,15 @@ 
     parent::authorize('group_admin');
 
     $operator = Operator::one($this->router()->params());
-    if($operator->username() == $this->operator()->username())
-      throw new AccessRefusedException();
+    if($operator->username() == $this->operator()->username()) {
+          throw new AccessRefusedException();
+    }
 
     if(Operator::toggle_boolean(Operator::table_name(), 'active', $operator->operator_id()) === true)
     {
       $confirmation_message = $operator->is_active() ? 'KADRO_operator_DISABLED' : 'KADRO_operator_ENABLED';
       $this->logger()->nice($confirmation_message, [$operator->get('name')]);
-    }
-    else
+    } else
     {
       $this->logger()->warning('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/TradukoController.class.php

Braces +12 added lines, -8 removed lines

@@ -34,10 +34,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;
     }
@@ -46,8 +48,9 @@ 
     // {
     $path_to_file = $locale_path.'/'.$lang;
     // test directory access & creation
-    if(!JSON::exists($path_to_file))
-      JSON::make_dir($path_to_file);
+    if(!JSON::exists($path_to_file)) {
+          JSON::make_dir($path_to_file);
+    }
 
     $file = new JSON($path_to_file.'/'.self::JSON_FILENAME, 'w+');
     $file->set_content(JSON::from_php($assoc));
@@ -61,8 +64,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;
   }