jon48 / webtrees-lib

src/Webtrees/Functions/Functions.php

Doc Comments +7 added lines, -7 removed lines

@@ -51,8 +51,8 @@ 
 	 * 
 	 * @param integer $num Numerator
 	 * @param integer $denom Denominator
-	 * @param float $default Default value if denominator null or 0
-	 * @return float Result of the safe division
+	 * @param integer $default Default value if denominator null or 0
+	 * @return integer Result of the safe division
 	 */
 	public static function safeDivision($num, $denom, $default = 0) {
 		if($denom && $denom!=0){
@@ -66,8 +66,8 @@ 
 	 *
 	 * @param int $num Numerator
 	 * @param int $denom Denominator
-	 * @param float $default Default value if denominator null or 0
-	 * @return float Percentage
+	 * @param integer $default Default value if denominator null or 0
+	 * @return integer Percentage
 	 */
 	public static function getPercentage($num, $denom, $default = 0){
 		return 100 * self::safeDivision($num, $denom, $default);
@@ -78,7 +78,7 @@ 
 	 *
 	 * @param string $file The image to resize
 	 * @param int $target	The final max width/height
-	 * @return array array of ($width, $height). One of them must be $target
+	 * @return integer[] array of ($width, $height). One of them must be $target
 	 */
 	static public function getResizedImageSize($file, $target=25){
 		list($width, $height, $type, $attr) = getimagesize($file);
@@ -233,7 +233,7 @@ 
 	 * Returns the generation associated with a Sosa number
 	 *
 	 * @param int $sosa Sosa number
-	 * @return number
+	 * @return integer
 	 */
 	public static function getGeneration($sosa){
 		return(int)log($sosa, 2)+1;
@@ -246,7 +246,7 @@ 
 	 * Returns whether the image type is supported by the system, and if so, return the standardised type
 	 *
 	 * @param string $reqtype Extension to test
-	 * @return boolean|string Is supported?
+	 * @return false|string Is supported?
 	 */
 	public static function isImageTypeSupported($reqtype) {
 	    $supportByGD = array('jpg'=>'jpeg', 'jpeg'=>'jpeg', 'gif'=>'gif', 'png'=>'png');

Spacing +27 added lines, -27 removed lines

@@ -38,9 +38,9 @@ 
 	 *
 	 * @param string $text Text to display
 	 */
-	static public function promptAlert($text){
+	static public function promptAlert($text) {
 		echo '<script>';
-		echo 'alert("',fw\Filter::escapeHtml($text),'")';
+		echo 'alert("', fw\Filter::escapeHtml($text), '")';
 		echo '</script>';
 	}
 	
@@ -53,7 +53,7 @@ 
 	 * @return float Result of the safe division
 	 */
 	public static function safeDivision($num, $denom, $default = 0) {
-		if($denom && $denom!=0){
+		if ($denom && $denom != 0) {
 			return $num / $denom;
 		}
 		return $default;
@@ -67,7 +67,7 @@ 
 	 * @param float $default Default value if denominator null or 0
 	 * @return float Percentage
 	 */
-	public static function getPercentage($num, $denom, $default = 0){
+	public static function getPercentage($num, $denom, $default = 0) {
 		return 100 * self::safeDivision($num, $denom, $default);
 	}
 	
@@ -78,8 +78,8 @@ 
 	 * @param int $target	The final max width/height
 	 * @return array array of ($width, $height). One of them must be $target
 	 */
-	static public function getResizedImageSize($file, $target=25){
-		list($width, $height, , ) = getimagesize($file);
+	static public function getResizedImageSize($file, $target = 25) {
+		list($width, $height,,) = getimagesize($file);
 		$max = max($width, $height);
 		$rapp = $target / $max;
 		$width = intval($rapp * $width);
@@ -109,21 +109,21 @@ 
 	 * @param int $length Length of the token, default to 32
 	 * @return string Random token
 	 */
-	public static function generateRandomToken($length=32) {
+	public static function generateRandomToken($length = 32) {
 		$chars = str_split('abcdefghijkmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789');
 		$len_chars = count($chars);
 		$token = '';
 		
 		for ($i = 0; $i < $length; $i++)
-			$token .= $chars[ mt_rand(0, $len_chars - 1) ];
+			$token .= $chars[mt_rand(0, $len_chars - 1)];
 		
 		# Number of 32 char chunks
-		$chunks = ceil( strlen($token) / 32 );
+		$chunks = ceil(strlen($token) / 32);
 		$md5token = '';
 		
 		# Run each chunk through md5
-		for ( $i=1; $i<=$chunks; $i++ )
-			$md5token .= md5( substr($token, $i * 32 - 32, 32) );
+		for ($i = 1; $i <= $chunks; $i++)
+			$md5token .= md5(substr($token, $i * 32 - 32, 32));
 		
 			# Trim the token
 		return substr($md5token, 0, $length);		
@@ -136,12 +136,12 @@ 
 	 * @param string $data Text to encrypt
 	 * @return string Encrypted and encoded text
 	 */
-	public static function encryptToSafeBase64($data){
+	public static function encryptToSafeBase64($data) {
 		$key = 'STANDARDKEYIFNOSERVER';
-		if(Filter::server('SERVER_NAME') && Filter::server('SERVER_SOFTWARE'))
+		if (Filter::server('SERVER_NAME') && Filter::server('SERVER_SOFTWARE'))
 			$key = md5(Filter::server('SERVER_NAME').Filter::server('SERVER_SOFTWARE'));
 		$iv = mcrypt_create_iv(self::ENCRYPTION_IV_SIZE, MCRYPT_RAND);
-		$id = mcrypt_encrypt(MCRYPT_RIJNDAEL_128, $key, $data, MCRYPT_MODE_CBC,$iv);
+		$id = mcrypt_encrypt(MCRYPT_RIJNDAEL_128, $key, $data, MCRYPT_MODE_CBC, $iv);
 		$encrypted = base64_encode($iv.$id);
 		// +, / and = are not URL-compatible
 		$encrypted = str_replace('+', '-', $encrypted);
@@ -156,22 +156,22 @@ 
 	 * @param string $encrypted Text to decrypt
 	 * @return string Decrypted text
 	 */
-	public static function decryptFromSafeBase64($encrypted){
+	public static function decryptFromSafeBase64($encrypted) {
 		$key = 'STANDARDKEYIFNOSERVER';
-		if(Filter::server('SERVER_NAME') && Filter::server('SERVER_SOFTWARE'))
+		if (Filter::server('SERVER_NAME') && Filter::server('SERVER_SOFTWARE'))
 			$key = md5(Filter::server('SERVER_NAME').Filter::server('SERVER_SOFTWARE'));
 		$encrypted = str_replace('-', '+', $encrypted);
 		$encrypted = str_replace('_', '/', $encrypted);
 		$encrypted = str_replace('*', '=', $encrypted);
 		$encrypted = base64_decode($encrypted);
-		if(!$encrypted)
+		if (!$encrypted)
 			throw new \InvalidArgumentException('The encrypted value is not in correct base64 format.');
-		if(strlen($encrypted) < self::ENCRYPTION_IV_SIZE) 
+		if (strlen($encrypted) < self::ENCRYPTION_IV_SIZE) 
 			throw new \InvalidArgumentException('The encrypted value does not contain enough characters for the key.');
 		$iv_dec = substr($encrypted, 0, self::ENCRYPTION_IV_SIZE);
 		$encrypted = substr($encrypted, self::ENCRYPTION_IV_SIZE);
 		$decrypted = mcrypt_decrypt(MCRYPT_RIJNDAEL_128, $key, $encrypted, MCRYPT_MODE_CBC, $iv_dec);
-		return  preg_replace('~(?:\\000+)$~','',$decrypted);
+		return  preg_replace('~(?:\\000+)$~', '', $decrypted);
 	}
 	
 	/**
@@ -180,9 +180,9 @@ 
 	 * @param string $string Filesystem encoded string to encode
 	 * @return string UTF-8 encoded string
 	 */
-	public static function encodeFileSystemToUtf8($string){
+	public static function encodeFileSystemToUtf8($string) {
 		if (strtoupper(substr(php_uname('s'), 0, 7)) === 'WINDOWS') {
-		    return iconv('cp1252', 'utf-8//IGNORE',$string);
+		    return iconv('cp1252', 'utf-8//IGNORE', $string);
 		}
 		return $string;
 	}
@@ -193,9 +193,9 @@ 
 	 * @param string $string UTF-8 encoded string to encode
 	 * @return string Filesystem encoded string
 	 */
-	public static function encodeUtf8ToFileSystem($string){
+	public static function encodeUtf8ToFileSystem($string) {
 		if (preg_match('//u', $string) && strtoupper(substr(php_uname('s'), 0, 7)) === 'WINDOWS') {
-			return iconv('utf-8', 'cp1252//IGNORE' ,  $string);
+			return iconv('utf-8', 'cp1252//IGNORE', $string);
 		}
 		return $string;
 	}
@@ -208,7 +208,7 @@ 
 	 * @return boolean True if path valid
 	 */
 	public static function isValidPath($filename, $acceptfolder = FALSE) {		
-		if(strpbrk($filename, $acceptfolder ? '?%*:|"<>' : '\\/?%*:|"<>') === FALSE) return true;
+		if (strpbrk($filename, $acceptfolder ? '?%*:|"<>' : '\\/?%*:|"<>') === FALSE) return true;
 		return false;
 	}
 	
@@ -220,7 +220,7 @@ 
 	 * @return array Array of month short names
 	 */
 	public static function getCalendarShortMonths($calendarId = 0) {
-		if(!isset(self::$calendarShortMonths[$calendarId])) {
+		if (!isset(self::$calendarShortMonths[$calendarId])) {
 			$calendar_info = cal_info($calendarId);
 			self::$calendarShortMonths[$calendarId] = $calendar_info['abbrevmonths'];
 		}		
@@ -233,8 +233,8 @@ 
 	 * @param int $sosa Sosa number
 	 * @return number
 	 */
-	public static function getGeneration($sosa){
-		return(int)log($sosa, 2)+1;
+	public static function getGeneration($sosa) {
+		return(int)log($sosa, 2) + 1;
 	}
 	
 	

Braces +21 added lines, -13 removed lines

@@ -114,16 +114,18 @@ 
 		$len_chars = count($chars);
 		$token = '';
 		
-		for ($i = 0; $i < $length; $i++)
-			$token .= $chars[ mt_rand(0, $len_chars - 1) ];
+		for ($i = 0; $i < $length; $i++) {
+					$token .= $chars[ mt_rand(0, $len_chars - 1) ];
+		}
 		
 		# Number of 32 char chunks
 		$chunks = ceil( strlen($token) / 32 );
 		$md5token = '';
 		
 		# Run each chunk through md5
-		for ( $i=1; $i<=$chunks; $i++ )
-			$md5token .= md5( substr($token, $i * 32 - 32, 32) );
+		for ( $i=1; $i<=$chunks; $i++ ) {
+					$md5token .= md5( substr($token, $i * 32 - 32, 32) );
+		}
 		
 			# Trim the token
 		return substr($md5token, 0, $length);		
@@ -138,8 +140,9 @@ 
 	 */
 	public static function encryptToSafeBase64($data){
 		$key = 'STANDARDKEYIFNOSERVER';
-		if(Filter::server('SERVER_NAME') && Filter::server('SERVER_SOFTWARE'))
-			$key = md5(Filter::server('SERVER_NAME').Filter::server('SERVER_SOFTWARE'));
+		if(Filter::server('SERVER_NAME') && Filter::server('SERVER_SOFTWARE')) {
+					$key = md5(Filter::server('SERVER_NAME').Filter::server('SERVER_SOFTWARE'));
+		}
 		$iv = mcrypt_create_iv(self::ENCRYPTION_IV_SIZE, MCRYPT_RAND);
 		$id = mcrypt_encrypt(MCRYPT_RIJNDAEL_128, $key, $data, MCRYPT_MODE_CBC,$iv);
 		$encrypted = base64_encode($iv.$id);
@@ -158,16 +161,19 @@ 
 	 */
 	public static function decryptFromSafeBase64($encrypted){
 		$key = 'STANDARDKEYIFNOSERVER';
-		if(Filter::server('SERVER_NAME') && Filter::server('SERVER_SOFTWARE'))
-			$key = md5(Filter::server('SERVER_NAME').Filter::server('SERVER_SOFTWARE'));
+		if(Filter::server('SERVER_NAME') && Filter::server('SERVER_SOFTWARE')) {
+					$key = md5(Filter::server('SERVER_NAME').Filter::server('SERVER_SOFTWARE'));
+		}
 		$encrypted = str_replace('-', '+', $encrypted);
 		$encrypted = str_replace('_', '/', $encrypted);
 		$encrypted = str_replace('*', '=', $encrypted);
 		$encrypted = base64_decode($encrypted);
-		if(!$encrypted)
-			throw new \InvalidArgumentException('The encrypted value is not in correct base64 format.');
-		if(strlen($encrypted) < self::ENCRYPTION_IV_SIZE) 
-			throw new \InvalidArgumentException('The encrypted value does not contain enough characters for the key.');
+		if(!$encrypted) {
+					throw new \InvalidArgumentException('The encrypted value is not in correct base64 format.');
+		}
+		if(strlen($encrypted) < self::ENCRYPTION_IV_SIZE) {
+					throw new \InvalidArgumentException('The encrypted value does not contain enough characters for the key.');
+		}
 		$iv_dec = substr($encrypted, 0, self::ENCRYPTION_IV_SIZE);
 		$encrypted = substr($encrypted, self::ENCRYPTION_IV_SIZE);
 		$decrypted = mcrypt_decrypt(MCRYPT_RIJNDAEL_128, $key, $encrypted, MCRYPT_MODE_CBC, $iv_dec);
@@ -208,7 +214,9 @@ 
 	 * @return boolean True if path valid
 	 */
 	public static function isValidPath($filename, $acceptfolder = FALSE) {		
-		if(strpbrk($filename, $acceptfolder ? '?%*:|"<>' : '\\/?%*:|"<>') === FALSE) return true;
+		if(strpbrk($filename, $acceptfolder ? '?%*:|"<>' : '\\/?%*:|"<>') === FALSE) {
+			return true;
+		}
 		return false;
 	}
 	

src/Webtrees/Module/GeoDispersion/Model/GeoAnalysisProvider.php

Indentation +327 added lines, -327 removed lines

@@ -21,130 +21,130 @@ 
  */
 class GeoAnalysisProvider {
     
-    /**
-     * Reference tree
-     * @var Tree $tree
-     */
-    protected $tree;
+	/**
+	 * Reference tree
+	 * @var Tree $tree
+	 */
+	protected $tree;
     
-    /**
-     * Cached hierarchy of places in the Gedcom file.
-     * 
-     * @var (array|null) $place_hierarchy
-     */
-    protected $place_hierarchy;
+	/**
+	 * Cached hierarchy of places in the Gedcom file.
+	 * 
+	 * @var (array|null) $place_hierarchy
+	 */
+	protected $place_hierarchy;
     
-    /**
-     * Constructor for GeoAnalysis Provider.
-     * A provider is defined in relation to a specific tree.
-     *
-     * @param Tree $tree
-     */
-    public function __construct(Tree $tree) {
-        $this->tree = $tree;
-        $this->place_hierarchy = null;
-    }
+	/**
+	 * Constructor for GeoAnalysis Provider.
+	 * A provider is defined in relation to a specific tree.
+	 *
+	 * @param Tree $tree
+	 */
+	public function __construct(Tree $tree) {
+		$this->tree = $tree;
+		$this->place_hierarchy = null;
+	}
     
-    /**
-     * Creates and returns a GeoAnalysis object from a data row.
-     * The row data is expected to be an array with the indexes:
-     *  - majgd_id: geodispersion analysis ID
-     *  - majgd_descr: geodispersion analysis description/title
-     *  - majgd_sublevel: Analysis level
-     *  - majgd_useflagsgen: Use flags in places display
-     *  - majgd_detailsgen: Number of top places
-     *  - majgd_map: file name of the map
-     *  - majgd_toplevel: parent level for the map
-     * 
-     * @param array $row
-     * @return GeoAnalysis
-     */
-    protected function loadGeoAnalysisFromRow($row) {
-        $options = new GeoDisplayOptions();
-        $options
-        ->setUsingFlags($row['majgd_useflagsgen'] == 'yes')
-        ->setMaxDetailsInGen($row['majgd_detailsgen']);
+	/**
+	 * Creates and returns a GeoAnalysis object from a data row.
+	 * The row data is expected to be an array with the indexes:
+	 *  - majgd_id: geodispersion analysis ID
+	 *  - majgd_descr: geodispersion analysis description/title
+	 *  - majgd_sublevel: Analysis level
+	 *  - majgd_useflagsgen: Use flags in places display
+	 *  - majgd_detailsgen: Number of top places
+	 *  - majgd_map: file name of the map
+	 *  - majgd_toplevel: parent level for the map
+	 * 
+	 * @param array $row
+	 * @return GeoAnalysis
+	 */
+	protected function loadGeoAnalysisFromRow($row) {
+		$options = new GeoDisplayOptions();
+		$options
+		->setUsingFlags($row['majgd_useflagsgen'] == 'yes')
+		->setMaxDetailsInGen($row['majgd_detailsgen']);
         
-        if($row['majgd_map']) {
-            $options
-            ->setMap(new OutlineMap($row['majgd_map']))
-            ->setMapLevel($row['majgd_toplevel']);
-        }
+		if($row['majgd_map']) {
+			$options
+			->setMap(new OutlineMap($row['majgd_map']))
+			->setMapLevel($row['majgd_toplevel']);
+		}
         
-        $enabled = true;
-        if(isset($row['majgd_status']) && $row['majgd_status'] == 'disabled') {
-            $enabled = false;
-        }
+		$enabled = true;
+		if(isset($row['majgd_status']) && $row['majgd_status'] == 'disabled') {
+			$enabled = false;
+		}
         
-        return new GeoAnalysis(
-            $this->tree,
-            $row['majgd_id'],
-            $row['majgd_descr'],
-            $row['majgd_sublevel'],
-            $options,
-            $enabled
-            );
-    }
+		return new GeoAnalysis(
+			$this->tree,
+			$row['majgd_id'],
+			$row['majgd_descr'],
+			$row['majgd_sublevel'],
+			$options,
+			$enabled
+			);
+	}
     
-    /**
-     * Returns the number of geographical analysis (active and inactive). 
-     * 
-     * @return int
-     */
-    public function getGeoAnalysisCount() {
-        return Database::prepare(
-            'SELECT COUNT(majgd_id)' .
-            ' FROM `##maj_geodispersion`' .
-            ' WHERE majgd_file = :gedcom_id'
-            )->execute(array(
-                'gedcom_id' => $this->tree->getTreeId()
-            ))->fetchOne();
-    }
+	/**
+	 * Returns the number of geographical analysis (active and inactive). 
+	 * 
+	 * @return int
+	 */
+	public function getGeoAnalysisCount() {
+		return Database::prepare(
+			'SELECT COUNT(majgd_id)' .
+			' FROM `##maj_geodispersion`' .
+			' WHERE majgd_file = :gedcom_id'
+			)->execute(array(
+				'gedcom_id' => $this->tree->getTreeId()
+			))->fetchOne();
+	}
     
-    /**
-     * Get a geographical analysis by its ID.
-     * The function can only search for only enabled analysis, or all.
-     * 
-     * @param int $id geodispersion analysis ID
-     * @param bool $only_enabled Search for only enabled geodispersion analysis
-     * @return \MyArtJaub\Webtrees\Module\GeoDispersion\Model\GeoAnalysis|NULL
-     */
-    public function getGeoAnalysis($id, $only_enabled = true) {
-        $args = array (
-            'gedcom_id' => $this->tree->getTreeId(),
-            'ga_id' => $id
-        );
+	/**
+	 * Get a geographical analysis by its ID.
+	 * The function can only search for only enabled analysis, or all.
+	 * 
+	 * @param int $id geodispersion analysis ID
+	 * @param bool $only_enabled Search for only enabled geodispersion analysis
+	 * @return \MyArtJaub\Webtrees\Module\GeoDispersion\Model\GeoAnalysis|NULL
+	 */
+	public function getGeoAnalysis($id, $only_enabled = true) {
+		$args = array (
+			'gedcom_id' => $this->tree->getTreeId(),
+			'ga_id' => $id
+		);
         
-        $sql = 'SELECT majgd_id, majgd_descr, majgd_sublevel, majgd_map, majgd_toplevel, majgd_useflagsgen, majgd_detailsgen, majgd_status' .
-            ' FROM `##maj_geodispersion`' .
-            ' WHERE majgd_file = :gedcom_id AND majgd_id=:ga_id';
-        if($only_enabled) {
-            $sql .= ' AND majgd_status = :status';
-            $args['status'] = 'enabled';
-        }
-        $sql .= ' ORDER BY majgd_descr';
+		$sql = 'SELECT majgd_id, majgd_descr, majgd_sublevel, majgd_map, majgd_toplevel, majgd_useflagsgen, majgd_detailsgen, majgd_status' .
+			' FROM `##maj_geodispersion`' .
+			' WHERE majgd_file = :gedcom_id AND majgd_id=:ga_id';
+		if($only_enabled) {
+			$sql .= ' AND majgd_status = :status';
+			$args['status'] = 'enabled';
+		}
+		$sql .= ' ORDER BY majgd_descr';
         
-        $ga_array = Database::prepare($sql)->execute($args)->fetchOneRow(\PDO::FETCH_ASSOC);
+		$ga_array = Database::prepare($sql)->execute($args)->fetchOneRow(\PDO::FETCH_ASSOC);
         
-        if($ga_array) {
-            return $this->loadGeoAnalysisFromRow($ga_array);
-        }
+		if($ga_array) {
+			return $this->loadGeoAnalysisFromRow($ga_array);
+		}
         
-        return null;            
-    }
+		return null;            
+	}
     
-    /**
-     * Add a new geodispersion analysis in the database, in a transactional manner.
-     * When successful, eturns the newly created GeoAnalysis object.
-     * 
-     * @param string $description geodispersion analysis title
-     * @param int $analysis_level Analysis level
-     * @param string $map_file Filename of the map
-     * @param int $map_top_level Parent level of the map
-     * @param bool $use_flags Use flag in the place display
-     * @param int $gen_details Number of top places to display
-     * @return GeoAnalysis
-     */
+	/**
+	 * Add a new geodispersion analysis in the database, in a transactional manner.
+	 * When successful, eturns the newly created GeoAnalysis object.
+	 * 
+	 * @param string $description geodispersion analysis title
+	 * @param int $analysis_level Analysis level
+	 * @param string $map_file Filename of the map
+	 * @param int $map_top_level Parent level of the map
+	 * @param bool $use_flags Use flag in the place display
+	 * @param int $gen_details Number of top places to display
+	 * @return GeoAnalysis
+	 */
 	public function createGeoAnalysis($description, $analysis_level, $map_file, $map_top_level, $use_flags, $gen_details) {
 		try{
 			Database::beginTransaction();
@@ -174,17 +174,17 @@ 
 			Log::addErrorLog('A new Geo Analysis failed to be created. Transaction rollbacked. Parameters ['.$description.', '.$analysis_level.','.$map_file.','.$map_top_level.','.$use_flags.', '.$gen_details.']. Exception: '.$ex->getMessage());
 		}
 		return $ga;
-    }
+	}
 	
-    /**
-     * Update a geodispersion analysis in the database, in transactional manner.
-     * When successful, returns the updated GeoAnalysis object
-     *  
-     * @param GeoAnalysis $ga
-     * @return GeoAnalysis
-     */
-    public function updateGeoAnalysis(GeoAnalysis $ga) {
-        try {
+	/**
+	 * Update a geodispersion analysis in the database, in transactional manner.
+	 * When successful, returns the updated GeoAnalysis object
+	 *  
+	 * @param GeoAnalysis $ga
+	 * @return GeoAnalysis
+	 */
+	public function updateGeoAnalysis(GeoAnalysis $ga) {
+		try {
 			Database::beginTransaction();
 		
 			Database::prepare(
@@ -217,236 +217,236 @@ 
 			$ga = null;
 		}
 		return $ga;
-    }
+	}
     
-    /**
-     * Set the status of a specific analysis.
-     * The status can be enabled (true), or disabled (false).
-     * 
-     * @param GeoAnalysis $ga
-     * @param bool $status
-     */
-    public function setGeoAnalysisStatus(GeoAnalysis $ga, $status) {
-        Database::prepare(
-            'UPDATE `##maj_geodispersion`'.
-            ' SET majgd_status = :status'.
-            ' WHERE majgd_file = :gedcom_id AND majgd_id=:ga_id'
-        )->execute(array(
-                'gedcom_id' => $this->tree->getTreeId(),
-                'status' => $status ? 'enabled' : 'disabled',
-                'ga_id' => $ga->getId()
-        ));
-    }
+	/**
+	 * Set the status of a specific analysis.
+	 * The status can be enabled (true), or disabled (false).
+	 * 
+	 * @param GeoAnalysis $ga
+	 * @param bool $status
+	 */
+	public function setGeoAnalysisStatus(GeoAnalysis $ga, $status) {
+		Database::prepare(
+			'UPDATE `##maj_geodispersion`'.
+			' SET majgd_status = :status'.
+			' WHERE majgd_file = :gedcom_id AND majgd_id=:ga_id'
+		)->execute(array(
+				'gedcom_id' => $this->tree->getTreeId(),
+				'status' => $status ? 'enabled' : 'disabled',
+				'ga_id' => $ga->getId()
+		));
+	}
     
-    /**
-     * Delete a geodispersion analysis from the database.
-     * 
-     * @param GeoAnalysis $ga
-     */
-    public function deleteGeoAnalysis(GeoAnalysis $ga) {
-        Database::prepare(
-            'DELETE FROM `##maj_geodispersion`'.
-            ' WHERE majgd_file = :gedcom_id AND majgd_id=:ga_id'
-            )->execute(array(
-                'gedcom_id' => $this->tree->getTreeId(),
-                'ga_id' => $ga->getId()
-            ));
-    }
+	/**
+	 * Delete a geodispersion analysis from the database.
+	 * 
+	 * @param GeoAnalysis $ga
+	 */
+	public function deleteGeoAnalysis(GeoAnalysis $ga) {
+		Database::prepare(
+			'DELETE FROM `##maj_geodispersion`'.
+			' WHERE majgd_file = :gedcom_id AND majgd_id=:ga_id'
+			)->execute(array(
+				'gedcom_id' => $this->tree->getTreeId(),
+				'ga_id' => $ga->getId()
+			));
+	}
         
-    /**
-     * Return the list of geodispersion analysis recorded and enabled for a specific GEDCOM
-     *
-     * @return array List of enabled maps
-     */
-    public function getGeoAnalysisList(){
-        $res = array();
+	/**
+	 * Return the list of geodispersion analysis recorded and enabled for a specific GEDCOM
+	 *
+	 * @return array List of enabled maps
+	 */
+	public function getGeoAnalysisList(){
+		$res = array();
         
-        $list = Database::prepare(
-            'SELECT majgd_id, majgd_descr, majgd_sublevel, majgd_map, majgd_toplevel, majgd_useflagsgen, majgd_detailsgen' .
-            ' FROM `##maj_geodispersion`' .
-            ' WHERE majgd_file = :gedcom_id AND majgd_status = :status'.
-            ' ORDER BY majgd_descr'
-        )->execute(array(
-            'gedcom_id' => $this->tree->getTreeId(),
-            'status' => 'enabled'
-        ))->fetchAll(\PDO::FETCH_ASSOC);
+		$list = Database::prepare(
+			'SELECT majgd_id, majgd_descr, majgd_sublevel, majgd_map, majgd_toplevel, majgd_useflagsgen, majgd_detailsgen' .
+			' FROM `##maj_geodispersion`' .
+			' WHERE majgd_file = :gedcom_id AND majgd_status = :status'.
+			' ORDER BY majgd_descr'
+		)->execute(array(
+			'gedcom_id' => $this->tree->getTreeId(),
+			'status' => 'enabled'
+		))->fetchAll(\PDO::FETCH_ASSOC);
         
-        foreach($list as $ga) {
-           $res[] = $this->loadGeoAnalysisFromRow($ga);
-        }
+		foreach($list as $ga) {
+		   $res[] = $this->loadGeoAnalysisFromRow($ga);
+		}
         
-        return $res;
-    }
+		return $res;
+	}
     
-    /**
-     * Return the list of geodispersion analysis matching specified criterias.
-     * 
-     * @param string $search Search criteria in analysis description
-     * @param array $order_by Columns to order by
-     * @param int $start Offset to start with (for pagination)
-     * @param int|null $limit Max number of items to return (for pagination)
-     * @return \MyArtJaub\Webtrees\Module\GeoDispersion\Model\GeoAnalysis[]
-     */
-    public function getFilteredGeoAnalysisList($search = null, $order_by = null, $start = 0, $limit = null){
-        $res = array();
+	/**
+	 * Return the list of geodispersion analysis matching specified criterias.
+	 * 
+	 * @param string $search Search criteria in analysis description
+	 * @param array $order_by Columns to order by
+	 * @param int $start Offset to start with (for pagination)
+	 * @param int|null $limit Max number of items to return (for pagination)
+	 * @return \MyArtJaub\Webtrees\Module\GeoDispersion\Model\GeoAnalysis[]
+	 */
+	public function getFilteredGeoAnalysisList($search = null, $order_by = null, $start = 0, $limit = null){
+		$res = array();
             
-        $sql = 
-            'SELECT majgd_id, majgd_descr, majgd_sublevel, majgd_map, majgd_toplevel, majgd_useflagsgen, majgd_detailsgen, majgd_status' .
-            ' FROM `##maj_geodispersion`' .
-            ' WHERE majgd_file = :gedcom_id';
+		$sql = 
+			'SELECT majgd_id, majgd_descr, majgd_sublevel, majgd_map, majgd_toplevel, majgd_useflagsgen, majgd_detailsgen, majgd_status' .
+			' FROM `##maj_geodispersion`' .
+			' WHERE majgd_file = :gedcom_id';
         
-        $args = array('gedcom_id'=> $this->tree->getTreeId());
+		$args = array('gedcom_id'=> $this->tree->getTreeId());
         
-        if($search) {
-            $sql .= ' AND majgd_descr LIKE CONCAT(\'%\', :search, \'%\')';
-            $args['search'] = $search;
-        }
+		if($search) {
+			$sql .= ' AND majgd_descr LIKE CONCAT(\'%\', :search, \'%\')';
+			$args['search'] = $search;
+		}
         
-        if ($order_by) {
-            $sql .= ' ORDER BY ';
-            foreach ($order_by as $key => $value) {
-                if ($key > 0) {
-                    $sql .= ',';
-                }
+		if ($order_by) {
+			$sql .= ' ORDER BY ';
+			foreach ($order_by as $key => $value) {
+				if ($key > 0) {
+					$sql .= ',';
+				}
                 
-                switch ($value['dir']) {
-                    case 'asc':
-                        $sql .= $value['column'] . ' ASC ';
-                        break;
-                    case 'desc':
-                        $sql .= $value['column'] . ' DESC ';
-                        break;
-                }
-            }
-        } else {
-            $sql = " ORDER BY majgd_descr ASC";
-        }
+				switch ($value['dir']) {
+					case 'asc':
+						$sql .= $value['column'] . ' ASC ';
+						break;
+					case 'desc':
+						$sql .= $value['column'] . ' DESC ';
+						break;
+				}
+			}
+		} else {
+			$sql = " ORDER BY majgd_descr ASC";
+		}
         
-        if ($limit) {
-            $sql .= " LIMIT :limit OFFSET :offset";
-            $args['limit']  = $limit;
-            $args['offset'] = $start;
-        }
+		if ($limit) {
+			$sql .= " LIMIT :limit OFFSET :offset";
+			$args['limit']  = $limit;
+			$args['offset'] = $start;
+		}
             
-        $data = Database::prepare($sql)->execute($args)->fetchAll(\PDO::FETCH_ASSOC);
+		$data = Database::prepare($sql)->execute($args)->fetchAll(\PDO::FETCH_ASSOC);
 
-        foreach($data as $ga) {
-            $res[] = $this->loadGeoAnalysisFromRow($ga);
-        }
+		foreach($data as $ga) {
+			$res[] = $this->loadGeoAnalysisFromRow($ga);
+		}
         
-        return $res;
-    }
+		return $res;
+	}
             
-    /**
-     * Returns the infered place hierarchy, determined from the Gedcom data.
-     * Depending on the data, it can be based on the Gedcom Header description, or from a place example.
-     * This is returned as an associative array:
-     *      - type:    describe the source of the data (<em>header<em> / <em>data</em>)
-     *      - hierarchy: an array of the place hierarchy (in reverse order of the gedcom)
-     *      
-     * @return array
-     */
-    public function getPlacesHierarchy() {
-        if(!$this->place_hierarchy) {
-            if($place_structure = $this->getPlacesHierarchyFromHeader()) {
-                $this->place_hierarchy = array('type' => 'header', 'hierarchy' => $place_structure);
-            }
-            else {
-                $this->place_hierarchy = array('type' => 'data', 'hierarchy' => $this->getPlacesHierarchyFromData());
-            }            
-        }
-        return $this->place_hierarchy;        
-    }
+	/**
+	 * Returns the infered place hierarchy, determined from the Gedcom data.
+	 * Depending on the data, it can be based on the Gedcom Header description, or from a place example.
+	 * This is returned as an associative array:
+	 *      - type:    describe the source of the data (<em>header<em> / <em>data</em>)
+	 *      - hierarchy: an array of the place hierarchy (in reverse order of the gedcom)
+	 *      
+	 * @return array
+	 */
+	public function getPlacesHierarchy() {
+		if(!$this->place_hierarchy) {
+			if($place_structure = $this->getPlacesHierarchyFromHeader()) {
+				$this->place_hierarchy = array('type' => 'header', 'hierarchy' => $place_structure);
+			}
+			else {
+				$this->place_hierarchy = array('type' => 'data', 'hierarchy' => $this->getPlacesHierarchyFromData());
+			}            
+		}
+		return $this->place_hierarchy;        
+	}
     
-    /**
-     * Returns an array of the place hierarchy, as defined in the GEDCOM header.
-     * The places are reversed compared to normal GEDCOM structure.
-     * 
-     * @return array|null
-     */
-    protected function getPlacesHierarchyFromHeader() {
-        $head = GedcomRecord::getInstance('HEAD', $this->tree);
-        $head_place = $head->getFirstFact('PLAC');
-        if($head_place && $head_place_value = $head_place->getAttribute('FORM')){
-            return array_reverse(array_map('trim',explode(',', $head_place_value)));
-        }
-        return null;
-    }
+	/**
+	 * Returns an array of the place hierarchy, as defined in the GEDCOM header.
+	 * The places are reversed compared to normal GEDCOM structure.
+	 * 
+	 * @return array|null
+	 */
+	protected function getPlacesHierarchyFromHeader() {
+		$head = GedcomRecord::getInstance('HEAD', $this->tree);
+		$head_place = $head->getFirstFact('PLAC');
+		if($head_place && $head_place_value = $head_place->getAttribute('FORM')){
+			return array_reverse(array_map('trim',explode(',', $head_place_value)));
+		}
+		return null;
+	}
     
-    /**
-     * Returns an array of the place hierarchy, based on a random example of place within the GEDCOM.
-     * It will look for the longest hierarchy in the tree.
-     * The places are reversed compared to normal GEDCOM structure.
-     * 
-     * @return array
-     */
-    protected function getPlacesHierarchyFromData() {
-        $nb_levels = 0;
+	/**
+	 * Returns an array of the place hierarchy, based on a random example of place within the GEDCOM.
+	 * It will look for the longest hierarchy in the tree.
+	 * The places are reversed compared to normal GEDCOM structure.
+	 * 
+	 * @return array
+	 */
+	protected function getPlacesHierarchyFromData() {
+		$nb_levels = 0;
         
-        //Select all '2 PLAC ' tags in the file and create array
-        $places_list=array();
-        $ged_data = Database::prepare(
-            'SELECT i_gedcom AS gedcom'.
-            ' FROM `##individuals`'.
-            ' WHERE i_gedcom LIKE :gedcom AND i_file = :gedcom_id'.
-            ' UNION ALL'.
-            'SELECT f_gedcom AS gedcom'.
-            ' FROM `##families`'.
-            ' WHERE f_gedcom LIKE :gedcom AND f_file = :gedcom_id'
-        )->execute(array(
-            'gedcom' => '%\n2 PLAC %',
-            'gedcom_id' => $this->tree->getTreeId()            
-        ))->fetchOneColumn();
-        foreach ($ged_data as $ged_datum) {
-            $matches = null;
-            preg_match_all('/\n2 PLAC (.+)/', $ged_datum, $matches);
-            foreach ($matches[1] as $match) {
-                $places_list[$match]=true;
-            }
-        }
+		//Select all '2 PLAC ' tags in the file and create array
+		$places_list=array();
+		$ged_data = Database::prepare(
+			'SELECT i_gedcom AS gedcom'.
+			' FROM `##individuals`'.
+			' WHERE i_gedcom LIKE :gedcom AND i_file = :gedcom_id'.
+			' UNION ALL'.
+			'SELECT f_gedcom AS gedcom'.
+			' FROM `##families`'.
+			' WHERE f_gedcom LIKE :gedcom AND f_file = :gedcom_id'
+		)->execute(array(
+			'gedcom' => '%\n2 PLAC %',
+			'gedcom_id' => $this->tree->getTreeId()            
+		))->fetchOneColumn();
+		foreach ($ged_data as $ged_datum) {
+			$matches = null;
+			preg_match_all('/\n2 PLAC (.+)/', $ged_datum, $matches);
+			foreach ($matches[1] as $match) {
+				$places_list[$match]=true;
+			}
+		}
         
-        // Unique list of places
-        $places_list=array_keys($places_list);
+		// Unique list of places
+		$places_list=array_keys($places_list);
         
-        //sort the array, limit to unique values, and count them
-        usort($places_list, array('I18N', 'strcasecmp'));
+		//sort the array, limit to unique values, and count them
+		usort($places_list, array('I18N', 'strcasecmp'));
         
-        //calculate maximum no. of levels to display
-        $has_found_good_example = false;
-        foreach($places_list as $place){
-            $levels = explode(",", $place);
-            $parts = count($levels);
-            if ($parts >= $nb_levels){
-                $nb_levels = $parts;
-                if(!$has_found_good_example){
-                    $random_place = $place;
-                    if(min(array_map('strlen', $levels)) > 0){
-                        $has_found_good_example = true;
-                    }
-                }
-            }
-        }
+		//calculate maximum no. of levels to display
+		$has_found_good_example = false;
+		foreach($places_list as $place){
+			$levels = explode(",", $place);
+			$parts = count($levels);
+			if ($parts >= $nb_levels){
+				$nb_levels = $parts;
+				if(!$has_found_good_example){
+					$random_place = $place;
+					if(min(array_map('strlen', $levels)) > 0){
+						$has_found_good_example = true;
+					}
+				}
+			}
+		}
         
-        return array_reverse(array_map('trim',explode(',', $random_place)));
-    }
+		return array_reverse(array_map('trim',explode(',', $random_place)));
+	}
     
-    /**
-     * Returns the list of geodispersion maps available within the maps folder.
-     * 
-     * @return \MyArtJaub\Webtrees\Module\GeoDispersion\Model\OutlineMap[]
-     */
-    public function getOutlineMapsList() {
-        $res = array();
-        $root_path = WT_ROOT.WT_MODULES_DIR.Constants::MODULE_MAJ_GEODISP_NAME.'/maps/';
-        if(is_dir($root_path)){
-            $dir = opendir($root_path);
-            while (($file=readdir($dir))!== false) {
-                if (preg_match('/^[a-zA-Z0-9_]+.xml$/', $file)) {
-                    $res[base64_encode($file)] = new OutlineMap($file, true);
-                }
-            }
-        }
-        return $res;
-    }
+	/**
+	 * Returns the list of geodispersion maps available within the maps folder.
+	 * 
+	 * @return \MyArtJaub\Webtrees\Module\GeoDispersion\Model\OutlineMap[]
+	 */
+	public function getOutlineMapsList() {
+		$res = array();
+		$root_path = WT_ROOT.WT_MODULES_DIR.Constants::MODULE_MAJ_GEODISP_NAME.'/maps/';
+		if(is_dir($root_path)){
+			$dir = opendir($root_path);
+			while (($file=readdir($dir))!== false) {
+				if (preg_match('/^[a-zA-Z0-9_]+.xml$/', $file)) {
+					$res[base64_encode($file)] = new OutlineMap($file, true);
+				}
+			}
+		}
+		return $res;
+	}
 }
  
\ No newline at end of file

Spacing +38 added lines, -38 removed lines

@@ -65,14 +65,14 @@ 
         ->setUsingFlags($row['majgd_useflagsgen'] == 'yes')
         ->setMaxDetailsInGen($row['majgd_detailsgen']);
         
-        if($row['majgd_map']) {
+        if ($row['majgd_map']) {
             $options
             ->setMap(new OutlineMap($row['majgd_map']))
             ->setMapLevel($row['majgd_toplevel']);
         }
         
         $enabled = true;
-        if(isset($row['majgd_status']) && $row['majgd_status'] == 'disabled') {
+        if (isset($row['majgd_status']) && $row['majgd_status'] == 'disabled') {
             $enabled = false;
         }
         
@@ -93,8 +93,8 @@ 
      */
     public function getGeoAnalysisCount() {
         return Database::prepare(
-            'SELECT COUNT(majgd_id)' .
-            ' FROM `##maj_geodispersion`' .
+            'SELECT COUNT(majgd_id)'.
+            ' FROM `##maj_geodispersion`'.
             ' WHERE majgd_file = :gedcom_id'
             )->execute(array(
                 'gedcom_id' => $this->tree->getTreeId()
@@ -110,15 +110,15 @@ 
      * @return \MyArtJaub\Webtrees\Module\GeoDispersion\Model\GeoAnalysis|NULL
      */
     public function getGeoAnalysis($id, $only_enabled = true) {
-        $args = array (
+        $args = array(
             'gedcom_id' => $this->tree->getTreeId(),
             'ga_id' => $id
         );
         
-        $sql = 'SELECT majgd_id, majgd_descr, majgd_sublevel, majgd_map, majgd_toplevel, majgd_useflagsgen, majgd_detailsgen, majgd_status' .
-            ' FROM `##maj_geodispersion`' .
+        $sql = 'SELECT majgd_id, majgd_descr, majgd_sublevel, majgd_map, majgd_toplevel, majgd_useflagsgen, majgd_detailsgen, majgd_status'.
+            ' FROM `##maj_geodispersion`'.
             ' WHERE majgd_file = :gedcom_id AND majgd_id=:ga_id';
-        if($only_enabled) {
+        if ($only_enabled) {
             $sql .= ' AND majgd_status = :status';
             $args['status'] = 'enabled';
         }
@@ -126,7 +126,7 @@ 
         
         $ga_array = Database::prepare($sql)->execute($args)->fetchOneRow(\PDO::FETCH_ASSOC);
         
-        if($ga_array) {
+        if ($ga_array) {
             return $this->loadGeoAnalysisFromRow($ga_array);
         }
         
@@ -146,7 +146,7 @@ 
      * @return GeoAnalysis
      */
 	public function createGeoAnalysis($description, $analysis_level, $map_file, $map_top_level, $use_flags, $gen_details) {
-		try{
+		try {
 			Database::beginTransaction();
 		
 			Database::prepare(
@@ -168,7 +168,7 @@ 
 			
 			Database::commit();
 		}
-		catch(\Exception $ex) {
+		catch (\Exception $ex) {
 			Database::rollback();
 			$ga = null;
 			Log::addErrorLog('A new Geo Analysis failed to be created. Transaction rollbacked. Parameters ['.$description.', '.$analysis_level.','.$map_file.','.$map_top_level.','.$use_flags.', '.$gen_details.']. Exception: '.$ex->getMessage());
@@ -211,9 +211,9 @@ 
 			
 			 Database::commit();
 		}
-		catch(\Exception $ex) {		    
+		catch (\Exception $ex) {		    
 			Database::rollback();
-			Log::addErrorLog('The Geo Analysis ID “' . $ga->getId() . '” failed to be updated. Transaction rollbacked. Exception: '.$ex->getMessage());
+			Log::addErrorLog('The Geo Analysis ID “'.$ga->getId().'” failed to be updated. Transaction rollbacked. Exception: '.$ex->getMessage());
 			$ga = null;
 		}
 		return $ga;
@@ -258,12 +258,12 @@ 
      *
      * @return array List of enabled maps
      */
-    public function getGeoAnalysisList(){
+    public function getGeoAnalysisList() {
         $res = array();
         
         $list = Database::prepare(
-            'SELECT majgd_id, majgd_descr, majgd_sublevel, majgd_map, majgd_toplevel, majgd_useflagsgen, majgd_detailsgen' .
-            ' FROM `##maj_geodispersion`' .
+            'SELECT majgd_id, majgd_descr, majgd_sublevel, majgd_map, majgd_toplevel, majgd_useflagsgen, majgd_detailsgen'.
+            ' FROM `##maj_geodispersion`'.
             ' WHERE majgd_file = :gedcom_id AND majgd_status = :status'.
             ' ORDER BY majgd_descr'
         )->execute(array(
@@ -271,7 +271,7 @@ 
             'status' => 'enabled'
         ))->fetchAll(\PDO::FETCH_ASSOC);
         
-        foreach($list as $ga) {
+        foreach ($list as $ga) {
            $res[] = $this->loadGeoAnalysisFromRow($ga);
         }
         
@@ -287,17 +287,17 @@ 
      * @param int|null $limit Max number of items to return (for pagination)
      * @return \MyArtJaub\Webtrees\Module\GeoDispersion\Model\GeoAnalysis[]
      */
-    public function getFilteredGeoAnalysisList($search = null, $order_by = null, $start = 0, $limit = null){
+    public function getFilteredGeoAnalysisList($search = null, $order_by = null, $start = 0, $limit = null) {
         $res = array();
             
         $sql = 
-            'SELECT majgd_id, majgd_descr, majgd_sublevel, majgd_map, majgd_toplevel, majgd_useflagsgen, majgd_detailsgen, majgd_status' .
-            ' FROM `##maj_geodispersion`' .
+            'SELECT majgd_id, majgd_descr, majgd_sublevel, majgd_map, majgd_toplevel, majgd_useflagsgen, majgd_detailsgen, majgd_status'.
+            ' FROM `##maj_geodispersion`'.
             ' WHERE majgd_file = :gedcom_id';
         
         $args = array('gedcom_id'=> $this->tree->getTreeId());
         
-        if($search) {
+        if ($search) {
             $sql .= ' AND majgd_descr LIKE CONCAT(\'%\', :search, \'%\')';
             $args['search'] = $search;
         }
@@ -311,10 +311,10 @@ 
                 
                 switch ($value['dir']) {
                     case 'asc':
-                        $sql .= $value['column'] . ' ASC ';
+                        $sql .= $value['column'].' ASC ';
                         break;
                     case 'desc':
-                        $sql .= $value['column'] . ' DESC ';
+                        $sql .= $value['column'].' DESC ';
                         break;
                 }
             }
@@ -330,7 +330,7 @@ 
             
         $data = Database::prepare($sql)->execute($args)->fetchAll(\PDO::FETCH_ASSOC);
 
-        foreach($data as $ga) {
+        foreach ($data as $ga) {
             $res[] = $this->loadGeoAnalysisFromRow($ga);
         }
         
@@ -347,8 +347,8 @@ 
      * @return array
      */
     public function getPlacesHierarchy() {
-        if(!$this->place_hierarchy) {
-            if($place_structure = $this->getPlacesHierarchyFromHeader()) {
+        if (!$this->place_hierarchy) {
+            if ($place_structure = $this->getPlacesHierarchyFromHeader()) {
                 $this->place_hierarchy = array('type' => 'header', 'hierarchy' => $place_structure);
             }
             else {
@@ -367,8 +367,8 @@ 
     protected function getPlacesHierarchyFromHeader() {
         $head = GedcomRecord::getInstance('HEAD', $this->tree);
         $head_place = $head->getFirstFact('PLAC');
-        if($head_place && $head_place_value = $head_place->getAttribute('FORM')){
-            return array_reverse(array_map('trim',explode(',', $head_place_value)));
+        if ($head_place && $head_place_value = $head_place->getAttribute('FORM')) {
+            return array_reverse(array_map('trim', explode(',', $head_place_value)));
         }
         return null;
     }
@@ -384,7 +384,7 @@ 
         $nb_levels = 0;
         
         //Select all '2 PLAC ' tags in the file and create array
-        $places_list=array();
+        $places_list = array();
         $ged_data = Database::prepare(
             'SELECT i_gedcom AS gedcom'.
             ' FROM `##individuals`'.
@@ -401,33 +401,33 @@ 
             $matches = null;
             preg_match_all('/\n2 PLAC (.+)/', $ged_datum, $matches);
             foreach ($matches[1] as $match) {
-                $places_list[$match]=true;
+                $places_list[$match] = true;
             }
         }
         
         // Unique list of places
-        $places_list=array_keys($places_list);
+        $places_list = array_keys($places_list);
         
         //sort the array, limit to unique values, and count them
         usort($places_list, array('I18N', 'strcasecmp'));
         
         //calculate maximum no. of levels to display
         $has_found_good_example = false;
-        foreach($places_list as $place){
+        foreach ($places_list as $place) {
             $levels = explode(",", $place);
             $parts = count($levels);
-            if ($parts >= $nb_levels){
+            if ($parts >= $nb_levels) {
                 $nb_levels = $parts;
-                if(!$has_found_good_example){
+                if (!$has_found_good_example) {
                     $random_place = $place;
-                    if(min(array_map('strlen', $levels)) > 0){
+                    if (min(array_map('strlen', $levels)) > 0) {
                         $has_found_good_example = true;
                     }
                 }
             }
         }
         
-        return array_reverse(array_map('trim',explode(',', $random_place)));
+        return array_reverse(array_map('trim', explode(',', $random_place)));
     }
     
     /**
@@ -438,9 +438,9 @@ 
     public function getOutlineMapsList() {
         $res = array();
         $root_path = WT_ROOT.WT_MODULES_DIR.Constants::MODULE_MAJ_GEODISP_NAME.'/maps/';
-        if(is_dir($root_path)){
+        if (is_dir($root_path)) {
             $dir = opendir($root_path);
-            while (($file=readdir($dir))!== false) {
+            while (($file = readdir($dir)) !== false) {
                 if (preg_match('/^[a-zA-Z0-9_]+.xml$/', $file)) {
                     $res[base64_encode($file)] = new OutlineMap($file, true);
                 }

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