jon48 / webtrees-lib

src/Webtrees/Mvc/Controller/MvcController.php

Indentation +20 added lines, -20 removed lines

@@ -17,28 +17,28 @@
  */
 class MvcController implements MvcControllerInterface 
 {
-    /**
-     * Reference module
-     * @var Fisharebest\Webtrees\Module\AbstractModule $module
-     */
-    protected $module;
+	/**
+	 * Reference module
+	 * @var Fisharebest\Webtrees\Module\AbstractModule $module
+	 */
+	protected $module;
     
-    /**
-     * Constructor for MvcController
-     * 
-     * @param AbstractModule $module
-     */
-    public function __construct(AbstractModule $module) {
-        $this->module = $module;
-    }
+	/**
+	 * Constructor for MvcController
+	 * 
+	 * @param AbstractModule $module
+	 */
+	public function __construct(AbstractModule $module) {
+		$this->module = $module;
+	}
     
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Mvc\Controller\MvcControllerInterface::getModule()
-     */
-    public function getModule() {
-        return $this->module;
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Mvc\Controller\MvcControllerInterface::getModule()
+	 */
+	public function getModule() {
+		return $this->module;
+	}
         
 }
  
\ No newline at end of file

src/Webtrees/Mvc/DispatcherInterface.php

Indentation +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 	 * @param \Fisharebest\Webtrees\Module\AbstractModule $module
 	 * @param string $request
 	 */
-    public function handle(\Fisharebest\Webtrees\Module\AbstractModule $module, $request);
+	public function handle(\Fisharebest\Webtrees\Module\AbstractModule $module, $request);
     
 }
  
\ No newline at end of file

src/Webtrees/Mvc/View/ViewFactory.php

Indentation +72 added lines, -72 removed lines

@@ -17,87 +17,87 @@
  */
 class ViewFactory {
     
-    /**
-     * @var ViewFactory $instance Singleton pattern instance
-     */
-    private static $instance = null;
+	/**
+	 * @var ViewFactory $instance Singleton pattern instance
+	 */
+	private static $instance = null;
     
-    /**
-     * Returns the *ViewFactory* instance of this class.
-     *
-     * @return ViewFactory The *Singleton* instance.
-     */
-    public static function getInstance()
-    {
-        if (null === static::$instance) {
-            static::$instance = new static();
-        }
+	/**
+	 * Returns the *ViewFactory* instance of this class.
+	 *
+	 * @return ViewFactory The *Singleton* instance.
+	 */
+	public static function getInstance()
+	{
+		if (null === static::$instance) {
+			static::$instance = new static();
+		}
     
-        return static::$instance;
-    }
+		return static::$instance;
+	}
     
-    /**
-     * Protected constructor
-     */
-    protected function __construct() {}
+	/**
+	 * Protected constructor
+	 */
+	protected function __construct() {}
               
-    /**
-     * Return the view specified by the controller and view name, using data from the ViewBag
-     * 
-     * @param string $view_name
-     * @param \MyArtJaub\Webtrees\Mvc\Controller\MvcControllerInterface $mvc_ctrl
-     * @param \Fisharebest\Webtrees\Controller\BaseController $ctrl
-     * @param \MyArtJaub\Webtrees\Mvc\View\ViewBag $data
-     * @return \MyArtJaub\Webtrees\Mvc\View\AbstractView View
-     * @throws \Exception
-     */
-    public function makeView($view_name, MvcController $mvc_ctrl, BaseController $ctrl, ViewBag $data) 
-    {
-        if(!$mvc_ctrl) throw new \Exception('Mvc Controller not defined');
-        if(!$ctrl) throw new \Exception('Base Controller not defined');
-        if(!$view_name) throw new \Exception('View not defined');
+	/**
+	 * Return the view specified by the controller and view name, using data from the ViewBag
+	 * 
+	 * @param string $view_name
+	 * @param \MyArtJaub\Webtrees\Mvc\Controller\MvcControllerInterface $mvc_ctrl
+	 * @param \Fisharebest\Webtrees\Controller\BaseController $ctrl
+	 * @param \MyArtJaub\Webtrees\Mvc\View\ViewBag $data
+	 * @return \MyArtJaub\Webtrees\Mvc\View\AbstractView View
+	 * @throws \Exception
+	 */
+	public function makeView($view_name, MvcController $mvc_ctrl, BaseController $ctrl, ViewBag $data) 
+	{
+		if(!$mvc_ctrl) throw new \Exception('Mvc Controller not defined');
+		if(!$ctrl) throw new \Exception('Base Controller not defined');
+		if(!$view_name) throw new \Exception('View not defined');
         
-        $mvc_ctrl_refl = new \ReflectionObject($mvc_ctrl);
-        $view_class = $mvc_ctrl_refl->getNamespaceName() . '\\Views\\' . $view_name . 'View';       
-        if(!class_exists($view_class)) throw new \Exception('View does not exist');
+		$mvc_ctrl_refl = new \ReflectionObject($mvc_ctrl);
+		$view_class = $mvc_ctrl_refl->getNamespaceName() . '\\Views\\' . $view_name . 'View';       
+		if(!class_exists($view_class)) throw new \Exception('View does not exist');
         
-        return new $view_class($ctrl, $data);
-    }
+		return new $view_class($ctrl, $data);
+	}
     
-    /**
-     * Static invocation of the makeView method
-     * 
-     * @param string $view_name
-     * @param \MyArtJaub\Webtrees\Mvc\Controller\MvcControllerInterface $mvc_ctrl
-     * @param \Fisharebest\Webtrees\Controller\BaseController $ctrl
-     * @param \MyArtJaub\Webtrees\Mvc\View\ViewBag $data
-     * @return \MyArtJaub\Webtrees\Mvc\View\AbstractView View
-     * @see \MyArtJaub\Webtrees\Mvc\View\ViewFactory::handle()
-     */
-    public static function make($view_name, MvcController $mvc_ctrl, BaseController $ctrl, ViewBag $data) 
-    {
-        return self::getInstance()->makeView($view_name, $mvc_ctrl, $ctrl, $data);
-    }
+	/**
+	 * Static invocation of the makeView method
+	 * 
+	 * @param string $view_name
+	 * @param \MyArtJaub\Webtrees\Mvc\Controller\MvcControllerInterface $mvc_ctrl
+	 * @param \Fisharebest\Webtrees\Controller\BaseController $ctrl
+	 * @param \MyArtJaub\Webtrees\Mvc\View\ViewBag $data
+	 * @return \MyArtJaub\Webtrees\Mvc\View\AbstractView View
+	 * @see \MyArtJaub\Webtrees\Mvc\View\ViewFactory::handle()
+	 */
+	public static function make($view_name, MvcController $mvc_ctrl, BaseController $ctrl, ViewBag $data) 
+	{
+		return self::getInstance()->makeView($view_name, $mvc_ctrl, $ctrl, $data);
+	}
     
-    /**
-     * Private clone method to prevent cloning of the instance of the
-     * *Dispatcher* instance.
-     *
-     * @return void
-     */
-    private function __clone()
-    {
-    }
+	/**
+	 * Private clone method to prevent cloning of the instance of the
+	 * *Dispatcher* instance.
+	 *
+	 * @return void
+	 */
+	private function __clone()
+	{
+	}
     
-    /**
-     * Private unserialize method to prevent unserializing of the *Dispatcher*
-     * instance.
-     *
-     * @return void
-     */
-    private function __wakeup()
-    {
-    }
+	/**
+	 * Private unserialize method to prevent unserializing of the *Dispatcher*
+	 * instance.
+	 *
+	 * @return void
+	 */
+	private function __wakeup()
+	{
+	}
     
 }
  
\ No newline at end of file

Spacing +5 added lines, -5 removed lines

@@ -53,13 +53,13 @@
      */
     public function makeView($view_name, MvcController $mvc_ctrl, BaseController $ctrl, ViewBag $data) 
     {
-        if(!$mvc_ctrl) throw new \Exception('Mvc Controller not defined');
-        if(!$ctrl) throw new \Exception('Base Controller not defined');
-        if(!$view_name) throw new \Exception('View not defined');
+        if (!$mvc_ctrl) throw new \Exception('Mvc Controller not defined');
+        if (!$ctrl) throw new \Exception('Base Controller not defined');
+        if (!$view_name) throw new \Exception('View not defined');
         
         $mvc_ctrl_refl = new \ReflectionObject($mvc_ctrl);
-        $view_class = $mvc_ctrl_refl->getNamespaceName() . '\\Views\\' . $view_name . 'View';       
-        if(!class_exists($view_class)) throw new \Exception('View does not exist');
+        $view_class = $mvc_ctrl_refl->getNamespaceName().'\\Views\\'.$view_name.'View';       
+        if (!class_exists($view_class)) throw new \Exception('View does not exist');
         
         return new $view_class($ctrl, $data);
     }

Braces +12 added lines, -4 removed lines

@@ -53,13 +53,21 @@
      */
     public function makeView($view_name, MvcController $mvc_ctrl, BaseController $ctrl, ViewBag $data) 
     {
-        if(!$mvc_ctrl) throw new \Exception('Mvc Controller not defined');
-        if(!$ctrl) throw new \Exception('Base Controller not defined');
-        if(!$view_name) throw new \Exception('View not defined');
+        if(!$mvc_ctrl) {
+        	throw new \Exception('Mvc Controller not defined');
+        }
+        if(!$ctrl) {
+        	throw new \Exception('Base Controller not defined');
+        }
+        if(!$view_name) {
+        	throw new \Exception('View not defined');
+        }
         
         $mvc_ctrl_refl = new \ReflectionObject($mvc_ctrl);
         $view_class = $mvc_ctrl_refl->getNamespaceName() . '\\Views\\' . $view_name . 'View';       
-        if(!class_exists($view_class)) throw new \Exception('View does not exist');
+        if(!class_exists($view_class)) {
+        	throw new \Exception('View does not exist');
+        }
         
         return new $view_class($ctrl, $data);
     }

src/Webtrees/ImageBuilder.php

