jon48 / webtrees-lib

src/Webtrees/Mvc/View/ViewBag.php

Indentation +83 added lines, -83 removed lines

@@ -18,97 +18,97 @@
 	/**
 	 * @var array $data Container for data
 	 */
-    protected $data = array();
+	protected $data = array();
     
-    /**
-     * Constructor for ViewBag
-     * @param array $data_in
-     */
-    public function __construct(array $data_in = array()) {
-        $this->data = $data_in;
-    }
+	/**
+	 * Constructor for ViewBag
+	 * @param array $data_in
+	 */
+	public function __construct(array $data_in = array()) {
+		$this->data = $data_in;
+	}
     
-    /**
-     * Get the keys present in the view bag.
-     *
-     * @return array
-     */
-    public function keys()
-    {
-        return array_keys($this->data);
-    }
+	/**
+	 * Get the keys present in the view bag.
+	 *
+	 * @return array
+	 */
+	public function keys()
+	{
+		return array_keys($this->data);
+	}
     
-    /**
-     * Get all the data from the bag for a given key.
-     *
-     * @param  string  $key
-     * @param  string  $format
-     * @return unknown
-     */
-    public function get($key, $default = null)
-    {
-        if (array_key_exists($key, $this->data)) {
-            return $this->data[$key];
-        }
-        return $default;
-    }
+	/**
+	 * Get all the data from the bag for a given key.
+	 *
+	 * @param  string  $key
+	 * @param  string  $format
+	 * @return unknown
+	 */
+	public function get($key, $default = null)
+	{
+		if (array_key_exists($key, $this->data)) {
+			return $this->data[$key];
+		}
+		return $default;
+	}
     
-    /**
-     * Magic getter.
-     * Returns the value associated with the key.
-     * 
-     * @param string $key
-     * @return unknown
-     */
-    public function __get($key) {
-        return $this->get($key, null);
-    }
+	/**
+	 * Magic getter.
+	 * Returns the value associated with the key.
+	 * 
+	 * @param string $key
+	 * @return unknown
+	 */
+	public function __get($key) {
+		return $this->get($key, null);
+	}
     
-    /**
-     * Set the value for the specified key.
-     * Can define whether to override an existing value;
-     * 
-     * @param string $key
-     * @param mixed $value
-     * @param bool $override
-     */
-    public function set($key, $value, $override = true) {
-        if(is_null($key)) return;
-        if(!$override && array_key_exists($key, $this->data)) return;
-        $this->data[$key] = $value;        
-    }
+	/**
+	 * Set the value for the specified key.
+	 * Can define whether to override an existing value;
+	 * 
+	 * @param string $key
+	 * @param mixed $value
+	 * @param bool $override
+	 */
+	public function set($key, $value, $override = true) {
+		if(is_null($key)) return;
+		if(!$override && array_key_exists($key, $this->data)) return;
+		$this->data[$key] = $value;        
+	}
     
-    /**
-     * Magic setter.
-     * Set the value for the specified key.
-     * 
-     * @param string $key
-     * @param mixed $value
-     */
-    public function __set($key, $value) {
-        $this->set($key, $value);
-    }
+	/**
+	 * Magic setter.
+	 * Set the value for the specified key.
+	 * 
+	 * @param string $key
+	 * @param mixed $value
+	 */
+	public function __set($key, $value) {
+		$this->set($key, $value);
+	}
     
-    /**
-     * Magic isset
-     * Checks whether the ViewBag contains the specified key
-     * 
-     * @param string $key
-     * @return bool
-     */
-    public function __isset($key) {
-        return isset($this->data[$key]);
-    }
+	/**
+	 * Magic isset
+	 * Checks whether the ViewBag contains the specified key
+	 * 
+	 * @param string $key
+	 * @return bool
+	 */
+	public function __isset($key) {
+		return isset($this->data[$key]);
+	}
     
-    /**
-     * Magic unset
-     * Unset the specified key from the ViewBag
-     * 
-     * @param string $key
-     */
-    public function __unset($key) {
-        unset($this->data[$key]);;
-    }
+	/**
+	 * Magic unset
+	 * Unset the specified key from the ViewBag
+	 * 
+	 * @param string $key
+	 */
+	public function __unset($key) {
+		unset($this->data[$key]);;
+	}
     
 }
  
\ No newline at end of file

src/Webtrees/Individual.php

Indentation +29 added lines, -29 removed lines

