jon48 / webtrees-lib

src/Webtrees/Map/GoogleMapsProvider.php

Braces +7 added lines, -2 removed lines

@@ -31,11 +31,16 @@
 			$nb_levels = count($parent);
 			for ($i=0; $i < $nb_levels; $i++) {
 				$parent[$i] = trim($parent[$i]);
-				if (empty($parent[$i])) $parent[$i]='unknown';// GoogleMap module uses "unknown" while GEDCOM uses , ,
+				if (empty($parent[$i])) {
+					$parent[$i]='unknown';
+				}
+				// GoogleMap module uses "unknown" while GEDCOM uses , ,
 				$pl_id=Database::prepare('SELECT pl_id FROM `##placelocation` WHERE pl_level=? AND pl_parent_id=? AND pl_place LIKE ? ORDER BY pl_place')
 					->execute(array($i, $place_id, $parent[$i]))
 					->fetchOne();
-				if (empty($pl_id)) break;
+				if (empty($pl_id)) {
+					break;
+				}
 				$place_id = $pl_id;
 			}
 			return $place_id;

Spacing +7 added lines, -7 removed lines

@@ -25,14 +25,14 @@ 
 	 * @see \MyArtJaub\Webtrees\Map\MapProviderInterface::getProviderPlaceId()
 	 */
 	public function getProviderPlaceId(\Fisharebest\Webtrees\Place $place) {
-		if(!$place->isEmpty()) {
-			$parent = array_reverse(explode (',', $place->getGedcomName()));
+		if (!$place->isEmpty()) {
+			$parent = array_reverse(explode(',', $place->getGedcomName()));
 			$place_id = 0;
 			$nb_levels = count($parent);
-			for ($i=0; $i < $nb_levels; $i++) {
+			for ($i = 0; $i < $nb_levels; $i++) {
 				$parent[$i] = trim($parent[$i]);
-				if (empty($parent[$i])) $parent[$i]='unknown';// GoogleMap module uses "unknown" while GEDCOM uses , ,
-				$pl_id=Database::prepare('SELECT pl_id FROM `##placelocation` WHERE pl_level=? AND pl_parent_id=? AND pl_place LIKE ? ORDER BY pl_place')
+				if (empty($parent[$i])) $parent[$i] = 'unknown'; // GoogleMap module uses "unknown" while GEDCOM uses , ,
+				$pl_id = Database::prepare('SELECT pl_id FROM `##placelocation` WHERE pl_level=? AND pl_parent_id=? AND pl_place LIKE ? ORDER BY pl_place')
 					->execute(array($i, $place_id, $parent[$i]))
 					->fetchOne();
 				if (empty($pl_id)) break;
@@ -48,12 +48,12 @@ 
 	 * @see \MyArtJaub\Webtrees\Map\MapProviderInterface::getPlaceIcon()
 	 */
 	public function getPlaceIcon(\Fisharebest\Webtrees\Place $place) {
-		if(!$place->isEmpty()){
+		if (!$place->isEmpty()) {
 			$place_details =
 				Database::prepare('SELECT pl_icon FROM `##placelocation` WHERE pl_id=? ORDER BY pl_place')	
 				->execute(array($this->getProviderPlaceId($place)))
 				->fetchOneRow();
-			if($place_details){
+			if ($place_details) {
 				return WT_MODULES_DIR.'googlemap/'.$place_details->pl_icon;
 			}
 		}

src/Webtrees/Hook/Hook.php

Indentation +19 added lines, -19 removed lines

@@ -1,13 +1,13 @@ 
 <?php
  /**
- * webtrees-lib: MyArtJaub library for webtrees
- *
- * @package MyArtJaub\Webtrees
- * @subpackage Hook
- * @author Jonathan Jaubart <dev@jaubart.com>
- * @copyright Copyright (c) 2011-2016, Jonathan Jaubart
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public License, version 3
- */
+  * webtrees-lib: MyArtJaub library for webtrees
+  *
+  * @package MyArtJaub\Webtrees
+  * @subpackage Hook
+  * @author Jonathan Jaubart <dev@jaubart.com>
+  * @copyright Copyright (c) 2011-2016, Jonathan Jaubart
+  * @license http://www.gnu.org/licenses/gpl.html GNU General Public License, version 3
+  */
 namespace MyArtJaub\Webtrees\Hook;
 
 use Fisharebest\Webtrees\Database;
@@ -137,17 +137,17 @@ 
 	 * @return array Results of the hook executions
 	 */
 	public function executeOnlyFor(array $module_names) {
-	    $result = array();
-	    if(HookProvider::getInstance()->isModuleOperational()){
-	       $params = func_get_args();
-	       array_shift($params);
-    	    foreach ($module_names as $module_name) {
-    	        if($module = Module::getModuleByName($module_name)) {
-    	            $result[] = call_user_func_array(array($module, $this->hook_function), $params);
-    	        }
-    	    }
-	    }
-	    return $result;
+		$result = array();
+		if(HookProvider::getInstance()->isModuleOperational()){
+		   $params = func_get_args();
+		   array_shift($params);
+			foreach ($module_names as $module_name) {
+				if($module = Module::getModuleByName($module_name)) {
+					$result[] = call_user_func_array(array($module, $this->hook_function), $params);
+				}
+			}
+		}
+		return $result;
 	}
 
 	/**

Spacing +23 added lines, -23 removed lines

@@ -31,7 +31,7 @@ 
 	 * @param string $hook_function_in Hook function to be subscribed or executed
 	 * @param string $hook_context_in Hook context to be subscribed or executed
 	 */
-	public function __construct($hook_function_in, $hook_context_in = 'all'){
+	public function __construct($hook_function_in, $hook_context_in = 'all') {
 		$this->hook_function = $hook_function_in;
 		$this->hook_context = $hook_context_in;
 	}
@@ -47,8 +47,8 @@ 
 	 *
 	 * @param string $hsubscriber Name of the subscriber module
 	 */
-	public function subscribe($hsubscriber){
-		if(HookProvider::getInstance()->isModuleOperational()){
+	public function subscribe($hsubscriber) {
+		if (HookProvider::getInstance()->isModuleOperational()) {
 			Database::prepare(
 					"INSERT IGNORE INTO `##maj_hooks` (majh_hook_function, majh_hook_context, majh_module_name)".
 					" VALUES (?, ?, ?)"
@@ -62,8 +62,8 @@ 
 	 * @param string $hsubscriber Name of the subscriber module
 	 * @param int $priority Priority of execution
 	 */
-	public function setPriority($hsubscriber, $priority){
-		if(HookProvider::getInstance()->isModuleOperational()){
+	public function setPriority($hsubscriber, $priority) {
+		if (HookProvider::getInstance()->isModuleOperational()) {
 			Database::prepare(
 			"UPDATE `##maj_hooks`".
 			" SET majh_module_priority=?".
@@ -79,8 +79,8 @@ 
 	 *
 	 * @param string $hsubscriber Name of the subscriber module
 	 */
-	public function enable($hsubscriber){
-		if(HookProvider::getInstance()->isModuleOperational()){
+	public function enable($hsubscriber) {
+		if (HookProvider::getInstance()->isModuleOperational()) {
 		Database::prepare(
 			"UPDATE `##maj_hooks`".
 			" SET majh_status='enabled'".
@@ -96,8 +96,8 @@ 
 	 *
 	 * @param string $hsubscriber Name of the subscriber module
 	 */
-	public function disable($hsubscriber){
-		if(HookProvider::getInstance()->isModuleOperational()){
+	public function disable($hsubscriber) {
+		if (HookProvider::getInstance()->isModuleOperational()) {
 		Database::prepare(
 			"UPDATE `##maj_hooks`".
 			" SET majh_status='disabled'".
@@ -113,8 +113,8 @@ 
 	 *
 	 * @param string $hsubscriber Name of the subscriber module
 	 */
-	public function remove($hsubscriber){
-		if(HookProvider::getInstance()->isModuleOperational()){
+	public function remove($hsubscriber) {
+		if (HookProvider::getInstance()->isModuleOperational()) {
 		Database::prepare(
 			"DELETE FROM `##maj_hooks`".
 			" WHERE majh_hook_function=?".
@@ -138,11 +138,11 @@ 
 	 */
 	public function executeOnlyFor(array $module_names) {
 	    $result = array();
-	    if(HookProvider::getInstance()->isModuleOperational()){
+	    if (HookProvider::getInstance()->isModuleOperational()) {
 	       $params = func_get_args();
 	       array_shift($params);
     	    foreach ($module_names as $module_name) {
-    	        if($module = Module::getModuleByName($module_name)) {
+    	        if ($module = Module::getModuleByName($module_name)) {
     	            $result[] = call_user_func_array(array($module, $this->hook_function), $params);
     	        }
     	    }
@@ -156,17 +156,17 @@ 
 	 *
 	 * @return array Results of the hook executions
 	 */
-	public function execute(){
+	public function execute() {
 		$result = array();
-		if(HookProvider::getInstance()->isModuleOperational()){
+		if (HookProvider::getInstance()->isModuleOperational()) {
 			$params = func_get_args();
 			$sqlquery = '';
 			$sqlparams = array($this->hook_function);
-			if($this->hook_context != 'all') {
+			if ($this->hook_context != 'all') {
 				$sqlparams = array($this->hook_function, $this->hook_context);
 				$sqlquery = " OR majh_hook_context=?";
 			}
-			$module_names=Database::prepare(
+			$module_names = Database::prepare(
 					"SELECT majh_module_name AS module, majh_module_priority AS priority FROM `##maj_hooks`".
 					" WHERE majh_hook_function = ? AND (majh_hook_context='all'".$sqlquery.") AND majh_status='enabled'".
 					" ORDER BY majh_module_priority ASC, module ASC"
@@ -183,15 +183,15 @@ 
 	 *
 	 * @return int Number of active modules
 	 */
-	public function getNumberActiveModules(){
-		if(HookProvider::getInstance()->isModuleOperational()){
+	public function getNumberActiveModules() {
+		if (HookProvider::getInstance()->isModuleOperational()) {
 			$sqlquery = '';
 			$sqlparams = array($this->hook_function);
-			if($this->hook_context != 'all') {
+			if ($this->hook_context != 'all') {
 				$sqlparams = array($this->hook_function, $this->hook_context);
 				$sqlquery = " OR majh_hook_context=?";
 			}
-			$module_names=Database::prepare(
+			$module_names = Database::prepare(
 					"SELECT majh_module_name AS modules FROM `##maj_hooks`".
 					" WHERE majh_hook_function = ? AND (majh_hook_context='all'".$sqlquery.") AND majh_status='enabled'"
 			)->execute($sqlparams)->fetchOneColumn();
@@ -205,8 +205,8 @@ 
 	 *
 	 * @return bool True is active modules exist, false otherwise
 	 */
-	public function hasAnyActiveModule(){
-		return ($this->getNumberActiveModules()>0);
+	public function hasAnyActiveModule() {
+		return ($this->getNumberActiveModules() > 0);
 	}
 
 }

src/Webtrees/Mvc/View/AbstractView.php

Indentation +49 added lines, -49 removed lines

@@ -15,66 +15,66 @@
  */
 abstract class AbstractView {
     
-    /**
-     * Reference controller
-     * @var \Fisharebest\Webtrees\Controller\BaseController $ctrl
-     */
-    protected $ctrl;
+	/**
+	 * Reference controller
+	 * @var \Fisharebest\Webtrees\Controller\BaseController $ctrl
+	 */
+	protected $ctrl;
     
-    /**
-     * Structure containing the data of the view
-     * @var ViewBag $data
-     */
-    protected $data;
+	/**
+	 * Structure containing the data of the view
+	 * @var ViewBag $data
+	 */
+	protected $data;
     
-    /**
-     * Constructor 
-     * @param \Fisharebest\Webtrees\Controller\BaseController $ctrl Controller
-     * @param ViewBag $data ViewBag holding view data
-     */
-    public function __construct(\Fisharebest\Webtrees\Controller\BaseController $ctrl, ViewBag $data) {
-        $this->ctrl = $ctrl;
-        $this->data = $data;
-    }
+	/**
+	 * Constructor 
+	 * @param \Fisharebest\Webtrees\Controller\BaseController $ctrl Controller
+	 * @param ViewBag $data ViewBag holding view data
+	 */
+	public function __construct(\Fisharebest\Webtrees\Controller\BaseController $ctrl, ViewBag $data) {
+		$this->ctrl = $ctrl;
+		$this->data = $data;
+	}
     
-    /**
-     * Render the view to the page, including header.
-     * 
-     * @throws \Exception
-     */
-    public function render() {
-        global $controller;        
+	/**
+	 * Render the view to the page, including header.
+	 * 
+	 * @throws \Exception
+	 */
+	public function render() {
+		global $controller;        
         
-        if(!$this->ctrl) throw new \Exception('Controller not initialised');
+		if(!$this->ctrl) throw new \Exception('Controller not initialised');
         
 		$controller = $this->ctrl;
-        $this->ctrl->pageHeader();
+		$this->ctrl->pageHeader();
         
-        echo $this->renderContent();
-    }
+		echo $this->renderContent();
+	}
     
-    /**
-     * Render the view to the page, without any header
-     */
-    public function renderPartial() {
-        echo $this->getHtmlPartial();
-    }
+	/**
+	 * Render the view to the page, without any header
+	 */
+	public function renderPartial() {
+		echo $this->getHtmlPartial();
+	}
     
-    /**
-     * Return the HTML code generated by the view, without any header
-     */
-    public function getHtmlPartial() {
-        ob_start();
-        $html_render = $this->renderContent();
-        $html_buffer = ob_get_clean();        
+	/**
+	 * Return the HTML code generated by the view, without any header
+	 */
+	public function getHtmlPartial() {
+		ob_start();
+		$html_render = $this->renderContent();
+		$html_buffer = ob_get_clean();        
         
-        return empty($html_render) ? $html_buffer : $html_render;
-    }
+		return empty($html_render) ? $html_buffer : $html_render;
+	}
     
-    /**
-     * Abstract method containing the details of the view.
-     */
-    abstract protected function renderContent();
+	/**
+	 * Abstract method containing the details of the view.
+	 */
+	abstract protected function renderContent();
     
 }
  
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
     public function render() {
         global $controller;        
         
-        if(!$this->ctrl) throw new \Exception('Controller not initialised');
+        if (!$this->ctrl) throw new \Exception('Controller not initialised');
         
 		$controller = $this->ctrl;
         $this->ctrl->pageHeader();

Braces +3 added lines, -1 removed lines

@@ -45,7 +45,9 @@
     public function render() {
         global $controller;        
         
-        if(!$this->ctrl) throw new \Exception('Controller not initialised');
+        if(!$this->ctrl) {
+        	throw new \Exception('Controller not initialised');
+        }
         
 		$controller = $this->ctrl;
         $this->ctrl->pageHeader();

src/Webtrees/Module/MiscExtensions/AdminConfigController.php

Indentation +37 added lines, -37 removed lines

@@ -27,52 +27,52 @@
  */
 class AdminConfigController extends MvcController
 {    
-    /**
-     * Manage updates sent from the AdminConfig@index form.
-     */
-    protected function update() {    
-        if(Auth::isAdmin()){
+	/**
+	 * Manage updates sent from the AdminConfig@index form.
+	 */
+	protected function update() {    
+		if(Auth::isAdmin()){
     
-            $this->module->setSetting('MAJ_TITLE_PREFIX', Filter::post('MAJ_TITLE_PREFIX'));
+			$this->module->setSetting('MAJ_TITLE_PREFIX', Filter::post('MAJ_TITLE_PREFIX'));
             
-            $this->module->setSetting('MAJ_ADD_HTML_HEADER', Filter::postInteger('MAJ_ADD_HTML_HEADER', 0, 1));
-            $this->module->setSetting('MAJ_SHOW_HTML_HEADER', Filter::postInteger('MAJ_SHOW_HTML_HEADER', Auth::PRIV_HIDE, Auth::PRIV_PRIVATE, Auth::PRIV_HIDE));
-            $this->module->setSetting('MAJ_HTML_HEADER', Filter::post('MAJ_HTML_HEADER'));
+			$this->module->setSetting('MAJ_ADD_HTML_HEADER', Filter::postInteger('MAJ_ADD_HTML_HEADER', 0, 1));
+			$this->module->setSetting('MAJ_SHOW_HTML_HEADER', Filter::postInteger('MAJ_SHOW_HTML_HEADER', Auth::PRIV_HIDE, Auth::PRIV_PRIVATE, Auth::PRIV_HIDE));
+			$this->module->setSetting('MAJ_HTML_HEADER', Filter::post('MAJ_HTML_HEADER'));
             
-            $this->module->setSetting('MAJ_ADD_HTML_FOOTER', Filter::postInteger('MAJ_ADD_HTML_FOOTER', 0, 1));
-            $this->module->setSetting('MAJ_SHOW_HTML_FOOTER', Filter::postInteger('MAJ_SHOW_HTML_FOOTER', Auth::PRIV_HIDE, Auth::PRIV_PRIVATE, Auth::PRIV_HIDE));
-            $this->module->setSetting('MAJ_HTML_FOOTER', Filter::post('MAJ_HTML_FOOTER'));
+			$this->module->setSetting('MAJ_ADD_HTML_FOOTER', Filter::postInteger('MAJ_ADD_HTML_FOOTER', 0, 1));
+			$this->module->setSetting('MAJ_SHOW_HTML_FOOTER', Filter::postInteger('MAJ_SHOW_HTML_FOOTER', Auth::PRIV_HIDE, Auth::PRIV_PRIVATE, Auth::PRIV_HIDE));
+			$this->module->setSetting('MAJ_HTML_FOOTER', Filter::post('MAJ_HTML_FOOTER'));
             
-            $this->module->setSetting('MAJ_DISPLAY_CNIL', Filter::postInteger('MAJ_DISPLAY_CNIL', 0, 1));
-            $this->module->setSetting('MAJ_CNIL_REFERENCE', Filter::post('MAJ_CNIL_REFERENCE'));
+			$this->module->setSetting('MAJ_DISPLAY_CNIL', Filter::postInteger('MAJ_DISPLAY_CNIL', 0, 1));
+			$this->module->setSetting('MAJ_CNIL_REFERENCE', Filter::post('MAJ_CNIL_REFERENCE'));
                 
-            FlashMessages::addMessage(I18N::translate('The preferences for the module “%s” have been updated.', $this->module->getTitle()), 'success');
+			FlashMessages::addMessage(I18N::translate('The preferences for the module “%s” have been updated.', $this->module->getTitle()), 'success');
     
-            return;
-        }
-    }
+			return;
+		}
+	}
     
-    /**
-     * Pages
-     */
+	/**
+	 * Pages
+	 */
         
-    /**
-     * AdminConfig@index
-     */
-    public function index() {
-        $action = Filter::post('action');        
-        if($action == 'update' && Filter::checkCsrf()) $this->update();
+	/**
+	 * AdminConfig@index
+	 */
+	public function index() {
+		$action = Filter::post('action');        
+		if($action == 'update' && Filter::checkCsrf()) $this->update();
         
-        Theme::theme(new AdministrationTheme)->init(Globals::getTree());        
-        $ctrl = new PageController();
-        $ctrl
-            ->restrictAccess(Auth::isAdmin())
-            ->setPageTitle($this->module->getTitle());
+		Theme::theme(new AdministrationTheme)->init(Globals::getTree());        
+		$ctrl = new PageController();
+		$ctrl
+			->restrictAccess(Auth::isAdmin())
+			->setPageTitle($this->module->getTitle());
             
-        $view_bag = new ViewBag();
-        $view_bag->set('title', $ctrl->getPageTitle());
-        $view_bag->set('module', $this->module);
+		$view_bag = new ViewBag();
+		$view_bag->set('title', $ctrl->getPageTitle());
+		$view_bag->set('module', $this->module);
         
-        ViewFactory::make('AdminConfig', $this, $ctrl, $view_bag)->render();
-    }
+		ViewFactory::make('AdminConfig', $this, $ctrl, $view_bag)->render();
+	}
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
      * Manage updates sent from the AdminConfig@index form.
      */
     protected function update() {    
-        if(Auth::isAdmin()){
+        if (Auth::isAdmin()) {
     
             $this->module->setSetting('MAJ_TITLE_PREFIX', Filter::post('MAJ_TITLE_PREFIX'));
             
@@ -61,7 +61,7 @@ 
      */
     public function index() {
         $action = Filter::post('action');        
-        if($action == 'update' && Filter::checkCsrf()) $this->update();
+        if ($action == 'update' && Filter::checkCsrf()) $this->update();
         
         Theme::theme(new AdministrationTheme)->init(Globals::getTree());        
         $ctrl = new PageController();

Braces +3 added lines, -1 removed lines

@@ -61,7 +61,9 @@
      */
     public function index() {
         $action = Filter::post('action');        
-        if($action == 'update' && Filter::checkCsrf()) $this->update();
+        if($action == 'update' && Filter::checkCsrf()) {
+        	$this->update();
+        }
         
         Theme::theme(new AdministrationTheme)->init(Globals::getTree());        
         $ctrl = new PageController();

src/Webtrees/Module/Hooks/AdminConfigController.php

Indentation +73 added lines, -73 removed lines

@@ -30,87 +30,87 @@ 
  */
 class AdminConfigController extends MvcController
 {
-    /**
-     * Manage updates sent from the AdminConfig@index form.
-     */
-    protected function update() {
-        if(Auth::isAdmin()){
-            $ihooks = HookProvider::getInstance()->getInstalledHooks();
+	/**
+	 * Manage updates sent from the AdminConfig@index form.
+	 */
+	protected function update() {
+		if(Auth::isAdmin()){
+			$ihooks = HookProvider::getInstance()->getInstalledHooks();
             	
-            $module_names= Database::prepare(
-                "SELECT module_name FROM `##module` WHERE status='disabled'"
-            )->fetchOneColumn();
+			$module_names= Database::prepare(
+				"SELECT module_name FROM `##module` WHERE status='disabled'"
+			)->fetchOneColumn();
             	
-            if($ihooks !== null){
-                foreach ($ihooks as $ihook => $params) {
-                    if(Filter::post('hook-' . $params['id']) === 'yes') {                    
-                        $array_hook = explode('#', $ihook);
-                        //Update status
-                        $new_status= Filter::postBool('status-' . $params['id']);
-                        if(in_array($array_hook[0], $module_names)) $new_status = false;
-                        $previous_status = $params['status'];
-                        if ($new_status !== null) {
-                            $new_status= $new_status ? 'enabled' : 'disabled';
-                            if($new_status != $previous_status){
-                                $chook = new Hook($array_hook[1], $array_hook[2]);
-                                switch($new_status){
-                                    case 'enabled':
-                                        $chook->enable($array_hook[0]);
-                                        break;
-                                    case 'disabled':
-                                        $chook->disable($array_hook[0]);
-                                        break;
-                                    default:
-                                        break;
-                                }
-                            }
-                        }
+			if($ihooks !== null){
+				foreach ($ihooks as $ihook => $params) {
+					if(Filter::post('hook-' . $params['id']) === 'yes') {                    
+						$array_hook = explode('#', $ihook);
+						//Update status
+						$new_status= Filter::postBool('status-' . $params['id']);
+						if(in_array($array_hook[0], $module_names)) $new_status = false;
+						$previous_status = $params['status'];
+						if ($new_status !== null) {
+							$new_status= $new_status ? 'enabled' : 'disabled';
+							if($new_status != $previous_status){
+								$chook = new Hook($array_hook[1], $array_hook[2]);
+								switch($new_status){
+									case 'enabled':
+										$chook->enable($array_hook[0]);
+										break;
+									case 'disabled':
+										$chook->disable($array_hook[0]);
+										break;
+									default:
+										break;
+								}
+							}
+						}
                         
-                        //Update priority
-                        $new_priority = Filter::postInteger("moduleorder-{$params['id']}");
-                        $previous_priority = $params['priority'];
-                        if ($new_priority !== null) {
-                            if($new_priority != $previous_priority){
-                                $chook = new Hook($array_hook[1], $array_hook[2]);
-                                $chook->setPriority($array_hook[0], $new_priority);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
+						//Update priority
+						$new_priority = Filter::postInteger("moduleorder-{$params['id']}");
+						$previous_priority = $params['priority'];
+						if ($new_priority !== null) {
+							if($new_priority != $previous_priority){
+								$chook = new Hook($array_hook[1], $array_hook[2]);
+								$chook->setPriority($array_hook[0], $new_priority);
+							}
+						}
+					}
+				}
+			}
+		}
+	}
     
-    /**
-     * Pages
-     */
+	/**
+	 * Pages
+	 */
         
-    /**
-     * AdminConfig@index
-     */
-    public function index() {            
-        HookProvider::getInstance()->updateHooks();
+	/**
+	 * AdminConfig@index
+	 */
+	public function index() {            
+		HookProvider::getInstance()->updateHooks();
         
-        $action = Filter::post('action');        
-        if($action == 'update' && Filter::checkCsrf()) $this->update();
+		$action = Filter::post('action');        
+		if($action == 'update' && Filter::checkCsrf()) $this->update();
         
-        Theme::theme(new AdministrationTheme)->init(Globals::getTree());        
-        $ctrl = new PageController();
-        $ctrl
-            ->restrictAccess(Auth::isAdmin())
-            ->setPageTitle($this->module->getTitle());
+		Theme::theme(new AdministrationTheme)->init(Globals::getTree());        
+		$ctrl = new PageController();
+		$ctrl
+			->restrictAccess(Auth::isAdmin())
+			->setPageTitle($this->module->getTitle());
         
-        $table_id = 'table-installedhooks-' . Uuid::uuid4();
+		$table_id = 'table-installedhooks-' . Uuid::uuid4();
 
-        $view_bag = new ViewBag();
-        $view_bag->set('title', $ctrl->getPageTitle());
-        $view_bag->set('table_id', $table_id);
-        $view_bag->set('hook_list', HookProvider::getInstance()->getRawInstalledHooks());
+		$view_bag = new ViewBag();
+		$view_bag->set('title', $ctrl->getPageTitle());
+		$view_bag->set('table_id', $table_id);
+		$view_bag->set('hook_list', HookProvider::getInstance()->getRawInstalledHooks());
         
-        $ctrl
-        ->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
-        ->addExternalJavascript(WT_DATATABLES_BOOTSTRAP_JS_URL)
-        ->addInlineJavascript('
+		$ctrl
+		->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
+		->addExternalJavascript(WT_DATATABLES_BOOTSTRAP_JS_URL)
+		->addInlineJavascript('
 		  	jQuery(document).ready(function() {
 				jQuery("#'.$table_id.'").dataTable( {
 					'.I18N::datatablesI18N().',		
@@ -130,7 +130,7 @@ 
 			});
 		');
         
-        ViewFactory::make('AdminConfig', $this, $ctrl, $view_bag)->render();
-    }
+		ViewFactory::make('AdminConfig', $this, $ctrl, $view_bag)->render();
+	}
         
 }
\ No newline at end of file

Spacing +12 added lines, -12 removed lines

@@ -34,26 +34,26 @@ 
      * Manage updates sent from the AdminConfig@index form.
      */
     protected function update() {
-        if(Auth::isAdmin()){
+        if (Auth::isAdmin()) {
             $ihooks = HookProvider::getInstance()->getInstalledHooks();
             	
-            $module_names= Database::prepare(
+            $module_names = Database::prepare(
                 "SELECT module_name FROM `##module` WHERE status='disabled'"
             )->fetchOneColumn();
             	
-            if($ihooks !== null){
+            if ($ihooks !== null) {
                 foreach ($ihooks as $ihook => $params) {
-                    if(Filter::post('hook-' . $params['id']) === 'yes') {                    
+                    if (Filter::post('hook-'.$params['id']) === 'yes') {                    
                         $array_hook = explode('#', $ihook);
                         //Update status
-                        $new_status= Filter::postBool('status-' . $params['id']);
-                        if(in_array($array_hook[0], $module_names)) $new_status = false;
+                        $new_status = Filter::postBool('status-'.$params['id']);
+                        if (in_array($array_hook[0], $module_names)) $new_status = false;
                         $previous_status = $params['status'];
                         if ($new_status !== null) {
-                            $new_status= $new_status ? 'enabled' : 'disabled';
-                            if($new_status != $previous_status){
+                            $new_status = $new_status ? 'enabled' : 'disabled';
+                            if ($new_status != $previous_status) {
                                 $chook = new Hook($array_hook[1], $array_hook[2]);
-                                switch($new_status){
+                                switch ($new_status) {
                                     case 'enabled':
                                         $chook->enable($array_hook[0]);
                                         break;
@@ -70,7 +70,7 @@ 
                         $new_priority = Filter::postInteger("moduleorder-{$params['id']}");
                         $previous_priority = $params['priority'];
                         if ($new_priority !== null) {
-                            if($new_priority != $previous_priority){
+                            if ($new_priority != $previous_priority) {
                                 $chook = new Hook($array_hook[1], $array_hook[2]);
                                 $chook->setPriority($array_hook[0], $new_priority);
                             }
@@ -92,7 +92,7 @@ 
         HookProvider::getInstance()->updateHooks();
         
         $action = Filter::post('action');        
-        if($action == 'update' && Filter::checkCsrf()) $this->update();
+        if ($action == 'update' && Filter::checkCsrf()) $this->update();
         
         Theme::theme(new AdministrationTheme)->init(Globals::getTree());        
         $ctrl = new PageController();
@@ -100,7 +100,7 @@ 
             ->restrictAccess(Auth::isAdmin())
             ->setPageTitle($this->module->getTitle());
         
-        $table_id = 'table-installedhooks-' . Uuid::uuid4();
+        $table_id = 'table-installedhooks-'.Uuid::uuid4();
 
         $view_bag = new ViewBag();
         $view_bag->set('title', $ctrl->getPageTitle());

Braces +6 added lines, -2 removed lines

@@ -47,7 +47,9 @@ 
                         $array_hook = explode('#', $ihook);
                         //Update status
                         $new_status= Filter::postBool('status-' . $params['id']);
-                        if(in_array($array_hook[0], $module_names)) $new_status = false;
+                        if(in_array($array_hook[0], $module_names)) {
+                        	$new_status = false;
+                        }
                         $previous_status = $params['status'];
                         if ($new_status !== null) {
                             $new_status= $new_status ? 'enabled' : 'disabled';
@@ -92,7 +94,9 @@ 
         HookProvider::getInstance()->updateHooks();
         
         $action = Filter::post('action');        
-        if($action == 'update' && Filter::checkCsrf()) $this->update();
+        if($action == 'update' && Filter::checkCsrf()) {
+        	$this->update();
+        }
         
         Theme::theme(new AdministrationTheme)->init(Globals::getTree());        
         $ctrl = new PageController();

src/Webtrees/Module/MiscExtensionsModule.php

Indentation +72 added lines, -72 removed lines

@@ -32,49 +32,49 @@ 
 class MiscExtensionsModule extends AbstractModule 
 implements HookSubscriberInterface, IndividualHeaderExtenderInterface, PageHeaderExtenderInterface, PageFooterExtenderInterface, ModuleConfigInterface
 {    
-    /** @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';
     
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\AbstractModule::getTitle()
-     */
-    public function getTitle() {
-        return I18N::translate('Miscellaneous extensions');
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\AbstractModule::getTitle()
+	 */
+	public function getTitle() {
+		return I18N::translate('Miscellaneous extensions');
+	}
     
    /**
     * {@inheritDoc}
     * @see \Fisharebest\Webtrees\Module\AbstractModule::getDescription()
     */
-    public function getDescription() {
-        return I18N::translate('Miscellaneous extensions for <strong>webtrees</strong>.');
-    }
+	public function getDescription() {
+		return I18N::translate('Miscellaneous extensions for <strong>webtrees</strong>.');
+	}
     
-    /**
-     * {@inhericDoc}
-     */
-    public function modAction($mod_action) {
-        \MyArtJaub\Webtrees\Mvc\Dispatcher::getInstance()->handle($this, $mod_action);
-    }
+	/**
+	 * {@inhericDoc}
+	 */
+	public function modAction($mod_action) {
+		\MyArtJaub\Webtrees\Mvc\Dispatcher::getInstance()->handle($this, $mod_action);
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink()
-     */
-    public function getConfigLink() {
-        return 'module.php?mod=' . $this->getName() . '&amp;mod_action=AdminConfig';
-    }
+	/**
+	 * {@inhericDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink()
+	 */
+	public function getConfigLink() {
+		return 'module.php?mod=' . $this->getName() . '&amp;mod_action=AdminConfig';
+	}
     
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookSubscriberInterface::getSubscribedHooks()
-     */
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookSubscriberInterface::getSubscribedHooks()
+	 */
 	public function getSubscribedHooks() {
 		return array(
-		    'hExtendIndiHeaderLeft' => 20,
-		    'hPrintHeader' => 20,
-		    'hPrintFooter' => 20
+			'hExtendIndiHeaderLeft' => 20,
+			'hPrintHeader' => 20,
+			'hPrintFooter' => 20
 		);
 	}
 	
@@ -89,22 +89,22 @@ 
 	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\IndividualHeaderExtenderInterface::hExtendIndiHeaderLeft()
 	 */
 	public function hExtendIndiHeaderLeft(IndividualController $ctrlIndi) { 
-	    $res = '';
-	    $dindi = new Individual($ctrlIndi->getSignificantIndividual());
-	    $titles = $dindi->getTitles();
-	    if(count($titles)>0){
-	        $res = '
+		$res = '';
+		$dindi = new Individual($ctrlIndi->getSignificantIndividual());
+		$titles = $dindi->getTitles();
+		if(count($titles)>0){
+			$res = '
 	            <dl>
 	               <dt class="label">'.I18N::translate('Titles').'</dt>';
-            foreach($titles as $title=>$props){
-                $res .= 
-                    '<dd class="field">' . $title. ' ' .
-                    FunctionsPrint::getListFromArray($props) .
-                    '</dd>';
-            }
-            $res .=  '</dl>';
-        }
-	    return array( 'indi-header-titles' , $res);	    
+			foreach($titles as $title=>$props){
+				$res .= 
+					'<dd class="field">' . $title. ' ' .
+					FunctionsPrint::getListFromArray($props) .
+					'</dd>';
+			}
+			$res .=  '</dl>';
+		}
+		return array( 'indi-header-titles' , $res);	    
 	}
 	
 	/**
@@ -118,13 +118,13 @@ 
 	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\PageHeaderExtenderInterface::hPrintHeader()
 	 */
 	public function hPrintHeader() {
-	    $html = '';
-	    if($this->getSetting('MAJ_ADD_HTML_HEADER', 0) == 1){
-	        if(Auth::accessLevel(Globals::getTree()) >= $this->getSetting('MAJ_SHOW_HTML_HEADER', Auth::PRIV_HIDE)  && !Filter::getBool('noheader')){
-	            $html .= $this->getSetting('MAJ_HTML_HEADER', '');
-	        }
-	    }	
-	    return $html;
+		$html = '';
+		if($this->getSetting('MAJ_ADD_HTML_HEADER', 0) == 1){
+			if(Auth::accessLevel(Globals::getTree()) >= $this->getSetting('MAJ_SHOW_HTML_HEADER', Auth::PRIV_HIDE)  && !Filter::getBool('noheader')){
+				$html .= $this->getSetting('MAJ_HTML_HEADER', '');
+			}
+		}	
+		return $html;
 	}
 	
 	/**
@@ -132,26 +132,26 @@ 
 	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\PageFooterExtenderInterface::hPrintFooter()
 	 */
 	public function hPrintFooter() {
-	    $wt_tree = Globals::getTree();
-	    $html = '';
-	    if($this->getSetting('MAJ_DISPLAY_CNIL', 0) == 1){
-	        $html .= '<br/>';
-	        $html .= '<div class="center">';
-	        $cnil_ref = $this->getSetting('MAJ_CNIL_REFERENCE', '');
-	        if($cnil_ref != ''){
-	            $html .= I18N::translate('This site has been notified to the French National Commission for Data protection (CNIL) and registered under number %s. ', $cnil_ref);
-	        }
-	        $html .= I18N::translate('In accordance with the French Data protection Act (<em>Loi Informatique et Libertés</em>) of January 6th, 1978, you have the right to access, modify, rectify and delete personal information that pertains to you. To exercice this right, please contact %s, and provide your name, address and a proof of your identity.',
-	            Theme::theme()->contactLink(User::find($wt_tree->getPreference('WEBMASTER_USER_ID'))));
-	        $html .= '</div>';
-	    }
+		$wt_tree = Globals::getTree();
+		$html = '';
+		if($this->getSetting('MAJ_DISPLAY_CNIL', 0) == 1){
+			$html .= '<br/>';
+			$html .= '<div class="center">';
+			$cnil_ref = $this->getSetting('MAJ_CNIL_REFERENCE', '');
+			if($cnil_ref != ''){
+				$html .= I18N::translate('This site has been notified to the French National Commission for Data protection (CNIL) and registered under number %s. ', $cnil_ref);
+			}
+			$html .= I18N::translate('In accordance with the French Data protection Act (<em>Loi Informatique et Libertés</em>) of January 6th, 1978, you have the right to access, modify, rectify and delete personal information that pertains to you. To exercice this right, please contact %s, and provide your name, address and a proof of your identity.',
+				Theme::theme()->contactLink(User::find($wt_tree->getPreference('WEBMASTER_USER_ID'))));
+			$html .= '</div>';
+		}
 	    
-	    if($this->getSetting('MAJ_ADD_HTML_FOOTER', 0) == 1){
-	        if(Auth::accessLevel($wt_tree) >= $this->getSetting('MAJ_SHOW_HTML_FOOTER', Auth::PRIV_HIDE)  && !Filter::getBool('nofooter')){
-	            $html .= $this->getSetting('MAJ_HTML_FOOTER', '');
-	        }
-	    }
-	    return $html;
+		if($this->getSetting('MAJ_ADD_HTML_FOOTER', 0) == 1){
+			if(Auth::accessLevel($wt_tree) >= $this->getSetting('MAJ_SHOW_HTML_FOOTER', Auth::PRIV_HIDE)  && !Filter::getBool('nofooter')){
+				$html .= $this->getSetting('MAJ_HTML_FOOTER', '');
+			}
+		}
+		return $html;
 	}
 	
 }

Spacing +13 added lines, -13 removed lines

@@ -63,7 +63,7 @@ 
      * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink()
      */
     public function getConfigLink() {
-        return 'module.php?mod=' . $this->getName() . '&mod_action=AdminConfig';
+        return 'module.php?mod='.$this->getName().'&mod_action=AdminConfig';
     }
     
     /**
@@ -92,19 +92,19 @@ 
 	    $res = '';
 	    $dindi = new Individual($ctrlIndi->getSignificantIndividual());
 	    $titles = $dindi->getTitles();
-	    if(count($titles)>0){
+	    if (count($titles) > 0) {
 	        $res = '
 	            <dl>
 	               <dt class="label">'.I18N::translate('Titles').'</dt>';
-            foreach($titles as $title=>$props){
+            foreach ($titles as $title=>$props) {
                 $res .= 
-                    '<dd class="field">' . $title. ' ' .
-                    FunctionsPrint::getListFromArray($props) .
+                    '<dd class="field">'.$title.' '.
+                    FunctionsPrint::getListFromArray($props).
                     '</dd>';
             }
-            $res .=  '</dl>';
+            $res .= '</dl>';
         }
-	    return array( 'indi-header-titles' , $res);	    
+	    return array('indi-header-titles', $res);	    
 	}
 	
 	/**
@@ -119,8 +119,8 @@ 
 	 */
 	public function hPrintHeader() {
 	    $html = '';
-	    if($this->getSetting('MAJ_ADD_HTML_HEADER', 0) == 1){
-	        if(Auth::accessLevel(Globals::getTree()) >= $this->getSetting('MAJ_SHOW_HTML_HEADER', Auth::PRIV_HIDE)  && !Filter::getBool('noheader')){
+	    if ($this->getSetting('MAJ_ADD_HTML_HEADER', 0) == 1) {
+	        if (Auth::accessLevel(Globals::getTree()) >= $this->getSetting('MAJ_SHOW_HTML_HEADER', Auth::PRIV_HIDE) && !Filter::getBool('noheader')) {
 	            $html .= $this->getSetting('MAJ_HTML_HEADER', '');
 	        }
 	    }	
@@ -134,11 +134,11 @@ 
 	public function hPrintFooter() {
 	    $wt_tree = Globals::getTree();
 	    $html = '';
-	    if($this->getSetting('MAJ_DISPLAY_CNIL', 0) == 1){
+	    if ($this->getSetting('MAJ_DISPLAY_CNIL', 0) == 1) {
 	        $html .= '<br/>';
 	        $html .= '<div class="center">';
 	        $cnil_ref = $this->getSetting('MAJ_CNIL_REFERENCE', '');
-	        if($cnil_ref != ''){
+	        if ($cnil_ref != '') {
 	            $html .= I18N::translate('This site has been notified to the French National Commission for Data protection (CNIL) and registered under number %s. ', $cnil_ref);
 	        }
 	        $html .= I18N::translate('In accordance with the French Data protection Act (<em>Loi Informatique et Libertés</em>) of January 6th, 1978, you have the right to access, modify, rectify and delete personal information that pertains to you. To exercice this right, please contact %s, and provide your name, address and a proof of your identity.',
@@ -146,8 +146,8 @@ 
 	        $html .= '</div>';
 	    }
 	    
-	    if($this->getSetting('MAJ_ADD_HTML_FOOTER', 0) == 1){
-	        if(Auth::accessLevel($wt_tree) >= $this->getSetting('MAJ_SHOW_HTML_FOOTER', Auth::PRIV_HIDE)  && !Filter::getBool('nofooter')){
+	    if ($this->getSetting('MAJ_ADD_HTML_FOOTER', 0) == 1) {
+	        if (Auth::accessLevel($wt_tree) >= $this->getSetting('MAJ_SHOW_HTML_FOOTER', Auth::PRIV_HIDE) && !Filter::getBool('nofooter')) {
 	            $html .= $this->getSetting('MAJ_HTML_FOOTER', '');
 	        }
 	    }

src/Webtrees/Globals.php

Indentation +36 added lines, -36 removed lines

@@ -16,48 +16,48 @@
  */
 class Globals {
     
-    /**
-     * Get global $WT_TREE variable.
-     * 
-     * @return \Fisharebest\Webtrees\Tree
-     */
-    public static function getTree() {
-        global $WT_TREE;
+	/**
+	 * Get global $WT_TREE variable.
+	 * 
+	 * @return \Fisharebest\Webtrees\Tree
+	 */
+	public static function getTree() {
+		global $WT_TREE;
         
-        return $WT_TREE;
-    }
+		return $WT_TREE;
+	}
     
-    /**
-     * Check whether the visitor is a bot.
-     * 
-     * @return boolean
-     */
-    public static function isSearchSpider() {
-        global $SEARCH_SPIDER;
+	/**
+	 * Check whether the visitor is a bot.
+	 * 
+	 * @return boolean
+	 */
+	public static function isSearchSpider() {
+		global $SEARCH_SPIDER;
         
-        return $SEARCH_SPIDER;
-    }
+		return $SEARCH_SPIDER;
+	}
     
-    /**
-     * Get the current controller.
-     * 
-     * @return \Fisharebest\Webtrees\BaseController
-     */
-    public static function getController() {
-        global $controller;
+	/**
+	 * Get the current controller.
+	 * 
+	 * @return \Fisharebest\Webtrees\BaseController
+	 */
+	public static function getController() {
+		global $controller;
         
-        return $controller;
-    }
+		return $controller;
+	}
     
-    /**
-     * Get the global facts
-     * 
-     * @return array
-     */
-    public static function getGlobalFacts() {
-        global $global_facts;
+	/**
+	 * Get the global facts
+	 * 
+	 * @return array
+	 */
+	public static function getGlobalFacts() {
+		global $global_facts;
         
-        return $global_facts;
-    }
+		return $global_facts;
+	}
     
 }

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

Indentation +329 added lines, -329 removed lines

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

Spacing +36 added lines, -36 removed lines

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

Braces +8 added lines, -11 removed lines

@@ -167,8 +167,7 @@ 
 			$ga = $this->getGeoAnalysis($id, false);
 			
 			Database::commit();
-		}
-		catch(\Exception $ex) {
+		} catch(\Exception $ex) {
 			Database::rollback();
 			$ga = null;
 			Log::addErrorLog('A new Geo Analysis failed to be created. Transaction rollbacked. Parameters ['.$description.', '.$analysis_level.','.$map_file.','.$map_top_level.','.$use_flags.', '.$gen_details.']. Exception: '.$ex->getMessage());
@@ -210,8 +209,7 @@ 
 			$ga = $this->getGeoAnalysis($ga->getId(), false);
 			
 			 Database::commit();
-		}
-		catch(\Exception $ex) {		    
+		} catch(\Exception $ex) {		    
 			Database::rollback();
 			Log::addErrorLog('The Geo Analysis ID “' . $ga->getId() . '” failed to be updated. Transaction rollbacked. Exception: '.$ex->getMessage());
 			$ga = null;
@@ -350,11 +348,9 @@ 
         if(!$this->place_hierarchy) {
             if($place_structure = $this->getPlacesHierarchyFromHeader()) {
                 $this->place_hierarchy = array('type' => 'header', 'hierarchy' => $place_structure);
-            }
-            elseif ($place_structure = $this->getPlacesHierarchyFromData()){
+            } elseif ($place_structure = $this->getPlacesHierarchyFromData()){
                 $this->place_hierarchy = array('type' => 'data', 'hierarchy' => $place_structure);
-            }
-            else {
+            } else {
                 $this->place_hierarchy = array('type' => 'none', 'hierarchy' => null);
             }
         }
@@ -418,14 +414,15 @@ 
             if($parts > $max_level) {
                 $max_level = $parts;
                 $places_with_high_level = array($place);
-            }
-            else if ($parts == $max_level) {
+            } else if ($parts == $max_level) {
                 $places_with_high_level[] = $place;
             }
         }
         
         // If empty array, then return null
-        if($max_level == 0) return null;
+        if($max_level == 0) {
+        	return null;
+        }
                 
         // Else, return the first alphabetical element -- cannot return random to ensure always the same example if used
         usort($places_with_high_level, array('Fisharebest\\Webtrees\\I18N', 'strcasecmp'));        

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

Indentation +25 added lines, -25 removed lines

@@ -23,14 +23,14 @@ 
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() {
+	protected function renderContent() {
         
-        /** @var Tree $tree  */
-        $tree = $this->data->get('tree');
-        $root_url = $this->data->get('root_url');
-        $other_trees = $this->data->get('other_trees');
-        $table_id = $this->data->get('table_id');
-        ?>        
+		/** @var Tree $tree  */
+		$tree = $this->data->get('tree');
+		$root_url = $this->data->get('root_url');
+		$other_trees = $this->data->get('other_trees');
+		$table_id = $this->data->get('table_id');
+		?>        
         <ol class="breadcrumb small">
         	<li><a href="admin.php"><?php echo I18N::translate('Control panel'); ?></a></li>
 			<li><a href="admin_modules.php"><?php echo I18N::translate('Module administration'); ?></a></li>
@@ -63,23 +63,23 @@ 
 		<p>
 		<?php $places_hierarchy = $this->data->get('places_hierarchy'); 
 		if($places_hierarchy && $places_hierarchy['type'] != 'none') {
-		    switch ($places_hierarchy['type']) {
-		        case 'header':
-		            echo I18N::translate('According to the GEDCOM header, the places within your file follows the structure: ');
-		            break;
-		        case 'data':
-		            echo I18N::translate('Your GEDCOM header does not contain any indication of place structure.').
-		            '<br/>'.
-		            I18N::translate('Here is an example of your place data: ');
-		            break;
-		        default:
-		            break;
-		    }
-		    $str_hierarchy = array();
-		    foreach($places_hierarchy['hierarchy'] as $key => $level) {
-		        $str_hierarchy[] = I18N::translate('(%d) %s', $key + 1, $level);
-		    }
-		    echo '<strong>' . implode(I18N::$list_separator, $str_hierarchy) . '</strong>';
+			switch ($places_hierarchy['type']) {
+				case 'header':
+					echo I18N::translate('According to the GEDCOM header, the places within your file follows the structure: ');
+					break;
+				case 'data':
+					echo I18N::translate('Your GEDCOM header does not contain any indication of place structure.').
+					'<br/>'.
+					I18N::translate('Here is an example of your place data: ');
+					break;
+				default:
+					break;
+			}
+			$str_hierarchy = array();
+			foreach($places_hierarchy['hierarchy'] as $key => $level) {
+				$str_hierarchy[] = I18N::translate('(%d) %s', $key + 1, $level);
+			}
+			echo '<strong>' . implode(I18N::$list_separator, $str_hierarchy) . '</strong>';
 		}
 		?>
 		</p>
@@ -109,7 +109,7 @@ 
         </a>
 		
 		<?php        
-    }
+	}
     
 }
  
\ No newline at end of file

Spacing +7 added lines, -7 removed lines

@@ -41,16 +41,16 @@ 
 		
 		<h2>
 			<?php echo $tree->getTitleHtml(); ?>
-			<?php if(count($other_trees) > 0) {?>
+			<?php if (count($other_trees) > 0) {?>
 			<div class="btn-group">
 				<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
 					<?php echo I18N::translate('Change tree'); ?>
 					<span class="caret"></span>
 				</button>
-				<?php foreach($other_trees as $other_tree) { ?>
+				<?php foreach ($other_trees as $other_tree) { ?>
 				<ul class="dropdown-menu" role="menu">
 					<li>
-						<a href="<?php echo $root_url . '&ged=' . $other_tree->getNameUrl(); ?>">
+						<a href="<?php echo $root_url.'&ged='.$other_tree->getNameUrl(); ?>">
 							<i class="fa fa-fw fa-tree"></i>&nbsp;<?php echo $other_tree->getTitleHtml(); ?>
 						</a>
 					</li>
@@ -62,7 +62,7 @@ 
 		
 		<p>
 		<?php $places_hierarchy = $this->data->get('places_hierarchy'); 
-		if($places_hierarchy && $places_hierarchy['type'] != 'none') {
+		if ($places_hierarchy && $places_hierarchy['type'] != 'none') {
 		    switch ($places_hierarchy['type']) {
 		        case 'header':
 		            echo I18N::translate('According to the GEDCOM header, the places within your file follows the structure: ');
@@ -76,10 +76,10 @@ 
 		            break;
 		    }
 		    $str_hierarchy = array();
-		    foreach($places_hierarchy['hierarchy'] as $key => $level) {
+		    foreach ($places_hierarchy['hierarchy'] as $key => $level) {
 		        $str_hierarchy[] = I18N::translate('(%d) %s', $key + 1, $level);
 		    }
-		    echo '<strong>' . implode(I18N::$list_separator, $str_hierarchy) . '</strong>';
+		    echo '<strong>'.implode(I18N::$list_separator, $str_hierarchy).'</strong>';
 		}
 		?>
 		</p>
@@ -103,7 +103,7 @@ 
     		</tbody>
     	</table>
     	
-        <a type="button" class="btn btn-primary" href="<?php echo $root_url . '@add&ged=' . $tree->getNameUrl(); ?>" title="<?php echo I18N::translate('Add'); ?>">
+        <a type="button" class="btn btn-primary" href="<?php echo $root_url.'@add&ged='.$tree->getNameUrl(); ?>" title="<?php echo I18N::translate('Add'); ?>">
         	<i class="fa fa-plus"></i>
         	<?php echo I18N::translate('Add'); ?>
         </a>