HexMakina / kadro

StorageManager/__DEL__FileManager.class.php

Indentation +1 added lines, -1 removed lines

@@ -100,4 +100,4 @@
 
 }
 
- ?>
+  ?>

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;

StorageManager/SnapshotManager.class.php

Indentation +1 added lines, -1 removed lines

@@ -15,4 +15,4 @@
   }
 }
 
- ?>
+  ?>

StorageManager/PictureManager.class.php

Indentation +47 added lines, -47 removed lines

@@ -29,8 +29,8 @@ 
   {
     $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);
 
@@ -87,11 +87,11 @@ 
     $filepath = $this->build_filename() . '.' . self::file_ext($_FILES[$this->get_type()]['name']);
     $filepath = $this->locate_file($filepath);
 
-		if(file_exists($filepath))
+    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);
   }
@@ -107,64 +107,64 @@ 
   }
 
   public function make_thumbnail($filepath)
-	{
+  {
     global $settings;
 
-		$cover_iri = null;
-
-		$mime_type = mime_content_type($filepath);
-		switch($mime_type)
-		{
-			case 'image/jpeg':
-			case 'image/pjpeg':
-				$cover_iri = imagecreatefromjpeg($filepath);
-			break;
+    $cover_iri = null;
 
-			case 'image/png':
-				$cover_iri = imagecreatefrompng($filepath);
-			break;
-
-			case 'image/gif':
-				$cover_iri = imagecreatefromgif($filepath);
-			break;
-		}
+    $mime_type = mime_content_type($filepath);
+    switch($mime_type)
+    {
+      case 'image/jpeg':
+      case 'image/pjpeg':
+        $cover_iri = imagecreatefromjpeg($filepath);
+      break;
+
+      case 'image/png':
+        $cover_iri = imagecreatefrompng($filepath);
+      break;
+
+      case 'image/gif':
+        $cover_iri = imagecreatefromgif($filepath);
+      break;
+    }
 
-		if(!is_null($cover_iri))
-		{
-			$width = imagesx( $cover_iri );
-			$height = imagesy( $cover_iri );
+    if(!is_null($cover_iri))
+    {
+      $width = imagesx( $cover_iri );
+      $height = imagesy( $cover_iri );
 
-			// calculate thumbnail size
+      // calculate thumbnail size
       
-			$new_width = $settings[get_class($this->pmi)::model_type()][$this->get_type()]['thumbnail']['width'];
-			$new_height = floor( $height * ( $new_width / $width ) );
+      $new_width = $settings[get_class($this->pmi)::model_type()][$this->get_type()]['thumbnail']['width'];
+      $new_height = floor( $height * ( $new_width / $width ) );
 
-			// create a new temporary image
-			$thumb_iri = imagecreatetruecolor($new_width, $new_height);
+      // create a new temporary image
+      $thumb_iri = imagecreatetruecolor($new_width, $new_height);
 
-			// copy and resize old image into new image
-			imagecopyresized( $thumb_iri, $cover_iri, 0, 0, 0, 0, $new_width, $new_height, $width, $height );
+      // copy and resize old image into new image
+      imagecopyresized( $thumb_iri, $cover_iri, 0, 0, 0, 0, $new_width, $new_height, $width, $height );
 
-			// save thumbnail into a file
+      // save thumbnail into a file
       imagejpeg($thumb_iri, $this->locate_thumbnail(pathinfo($filepath, PATHINFO_BASENAME)));
-		}
-	}
+    }
+  }
 
   public function remove_all()
   {
     $filenames = $this->filenames();
 
     foreach($filenames as $filename)
-				$this->remove($filename);
+        $this->remove($filename);
 
     $directory = $this->build_path_to_directory();
-		if(file_exists($directory) === true)
+    if(file_exists($directory) === true)
     {
       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);
   }
@@ -181,7 +181,7 @@ 
     foreach($pathes as $what => $path)
     {
       $error = null;
-  		if(!file_exists($path))
+      if(!file_exists($path))
         $error = 'file does not exist';
       elseif(unlink($path)===false)
         $error = 'unlink() failed';
@@ -235,16 +235,16 @@ 
     global $settings;
     $pi_manager = new PictureManager($item, $picture_type);
 
-		$pictures = $pi_manager->filenames();
+    $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($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));
   }

Spacing +44 added lines, -44 removed lines