Spacing +25 added lines, -25 removed lines

@@ -62,7 +62,7 @@ 
 	*
 	* @param Media|null $media Reference media object
 	*/
-	public function __construct(Media $media = null){
+	public function __construct(Media $media = null) {
 	    $this->media = $media;
 	    $this->use_ttf = function_exists('imagettftext');
 	    $this->expire_offset = 3600 * 24;
@@ -87,7 +87,7 @@ 
 	 * @return ImageBuilder
 	 */
 	public function setExpireOffset($expireOffset) {
-	    if($expireOffset) $this->expire_offset = $expireOffset;
+	    if ($expireOffset) $this->expire_offset = $expireOffset;
 	    return $this;
 	}
 	
@@ -107,7 +107,7 @@ 
 	 * @return ImageBuilder
 	 */
 	public function setShowWatermark($show_watermark) {
-	    if(!is_null($show_watermark)) $this->show_watermark = $show_watermark;
+	    if (!is_null($show_watermark)) $this->show_watermark = $show_watermark;
 	    return $this;
 	}
 	
@@ -118,7 +118,7 @@ 
 	 * @return ImageBuilder
 	 */
 	public function setFontMaxSize($font_max_size) {
-	    if($font_max_size) $this->font_max_size = $font_max_size;
+	    if ($font_max_size) $this->font_max_size = $font_max_size;
 	    return $this;
 	}
 	
@@ -129,32 +129,32 @@ 
 	 * @return ImageBuilder
 	 */
 	public function setFontColor($font_color) {
-	    if($font_color) $this->font_color = $font_color;
+	    if ($font_color) $this->font_color = $font_color;
 	    return $this;
 	}
 	
 	/**
 	 * Render the image to the output.
 	 */
-	public function render(){
+	public function render() {
 	    
 	    if (!$this->media || !$this->media->canShow()) {
-	        Log::addMediaLog('Image Builder error: >' . I18N::translate('Missing or private media object.'));
+	        Log::addMediaLog('Image Builder error: >'.I18N::translate('Missing or private media object.'));
 	        $this->renderError();
 	    }
 	    
 	    $serverFilename = $this->media->getServerFilename();
 	    
 	    if (!file_exists($serverFilename)) {
-	        Log::addMediaLog('Image Builder error: >'. I18N::translate('The media object does not exist.').'< for path >'.$serverFilename.'<');
+	        Log::addMediaLog('Image Builder error: >'.I18N::translate('The media object does not exist.').'< for path >'.$serverFilename.'<');
 	        $this->renderError();
 	    }
 	    
 	    $mimetype = $this->media->mimeType();
 	    $imgsize = $this->media->getImageAttributes();
 	    $filetime = $this->media->getFiletime();
-	    $filetimeHeader = gmdate('D, d M Y H:i:s', $filetime) . ' GMT';	    
-	    $expireHeader = gmdate('D, d M Y H:i:s', WT_TIMESTAMP + $this->getExpireOffset()) . ' GMT';
+	    $filetimeHeader = gmdate('D, d M Y H:i:s', $filetime).' GMT';	    
+	    $expireHeader = gmdate('D, d M Y H:i:s', WT_TIMESTAMP + $this->getExpireOffset()).' GMT';
 	    
 	    $type = Functions::isImageTypeSupported($imgsize['ext']);
 	    $usewatermark = false;
@@ -186,10 +186,10 @@ 
 	    }
 	    
 	    // add caching headers.  allow browser to cache file, but not proxy
-	    header('Last-Modified: ' . $filetimeHeader);
-	    header('ETag: "' . $etag . '"');
-	    header('Expires: ' . $expireHeader);
-	    header('Cache-Control: max-age=' . $this->getExpireOffset() . ', s-maxage=0, proxy-revalidate');
+	    header('Last-Modified: '.$filetimeHeader);
+	    header('ETag: "'.$etag.'"');
+	    header('Expires: '.$expireHeader);
+	    header('Cache-Control: max-age='.$this->getExpireOffset().', s-maxage=0, proxy-revalidate');
 	    
 	    // if this file is already in the user’s cache, don’t resend it
 	    // first check if the if_modified_since param matches
@@ -203,13 +203,13 @@ 
 	    }	    
 
 	    // send headers for the image
-	    header('Content-Type: ' . $mimetype);
-	    header('Content-Disposition: filename="' . addslashes(basename($this->media->getFilename())) . '"');
+	    header('Content-Type: '.$mimetype);
+	    header('Content-Disposition: filename="'.addslashes(basename($this->media->getFilename())).'"');
 	     
 	    if ($usewatermark) {
 	        // generate the watermarked image
-	        $imCreateFunc = 'imagecreatefrom' . $type;
-	        $imSendFunc   = 'image' . $type;
+	        $imCreateFunc = 'imagecreatefrom'.$type;
+	        $imSendFunc   = 'image'.$type;
 	    
 	        if (function_exists($imCreateFunc) && function_exists($imSendFunc)) {
 	            $im = $imCreateFunc($serverFilename);
@@ -222,7 +222,7 @@ 
 	            return;
 	        } else {
 	            // this image is defective.  log it
-	            Log::addMediaLog('Image Builder error: >' . I18N::translate('This media file is broken and cannot be watermarked.') . '< in file >' . $serverFilename . '< memory used: ' . memory_get_usage());
+	            Log::addMediaLog('Image Builder error: >'.I18N::translate('This media file is broken and cannot be watermarked.').'< in file >'.$serverFilename.'< memory used: '.memory_get_usage());
 	        }
 	    }
 	    
@@ -230,7 +230,7 @@ 
 	    $filesize = filesize($serverFilename);
 	    
 	    // set content-length header, send file
-	    header('Content-Length: ' . $filesize);
+	    header('Content-Length: '.$filesize);
 	    
 	    // Some servers disable fpassthru() and readfile()
 	    if (function_exists('readfile')) {
@@ -260,7 +260,7 @@ 
     	$bgc    = imagecolorallocate($im, 255, 255, 255); /* set background color */
     	imagefilledrectangle($im, 2, 2, $width - 4, $height - 4, $bgc); /* create a rectangle, leaving 2 px border */
     
-    	$this->embedText($im, $error, 100, '255, 0, 0', WT_ROOT . Config::FONT_DEJAVU_SANS_TTF, 'top', 'left');
+    	$this->embedText($im, $error, 100, '255, 0, 0', WT_ROOT.Config::FONT_DEJAVU_SANS_TTF, 'top', 'left');
     
     	http_response_code(404);
     	header('Content-Type: image/png');
@@ -278,7 +278,7 @@ 
 	protected function applyWatermark($im) {
 	    
 	    // text to watermark with	    
-	    if(method_exists($this->media, 'getWatermarkText')) {
+	    if (method_exists($this->media, 'getWatermarkText')) {
 	       $word1_text = $this->media->getWatermarkText();
 	    }
 	    else {
@@ -290,7 +290,7 @@ 
 	        $word1_text, 
 	        $this->font_max_size,
 	        $this->font_color,
-	        WT_ROOT . Config::FONT_DEJAVU_SANS_TTF,
+	        WT_ROOT.Config::FONT_DEJAVU_SANS_TTF,
 	        'top', 
 	        'left'
 	     );
@@ -409,7 +409,7 @@ 
 	 * @param string $hexstr
 	 * @return int[]
 	 */
-	protected function hexrgb ($hexstr)
+	protected function hexrgb($hexstr)
 	{
 	    $int = hexdec($hexstr);
 	
@@ -451,7 +451,7 @@ 
      */
     function imageTtfTextErrorHandler($errno, $errstr) {
         // log the error
-        Log::addErrorLog('Image Builder error: >' . $errno . '/' . $errstr . '< while processing file >' . $this->media->getServerFilename() . '<');
+        Log::addErrorLog('Image Builder error: >'.$errno.'/'.$errstr.'< while processing file >'.$this->media->getServerFilename().'<');
     
         // change value of useTTF to false so the fallback watermarking can be used.
         $this->use_ttf = false;

Braces +13 added lines, -6 removed lines

@@ -87,7 +87,9 @@ 
 	 * @return ImageBuilder
 	 */
 	public function setExpireOffset($expireOffset) {
-	    if($expireOffset) $this->expire_offset = $expireOffset;
+	    if($expireOffset) {
+	    	$this->expire_offset = $expireOffset;
+	    }
 	    return $this;
 	}
 	
@@ -107,7 +109,9 @@ 
 	 * @return ImageBuilder
 	 */
 	public function setShowWatermark($show_watermark) {
-	    if(!is_null($show_watermark)) $this->show_watermark = $show_watermark;
+	    if(!is_null($show_watermark)) {
+	    	$this->show_watermark = $show_watermark;
+	    }
 	    return $this;
 	}
 	
@@ -118,7 +122,9 @@ 
 	 * @return ImageBuilder
 	 */
 	public function setFontMaxSize($font_max_size) {
-	    if($font_max_size) $this->font_max_size = $font_max_size;
+	    if($font_max_size) {
+	    	$this->font_max_size = $font_max_size;
+	    }
 	    return $this;
 	}
 	
@@ -129,7 +135,9 @@ 
 	 * @return ImageBuilder
 	 */
 	public function setFontColor($font_color) {
-	    if($font_color) $this->font_color = $font_color;
+	    if($font_color) {
+	    	$this->font_color = $font_color;
+	    }
 	    return $this;
 	}
 	
@@ -280,8 +288,7 @@ 
 	    // text to watermark with	    
 	    if(method_exists($this->media, 'getWatermarkText')) {
 	       $word1_text = $this->media->getWatermarkText();
-	    }
-	    else {
+	    } else {
 	        $word1_text = $this->media->getTitle();
 	    }
 	

Indentation +290 added lines, -290 removed lines

@@ -22,54 +22,54 @@ 
  */
 class ImageBuilder {
     
-    /**
-     * Reference media
-     * @var Media $media
-     */
-    protected $media;
+	/**
+	 * Reference media
+	 * @var Media $media
+	 */
+	protected $media;
     
-    /**
-     * Use TTF font
-     * @var bool $use_ttf
-     */
-    protected $use_ttf;
+	/**
+	 * Use TTF font
+	 * @var bool $use_ttf
+	 */
+	protected $use_ttf;
     
-    /**
-     * Expiration offset. Default is one day.
-     * @var int $expire_offset
-     */
-    protected $expire_offset;
+	/**
+	 * Expiration offset. Default is one day.
+	 * @var int $expire_offset
+	 */
+	protected $expire_offset;
    
-    /**
-     * Should the certificate display a watermark
-     * @var bool $show_watermark
-     */
-    protected $show_watermark;
+	/**
+	 * Should the certificate display a watermark
+	 * @var bool $show_watermark
+	 */
+	protected $show_watermark;
         
-    /**
-     * Maximum watermark font size. Default is 18.
-     * @var int $font_max_size
-     */
-    protected $font_max_size;
+	/**
+	 * Maximum watermark font size. Default is 18.
+	 * @var int $font_max_size
+	 */
+	protected $font_max_size;
     
-    /**
-     * Watermark font color, in hexadecimal. Default is #4D6DF3.
-     * @var string $font_color
-     */
-    protected $font_color;
+	/**
+	 * Watermark font color, in hexadecimal. Default is #4D6DF3.
+	 * @var string $font_color
+	 */
+	protected $font_color;
     
 	/**
-	* Contructor for ImageBuilder
-	*
-	* @param Media|null $media Reference media object
-	*/
+	 * Contructor for ImageBuilder
+	 *
+	 * @param Media|null $media Reference media object
+	 */
 	public function __construct(Media $media = null){
-	    $this->media = $media;
-	    $this->use_ttf = function_exists('imagettftext');
-	    $this->expire_offset = 3600 * 24;
-	    $this->show_watermark = true;
-	    $this->font_max_size = 18;
-	    $this->font_color = '#4D6DF3';
+		$this->media = $media;
+		$this->use_ttf = function_exists('imagettftext');
+		$this->expire_offset = 3600 * 24;
+		$this->show_watermark = true;
+		$this->font_max_size = 18;
+		$this->font_color = '#4D6DF3';
 	}
 	
 	/**
@@ -78,7 +78,7 @@ 
 	 * @return int
 	 */
 	public function getExpireOffset() {
-	    return $this->expire_offset;
+		return $this->expire_offset;
 	}
 	
 	/**
@@ -88,8 +88,8 @@ 
 	 * @return ImageBuilder
 	 */
 	public function setExpireOffset($expireOffset) {
-	    if($expireOffset) $this->expire_offset = $expireOffset;
-	    return $this;
+		if($expireOffset) $this->expire_offset = $expireOffset;
+		return $this;
 	}
 	
 	/**
@@ -98,7 +98,7 @@ 
 	 * @return bool
 	 */
 	public function isShowWatermark() {
-	    return $this->show_watermark;
+		return $this->show_watermark;
 	}
 	
 	/**
@@ -108,8 +108,8 @@ 
 	 * @return ImageBuilder
 	 */
 	public function setShowWatermark($show_watermark) {
-	    if(!is_null($show_watermark)) $this->show_watermark = $show_watermark;
-	    return $this;
+		if(!is_null($show_watermark)) $this->show_watermark = $show_watermark;
+		return $this;
 	}
 	
 	/**
@@ -119,8 +119,8 @@ 
 	 * @return ImageBuilder
 	 */
 	public function setFontMaxSize($font_max_size) {
-	    if($font_max_size) $this->font_max_size = $font_max_size;
-	    return $this;
+		if($font_max_size) $this->font_max_size = $font_max_size;
+		return $this;
 	}
 	
 	/**
@@ -130,8 +130,8 @@ 
 	 * @return ImageBuilder
 	 */
 	public function setFontColor($font_color) {
-	    if($font_color) $this->font_color = $font_color;
-	    return $this;
+		if($font_color) $this->font_color = $font_color;
+		return $this;
 	}
 	
 	/**
@@ -139,134 +139,134 @@ 
 	 */
 	public function render(){
 	    
-	    if (!$this->media || !$this->media->canShow()) {
-	        Log::addMediaLog('Image Builder error: >' . I18N::translate('Missing or private media object.'));
-	        $this->renderError();
-	    }
+		if (!$this->media || !$this->media->canShow()) {
+			Log::addMediaLog('Image Builder error: >' . I18N::translate('Missing or private media object.'));
+			$this->renderError();
+		}
 	    
-	    $serverFilename = $this->media->getServerFilename();
+		$serverFilename = $this->media->getServerFilename();
 	    
-	    if (!file_exists($serverFilename)) {
-	        Log::addMediaLog('Image Builder error: >'. I18N::translate('The media object does not exist.').'< for path >'.$serverFilename.'<');
-	        $this->renderError();
-	    }
+		if (!file_exists($serverFilename)) {
+			Log::addMediaLog('Image Builder error: >'. I18N::translate('The media object does not exist.').'< for path >'.$serverFilename.'<');
+			$this->renderError();
+		}
 	    
-	    $mimetype = $this->media->mimeType();
-	    $imgsize = $this->media->getImageAttributes();
-	    $filetime = $this->media->getFiletime();
-	    $filetimeHeader = gmdate('D, d M Y H:i:s', $filetime) . ' GMT';	    
-	    $expireHeader = gmdate('D, d M Y H:i:s', WT_TIMESTAMP + $this->getExpireOffset()) . ' GMT';
+		$mimetype = $this->media->mimeType();
+		$imgsize = $this->media->getImageAttributes();
+		$filetime = $this->media->getFiletime();
+		$filetimeHeader = gmdate('D, d M Y H:i:s', $filetime) . ' GMT';	    
+		$expireHeader = gmdate('D, d M Y H:i:s', WT_TIMESTAMP + $this->getExpireOffset()) . ' GMT';
 	    
-	    $type = Functions::isImageTypeSupported($imgsize['ext']);
-	    $usewatermark = false;
-	    // if this image supports watermarks and the watermark module is intalled...
-	    if ($type) {
-	        $usewatermark = $this->isShowWatermark();
-	    }
+		$type = Functions::isImageTypeSupported($imgsize['ext']);
+		$usewatermark = false;
+		// if this image supports watermarks and the watermark module is intalled...
+		if ($type) {
+			$usewatermark = $this->isShowWatermark();
+		}
 	    
-	    // determine whether we have enough memory to watermark this image
-	    if ($usewatermark) {
-	        if (!FunctionsMedia::hasMemoryForImage($serverFilename)) {
-	            // not enough memory to watermark this file
-	            $usewatermark = false;
-	        }
-	    }
+		// determine whether we have enough memory to watermark this image
+		if ($usewatermark) {
+			if (!FunctionsMedia::hasMemoryForImage($serverFilename)) {
+				// not enough memory to watermark this file
+				$usewatermark = false;
+			}
+		}
 	    
-	    $etag = $this->media->getEtag();
+		$etag = $this->media->getEtag();
 	    
-	    // parse IF_MODIFIED_SINCE header from client
-	    $if_modified_since = 'x';
-	    if (!empty(Filter::server('HTTP_IF_MODIFIED_SINCE'))) {
-	        $if_modified_since = preg_replace('/;.*$/', '', Filter::server('HTTP_IF_MODIFIED_SINCE'));
-	    }
+		// parse IF_MODIFIED_SINCE header from client
+		$if_modified_since = 'x';
+		if (!empty(Filter::server('HTTP_IF_MODIFIED_SINCE'))) {
+			$if_modified_since = preg_replace('/;.*$/', '', Filter::server('HTTP_IF_MODIFIED_SINCE'));
+		}
 	    
-	    // parse IF_NONE_MATCH header from client
-	    $if_none_match = 'x';
-	    if (!empty(Filter::server('HTTP_IF_NONE_MATCH'))) {
-	        $if_none_match = str_replace('"', '', Filter::server('HTTP_IF_NONE_MATCH'));
-	    }
+		// parse IF_NONE_MATCH header from client
+		$if_none_match = 'x';
+		if (!empty(Filter::server('HTTP_IF_NONE_MATCH'))) {
+			$if_none_match = str_replace('"', '', Filter::server('HTTP_IF_NONE_MATCH'));
+		}
 	    
-	    // add caching headers.  allow browser to cache file, but not proxy
-	    header('Last-Modified: ' . $filetimeHeader);
-	    header('ETag: "' . $etag . '"');
-	    header('Expires: ' . $expireHeader);
-	    header('Cache-Control: max-age=' . $this->getExpireOffset() . ', s-maxage=0, proxy-revalidate');
+		// add caching headers.  allow browser to cache file, but not proxy
+		header('Last-Modified: ' . $filetimeHeader);
+		header('ETag: "' . $etag . '"');
+		header('Expires: ' . $expireHeader);
+		header('Cache-Control: max-age=' . $this->getExpireOffset() . ', s-maxage=0, proxy-revalidate');
 	    
-	    // if this file is already in the user’s cache, don’t resend it
-	    // first check if the if_modified_since param matches
-	    if ($if_modified_since === $filetimeHeader) {
-	        // then check if the etag matches
-	        if ($if_none_match === $etag) {
-	            http_response_code(304);
+		// if this file is already in the user’s cache, don’t resend it
+		// first check if the if_modified_since param matches
+		if ($if_modified_since === $filetimeHeader) {
+			// then check if the etag matches
+			if ($if_none_match === $etag) {
+				http_response_code(304);
 	    
-	            return;
-	        }
-	    }	    
+				return;
+			}
+		}	    
 
-	    // send headers for the image
-	    header('Content-Type: ' . $mimetype);
-	    header('Content-Disposition: filename="' . addslashes(basename($this->media->getFilename())) . '"');
+		// send headers for the image
+		header('Content-Type: ' . $mimetype);
+		header('Content-Disposition: filename="' . addslashes(basename($this->media->getFilename())) . '"');
 	     
-	    if ($usewatermark) {
-	        // generate the watermarked image
-	        $imCreateFunc = 'imagecreatefrom' . $type;
-	        $imSendFunc   = 'image' . $type;
+		if ($usewatermark) {
+			// generate the watermarked image
+			$imCreateFunc = 'imagecreatefrom' . $type;
+			$imSendFunc   = 'image' . $type;
 	    
-	        if (function_exists($imCreateFunc) && function_exists($imSendFunc)) {
-	            $im = $imCreateFunc($serverFilename);
-	            $im = $this->applyWatermark($im);
+			if (function_exists($imCreateFunc) && function_exists($imSendFunc)) {
+				$im = $imCreateFunc($serverFilename);
+				$im = $this->applyWatermark($im);
 	    	    
-	            // send the image
-	            $imSendFunc($im);
-	            imagedestroy($im);
+				// send the image
+				$imSendFunc($im);
+				imagedestroy($im);
 	    
-	            return;
-	        } else {
-	            // this image is defective.  log it
-	            Log::addMediaLog('Image Builder error: >' . I18N::translate('This media file is broken and cannot be watermarked.') . '< in file >' . $serverFilename . '< memory used: ' . memory_get_usage());
-	        }
-	    }
+				return;
+			} else {
+				// this image is defective.  log it
+				Log::addMediaLog('Image Builder error: >' . I18N::translate('This media file is broken and cannot be watermarked.') . '< in file >' . $serverFilename . '< memory used: ' . memory_get_usage());
+			}
+		}
 	    
-	    // determine filesize of image (could be original or watermarked version)
-	    $filesize = filesize($serverFilename);
+		// determine filesize of image (could be original or watermarked version)
+		$filesize = filesize($serverFilename);
 	    
-	    // set content-length header, send file
-	    header('Content-Length: ' . $filesize);
+		// set content-length header, send file
+		header('Content-Length: ' . $filesize);
 	    
-	    // Some servers disable fpassthru() and readfile()
-	    if (function_exists('readfile')) {
-	        readfile($serverFilename);
-	    } else {
-	        $fp = fopen($serverFilename, 'rb');
-	        if (function_exists('fpassthru')) {
-	            fpassthru($fp);
-	        } else {
-	            while (!feof($fp)) {
-	                echo fread($fp, 65536);
-	            }
-	        }
-	        fclose($fp);
-	    }	    
+		// Some servers disable fpassthru() and readfile()
+		if (function_exists('readfile')) {
+			readfile($serverFilename);
+		} else {
+			$fp = fopen($serverFilename, 'rb');
+			if (function_exists('fpassthru')) {
+				fpassthru($fp);
+			} else {
+				while (!feof($fp)) {
+					echo fread($fp, 65536);
+				}
+			}
+			fclose($fp);
+		}	    
 	}
 	
 	/**
 	 * Render an error as an image.
 	 */
 	protected function renderError() {	
-	    $error = I18N::translate('The media file was not found in this family tree.');
+		$error = I18N::translate('The media file was not found in this family tree.');
 
-    	$width  = (mb_strlen($error) * 6.5 + 50) * 1.15;
-    	$height = 60;
-    	$im     = imagecreatetruecolor($width, $height); /* Create a black image */
-    	$bgc    = imagecolorallocate($im, 255, 255, 255); /* set background color */
-    	imagefilledrectangle($im, 2, 2, $width - 4, $height - 4, $bgc); /* create a rectangle, leaving 2 px border */
+		$width  = (mb_strlen($error) * 6.5 + 50) * 1.15;
+		$height = 60;
+		$im     = imagecreatetruecolor($width, $height); /* Create a black image */
+		$bgc    = imagecolorallocate($im, 255, 255, 255); /* set background color */
+		imagefilledrectangle($im, 2, 2, $width - 4, $height - 4, $bgc); /* create a rectangle, leaving 2 px border */
     
-    	$this->embedText($im, $error, 100, '255, 0, 0', WT_ROOT . Config::FONT_DEJAVU_SANS_TTF, 'top', 'left');
+		$this->embedText($im, $error, 100, '255, 0, 0', WT_ROOT . Config::FONT_DEJAVU_SANS_TTF, 'top', 'left');
     
-    	http_response_code(404);
-    	header('Content-Type: image/png');
-    	imagepng($im);
-    	imagedestroy($im);
+		http_response_code(404);
+		header('Content-Type: image/png');
+		imagepng($im);
+		imagedestroy($im);
 	}
 	
 	/**
@@ -278,25 +278,25 @@ 
 	 */
 	protected function applyWatermark($im) {
 	    
-	    // text to watermark with	    
-	    if(method_exists($this->media, 'getWatermarkText')) {
-	       $word1_text = $this->media->getWatermarkText();
-	    }
-	    else {
-	        $word1_text = $this->media->getTitle();
-	    }
+		// text to watermark with	    
+		if(method_exists($this->media, 'getWatermarkText')) {
+		   $word1_text = $this->media->getWatermarkText();
+		}
+		else {
+			$word1_text = $this->media->getTitle();
+		}
 	
-	    $this->embedText(
-	        $im, 
-	        $word1_text, 
-	        $this->font_max_size,
-	        $this->font_color,
-	        WT_ROOT . Config::FONT_DEJAVU_SANS_TTF,
-	        'top', 
-	        'left'
-	     );
+		$this->embedText(
+			$im, 
+			$word1_text, 
+			$this->font_max_size,
+			$this->font_color,
+			WT_ROOT . Config::FONT_DEJAVU_SANS_TTF,
+			'top', 
+			'left'
+		 );
 	
-	    return ($im);
+		return ($im);
 	}
 	
 	/**
@@ -313,94 +313,94 @@ 
 	 */
 	protected function embedText($im, $text, $maxsize, $color, $font, $vpos, $hpos) {
 	    
-	    // there are two ways to embed text with PHP
-	    // (preferred) using GD and FreeType you can embed text using any True Type font
-	    // (fall back) if that is not available, you can insert basic monospaced text
+		// there are two ways to embed text with PHP
+		// (preferred) using GD and FreeType you can embed text using any True Type font
+		// (fall back) if that is not available, you can insert basic monospaced text
 	    
-	    $col = $this->hexrgb($color);
-	    $textcolor = imagecolorallocate($im, $col['red'], $col['green'], $col['blue']);
+		$col = $this->hexrgb($color);
+		$textcolor = imagecolorallocate($im, $col['red'], $col['green'], $col['blue']);
 	    
-	    // make adjustments to settings that imagestring and imagestringup can’t handle
-	    if (!$this->use_ttf) {
-	        // imagestringup only writes up, can’t use top2bottom
-	        if ($hpos === 'top2bottom') {
-	            $hpos = 'bottom2top';
-	        }
-	    }
+		// make adjustments to settings that imagestring and imagestringup can’t handle
+		if (!$this->use_ttf) {
+			// imagestringup only writes up, can’t use top2bottom
+			if ($hpos === 'top2bottom') {
+				$hpos = 'bottom2top';
+			}
+		}
 	    
-	    $text       = I18N::reverseText($text);
-	    $height     = imagesy($im);
-	    $width      = imagesx($im);
-	    $calc_angle = rad2deg(atan($height / $width));
-	    $hypoth     = $height / sin(deg2rad($calc_angle));
+		$text       = I18N::reverseText($text);
+		$height     = imagesy($im);
+		$width      = imagesx($im);
+		$calc_angle = rad2deg(atan($height / $width));
+		$hypoth     = $height / sin(deg2rad($calc_angle));
 	    
-	    // vertical and horizontal position of the text
-	    switch ($vpos) {
-	        default:
-	        case 'top':
-	            $taille   = $this->textLength($maxsize, $width, $text);
-	            $pos_y    = $height * 0.15 + $taille;
-	            $pos_x    = $width * 0.15;
-	            $rotation = 0;
-	            break;
-	        case 'middle':
-	            $taille   = $this->textLength($maxsize, $width, $text);
-	            $pos_y    = ($height + $taille) / 2;
-	            $pos_x    = $width * 0.15;
-	            $rotation = 0;
-	            break;
-	        case 'bottom':
-	            $taille   = $this->textLength($maxsize, $width, $text);
-	            $pos_y    = ($height * .85 - $taille);
-	            $pos_x    = $width * 0.15;
-	            $rotation = 0;
-	            break;
-	        case 'across':
-	            switch ($hpos) {
-	                default:
-	                case 'left':
-	                    $taille   = $this->textLength($maxsize, $hypoth, $text);
-	                    $pos_y    = ($height * .85 - $taille);
-	                    $pos_x    = $width * 0.15;
-	                    $rotation = $calc_angle;
-	                    break;
-	                case 'right':
-	                    $taille   = $this->textLength($maxsize, $hypoth, $text);
-	                    $pos_y    = ($height * .15 - $taille);
-	                    $pos_x    = $width * 0.85;
-	                    $rotation = $calc_angle + 180;
-	                    break;
-	                case 'top2bottom':
-	                    $taille   = $this->textLength($maxsize, $height, $text);
-	                    $pos_y    = ($height * .15 - $taille);
-	                    $pos_x    = ($width * .90 - $taille);
-	                    $rotation = -90;
-	                    break;
-	                case 'bottom2top':
-	                    $taille   = $this->textLength($maxsize, $height, $text);
-	                    $pos_y    = $height * 0.85;
-	                    $pos_x    = $width * 0.15;
-	                    $rotation = 90;
-	                    break;
-	            }
-	            break;
-	    }
+		// vertical and horizontal position of the text
+		switch ($vpos) {
+			default:
+			case 'top':
+				$taille   = $this->textLength($maxsize, $width, $text);
+				$pos_y    = $height * 0.15 + $taille;
+				$pos_x    = $width * 0.15;
+				$rotation = 0;
+				break;
+			case 'middle':
+				$taille   = $this->textLength($maxsize, $width, $text);
+				$pos_y    = ($height + $taille) / 2;
+				$pos_x    = $width * 0.15;
+				$rotation = 0;
+				break;
+			case 'bottom':
+				$taille   = $this->textLength($maxsize, $width, $text);
+				$pos_y    = ($height * .85 - $taille);
+				$pos_x    = $width * 0.15;
+				$rotation = 0;
+				break;
+			case 'across':
+				switch ($hpos) {
+					default:
+					case 'left':
+						$taille   = $this->textLength($maxsize, $hypoth, $text);
+						$pos_y    = ($height * .85 - $taille);
+						$pos_x    = $width * 0.15;
+						$rotation = $calc_angle;
+						break;
+					case 'right':
+						$taille   = $this->textLength($maxsize, $hypoth, $text);
+						$pos_y    = ($height * .15 - $taille);
+						$pos_x    = $width * 0.85;
+						$rotation = $calc_angle + 180;
+						break;
+					case 'top2bottom':
+						$taille   = $this->textLength($maxsize, $height, $text);
+						$pos_y    = ($height * .15 - $taille);
+						$pos_x    = ($width * .90 - $taille);
+						$rotation = -90;
+						break;
+					case 'bottom2top':
+						$taille   = $this->textLength($maxsize, $height, $text);
+						$pos_y    = $height * 0.85;
+						$pos_x    = $width * 0.15;
+						$rotation = 90;
+						break;
+				}
+				break;
+		}
 	    
-	    // apply the text
-	    if ($this->use_ttf) {
-	        // if imagettftext throws errors, catch them with a custom error handler
-	        set_error_handler(array($this, 'imageTtfTextErrorHandler'));
-	        imagettftext($im, $taille, $rotation, $pos_x, $pos_y, $textcolor, $font, $text);
-	        restore_error_handler();
-	    }
-	    // Don’t use an ‘else’ here since imagettftextErrorHandler may have changed the value of $useTTF from true to false
-	    if (!$this->use_ttf) {
-	        if ($rotation !== 90) {
-	            imagestring($im, 5, $pos_x, $pos_y, $text, $textcolor);
-	        } else {
-	            imagestringup($im, 5, $pos_x, $pos_y, $text, $textcolor);
-	        }
-	    }
+		// apply the text
+		if ($this->use_ttf) {
+			// if imagettftext throws errors, catch them with a custom error handler
+			set_error_handler(array($this, 'imageTtfTextErrorHandler'));
+			imagettftext($im, $taille, $rotation, $pos_x, $pos_y, $textcolor, $font, $text);
+			restore_error_handler();
+		}
+		// Don’t use an ‘else’ here since imagettftextErrorHandler may have changed the value of $useTTF from true to false
+		if (!$this->use_ttf) {
+			if ($rotation !== 90) {
+				imagestring($im, 5, $pos_x, $pos_y, $text, $textcolor);
+			} else {
+				imagestringup($im, 5, $pos_x, $pos_y, $text, $textcolor);
+			}
+		}
 	
 	}
 	
@@ -412,53 +412,53 @@ 
 	 */
 	protected function hexrgb ($hexstr)
 	{
-	    $int = hexdec($hexstr);
+		$int = hexdec($hexstr);
 	
-	    return array('red' => 0xFF & ($int >> 0x10),
-	        'green' => 0xFF & ($int >> 0x8),
-	        'blue' => 0xFF & $int);
+		return array('red' => 0xFF & ($int >> 0x10),
+			'green' => 0xFF & ($int >> 0x8),
+			'blue' => 0xFF & $int);
 	}
 	
-    /**
-     * Generate an approximate length of text, in pixels.
-     *
-     * @param int    $t
-     * @param int    $mxl
-     * @param string $text
-     *
-     * @return int
-     */
-    function textLength($t, $mxl, $text) {
-    	$taille_c = $t;
-    	$len      = mb_strlen($text);
-    	while (($taille_c - 2) * $len > $mxl) {
-    		$taille_c--;
-    		if ($taille_c == 2) {
-    			break;
-    		}
-    	}
+	/**
+	 * Generate an approximate length of text, in pixels.
+	 *
+	 * @param int    $t
+	 * @param int    $mxl
+	 * @param string $text
+	 *
+	 * @return int
+	 */
+	function textLength($t, $mxl, $text) {
+		$taille_c = $t;
+		$len      = mb_strlen($text);
+		while (($taille_c - 2) * $len > $mxl) {
+			$taille_c--;
+			if ($taille_c == 2) {
+				break;
+			}
+		}
     
-    	return $taille_c;
-    }
+		return $taille_c;
+	}
     
-    /**
-     * imagettftext is the function that is most likely to throw an error
-     * use this custom error handler to catch and log it
-     *
-     * @param int    $errno
-     * @param string $errstr
-     *
-     * @return bool
-     */
-    function imageTtfTextErrorHandler($errno, $errstr) {
-        // log the error
-        Log::addErrorLog('Image Builder error: >' . $errno . '/' . $errstr . '< while processing file >' . $this->media->getServerFilename() . '<');
+	/**
+	 * imagettftext is the function that is most likely to throw an error
+	 * use this custom error handler to catch and log it
+	 *
+	 * @param int    $errno
+	 * @param string $errstr
+	 *
+	 * @return bool
+	 */
+	function imageTtfTextErrorHandler($errno, $errstr) {
+		// log the error
+		Log::addErrorLog('Image Builder error: >' . $errno . '/' . $errstr . '< while processing file >' . $this->media->getServerFilename() . '<');
     
-        // change value of useTTF to false so the fallback watermarking can be used.
-        $this->use_ttf = false;
+		// change value of useTTF to false so the fallback watermarking can be used.
+		$this->use_ttf = false;
     
-        return true;
-    }
+		return true;
+	}
 		
 }
 

src/Webtrees/Hook/HookSubscriberInterface.php

Indentation +2 added lines, -2 removed lines

@@ -15,13 +15,13 @@
  */
 interface HookSubscriberInterface {
 	
-    /**
+	/**
 	 * Return the list of functions implementented in the class which needs to be registered as hooks.
 	 * The format is either { function1, function 2,...} in which case the priority is the default one
 	 * or { function1 => priority1, function2 => priority2, ...}
 	 * 
 	 * @return array Array of hooks
 	 */
-    public function getSubscribedHooks();
+	public function getSubscribedHooks();
     
 }
\ No newline at end of file

src/Webtrees/Hook/HookInterfaces/FactSourceTextExtenderInterface.php

Doc Comments +2 added lines

@@ -19,6 +19,7 @@ 
 	 * Insert some content before the fact source text.
 	 * 
 	 * @param string $srec Source fact record
+	 * @return string
 	 */
 	public function hFactSourcePrepend($srec);
 	
@@ -26,6 +27,7 @@ 
 	 * Insert some content after the fact source text.
 	 * 
 	 * @param string $srec Source fact record
+	 * @return void
 	 */
 	public function hFactSourceAppend($srec);
 	

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
  /**
- * webtrees-lib: MyArtJaub library for webtrees
- *
- * @package MyArtJaub\Webtrees
- * @subpackage Hook
- * @author Jonathan Jaubart <dev@jaubart.com>
- * @copyright Copyright (c) 2011-2016, Jonathan Jaubart
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public License, version 3
- */
+  * webtrees-lib: MyArtJaub library for webtrees
+  *
+  * @package MyArtJaub\Webtrees
+  * @subpackage Hook
+  * @author Jonathan Jaubart <dev@jaubart.com>
+  * @copyright Copyright (c) 2011-2016, Jonathan Jaubart
+  * @license http://www.gnu.org/licenses/gpl.html GNU General Public License, version 3
+  */
 namespace MyArtJaub\Webtrees\Hook\HookInterfaces;
 
 /**

src/Webtrees/Cache.php

Braces +6 added lines, -2 removed lines

@@ -80,7 +80,9 @@ 
 	 *
 	 */
 	protected function checkInit(){
-		if(!$this->is_init) $this->init();
+		if(!$this->is_init) {
+			$this->init();
+		}
 	}
 	
 	/**
@@ -93,7 +95,9 @@ 
 	protected function getKeyName($value, AbstractModule $mod = null){
 	    $this->checkInit();
 		$mod_name = 'myartjaub';
-		if($mod !== null) $mod_name = $mod->getName();
+		if($mod !== null) {
+			$mod_name = $mod->getName();
+		}
 		return $mod_name.'_'.$value;
 	}
 

Doc Comments +1 added lines, -1 removed lines

@@ -146,7 +146,7 @@
 	/**
 	 * Static invocation of the *save* method.
 	 *
-	 * @param string|\Psr\Cache\CacheItemInterface $value Value name
+	 * @param CacheItemInterface $value Value name
 	 * @param mixed $data Value
 	 * @param AbstractModule $mod Calling module
 	 */

Indentation +22 added lines, -22 removed lines

@@ -22,10 +22,10 @@ 
  */
 class Cache{
 	
-    /**
-     * Underlying Cache object
-     * @var CacheItemPoolInterface $cache
-     */
+	/**
+	 * Underlying Cache object
+	 * @var CacheItemPoolInterface $cache
+	 */
 	protected $cache=null;
 	
 	/**
@@ -47,11 +47,11 @@ 
 	 */
 	protected static function getInstance()
 	{
-	    if (null === static::$instance) {
-	        static::$instance = new static();
-	    }
+		if (null === static::$instance) {
+			static::$instance = new static();
+		}
 	
-	    return static::$instance;
+		return static::$instance;
 	}
 	
 	/**
@@ -59,8 +59,8 @@ 
 	 *
 	 */
 	protected function init() {		
-	    if(Apc::isAvailable()) {
-		    $driver = new Apc();
+		if(Apc::isAvailable()) {
+			$driver = new Apc();
 		} else {
 			if (!is_dir(WT_DATA_DIR.DIRECTORY_SEPARATOR.'cache')) {
 				// We may not have permission - especially during setup, before we instruct
@@ -68,7 +68,7 @@ 
 				@mkdir(WT_DATA_DIR.DIRECTORY_SEPARATOR.'cache');
 			}
 			if (is_dir(WT_DATA_DIR.DIRECTORY_SEPARATOR.'cache')) {
-			    $driver = new FileSystem(array('path' => WT_DATA_DIR.DIRECTORY_SEPARATOR.'cache'));
+				$driver = new FileSystem(array('path' => WT_DATA_DIR.DIRECTORY_SEPARATOR.'cache'));
 			} else {
 				// No cache available, let's just use a basic one :-(
 				$driver = new Ephemeral();
@@ -95,7 +95,7 @@ 
 	 * @return string Cached key name
 	 */
 	protected function getKeyName($value, AbstractModule $mod = null){
-	    $this->checkInit();
+		$this->checkInit();
 		$mod_name = 'myartjaub';
 		if($mod !== null) $mod_name = $mod->getName();
 		return $mod_name.'_'.$value;
@@ -109,7 +109,7 @@ 
 	 * @return \Psr\Cache\CacheItemInterface
 	 */
 	public function getI($value, AbstractModule $mod = null){
-	    $this->checkInit();
+		$this->checkInit();
 		return $this->cache->getItem($this->getKeyName($value, $mod));
 	}
 	
@@ -121,7 +121,7 @@ 
 	 * @return \Psr\Cache\CacheItemInterface
 	 */
 	public static function get($value, AbstractModule $mod = null){
-	    return self::getInstance()->getI($value, $mod);
+		return self::getInstance()->getI($value, $mod);
 	}
 	
 	/**
@@ -136,8 +136,8 @@ 
 		
 		$item = $value;
 		if(!($value instanceof CacheItemInterface)) {
-		    $item = new \Stash\Item();
-    		$item->setKey($this->getKeyName($value, $mod));
+			$item = new \Stash\Item();
+			$item->setKey($this->getKeyName($value, $mod));
 		}		
 		$item->set($data);
 		$this->cache->save($item);
@@ -151,7 +151,7 @@ 
 	 * @param AbstractModule $mod Calling module
 	 */
 	public static function save($value, $data, AbstractModule $mod = null){
-	    self::getInstance()->saveI($value, $data, $mod);
+		self::getInstance()->saveI($value, $data, $mod);
 	}
 	
 	/**
@@ -162,8 +162,8 @@ 
 	 * @return bool Deletion successful?
 	 */
 	public function deleteI($value, AbstractModule $mod = null){
-	    $this->checkInit();	
-	    return $this->cache->deleteItem($this->getKeyName($value, $mod));
+		$this->checkInit();	
+		return $this->cache->deleteItem($this->getKeyName($value, $mod));
 	}
 	
 	/**
@@ -174,7 +174,7 @@ 
 	 * @return bool Deletion successful?
 	 */
 	public static function delete($value, AbstractModule $mod = null){
-	    return self::getInstance()->deleteI($value, $mod);
+		return self::getInstance()->deleteI($value, $mod);
 	}
 	
 	/**
@@ -182,7 +182,7 @@ 
 	 *
 	 */
 	public function cleanI(){
-	    $this->checkInit();
+		$this->checkInit();
 		$this->cache->clear();
 	}
 	
@@ -190,7 +190,7 @@ 
 	 * Static invocation of the *clean* method.
 	 */
 	public static function clean() {
-	    self::getInstance()->cleanI();
+		self::getInstance()->cleanI();
 	}
 	
 }
\ No newline at end of file

Spacing +15 added lines, -15 removed lines

@@ -20,13 +20,13 @@ 
 /**
  * Cache component to speed up some potential data retrievals
  */
-class Cache{
+class Cache {
 	
     /**
      * Underlying Cache object
      * @var CacheItemPoolInterface $cache
      */
-	protected $cache=null;
+	protected $cache = null;
 	
 	/**
 	 * Defines whether the cache has been initialised
@@ -59,7 +59,7 @@ 
 	 *
 	 */
 	protected function init() {		
-	    if(Apc::isAvailable()) {
+	    if (Apc::isAvailable()) {
 		    $driver = new Apc();
 		} else {
 			if (!is_dir(WT_DATA_DIR.DIRECTORY_SEPARATOR.'cache')) {
@@ -83,8 +83,8 @@ 
 	 * Initiliase the Cache if not done.
 	 *
 	 */
-	protected function checkInit(){
-		if(!$this->is_init) $this->init();
+	protected function checkInit() {
+		if (!$this->is_init) $this->init();
 	}
 	
 	/**
@@ -94,10 +94,10 @@ 
 	 * @param AbstractModule $mod Calling module
 	 * @return string Cached key name
 	 */
-	protected function getKeyName($value, AbstractModule $mod = null){
+	protected function getKeyName($value, AbstractModule $mod = null) {
 	    $this->checkInit();
 		$mod_name = 'myartjaub';
-		if($mod !== null) $mod_name = $mod->getName();
+		if ($mod !== null) $mod_name = $mod->getName();
 		return $mod_name.'_'.$value;
 	}
 	
@@ -108,7 +108,7 @@ 
 	 * @param AbstractModule $mod Calling module
 	 * @return \Psr\Cache\CacheItemInterface
 	 */
-	public function getI($value, AbstractModule $mod = null){
+	public function getI($value, AbstractModule $mod = null) {
 	    $this->checkInit();
 		return $this->cache->getItem($this->getKeyName($value, $mod));
 	}
@@ -120,7 +120,7 @@ 
 	 * @param AbstractModule $mod Calling module
 	 * @return \Psr\Cache\CacheItemInterface
 	 */
-	public static function get($value, AbstractModule $mod = null){
+	public static function get($value, AbstractModule $mod = null) {
 	    return self::getInstance()->getI($value, $mod);
 	}
 	
@@ -131,11 +131,11 @@ 
 	 * @param mixed $data Value
 	 * @param AbstractModule $mod Calling module
 	 */
-	public function saveI($value, $data, AbstractModule $mod = null){
+	public function saveI($value, $data, AbstractModule $mod = null) {
 		$this->checkInit();
 		
 		$item = $value;
-		if(!($value instanceof CacheItemInterface)) {
+		if (!($value instanceof CacheItemInterface)) {
 		    $item = new \Stash\Item();
     		$item->setKey($this->getKeyName($value, $mod));
 		}		
@@ -150,7 +150,7 @@ 
 	 * @param mixed $data Value
 	 * @param AbstractModule $mod Calling module
 	 */
-	public static function save($value, $data, AbstractModule $mod = null){
+	public static function save($value, $data, AbstractModule $mod = null) {
 	    self::getInstance()->saveI($value, $data, $mod);
 	}
 	
@@ -161,7 +161,7 @@ 
 	 * @param AbstractModule $mod Calling module
 	 * @return bool Deletion successful?
 	 */
-	public function deleteI($value, AbstractModule $mod = null){
+	public function deleteI($value, AbstractModule $mod = null) {
 	    $this->checkInit();	
 	    return $this->cache->deleteItem($this->getKeyName($value, $mod));
 	}
@@ -173,7 +173,7 @@ 
 	 * @param AbstractModule $mod Calling module
 	 * @return bool Deletion successful?
 	 */
-	public static function delete($value, AbstractModule $mod = null){
+	public static function delete($value, AbstractModule $mod = null) {
 	    return self::getInstance()->deleteI($value, $mod);
 	}
 	
@@ -181,7 +181,7 @@ 
 	 * Clean the cache
 	 *
 	 */
-	public function cleanI(){
+	public function cleanI() {
 	    $this->checkInit();
 		$this->cache->clear();
 	}

src/Webtrees/Module/PatronymicLineage/Model/LineageBuilder.php

Spacing +55 added lines, -55 removed lines

@@ -54,30 +54,30 @@ 
 	public function buildLineages() {				
 		$indis = \Fisharebest\Webtrees\Query\QueryName::individuals($this->tree, $this->surname, null, null, false, false);
 		
-		if(count($indis) == 0) return null;
+		if (count($indis) == 0) return null;
 		
 		$root_lineages = array();
 		
-		foreach($indis as $indi) {
+		foreach ($indis as $indi) {
 			$pid = $indi->getXref();
-			if(!isset($this->used_indis[$pid])){
+			if (!isset($this->used_indis[$pid])) {
 				//Find the root of the lineage
 				/** @var Fisharebest\Webtrees\Individual $indiFirst  */
-				$indiFirst= $this->getLineageRootIndividual($indi);
-				if($indiFirst){
+				$indiFirst = $this->getLineageRootIndividual($indi);
+				if ($indiFirst) {
 					$this->used_indis[$indiFirst->getXref()] = true;
-					if($indiFirst->canShow()){
+					if ($indiFirst->canShow()) {
 						//Check if the root individual has brothers and sisters, without parents
 						$indiChildFamily = $indiFirst->getPrimaryChildFamily();
-						if($indiChildFamily !== null){
+						if ($indiChildFamily !== null) {
 							$root_node = new LineageRootNode(null); 
 							$root_node->addFamily($indiChildFamily);
 						}
-						else{
+						else {
 							$root_node = new LineageRootNode($indiFirst);
 						}
 						$root_node = $this->buildLineage($root_node);		
-						if($root_node) $root_lineages[] = $root_node;
+						if ($root_node) $root_lineages[] = $root_node;
 					}
 				}
 			}
@@ -94,45 +94,45 @@ 
 	 * @return (Individual|null) Root individual
 	 */
 	protected function getLineageRootIndividual(Individual $indi) {
-		$is_first=false;
+		$is_first = false;
 		$dindi = new \MyArtJaub\Webtrees\Individual($indi);
-		$indi_surname=$dindi->getUnprotectedPrimarySurname();
+		$indi_surname = $dindi->getUnprotectedPrimarySurname();
 		$resIndi = $indi;
-		while(!$is_first){
+		while (!$is_first) {
 			//Get the individual parents family
-			$fam=$resIndi->getPrimaryChildFamily();
-			if($fam){
-				$husb=$fam->getHusband();
-				$wife=$fam->getWife();
+			$fam = $resIndi->getPrimaryChildFamily();
+			if ($fam) {
+				$husb = $fam->getHusband();
+				$wife = $fam->getWife();
 				//If the father exists, take him
-				if($husb){
+				if ($husb) {
 					$dhusb = new \MyArtJaub\Webtrees\Individual($husb);
-					$dhusb->isNewAddition() ? $is_first = true : $resIndi=$husb;
+					$dhusb->isNewAddition() ? $is_first = true : $resIndi = $husb;
 				}
 				//If only a mother exists
-				else if($wife){
+				else if ($wife) {
 					$dwife = new \MyArtJaub\Webtrees\Individual($wife);
-					$wife_surname=$dwife->getUnprotectedPrimarySurname();
+					$wife_surname = $dwife->getUnprotectedPrimarySurname();
 					//Check if the child is a natural child of the mother (based on the surname - Warning : surname must be identical)
-					if(!$dwife->isNewAddition() && I18N::strcasecmp($wife_surname, $indi_surname) == 0){
-						$resIndi=$wife;
+					if (!$dwife->isNewAddition() && I18N::strcasecmp($wife_surname, $indi_surname) == 0) {
+						$resIndi = $wife;
 					}
-					else{
-						$is_first=true;
+					else {
+						$is_first = true;
 					}
 				}
-				else{
-					$is_first=true;
+				else {
+					$is_first = true;
 				}
 			}
-			else{
-				$is_first=true;
+			else {
+				$is_first = true;
 			}
 		}
-		if(isset($this->used_indis[$resIndi->getXref()])){
+		if (isset($this->used_indis[$resIndi->getXref()])) {
 			return null;
 		}
-		else{
+		else {
 			return $resIndi;
 		}
 	}
@@ -145,15 +145,15 @@ 
 	 * @return LineageNode Computed lineage
 	 */
 	protected function buildLineage(LineageNode $node) {
-		if($node === null) return;
+		if ($node === null) return;
 		
 		$indi_surname = null;
 		
 		$indi_node = $node->getIndividual();			
-		if($indi_node) {
-			if(count($node->getFamiliesNodes()) == 0) {
+		if ($indi_node) {
+			if (count($node->getFamiliesNodes()) == 0) {
 				$indiSpouseFamilies = $indi_node->getSpouseFamilies();
-				foreach($indiSpouseFamilies as $indiSpouseFamily) {
+				foreach ($indiSpouseFamilies as $indiSpouseFamily) {
 					$node->addFamily($indiSpouseFamily);
 				}
 			}
@@ -162,62 +162,62 @@ 
 			$indi_surname = $dindi_node->getUnprotectedPrimarySurname();
 			
 			//Get the estimated birth place and put it in the place table
-			$place=$dindi_node->getEstimatedBirthPlace(false);
-			if($place && strlen($place) > 0){
-				$place=trim($place);
+			$place = $dindi_node->getEstimatedBirthPlace(false);
+			if ($place && strlen($place) > 0) {
+				$place = trim($place);
 				$node->getRootNode()->addPlace(new Place($place, $this->tree));
 			}
 				
 			//Tag the individual as used
-			$this->used_indis[$indi_node->getXref()]=true;
+			$this->used_indis[$indi_node->getXref()] = true;
 		}
 		
-		foreach($node->getFamiliesNodes() as $family) {
+		foreach ($node->getFamiliesNodes() as $family) {
 			$spouse_surname = null;
-			if($indi_node && $spouse = $family->getSpouse($indi_node)) {
+			if ($indi_node && $spouse = $family->getSpouse($indi_node)) {
 				$dspouse = new \MyArtJaub\Webtrees\Individual($spouse);
-				$spouse_surname=$dspouse->getUnprotectedPrimarySurname();
+				$spouse_surname = $dspouse->getUnprotectedPrimarySurname();
 			}
 			
 			$children = $family->getChildren();
 
-			$nbChildren=0;
-			$nbNatural=0;
+			$nbChildren = 0;
+			$nbNatural = 0;
 			
-			foreach($children as $child){
+			foreach ($children as $child) {
 				$dchild = new \MyArtJaub\Webtrees\Individual($child);
-				$child_surname=$dchild->getUnprotectedPrimarySurname();
+				$child_surname = $dchild->getUnprotectedPrimarySurname();
 				
-				if(!$dchild->isNewAddition()) {
+				if (!$dchild->isNewAddition()) {
 					$nbChildren++;
 					//If the root individual is the mother
-					if($indi_node && I18N::strcasecmp($indi_node->getSex(), 'F') == 0) {
+					if ($indi_node && I18N::strcasecmp($indi_node->getSex(), 'F') == 0) {
 						//Print only lineages of children with the same surname as their mother (supposing they are natural children)
-						if(!$spouse || ($spouse_surname && I18N::strcasecmp($child_surname, $spouse_surname) != 0)){
-							if(I18N::strcasecmp($child_surname, $indi_surname) == 0){
+						if (!$spouse || ($spouse_surname && I18N::strcasecmp($child_surname, $spouse_surname) != 0)) {
+							if (I18N::strcasecmp($child_surname, $indi_surname) == 0) {
 								$nbNatural++;
 								$node_child = new LineageNode($child, $node->getRootNode());							
 								$node_child = $this->buildLineage($node_child);
-								if($node_child) $node->addChild($family, $node_child);
+								if ($node_child) $node->addChild($family, $node_child);
 							}
 						}
 					}
 					//If the root individual is the father
 					else {
 						//Print if the children does not bear the same name as his mother (and different from his father)
-						if( strlen($child_surname) == 0 || strlen($indi_surname) == 0 || strlen($spouse_surname) == 0 ||
+						if (strlen($child_surname) == 0 || strlen($indi_surname) == 0 || strlen($spouse_surname) == 0 ||
 							I18N::strcasecmp($child_surname, $indi_surname) == 0 ||
-							I18N::strcasecmp($child_surname, $spouse_surname) != 0 )
+							I18N::strcasecmp($child_surname, $spouse_surname) != 0)
 						{
 							$nbNatural++;
 							$node_child = new LineageNode($child, $node->getRootNode());							
 							$node_child = $this->buildLineage($node_child);
-							if($node_child) $node->addChild($family, $node_child);
+							if ($node_child) $node->addChild($family, $node_child);
 						}
 						else {
 							$nbNatural++;
 							$node_child = new LineageNode($child, $node->getRootNode(), $child_surname);
-							if($node_child) $node->addChild($family, $node_child);
+							if ($node_child) $node->addChild($family, $node_child);
 						}
 					}
 				}
@@ -225,7 +225,7 @@ 
 
 
 			//Do not print other children
-			if(($nbChildren-$nbNatural)>0){
+			if (($nbChildren - $nbNatural) > 0) {
 				$node->addChild($family, null);
 			}
 		}

Braces +24 added lines, -18 removed lines

@@ -54,7 +54,9 @@ 
 	public function buildLineages() {				
 		$indis = \Fisharebest\Webtrees\Query\QueryName::individuals($this->tree, $this->surname, null, null, false, false);
 		
-		if(count($indis) == 0) return null;
+		if(count($indis) == 0) {
+			return null;
+		}
 		
 		$root_lineages = array();
 		
@@ -72,12 +74,13 @@ 
 						if($indiChildFamily !== null){
 							$root_node = new LineageRootNode(null); 
 							$root_node->addFamily($indiChildFamily);
-						}
-						else{
+						} else{
 							$root_node = new LineageRootNode($indiFirst);
 						}
 						$root_node = $this->buildLineage($root_node);		
-						if($root_node) $root_lineages[] = $root_node;
+						if($root_node) {
+							$root_lineages[] = $root_node;
+						}
 					}
 				}
 			}
@@ -116,23 +119,19 @@ 
 					//Check if the child is a natural child of the mother (based on the surname - Warning : surname must be identical)
 					if(!$dwife->isNewAddition() && I18N::strcasecmp($wife_surname, $indi_surname) == 0){
 						$resIndi=$wife;
-					}
-					else{
+					} else{
 						$is_first=true;
 					}
-				}
-				else{
+				} else{
 					$is_first=true;
 				}
-			}
-			else{
+			} else{
 				$is_first=true;
 			}
 		}
 		if(isset($this->used_indis[$resIndi->getXref()])){
 			return null;
-		}
-		else{
+		} else{
 			return $resIndi;
 		}
 	}
@@ -145,7 +144,9 @@ 
 	 * @return LineageNode Computed lineage
 	 */
 	protected function buildLineage(LineageNode $node) {
-		if($node === null) return;
+		if($node === null) {
+			return;
+		}
 		
 		$indi_surname = null;
 		
@@ -198,7 +199,9 @@ 
 								$nbNatural++;
 								$node_child = new LineageNode($child, $node->getRootNode());							
 								$node_child = $this->buildLineage($node_child);
-								if($node_child) $node->addChild($family, $node_child);
+								if($node_child) {
+									$node->addChild($family, $node_child);
+								}
 							}
 						}
 					}
@@ -212,12 +215,15 @@ 
 							$nbNatural++;
 							$node_child = new LineageNode($child, $node->getRootNode());							
 							$node_child = $this->buildLineage($node_child);
-							if($node_child) $node->addChild($family, $node_child);
-						}
-						else {
+							if($node_child) {
+								$node->addChild($family, $node_child);
+							}
+						} else {
 							$nbNatural++;
 							$node_child = new LineageNode($child, $node->getRootNode(), $child_surname);
-							if($node_child) $node->addChild($family, $node_child);
+							if($node_child) {
+								$node->addChild($family, $node_child);
+							}
 						}
 					}
 				}

src/Webtrees/Module/Certificates/Model/CertificateFileProvider.php

Indentation +92 added lines, -92 removed lines

@@ -20,111 +20,111 @@
  */
 class CertificateFileProvider implements CertificateProviderInterface {
     
-    /**
-     * Relative path to the root certificate folder
-     * @var string $root_path
-     */
-    protected $root_path;
+	/**
+	 * Relative path to the root certificate folder
+	 * @var string $root_path
+	 */
+	protected $root_path;
     
-    /**
-     * Reference tree
-     * @var Tree $tree
-     */
-    protected $tree;
+	/**
+	 * Reference tree
+	 * @var Tree $tree
+	 */
+	protected $tree;
     
-    /**
-     * Cached list of certificates' cities.
-     * @var (null|array) $cities_list
-     */
-    protected $cities_list = null;
+	/**
+	 * Cached list of certificates' cities.
+	 * @var (null|array) $cities_list
+	 */
+	protected $cities_list = null;
     
-    /**
-     * Constructor for the File Provider
-     * @param string $root_path
-     * @param Tree $tree
-     */
-    public function __construct($root_path, Tree $tree) {
-        $this->root_path = $root_path;
-        $this->tree = $tree;
-    }
+	/**
+	 * Constructor for the File Provider
+	 * @param string $root_path
+	 * @param Tree $tree
+	 */
+	public function __construct($root_path, Tree $tree) {
+		$this->root_path = $root_path;
+		$this->tree = $tree;
+	}
         
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface::getRealCertificatesDirectory()
-     */
-    public function getRealCertificatesDirectory(){
-        return WT_DATA_DIR . $this->root_path;
-    }
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface::getRealCertificatesDirectory()
+	 */
+	public function getRealCertificatesDirectory(){
+		return WT_DATA_DIR . $this->root_path;
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface::getCitiesList()
-     */
-    public function getCitiesList(){
-        if(!isset($this->cities_list) || is_null($this->cities_list)){
-            $certdir = $this->getRealCertificatesDirectory();
-            $this->cities_list = array();
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface::getCitiesList()
+	 */
+	public function getCitiesList(){
+		if(!isset($this->cities_list) || is_null($this->cities_list)){
+			$certdir = $this->getRealCertificatesDirectory();
+			$this->cities_list = array();
     
-            $dir = opendir($certdir);
+			$dir = opendir($certdir);
             
-            while($entry = readdir($dir)){
-                if($entry != '.' && $entry != '..' && is_dir($certdir.$entry)){
-                    $this->cities_list[]= Functions::encodeFileSystemToUtf8($entry);
-                }
-            }
-            sort($this->cities_list);
-        }
-        return $this->cities_list;
-    }
+			while($entry = readdir($dir)){
+				if($entry != '.' && $entry != '..' && is_dir($certdir.$entry)){
+					$this->cities_list[]= Functions::encodeFileSystemToUtf8($entry);
+				}
+			}
+			sort($this->cities_list);
+		}
+		return $this->cities_list;
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface::getCertificatesList()
-     */
-    public function getCertificatesList($selCity){
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface::getCertificatesList()
+	 */
+	public function getCertificatesList($selCity){
     
-        $selCity = Functions::encodeUtf8ToFileSystem($selCity);
+		$selCity = Functions::encodeUtf8ToFileSystem($selCity);
     
-        $certdir = $this->getRealCertificatesDirectory();
-        $tabCertif= array();
+		$certdir = $this->getRealCertificatesDirectory();
+		$tabCertif= array();
     
-        if(is_dir($certdir.$selCity)){
-            $dir=opendir($certdir.$selCity);
-            while($entry = readdir($dir)){
-                if($entry!='.' && $entry!='..' && !is_dir($certdir.$entry.'/')){
-                    $path = Functions::encodeFileSystemToUtf8($selCity.'/'.$entry);
-                    $certificate = new Certificate($path, $this->tree, $this);
-                    if(Functions::isImageTypeSupported($certificate->extension())){
-                        $tabCertif[] = 	$certificate;
-                    }
-                }
-            }
-        }
-        return $tabCertif;
-    }
+		if(is_dir($certdir.$selCity)){
+			$dir=opendir($certdir.$selCity);
+			while($entry = readdir($dir)){
+				if($entry!='.' && $entry!='..' && !is_dir($certdir.$entry.'/')){
+					$path = Functions::encodeFileSystemToUtf8($selCity.'/'.$entry);
+					$certificate = new Certificate($path, $this->tree, $this);
+					if(Functions::isImageTypeSupported($certificate->extension())){
+						$tabCertif[] = 	$certificate;
+					}
+				}
+			}
+		}
+		return $tabCertif;
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface::getCertificatesListBeginWith()
-     */
-    public function getCertificatesListBeginWith($city, $contains, $limit= 9999){
-        $tabFiles= array();
-        $dirPath= $this->getRealCertificatesDirectory() . Functions::encodeUtf8ToFileSystem($city).'/';
-        $contains = utf8_decode($contains);
-        $nbCert = 0;
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface::getCertificatesListBeginWith()
+	 */
+	public function getCertificatesListBeginWith($city, $contains, $limit= 9999){
+		$tabFiles= array();
+		$dirPath= $this->getRealCertificatesDirectory() . Functions::encodeUtf8ToFileSystem($city).'/';
+		$contains = utf8_decode($contains);
+		$nbCert = 0;
     
-        if(is_dir($dirPath)){
-            $dir=opendir($dirPath);
-            while(($entry = readdir($dir)) && $nbCert < $limit){
-                if($entry!='.' && $entry!='..' && $entry!='Thumbs.db' &&!is_dir($dirPath.$entry.'/') && stripos($entry, $contains)!== false){
-                    $tabFiles[]= Functions::encodeFileSystemToUtf8($entry);
-                    $nbCert++;
-                }
-            }
-        }
-        sort($tabFiles);
-        return $tabFiles;
-    }
+		if(is_dir($dirPath)){
+			$dir=opendir($dirPath);
+			while(($entry = readdir($dir)) && $nbCert < $limit){
+				if($entry!='.' && $entry!='..' && $entry!='Thumbs.db' &&!is_dir($dirPath.$entry.'/') && stripos($entry, $contains)!== false){
+					$tabFiles[]= Functions::encodeFileSystemToUtf8($entry);
+					$nbCert++;
+				}
+			}
+		}
+		sort($tabFiles);
+		return $tabFiles;
+	}
     
 }
 

Spacing +23 added lines, -23 removed lines

@@ -52,24 +52,24 @@ 
      * {@inhericDoc}
      * @see \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface::getRealCertificatesDirectory()
      */
-    public function getRealCertificatesDirectory(){
-        return WT_DATA_DIR . $this->root_path;
+    public function getRealCertificatesDirectory() {
+        return WT_DATA_DIR.$this->root_path;
     }
     
     /**
      * {@inhericDoc}
      * @see \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface::getCitiesList()
      */
-    public function getCitiesList(){
-        if(!isset($this->cities_list) || is_null($this->cities_list)){
+    public function getCitiesList() {
+        if (!isset($this->cities_list) || is_null($this->cities_list)) {
             $certdir = $this->getRealCertificatesDirectory();
             $this->cities_list = array();
     
             $dir = opendir($certdir);
             
-            while($entry = readdir($dir)){
-                if($entry != '.' && $entry != '..' && is_dir($certdir.$entry)){
-                    $this->cities_list[]= Functions::encodeFileSystemToUtf8($entry);
+            while ($entry = readdir($dir)) {
+                if ($entry != '.' && $entry != '..' && is_dir($certdir.$entry)) {
+                    $this->cities_list[] = Functions::encodeFileSystemToUtf8($entry);
                 }
             }
             sort($this->cities_list);
@@ -81,21 +81,21 @@ 
      * {@inhericDoc}
      * @see \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface::getCertificatesList()
      */
-    public function getCertificatesList($selCity){
+    public function getCertificatesList($selCity) {
     
         $selCity = Functions::encodeUtf8ToFileSystem($selCity);
     
         $certdir = $this->getRealCertificatesDirectory();
-        $tabCertif= array();
+        $tabCertif = array();
     
-        if(is_dir($certdir.$selCity)){
-            $dir=opendir($certdir.$selCity);
-            while($entry = readdir($dir)){
-                if($entry!='.' && $entry!='..' && !is_dir($certdir.$entry.'/')){
+        if (is_dir($certdir.$selCity)) {
+            $dir = opendir($certdir.$selCity);
+            while ($entry = readdir($dir)) {
+                if ($entry != '.' && $entry != '..' && !is_dir($certdir.$entry.'/')) {
                     $path = Functions::encodeFileSystemToUtf8($selCity.'/'.$entry);
                     $certificate = new Certificate($path, $this->tree, $this);
-                    if(Functions::isImageTypeSupported($certificate->extension())){
-                        $tabCertif[] = 	$certificate;
+                    if (Functions::isImageTypeSupported($certificate->extension())) {
+                        $tabCertif[] = $certificate;
                     }
                 }
             }
@@ -107,17 +107,17 @@ 
      * {@inhericDoc}
      * @see \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface::getCertificatesListBeginWith()
      */
-    public function getCertificatesListBeginWith($city, $contains, $limit= 9999){
-        $tabFiles= array();
-        $dirPath= $this->getRealCertificatesDirectory() . Functions::encodeUtf8ToFileSystem($city).'/';
+    public function getCertificatesListBeginWith($city, $contains, $limit = 9999) {
+        $tabFiles = array();
+        $dirPath = $this->getRealCertificatesDirectory().Functions::encodeUtf8ToFileSystem($city).'/';
         $contains = utf8_decode($contains);
         $nbCert = 0;
     
-        if(is_dir($dirPath)){
-            $dir=opendir($dirPath);
-            while(($entry = readdir($dir)) && $nbCert < $limit){
-                if($entry!='.' && $entry!='..' && $entry!='Thumbs.db' &&!is_dir($dirPath.$entry.'/') && stripos($entry, $contains)!== false){
-                    $tabFiles[]= Functions::encodeFileSystemToUtf8($entry);
+        if (is_dir($dirPath)) {
+            $dir = opendir($dirPath);
+            while (($entry = readdir($dir)) && $nbCert < $limit) {
+                if ($entry != '.' && $entry != '..' && $entry != 'Thumbs.db' && !is_dir($dirPath.$entry.'/') && stripos($entry, $contains) !== false) {
+                    $tabFiles[] = Functions::encodeFileSystemToUtf8($entry);
                     $nbCert++;
                 }
             }