jon48 / webtrees-lib

src/Webtrees/Mvc/Dispatcher.php

Indentation +53 added lines, -53 removed lines

@@ -18,35 +18,35 @@ 
  */
 class Dispatcher implements DispatcherInterface {
     
-    /**
-     * @var Dispatcher $instance Singleton pattern instance
-     */
-    private static $instance = null;
+	/**
+	 * @var Dispatcher $instance Singleton pattern instance
+	 */
+	private static $instance = null;
     
-    /**
-     * Returns the *Dispatcher* instance of this class.
-     *
-     * @return Dispatcher The *Singleton* instance.
-     */
-    public static function getInstance()
-    {
-        if (null === static::$instance) {
-            static::$instance = new static();
-        }
+	/**
+	 * Returns the *Dispatcher* instance of this class.
+	 *
+	 * @return Dispatcher The *Singleton* instance.
+	 */
+	public static function getInstance()
+	{
+		if (null === static::$instance) {
+			static::$instance = new static();
+		}
     
-        return static::$instance;
-    }    
+		return static::$instance;
+	}    
     
 	/**
-     * Protected constructor.
-     */
-    protected function __construct() {}
+	 * Protected constructor.
+	 */
+	protected function __construct() {}
     
-    /**
-     * {@inheritdoc }
-     * @see \MyArtJaub\Webtrees\Mvc\DispatcherInterface::handle()
-     */
-    public function handle(fw\Module\AbstractModule $module, $request) {
+	/**
+	 * {@inheritdoc }
+	 * @see \MyArtJaub\Webtrees\Mvc\DispatcherInterface::handle()
+	 */
+	public function handle(fw\Module\AbstractModule $module, $request) {
 		
 		$fq_modclass_name = get_class($module);
 		$ctrl_namespace = substr($fq_modclass_name, 0, - strlen('Module')) . '\\';
@@ -66,18 +66,18 @@ 
 		
 		$ctrl_class = $ctrl_namespace . $ctrl_name . 'Controller';
 		if(class_exists($ctrl_class) 
-		    && is_subclass_of($ctrl_class, '\\MyArtJaub\\Webtrees\\Mvc\\Controller\\MvcController')
+			&& is_subclass_of($ctrl_class, '\\MyArtJaub\\Webtrees\\Mvc\\Controller\\MvcController')
 			&& $ctrl = new $ctrl_class($module) ) {
 			if(method_exists($ctrl, $method)) {
-			    try {
-			        call_user_func_array(array($ctrl, $method), array());
-			    }
-			    catch (MvcException $ex) {
-			        if(!headers_sent()) {
-			            http_response_code($ex->getHttpCode());
-			        }
-			        echo $ex->getMessage();			        
-			    }
+				try {
+					call_user_func_array(array($ctrl, $method), array());
+				}
+				catch (MvcException $ex) {
+					if(!headers_sent()) {
+						http_response_code($ex->getHttpCode());
+					}
+					echo $ex->getMessage();			        
+				}
 			}
 			 else {
 				 throw new \Exception('The page requested does not exist');
@@ -86,27 +86,27 @@ 
 		 else {
 			 throw new \Exception('The page requested does not exist');
 		 }
-    }
+	}
 
-    /**
-     * Private clone method to prevent cloning of the instance of the
-     * *Dispatcher* instance.
-     *
-     * @return void
-     */
-    private function __clone()
-    {
-    }
+	/**
+	 * Private clone method to prevent cloning of the instance of the
+	 * *Dispatcher* instance.
+	 *
+	 * @return void
+	 */
+	private function __clone()
+	{
+	}
     
-    /**
-     * Private unserialize method to prevent unserializing of the *Dispatcher*
-     * instance.
-     *
-     * @return void
-     */
-    private function __wakeup()
-    {
-    }
+	/**
+	 * Private unserialize method to prevent unserializing of the *Dispatcher*
+	 * instance.
+	 *
+	 * @return void
+	 */
+	private function __wakeup()
+	{
+	}
     
 }
 

Spacing +8 added lines, -8 removed lines

@@ -49,10 +49,10 @@ 
     public function handle(fw\Module\AbstractModule $module, $request) {
 		
 		$fq_modclass_name = get_class($module);
-		$ctrl_namespace = substr($fq_modclass_name, 0, - strlen('Module')) . '\\';
+		$ctrl_namespace = substr($fq_modclass_name, 0, - strlen('Module')).'\\';
 		
-		$args = explode( '@', $request, 2);
-		switch(count($args)) {
+		$args = explode('@', $request, 2);
+		switch (count($args)) {
 			case 1:
 				$ctrl_name = $args[0];
 				$method = 'index';
@@ -64,16 +64,16 @@ 
 				break;
 		}
 		
-		$ctrl_class = $ctrl_namespace . $ctrl_name . 'Controller';
-		if(class_exists($ctrl_class) 
+		$ctrl_class = $ctrl_namespace.$ctrl_name.'Controller';
+		if (class_exists($ctrl_class) 
 		    && is_subclass_of($ctrl_class, '\\MyArtJaub\\Webtrees\\Mvc\\Controller\\MvcController')
-			&& $ctrl = new $ctrl_class($module) ) {
-			if(method_exists($ctrl, $method)) {
+			&& $ctrl = new $ctrl_class($module)) {
+			if (method_exists($ctrl, $method)) {
 			    try {
 			        call_user_func_array(array($ctrl, $method), array());
 			    }
 			    catch (MvcException $ex) {
-			        if(!headers_sent()) {
+			        if (!headers_sent()) {
 			            http_response_code($ex->getHttpCode());
 			        }
 			        echo $ex->getMessage();			        

Braces +3 added lines, -6 removed lines

@@ -71,19 +71,16 @@
 			if(method_exists($ctrl, $method)) {
 			    try {
 			        call_user_func_array(array($ctrl, $method), array());
-			    }
-			    catch (MvcException $ex) {
+			    } catch (MvcException $ex) {
 			        if(!headers_sent()) {
 			            http_response_code($ex->getHttpCode());
 			        }
 			        echo $ex->getMessage();			        
 			    }
-			}
-			 else {
+			} else {
 				 throw new \Exception('The page requested does not exist');
 			 }
-		 }
-		 else {
+		 } else {
 			 throw new \Exception('The page requested does not exist');
 		 }
     }

src/Webtrees/Mvc/MvcException.php

Indentation +41 added lines, -41 removed lines

@@ -16,52 +16,52 @@
  */
 class MvcException extends \Exception {
 
-    /** @var int[] $VALID_HTTP List of valid HTTP codes */
-    protected static $VALID_HTTP =  array(
-        100, 101,
-        200, 201, 202, 203, 204, 205, 206,
-        300, 301, 302, 303, 304, 305, 306, 307,
-        400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417,
-        500, 501, 502, 503, 504, 505
-    );
+	/** @var int[] $VALID_HTTP List of valid HTTP codes */
+	protected static $VALID_HTTP =  array(
+		100, 101,
+		200, 201, 202, 203, 204, 205, 206,
+		300, 301, 302, 303, 304, 305, 306, 307,
+		400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417,
+		500, 501, 502, 503, 504, 505
+	);
     
-    /** @var int $http_code */
-    protected $http_code;
+	/** @var int $http_code */
+	protected $http_code;
     
-    /**
-     * Constructor for MvcException
-     * 
-     * @param int $http_code
-     * @param string $message
-     * @param int $code
-     * @param \Throwable $previous
-     */
-    public function __construct($http_code = 500, $message = "", $code = 0, \Throwable $previous = null) {
-        parent::__construct($message, $code, $previous);   
+	/**
+	 * Constructor for MvcException
+	 * 
+	 * @param int $http_code
+	 * @param string $message
+	 * @param int $code
+	 * @param \Throwable $previous
+	 */
+	public function __construct($http_code = 500, $message = "", $code = 0, \Throwable $previous = null) {
+		parent::__construct($message, $code, $previous);   
                 
-        $this->http_code = in_array($http_code, self::$VALID_HTTP) ? $http_code : 500;
-    }
+		$this->http_code = in_array($http_code, self::$VALID_HTTP) ? $http_code : 500;
+	}
     
-    /**
-     * Get the HTTP code
-     * 
-     * @return int
-     */
-    public function getHttpCode() {
-        return $this->http_code;
-    }
+	/**
+	 * Get the HTTP code
+	 * 
+	 * @return int
+	 */
+	public function getHttpCode() {
+		return $this->http_code;
+	}
     
-    /**
-     * Set the HTTP code
-     * 
-     * @param int $http_code
-     * @throws InvalidArgumentException Thrown if not valid Http code
-     */
-    public function setHttpCode($http_code) {
-        if(!in_array($http_code, self::$VALID_HTTP))
-            throw new \InvalidArgumentException('Invalid HTTP code');
-        $this->http_code= $http_code;
-    }   
+	/**
+	 * Set the HTTP code
+	 * 
+	 * @param int $http_code
+	 * @throws InvalidArgumentException Thrown if not valid Http code
+	 */
+	public function setHttpCode($http_code) {
+		if(!in_array($http_code, self::$VALID_HTTP))
+			throw new \InvalidArgumentException('Invalid HTTP code');
+		$this->http_code= $http_code;
+	}   
 
 }
 

Spacing +3 added lines, -3 removed lines

@@ -17,7 +17,7 @@ 
 class MvcException extends \Exception {
 
     /** @var int[] $VALID_HTTP List of valid HTTP codes */
-    protected static $VALID_HTTP =  array(
+    protected static $VALID_HTTP = array(
         100, 101,
         200, 201, 202, 203, 204, 205, 206,
         300, 301, 302, 303, 304, 305, 306, 307,
@@ -58,9 +58,9 @@ 
      * @throws InvalidArgumentException Thrown if not valid Http code
      */
     public function setHttpCode($http_code) {
-        if(!in_array($http_code, self::$VALID_HTTP))
+        if (!in_array($http_code, self::$VALID_HTTP))
             throw new \InvalidArgumentException('Invalid HTTP code');
-        $this->http_code= $http_code;
+        $this->http_code = $http_code;
     }   
 
 }

Braces +3 added lines, -2 removed lines

@@ -58,8 +58,9 @@
      * @throws InvalidArgumentException Thrown if not valid Http code
      */
     public function setHttpCode($http_code) {
-        if(!in_array($http_code, self::$VALID_HTTP))
-            throw new \InvalidArgumentException('Invalid HTTP code');
+        if(!in_array($http_code, self::$VALID_HTTP)) {
+                    throw new \InvalidArgumentException('Invalid HTTP code');
+        }
         $this->http_code= $http_code;
     }   
 

src/Webtrees/Module/HooksModule.php

Indentation +45 added lines, -45 removed lines

@@ -19,59 +19,59 @@
  * Hooks Module.
  */
 class HooksModule extends AbstractModule implements ModuleConfigInterface, DependentInterface {
-    // How to update the database schema for this module
-    const SCHEMA_TARGET_VERSION   = 1;
-    const SCHEMA_SETTING_NAME     = 'MAJ_HOOKS_SCHEMA_VERSION';
-    const SCHEMA_MIGRATION_PREFIX = '\MyArtJaub\Webtrees\Module\Hooks\Schema';
+	// How to update the database schema for this module
+	const SCHEMA_TARGET_VERSION   = 1;
+	const SCHEMA_SETTING_NAME     = 'MAJ_HOOKS_SCHEMA_VERSION';
+	const SCHEMA_MIGRATION_PREFIX = '\MyArtJaub\Webtrees\Module\Hooks\Schema';
     
-    /** @var string For custom modules - link for support, upgrades, etc. */
-    const CUSTOM_WEBSITE = 'https://github.com/jon48/webtrees-lib';
+	/** @var string For custom modules - link for support, upgrades, etc. */
+	const CUSTOM_WEBSITE = 'https://github.com/jon48/webtrees-lib';
     
-    /**
-     * {@inhericDoc}
-     */
-    public function getTitle() {
-        return /* I18N: Name of the “Hooks” module */ I18N::translate('Hooks');
-    }
+	/**
+	 * {@inhericDoc}
+	 */
+	public function getTitle() {
+		return /* I18N: Name of the “Hooks” module */ I18N::translate('Hooks');
+	}
     
-    /**
-     * {@inhericDoc}
-     */
-    public function getDescription() {
-        return /* I18N: Description of the “Hooks” module */ I18N::translate('Implements hooks management.');
-    }
+	/**
+	 * {@inhericDoc}
+	 */
+	public function getDescription() {
+		return /* I18N: Description of the “Hooks” module */ I18N::translate('Implements hooks management.');
+	}
     
-    /**
-     * {@inhericDoc}
-     */
-    public function modAction($mod_action) {
-        Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
+	/**
+	 * {@inhericDoc}
+	 */
+	public function modAction($mod_action) {
+		Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
         
-        \MyArtJaub\Webtrees\Mvc\Dispatcher::getInstance()->handle($this, $mod_action);
-    }
+		\MyArtJaub\Webtrees\Mvc\Dispatcher::getInstance()->handle($this, $mod_action);
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink()
-     */
-    public function getConfigLink() {
-        Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
+	/**
+	 * {@inhericDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink()
+	 */
+	public function getConfigLink() {
+		Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
         
-        return 'module.php?mod=' . $this->getName() . '&mod_action=AdminConfig';
-    }
+		return 'module.php?mod=' . $this->getName() . '&mod_action=AdminConfig';
+	}
     
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\DependentInterface::validatePrerequisites()
-     */
-    public function validatePrerequisites() {
-        try {
-            Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
-            return true;
-        }
-        catch (\Exception $ex) { }
-        return false;
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\DependentInterface::validatePrerequisites()
+	 */
+	public function validatePrerequisites() {
+		try {
+			Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
+			return true;
+		}
+		catch (\Exception $ex) { }
+		return false;
+	}
     
 
 }

Braces +1 added lines, -2 removed lines

@@ -68,8 +68,7 @@
         try {
             Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
             return true;
-        }
-        catch (\Exception $ex) { }
+        } catch (\Exception $ex) { }
         return false;
     }
     

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
     public function getConfigLink() {
         Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
         
-        return 'module.php?mod=' . $this->getName() . '&mod_action=AdminConfig';
+        return 'module.php?mod='.$this->getName().'&mod_action=AdminConfig';
     }
     
     /**

src/Webtrees/Module/GeoDispersionModule.php

Braces +1 added lines, -2 removed lines

@@ -79,8 +79,7 @@
             Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
             
             return !is_null(Module::getModuleByName(Constants::MODULE_MAJ_SOSA_NAME));
-        }
-        catch (\Exception $ex) {  }
+        } catch (\Exception $ex) {  }
         return false;
     }
     

Indentation +58 added lines, -58 removed lines

@@ -25,86 +25,86 @@
 class GeoDispersionModule extends AbstractModule implements ModuleConfigInterface, DependentInterface {
     
 	// How to update the database schema for this module
-    const SCHEMA_TARGET_VERSION   = 1;
-    const SCHEMA_SETTING_NAME     = 'MAJ_GEODISP_SCHEMA_VERSION';
-    const SCHEMA_MIGRATION_PREFIX = '\MyArtJaub\Webtrees\Module\GeoDispersion\Schema';
+	const SCHEMA_TARGET_VERSION   = 1;
+	const SCHEMA_SETTING_NAME     = 'MAJ_GEODISP_SCHEMA_VERSION';
+	const SCHEMA_MIGRATION_PREFIX = '\MyArtJaub\Webtrees\Module\GeoDispersion\Schema';
     
-    /** @var string For custom modules - link for support, upgrades, etc. */
-    const CUSTOM_WEBSITE = 'https://github.com/jon48/webtrees-lib';
+	/** @var string For custom modules - link for support, upgrades, etc. */
+	const CUSTOM_WEBSITE = 'https://github.com/jon48/webtrees-lib';
         
-    /**
-     * GeoDispersion analysis provider
-     * @var \MyArtJaub\Webtrees\Module\GeoDispersion\Model\GeoAnalysisProvider $provider
-     */
-    protected $provider;
+	/**
+	 * GeoDispersion analysis provider
+	 * @var \MyArtJaub\Webtrees\Module\GeoDispersion\Model\GeoAnalysisProvider $provider
+	 */
+	protected $provider;
     
-    /**
-     * {@inhericDoc}
-     */
-    public function getTitle() {
-        return /* I18N: Name of the “Hooks” module */ I18N::translate('Geographical Dispersion');
-    }
+	/**
+	 * {@inhericDoc}
+	 */
+	public function getTitle() {
+		return /* I18N: Name of the “Hooks” module */ I18N::translate('Geographical Dispersion');
+	}
     
-    /**
-     * {@inhericDoc}
-     */
-    public function getDescription() {
-        return /* I18N: Description of the “Hooks” module */ I18N::translate('Display the geographical dispersion of the root person’s Sosa ancestors.');
-    }
+	/**
+	 * {@inhericDoc}
+	 */
+	public function getDescription() {
+		return /* I18N: Description of the “Hooks” module */ I18N::translate('Display the geographical dispersion of the root person’s Sosa ancestors.');
+	}
     
-    /**
-     * {@inhericDoc}
-     */
-    public function modAction($mod_action) {
-        Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
+	/**
+	 * {@inhericDoc}
+	 */
+	public function modAction($mod_action) {
+		Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
         
-        \MyArtJaub\Webtrees\Mvc\Dispatcher::getInstance()->handle($this, $mod_action);
-    }
+		\MyArtJaub\Webtrees\Mvc\Dispatcher::getInstance()->handle($this, $mod_action);
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink()
-     */
-    public function getConfigLink() {
-        Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
+	/**
+	 * {@inhericDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink()
+	 */
+	public function getConfigLink() {
+		Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
         
-        return 'module.php?mod=' . $this->getName() . '&mod_action=AdminConfig';
-    }
+		return 'module.php?mod=' . $this->getName() . '&mod_action=AdminConfig';
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Module\DependentInterface::validatePrerequisites()
-     */
-    public function validatePrerequisites() {
-        try {
-            Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Module\DependentInterface::validatePrerequisites()
+	 */
+	public function validatePrerequisites() {
+		try {
+			Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
             
-            return !is_null(Module::getModuleByName(Constants::MODULE_MAJ_SOSA_NAME));
-        }
-        catch (\Exception $ex) {  }
-        return false;
-    }
+			return !is_null(Module::getModuleByName(Constants::MODULE_MAJ_SOSA_NAME));
+		}
+		catch (\Exception $ex) {  }
+		return false;
+	}
     
 	/**
 	 * Get the GeoAnalysis Provider (initialise it if not done yet).
 	 *
 	 * @return \MyArtJaub\Webtrees\Module\GeoDispersion\Model\GeoAnalysisProvider
 	 */
-    public function getProvider() {
-        if(!$this->provider) {
-            $this->provider = new GeoAnalysisProvider(Globals::getTree());
-        }
-        return $this->provider;
-    }
+	public function getProvider() {
+		if(!$this->provider) {
+			$this->provider = new GeoAnalysisProvider(Globals::getTree());
+		}
+		return $this->provider;
+	}
 	
 	/**
 	 * Set the GeoAnalysis Provider.
 	 *
 	 * @return \MyArtJaub\Webtrees\Module\GeoDispersion\Model\GeoAnalysisProvider
 	 */
-    public function setProvider(GeoAnalysisProvider $provider) {
-        $this->provider = $provider;
-    }
+	public function setProvider(GeoAnalysisProvider $provider) {
+		$this->provider = $provider;
+	}
     
 
 }

Spacing +2 added lines, -2 removed lines

@@ -68,7 +68,7 @@ 
     public function getConfigLink() {
         Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
         
-        return 'module.php?mod=' . $this->getName() . '&mod_action=AdminConfig';
+        return 'module.php?mod='.$this->getName().'&mod_action=AdminConfig';
     }
     
     /**
@@ -91,7 +91,7 @@ 
 	 * @return \MyArtJaub\Webtrees\Module\GeoDispersion\Model\GeoAnalysisProvider
 	 */
     public function getProvider() {
-        if(!$this->provider) {
+        if (!$this->provider) {
             $this->provider = new GeoAnalysisProvider(Globals::getTree());
         }
         return $this->provider;

src/Webtrees/Module/Sosa/Views/SosaConfigView.php

Indentation +8 added lines, -8 removed lines

@@ -24,9 +24,9 @@ 
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() {
+	protected function renderContent() {
         
-        ?>        
+		?>        
         
         <div id="maj-sosa-config-page">
 			<h2><?php echo $this->data->get('title'); ?></h2>
@@ -46,9 +46,9 @@ 
         			</div>
         			<div class="value">
         				<?php 
-        				    $users = $this->data->get('users_settings');
-        				    if(count($users) == 1) {
-        				        $root_indi = $users[0]['rootid'];  ?>
+							$users = $this->data->get('users_settings');
+							if(count($users) == 1) {
+								$root_indi = $users[0]['rootid'];  ?>
         					<label>
         						<input id="maj_sosa_input_userid" type="hidden" name="userid" value="<?php echo $users[0]['user']->getUserId(); ?>" />
         						<?php echo $users[0]['user']->getRealNameHtml() ?>
@@ -56,8 +56,8 @@ 
         				<?php  } else if(count($users) > 1) { ?>
         					<select id='maj-sosa-config-select' name="userid">
         					<?php 
-        					   $root_indi = $users[0]['rootid'];
-        					   foreach ($this->data->get('users_settings') as $user) { ?>
+							   $root_indi = $users[0]['rootid'];
+							   foreach ($this->data->get('users_settings') as $user) { ?>
         						<option value="<?php echo $user['user']->getUserId(); ?>"><?php echo $user['user']->getRealNameHtml() ?></option>
         					<?php  } ?>
         					</select>
@@ -80,7 +80,7 @@ 
 			</form>	
 		
 		<?php        
-    }
+	}
     
 }
  
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -47,13 +47,13 @@
         			<div class="value">
         				<?php 
         				    $users = $this->data->get('users_settings');
-        				    if(count($users) == 1) {
-        				        $root_indi = $users[0]['rootid'];  ?>
+        				    if (count($users) == 1) {
+        				        $root_indi = $users[0]['rootid']; ?>
         					<label>
         						<input id="maj_sosa_input_userid" type="hidden" name="userid" value="<?php echo $users[0]['user']->getUserId(); ?>" />
         						<?php echo $users[0]['user']->getRealNameHtml() ?>
         					</label>
-        				<?php  } else if(count($users) > 1) { ?>
+        				<?php  } else if (count($users) > 1) { ?>
         					<select id='maj-sosa-config-select' name="userid">
         					<?php 
         					   $root_indi = $users[0]['rootid'];

src/Webtrees/Hook/HookProvider.php

Braces +2 added lines, -4 removed lines

@@ -93,16 +93,14 @@
 							if(is_int($key)) {
 								$hook_item = $value;
 								$priority = self::DEFAULT_PRIORITY;
-							}
-							else{
+							} else{
 								$hook_item = explode('#', $key, 2);
 								$priority = $value;
 							}
 							if($hook_item && count($hook_item) == 2){
 								$hook_func = $hook_item[0];
 								$hook_cont = $hook_item[1];
-							}
-							else{
+							} else{
 								$hook_func = $hook_item[0];
 								$hook_cont = 'all';
 							}

Indentation +42 added lines, -42 removed lines

@@ -43,11 +43,11 @@ 
 	 */
 	public static function getInstance()
 	{
-	    if (null === static::$instance) {
-	        static::$instance = new static();
-	    }
+		if (null === static::$instance) {
+			static::$instance = new static();
+		}
 	
-	    return static::$instance;
+		return static::$instance;
 	}
 	
 	/**
@@ -55,7 +55,7 @@ 
 	 * @see \MyArtJaub\Webtrees\Hook\HookProviderInterface::get()
 	 */
 	public function get($hook_function, $hook_context = null) {
-	    return new Hook($hook_function, $hook_context);
+		return new Hook($hook_function, $hook_context);
 	}
 	
 	/**
@@ -73,20 +73,20 @@ 
 	public function getPossibleHooks() {
 		static $hooks=null;
 		if ($hooks === null) {
-		    $hooks = array();
+			$hooks = array();
 		    
-		    // Cannot use the same logic as the core Module loading,
-		    // as this forces a new include of the module.php file.
-		    // This causes issue when classes are defined in this file.
-		    // Cannot use Module::getActiveModules as well, as this is private.
-		    $module_names = Database::prepare(
-		        'SELECT module_name FROM `##module`'
-		    )->fetchOneColumn();
+			// Cannot use the same logic as the core Module loading,
+			// as this forces a new include of the module.php file.
+			// This causes issue when classes are defined in this file.
+			// Cannot use Module::getActiveModules as well, as this is private.
+			$module_names = Database::prepare(
+				'SELECT module_name FROM `##module`'
+			)->fetchOneColumn();
 		    
-		    foreach($module_names as $module_name) {
-		        $module = Module::getModuleByName($module_name);
+			foreach($module_names as $module_name) {
+				$module = Module::getModuleByName($module_name);
 		        
-		        if($module instanceof HookSubscriberInterface){
+				if($module instanceof HookSubscriberInterface){
 					$subscribedhooks = $module->getSubscribedHooks();
 					if(is_array($subscribedhooks)){
 						foreach($subscribedhooks as $key => $value){
@@ -111,7 +111,7 @@ 
 							}
 						}
 					}
-		        }
+				}
 			}
 		}
 		return $hooks;
@@ -153,33 +153,33 @@ 
 	 */
 	public function updateHooks() {
 	    
-	    if(Auth::isAdmin()){
-	        $ihooks = self::getInstalledHooks();
-	        $phooks = self::getPossibleHooks();
+		if(Auth::isAdmin()){
+			$ihooks = self::getInstalledHooks();
+			$phooks = self::getPossibleHooks();
 	        	
-	        // Insert hooks not existing yet in the DB
-	        if($phooks !== null){
-	            foreach($phooks as $phook => $priority){
-	                $array_hook = explode('#', $phook);
-	                if($ihooks === null || !array_key_exists($phook, $ihooks)){
-	                    $chook = new Hook($array_hook[1], $array_hook[2]);
-	                    $chook->subscribe($array_hook[0]);
-	                    $chook->setPriority($array_hook[0], $priority);
-	                }
-	            }
-	        }
+			// Insert hooks not existing yet in the DB
+			if($phooks !== null){
+				foreach($phooks as $phook => $priority){
+					$array_hook = explode('#', $phook);
+					if($ihooks === null || !array_key_exists($phook, $ihooks)){
+						$chook = new Hook($array_hook[1], $array_hook[2]);
+						$chook->subscribe($array_hook[0]);
+						$chook->setPriority($array_hook[0], $priority);
+					}
+				}
+			}
 	        	
-	        //Remove hooks not existing any more in the file system
-	        if($ihooks !== null){
-	            foreach(array_keys($ihooks) as $ihook){
-	                $array_hook = explode('#', $ihook);
-	                if($phooks === null || !array_key_exists($ihook, $phooks)){
-	                    $chook = new Hook($array_hook[1], $array_hook[2]);
-	                    $chook->remove($array_hook[0]);
-	                }
-	            }
-	        }
-	    }
+			//Remove hooks not existing any more in the file system
+			if($ihooks !== null){
+				foreach(array_keys($ihooks) as $ihook){
+					$array_hook = explode('#', $ihook);
+					if($phooks === null || !array_key_exists($ihook, $phooks)){
+						$chook = new Hook($array_hook[1], $array_hook[2]);
+						$chook->remove($array_hook[0]);
+					}
+				}
+			}
+		}
 	}
 	
 }
\ No newline at end of file

Spacing +25 added lines, -25 removed lines

@@ -71,7 +71,7 @@ 
 	 * @see \MyArtJaub\Webtrees\Hook\HookProviderInterface::getPossibleHooks()
 	 */
 	public function getPossibleHooks() {
-		static $hooks=null;
+		static $hooks = null;
 		if ($hooks === null) {
 		    $hooks = array();
 		    
@@ -83,31 +83,31 @@ 
 		        'SELECT module_name FROM `##module`'
 		    )->fetchOneColumn();
 		    
-		    foreach($module_names as $module_name) {
+		    foreach ($module_names as $module_name) {
 		        $module = Module::getModuleByName($module_name);
 		        
-		        if($module instanceof HookSubscriberInterface){
+		        if ($module instanceof HookSubscriberInterface) {
 					$subscribedhooks = $module->getSubscribedHooks();
-					if(is_array($subscribedhooks)){
-						foreach($subscribedhooks as $key => $value){
-							if(is_int($key)) {
+					if (is_array($subscribedhooks)) {
+						foreach ($subscribedhooks as $key => $value) {
+							if (is_int($key)) {
 								$hook_item = $value;
 								$priority = self::DEFAULT_PRIORITY;
 							}
-							else{
+							else {
 								$hook_item = explode('#', $key, 2);
 								$priority = $value;
 							}
-							if($hook_item && count($hook_item) == 2){
+							if ($hook_item && count($hook_item) == 2) {
 								$hook_func = $hook_item[0];
 								$hook_cont = $hook_item[1];
 							}
-							else{
+							else {
 								$hook_func = $hook_item[0];
 								$hook_cont = 'all';
 							}
-							if(method_exists($module, $hook_func)){
-								$hooks[$module->getName().'#'.$hook_func.'#'.$hook_cont]=$priority;
+							if (method_exists($module, $hook_func)) {
+								$hooks[$module->getName().'#'.$hook_func.'#'.$hook_cont] = $priority;
 							}
 						}
 					}
@@ -121,8 +121,8 @@ 
 	 * {@inheritDoc}
 	 * @see \MyArtJaub\Webtrees\Hook\HookProviderInterface::getRawInstalledHooks()
 	 */
-	public function getRawInstalledHooks(){
-		if(self::isModuleOperational()){
+	public function getRawInstalledHooks() {
+		if (self::isModuleOperational()) {
 			return Database::prepare(
 					"SELECT majh_id AS id, majh_module_name AS module, majh_hook_function AS hook, majh_hook_context as context, majh_module_priority AS priority,  majh_status AS status".
 					" FROM `##maj_hooks`".
@@ -136,11 +136,11 @@ 
 	 * {@inheritDoc}
 	 * @see \MyArtJaub\Webtrees\Hook\HookProviderInterface::getInstalledHooks()
 	 */
-	public function getInstalledHooks(){
-		static $installedhooks =null;
-		if($installedhooks===null){
-			$dbhooks=self::getRawInstalledHooks();
-			foreach($dbhooks as $dbhook){
+	public function getInstalledHooks() {
+		static $installedhooks = null;
+		if ($installedhooks === null) {
+			$dbhooks = self::getRawInstalledHooks();
+			foreach ($dbhooks as $dbhook) {
 				$installedhooks[($dbhook->module).'#'.($dbhook->hook).'#'.($dbhook->context)] = array('id' => $dbhook->id, 'status' => $dbhook->status, 'priority' => $dbhook->priority);
 			}
 		}
@@ -153,15 +153,15 @@ 
 	 */
 	public function updateHooks() {
 	    
-	    if(Auth::isAdmin()){
+	    if (Auth::isAdmin()) {
 	        $ihooks = self::getInstalledHooks();
 	        $phooks = self::getPossibleHooks();
 	        	
 	        // Insert hooks not existing yet in the DB
-	        if($phooks !== null){
-	            foreach($phooks as $phook => $priority){
+	        if ($phooks !== null) {
+	            foreach ($phooks as $phook => $priority) {
 	                $array_hook = explode('#', $phook);
-	                if($ihooks === null || !array_key_exists($phook, $ihooks)){
+	                if ($ihooks === null || !array_key_exists($phook, $ihooks)) {
 	                    $chook = new Hook($array_hook[1], $array_hook[2]);
 	                    $chook->subscribe($array_hook[0]);
 	                    $chook->setPriority($array_hook[0], $priority);
@@ -170,10 +170,10 @@ 
 	        }
 	        	
 	        //Remove hooks not existing any more in the file system
-	        if($ihooks !== null){
-	            foreach(array_keys($ihooks) as $ihook){
+	        if ($ihooks !== null) {
+	            foreach (array_keys($ihooks) as $ihook) {
 	                $array_hook = explode('#', $ihook);
-	                if($phooks === null || !array_key_exists($ihook, $phooks)){
+	                if ($phooks === null || !array_key_exists($ihook, $phooks)) {
 	                    $chook = new Hook($array_hook[1], $array_hook[2]);
 	                    $chook->remove($array_hook[0]);
 	                }

src/Webtrees/Controller/JsonController.php

Indentation +41 added lines, -41 removed lines

@@ -18,50 +18,50 @@
  */
 class JsonController extends BaseController {
     
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Controller\BaseController::pageHeader()
-     */
-    public function pageHeader() {        
-        header('Content-Type: application/json');
-        header('Cache-Control: no-cache, must-revalidate');
-        header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
-        // We've displayed the header - display the footer automatically
-        register_shutdown_function(array($this, 'pageFooter'));
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Controller\BaseController::pageHeader()
+	 */
+	public function pageHeader() {        
+		header('Content-Type: application/json');
+		header('Cache-Control: no-cache, must-revalidate');
+		header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+		// We've displayed the header - display the footer automatically
+		register_shutdown_function(array($this, 'pageFooter'));
         
-        return $this;
-    }
+		return $this;
+	}
     
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Controller\BaseController::pageFooter()
-     */
-    public function pageFooter() {
-        return $this;
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Controller\BaseController::pageFooter()
+	 */
+	public function pageFooter() {
+		return $this;
+	}
     
-    /**
-     * Restrict access.
-     *
-     * @param bool $condition
-     *
-     * @return $this
-     */
-    public function restrictAccess($condition) {
-        if ($condition !== true) {
-            throw new MvcException(403);
-        }
+	/**
+	 * Restrict access.
+	 *
+	 * @param bool $condition
+	 *
+	 * @return $this
+	 */
+	public function restrictAccess($condition) {
+		if ($condition !== true) {
+			throw new MvcException(403);
+		}
     
-        return $this;
-    }
+		return $this;
+	}
     
-    /**
-     * Encode the data to JSON format.
-     * 
-     * @param array $data Data to encode
-     * @param number $options JSON options mask. See http://php.net/manual/fr/json.constants.php
-     */
-    public function encode(array $data, $options = 0) {
-        echo json_encode($data, $options);
-    }
+	/**
+	 * Encode the data to JSON format.
+	 * 
+	 * @param array $data Data to encode
+	 * @param number $options JSON options mask. See http://php.net/manual/fr/json.constants.php
+	 */
+	public function encode(array $data, $options = 0) {
+		echo json_encode($data, $options);
+	}
 }

src/Webtrees/Module/WelcomeBlock/PiwikController.php

Braces +3 added lines, -1 removed lines

@@ -50,7 +50,9 @@
         
             if($fetched = File::fetchUrl($url)) {
                 $content = @unserialize($fetched);
-                if(is_numeric($content)) return $content;
+                if(is_numeric($content)) {
+                	return $content;
+                }
             }
         }
     

Indentation +60 added lines, -60 removed lines

@@ -23,77 +23,77 @@
  */
 class PiwikController extends MvcController
 {   
-    /**
-     * Retrieve the number of visitors from Piwik, for a given period.
-     * 
-     * @param string $block_id
-     * @param string $period
-     * @param (null|int) Number of visits
-     */
-    private function getNumberOfVisitsPiwik($block_id, $period='year'){
+	/**
+	 * Retrieve the number of visitors from Piwik, for a given period.
+	 * 
+	 * @param string $block_id
+	 * @param string $period
+	 * @param (null|int) Number of visits
+	 */
+	private function getNumberOfVisitsPiwik($block_id, $period='year'){
     
-        $piwik_url = $this->module->getBlockSetting($block_id, 'piwik_url');
-        $piwik_siteid = $this->module->getBlockSetting($block_id, 'piwik_siteid');
-        $piwik_token = $this->module->getBlockSetting($block_id, 'piwik_token');
+		$piwik_url = $this->module->getBlockSetting($block_id, 'piwik_url');
+		$piwik_siteid = $this->module->getBlockSetting($block_id, 'piwik_siteid');
+		$piwik_token = $this->module->getBlockSetting($block_id, 'piwik_token');
     
-        if($piwik_url && strlen($piwik_url) > 0 &&
-            $piwik_siteid  && strlen($piwik_siteid) > 0 &&
-            $piwik_token && strlen($piwik_token)            
-            ) 
-        {        
-            // calling Piwik REST API
-            $url = $piwik_url;
-            $url .= '?module=API&method=VisitsSummary.getVisits';
-            $url .= '&idSite='.$piwik_siteid.'&period='.$period.'&date=today';
-            $url .= '&format=PHP';
-            $url .= '&token_auth='.$piwik_token;
+		if($piwik_url && strlen($piwik_url) > 0 &&
+			$piwik_siteid  && strlen($piwik_siteid) > 0 &&
+			$piwik_token && strlen($piwik_token)            
+			) 
+		{        
+			// calling Piwik REST API
+			$url = $piwik_url;
+			$url .= '?module=API&method=VisitsSummary.getVisits';
+			$url .= '&idSite='.$piwik_siteid.'&period='.$period.'&date=today';
+			$url .= '&format=PHP';
+			$url .= '&token_auth='.$piwik_token;
         
-            if($fetched = File::fetchUrl($url)) {
-                $content = @unserialize($fetched);
-                if(is_numeric($content)) return $content;
-            }
-        }
+			if($fetched = File::fetchUrl($url)) {
+				$content = @unserialize($fetched);
+				if(is_numeric($content)) return $content;
+			}
+		}
     
-        return null;
-    }
+		return null;
+	}
     
-    /**
-     * Pages
-     */
+	/**
+	 * Pages
+	 */
         
-    /**
-     * Piwik@index
-     */
-    public function index() {  
+	/**
+	 * Piwik@index
+	 */
+	public function index() {  
         
-        $ctrl = new AjaxController();
+		$ctrl = new AjaxController();
         
-        $data = new ViewBag();
-        $data->set('has_stats', false);
+		$data = new ViewBag();
+		$data->set('has_stats', false);
         
-        $block_id = Filter::get('block_id');        
-        if($block_id){
-            $cached_item = Cache::get('piwikCountYear', $this->module);
-            $visitCountYear = $cached_item->get();
-            if(!$cached_item->isHit()) {
-                $visitCountYear = $this->getNumberOfVisitsPiwik($block_id);
-                if(!is_null($visitCountYear)) {
-                    $cached_item->expiresAt(new \DateTime('tomorrow'));  // Expires the next day at midnight
-                    Cache::save($cached_item, $visitCountYear);
-                }
-            }
+		$block_id = Filter::get('block_id');        
+		if($block_id){
+			$cached_item = Cache::get('piwikCountYear', $this->module);
+			$visitCountYear = $cached_item->get();
+			if(!$cached_item->isHit()) {
+				$visitCountYear = $this->getNumberOfVisitsPiwik($block_id);
+				if(!is_null($visitCountYear)) {
+					$cached_item->expiresAt(new \DateTime('tomorrow'));  // Expires the next day at midnight
+					Cache::save($cached_item, $visitCountYear);
+				}
+			}
             
-            if($visitCountYear){
-                $visitCountToday = max(0, $this->getNumberOfVisitsPiwik($block_id, 'day'));
-                $visitCountYear = max( 0, $visitCountYear);
+			if($visitCountYear){
+				$visitCountToday = max(0, $this->getNumberOfVisitsPiwik($block_id, 'day'));
+				$visitCountYear = max( 0, $visitCountYear);
                 
-                $data->set('has_stats', true);
-                $data->set('visits_today', $visitCountToday);
-                $data->set('visits_year', $visitCountYear + $visitCountToday);                
-            }
-        }
+				$data->set('has_stats', true);
+				$data->set('visits_today', $visitCountToday);
+				$data->set('visits_year', $visitCountYear + $visitCountToday);                
+			}
+		}
         
-        ViewFactory::make('PiwikStats', $this, $ctrl, $data)->render();        
-    }
+		ViewFactory::make('PiwikStats', $this, $ctrl, $data)->render();        
+	}
     
 }
\ No newline at end of file

Spacing +11 added lines, -11 removed lines

@@ -30,14 +30,14 @@ 
      * @param string $period
      * @param (null|int) Number of visits
      */
-    private function getNumberOfVisitsPiwik($block_id, $period='year'){
+    private function getNumberOfVisitsPiwik($block_id, $period = 'year') {
     
         $piwik_url = $this->module->getBlockSetting($block_id, 'piwik_url');
         $piwik_siteid = $this->module->getBlockSetting($block_id, 'piwik_siteid');
         $piwik_token = $this->module->getBlockSetting($block_id, 'piwik_token');
     
-        if($piwik_url && strlen($piwik_url) > 0 &&
-            $piwik_siteid  && strlen($piwik_siteid) > 0 &&
+        if ($piwik_url && strlen($piwik_url) > 0 &&
+            $piwik_siteid && strlen($piwik_siteid) > 0 &&
             $piwik_token && strlen($piwik_token)            
             ) 
         {        
@@ -48,9 +48,9 @@ 
             $url .= '&format=PHP';
             $url .= '&token_auth='.$piwik_token;
         
-            if($fetched = File::fetchUrl($url)) {
+            if ($fetched = File::fetchUrl($url)) {
                 $content = @unserialize($fetched);
-                if(is_numeric($content)) return $content;
+                if (is_numeric($content)) return $content;
             }
         }
     
@@ -72,20 +72,20 @@ 
         $data->set('has_stats', false);
         
         $block_id = Filter::get('block_id');        
-        if($block_id){
+        if ($block_id) {
             $cached_item = Cache::get('piwikCountYear', $this->module);
             $visitCountYear = $cached_item->get();
-            if(!$cached_item->isHit()) {
+            if (!$cached_item->isHit()) {
                 $visitCountYear = $this->getNumberOfVisitsPiwik($block_id);
-                if(!is_null($visitCountYear)) {
-                    $cached_item->expiresAt(new \DateTime('tomorrow'));  // Expires the next day at midnight
+                if (!is_null($visitCountYear)) {
+                    $cached_item->expiresAt(new \DateTime('tomorrow')); // Expires the next day at midnight
                     Cache::save($cached_item, $visitCountYear);
                 }
             }
             
-            if($visitCountYear){
+            if ($visitCountYear) {
                 $visitCountToday = max(0, $this->getNumberOfVisitsPiwik($block_id, 'day'));
-                $visitCountYear = max( 0, $visitCountYear);
+                $visitCountYear = max(0, $visitCountYear);
                 
                 $data->set('has_stats', true);
                 $data->set('visits_today', $visitCountToday);

src/Webtrees/Functions/FunctionsPrintLists.php

Indentation +19 added lines, -19 removed lines

@@ -17,27 +17,27 @@
  */
 class FunctionsPrintLists {
     
-    /**
-     * Copy of core function, which is not public.
-     *
-     * @param Individual $individual
-     *
-     * @return string[]
-     * @see \Fisharebest\Webtrees\Functions\FunctionsPrintLists
-     */
-    public static function sortableNames(Individual $individual) {
-        $names   = $individual->getAllNames();
-        $primary = $individual->getPrimaryName();
+	/**
+	 * Copy of core function, which is not public.
+	 *
+	 * @param Individual $individual
+	 *
+	 * @return string[]
+	 * @see \Fisharebest\Webtrees\Functions\FunctionsPrintLists
+	 */
+	public static function sortableNames(Individual $individual) {
+		$names   = $individual->getAllNames();
+		$primary = $individual->getPrimaryName();
 
-        list($surn, $givn) = explode(',', $names[$primary]['sort']);
+		list($surn, $givn) = explode(',', $names[$primary]['sort']);
 
-        $givn = str_replace('@P.N.', 'AAAA', $givn);
-        $surn = str_replace('@N.N.', 'AAAA', $surn);
+		$givn = str_replace('@P.N.', 'AAAA', $givn);
+		$surn = str_replace('@N.N.', 'AAAA', $surn);
 
-        return array(
-            $surn . 'AAAA' . $givn,
-            $givn . 'AAAA' . $surn,
-        );
-    }
+		return array(
+			$surn . 'AAAA' . $givn,
+			$givn . 'AAAA' . $surn,
+		);
+	}
 
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -35,8 +35,8 @@
         $surn = str_replace('@N.N.', 'AAAA', $surn);
 
         return array(
-            $surn . 'AAAA' . $givn,
-            $givn . 'AAAA' . $surn,
+            $surn.'AAAA'.$givn,
+            $givn.'AAAA'.$surn,
         );
     }