jon48 / webtrees-lib

src/Webtrees/ImageBuilder.php

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/Mvc/Dispatcher.php

Indentation +53 added lines, -53 removed lines

@@ -18,35 +18,35 @@ 
  */
 class Dispatcher implements DispatcherInterface {
     
-    /**
-     * @var Dispatcher $instance Singleton pattern instance
-     */
-    private static $instance = null;
+	/**
+	 * @var Dispatcher $instance Singleton pattern instance
+	 */
+	private static $instance = null;
     
-    /**
-     * Returns the *Dispatcher* instance of this class.
-     *
-     * @return Dispatcher The *Singleton* instance.
-     */
-    public static function getInstance()
-    {
-        if (null === static::$instance) {
-            static::$instance = new static();
-        }
+	/**
+	 * Returns the *Dispatcher* instance of this class.
+	 *
+	 * @return Dispatcher 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() {}
     
-    /**
-     * {@inheritdoc }
-     * @see \MyArtJaub\Webtrees\Mvc\DispatcherInterface::handle()
-     */
-    public function handle(fw\Module\AbstractModule $module, $request) {
+	/**
+	 * {@inheritdoc }
+	 * @see \MyArtJaub\Webtrees\Mvc\DispatcherInterface::handle()
+	 */
+	public function handle(fw\Module\AbstractModule $module, $request) {
 		
 		$fq_modclass_name = get_class($module);
 		$ctrl_namespace = substr($fq_modclass_name, 0, - strlen('Module')) . '\\';
@@ -66,18 +66,18 @@ 
 		
 		$ctrl_class = $ctrl_namespace . $ctrl_name . 'Controller';
 		if(class_exists($ctrl_class) 
-		    && is_subclass_of($ctrl_class, '\\MyArtJaub\\Webtrees\\Mvc\\Controller\\MvcController')
+			&& is_subclass_of($ctrl_class, '\\MyArtJaub\\Webtrees\\Mvc\\Controller\\MvcController')
 			&& $ctrl = new $ctrl_class($module) ) {
 			if(method_exists($ctrl, $method)) {
-			    try {
-			        call_user_func_array(array($ctrl, $method), array());
-			    }
-			    catch (MvcException $ex) {
-			        if(!headers_sent()) {
-			            http_response_code($ex->getHttpCode());
-			        }
-			        echo $ex->getMessage();			        
-			    }
+				try {
+					call_user_func_array(array($ctrl, $method), array());
+				}
+				catch (MvcException $ex) {
+					if(!headers_sent()) {
+						http_response_code($ex->getHttpCode());
+					}
+					echo $ex->getMessage();			        
+				}
 			}
 			 else {
 				 throw new \Exception('The page requested does not exist');
@@ -86,27 +86,27 @@ 
 		 else {
 			 throw new \Exception('The page requested does not exist');
 		 }
-    }
+	}
 
-    /**
-     * 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()
+	{
+	}
     
 }
 

src/Webtrees/Mvc/MvcException.php

Indentation +41 added lines, -41 removed lines

@@ -16,52 +16,52 @@
  */
 class MvcException extends \Exception {
 
-    /** @var int[] $VALID_HTTP List of valid HTTP codes */
-    protected static $VALID_HTTP =  array(
-        100, 101,
-        200, 201, 202, 203, 204, 205, 206,
-        300, 301, 302, 303, 304, 305, 306, 307,
-        400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417,
-        500, 501, 502, 503, 504, 505
-    );
+	/** @var int[] $VALID_HTTP List of valid HTTP codes */
+	protected static $VALID_HTTP =  array(
+		100, 101,
+		200, 201, 202, 203, 204, 205, 206,
+		300, 301, 302, 303, 304, 305, 306, 307,
+		400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417,
+		500, 501, 502, 503, 504, 505
+	);
     
-    /** @var int $http_code */
-    protected $http_code;
+	/** @var int $http_code */
+	protected $http_code;
     
-    /**
-     * Constructor for MvcException
-     * 
-     * @param int $http_code
-     * @param string $message
-     * @param int $code
-     * @param \Throwable $previous
-     */
-    public function __construct($http_code = 500, $message = "", $code = 0, \Throwable $previous = null) {
-        parent::__construct($message, $code, $previous);   
+	/**
+	 * Constructor for MvcException
+	 * 
+	 * @param int $http_code
+	 * @param string $message
+	 * @param int $code
+	 * @param \Throwable $previous
+	 */
+	public function __construct($http_code = 500, $message = "", $code = 0, \Throwable $previous = null) {
+		parent::__construct($message, $code, $previous);   
                 
-        $this->http_code = in_array($http_code, self::$VALID_HTTP) ? $http_code : 500;
-    }
+		$this->http_code = in_array($http_code, self::$VALID_HTTP) ? $http_code : 500;
+	}
     
-    /**
-     * Get the HTTP code
-     * 
-     * @return int
-     */
-    public function getHttpCode() {
-        return $this->http_code;
-    }
+	/**
+	 * Get the HTTP code
+	 * 
+	 * @return int
+	 */
+	public function getHttpCode() {
+		return $this->http_code;
+	}
     
-    /**
-     * Set the HTTP code
-     * 
-     * @param int $http_code
-     * @throws InvalidArgumentException Thrown if not valid Http code
-     */
-    public function setHttpCode($http_code) {
-        if(!in_array($http_code, self::$VALID_HTTP))
-            throw new \InvalidArgumentException('Invalid HTTP code');
-        $this->http_code= $http_code;
-    }   
+	/**
+	 * Set the HTTP code
+	 * 
+	 * @param int $http_code
+	 * @throws InvalidArgumentException Thrown if not valid Http code
+	 */
+	public function setHttpCode($http_code) {
+		if(!in_array($http_code, self::$VALID_HTTP))
+			throw new \InvalidArgumentException('Invalid HTTP code');
+		$this->http_code= $http_code;
+	}   
 
 }
 

src/Webtrees/Module/HooksModule.php

Indentation +45 added lines, -45 removed lines

@@ -19,59 +19,59 @@
  * Hooks Module.
  */
 class HooksModule extends AbstractModule implements ModuleConfigInterface, DependentInterface {
-    // How to update the database schema for this module
-    const SCHEMA_TARGET_VERSION   = 1;
-    const SCHEMA_SETTING_NAME     = 'MAJ_HOOKS_SCHEMA_VERSION';
-    const SCHEMA_MIGRATION_PREFIX = '\MyArtJaub\Webtrees\Module\Hooks\Schema';
+	// How to update the database schema for this module
+	const SCHEMA_TARGET_VERSION   = 1;
+	const SCHEMA_SETTING_NAME     = 'MAJ_HOOKS_SCHEMA_VERSION';
+	const SCHEMA_MIGRATION_PREFIX = '\MyArtJaub\Webtrees\Module\Hooks\Schema';
     
-    /** @var string For custom modules - link for support, upgrades, etc. */
-    const CUSTOM_WEBSITE = 'https://github.com/jon48/webtrees-lib';
+	/** @var string For custom modules - link for support, upgrades, etc. */
+	const CUSTOM_WEBSITE = 'https://github.com/jon48/webtrees-lib';
     
-    /**
-     * {@inhericDoc}
-     */
-    public function getTitle() {
-        return /* I18N: Name of the “Hooks” module */ I18N::translate('Hooks');
-    }
+	/**
+	 * {@inhericDoc}
+	 */
+	public function getTitle() {
+		return /* I18N: Name of the “Hooks” module */ I18N::translate('Hooks');
+	}
     
-    /**
-     * {@inhericDoc}
-     */
-    public function getDescription() {
-        return /* I18N: Description of the “Hooks” module */ I18N::translate('Implements hooks management.');
-    }
+	/**
+	 * {@inhericDoc}
+	 */
+	public function getDescription() {
+		return /* I18N: Description of the “Hooks” module */ I18N::translate('Implements hooks management.');
+	}
     
-    /**
-     * {@inhericDoc}
-     */
-    public function modAction($mod_action) {
-        Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
+	/**
+	 * {@inhericDoc}
+	 */
+	public function modAction($mod_action) {
+		Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
         
-        \MyArtJaub\Webtrees\Mvc\Dispatcher::getInstance()->handle($this, $mod_action);
-    }
+		\MyArtJaub\Webtrees\Mvc\Dispatcher::getInstance()->handle($this, $mod_action);
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink()
-     */
-    public function getConfigLink() {
-        Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
+	/**
+	 * {@inhericDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink()
+	 */
+	public function getConfigLink() {
+		Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
         
-        return 'module.php?mod=' . $this->getName() . '&mod_action=AdminConfig';
-    }
+		return 'module.php?mod=' . $this->getName() . '&mod_action=AdminConfig';
+	}
     
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\DependentInterface::validatePrerequisites()
-     */
-    public function validatePrerequisites() {
-        try {
-            Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
-            return true;
-        }
-        catch (\Exception $ex) { }
-        return false;
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\DependentInterface::validatePrerequisites()
+	 */
+	public function validatePrerequisites() {
+		try {
+			Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
+			return true;
+		}
+		catch (\Exception $ex) { }
+		return false;
+	}
     
 
 }

src/Webtrees/Module/Sosa/Model/SosaProvider.php

Indentation +560 added lines, -560 removed lines

@@ -22,389 +22,389 @@ 
  */
 class SosaProvider {
     
-    /**
-     * Maximum number of generation the database is able to hold.
-     * @var int MAX_DB_GENERATIONS
-     */
-    const MAX_DB_GENERATIONS = 64;
-    
-    /**
-     * System's default user (ID -1 in the database
-     * @var User $default_user
-     */
-    protected static $default_user;
-    
-    /**
-     * Reference user
-     * @var User $user
-     */
-    protected $user;
-    
-    /**
-     * Reference tree
-     * @var Tree $tree
-     */
-    protected $tree;
-    
-    /**
-     * Cached list of Sosa Individuals by generation
-     * Format: key = generation, value = array ( sosa => Individual ID)
-     * @var array $sosa_list_by_gen
-     */
-    protected $sosa_list_by_gen;
-    
-    /**
-     * Cached list of Sosa Families by generation
-     * Format: key = generation, value = array ( sosa => Family ID)
-     * @var unknown $sosa_fam_list_by_gen
-     */
-    protected $sosa_fam_list_by_gen;
-    
-    /**
-     * Cached array of statistics by generation
-     * Format:  key = generation, 
-     *          value = array(
-     *              sosaCount, sosaTotalCount, diffSosaTotalCount, firstBirth, lastBirth, avgBirth
-     *           )
-     * @var array $statistics_tab
-     */
-    protected $statistics_tab;
-    
-    /**
-     * Has the provider's initialisation completed
-     * @var bool $is_setup
-     */
-    protected $is_setup;
-    
-    /**
-     * Constructor for Sosa Provider.
-     * A provider is defined in relation to a specific tree and reference user.
-     * 
-     * @param Tree $tree
-     * @param User $user
-     */
-    public function __construct(Tree $tree, User $user = null) {
-        if(self::$default_user === null) 
-            self::$default_user = User::find(-1);
+	/**
+	 * Maximum number of generation the database is able to hold.
+	 * @var int MAX_DB_GENERATIONS
+	 */
+	const MAX_DB_GENERATIONS = 64;
+    
+	/**
+	 * System's default user (ID -1 in the database
+	 * @var User $default_user
+	 */
+	protected static $default_user;
+    
+	/**
+	 * Reference user
+	 * @var User $user
+	 */
+	protected $user;
+    
+	/**
+	 * Reference tree
+	 * @var Tree $tree
+	 */
+	protected $tree;
+    
+	/**
+	 * Cached list of Sosa Individuals by generation
+	 * Format: key = generation, value = array ( sosa => Individual ID)
+	 * @var array $sosa_list_by_gen
+	 */
+	protected $sosa_list_by_gen;
+    
+	/**
+	 * Cached list of Sosa Families by generation
+	 * Format: key = generation, value = array ( sosa => Family ID)
+	 * @var unknown $sosa_fam_list_by_gen
+	 */
+	protected $sosa_fam_list_by_gen;
+    
+	/**
+	 * Cached array of statistics by generation
+	 * Format:  key = generation, 
+	 *          value = array(
+	 *              sosaCount, sosaTotalCount, diffSosaTotalCount, firstBirth, lastBirth, avgBirth
+	 *           )
+	 * @var array $statistics_tab
+	 */
+	protected $statistics_tab;
+    
+	/**
+	 * Has the provider's initialisation completed
+	 * @var bool $is_setup
+	 */
+	protected $is_setup;
+    
+	/**
+	 * Constructor for Sosa Provider.
+	 * A provider is defined in relation to a specific tree and reference user.
+	 * 
+	 * @param Tree $tree
+	 * @param User $user
+	 */
+	public function __construct(Tree $tree, User $user = null) {
+		if(self::$default_user === null) 
+			self::$default_user = User::find(-1);
         
-        $this->tree = $tree;
-        $this->user = $user;
-        $this->is_setup = true;
-        if($this->user === null) $this->user = Auth::user();
-        if(strlen($this->user->getUserId()) == 0) $this->user = self::$default_user;
+		$this->tree = $tree;
+		$this->user = $user;
+		$this->is_setup = true;
+		if($this->user === null) $this->user = Auth::user();
+		if(strlen($this->user->getUserId()) == 0) $this->user = self::$default_user;
         
-        // Check if the user, or the default user, has a root already setup;
-        if(empty($this->getRootIndiId())) {
-            if($this->user == self::$default_user) {  // If the default user is not setup
-                $this->is_setup = false;
-            }
-            else {
-                $this->user = self::$default_user;
-                $this->is_setup = $this->getRootIndiId() === null;
-            }            
-        }
-    }
-    
-    /**
-     * Returns is the Provider has been successfully set up
-     * @return bool
-     */
-    public function isSetup() {
-        return $this->is_setup;
-    }
-    
-    /**
-     * Return the root individual ID for the reference tree and user.
-     * @return string Individual ID
-     */
-    public function getRootIndiId() {
-        return $this->tree->getUserPreference($this->user, 'MAJ_SOSA_ROOT_ID');
-    }
-    
-    /**
-     * Return the root individual for the reference tree and user.
-     * @return Individual Individual
-     */
-    public function getRootIndi() {
-        $root_indi_id = $this->getRootIndiId();
-        if(!empty($root_indi_id)) {
-            return Individual::getInstance($root_indi_id, $this->tree);
-        }
-        return null;
-    }
+		// Check if the user, or the default user, has a root already setup;
+		if(empty($this->getRootIndiId())) {
+			if($this->user == self::$default_user) {  // If the default user is not setup
+				$this->is_setup = false;
+			}
+			else {
+				$this->user = self::$default_user;
+				$this->is_setup = $this->getRootIndiId() === null;
+			}            
+		}
+	}
+    
+	/**
+	 * Returns is the Provider has been successfully set up
+	 * @return bool
+	 */
+	public function isSetup() {
+		return $this->is_setup;
+	}
+    
+	/**
+	 * Return the root individual ID for the reference tree and user.
+	 * @return string Individual ID
+	 */
+	public function getRootIndiId() {
+		return $this->tree->getUserPreference($this->user, 'MAJ_SOSA_ROOT_ID');
+	}
+    
+	/**
+	 * Return the root individual for the reference tree and user.
+	 * @return Individual Individual
+	 */
+	public function getRootIndi() {
+		$root_indi_id = $this->getRootIndiId();
+		if(!empty($root_indi_id)) {
+			return Individual::getInstance($root_indi_id, $this->tree);
+		}
+		return null;
+	}
        
-    /*****************
+	/*****************
      * DATA CRUD LAYER
      *****************/
     
-    /**
-     * Remove all Sosa entries related to the gedcom file and user
-     */
-    public function deleteAll() {
-        if(!$this->is_setup) return;
-        Database::prepare(
-            'DELETE FROM `##maj_sosa`'.
-            ' WHERE majs_gedcom_id= :tree_id and majs_user_id = :user_id ')
-            ->execute(array(
-                'tree_id' => $this->tree->getTreeId(), 
-                'user_id' => $this->user->getUserId()                
-            ));
-    }
-    
-    /**
-     * Remove all ancestors of a sosa number
-     * 
-     * @param int $sosa
-     */
-    public function deleteAncestors($sosa) {
-        if(!$this->is_setup) return;
-        $gen = Functions::getGeneration($sosa);
-        Database::prepare(
-            'DELETE FROM `##maj_sosa`'.
-            ' WHERE majs_gedcom_id=:tree_id and majs_user_id = :user_id' .
-            ' AND majs_gen >= :gen' .
-            ' AND FLOOR(majs_sosa / (POW(2, (majs_gen - :gen)))) = :sosa'
-        )->execute(array(
-            'tree_id' => $this->tree->getTreeId(), 
-            'user_id' => $this->user->getUserId(),
-            'gen' => $gen,
-            'sosa' => $sosa
-        ));
-    }    
-    
-    /**
-     * Insert (or update if already existing) a list of Sosa individuals
-     * @param array $sosa_records
-     */
-    public function insertOrUpdate($sosa_records) {
-        if(!$this->is_setup) return;
+	/**
+	 * Remove all Sosa entries related to the gedcom file and user
+	 */
+	public function deleteAll() {
+		if(!$this->is_setup) return;
+		Database::prepare(
+			'DELETE FROM `##maj_sosa`'.
+			' WHERE majs_gedcom_id= :tree_id and majs_user_id = :user_id ')
+			->execute(array(
+				'tree_id' => $this->tree->getTreeId(), 
+				'user_id' => $this->user->getUserId()                
+			));
+	}
+    
+	/**
+	 * Remove all ancestors of a sosa number
+	 * 
+	 * @param int $sosa
+	 */
+	public function deleteAncestors($sosa) {
+		if(!$this->is_setup) return;
+		$gen = Functions::getGeneration($sosa);
+		Database::prepare(
+			'DELETE FROM `##maj_sosa`'.
+			' WHERE majs_gedcom_id=:tree_id and majs_user_id = :user_id' .
+			' AND majs_gen >= :gen' .
+			' AND FLOOR(majs_sosa / (POW(2, (majs_gen - :gen)))) = :sosa'
+		)->execute(array(
+			'tree_id' => $this->tree->getTreeId(), 
+			'user_id' => $this->user->getUserId(),
+			'gen' => $gen,
+			'sosa' => $sosa
+		));
+	}    
+    
+	/**
+	 * Insert (or update if already existing) a list of Sosa individuals
+	 * @param array $sosa_records
+	 */
+	public function insertOrUpdate($sosa_records) {
+		if(!$this->is_setup) return;
         
-        $treeid = $this->tree->getTreeId();
-        $userid = $this->user->getUserId();
-        $questionmarks_table = array();
-        $values_table = array();
+		$treeid = $this->tree->getTreeId();
+		$userid = $this->user->getUserId();
+		$questionmarks_table = array();
+		$values_table = array();
         
-        $i = 0;
-        foreach  ($sosa_records as $row) {
-            $gen = Functions::getGeneration($row['sosa']);
-            if($gen <= self::MAX_DB_GENERATIONS) {
-                $questionmarks_table[] = 
-                    '(:tree_id'.$i.', :user_id'.$i.', :sosa'.$i.', :indi_id'.$i.', :gen'.$i.', :byear'.$i.', :dyear'.$i.')';
-                $values_table = array_merge(
-                    $values_table, 
-                    array(
-                        'tree_id'.$i => $treeid, 
-                        'user_id'.$i => $userid, 
-                        'sosa'.$i => $row['sosa'], 
-                        'indi_id'.$i => $row['indi'], 
-                        'gen'.$i => Functions::getGeneration($row['sosa']),
-                        'byear'.$i => $row['birth_year'],
-                        'dyear'.$i => $row['death_year']
-                    )
-                );
-            }
-            $i++;
-        }
+		$i = 0;
+		foreach  ($sosa_records as $row) {
+			$gen = Functions::getGeneration($row['sosa']);
+			if($gen <= self::MAX_DB_GENERATIONS) {
+				$questionmarks_table[] = 
+					'(:tree_id'.$i.', :user_id'.$i.', :sosa'.$i.', :indi_id'.$i.', :gen'.$i.', :byear'.$i.', :dyear'.$i.')';
+				$values_table = array_merge(
+					$values_table, 
+					array(
+						'tree_id'.$i => $treeid, 
+						'user_id'.$i => $userid, 
+						'sosa'.$i => $row['sosa'], 
+						'indi_id'.$i => $row['indi'], 
+						'gen'.$i => Functions::getGeneration($row['sosa']),
+						'byear'.$i => $row['birth_year'],
+						'dyear'.$i => $row['death_year']
+					)
+				);
+			}
+			$i++;
+		}
         
-        $sql = 'REPLACE INTO `##maj_sosa`' .
-            ' (majs_gedcom_id, majs_user_id, majs_sosa, majs_i_id, majs_gen, majs_birth_year, majs_death_year)' .
-            ' VALUES '. implode(',', $questionmarks_table);
-        Database::prepare($sql)->execute($values_table);
-    }
+		$sql = 'REPLACE INTO `##maj_sosa`' .
+			' (majs_gedcom_id, majs_user_id, majs_sosa, majs_i_id, majs_gen, majs_birth_year, majs_death_year)' .
+			' VALUES '. implode(',', $questionmarks_table);
+		Database::prepare($sql)->execute($values_table);
+	}
     
-    /****************
+	/****************
      * SIMPLE QUERIES
      ****************/
     
-    /**
-     * Returns the list of Sosa numbers to which an individual is related.
-     * Format: key = sosa number, value = generation for the Sosa number
-     * 
-     * @param Individual $indi
-     * @return array Array of sosa numbers
-     */
-    public function getSosaNumbers(Individual $indi) {
-        if(!$this->is_setup) return array();
-        return Database::prepare(
-                'SELECT majs_sosa, majs_gen FROM `##maj_sosa`'.
-                ' WHERE majs_i_id=:indi_id AND majs_gedcom_id=:tree_id AND majs_user_id=:user_id'
-            )->execute(array(
-                'indi_id' => $indi->getXref(), 
-                'tree_id' => $this->tree->getTreeId(), 
-                'user_id' => $this->user->getUserId()
-            ))->fetchAssoc();
-    }
-    
-    /**
-     * Get the last generation of Sosa ancestors
-     *
-     * @return number Last generation if found, 1 otherwise
-     */
-    public function getLastGeneration() {
-        if(!$this->is_setup) return;
-        return Database::prepare(
-                'SELECT MAX(majs_gen) FROM `##maj_sosa`'.
-                ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'
-            )->execute(array(
-                'tree_id' => $this->tree->getTreeId(), 
-                'user_id' => $this->user->getUserId()                
-            ))->fetchOne() ?: 1;
-    }
-    
-    /*************
+	/**
+	 * Returns the list of Sosa numbers to which an individual is related.
+	 * Format: key = sosa number, value = generation for the Sosa number
+	 * 
+	 * @param Individual $indi
+	 * @return array Array of sosa numbers
+	 */
+	public function getSosaNumbers(Individual $indi) {
+		if(!$this->is_setup) return array();
+		return Database::prepare(
+				'SELECT majs_sosa, majs_gen FROM `##maj_sosa`'.
+				' WHERE majs_i_id=:indi_id AND majs_gedcom_id=:tree_id AND majs_user_id=:user_id'
+			)->execute(array(
+				'indi_id' => $indi->getXref(), 
+				'tree_id' => $this->tree->getTreeId(), 
+				'user_id' => $this->user->getUserId()
+			))->fetchAssoc();
+	}
+    
+	/**
+	 * Get the last generation of Sosa ancestors
+	 *
+	 * @return number Last generation if found, 1 otherwise
+	 */
+	public function getLastGeneration() {
+		if(!$this->is_setup) return;
+		return Database::prepare(
+				'SELECT MAX(majs_gen) FROM `##maj_sosa`'.
+				' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'
+			)->execute(array(
+				'tree_id' => $this->tree->getTreeId(), 
+				'user_id' => $this->user->getUserId()                
+			))->fetchOne() ?: 1;
+	}
+    
+	/*************
      * SOSA LISTS
      *************/
     
-    /**
-     * Return the list of all sosas, with the generations it belongs to
-     *
-     * @return array Associative array of Sosa ancestors, with their generation, comma separated
-     */
-    public function getAllSosaWithGenerations(){
-        if(!$this->is_setup) return array();
-        return Database::prepare(
-            'SELECT majs_i_id AS indi,' .
-            ' GROUP_CONCAT(DISTINCT majs_gen ORDER BY majs_gen ASC SEPARATOR ",") AS generations' .
-            ' FROM `##maj_sosa`' .
-            ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id' .
-            ' GROUP BY majs_i_id'
-        )->execute(array(
-            'tree_id' => $this->tree->getTreeId(),
-            'user_id' => $this->user->getUserId()
-        ))->fetchAssoc();
-    }
-    
-    /**
-     * Get an associative array of Sosa individuals in generation G. Keys are Sosa numbers, values individuals.
-     *
-     * @param number $gen Generation
-     * @return array Array of Sosa individuals
-     */
-    public function getSosaListAtGeneration($gen){
-        if(!$this->is_setup) return array();
-        if(!$this->sosa_list_by_gen)
-            $this->sosa_list_by_gen = array();
+	/**
+	 * Return the list of all sosas, with the generations it belongs to
+	 *
+	 * @return array Associative array of Sosa ancestors, with their generation, comma separated
+	 */
+	public function getAllSosaWithGenerations(){
+		if(!$this->is_setup) return array();
+		return Database::prepare(
+			'SELECT majs_i_id AS indi,' .
+			' GROUP_CONCAT(DISTINCT majs_gen ORDER BY majs_gen ASC SEPARATOR ",") AS generations' .
+			' FROM `##maj_sosa`' .
+			' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id' .
+			' GROUP BY majs_i_id'
+		)->execute(array(
+			'tree_id' => $this->tree->getTreeId(),
+			'user_id' => $this->user->getUserId()
+		))->fetchAssoc();
+	}
+    
+	/**
+	 * Get an associative array of Sosa individuals in generation G. Keys are Sosa numbers, values individuals.
+	 *
+	 * @param number $gen Generation
+	 * @return array Array of Sosa individuals
+	 */
+	public function getSosaListAtGeneration($gen){
+		if(!$this->is_setup) return array();
+		if(!$this->sosa_list_by_gen)
+			$this->sosa_list_by_gen = array();
         
-        if($gen){
-            if(!isset($this->sosa_list_by_gen[$gen])){
-                $this->sosa_list_by_gen[$gen] = Database::prepare(
-                    'SELECT majs_sosa AS sosa, majs_i_id AS indi'.
-                    ' FROM `##maj_sosa`'.
-                    ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'.
-                    ' AND majs_gen = :gen'.
-                    ' ORDER BY majs_sosa ASC')
-                ->execute(array(
-                    'tree_id' => $this->tree->getTreeId(),
-                    'user_id' => $this->user->getUserId(),
-                    'gen' => $gen
-                ))
-                ->fetchAssoc();
-            }
-            return $this->sosa_list_by_gen[$gen];
-        }
-        return array();
-    }
-    
-    /**
-     * Get an associative array of Sosa families in generation G. Keys are Sosa numbers for the husband, values families.
-     *
-     * @param number $gen Generation
-     * @return array Array of Sosa families
-     */
-    public function getFamilySosaListAtGeneration($gen){
-        if(!$this->is_setup) return array();
-        if(!$this->sosa_fam_list_by_gen)
-            $this->sosa_fam_list_by_gen = array();
+		if($gen){
+			if(!isset($this->sosa_list_by_gen[$gen])){
+				$this->sosa_list_by_gen[$gen] = Database::prepare(
+					'SELECT majs_sosa AS sosa, majs_i_id AS indi'.
+					' FROM `##maj_sosa`'.
+					' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'.
+					' AND majs_gen = :gen'.
+					' ORDER BY majs_sosa ASC')
+				->execute(array(
+					'tree_id' => $this->tree->getTreeId(),
+					'user_id' => $this->user->getUserId(),
+					'gen' => $gen
+				))
+				->fetchAssoc();
+			}
+			return $this->sosa_list_by_gen[$gen];
+		}
+		return array();
+	}
+    
+	/**
+	 * Get an associative array of Sosa families in generation G. Keys are Sosa numbers for the husband, values families.
+	 *
+	 * @param number $gen Generation
+	 * @return array Array of Sosa families
+	 */
+	public function getFamilySosaListAtGeneration($gen){
+		if(!$this->is_setup) return array();
+		if(!$this->sosa_fam_list_by_gen)
+			$this->sosa_fam_list_by_gen = array();
         
-        if($gen){
-            if(!isset($this->sosa_fam_list_by_gen[$gen])){
-                $this->sosa_fam_list_by_gen[$gen] = Database::prepare(
-                    'SELECT s1.majs_sosa AS sosa, f_id AS fam'.
-                    ' FROM `##families`'.
-                    ' INNER JOIN `##maj_sosa` AS s1 ON (`##families`.f_husb = s1.majs_i_id AND `##families`.f_file = s1.majs_gedcom_id)'.
-                    ' INNER JOIN `##maj_sosa` AS s2 ON (`##families`.f_wife = s2.majs_i_id AND `##families`.f_file = s2.majs_gedcom_id)'.
-                    ' WHERE s1.majs_sosa + 1 = s2.majs_sosa'.
-                    ' AND s1.majs_gedcom_id= :tree_id AND s1.majs_user_id=:user_id'.
-                    ' AND s2.majs_gedcom_id= :tree_id AND s2.majs_user_id=:user_id'.
-                    ' AND s1.majs_gen = :gen'.
-                    ' ORDER BY s1.majs_sosa ASC'
-                    )
-                    ->execute(array(
-                        'tree_id' => $this->tree->getTreeId(),
-                        'user_id' => $this->user->getUserId(),
-                        'gen' => $gen
-                    ))
-                    ->fetchAssoc();
-            }
-            return $this->sosa_fam_list_by_gen[$gen];
-        }
-        return array();
-    }
-    
-    /**
-     * Get an associative array of Sosa individuals in generation G who are missing parents. Keys are Sosa numbers, values individuals.
-     *
-     * @param number $gen Generation
-     * @return array Array of Sosa individuals
-     */
-    public function getMissingSosaListAtGeneration($gen){
-        if(!$this->is_setup) return array();    
-        if($gen){
-            return $this->sosa_list_by_gen[$gen] = Database::prepare(
-                'SELECT schild.majs_sosa sosa, schild.majs_i_id indi, sfat.majs_sosa IS NOT NULL has_father, smot.majs_sosa IS NOT NULL has_mother'.
-                ' FROM `##maj_sosa` schild'.
-                ' LEFT JOIN `##maj_sosa` sfat ON ((schild.majs_sosa * 2) = sfat.majs_sosa AND schild.majs_gedcom_id = sfat.majs_gedcom_id AND schild.majs_user_id = sfat.majs_user_id)'.
-                ' LEFT JOIN `##maj_sosa` smot ON ((schild.majs_sosa * 2 + 1) = smot.majs_sosa AND schild.majs_gedcom_id = smot.majs_gedcom_id AND schild.majs_user_id = smot.majs_user_id)'.
-                ' WHERE schild.majs_gedcom_id = :tree_id AND schild.majs_user_id = :user_id'.
-                ' AND schild.majs_gen = :gen'.
-                ' AND (sfat.majs_sosa IS NULL OR smot.majs_sosa IS NULL)'.
-                ' ORDER BY schild.majs_sosa ASC')
-                ->execute(array(
-                    'tree_id' => $this->tree->getTreeId(),
-                    'user_id' => $this->user->getUserId(),
-                    'gen' => $gen - 1
-                ))->fetchAll(\PDO::FETCH_ASSOC);
-        }
-        return array();
-    }
-    
-    
-    
-    /*************
+		if($gen){
+			if(!isset($this->sosa_fam_list_by_gen[$gen])){
+				$this->sosa_fam_list_by_gen[$gen] = Database::prepare(
+					'SELECT s1.majs_sosa AS sosa, f_id AS fam'.
+					' FROM `##families`'.
+					' INNER JOIN `##maj_sosa` AS s1 ON (`##families`.f_husb = s1.majs_i_id AND `##families`.f_file = s1.majs_gedcom_id)'.
+					' INNER JOIN `##maj_sosa` AS s2 ON (`##families`.f_wife = s2.majs_i_id AND `##families`.f_file = s2.majs_gedcom_id)'.
+					' WHERE s1.majs_sosa + 1 = s2.majs_sosa'.
+					' AND s1.majs_gedcom_id= :tree_id AND s1.majs_user_id=:user_id'.
+					' AND s2.majs_gedcom_id= :tree_id AND s2.majs_user_id=:user_id'.
+					' AND s1.majs_gen = :gen'.
+					' ORDER BY s1.majs_sosa ASC'
+					)
+					->execute(array(
+						'tree_id' => $this->tree->getTreeId(),
+						'user_id' => $this->user->getUserId(),
+						'gen' => $gen
+					))
+					->fetchAssoc();
+			}
+			return $this->sosa_fam_list_by_gen[$gen];
+		}
+		return array();
+	}
+    
+	/**
+	 * Get an associative array of Sosa individuals in generation G who are missing parents. Keys are Sosa numbers, values individuals.
+	 *
+	 * @param number $gen Generation
+	 * @return array Array of Sosa individuals
+	 */
+	public function getMissingSosaListAtGeneration($gen){
+		if(!$this->is_setup) return array();    
+		if($gen){
+			return $this->sosa_list_by_gen[$gen] = Database::prepare(
+				'SELECT schild.majs_sosa sosa, schild.majs_i_id indi, sfat.majs_sosa IS NOT NULL has_father, smot.majs_sosa IS NOT NULL has_mother'.
+				' FROM `##maj_sosa` schild'.
+				' LEFT JOIN `##maj_sosa` sfat ON ((schild.majs_sosa * 2) = sfat.majs_sosa AND schild.majs_gedcom_id = sfat.majs_gedcom_id AND schild.majs_user_id = sfat.majs_user_id)'.
+				' LEFT JOIN `##maj_sosa` smot ON ((schild.majs_sosa * 2 + 1) = smot.majs_sosa AND schild.majs_gedcom_id = smot.majs_gedcom_id AND schild.majs_user_id = smot.majs_user_id)'.
+				' WHERE schild.majs_gedcom_id = :tree_id AND schild.majs_user_id = :user_id'.
+				' AND schild.majs_gen = :gen'.
+				' AND (sfat.majs_sosa IS NULL OR smot.majs_sosa IS NULL)'.
+				' ORDER BY schild.majs_sosa ASC')
+				->execute(array(
+					'tree_id' => $this->tree->getTreeId(),
+					'user_id' => $this->user->getUserId(),
+					'gen' => $gen - 1
+				))->fetchAll(\PDO::FETCH_ASSOC);
+		}
+		return array();
+	}
+    
+    
+    
+	/*************
      * STATISTICS
      *************/
-    /**
-     * Get the statistic array detailed by generation.
-     * Statistics for each generation are:
-     * 	- The number of Sosa in generation
-     * 	- The number of Sosa up to generation
-     *  - The number of distinct Sosa up to generation
-     *  - The year of the first birth in generation
-     *  - The year of the last birth in generation
-     *  - The average year of birth in generation
-     *
-     * @return array Statistics array
-     */
-    public function getStatisticsByGeneration() {
-        if(!$this->is_setup) return array();
-        if(!$this->statistics_tab) {
-            $this->statistics_tab = array();
-            if($maxGeneration = $this->getLastGeneration()) {
-                for ($gen = 1; $gen <= $maxGeneration; $gen++) {
-                    $birthStats = $this->getStatsBirthYearInGeneration($gen);
-                    $this->statistics_tab[$gen] = array(
-                        'sosaCount'				=>	$this->getSosaCountAtGeneration($gen),
-                        'sosaTotalCount'		=>	$this->getSosaCountUpToGeneration($gen),
-                        'diffSosaTotalCount'	=>	$this->getDifferentSosaCountUpToGeneration($gen),
-                        'firstBirth'			=>	$birthStats['first'],
-                        'lastBirth'				=>	$birthStats['last'],
-                        'avgBirth'				=>	$birthStats['avg']
-                    );
-                }
-            }
-        }
-        return $this->statistics_tab;        
-    }
+	/**
+	 * Get the statistic array detailed by generation.
+	 * Statistics for each generation are:
+	 * 	- The number of Sosa in generation
+	 * 	- The number of Sosa up to generation
+	 *  - The number of distinct Sosa up to generation
+	 *  - The year of the first birth in generation
+	 *  - The year of the last birth in generation
+	 *  - The average year of birth in generation
+	 *
+	 * @return array Statistics array
+	 */
+	public function getStatisticsByGeneration() {
+		if(!$this->is_setup) return array();
+		if(!$this->statistics_tab) {
+			$this->statistics_tab = array();
+			if($maxGeneration = $this->getLastGeneration()) {
+				for ($gen = 1; $gen <= $maxGeneration; $gen++) {
+					$birthStats = $this->getStatsBirthYearInGeneration($gen);
+					$this->statistics_tab[$gen] = array(
+						'sosaCount'				=>	$this->getSosaCountAtGeneration($gen),
+						'sosaTotalCount'		=>	$this->getSosaCountUpToGeneration($gen),
+						'diffSosaTotalCount'	=>	$this->getDifferentSosaCountUpToGeneration($gen),
+						'firstBirth'			=>	$birthStats['first'],
+						'lastBirth'				=>	$birthStats['last'],
+						'avgBirth'				=>	$birthStats['avg']
+					);
+				}
+			}
+		}
+		return $this->statistics_tab;        
+	}
     
 	/**
 	 * How many individuals exist in the tree.
@@ -412,205 +412,205 @@ 
 	 * @return int
 	 */
 	public function getTotalIndividuals() {
-	    if(!$this->is_setup) return 0;
-	    return Database::prepare(
-	        'SELECT SQL_CACHE COUNT(*) FROM `##individuals`' .
-	        ' WHERE i_file = :tree_id')
-	        ->execute(array('tree_id' => $this->tree->getTreeId()))
-	        ->fetchOne() ?: 0;
+		if(!$this->is_setup) return 0;
+		return Database::prepare(
+			'SELECT SQL_CACHE COUNT(*) FROM `##individuals`' .
+			' WHERE i_file = :tree_id')
+			->execute(array('tree_id' => $this->tree->getTreeId()))
+			->fetchOne() ?: 0;
 	}
     
-    /**
-     * Get the total Sosa count for all generations
-     *
-     * @return number Number of Sosas
-     */
-    public function getSosaCount(){
-        if(!$this->is_setup) return 0;
-        return Database::prepare(
-            'SELECT SQL_CACHE COUNT(majs_sosa) FROM `##maj_sosa`' .
-            ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id')
-            ->execute(array(
-                'tree_id' => $this->tree->getTreeId(), 
-                'user_id' => $this->user->getUserId() 
-            ))->fetchOne() ?: 0;
-    }
-    
-    /**
-     * Get the number of Sosa in a specific generation.
-     *
-     * @param number $gen Generation
-     * @return number Number of Sosas in generation
-     */
-    public function getSosaCountAtGeneration($gen){
-        if(!$this->is_setup) return 0;
-        return Database::prepare(
-            'SELECT SQL_CACHE COUNT(majs_sosa) FROM `##maj_sosa`' .
-            ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'.
-            ' AND majs_gen= :gen')
-        ->execute(array(
-                'tree_id' => $this->tree->getTreeId(), 
-                'user_id' => $this->user->getUserId(),
-                'gen' => $gen            
-        ))->fetchOne() ?: 0;
-    }
-    
-    /**
-     * Get the total number of Sosa up to a specific generation.
-     *
-     * @param number $gen Generation
-     * @return number Total number of Sosas up to generation
-     */
-    public function getSosaCountUpToGeneration($gen){
-        if(!$this->is_setup) return 0;
-        return Database::prepare(
-            'SELECT SQL_CACHE COUNT(majs_sosa) FROM `##maj_sosa`' .
-            ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'.
-            ' AND majs_gen <= :gen')
-        ->execute(array(
-                'tree_id' => $this->tree->getTreeId(), 
-                'user_id' => $this->user->getUserId(),
-                'gen' => $gen 
-        ))->fetchOne() ?: 0;
-    }
-    
-    /**
-     * Get the total number of distinct Sosa individual for all generations.
-     *
-     * @return number Total number of distinct individual
-     */
-    public function getDifferentSosaCount(){
-        if(!$this->is_setup) return 0;
-        return Database::prepare(
-            'SELECT SQL_CACHE COUNT(DISTINCT majs_i_id) FROM `##maj_sosa`' .
-            ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id')
-        ->execute(array(
-                'tree_id' => $this->tree->getTreeId(), 
-                'user_id' => $this->user->getUserId()
-        ))->fetchOne() ?: 0;
-    }
-    
-    /**
-     * Get the number of distinct Sosa individual up to a specific generation.
-     *
-     * @param number $gen Generation
-     * @return number Number of distinct Sosa individuals up to generation
-     */
-    public function getDifferentSosaCountUpToGeneration($gen){
-        if(!$this->is_setup) return 0;
-        return Database::prepare(
-            'SELECT SQL_CACHE COUNT(DISTINCT majs_i_id) FROM `##maj_sosa`' .
-            ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'.
-            ' AND majs_gen <= :gen')
-        ->execute(array(
-                'tree_id' => $this->tree->getTreeId(), 
-                'user_id' => $this->user->getUserId(),
-                'gen' => $gen 
-        ))->fetchOne() ?: 0;
-    }
-    
-    /**
-     * Get an array of birth statistics for a specific generation
-     * Statistics are :
-     * 	- first : First birth year in generation
-     *  - last : Last birth year in generation
-     *  - avg : Average birth year
-     *
-     * @param number $gen Generation
-     * @return array Birth statistics array
-     */
-    public function getStatsBirthYearInGeneration($gen){
-        if(!$this->is_setup) return array('first' => 0, 'avg' => 0, 'last' => 0);
-        return Database::prepare(
-            'SELECT MIN(majs_birth_year) AS first, AVG(majs_birth_year) AS avg, MAX(majs_birth_year) AS last'.
-            ' FROM `##maj_sosa`' .
-            ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'.
-            ' AND majs_gen=:gen AND NOT majs_birth_year = :birth_year')
-            ->execute(array(
-                'tree_id' => $this->tree->getTreeId(), 
-                'user_id' => $this->user->getUserId(),
-                'gen' => $gen,
-                'birth_year' => 0))
-            ->fetchOneRow(\PDO::FETCH_ASSOC) ?: array('first' => 0, 'avg' => 0, 'last' => 0);
-    }
-    
-    /**
-     * Get the mean generation time, based on a linear regression of birth years and generations
-     *
-     * @return number|NULL Mean generation time
-     */
-    public function getMeanGenerationTime(){
-        if(!$this->is_setup) return;
-        if(!$this->statistics_tab){
-            $this->getStatisticsByGeneration();
-        }
-        //Linear regression on x=generation and y=birthdate
-        $sum_xy = 0;
-        $sum_x=0;
-        $sum_y=0;
-        $sum_x2=0;
-        $n=count($this->statistics_tab);
-        foreach($this->statistics_tab as $gen=>$stats){
-            $sum_xy+=$gen*$stats['avgBirth'];
-            $sum_x+=$gen;
-            $sum_y+=$stats['avgBirth'];
-            $sum_x2+=$gen*$gen;
-        }
-        $denom=($n*$sum_x2)-($sum_x*$sum_x);
-        if($denom!=0){
-            return -(($n*$sum_xy)-($sum_x*$sum_y))/($denom);
-        }
-        return null;
-    }
-    
-    /**
-     * Return a computed array of statistics about the dispersion of ancestors across the ancestors
-     * at a specified generation.
-     * This statistics cannot be used for generations above 11, as it would cause a out of range in MySQL
-     * 
-     * Format: 
-     *  - key : a base-2 representation of the ancestor at generation G for which exclusive ancestors have been found,
-     *          -1 is used for shared ancestors
-     *          For instance base2(0100) = base10(4) represent the maternal grand father
-     *  - values: number of ancestors exclusively in the ancestors of the ancestor in key
-     *  
-     *  For instance a result at generation 3 could be :
-     *      array (   -1        =>  12      -> 12 ancestors are shared by the grand-parents
-     *                base10(1) =>  32      -> 32 ancestors are exclusive to the paternal grand-father
-     *                base10(2) =>  25      -> 25 ancestors are exclusive to the paternal grand-mother
-     *                base10(4) =>  12      -> 12 ancestors are exclusive to the maternal grand-father
-     *                base10(8) =>  30      -> 30 ancestors are exclusive to the maternal grand-mother
-     *            )
-     *  
-     * @param int $gen Reference generation
-     * @return array
-     */
-    public function getAncestorDispersionForGen($gen) {
-        if(!$this->is_setup || $gen > 11) return array();  // Going further than 11 gen will be out of range in the query
-        return Database::prepare(
-            'SELECT branches, count(i_id)'.
-            ' FROM ('.
-            '   SELECT i_id,'.
-            '       CASE'.
-            '           WHEN CEIL(LOG2(SUM(branch))) = LOG2(SUM(branch)) THEN SUM(branch)'.
-            '           ELSE -1'.   // We put all ancestors shared between some branches in the same bucket
-            '       END branches'.
-            '   FROM ('.
-            '       SELECT DISTINCT majs_i_id i_id,'.
-            '           POW(2, FLOOR(majs_sosa / POW(2, (majs_gen - :gen))) - POW(2, :gen -1)) branch'.
-            '       FROM `##maj_sosa`'.
-            '       WHERE majs_gedcom_id = :tree_id AND majs_user_id = :user_id'.
-            '           AND majs_gen >= :gen'.
-            '   ) indistat'.
-            '   GROUP BY i_id'.
-            ') grouped'.
-            ' GROUP BY branches')
-            ->execute(array(
-                'tree_id' => $this->tree->getTreeId(), 
-                'user_id' => $this->user->getUserId(),
-                'gen' => $gen
-            ))->fetchAssoc() ?: array();
-    }
+	/**
+	 * Get the total Sosa count for all generations
+	 *
+	 * @return number Number of Sosas
+	 */
+	public function getSosaCount(){
+		if(!$this->is_setup) return 0;
+		return Database::prepare(
+			'SELECT SQL_CACHE COUNT(majs_sosa) FROM `##maj_sosa`' .
+			' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id')
+			->execute(array(
+				'tree_id' => $this->tree->getTreeId(), 
+				'user_id' => $this->user->getUserId() 
+			))->fetchOne() ?: 0;
+	}
+    
+	/**
+	 * Get the number of Sosa in a specific generation.
+	 *
+	 * @param number $gen Generation
+	 * @return number Number of Sosas in generation
+	 */
+	public function getSosaCountAtGeneration($gen){
+		if(!$this->is_setup) return 0;
+		return Database::prepare(
+			'SELECT SQL_CACHE COUNT(majs_sosa) FROM `##maj_sosa`' .
+			' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'.
+			' AND majs_gen= :gen')
+		->execute(array(
+				'tree_id' => $this->tree->getTreeId(), 
+				'user_id' => $this->user->getUserId(),
+				'gen' => $gen            
+		))->fetchOne() ?: 0;
+	}
+    
+	/**
+	 * Get the total number of Sosa up to a specific generation.
+	 *
+	 * @param number $gen Generation
+	 * @return number Total number of Sosas up to generation
+	 */
+	public function getSosaCountUpToGeneration($gen){
+		if(!$this->is_setup) return 0;
+		return Database::prepare(
+			'SELECT SQL_CACHE COUNT(majs_sosa) FROM `##maj_sosa`' .
+			' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'.
+			' AND majs_gen <= :gen')
+		->execute(array(
+				'tree_id' => $this->tree->getTreeId(), 
+				'user_id' => $this->user->getUserId(),
+				'gen' => $gen 
+		))->fetchOne() ?: 0;
+	}
+    
+	/**
+	 * Get the total number of distinct Sosa individual for all generations.
+	 *
+	 * @return number Total number of distinct individual
+	 */
+	public function getDifferentSosaCount(){
+		if(!$this->is_setup) return 0;
+		return Database::prepare(
+			'SELECT SQL_CACHE COUNT(DISTINCT majs_i_id) FROM `##maj_sosa`' .
+			' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id')
+		->execute(array(
+				'tree_id' => $this->tree->getTreeId(), 
+				'user_id' => $this->user->getUserId()
+		))->fetchOne() ?: 0;
+	}
+    
+	/**
+	 * Get the number of distinct Sosa individual up to a specific generation.
+	 *
+	 * @param number $gen Generation
+	 * @return number Number of distinct Sosa individuals up to generation
+	 */
+	public function getDifferentSosaCountUpToGeneration($gen){
+		if(!$this->is_setup) return 0;
+		return Database::prepare(
+			'SELECT SQL_CACHE COUNT(DISTINCT majs_i_id) FROM `##maj_sosa`' .
+			' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'.
+			' AND majs_gen <= :gen')
+		->execute(array(
+				'tree_id' => $this->tree->getTreeId(), 
+				'user_id' => $this->user->getUserId(),
+				'gen' => $gen 
+		))->fetchOne() ?: 0;
+	}
+    
+	/**
+	 * Get an array of birth statistics for a specific generation
+	 * Statistics are :
+	 * 	- first : First birth year in generation
+	 *  - last : Last birth year in generation
+	 *  - avg : Average birth year
+	 *
+	 * @param number $gen Generation
+	 * @return array Birth statistics array
+	 */
+	public function getStatsBirthYearInGeneration($gen){
+		if(!$this->is_setup) return array('first' => 0, 'avg' => 0, 'last' => 0);
+		return Database::prepare(
+			'SELECT MIN(majs_birth_year) AS first, AVG(majs_birth_year) AS avg, MAX(majs_birth_year) AS last'.
+			' FROM `##maj_sosa`' .
+			' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'.
+			' AND majs_gen=:gen AND NOT majs_birth_year = :birth_year')
+			->execute(array(
+				'tree_id' => $this->tree->getTreeId(), 
+				'user_id' => $this->user->getUserId(),
+				'gen' => $gen,
+				'birth_year' => 0))
+			->fetchOneRow(\PDO::FETCH_ASSOC) ?: array('first' => 0, 'avg' => 0, 'last' => 0);
+	}
+    
+	/**
+	 * Get the mean generation time, based on a linear regression of birth years and generations
+	 *
+	 * @return number|NULL Mean generation time
+	 */
+	public function getMeanGenerationTime(){
+		if(!$this->is_setup) return;
+		if(!$this->statistics_tab){
+			$this->getStatisticsByGeneration();
+		}
+		//Linear regression on x=generation and y=birthdate
+		$sum_xy = 0;
+		$sum_x=0;
+		$sum_y=0;
+		$sum_x2=0;
+		$n=count($this->statistics_tab);
+		foreach($this->statistics_tab as $gen=>$stats){
+			$sum_xy+=$gen*$stats['avgBirth'];
+			$sum_x+=$gen;
+			$sum_y+=$stats['avgBirth'];
+			$sum_x2+=$gen*$gen;
+		}
+		$denom=($n*$sum_x2)-($sum_x*$sum_x);
+		if($denom!=0){
+			return -(($n*$sum_xy)-($sum_x*$sum_y))/($denom);
+		}
+		return null;
+	}
+    
+	/**
+	 * Return a computed array of statistics about the dispersion of ancestors across the ancestors
+	 * at a specified generation.
+	 * This statistics cannot be used for generations above 11, as it would cause a out of range in MySQL
+	 * 
+	 * Format: 
+	 *  - key : a base-2 representation of the ancestor at generation G for which exclusive ancestors have been found,
+	 *          -1 is used for shared ancestors
+	 *          For instance base2(0100) = base10(4) represent the maternal grand father
+	 *  - values: number of ancestors exclusively in the ancestors of the ancestor in key
+	 *  
+	 *  For instance a result at generation 3 could be :
+	 *      array (   -1        =>  12      -> 12 ancestors are shared by the grand-parents
+	 *                base10(1) =>  32      -> 32 ancestors are exclusive to the paternal grand-father
+	 *                base10(2) =>  25      -> 25 ancestors are exclusive to the paternal grand-mother
+	 *                base10(4) =>  12      -> 12 ancestors are exclusive to the maternal grand-father
+	 *                base10(8) =>  30      -> 30 ancestors are exclusive to the maternal grand-mother
+	 *            )
+	 *  
+	 * @param int $gen Reference generation
+	 * @return array
+	 */
+	public function getAncestorDispersionForGen($gen) {
+		if(!$this->is_setup || $gen > 11) return array();  // Going further than 11 gen will be out of range in the query
+		return Database::prepare(
+			'SELECT branches, count(i_id)'.
+			' FROM ('.
+			'   SELECT i_id,'.
+			'       CASE'.
+			'           WHEN CEIL(LOG2(SUM(branch))) = LOG2(SUM(branch)) THEN SUM(branch)'.
+			'           ELSE -1'.   // We put all ancestors shared between some branches in the same bucket
+			'       END branches'.
+			'   FROM ('.
+			'       SELECT DISTINCT majs_i_id i_id,'.
+			'           POW(2, FLOOR(majs_sosa / POW(2, (majs_gen - :gen))) - POW(2, :gen -1)) branch'.
+			'       FROM `##maj_sosa`'.
+			'       WHERE majs_gedcom_id = :tree_id AND majs_user_id = :user_id'.
+			'           AND majs_gen >= :gen'.
+			'   ) indistat'.
+			'   GROUP BY i_id'.
+			') grouped'.
+			' GROUP BY branches')
+			->execute(array(
+				'tree_id' => $this->tree->getTreeId(), 
+				'user_id' => $this->user->getUserId(),
+				'gen' => $gen
+			))->fetchAssoc() ?: array();
+	}
     
                
 }

src/Webtrees/Module/Sosa/Views/SosaConfigView.php

Indentation +8 added lines, -8 removed lines

@@ -24,9 +24,9 @@ 
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() {
+	protected function renderContent() {
         
-        ?>        
+		?>        
         
         <div id="maj-sosa-config-page">
 			<h2><?php echo $this->data->get('title'); ?></h2>
@@ -46,9 +46,9 @@ 
         			</div>
         			<div class="value">
         				<?php 
-        				    $users = $this->data->get('users_settings');
-        				    if(count($users) == 1) {
-        				        $root_indi = $users[0]['rootid'];  ?>
+							$users = $this->data->get('users_settings');
+							if(count($users) == 1) {
+								$root_indi = $users[0]['rootid'];  ?>
         					<label>
         						<input id="maj_sosa_input_userid" type="hidden" name="userid" value="<?php echo $users[0]['user']->getUserId(); ?>" />
         						<?php echo $users[0]['user']->getRealNameHtml() ?>
@@ -56,8 +56,8 @@ 
         				<?php  } else if(count($users) > 1) { ?>
         					<select id='maj-sosa-config-select' name="userid">
         					<?php 
-        					   $root_indi = $users[0]['rootid'];
-        					   foreach ($this->data->get('users_settings') as $user) { ?>
+							   $root_indi = $users[0]['rootid'];
+							   foreach ($this->data->get('users_settings') as $user) { ?>
         						<option value="<?php echo $user['user']->getUserId(); ?>"><?php echo $user['user']->getRealNameHtml() ?></option>
         					<?php  } ?>
         					</select>
@@ -80,7 +80,7 @@ 
 			</form>	
 		
 		<?php        
-    }
+	}
     
 }
  
\ No newline at end of file

src/Webtrees/Hook/HookProvider.php

Indentation +42 added lines, -42 removed lines

@@ -43,11 +43,11 @@ 
 	 */
 	public 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;
 	}
 	
 	/**
@@ -55,7 +55,7 @@ 
 	 * @see \MyArtJaub\Webtrees\Hook\HookProviderInterface::get()
 	 */
 	public function get($hook_function, $hook_context = null) {
-	    return new Hook($hook_function, $hook_context);
+		return new Hook($hook_function, $hook_context);
 	}
 	
 	/**
@@ -73,20 +73,20 @@ 
 	public function getPossibleHooks() {
 		static $hooks=null;
 		if ($hooks === null) {
-		    $hooks = array();
+			$hooks = array();
 		    
-		    // Cannot use the same logic as the core Module loading,
-		    // as this forces a new include of the module.php file.
-		    // This causes issue when classes are defined in this file.
-		    // Cannot use Module::getActiveModules as well, as this is private.
-		    $module_names = Database::prepare(
-		        'SELECT SQL_CACHE module_name FROM `##module`'
-		    )->fetchOneColumn();
+			// Cannot use the same logic as the core Module loading,
+			// as this forces a new include of the module.php file.
+			// This causes issue when classes are defined in this file.
+			// Cannot use Module::getActiveModules as well, as this is private.
+			$module_names = Database::prepare(
+				'SELECT SQL_CACHE module_name FROM `##module`'
+			)->fetchOneColumn();
 		    
-		    foreach($module_names as $module_name) {
-		        $module = Module::getModuleByName($module_name);
+			foreach($module_names as $module_name) {
+				$module = Module::getModuleByName($module_name);
 		        
-		        if($module instanceof HookSubscriberInterface){
+				if($module instanceof HookSubscriberInterface){
 					$subscribedhooks = $module->getSubscribedHooks();
 					if(is_array($subscribedhooks)){
 						foreach($subscribedhooks as $key => $value){
@@ -111,7 +111,7 @@ 
 							}
 						}
 					}
-		        }
+				}
 			}
 		}
 		return $hooks;
@@ -153,33 +153,33 @@ 
 	 */
 	public function updateHooks() {
 	    
-	    if(Auth::isAdmin()){
-	        $ihooks = self::getInstalledHooks();
-	        $phooks = self::getPossibleHooks();
+		if(Auth::isAdmin()){
+			$ihooks = self::getInstalledHooks();
+			$phooks = self::getPossibleHooks();
 	        	
-	        // Insert hooks not existing yet in the DB
-	        if($phooks !== null){
-	            foreach($phooks as $phook => $priority){
-	                $array_hook = explode('#', $phook);
-	                if($ihooks === null || !array_key_exists($phook, $ihooks)){
-	                    $chook = new Hook($array_hook[1], $array_hook[2]);
-	                    $chook->subscribe($array_hook[0]);
-	                    $chook->setPriority($array_hook[0], $priority);
-	                }
-	            }
-	        }
+			// Insert hooks not existing yet in the DB
+			if($phooks !== null){
+				foreach($phooks as $phook => $priority){
+					$array_hook = explode('#', $phook);
+					if($ihooks === null || !array_key_exists($phook, $ihooks)){
+						$chook = new Hook($array_hook[1], $array_hook[2]);
+						$chook->subscribe($array_hook[0]);
+						$chook->setPriority($array_hook[0], $priority);
+					}
+				}
+			}
 	        	
-	        //Remove hooks not existing any more in the file system
-	        if($ihooks !== null){
-	            foreach(array_keys($ihooks) as $ihook){
-	                $array_hook = explode('#', $ihook);
-	                if($phooks === null || !array_key_exists($ihook, $phooks)){
-	                    $chook = new Hook($array_hook[1], $array_hook[2]);
-	                    $chook->remove($array_hook[0]);
-	                }
-	            }
-	        }
-	    }
+			//Remove hooks not existing any more in the file system
+			if($ihooks !== null){
+				foreach(array_keys($ihooks) as $ihook){
+					$array_hook = explode('#', $ihook);
+					if($phooks === null || !array_key_exists($ihook, $phooks)){
+						$chook = new Hook($array_hook[1], $array_hook[2]);
+						$chook->remove($array_hook[0]);
+					}
+				}
+			}
+		}
 	}
 	
 }
\ No newline at end of file

src/Webtrees/Controller/JsonController.php

Indentation +41 added lines, -41 removed lines

@@ -18,50 +18,50 @@
  */
 class JsonController extends BaseController {
     
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Controller\BaseController::pageHeader()
-     */
-    public function pageHeader() {        
-        header('Content-Type: application/json');
-        header('Cache-Control: no-cache, must-revalidate');
-        header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
-        // We've displayed the header - display the footer automatically
-        register_shutdown_function(array($this, 'pageFooter'));
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Controller\BaseController::pageHeader()
+	 */
+	public function pageHeader() {        
+		header('Content-Type: application/json');
+		header('Cache-Control: no-cache, must-revalidate');
+		header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+		// We've displayed the header - display the footer automatically
+		register_shutdown_function(array($this, 'pageFooter'));
         
-        return $this;
-    }
+		return $this;
+	}
     
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Controller\BaseController::pageFooter()
-     */
-    public function pageFooter() {
-        return $this;
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Controller\BaseController::pageFooter()
+	 */
+	public function pageFooter() {
+		return $this;
+	}
     
-    /**
-     * Restrict access.
-     *
-     * @param bool $condition
-     *
-     * @return $this
-     */
-    public function restrictAccess($condition) {
-        if ($condition !== true) {
-            throw new MvcException(403);
-        }
+	/**
+	 * Restrict access.
+	 *
+	 * @param bool $condition
+	 *
+	 * @return $this
+	 */
+	public function restrictAccess($condition) {
+		if ($condition !== true) {
+			throw new MvcException(403);
+		}
     
-        return $this;
-    }
+		return $this;
+	}
     
-    /**
-     * Encode the data to JSON format.
-     * 
-     * @param array $data Data to encode
-     * @param number $options JSON options mask. See http://php.net/manual/fr/json.constants.php
-     */
-    public function encode(array $data, $options = 0) {
-        echo json_encode($data, $options);
-    }
+	/**
+	 * Encode the data to JSON format.
+	 * 
+	 * @param array $data Data to encode
+	 * @param number $options JSON options mask. See http://php.net/manual/fr/json.constants.php
+	 */
+	public function encode(array $data, $options = 0) {
+		echo json_encode($data, $options);
+	}
 }

src/Webtrees/Cache.php

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