@@ -25,11 +25,11 @@ 
   // const MOVIE_POSTER = 'poster';
   // const MOVIE_SNAPSHOT = 'snapshot';
 
-  public function filenames($replace_by_thumbs_if_exists=false)
+  public function filenames($replace_by_thumbs_if_exists = false)
   {
     $picture_directory = $this->build_path_to_directory();
     $thumbnail_directory = $picture_directory;
-		if(!file_exists($picture_directory) && mkdir($picture_directory) === false)
+		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);
@@ -38,21 +38,21 @@ 
     return $filenames;
   }
 
-  public function filepathes($replace_by_thumbs_if_exists=false)
+  public function filepathes($replace_by_thumbs_if_exists = false)
   {
     $filenames = $this->filenames($replace_by_thumbs_if_exists);
     $filepathes = [];
-    foreach($filenames as $filename)
+    foreach ($filenames as $filename)
       $filepathes[] = $this->locate_thumbnail($filename);
 
     return $filepathes;
   }
 
-  public function file_uris($replace_by_thumbs_if_exists=false)
+  public function file_uris($replace_by_thumbs_if_exists = false)
   {
     $filenames = $this->filenames($replace_by_thumbs_if_exists);
     $uris = [];
-    foreach($filenames as $filename)
+    foreach ($filenames as $filename)
       $uris[] = hopper::file_uri($this->locate_file($filename)); ;
 
     return $uris;
@@ -67,7 +67,7 @@ 
       'image/gif' => 'imagecreatefromgif',
     );
     $mime = mime_content_type($filepath);
-    if(array_key_exists($mime, $picture_mime_to_gd_create_function))
+    if (array_key_exists($mime, $picture_mime_to_gd_create_function))
       return true;
     return $mime;
   }
