jon48 / webtrees-lib

src/Webtrees/Hook/HookProviderInterface.php

Indentation +41 added lines, -41 removed lines

@@ -16,51 +16,51 @@
  */
 interface HookProviderInterface {
 
-    /**
-     * Return an instance of the hook linked to the specifed function / context
-     *
-     * @param string $hook_function
-     * @param string $hook_context
-     * @return Hook
-     */
-    public function get($hook_function, $hook_context = null);
+	/**
+	 * Return an instance of the hook linked to the specifed function / context
+	 *
+	 * @param string $hook_function
+	 * @param string $hook_context
+	 * @return Hook
+	 */
+	public function get($hook_function, $hook_context = null);
     
-    /**
-     * Return whether the Hook module is active and the table has been created.
-     *
-     * @uses \MyArtJaub\Webtrees\Module\ModuleManager to check if the module is operational
-     * @return bool True if module active and table created, false otherwise
-     */
-    public function isModuleOperational();
+	/**
+	 * Return whether the Hook module is active and the table has been created.
+	 *
+	 * @uses \MyArtJaub\Webtrees\Module\ModuleManager to check if the module is operational
+	 * @return bool True if module active and table created, false otherwise
+	 */
+	public function isModuleOperational();
     
-    /**
-     * Get the list of possible hooks in the list of modules files.
-     * A hook will be registered:
-     * 		- for all modules already registered in Webtrees
-     * 		- if the module implements HookSubscriberInterface
-     * 		- if the method exist within the module
-     *
-     * @return Array List of possible hooks, with the priority
-     */
-    public function getPossibleHooks();
+	/**
+	 * Get the list of possible hooks in the list of modules files.
+	 * A hook will be registered:
+	 * 		- for all modules already registered in Webtrees
+	 * 		- if the module implements HookSubscriberInterface
+	 * 		- if the method exist within the module
+	 *
+	 * @return Array List of possible hooks, with the priority
+	 */
+	public function getPossibleHooks();
     
-    /**
-     * Get the list of hooks intalled in webtrees, with their id, status and priority.
-     *
-     * @return array List of installed hooks
-     */
-    public function getRawInstalledHooks();
+	/**
+	 * Get the list of hooks intalled in webtrees, with their id, status and priority.
+	 *
+	 * @return array List of installed hooks
+	 */
+	public function getRawInstalledHooks();
     
-    /**
-     * Get the list of hooks intalled in webtrees, with their id, status and priority.
-     *
-     * @return Array List of installed hooks, with id, status and priority
-     */
-    public function getInstalledHooks();
+	/**
+	 * Get the list of hooks intalled in webtrees, with their id, status and priority.
+	 *
+	 * @return Array List of installed hooks, with id, status and priority
+	 */
+	public function getInstalledHooks();
     
-    /**
-     * Update the list of hooks, identifying missing ones and removed ones.
-     */
-    public function updateHooks();
+	/**
+	 * Update the list of hooks, identifying missing ones and removed ones.
+	 */
+	public function updateHooks();
     
 }
\ No newline at end of file

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

Indentation +97 added lines, -97 removed lines

