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\ORM\TightModel'))
+    if (!is_subclass_of($file_manageable_model, '\HexMakina\ORM\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;

Braces +9 added lines, -6 removed lines

@@ -12,8 +12,9 @@ 
   
   function __construct($file_manageable_model, $filetype)
   {
-    if(!is_subclass_of($file_manageable_model, '\HexMakina\ORM\TightModel'))
-      throw new \Exception("__construct($file_manageable_model) // only Model items are manageable");
+    if(!is_subclass_of($file_manageable_model, '\HexMakina\ORM\TightModel')) {
+          throw new \Exception("__construct($file_manageable_model) // only Model items are manageable");
+    }
 
     $this->pmi = $file_manageable_model;
     $this->picture_type = $filetype;
@@ -58,11 +59,13 @@ 
     return $this->pmi->get_id().'/';  
 
     $pmi_model_type = get_class($this->pmi)::model_type();
-    if(!isset($this->pmi) || is_null($this->get_type()))
-      throw new \Exception(__FUNCTION__." // undefined manageable item or picture 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']))
-      throw new \Exception(__FUNCTION__." // undefined configuration for '".($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;
     // return $settings[$pmi_model_type][$this->get_type()]['import_directory'].$this->pmi->get_id().'/';

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

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
   }

Logger/LogLaddy.class.php

Indentation +5 added lines, -5 removed lines

@@ -52,11 +52,11 @@ 
 
   // ----------------------------------------------------------- Static handlers for error, use set_error_handler('\HexMakina\kadro\Logger\LogLaddy::error_handler')
   public static function error_handler($level, $message, $file = '', $line = 0)
-	{
+  {
     $loglevel = self::map_error_level_to_log_level($level);
 
     (new LogLaddy())->$loglevel($message, ['file' => $file, 'line' => $line, 'trace' => debug_backtrace()]);
-	}
+  }
 
   // ----------------------------------------------------------- Static handlers for throwables, use set_exception_handler('\HexMakina\kadro\Logger\LogLaddy::exception_handler');
   public static function exception_handler($throwable)
@@ -234,8 +234,8 @@ 
       elseif(preg_match('/(oper|user|query_by)/', $o))  $q->aw_eq('query_by', $v);
     }
 
-		try{$q->run();}
-		catch(CruditesException $e){vdt($e);return false;}
+    try{$q->run();}
+    catch(CruditesException $e){vdt($e);return false;}
 
     $res = $q->ret_num(); // ret num to list()
     // ddt($res);
@@ -265,7 +265,7 @@ 
    * const NOTICE    = 'notice'; // Normal but significant events.
    * const INFO      = 'info'; // Interesting events. User logs in, SQL logs.
    * const DEBUG     = 'debug'; // Detailed debug information.
-  */
+   */
   private static function map_error_level_to_log_level($level) : string
   {
 

Spacing +26 added lines, -26 removed lines

@@ -11,7 +11,7 @@ 
 
 namespace HexMakina\kadro\Logger;
 
-use \HexMakina\Crudites\{Crudites,CruditesException,Table};
+use \HexMakina\Crudites\{Crudites, CruditesException, Table};
 use \HexMakina\Crudites\TableInterface;
 
 
@@ -68,9 +68,9 @@ 
     $context['class'] = get_class($throwable);
     $context['trace'] = $throwable->getTrace();
 
-    if(is_subclass_of($throwable, 'Error') || get_class($throwable) === 'Error')
+    if (is_subclass_of($throwable, 'Error') || get_class($throwable) === 'Error')
       (new LogLaddy())->alert(self::INTERNAL_ERROR, $context);
-    elseif(is_subclass_of($throwable, 'Exception') || get_class($throwable) === 'Exception')
+    elseif (is_subclass_of($throwable, 'Exception') || get_class($throwable) === 'Exception')
       (new LogLaddy())->notice(self::USER_EXCEPTION, $context);
     else
     {
@@ -82,7 +82,7 @@ 
   public function system_halted($level)
   {
 
-    switch($level)
+    switch ($level)
     {
       case LogLevel::ERROR:
       case LogLevel::CRITICAL:
@@ -101,19 +101,19 @@ 
     $display_error = null;
 
     // --- Handles Throwables (exception_handler())
-    if($message==self::INTERNAL_ERROR || $message== self::USER_EXCEPTION)
+    if ($message == self::INTERNAL_ERROR || $message == self::USER_EXCEPTION)
     {
       $this->has_halting_messages = true;
       $display_error = \HexMakina\Debugger\Debugger::format_throwable_message($context['class'], $context['code'], $context['file'], $context['line'], $context['text']);
       error_log($display_error);
-      $display_error.= \HexMakina\Debugger\Debugger::format_trace($context['trace'], false);
+      $display_error .= \HexMakina\Debugger\Debugger::format_trace($context['trace'], false);
       self::HTTP_500($display_error);
     }
-    elseif($this->system_halted($level)) // analyses error level
+    elseif ($this->system_halted($level)) // analyses error level
     {
       $display_error = sprintf(PHP_EOL.'%s in file %s:%d'.PHP_EOL.'%s', $level, \HexMakina\Debugger\Debugger::format_file($context['file']), $context['line'], $message);
       error_log($display_error);
-      $display_error.= \HexMakina\Debugger\Debugger::format_trace($context['trace'], false);
+      $display_error .= \HexMakina\Debugger\Debugger::format_trace($context['trace'], false);
       self::HTTP_500($display_error);
     }
     else
@@ -165,10 +165,10 @@ 
   // ----------------------------------------------------------- User messages:add one
   public function report_to_user($level, $message, $context = [])
   {
-    if(!isset($_SESSION[self::REPORTING_USER]))
+    if (!isset($_SESSION[self::REPORTING_USER]))
       $_SESSION[self::REPORTING_USER] = [];
 
-    if(!isset($_SESSION[self::REPORTING_USER][$level]))
+    if (!isset($_SESSION[self::REPORTING_USER][$level]))
       $_SESSION[self::REPORTING_USER][$level] = [];
 
     $_SESSION[self::REPORTING_USER][$level][] = [$message, $context];
@@ -203,16 +203,16 @@ 
   // }
 
   // ----------------------------------------------------------- CRUD Tracking:get for many models
-  public function changes($options=[])
+  public function changes($options = [])
   {
 
-    if(!isset($options['limit']) || empty($options['limit']))
+    if (!isset($options['limit']) || empty($options['limit']))
       $limit = 1000;
     else  $limit = intval($options['limit']);
 
     // TODO SELECT field order can't change without adapting the result parsing code (foreach $res)
     $table = Crudites::inspect(self::LOG_TABLE_NAME);
-    $select_fields = ['SUBSTR(query_on, 1, 10) AS working_day', 'query_table', 'query_id',  'GROUP_CONCAT(DISTINCT query_type, "-", query_by) as action_by'];
+    $select_fields = ['SUBSTR(query_on, 1, 10) AS working_day', 'query_table', 'query_id', 'GROUP_CONCAT(DISTINCT query_type, "-", query_by) as action_by'];
     $q = $table->select($select_fields);
     $q->order_by(['', 'working_day', 'DESC']);
     $q->order_by([self::LOG_TABLE_NAME, 'query_table', 'DESC']);
@@ -224,30 +224,30 @@ 
     $q->having("action_by NOT LIKE '%D%'");
     $q->limit($limit);
 
-    foreach($options as $o => $v)
+    foreach ($options as $o => $v)
     {
-          if(preg_match('/id/', $o))                    $q->aw_eq('query_id', $v);
-      elseif(preg_match('/tables/', $o))                $q->aw_string_in('query_table', is_array($v) ? $v : [$v]);
-      elseif(preg_match('/table/', $o))                 $q->aw_eq('query_table', $v);
-      elseif(preg_match('/(type|action)/', $o))         $q->aw_string_in('query_type', is_array($v) ? $v : [$v]);
-      elseif(preg_match('/(date|query_on)/', $o))       $q->aw_like('query_on', "$v%");
-      elseif(preg_match('/(oper|user|query_by)/', $o))  $q->aw_eq('query_by', $v);
+          if (preg_match('/id/', $o))                    $q->aw_eq('query_id', $v);
+      elseif (preg_match('/tables/', $o))                $q->aw_string_in('query_table', is_array($v) ? $v : [$v]);
+      elseif (preg_match('/table/', $o))                 $q->aw_eq('query_table', $v);
+      elseif (preg_match('/(type|action)/', $o))         $q->aw_string_in('query_type', is_array($v) ? $v : [$v]);
+      elseif (preg_match('/(date|query_on)/', $o))       $q->aw_like('query_on', "$v%");
+      elseif (preg_match('/(oper|user|query_by)/', $o))  $q->aw_eq('query_by', $v);
     }
 
-		try{$q->run();}
-		catch(CruditesException $e){vdt($e);return false;}
+		try {$q->run(); }
+		catch (CruditesException $e) {vdt($e); return false; }
 
     $res = $q->ret_num(); // ret num to list()
     // ddt($res);
     $ret = [];
 
-    foreach($res as $r)
+    foreach ($res as $r)
     {
       list($working_day, $class, $instance_id, $logs) = $r;
 
-      if(!isset($ret[$working_day]))
+      if (!isset($ret[$working_day]))
         $ret[$working_day] = [];
-      if(!isset($ret[$working_day][$class]))
+      if (!isset($ret[$working_day][$class]))
         $ret[$working_day][$class] = [];
 
       $ret[$working_day][$class][$instance_id] = $logs;
@@ -269,7 +269,7 @@ 
   private static function map_error_level_to_log_level($level) : string
   {
 
-    switch($level)        // http://php.net/manual/en/errorfunc.constants.php
+    switch ($level)        // http://php.net/manual/en/errorfunc.constants.php
     {
       case E_ERROR:               // ('E_ERROR', "Fatal run-time errors. Execution of the script is halted");
       case 1:

Braces +40 added lines, -28 removed lines

@@ -68,11 +68,11 @@ 
     $context['class'] = get_class($throwable);
     $context['trace'] = $throwable->getTrace();
 
-    if(is_subclass_of($throwable, 'Error') || get_class($throwable) === 'Error')
-      (new LogLaddy())->alert(self::INTERNAL_ERROR, $context);
-    elseif(is_subclass_of($throwable, 'Exception') || get_class($throwable) === 'Exception')
-      (new LogLaddy())->notice(self::USER_EXCEPTION, $context);
-    else
+    if(is_subclass_of($throwable, 'Error') || get_class($throwable) === 'Error') {
+          (new LogLaddy())->alert(self::INTERNAL_ERROR, $context);
+    } elseif(is_subclass_of($throwable, 'Exception') || get_class($throwable) === 'Exception') {
+          (new LogLaddy())->notice(self::USER_EXCEPTION, $context);
+    } else
     {
       die('This Throwable is not an Error or an Exception. This is unfortunate.');
     }
@@ -108,15 +108,15 @@ 
       error_log($display_error);
       $display_error.= \HexMakina\Debugger\Debugger::format_trace($context['trace'], false);
       self::HTTP_500($display_error);
-    }
-    elseif($this->system_halted($level)) // analyses error level
+    } elseif($this->system_halted($level)) {
+      // analyses error level
     {
       $display_error = sprintf(PHP_EOL.'%s in file %s:%d'.PHP_EOL.'%s', $level, \HexMakina\Debugger\Debugger::format_file($context['file']), $context['line'], $message);
+    }
       error_log($display_error);
       $display_error.= \HexMakina\Debugger\Debugger::format_trace($context['trace'], false);
       self::HTTP_500($display_error);
-    }
-    else
+    } else
     {// --- Handles user messages, through SESSION storage
       $this->report_to_user($level, $message, $context);
     }
@@ -165,11 +165,13 @@ 
   // ----------------------------------------------------------- User messages:add one
   public function report_to_user($level, $message, $context = [])
   {
-    if(!isset($_SESSION[self::REPORTING_USER]))
-      $_SESSION[self::REPORTING_USER] = [];
+    if(!isset($_SESSION[self::REPORTING_USER])) {
+          $_SESSION[self::REPORTING_USER] = [];
+    }
 
-    if(!isset($_SESSION[self::REPORTING_USER][$level]))
-      $_SESSION[self::REPORTING_USER][$level] = [];
+    if(!isset($_SESSION[self::REPORTING_USER][$level])) {
+          $_SESSION[self::REPORTING_USER][$level] = [];
+    }
 
     $_SESSION[self::REPORTING_USER][$level][] = [$message, $context];
   }
@@ -206,9 +208,11 @@ 
   public function changes($options=[])
   {
 
-    if(!isset($options['limit']) || empty($options['limit']))
-      $limit = 1000;
-    else  $limit = intval($options['limit']);
+    if(!isset($options['limit']) || empty($options['limit'])) {
+          $limit = 1000;
+    } else {
+      $limit = intval($options['limit']);
+    }
 
     // TODO SELECT field order can't change without adapting the result parsing code (foreach $res)
     $table = Crudites::inspect(self::LOG_TABLE_NAME);
@@ -226,16 +230,22 @@ 
 
     foreach($options as $o => $v)
     {
-          if(preg_match('/id/', $o))                    $q->aw_eq('query_id', $v);
-      elseif(preg_match('/tables/', $o))                $q->aw_string_in('query_table', is_array($v) ? $v : [$v]);
-      elseif(preg_match('/table/', $o))                 $q->aw_eq('query_table', $v);
-      elseif(preg_match('/(type|action)/', $o))         $q->aw_string_in('query_type', is_array($v) ? $v : [$v]);
-      elseif(preg_match('/(date|query_on)/', $o))       $q->aw_like('query_on', "$v%");
-      elseif(preg_match('/(oper|user|query_by)/', $o))  $q->aw_eq('query_by', $v);
+          if(preg_match('/id/', $o)) {
+            $q->aw_eq('query_id', $v);
+          } elseif(preg_match('/tables/', $o)) {
+        $q->aw_string_in('query_table', is_array($v) ? $v : [$v]);
+      } elseif(preg_match('/table/', $o)) {
+        $q->aw_eq('query_table', $v);
+      } elseif(preg_match('/(type|action)/', $o)) {
+        $q->aw_string_in('query_type', is_array($v) ? $v : [$v]);
+      } elseif(preg_match('/(date|query_on)/', $o)) {
+        $q->aw_like('query_on', "$v%");
+      } elseif(preg_match('/(oper|user|query_by)/', $o)) {
+        $q->aw_eq('query_by', $v);
+      }
     }
 
-		try{$q->run();}
-		catch(CruditesException $e){vdt($e);return false;}
+		try{$q->run();} catch(CruditesException $e){vdt($e);return false;}
 
     $res = $q->ret_num(); // ret num to list()
     // ddt($res);
@@ -245,10 +255,12 @@ 
     {
       list($working_day, $class, $instance_id, $logs) = $r;
 
-      if(!isset($ret[$working_day]))
-        $ret[$working_day] = [];
-      if(!isset($ret[$working_day][$class]))
-        $ret[$working_day][$class] = [];
+      if(!isset($ret[$working_day])) {
+              $ret[$working_day] = [];
+      }
+      if(!isset($ret[$working_day][$class])) {
+              $ret[$working_day][$class] = [];
+      }
 
       $ret[$working_day][$class][$instance_id] = $logs;
     }

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"]
       );

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

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=[]) : BaseQuery
+  public static function query_retrieve($filters = [], $options = []) : BaseQuery
   {
     $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)

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

Indentation +29 added lines, -29 removed lines

@@ -13,12 +13,12 @@ 
 

   use Permissionability;

 

-	public function __toString()

+  public function __toString()

   {

     return $this->get('username');

   }

 

-	public function is_active() : bool

+  public function is_active() : bool

   {

     return !empty($this->get('active'));

   }

@@ -39,14 +39,14 @@ 
   }

 

   public function password_change($string)

-	{

-		$this->password = password_hash($string, PASSWORD_DEFAULT);

-	}

+  {

+    $this->password = password_hash($string, PASSWORD_DEFAULT);

+  }

 

-	public function password_verify($string) : bool

-	{

-		return password_verify($string, $this->password());

-	}

+  public function password_verify($string) : bool

+  {

+    return password_verify($string, $this->password());

+  }

 

   public function name()

   {

@@ -62,39 +62,39 @@ 
     return $this->get('phone');

   }

 

-	public function language_code()

+  public function language_code()

   {

     return $this->get('language_code');

   }

 

-	public static function query_retrieve($filters=[], $options=[]) : BaseQuery

-	{

-		$Query = static::table()->select();

-  	if(isset($options['eager']) && $options['eager'] === true)

-		{

+  public static function query_retrieve($filters=[], $options=[]) : BaseQuery

+  {

+    $Query = static::table()->select();

+    if(isset($options['eager']) && $options['eager'] === true)

+    {

       $Query->group_by('id');

 

       $Query->auto_join([ACL::table(), 'acl'], null, 'LEFT OUTER');

       $Query->auto_join([Permission::table(), 'kadro_permission'], null, 'LEFT OUTER');

-			$Query->select_also(["GROUP_CONCAT(DISTINCT kadro_permission.id) as permission_ids", "GROUP_CONCAT(DISTINCT kadro_permission.name) as permission_names"]);

-		}

+      $Query->select_also(["GROUP_CONCAT(DISTINCT kadro_permission.id) as permission_ids", "GROUP_CONCAT(DISTINCT kadro_permission.name) as permission_names"]);

+    }

 

-		if(isset($filters['model']) && !empty($filters['model']))

-		{

-			$model = $filters['model'];

-			$Query->join([static::otm('t'), static::otm('a')],[[static::otm('a'),static::otm('k'), 't_from','id']], 'INNER');

-			$Query->aw_fields_eq(['model_id' => $filters['model']->get_id(), 'model_type' => get_class($filters['model'])::model_type()], static::otm('a'));

-		}

+    if(isset($filters['model']) && !empty($filters['model']))

+    {

+      $model = $filters['model'];

+      $Query->join([static::otm('t'), static::otm('a')],[[static::otm('a'),static::otm('k'), 't_from','id']], 'INNER');

+      $Query->aw_fields_eq(['model_id' => $filters['model']->get_id(), 'model_type' => get_class($filters['model'])::model_type()], static::otm('a'));

+    }

 

     $Query->order_by([$Query->table_label(), 'name', 'ASC']);

 

 

-		return $Query;

-	}

+    return $Query;

+  }

 

-	public function immortal() : bool

-	{

-		return true; // never delete a user, always deactivate

-	}

+  public function immortal() : bool

+  {

+    return true; // never delete a user, always deactivate

+  }

 }

 ?>

Spacing +4 added lines, -4 removed lines

@@ -67,10 +67,10 @@ 
     return $this->get('language_code');

   }

 

-	public static function query_retrieve($filters=[], $options=[]) : BaseQuery

+	public static function query_retrieve($filters = [], $options = []) : BaseQuery

 	{

 		$Query = static::table()->select();

-  	if(isset($options['eager']) && $options['eager'] === true)

+  	if (isset($options['eager']) && $options['eager'] === true)

 		{

       $Query->group_by('id');

 

@@ -79,10 +79,10 @@ 
 			$Query->select_also(["GROUP_CONCAT(DISTINCT kadro_permission.id) as permission_ids", "GROUP_CONCAT(DISTINCT kadro_permission.name) as permission_names"]);

 		}

 

-		if(isset($filters['model']) && !empty($filters['model']))

+		if (isset($filters['model']) && !empty($filters['model']))

 		{

 			$model = $filters['model'];

-			$Query->join([static::otm('t'), static::otm('a')],[[static::otm('a'),static::otm('k'), 't_from','id']], 'INNER');

+			$Query->join([static::otm('t'), static::otm('a')], [[static::otm('a'), static::otm('k'), 't_from', 'id']], 'INNER');

 			$Query->aw_fields_eq(['model_id' => $filters['model']->get_id(), 'model_type' => get_class($filters['model'])::model_type()], static::otm('a'));

 		}

 

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

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

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;

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