@@ -75,22 +75,22 @@ 
 
   public function upload()
   {
-    if(!array_key_exists($this->get_type(), $_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)
+    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)
+    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->build_filename().'.'.self::file_ext($_FILES[$this->get_type()]['name']);
     $filepath = $this->locate_file($filepath);
 
-		if(file_exists($filepath))
+		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)
+		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);
@@ -98,7 +98,7 @@ 
 
   public function download($url)
   {
-    $filepath = $this->build_filename() . '.' . self::file_ext($url);
+    $filepath = $this->build_filename().'.'.self::file_ext($url);
     $filepath = $this->locate_file($filepath);
 
     \qivive\Curlyb::fetch($url, $filepath);
@@ -113,7 +113,7 @@ 
 		$cover_iri = null;
 
 		$mime_type = mime_content_type($filepath);
-		switch($mime_type)
+		switch ($mime_type)
 		{
 			case 'image/jpeg':
 			case 'image/pjpeg':
@@ -129,21 +129,21 @@ 
 			break;
 		}
 
-		if(!is_null($cover_iri))
+		if (!is_null($cover_iri))
 		{
-			$width = imagesx( $cover_iri );
-			$height = imagesy( $cover_iri );
+			$width = imagesx($cover_iri);
+			$height = imagesy($cover_iri);
 
 			// calculate thumbnail size
       
 			$new_width = $settings[get_class($this->pmi)::model_type()][$this->get_type()]['thumbnail']['width'];
-			$new_height = floor( $height * ( $new_width / $width ) );
+			$new_height = floor($height * ($new_width / $width));
 
 			// create a new temporary image
 			$thumb_iri = imagecreatetruecolor($new_width, $new_height);
 
 			// copy and resize old image into new image
-			imagecopyresized( $thumb_iri, $cover_iri, 0, 0, 0, 0, $new_width, $new_height, $width, $height );
+			imagecopyresized($thumb_iri, $cover_iri, 0, 0, 0, 0, $new_width, $new_height, $width, $height);
 
 			// save thumbnail into a file
       imagejpeg($thumb_iri, $this->locate_thumbnail(pathinfo($filepath, PATHINFO_BASENAME)));
@@ -154,16 +154,16 @@ 
   {
     $filenames = $this->filenames();
 
-    foreach($filenames as $filename)
+    foreach ($filenames as $filename)
 				$this->remove($filename);
 
     $directory = $this->build_path_to_directory();
-		if(file_exists($directory) === true)
+		if (file_exists($directory) === true)
     {
-      if(is_dir($directory) === false)
+      if (is_dir($directory) === false)
         throw new PictureManagerException($this->get_type()."' directory '$directory' is not a directory");
 
-   		if(rmdir($directory) === false)
+   		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);
@@ -174,27 +174,27 @@ 
     // removing a picture, and maybe a thumbnail? build the $pathes array accordingly
     $pathes = [];
     $pathes[$this->get_type()] = $this->locate_file($picture_filename);
-    $pathes[$this->get_type() . ' thumbnail'] = $this->locate_thumbnail($picture_filename);
+    $pathes[$this->get_type().' thumbnail'] = $this->locate_thumbnail($picture_filename);
 
     $deleted = [];
     $still_walking = [];
-    foreach($pathes as $what => $path)
+    foreach ($pathes as $what => $path)
     {
       $error = null;
-  		if(!file_exists($path))
+  		if (!file_exists($path))
         $error = 'file does not exist';
-      elseif(unlink($path)===false)
+      elseif (unlink($path) === false)
         $error = 'unlink() failed';
 
-      if(is_null($error))
-        $deleted[]= $what;
+      if (is_null($error))
+        $deleted[] = $what;
       else
       {
         trigger_error(__FUNCTION__." '$picture_filename' ($what @ $path) impossible because ", E_USER_NOTICE);
-        $still_walking[]=$what;
+        $still_walking[] = $what;
       }
     }
-    return count($still_walking)===0;
+    return count($still_walking) === 0;
   }
 
   public function locate_thumbnail($filename)
@@ -208,11 +208,11 @@ 
     return $settings['thumbnail']['file_prefix'].''.pathinfo($picture_basename, PATHINFO_FILENAME).'.jpg';
   }
 
-  public static function file_info($absolute_path_to_picture, $what=null)
+  public static function file_info($absolute_path_to_picture, $what = null)
   {
-    $ret = parent::file_info($absolute_path_to_picture, $what=null);
+    $ret = parent::file_info($absolute_path_to_picture, $what = null);
 
-    if(is_array($ret))
+    if (is_array($ret))
     {
       $t = getimagesize($absolute_path_to_picture);
       $ret['width'] = $t[0];
@@ -230,7 +230,7 @@ 
   }
 
 
-  public static function uri_for($item, $picture_type, $thumbnail=true)
+  public static function uri_for($item, $picture_type, $thumbnail = true)
   {
     global $settings;
     $pi_manager = new PictureManager($item, $picture_type);
@@ -238,24 +238,24 @@ 
 		$pictures = $pi_manager->filenames();
 
     $item_model_type = get_class($item)::model_type();
-    if(count($pictures)===0)
+    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'])
+		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));
+    return hopper::file_uri($thumbnail === true ? $pi_manager->locate_thumbnail($filename) : $pi_manager->locate_file($filename));
   }
 
   public function last_index()
   {
     $last_index = 0;
-    if(count($filenames = $this->filenames()) > 0)
+    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)
+      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];
@@ -269,9 +269,9 @@ 
     return sprintf('%s%s.jpg', $settings['thumbnail']['file_prefix'], pathinfo($picture_basename, PATHINFO_FILENAME));
   }
 
