jon48 / webtrees-lib

src/Webtrees/Mvc/DispatcherInterface.php

Indentation +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 	 * @param \Fisharebest\Webtrees\Module\AbstractModule $module
 	 * @param string $request
 	 */
-    public function handle(\Fisharebest\Webtrees\Module\AbstractModule $module, $request);
+	public function handle(\Fisharebest\Webtrees\Module\AbstractModule $module, $request);
     
 }
  
\ No newline at end of file

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/PatronymicLineage/Views/LineageView.php

Indentation +159 added lines, -159 removed lines

@@ -31,161 +31,161 @@ 
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() {
+	protected function renderContent() {
         
-        /** @var \Fisharebest\Webtrees\Tree $tree */
-        $tree = $this->data->get('tree');
+		/** @var \Fisharebest\Webtrees\Tree $tree */
+		$tree = $this->data->get('tree');
         
-        echo '<h2 class="center">', $this->data->get('title') , '</h2>';
-        echo '<p class="center alpha_index">', implode(' | ', $this->getInitialLettersList()), '</p>';
+		echo '<h2 class="center">', $this->data->get('title') , '</h2>';
+		echo '<p class="center alpha_index">', implode(' | ', $this->getInitialLettersList()), '</p>';
          
-        if($this->data->get('issurnames', false)) {
-            $surns = $this->data->get('surnameslist', array());
-            $extra_params = array ('mod' => Constants::MODULE_MAJ_PATROLIN_NAME, 'mod_action' => 'Lineage');
-            // Show the surname list
-            switch ($tree->getPreference('SURNAME_LIST_STYLE')) {
-                case 'style1':
+		if($this->data->get('issurnames', false)) {
+			$surns = $this->data->get('surnameslist', array());
+			$extra_params = array ('mod' => Constants::MODULE_MAJ_PATROLIN_NAME, 'mod_action' => 'Lineage');
+			// Show the surname list
+			switch ($tree->getPreference('SURNAME_LIST_STYLE')) {
+				case 'style1':
 					echo FunctionsPrintLists::surnameList($surns, 3, true, WT_SCRIPT_NAME, $tree, $extra_params);
 					break;
-                case 'style3':
-                    echo FunctionsPrintLists::surnameTagCloud($surns, WT_SCRIPT_NAME, true, $tree, $extra_params);
-                    break;
-                case 'style2':
-                default:
-                    echo FunctionsPrintLists::surnameTable($surns, WT_SCRIPT_NAME, $tree, $extra_params);
-                    break;
-            }
-        }
-        else if ($this->data->get('islineages', false)) {
-            //Link to indilist
-            echo '<p class="center"><strong>'.
-                '<a href="indilist.php?ged=' . $tree->getNameUrl() . '&surname=' . rawurlencode($this->data->get('surname')) .'">'. 
-                I18N::translate('Go to the list of individuals with surname %s', $this->data->get('legend')).
-                '</a></strong></p>';
+				case 'style3':
+					echo FunctionsPrintLists::surnameTagCloud($surns, WT_SCRIPT_NAME, true, $tree, $extra_params);
+					break;
+				case 'style2':
+				default:
+					echo FunctionsPrintLists::surnameTable($surns, WT_SCRIPT_NAME, $tree, $extra_params);
+					break;
+			}
+		}
+		else if ($this->data->get('islineages', false)) {
+			//Link to indilist
+			echo '<p class="center"><strong>'.
+				'<a href="indilist.php?ged=' . $tree->getNameUrl() . '&surname=' . rawurlencode($this->data->get('surname')) .'">'. 
+				I18N::translate('Go to the list of individuals with surname %s', $this->data->get('legend')).
+				'</a></strong></p>';
             
-            $lineages = $this->data->get('lineages', null);
-            $nb_lineages = count($lineages);
-            if(is_null($lineages) || $nb_lineages == 0) {
-            	echo '<p class="center"><span class="warning">',
-            		I18N::translate('No individuals with surname %s has been found. Please try another name.',
-            			'<span dir="auto">' . $this->data->get('legend') . '</span>'),
-            			'</span></p>';
-            } else { 
+			$lineages = $this->data->get('lineages', null);
+			$nb_lineages = count($lineages);
+			if(is_null($lineages) || $nb_lineages == 0) {
+				echo '<p class="center"><span class="warning">',
+					I18N::translate('No individuals with surname %s has been found. Please try another name.',
+						'<span dir="auto">' . $this->data->get('legend') . '</span>'),
+						'</span></p>';
+			} else { 
             	
-            	echo '<div id="patronymiclineages">'.
-            		'<div class="list_label">',
-            		$this->data->get('table_title'),
-            		'</div>';
+				echo '<div id="patronymiclineages">'.
+					'<div class="list_label">',
+					$this->data->get('table_title'),
+					'</div>';
             	
-            	echo '<div class="list_value_wrap">';            	
+				echo '<div class="list_value_wrap">';            	
             	
-            	foreach($lineages as $i => $lineage) {
-            		$this->printRootLineage($lineage);
-            		if($i < $nb_lineages - 1) echo '<hr />';
-            	}
+				foreach($lineages as $i => $lineage) {
+					$this->printRootLineage($lineage);
+					if($i < $nb_lineages - 1) echo '<hr />';
+				}
             	
-            	echo '</div>';
+				echo '</div>';
             	
-            	echo '<div class="list_label">',
-            		I18N::translate('%s lineages found', $nb_lineages),
-            		'</div>'.
-            		'</div>';
+				echo '<div class="list_label">',
+					I18N::translate('%s lineages found', $nb_lineages),
+					'</div>'.
+					'</div>';
 
-            }
-        }
-    }
+			}
+		}
+	}
     
