jon48 / webtrees-lib

src/Webtrees/Mvc/View/ViewFactory.php

Indentation +72 added lines, -72 removed lines

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

src/Webtrees/Hook/HookSubscriberInterface.php

Indentation +2 added lines, -2 removed lines

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

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

Indentation +92 added lines, -92 removed lines

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

src/Webtrees/Functions/FunctionsPrint.php

Indentation +2 added lines, -2 removed lines

@@ -79,7 +79,7 @@ 
 	 * @return string HTML code of the inserted flag
 	 */
 	public static function htmlPlaceIcon(\Fisharebest\Webtrees\Place $place, $icon_path , $size = 50) {
-	    return '<img class="flag_gm_h'. $size . '" src="' . $icon_path . '" title="' . $place->getGedcomName() . '" alt="' . $place->getGedcomName() . '" />';
+		return '<img class="flag_gm_h'. $size . '" src="' . $icon_path . '" title="' . $place->getGedcomName() . '" alt="' . $place->getGedcomName() . '" />';
 	}
 	
 	/**
@@ -355,7 +355,7 @@ 
 	 * @return boolean
 	 */
 	public static function isDateWithinChartsRange(Date $date) {
-	    return $date->gregorianYear() >= 1550 && $date->gregorianYear() < 2030;
+		return $date->gregorianYear() >= 1550 && $date->gregorianYear() < 2030;
 	}
 
 }

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/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/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