@@ -19,116 +19,116 @@
  */
 class SosaCalculator {
     
-    /**
-     * Maximium size for the temporary Sosa table
-     * @var int TMP_SOSA_TABLE_LIMIT
-     */
-    const TMP_SOSA_TABLE_LIMIT = 1000;
+	/**
+	 * Maximium size for the temporary Sosa table
+	 * @var int TMP_SOSA_TABLE_LIMIT
+	 */
+	const TMP_SOSA_TABLE_LIMIT = 1000;
     
-    /**
-     * Reference user
-     * @var Fisharebest\Webtrees\User $user
-     */
-    protected $user;
+	/**
+	 * Reference user
+	 * @var Fisharebest\Webtrees\User $user
+	 */
+	protected $user;
     
-    /**
-     * Reference tree
-     * @var Fisharebest\Webtrees\Tree $tree
-     */
-    protected $tree;
+	/**
+	 * Reference tree
+	 * @var Fisharebest\Webtrees\Tree $tree
+	 */
+	protected $tree;
     
-    /**
-     * Sosa Provider for the calculator
-     * @var \MyArtJaub\Webtrees\Module\Sosa\Model\SosaCalculator $sosa_provider
-     */
-    protected $sosa_provider;
+	/**
+	 * Sosa Provider for the calculator
+	 * @var \MyArtJaub\Webtrees\Module\Sosa\Model\SosaCalculator $sosa_provider
+	 */
+	protected $sosa_provider;
     
-    /**
-     * Temporary Sosa table, used during construction
-     * @var array $tmp_sosa_table
-     */
-    protected $tmp_sosa_table;
+	/**
+	 * Temporary Sosa table, used during construction
+	 * @var array $tmp_sosa_table
+	 */
+	protected $tmp_sosa_table;
     
-    /**
-     * Constructor for the Sosa Calculator
-     * @param Tree $tree
-     * @param User $user
-     */
-    public function __construct(Tree $tree, User $user) {        
-        $this->tree = $tree;
-        $this->user = $user;
+	/**
+	 * Constructor for the Sosa Calculator
+	 * @param Tree $tree
+	 * @param User $user
+	 */
+	public function __construct(Tree $tree, User $user) {        
+		$this->tree = $tree;
+		$this->user = $user;
         
-        $this->sosa_provider = new SosaProvider($this->tree, $this->user);;
-    }
+		$this->sosa_provider = new SosaProvider($this->tree, $this->user);;
+	}
     
-    /**
-     * Compute all Sosa ancestors from the user's root individual.
-     * @return bool Result of the computation
-     */
-    public function computeAll() {
-        $root_id = $this->tree->getUserPreference($this->user, 'MAJ_SOSA_ROOT_ID');        
-        $indi = Individual::getInstance($root_id, $this->tree);
-        if($indi){
-            $this->sosa_provider->deleteAll();
-            $this->addNode($indi, 1);
-            $this->flushTmpSosaTable(true);
-            return true;
-        }     
-        return false;
-    }
+	/**
+	 * Compute all Sosa ancestors from the user's root individual.
+	 * @return bool Result of the computation
+	 */
+	public function computeAll() {
+		$root_id = $this->tree->getUserPreference($this->user, 'MAJ_SOSA_ROOT_ID');        
+		$indi = Individual::getInstance($root_id, $this->tree);
+		if($indi){
+			$this->sosa_provider->deleteAll();
+			$this->addNode($indi, 1);
+			$this->flushTmpSosaTable(true);
+			return true;
+		}     
+		return false;
+	}
     
-    /**
-     * Compute all Sosa Ancestors from a specified Individual
-     * @param Individual $indi
-     * @return bool Result of the computation
-     */
-    public function computeFromIndividual(Individual $indi) {
-        $dindi = new \MyArtJaub\Webtrees\Individual($indi);
-        $current_sosas = $dindi->getSosaNumbers();
-        foreach($current_sosas as $current_sosa => $gen) {
-            $this->sosa_provider->deleteAncestors($current_sosa);
-            $this->addNode($indi, $current_sosa);
-        }
-        $this->flushTmpSosaTable(true);
-        return true;
-    }
+	/**
+	 * Compute all Sosa Ancestors from a specified Individual
+	 * @param Individual $indi
+	 * @return bool Result of the computation
+	 */
+	public function computeFromIndividual(Individual $indi) {
+		$dindi = new \MyArtJaub\Webtrees\Individual($indi);
+		$current_sosas = $dindi->getSosaNumbers();
+		foreach($current_sosas as $current_sosa => $gen) {
+			$this->sosa_provider->deleteAncestors($current_sosa);
+			$this->addNode($indi, $current_sosa);
+		}
+		$this->flushTmpSosaTable(true);
+		return true;
+	}
     
-    /**
-     * Recursive method to add individual to the Sosa table, and flush it regularly
-     * @param Individual $indi Individual to add
-     * @param int $sosa Individual's sosa
-     */
-    protected function addNode(Individual $indi, $sosa) {                
-        $birth_year = $indi->getEstimatedBirthDate()->gregorianYear();
-        $death_year = $indi->getEstimatedDeathDate()->gregorianYear();
+	/**
+	 * Recursive method to add individual to the Sosa table, and flush it regularly
+	 * @param Individual $indi Individual to add
+	 * @param int $sosa Individual's sosa
+	 */
+	protected function addNode(Individual $indi, $sosa) {                
+		$birth_year = $indi->getEstimatedBirthDate()->gregorianYear();
+		$death_year = $indi->getEstimatedDeathDate()->gregorianYear();
         
-        $this->tmp_sosa_table[] = array(
-            'indi' => $indi->getXref(), 
-            'sosa' => $sosa, 
-            'birth_year' => $birth_year,
-            'death_year' => $death_year
-        );
+		$this->tmp_sosa_table[] = array(
+			'indi' => $indi->getXref(), 
+			'sosa' => $sosa, 
+			'birth_year' => $birth_year,
+			'death_year' => $death_year
+		);
         
-        $this->flushTmpSosaTable();
+		$this->flushTmpSosaTable();
         
-        if($fam = $indi->getPrimaryChildFamily()) {
-            if($husb = $fam->getHusband()) $this->addNode($husb, 2 * $sosa);
-            if($wife = $fam->getWife()) $this->addNode($wife, 2 * $sosa + 1);
-        }
-    }
+		if($fam = $indi->getPrimaryChildFamily()) {
+			if($husb = $fam->getHusband()) $this->addNode($husb, 2 * $sosa);
+			if($wife = $fam->getWife()) $this->addNode($wife, 2 * $sosa + 1);
+		}
+	}
     
-    /**
-     * Write sosas in the table, if the number of items is superior to the limit, or if forced.
-     *
-     * @param bool $force Should the flush be forced
-     */
-    protected function flushTmpSosaTable($force = false) {
-        if( count($this->tmp_sosa_table)> 0 && 
-            ($force ||  count($this->tmp_sosa_table) >= self::TMP_SOSA_TABLE_LIMIT)){            
-                $this->sosa_provider->insertOrUpdate($this->tmp_sosa_table);
-                $this->tmp_sosa_table = array();
-        }
-    }
+	/**
+	 * Write sosas in the table, if the number of items is superior to the limit, or if forced.
+	 *
+	 * @param bool $force Should the flush be forced
+	 */
+	protected function flushTmpSosaTable($force = false) {
+		if( count($this->tmp_sosa_table)> 0 && 
+			($force ||  count($this->tmp_sosa_table) >= self::TMP_SOSA_TABLE_LIMIT)){            
+				$this->sosa_provider->insertOrUpdate($this->tmp_sosa_table);
+				$this->tmp_sosa_table = array();
+		}
+	}
                
 }
  