-    /**
-     * Get the list of initial letters
-     * 
-     * @return string[]
-     */
-    private function getInitialLettersList() { 
-        $list = array();
-        /** @var \Fisharebest\Webtrees\Tree $tree */
-        $tree = $this->data->get('tree');
+	/**
+	 * Get the list of initial letters
+	 * 
+	 * @return string[]
+	 */
+	private function getInitialLettersList() { 
+		$list = array();
+		/** @var \Fisharebest\Webtrees\Tree $tree */
+		$tree = $this->data->get('tree');
 		$script_base_url = WT_SCRIPT_NAME . '?mod=' . \MyArtJaub\Webtrees\Constants::MODULE_MAJ_PATROLIN_NAME . '&mod_action=Lineage';
 		
-        foreach (QueryName::surnameAlpha($tree, false, false) as $letter => $count) {
-            switch ($letter) {
-                case '@':
-                    $html = I18N::translateContext('Unknown surname', '…');
-                    break;
-                case ',':
-                    $html = I18N::translate('None');
-                    break;
-                default:
-                    $html = Filter::escapeHtml($letter);
-                    break;
-            }
-            if ($count) {
-                if ($letter == $this->data->get('alpha')) {
-                    $list[] = '<a href="' . $script_base_url . '&alpha=' . rawurlencode($letter) . '&amp;ged=' . $tree->getNameUrl() . '" class="warning" title="' . I18N::number($count) . '">' . $html . '</a>';
-                } else {
-                    $list[] = '<a href="' . $script_base_url . '&alpha=' . rawurlencode($letter) . '&amp;ged=' . $tree->getNameUrl() . '" title="' . I18N::number($count) . '">' . $html . '</a>';
-                }
-            } else {
-                $list[] = $html;
-            }
-        }
+		foreach (QueryName::surnameAlpha($tree, false, false) as $letter => $count) {
+			switch ($letter) {
+				case '@':
+					$html = I18N::translateContext('Unknown surname', '…');
+					break;
+				case ',':
+					$html = I18N::translate('None');
+					break;
+				default:
+					$html = Filter::escapeHtml($letter);
+					break;
+			}
+			if ($count) {
+				if ($letter == $this->data->get('alpha')) {
+					$list[] = '<a href="' . $script_base_url . '&alpha=' . rawurlencode($letter) . '&amp;ged=' . $tree->getNameUrl() . '" class="warning" title="' . I18N::number($count) . '">' . $html . '</a>';
+				} else {
+					$list[] = '<a href="' . $script_base_url . '&alpha=' . rawurlencode($letter) . '&amp;ged=' . $tree->getNameUrl() . '" title="' . I18N::number($count) . '">' . $html . '</a>';
+				}
+			} else {
+				$list[] = $html;
+			}
+		}
     
-        // Search spiders don't get the "show all" option as the other links give them everything.
-        if (!Auth::isSearchEngine()) {
-            if ($this->data->get('show_all') === 'yes') {
-                $list[] = '<span class="warning">' . I18N::translate('All') . '</span>';
-            } else {
-                $list[] = '<a href="' . $script_base_url . '&show_all=yes' . '&amp;ged=' . $tree->getNameUrl() . '">' . I18N::translate('All') . '</a>';
-            }
-        }
+		// Search spiders don't get the "show all" option as the other links give them everything.
+		if (!Auth::isSearchEngine()) {
+			if ($this->data->get('show_all') === 'yes') {
+				$list[] = '<span class="warning">' . I18N::translate('All') . '</span>';
+			} else {
+				$list[] = '<a href="' . $script_base_url . '&show_all=yes' . '&amp;ged=' . $tree->getNameUrl() . '">' . I18N::translate('All') . '</a>';
+			}
+		}
     
-        return $list;
-    }
+		return $list;
+	}
 