-  public function build_filename($index=null)
+  public function build_filename($index = null)
   {
-    if(is_null($index))
+    if (is_null($index))
       $index = $this->last_index()+1;
 
     return $this->pmi->id.'_'.sprintf("%'.09d", $index); // prepend bean id
@@ -290,7 +290,7 @@ 
     $new_thumbname_path = $this->locate_file($this->build_thumb_filename($new_filename_path)); //move current to zero
     $this->rename($selected_thumbname_path, $new_thumbname_path);
 
-    for($i=$filename_index-1; $i>=0; --$i)
+    for ($i = $filename_index-1; $i >= 0; --$i)
     {
       $move_this = $this->locate_file($files[$i]);
       $to_that = $this->locate_file($files[$i+1]);

StateAgent.class.php

Spacing +10 added lines, -10 removed lines

@@ -11,7 +11,7 @@ 
   // $options : https://www.php.net/manual/fr/session.configuration.php
   public function __construct($options)
   {
-    if(isset($options['session_name']))
+    if (isset($options['session_name']))
     {
       session_name($options['session_name']);
       unset($options['session_name']);
@@ -32,28 +32,28 @@ 
     return isset($_SESSION[$this->index_filter][$filter_name]) && strlen(''.$_SESSION[$this->index_filter][$filter_name]) > 0;
   }
 
-  public function filters($filter_name=null, $value=null)
+  public function filters($filter_name = null, $value = null)
   {
-    if(is_null($filter_name))
+    if (is_null($filter_name))
       return $_SESSION[$this->index_filter];
 
-    if(!is_null($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)
+  public function reset_filters($filter_name = null)
   {
-    if(is_null($filter_name))
-      $_SESSION[$this->index_filter]=[];
+    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))
+    if (!is_null($setter))
       $_SESSION[$this->index_operator] = ['id' => $setter, 'set_on' => time()];
 
     return $_SESSION[$this->index_operator]['id'] ?? null;
@@ -68,10 +68,10 @@ 
   public function destroy() : bool
   {
 
-    if(ini_get("session.use_cookies"))
+    if (ini_get("session.use_cookies"))
     {
       $params = session_get_cookie_params();
-      setcookie(session_name(), '', time() - 42000,
+      setcookie(session_name(), '', time()-42000,
         $params["path"], $params["domain"],
         $params["secure"], $params["httponly"]
       );

Auth/ACL.class.php

Indentation +3 added lines, -3 removed lines

@@ -9,9 +9,9 @@
   const TABLE_ALIAS = 'acl';
 
   public function traceable() : bool
-	{
-		return false;
-	}
+  {
+    return false;
+  }
 
   public static function match(OperatorInterface $op, $permission_name)
   {

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

Spacing +16 added lines, -16 removed lines

@@ -8,17 +8,17 @@ 
 
   public function permission_names()
   {
-    if(property_exists($this, 'permission_names'))
+    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;
     }
     
@@ -31,16 +31,16 @@ 
   public function permissions()
   {
     
-    if(!is_null($this->permissions))
+    if (!is_null($this->permissions))
       return $this->permissions;
     $permission_unique_keys = null;
-    if(property_exists($this, 'permission_names'))
+    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));
@@ -56,40 +56,40 @@ 
   public function has_permission($p) : bool
   {
     // new instances or inactive operators, none shall pass
-    if($this->is_new() === true || $this->is_active()  === 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'))
+    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))
+    elseif (preg_match('/[0-9]+/', $p))
       $permission_id = $p;
     else
       $permission_name = $p;
 
 
-    if(!is_null($this->get('permission_names')) && !is_null($permission_name))
+    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)
+      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

Indentation +9 added lines, -9 removed lines

@@ -45,8 +45,8 @@ 
 
   public static function enhance_query_retrieve($Query, $filters, $options)
   {
-		$joined_alias = $Query->auto_join([ACL::table(),'ACL'], null, 'LEFT OUTER');
-		$joined_alias = $Query->auto_join([Permission::table(), 'permission'], null, 'LEFT OUTER');
+    $joined_alias = $Query->auto_join([ACL::table(),'ACL'], null, 'LEFT OUTER');
+    $joined_alias = $Query->auto_join([Permission::table(), 'permission'], null, 'LEFT OUTER');
 
     $permission_ids_and_names = [];
     $permission_ids_and_names []= sprintf('GROUP_CONCAT(DISTINCT %s.%s) as %s', $joined_alias, 'id', $joined_alias.'_ids');
@@ -67,7 +67,7 @@ 
     return $Query;
   }
 
-	public function is_active() : bool
+  public function is_active() : bool
   {
     return is_null($this->operator()) ? false : $this->operator()->is_active();
   }
@@ -77,12 +77,12 @@ 
     return is_null($this->operator()) ? null : $this->operator()->operator_id();
   }
 
-	public function username()
+  public function username()
   {
     return is_null($this->operator()) ? null : $this->operator()->username();
   }
 
-	public function password()
+  public function password()
   {
     return is_null($this->operator()) ? null : $this->operator()->password();
   }
@@ -97,22 +97,22 @@ 
     return $this->operator()->password_verify($string);
   }
 
-	public function name()
+  public function name()
   {
     return is_null($this->operator()) ? null : $this->operator()->name();
   }
 
-	public function email()
+  public function email()
   {
     return is_null($this->operator()) ? null : $this->operator()->email();
   }
 
-	public function phone()
+  public function phone()
   {
     return is_null($this->operator()) ? null : $this->operator()->phone();
   }
 
-	public function language_code()
+  public function language_code()
   {
     return is_null($this->operator()) ? null : $this->operator()->language_code();
   }

Spacing +11 added lines, -11 removed lines

@@ -17,19 +17,19 @@ 
 
   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
   {
-    if(is_null($this->operator))
+    if (is_null($this->operator))
     {
       $extract_attempt = $this->extract(new Operator(), true);
-      if(!is_null($extract_attempt))
+      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;
@@ -45,23 +45,23 @@ 
 
   public static function enhance_query_retrieve($Query, $filters, $options)
   {
-		$joined_alias = $Query->auto_join([ACL::table(),'ACL'], null, 'LEFT OUTER');
+		$joined_alias = $Query->auto_join([ACL::table(), 'ACL'], null, 'LEFT OUTER');
 		$joined_alias = $Query->auto_join([Permission::table(), 'permission'], null, 'LEFT OUTER');
 
     $permission_ids_and_names = [];
-    $permission_ids_and_names []= sprintf('GROUP_CONCAT(DISTINCT %s.%s) as %s', $joined_alias, 'id', $joined_alias.'_ids');
-    $permission_ids_and_names []= sprintf('GROUP_CONCAT(DISTINCT %s.%s) as %s', $joined_alias, 'name', $joined_alias.'_names');
+    $permission_ids_and_names [] = sprintf('GROUP_CONCAT(DISTINCT %s.%s) as %s', $joined_alias, 'id', $joined_alias.'_ids');
+    $permission_ids_and_names [] = sprintf('GROUP_CONCAT(DISTINCT %s.%s) as %s', $joined_alias, 'name', $joined_alias.'_names');
     $Query->select_also($permission_ids_and_names);
 
     $Query->select_also(['operator.name as operator_name', 'operator.active as operator_active']);
 
-    if(isset($filters['username']))
+    if (isset($filters['username']))
       $Query->aw_eq('username', $filters['username'], 'operator');
 
-    if(isset($filters['email']))
+    if (isset($filters['email']))
       $Query->aw_eq('email', $filters['email'], 'operator');
 
-    if(isset($filters['active']))
+    if (isset($filters['active']))
       $Query->aw_eq('active', $filters['active'], 'operator');
 
     return $Query;

PSR4Autoloader.class.php

Indentation +45 added lines, -45 removed lines

@@ -7,18 +7,18 @@ 
 {
   
   /**
-  * An associative array where the key is a namespace prefix and the value
-  * is an array of base directories for classes in that namespace.
-  *
-  * @var array
-  */
+   * An associative array where the key is a namespace prefix and the value
+   * is an array of base directories for classes in that namespace.
+   *
+   * @var array
+   */
   protected $prefixes = [];
 
   /**
-  * Register loader with SPL autoloader stack.
-  *
-  * @return void
-  */
+   * Register loader with SPL autoloader stack.
+   *
+   * @return void
+   */
 
   public function register()
   {
@@ -26,28 +26,28 @@ 
   }
 
   /**
-  * Adds a base directory for a namespace prefix.
-  *
-  * @param string $prefix The namespace prefix.
-  * @param string $base_dir A base directory for class files in the
-  * namespace.
-  * @param bool $prepend If true, prepend the base directory to the stack
-  * instead of appending it; this causes it to be searched first rather
-  * than last.
-  * @return void
-  */
+   * Adds a base directory for a namespace prefix.
+   *
+   * @param string $prefix The namespace prefix.
+   * @param string $base_dir A base directory for class files in the
+   * namespace.
+   * @param bool $prepend If true, prepend the base directory to the stack
+   * instead of appending it; this causes it to be searched first rather
+   * than last.
+   * @return void
+   */
   public function addNamespaceTree($base_dir, $prepend = false)
   {
-  	$dir_content = FileSystem::preg_scandir($base_dir, '/^[A-Z]{1}[A-Za-z]+(?!\.class.\.php)$/');
+    $dir_content = FileSystem::preg_scandir($base_dir, '/^[A-Z]{1}[A-Za-z]+(?!\.class.\.php)$/');
     
-  	foreach($dir_content as $res)
-  	{
-  		if(is_dir($fullpath = $base_dir.'/'.$res))
-  		{
-  			$this->addNamespace('HexMakina\kadro\\'.$res, $fullpath);
+    foreach($dir_content as $res)
+    {
+      if(is_dir($fullpath = $base_dir.'/'.$res))
+      {
+        $this->addNamespace('HexMakina\kadro\\'.$res, $fullpath);
         $this->addNamespaceTree($fullpath);
-  		}
-  	}
+      }
+    }
   }
   
   public function addNamespace($prefix, $base_dir, $prepend = false)
@@ -73,12 +73,12 @@ 
   }
 
   /**
-  * Loads the class file for a given class name.
-  *
-  * @param string $class The fully-qualified class name.
-  * @return mixed The mapped file name on success, or boolean false on
-  * failure.
-  */
+   * Loads the class file for a given class name.
+   *
+   * @param string $class The fully-qualified class name.
+   * @return mixed The mapped file name on success, or boolean false on
+   * failure.
+   */
   public function loadClass($class)
   {
     // var_dump(__FUNCTION__."($class)");
@@ -110,13 +110,13 @@ 
   }
 
   /**
-  * Load the mapped file for a namespace prefix and relative class.
-  *
-  * @param string $prefix The namespace prefix.
-  * @param string $relative_class The relative class name.
-  * @return mixed Boolean false if no mapped file can be loaded, or the
-  * name of the mapped file that was loaded.
-  */
+   * Load the mapped file for a namespace prefix and relative class.
+   *
+   * @param string $prefix The namespace prefix.
+   * @param string $relative_class The relative class name.
+   * @return mixed Boolean false if no mapped file can be loaded, or the
+   * name of the mapped file that was loaded.
+   */
   protected function loadMappedFile($prefix, $relative_class)
   {
     // are there any base directories for this namespace prefix?
@@ -147,11 +147,11 @@ 
   }
 
   /**
-  * If a file exists, require it from the file system.
-  *
-  * @param string $file The file to require.
-  * @return bool True if the file exists, false if not.
-  */
+   * If a file exists, require it from the file system.
+   *
+   * @param string $file The file to require.
+   * @return bool True if the file exists, false if not.
+   */
   protected function requireFile($file)
   {
     // var_dump(__FUNCTION__."($file)");

Spacing +6 added lines, -6 removed lines

@@ -40,9 +40,9 @@ 
   {
   	$dir_content = FileSystem::preg_scandir($base_dir, '/^[A-Z]{1}[A-Za-z]+(?!\.class.\.php)$/');
     
-  	foreach($dir_content as $res)
+  	foreach ($dir_content as $res)
   	{
-  		if(is_dir($fullpath = $base_dir.'/'.$res))
+  		if (is_dir($fullpath = $base_dir.'/'.$res))
   		{
   			$this->addNamespace('HexMakina\kadro\\'.$res, $fullpath);
         $this->addNamespaceTree($fullpath);
@@ -54,10 +54,10 @@ 
   {
     
     // normalize namespace prefix
-    $prefix = trim($prefix, '\\') . '\\';
+    $prefix = trim($prefix, '\\').'\\';
 
     // normalize the base directory with a trailing separator
-    $base_dir = rtrim($base_dir, DIRECTORY_SEPARATOR) . '/';
+    $base_dir = rtrim($base_dir, DIRECTORY_SEPARATOR).'/';
 
     // initialize the namespace prefix array
     if (isset($this->prefixes[$prefix]) === false) {
@@ -90,10 +90,10 @@ 
     while (false !== $pos = strrpos($prefix, '\\')) 
     {
       // retain the trailing namespace separator in the prefix
-      $prefix = substr($class, 0, $pos + 1);
+      $prefix = substr($class, 0, $pos+1);
       // var_dump("prefix: $prefix");
       // the rest is the relative class name
-      $relative_class = substr($class, $pos + 1);
+      $relative_class = substr($class, $pos+1);
       // try to load a mapped file for the prefix and relative class
       
       $mapped_file = $this->loadMappedFile($prefix, $relative_class);

Router/hopper.class.php

Indentation +2 added lines, -2 removed lines

@@ -192,8 +192,8 @@
 
   public function hop_url($url)
   {
-  	header('Cache-Control: no-cache, must-revalidate');
-  	header('Expires: Mon, 01 Jan 1970 00:00:00 GMT');
+    header('Cache-Control: no-cache, must-revalidate');
+    header('Expires: Mon, 01 Jan 1970 00:00:00 GMT');
     header('Location: '.$url);
     exit();
   }

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