\ No newline at end of file

src/Webtrees/Module/AdminTasks/Tasks/HealthCheckEmailTask.php

Indentation +21 added lines, -21 removed lines

@@ -29,11 +29,11 @@ 
  */
 class HealthCheckEmailTask extends AbstractTask implements ConfigurableTaskInterface {
     
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\AbstractTask::getTitle()
-     */
-    public function getTitle() {
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\AbstractTask::getTitle()
+	 */
+	public function getTitle() {
 		return I18N::translate('Healthcheck Email');
 	}
 	
@@ -41,7 +41,7 @@ 
 	 * {@inheritDoc}
 	 * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\AbstractTask::getDefaultFrequency()
 	 */
-    public function getDefaultFrequency() {
+	public function getDefaultFrequency() {
 		return 10080;  // = 1 week = 7 * 24 * 60 min
 	}
     
@@ -49,7 +49,7 @@ 
 	 * {@inheritDoc}
 	 * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\AbstractTask::executeSteps()
 	 */
-    protected function executeSteps() {
+	protected function executeSteps() {
 	
 		$res = false;		
 		
@@ -63,14 +63,14 @@ 
 		$interval = max($this->frequency, $interval_sincelast);
 		$nbdays = ceil($interval / (24 * 60));
 				
-        // Check for updates
-        $latest_version_txt = Functions::fetchLatestVersion();
-        if (preg_match('/^[0-9.]+\|[0-9.]+\|/', $latest_version_txt)) {
-        	list($latest_version, , $download_url) = explode('|', $latest_version_txt);
-        } else {
-        	// Cannot determine the latest version
-        	list($latest_version, , $download_url) = explode('|', '||');
-        }
+		// Check for updates
+		$latest_version_txt = Functions::fetchLatestVersion();
+		if (preg_match('/^[0-9.]+\|[0-9.]+\|/', $latest_version_txt)) {
+			list($latest_version, , $download_url) = explode('|', $latest_version_txt);
+		} else {
+			// Cannot determine the latest version
+			list($latest_version, , $download_url) = explode('|', '||');
+		}
 		
 		// Users statistics
 		$warnusers = 0;
@@ -213,15 +213,15 @@ 
 		$html = '
 			<div class="form-group">
     			<label class="control-label col-sm-3"> '.
-    				I18N::translate('Enable healthcheck emails for') .
-    			'</label>
+					I18N::translate('Enable healthcheck emails for') .
+				'</label>
     			<div class="col-sm-9">';
 
 		foreach(Tree::getAll() as $tree){
 			if(Auth::isManager($tree)){	
-			    $html .= '<div class="form-group row">
+				$html .= '<div class="form-group row">
 			        <span class="col-sm-3 control-label">' .
-			             $tree->getTitle() .
+						 $tree->getTitle() .
 					'</span>
 					 <div class="col-sm-2">';
 				$html .= FunctionsEdit::editFieldYesNo('HEALTHCHECK_ENABLED_' . $tree->getTreeId(), $tree->getPreference('MAJ_AT_'.$this->getName().'_ENABLED', 1), 'class="radio-inline"');
@@ -230,8 +230,8 @@ 
 		}
 		
 		$html .= '	<p class="small text-muted">'.
-    					I18N::translate('Enable the health check emails for each of the selected trees.') .
-    				'</p>
+						I18N::translate('Enable the health check emails for each of the selected trees.') .
+					'</p>
     			</div>
     		</div>';
 			

src/Webtrees/Module/AdminTasks/Schema/Migration0.php

Indentation +10 added lines, -10 removed lines

@@ -24,16 +24,16 @@
 	 */
 	public function upgrade() {
 		Database::exec(
-		    'CREATE TABLE IF NOT EXISTS `##maj_admintasks` ('.
-		    ' majat_name 		    VARCHAR(32)                      NOT NULL,'.
-		    ' majat_status          ENUM(\'enabled\',\'disabled\') 	 NOT NULL DEFAULT \'disabled\','.
-		    ' majat_last_run 		DATETIME 					     NOT NULL DEFAULT \'2000-01-01 00:00:00\','.
-		    ' majat_last_result 	TINYINT(1)					     NOT NULL DEFAULT 1,'.		// 0 means error, 1 is success
-		    ' majat_frequency		INTEGER						     NOT NULL DEFAULT 10080,'.	// In min, Default every week
-		    ' majat_nb_occur	 	SMALLINT					     NOT NULL DEFAULT 0,'.
-		    ' majat_running 		TINYINT(1)					     NOT NULL DEFAULT 0,'.
-		    ' PRIMARY KEY (majat_name)'.
-		    ') COLLATE utf8_unicode_ci ENGINE=InnoDB'
+			'CREATE TABLE IF NOT EXISTS `##maj_admintasks` ('.
+			' majat_name 		    VARCHAR(32)                      NOT NULL,'.
+			' majat_status          ENUM(\'enabled\',\'disabled\') 	 NOT NULL DEFAULT \'disabled\','.
+			' majat_last_run 		DATETIME 					     NOT NULL DEFAULT \'2000-01-01 00:00:00\','.
+			' majat_last_result 	TINYINT(1)					     NOT NULL DEFAULT 1,'.		// 0 means error, 1 is success
+			' majat_frequency		INTEGER						     NOT NULL DEFAULT 10080,'.	// In min, Default every week
+			' majat_nb_occur	 	SMALLINT					     NOT NULL DEFAULT 0,'.
+			' majat_running 		TINYINT(1)					     NOT NULL DEFAULT 0,'.
+			' PRIMARY KEY (majat_name)'.
+			') COLLATE utf8_unicode_ci ENGINE=InnoDB'
 		);
 	}
 }

src/Webtrees/Module/GeoDispersion/Views/GeoAnalysisTabGenerationsView.php

Indentation +93 added lines, -93 removed lines

@@ -24,89 +24,89 @@ 
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() {       
+	protected function renderContent() {       
 
-        $max_details_gen = $this->data->get('max_details_gen');
-        $analysis_level = $this->data->get('analysis_level');
-        $results_by_gen = $this->data->get('results_by_generations');
-        $display_all_places = $this->data->get('display_all_places', true);
+		$max_details_gen = $this->data->get('max_details_gen');
+		$analysis_level = $this->data->get('analysis_level');
+		$results_by_gen = $this->data->get('results_by_generations');
+		$display_all_places = $this->data->get('display_all_places', true);
         
-        $html = 
-        '<div id="geodispersion_gen">
+		$html = 
+		'<div id="geodispersion_gen">
         	<table id="geodispersion_gentable" class="center">';
             
-        foreach($results_by_gen as $gen => $genData){
-            $html .= 
-            '<tr>
+		foreach($results_by_gen as $gen => $genData){
+			$html .= 
+			'<tr>
                 <td class="descriptionbox">' .
-                    I18N::translate("Generation %s", I18N::number($gen)).
-                    ($display_all_places ? '<br />' : ' ').
-                    I18N::translate('(%s)', I18N::percentage(Functions::safeDivision($genData['sum'] + $genData['other'], $genData['sum'] + $genData['other'] + $genData['unknown']),1)) . 
-                '</td>
+					I18N::translate("Generation %s", I18N::number($gen)).
+					($display_all_places ? '<br />' : ' ').
+					I18N::translate('(%s)', I18N::percentage(Functions::safeDivision($genData['sum'] + $genData['other'], $genData['sum'] + $genData['other'] + $genData['unknown']),1)) . 
+				'</td>
                  <td class="optionbox left">'.
-                    ($display_all_places ? 
-                        $this->htmlGenerationAllPlacesRow($genData, $analysis_level) :
-                        $this->htmlGenerationTopPlacesRow($genData, $analysis_level)
-                     ) .
-                '</ditdv>
+					($display_all_places ? 
+						$this->htmlGenerationAllPlacesRow($genData, $analysis_level) :
+						$this->htmlGenerationTopPlacesRow($genData, $analysis_level)
+					 ) .
+				'</ditdv>
             </tr>';
-        }       
+		}       
         
-        $html.= 
-            '</table>
+		$html.= 
+			'</table>
             <div class="left">
                 <strong>' . I18N::translate('Interpretation help:') . '</strong>
                 <br />'.
-                I18N::translate('<strong>Generation X (yy %%)</strong>: The percentage indicates the number of found places compared to the total number of ancestors in this generation.') . 
-                '<br />';
-        if(!is_null($max_details_gen) && $max_details_gen == 0){
-            $html .= I18N::translate('<strong><em>Place</em> or <em>Flag</em> aa (bb %%)</strong>: The first number indicates the total number of ancestors born in this place, the percentage relates this count to the total number of found places. No percentage means it is less than 10%%.').'<br />';
-            $html .= I18N::translate('If any, the darker area indicates the number of unknown places within the generation or places outside the analysed area, and its percentage compared to the number of ancestors. No percentage means it is less than 10%%.');
-        }
-        else{
-            $html .= I18N::translate('<strong><em>Place</em> [aa - bb %%]</strong>: The first number indicates the total number of ancestors born in this place, the percentage compares this count to the total number of found places.').'<br />';
-            $html .= I18N::translate('Only the %d more frequent places for each generation are displayed.', $max_details_gen);
-        }
-        $html.= 
-            '</div>
+				I18N::translate('<strong>Generation X (yy %%)</strong>: The percentage indicates the number of found places compared to the total number of ancestors in this generation.') . 
+				'<br />';
+		if(!is_null($max_details_gen) && $max_details_gen == 0){
+			$html .= I18N::translate('<strong><em>Place</em> or <em>Flag</em> aa (bb %%)</strong>: The first number indicates the total number of ancestors born in this place, the percentage relates this count to the total number of found places. No percentage means it is less than 10%%.').'<br />';
+			$html .= I18N::translate('If any, the darker area indicates the number of unknown places within the generation or places outside the analysed area, and its percentage compared to the number of ancestors. No percentage means it is less than 10%%.');
+		}
+		else{
+			$html .= I18N::translate('<strong><em>Place</em> [aa - bb %%]</strong>: The first number indicates the total number of ancestors born in this place, the percentage compares this count to the total number of found places.').'<br />';
+			$html .= I18N::translate('Only the %d more frequent places for each generation are displayed.', $max_details_gen);
+		}
+		$html.= 
+			'</div>
         </div>';
         
-        return $html;
-    }
+		return $html;
+	}
     
     
-    /**
-     * Return the HTML code to display a row with all places found in a generation.
-     *
-     * @param array $data Data array
-     * @param int $analysis_level Level of subdivision of analysis
-     * @return string HTML code for all places row
-     */
-    protected function htmlGenerationAllPlacesRow($data, $analysis_level) {
-        $html =
-        '<table class="geodispersion_bigrow">
+	/**
+	 * Return the HTML code to display a row with all places found in a generation.
+	 *
+	 * @param array $data Data array
+	 * @param int $analysis_level Level of subdivision of analysis
+	 * @return string HTML code for all places row
+	 */
+	protected function htmlGenerationAllPlacesRow($data, $analysis_level) {
+		$html =
+		'<table class="geodispersion_bigrow">
             <tr>';
         
-        $sum_gen = $data['sum'];
-        $unknownother = $data['unknown'] + $data['other'];
-        foreach($data['places'] as $placename=> $dataplace){
-            $levels = array_map('trim',explode(',', $placename));
-            $content = '';
-            if(isset($dataplace['flag'])){
-                $content .= '<td class="geodispersion_flag">'. FunctionsPrint::htmlPlaceIcon($dataplace['place'], $dataplace['flag']) .'</td><td>';
-            }
-            else{
-                $content .= '<td><span title="'.implode(I18N::$list_separator, array_reverse($levels)).'">'.$levels[$analysis_level-1].'</span><br/>';
-            }
-            $count = $dataplace['count'];
-            $content .= I18N::number($count);
-            $perc = Functions::safeDivision($count, $sum_gen + $unknownother);
-            $perc2= Functions::safeDivision($count, $sum_gen);
-            if($perc2>=0.1) 
-                $content.= '<br/><span class="small">('.I18N::percentage($perc2, 1).')</span>';
-            $content .= '</td>';
+		$sum_gen = $data['sum'];
+		$unknownother = $data['unknown'] + $data['other'];
+		foreach($data['places'] as $placename=> $dataplace){
+			$levels = array_map('trim',explode(',', $placename));
+			$content = '';
+			if(isset($dataplace['flag'])){
+				$content .= '<td class="geodispersion_flag">'. FunctionsPrint::htmlPlaceIcon($dataplace['place'], $dataplace['flag']) .'</td><td>';
+			}
+			else{
+				$content .= '<td><span title="'.implode(I18N::$list_separator, array_reverse($levels)).'">'.$levels[$analysis_level-1].'</span><br/>';
+			}
+			$count = $dataplace['count'];
+			$content .= I18N::number($count);
+			$perc = Functions::safeDivision($count, $sum_gen + $unknownother);
+			$perc2= Functions::safeDivision($count, $sum_gen);
+			if($perc2>=0.1) 
+				$content.= '<br/><span class="small">('.I18N::percentage($perc2, 1).')</span>';
+			$content .= '</td>';
                
-            $html .= '
+			$html .= '
                 <td class="geodispersion_rowitem" width="'.max(round(100*$perc, 0),1).'%">
                     <table>
                         <tr>
@@ -118,46 +118,46 @@ 
                         </tr>
                     </table>
                 </td>';
-        }
+		}
         
-        if($unknownother>0){
-            $perc= Functions::safeDivision($unknownother, $sum_gen + $unknownother);
-            $html .='<td class="geodispersion_unknownitem left" >'.I18N::number($unknownother);
-            if($perc>=0.1) $html.= '<br/><span class="small">('.I18N::percentage($perc, 1).')</span>';
-            $html .='</td>';
-        }
+		if($unknownother>0){
+			$perc= Functions::safeDivision($unknownother, $sum_gen + $unknownother);
+			$html .='<td class="geodispersion_unknownitem left" >'.I18N::number($unknownother);
+			if($perc>=0.1) $html.= '<br/><span class="small">('.I18N::percentage($perc, 1).')</span>';
+			$html .='</td>';
+		}
         
-        $html .= 
-            '</tr>
+		$html .= 
+			'</tr>
         </table>';
-        return $html;
-    }
+		return $html;
+	}
     
 	/**
 	 * Returns the HTML code fo display a row of the Top Places found for a generation.
 	 *
 	 * @param array $data Data array
-     * @param int $analysis_level Level of subdivision of analysis
+	 * @param int $analysis_level Level of subdivision of analysis
 	 * @return string HTML code for Top Places row
 	 */
-    protected function htmlGenerationTopPlacesRow($data, $analysis_level) {
-        $tmp_places = array();
-        $sum_gen = $data['sum'];
-        $other = $data['other'];
+	protected function htmlGenerationTopPlacesRow($data, $analysis_level) {
+		$tmp_places = array();
+		$sum_gen = $data['sum'];
+		$other = $data['other'];
         
-        foreach($data['places'] as $placename => $count) {
-            if($placename != 'other'){
-                $levels = array_map('trim',explode(',', $placename));
-                $placename = '<span title="'.implode(I18N::$list_separator, array_reverse($levels)).'">'.$levels[$analysis_level-1].'</span>';
-            }
-            else{
-                $placename = I18N::translate('Other places');
-            }
-            $tmp_places[] = I18N::translate('<strong>%s</strong> [%d - %s]', $placename, $count, I18N::percentage(Functions::safeDivision($count, $sum_gen + $other), 1));         	
-        }
+		foreach($data['places'] as $placename => $count) {
+			if($placename != 'other'){
+				$levels = array_map('trim',explode(',', $placename));
+				$placename = '<span title="'.implode(I18N::$list_separator, array_reverse($levels)).'">'.$levels[$analysis_level-1].'</span>';
+			}
+			else{
+				$placename = I18N::translate('Other places');
+			}
+			$tmp_places[] = I18N::translate('<strong>%s</strong> [%d - %s]', $placename, $count, I18N::percentage(Functions::safeDivision($count, $sum_gen + $other), 1));         	
+		}
         
-        return implode(I18N::$list_separator, $tmp_places);
-    }
+		return implode(I18N::$list_separator, $tmp_places);
+	}
     
 }
  
\ No newline at end of file

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