-    /**
-     * Print a root lineage node
-     * @param LineageRootNode $node
-     */
-    private function printRootLineage(LineageRootNode $node) {    	
-    	print '<div class="patrolin_tree">';
-    	if($node->getIndividual() === null) {
-    		$fam_nodes = $node->getFamiliesNodes();
-    		foreach($fam_nodes as $fam){
-    			foreach($fam_nodes[$fam] as $child_node) {
-    				if($child_node) {
-    					$this->printLineage($child_node);
-    				}
-    			}
-    		}
-    	}
-    	else {
-    		$this->printLineage($node);
-    	}
-    	echo '</div>';
+	/**
+	 * Print a root lineage node
+	 * @param LineageRootNode $node
+	 */
+	private function printRootLineage(LineageRootNode $node) {    	
+		print '<div class="patrolin_tree">';
+		if($node->getIndividual() === null) {
+			$fam_nodes = $node->getFamiliesNodes();
+			foreach($fam_nodes as $fam){
+				foreach($fam_nodes[$fam] as $child_node) {
+					if($child_node) {
+						$this->printLineage($child_node);
+					}
+				}
+			}
+		}
+		else {
+			$this->printLineage($node);
+		}
+		echo '</div>';
     	
-    	$places = $node->getPlaces();
-    	if($places && count($places)>0){
-    		echo '<div class="patrolin_places">';
-    		echo \MyArtJaub\Webtrees\Functions\FunctionsPrint::htmlPlacesCloud($places, false, $this->data->get('tree'));
-    		echo '</div>';
-    	}
-    }
+		$places = $node->getPlaces();
+		if($places && count($places)>0){
+			echo '<div class="patrolin_places">';
+			echo \MyArtJaub\Webtrees\Functions\FunctionsPrint::htmlPlacesCloud($places, false, $this->data->get('tree'));
+			echo '</div>';
+		}
+	}
     
-    /**
-     * Print a lineage node, recursively.
-     * @param LineageNode $node
-     */
-    private function printLineage(LineageNode $node) {
+	/**
+	 * Print a lineage node, recursively.
+	 * @param LineageNode $node
+	 */
+	private function printLineage(LineageNode $node) {
     	
-    	echo '<ul>';
-    	$fam_nodes = $node->getFamiliesNodes();
-    	if(count($fam_nodes) > 0) {
-    		$is_first_family = true;
-    		foreach($fam_nodes as $fam) {
-    			$node_indi = $node->getIndividual();
-    			echo '<li>';
-    			if($is_first_family){
-    				echo FunctionsPrint::htmlIndividualForList($node_indi);
-    			}
+		echo '<ul>';
+		$fam_nodes = $node->getFamiliesNodes();
+		if(count($fam_nodes) > 0) {
+			$is_first_family = true;
+			foreach($fam_nodes as $fam) {
+				$node_indi = $node->getIndividual();
+				echo '<li>';
+				if($is_first_family){
+					echo FunctionsPrint::htmlIndividualForList($node_indi);
+				}
 				else{
 					echo FunctionsPrint::htmlIndividualForList($node_indi, false);
 				}
@@ -204,32 +204,32 @@ 
 					echo '<span class="details1" title="'.$marrdate.'"><i class="icon-rings"></i>'.$marryear.'</span></a>&nbsp;';
 					echo FunctionsPrint::htmlIndividualForList($spouse);
 				}
-    			foreach($fam_nodes[$fam] as $child_node) {
-    				if($child_node) {
-    					$this->printLineage($child_node);
-    				}
-    				else {
-    					echo '<ul><li><strong>&hellip;</strong></li></ul>';
-    				}
-    			}
-    			$is_first_family = false;
-    		}
-    	}
-    	else {
-    		echo '<li>';
-    		echo \MyArtJaub\Webtrees\Functions\FunctionsPrint::htmlIndividualForList($node->getIndividual());
-    		if($node->hasFollowUpSurname()) {
-    			$url_base = WT_SCRIPT_NAME . '?mod=' . \MyArtJaub\Webtrees\Constants::MODULE_MAJ_PATROLIN_NAME . '&mod_action=Lineage';
-    			echo '&nbsp;'.
-    				'<a href="' . $url_base . '&surname=' . rawurlencode($node->getFollowUpSurname()) . '&amp;ged=' . $this->data->get('tree')->getNameUrl() . '">'.
-    				'('.I18N::translate('Go to %s lineages', $node->getFollowUpSurname()).')'.
-    				'</a>';
-    		}
-    		echo '</li>';
-    	}
-    	echo '</ul>';
+				foreach($fam_nodes[$fam] as $child_node) {
+					if($child_node) {
+						$this->printLineage($child_node);
+					}
+					else {
+						echo '<ul><li><strong>&hellip;</strong></li></ul>';
+					}
+				}
+				$is_first_family = false;
+			}
+		}
+		else {
+			echo '<li>';
+			echo \MyArtJaub\Webtrees\Functions\FunctionsPrint::htmlIndividualForList($node->getIndividual());
+			if($node->hasFollowUpSurname()) {
+				$url_base = WT_SCRIPT_NAME . '?mod=' . \MyArtJaub\Webtrees\Constants::MODULE_MAJ_PATROLIN_NAME . '&mod_action=Lineage';
+				echo '&nbsp;'.
+					'<a href="' . $url_base . '&surname=' . rawurlencode($node->getFollowUpSurname()) . '&amp;ged=' . $this->data->get('tree')->getNameUrl() . '">'.
+					'('.I18N::translate('Go to %s lineages', $node->getFollowUpSurname()).')'.
+					'</a>';
+			}
+			echo '</li>';
+		}
+		echo '</ul>';
     	
-    }
+	}
 
 }
  