@@ -113,29 +113,29 @@ 
 	 * @return string|array Estimated birth place if found, null otherwise
 	 */
 	public function getSignificantPlace(){
-	    if($bplace = $this->gedcomrecord->getBirthPlace()){
-	        return $bplace;
-	    }
+		if($bplace = $this->gedcomrecord->getBirthPlace()){
+			return $bplace;
+		}
 	
-	    foreach ($this->gedcomrecord->getAllEventPlaces('RESI') as $rplace) {
-	        if ($rplace) {
-	            return $rplace;
-	        }
-	    }
+		foreach ($this->gedcomrecord->getAllEventPlaces('RESI') as $rplace) {
+			if ($rplace) {
+				return $rplace;
+			}
+		}
 	
-	    if($dplace = $this->gedcomrecord->getDeathPlace()){
-	        return $dplace;
-	    }
+		if($dplace = $this->gedcomrecord->getDeathPlace()){
+			return $dplace;
+		}
 	
-	    foreach($this->gedcomrecord->getSpouseFamilies() as $fams) {
-	        foreach ($fams->getAllEventPlaces('RESI') as $rplace) {
-	            if ($rplace) {
-	                return $rplace;
-	            }
-	        }
-	    }
+		foreach($this->gedcomrecord->getSpouseFamilies() as $fams) {
+			foreach ($fams->getAllEventPlaces('RESI') as $rplace) {
+				if ($rplace) {
+					return $rplace;
+				}
+			}
+		}
 	
-	    return null;
+		return null;
 	}
 	
 	/**
@@ -144,7 +144,7 @@ 
 	 * @return boolean Is the individual a Sosa ancestor
 	 */
 	public function isSosa(){
-	    return count($this->getSosaNumbers()) > 0;
+		return count($this->getSosaNumbers()) > 0;
 	}
 	
 	/**
@@ -155,11 +155,11 @@ 
 	 * @return array List of Sosa numbers
 	 */
 	public function getSosaNumbers(){
-	    if($this->sosa === null) {
-	        $provider = new SosaProvider($this->gedcomrecord->getTree());
-	        $this->sosa = $provider->getSosaNumbers($this->gedcomrecord);	        
-	    }
-	    return $this->sosa;
+		if($this->sosa === null) {
+			$provider = new SosaProvider($this->gedcomrecord->getTree());
+			$this->sosa = $provider->getSosaNumbers($this->gedcomrecord);	        
+		}
+		return $this->sosa;
 	}
 		
 	/** 
@@ -174,10 +174,10 @@ 
 	}
 	
 	/**
-	* Check if this individual's death is sourced
-	*
-	* @return int Level of sources
-	* */
+	 * Check if this individual's death is sourced
+	 *
+	 * @return int Level of sources
+	 * */
 	public function isDeathSourced(){
 		if($this->is_death_sourced !== null) return $this->is_death_sourced;
 		$this->is_death_sourced = $this->isFactSourced(WT_EVENTS_DEAT);

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

Indentation +40 added lines, -40 removed lines

@@ -15,58 +15,58 @@ 
  */
 class GeoDisplayOptions {
     
-    /**
+	/**
 	 * Outline map to be used for diaplay
-     * @var (null|OutlineMap) $map
-     */
-    protected $map;
+	 * @var (null|OutlineMap) $map
+	 */
+	protected $map;
     
 	/**
 	 * Level in the Gedcom hierarchy of the parent level of the outline map.
 	 * @var int $map_level
 	 */
-    protected $map_level;
+	protected $map_level;
     
 	/**
 	 * Option to use flags in places display, instead of or in addition to the name.
 	 * @var bool $use_flags
 	 */
-    protected $use_flags;
+	protected $use_flags;
     
 	/**
 	 * Option to define the number of top places to display in the generation view.
 	 * @var int $max_details_in_gen
 	 */
-    protected $max_details_in_gen;
+	protected $max_details_in_gen;
     
-    /**
+	/**
 	 * Get the outline map to use for display.
 	 *
-     * @return (OutlineMap|null)
-     */
-    public function getMap(){
-        return $this->map;
-    }
+	 * @return (OutlineMap|null)
+	 */
+	public function getMap(){
+		return $this->map;
+	}
     
 	/**
 	 * Set the outline map to use for display.
 	 *
-     * @param (OutlineMap|null) $map
+	 * @param (OutlineMap|null) $map
 	 * @return self Enable method-chaining
-     */
-    public function setMap(OutlineMap $map = null) {
-        $this->map = $map;
-        return $this;
-    }
+	 */
+	public function setMap(OutlineMap $map = null) {
+		$this->map = $map;
+		return $this;
+	}
     
 	/**
 	 * Get the level of the map parent place
 	 *
 	 * @return int
 	 */
-    public function getMapLevel(){
-        return $this->map_level;
-    }
+	public function getMapLevel(){
+		return $this->map_level;
+	}
     
 	/**
 	 * Set the level of the map parent place
@@ -74,19 +74,19 @@ 
 	 * @param int $maplevel
 	 * @return self Enable method-chaining
 	 */
-    public function setMapLevel($maplevel) {
-        $this->map_level = $maplevel;
-        return $this;
-    }
+	public function setMapLevel($maplevel) {
+		$this->map_level = $maplevel;
+		return $this;
+	}
     
 	/**
 	 * Get whether flags should be used in places display
 	 *
 	 * @return bool
 	 */
-    public function isUsingFlags(){
-        return $this->use_flags;
-    }
+	public function isUsingFlags(){
+		return $this->use_flags;
+	}
     
 	/**
 	 * Set whether flags should be used in places display
@@ -94,19 +94,19 @@ 
 	 * @param bool $use_flags
 	 * @return self Enable method-chaining
 	 */
-    public function setUsingFlags($use_flags) {
-        $this->use_flags = $use_flags;
-        return $this;
-    }
+	public function setUsingFlags($use_flags) {
+		$this->use_flags = $use_flags;
+		return $this;
+	}
     
 	/**
 	 * Get the number of Top Places in the generation view
 	 *
 	 * @return int
 	 */
-    public function getMaxDetailsInGen(){
-        return $this->max_details_in_gen;
-    }
+	public function getMaxDetailsInGen(){
+		return $this->max_details_in_gen;
+	}
     
 	/**
 	 * Set the number of Top Places in the generation view
@@ -114,10 +114,10 @@ 
 	 * @param int $max_details_in_gen
 	 * @return self Enable method-chaining
 	 */
-    public function setMaxDetailsInGen($max_details_in_gen) {
-        $this->max_details_in_gen = $max_details_in_gen;
-        return $this;
-    }
+	public function setMaxDetailsInGen($max_details_in_gen) {
+		$this->max_details_in_gen = $max_details_in_gen;
+		return $this;
+	}
                    
 }
  
\ No newline at end of file

src/Webtrees/Module/AdminTasks/Model/AbstractTask.php

Indentation +194 added lines, -194 removed lines

@@ -20,253 +20,253 @@
  */
 abstract class AbstractTask {
     
-    /**
-     * Time out for runnign tasks, in seconds. Default 5 min
-     * @var int TASK_TIME_OUT
-     */
-    const TASK_TIME_OUT = 300;
+	/**
+	 * Time out for runnign tasks, in seconds. Default 5 min
+	 * @var int TASK_TIME_OUT
+	 */
+	const TASK_TIME_OUT = 300;
               
-    /**
-     * Task provider
-     * @var TaskProviderInterface $provider
-     */
+	/**
+	 * Task provider
+	 * @var TaskProviderInterface $provider
+	 */
 	protected $provider;
 			
 	/**
 	 * Task name
 	 * @var string $name
 	 */
-    protected $name;
+	protected $name;
     
-    /**
-     * Status of the task
-     * @var bool $is_enabled
-     */
-    protected $is_enabled;
+	/**
+	 * Status of the task
+	 * @var bool $is_enabled
+	 */
+	protected $is_enabled;
     
-    /**
-     * Last updated date
-     * @var \DateTime $last_updated
-     */
-    protected $last_updated;
+	/**
+	 * Last updated date
+	 * @var \DateTime $last_updated
+	 */
+	protected $last_updated;
     
-    /**
-     * Last run result
-     * @var bool $last_result
-     */
-    protected $last_result;
+	/**
+	 * Last run result
+	 * @var bool $last_result
+	 */
+	protected $last_result;
     
-    /**
-     * Task run frequency
-     * @var int $frequency
-     */
-    protected $frequency;
+	/**
+	 * Task run frequency
+	 * @var int $frequency
+	 */
+	protected $frequency;
     
-    /**
-     * Task remaining runs
-     * @var int $nb_occurrences
-     */
-    protected $nb_occurrences;
+	/**
+	 * Task remaining runs
+	 * @var int $nb_occurrences
+	 */
+	protected $nb_occurrences;
     
-    /**
-     * Current running status of the task
-     * @var bool $is_running
-     */
-    protected $is_running;
+	/**
+	 * Current running status of the task
+	 * @var bool $is_running
+	 */
+	protected $is_running;
     
-    /**
-     * Constructor for the Admin task class
+	/**
+	 * Constructor for the Admin task class
 	 *
 	 * @param string $file Filename containing the task object
 	 * @param TaskProviderInterface $provider Provider for tasks
-     */
-    public function __construct($file, TaskProviderInterface $provider = null){
-        $this->name = trim(basename($file, '.php'));
+	 */
+	public function __construct($file, TaskProviderInterface $provider = null){
+		$this->name = trim(basename($file, '.php'));
 		$this->provider = $provider;
-    }
+	}
     
-    /**
-     * Get the provider.
-     *
-     * @return TaskProviderInterface 
-     */
-    public function getProvider(){
-        return $this->provider;
-    }
+	/**
+	 * Get the provider.
+	 *
+	 * @return TaskProviderInterface 
+	 */
+	public function getProvider(){
+		return $this->provider;
+	}
     
-    /**
-     * Set the provider.
-     *
-     * @param TaskProviderInterface $provider
-     * @return self Enable method-chaining
-     */
-    public function setProvider(TaskProviderInterface $provider){
-        $this->provider = $provider;
-        return $this;
-    }
+	/**
+	 * Set the provider.
+	 *
+	 * @param TaskProviderInterface $provider
+	 * @return self Enable method-chaining
+	 */
+	public function setProvider(TaskProviderInterface $provider){
+		$this->provider = $provider;
+		return $this;
+	}
     
-    /**
-     * Set parameters of the Task
-     *
-     * @param bool $is_enabled Status of the task
-     * @param \DateTime $lastupdated Time of the last task run
-     * @param bool $last_result Result of the last run, true for success, false for failure
-     * @param int $frequency Frequency of execution in minutes
-     * @param int $nb_occur Number of remaining occurrences, 0 for tasks not limited
-     * @param bool $is_running Indicates if the task is currently running
-     */
-    public function setParameters($is_enabled, \DateTime $last_updated, $last_result, $frequency, $nb_occur, $is_running){
-        $this->is_enabled = $is_enabled;
-        $this->last_updated = $last_updated;
-        $this->last_result = $last_result;
-        $this->frequency = $frequency;
-        $this->nb_occurrences = $nb_occur;
-        $this->is_running = $is_running;
-    }
+	/**
+	 * Set parameters of the Task
+	 *
+	 * @param bool $is_enabled Status of the task
+	 * @param \DateTime $lastupdated Time of the last task run
+	 * @param bool $last_result Result of the last run, true for success, false for failure
+	 * @param int $frequency Frequency of execution in minutes
+	 * @param int $nb_occur Number of remaining occurrences, 0 for tasks not limited
+	 * @param bool $is_running Indicates if the task is currently running
+	 */
+	public function setParameters($is_enabled, \DateTime $last_updated, $last_result, $frequency, $nb_occur, $is_running){
+		$this->is_enabled = $is_enabled;
+		$this->last_updated = $last_updated;
+		$this->last_result = $last_result;
+		$this->frequency = $frequency;
+		$this->nb_occurrences = $nb_occur;
+		$this->is_running = $is_running;
+	}
     
-    /**
-     * Get the name of the task
-     *
-     * @return string
-     */
-    public function getName(){
-        return $this->name;
-    }
+	/**
+	 * Get the name of the task
+	 *
+	 * @return string
+	 */
+	public function getName(){
+		return $this->name;
+	}
     
     
-    /**
-     * Return the status of the task in a boolean way
-     *
-     * @return boolean True if enabled
-     */
-    public function isEnabled(){
-        return $this->is_enabled;
-    }
+	/**
+	 * Return the status of the task in a boolean way
+	 *
+	 * @return boolean True if enabled
+	 */
+	public function isEnabled(){
+		return $this->is_enabled;
+	}
     
-    /**
-     * Get the last updated time.
-     *
-     * @return \DateTime
-     */
-    public function getLastUpdated(){
-        return $this->last_updated;
-    }
+	/**
+	 * Get the last updated time.
+	 *
+	 * @return \DateTime
+	 */
+	public function getLastUpdated(){
+		return $this->last_updated;
+	}
     
-    /**
-     * Check if the last result has been successful.
-     *
-     * @return bool
-     */
-    public function isLastRunSuccess(){
-        return $this->last_result;
-    }
+	/**
+	 * Check if the last result has been successful.
+	 *
+	 * @return bool
+	 */
+	public function isLastRunSuccess(){
+		return $this->last_result;
+	}
     
-    /**
-     * Get the task frequency.
-     *
-     * @return int
-     */
-    public function getFrequency(){
-        return $this->frequency;
-    }
+	/**
+	 * Get the task frequency.
+	 *
+	 * @return int
+	 */
+	public function getFrequency(){
+		return $this->frequency;
+	}
 	
 	/**
-     * Set the task frequency.
-     *
+	 * Set the task frequency.
+	 *
 	 * @param int $frequency
-     * @return self Enable method-chaining
-     */
-    public function setFrequency($frequency){
-        $this->frequency = $frequency;
+	 * @return self Enable method-chaining
+	 */
+	public function setFrequency($frequency){
+		$this->frequency = $frequency;
 		return $this;
-    }
+	}
     
-    /**
-     * Get the number of remaining occurrences.
-     *
-     * @return int
-     */
-    public function getRemainingOccurrences(){
-        return $this->nb_occurrences;
-    }
+	/**
+	 * Get the number of remaining occurrences.
+	 *
+	 * @return int
+	 */
+	public function getRemainingOccurrences(){
+		return $this->nb_occurrences;
+	}
 	
 	/**
-     * Set the number of remaining occurrences.
-     *
+	 * Set the number of remaining occurrences.
+	 *
 	 * @param int $nb_occur
-     * @return self Enable method-chaining
-     */
-    public function setRemainingOccurrences($nb_occur){
-        $this->nb_occurrences = $nb_occur;
+	 * @return self Enable method-chaining
+	 */
+	public function setRemainingOccurrences($nb_occur){
+		$this->nb_occurrences = $nb_occur;
 		return $this;
-    }
+	}
     
-    /**
-     * Check if the task if running.
-     *
-     * @return bool
-     */
-    public function isRunning(){
-        return $this->is_running;
-    }
+	/**
+	 * Check if the task if running.
+	 *
+	 * @return bool
+	 */
+	public function isRunning(){
+		return $this->is_running;
+	}
     
     
-    /**
-     * Return the name to display for the task
-     *
-     * @return string Title for the task
-     */
-    abstract public function getTitle();
+	/**
+	 * Return the name to display for the task
+	 *
+	 * @return string Title for the task
+	 */
+	abstract public function getTitle();
     
-    /**
-     * Return the default frequency for the execution of the task
-     *
-     * @return int Frequency for the execution of the task
-     */
-    abstract public function getDefaultFrequency();
+	/**
+	 * Return the default frequency for the execution of the task
+	 *
+	 * @return int Frequency for the execution of the task
+	 */
+	abstract public function getDefaultFrequency();
     
-    /**
-     * Execute the task's actions
-     */
-    abstract protected function executeSteps();
+	/**
+	 * Execute the task's actions
+	 */
+	abstract protected function executeSteps();
     
 	/**
 	 * Persist task state into database.
 	 * @return bool
 	 */
 	public function save() {
-	    if(!$this->provider) throw new \Exception('The task has not been initialised with a provider.');
+		if(!$this->provider) throw new \Exception('The task has not been initialised with a provider.');
 		return $this->provider->updateTask($this);
 	}
 	
-    /**
-     * Execute the task, default skeleton
-     *
-     */
-    public function execute(){
+	/**
+	 * Execute the task, default skeleton
+	 *
+	 */
+	public function execute(){
     
-        if($this->last_updated->add(new \DateInterval('PT'.self::TASK_TIME_OUT.'S')) < new \DateTime())
-            $this->is_running = false;
+		if($this->last_updated->add(new \DateInterval('PT'.self::TASK_TIME_OUT.'S')) < new \DateTime())
+			$this->is_running = false;
     
-        if(!$this->is_running){
-            $this->last_result = false;
-            $this->is_running = true;
-            $this->save();
+		if(!$this->is_running){
+			$this->last_result = false;
+			$this->is_running = true;
+			$this->save();
     
-            Log::addDebugLog('Start execution of Admin task: '.$this->getTitle());
-            $this->last_result = $this->executeSteps();
-            if($this->last_result){
-                $this->last_updated = new \DateTime();
-                if($this->nb_occurrences > 0){
-                    $this->nb_occurrences--;
-                    if($this->nb_occurrences == 0) $this->is_enabled = false;
-                }
-            }
-            $this->is_running = false;
-            $this->save();
-            Log::addDebugLog('Execution completed for Admin task: '.$this->getTitle().' - '.($this->last_result ? 'Success' : 'Failure'));
-        }
-    }
+			Log::addDebugLog('Start execution of Admin task: '.$this->getTitle());
+			$this->last_result = $this->executeSteps();
+			if($this->last_result){
+				$this->last_updated = new \DateTime();
+				if($this->nb_occurrences > 0){
+					$this->nb_occurrences--;
+					if($this->nb_occurrences == 0) $this->is_enabled = false;
+				}
+			}
+			$this->is_running = false;
+			$this->save();
+			Log::addDebugLog('Execution completed for Admin task: '.$this->getTitle().' - '.($this->last_result ? 'Success' : 'Failure'));
+		}
+	}
     
     
 }

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