\ 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/Module/PatronymicLineageModule.php

Indentation +30 added lines, -30 removed lines

@@ -18,40 +18,40 @@
  * Patronymic Lineage Module.

  */

 class PatronymicLineageModule extends fw\Module\AbstractModule 

-    implements ModuleMenuItemInterface

+	implements ModuleMenuItemInterface

 {

-    /** @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 “Patronymic lineage” module */ I18N::translate('Patronymic Lineages');

-    }

+	/**

+	 * {@inhericDoc}

+	 */

+	public function getTitle() {

+		return /* I18N: Name of the “Patronymic lineage” module */ I18N::translate('Patronymic Lineages');

+	}

     

-    /**

-     * {@inhericDoc}

-     */

-    public function getDescription() {

-        return /* I18N: Description of the “Patronymic lineage” module */ I18N::translate('Display lineages of people holding the same surname.');

-    }

+	/**

+	 * {@inhericDoc}

+	 */

+	public function getDescription() {

+		return /* I18N: Description of the “Patronymic lineage” module */ I18N::translate('Display lineages of people holding the same surname.');

+	}

     

-    /**

-     * {@inhericDoc}

-     */

-    public function modAction($mod_action) {

-        \MyArtJaub\Webtrees\Mvc\Dispatcher::getInstance()->handle($this, $mod_action);

-    }


-     /** 

-      * {@inhericDoc}

-      * @see \MyArtJaub\Webtrees\Module\ModuleMenuItemInterface::getMenu()

-      */

-     public function getMenu(fw\Tree $tree, $reference) {

-         $tree_url = $tree ? $tree->getNameUrl() : '';

-         $surname = $reference && is_string($reference) ? $reference : '';

-         return new fw\Menu($this->getTitle(), 'module.php?mod=' . $this->getName() . '&mod_action=Lineage&ged=' . $tree_url . '&surname=' . $surname , 'menu-maj-list-lineage', array('rel' => 'nofollow'));

-     }

+	/**

+	 * {@inhericDoc}

+	 */

+	public function modAction($mod_action) {

+		\MyArtJaub\Webtrees\Mvc\Dispatcher::getInstance()->handle($this, $mod_action);

+	}


+	 /** 

+	  * {@inhericDoc}

+	  * @see \MyArtJaub\Webtrees\Module\ModuleMenuItemInterface::getMenu()

+	  */

+	 public function getMenu(fw\Tree $tree, $reference) {

+		 $tree_url = $tree ? $tree->getNameUrl() : '';

+		 $surname = $reference && is_string($reference) ? $reference : '';

+		 return new fw\Menu($this->getTitle(), 'module.php?mod=' . $this->getName() . '&mod_action=Lineage&ged=' . $tree_url . '&surname=' . $surname , 'menu-maj-list-lineage', array('rel' => 'nofollow'));

+	 }

 
 }

  
\ No newline at end of file

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);