jon48 / webtrees-lib

src/Webtrees/Hook/HookInterfaces/CustomSimpleTagManagerInterface.php

Doc Comments +2 added lines

@@ -19,6 +19,7 @@ 
 	 * Insert some content before the fact source text.
 	 * 
 	 * @param string $srec Source fact record
+	 * @return string
 	 */
 	public function hFactSourcePrepend($srec);
 	
@@ -26,6 +27,7 @@ 
 	 * Insert some content after the fact source text.
 	 * 
 	 * @param string $srec Source fact record
+	 * @return void
 	 */
 	public function hFactSourceAppend($srec);
 	

Indentation +14 added lines, -14 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\HookInterfaces;
 
 /**
@@ -18,12 +18,12 @@ 
 interface CustomSimpleTagManager {
 
 
-    /**
-     * Returns the list of expected tags, classified by type of records.
-     *
-     * @return array List of expected tags
-     */
-    public function hGetExpectedTags();
+	/**
+	 * Returns the list of expected tags, classified by type of records.
+	 *
+	 * @return array List of expected tags
+	 */
+	public function hGetExpectedTags();
     
 	/**
 	 * Return the HTML code to be display for this tag.

src/Webtrees/Hook/HookInterfaces/FactSourceTextExtenderInterface.php

Doc Comments +2 added lines

@@ -19,6 +19,7 @@ 
 	 * Insert some content before the fact source text.
 	 * 
 	 * @param string $srec Source fact record
+	 * @return string
 	 */
 	public function hFactSourcePrepend($srec);
 	
@@ -26,6 +27,7 @@ 
 	 * Insert some content after the fact source text.
 	 * 
 	 * @param string $srec Source fact record
+	 * @return void
 	 */
 	public function hFactSourceAppend($srec);
 	

Indentation +8 added lines, -8 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 as fw;

src/Webtrees/Hook/HookInterfaces/RecordNameTextExtenderInterface.php

Doc Comments +2 added lines

@@ -21,6 +21,7 @@ 
 	 * Insert some content before the record name text.
 	 * 
 	 * @param GedcomRecord $grec Gedcom record
+	 * @return void
 	 */
 	public function hRecordNamePrepend(GedcomRecord $grec);
 	
@@ -28,6 +29,7 @@ 
 	 * Insert some content after the record name text.
 	 * 
 	 * @param GedcomRecord $grec Gedcom record
+	 * @return string
 	 */
 	public function hRecordNameAppend(GedcomRecord $grec);
 	

Indentation +8 added lines, -8 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 as fw;

src/Webtrees/Cache.php

Braces +6 added lines, -2 removed lines

@@ -80,7 +80,9 @@ 
 	 *
 	 */
 	protected function checkInit(){
-		if(!$this->is_init) $this->init();
+		if(!$this->is_init) {
+			$this->init();
+		}
 	}
 	
 	/**
@@ -93,7 +95,9 @@ 
 	protected function getKeyName($value, AbstractModule $mod = null){
 	    $this->checkInit();
 		$mod_name = 'myartjaub';
-		if($mod !== null) $mod_name = $mod->getName();
+		if($mod !== null) {
+			$mod_name = $mod->getName();
+		}
 		return $mod_name.'_'.$value;
 	}
 

Doc Comments +1 added lines, -1 removed lines

@@ -146,7 +146,7 @@
 	/**
 	 * Static invocation of the *save* method.
 	 *
-	 * @param string|\Psr\Cache\CacheItemInterface $value Value name
+	 * @param CacheItemInterface $value Value name
 	 * @param mixed $data Value
 	 * @param AbstractModule $mod Calling module
 	 */

Indentation +22 added lines, -22 removed lines

@@ -22,10 +22,10 @@ 
  */
 class Cache{
 	
-    /**
-     * Underlying Cache object
-     * @var CacheItemPoolInterface $cache
-     */
+	/**
+	 * Underlying Cache object
+	 * @var CacheItemPoolInterface $cache
+	 */
 	protected $cache=null;
 	
 	/**
@@ -47,11 +47,11 @@ 
 	 */
 	protected 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;
 	}
 	
 	/**
@@ -59,8 +59,8 @@ 
 	 *
 	 */
 	protected function init() {		
-	    if(Apc::isAvailable()) {
-		    $driver = new Apc();
+		if(Apc::isAvailable()) {
+			$driver = new Apc();
 		} else {
 			if (!is_dir(WT_DATA_DIR.DIRECTORY_SEPARATOR.'cache')) {
 				// We may not have permission - especially during setup, before we instruct
@@ -68,7 +68,7 @@ 
 				@mkdir(WT_DATA_DIR.DIRECTORY_SEPARATOR.'cache');
 			}
 			if (is_dir(WT_DATA_DIR.DIRECTORY_SEPARATOR.'cache')) {
-			    $driver = new FileSystem(array('path' => WT_DATA_DIR.DIRECTORY_SEPARATOR.'cache'));
+				$driver = new FileSystem(array('path' => WT_DATA_DIR.DIRECTORY_SEPARATOR.'cache'));
 			} else {
 				// No cache available, let's just use a basic one :-(
 				$driver = new Ephemeral();
@@ -95,7 +95,7 @@ 
 	 * @return string Cached key name
 	 */
 	protected function getKeyName($value, AbstractModule $mod = null){
-	    $this->checkInit();
+		$this->checkInit();
 		$mod_name = 'myartjaub';
 		if($mod !== null) $mod_name = $mod->getName();
 		return $mod_name.'_'.$value;
@@ -109,7 +109,7 @@ 
 	 * @return \Psr\Cache\CacheItemInterface
 	 */
 	public function getI($value, AbstractModule $mod = null){
-	    $this->checkInit();
+		$this->checkInit();
 		return $this->cache->getItem($this->getKeyName($value, $mod));
 	}
 	
@@ -121,7 +121,7 @@ 
 	 * @return \Psr\Cache\CacheItemInterface
 	 */
 	public static function get($value, AbstractModule $mod = null){
-	    return self::getInstance()->getI($value, $mod);
+		return self::getInstance()->getI($value, $mod);
 	}
 	
 	/**
@@ -136,8 +136,8 @@ 
 		
 		$item = $value;
 		if(!($value instanceof CacheItemInterface)) {
-		    $item = new \Stash\Item();
-    		$item->setKey($this->getKeyName($value, $mod));
+			$item = new \Stash\Item();
+			$item->setKey($this->getKeyName($value, $mod));
 		}		
 		$item->set($data);
 		$this->cache->save($item);
@@ -151,7 +151,7 @@ 
 	 * @param AbstractModule $mod Calling module
 	 */
 	public static function save($value, $data, AbstractModule $mod = null){
-	    self::getInstance()->saveI($value, $data, $mod);
+		self::getInstance()->saveI($value, $data, $mod);
 	}
 	
 	/**
@@ -162,8 +162,8 @@ 
 	 * @return bool Deletion successful?
 	 */
 	public function deleteI($value, AbstractModule $mod = null){
-	    $this->checkInit();	
-	    return $this->cache->deleteItem($this->getKeyName($value, $mod));
+		$this->checkInit();	
+		return $this->cache->deleteItem($this->getKeyName($value, $mod));
 	}
 	
 	/**
@@ -174,7 +174,7 @@ 
 	 * @return bool Deletion successful?
 	 */
 	public static function delete($value, AbstractModule $mod = null){
-	    return self::getInstance()->deleteI($value, $mod);
+		return self::getInstance()->deleteI($value, $mod);
 	}
 	
 	/**
@@ -182,7 +182,7 @@ 
 	 *
 	 */
 	public function cleanI(){
-	    $this->checkInit();
+		$this->checkInit();
 		$this->cache->clear();
 	}
 	
@@ -190,7 +190,7 @@ 
 	 * Static invocation of the *clean* method.
 	 */
 	public static function clean() {
-	    self::getInstance()->cleanI();
+		self::getInstance()->cleanI();
 	}
 	
 }
\ No newline at end of file

Spacing +15 added lines, -15 removed lines

@@ -20,13 +20,13 @@ 
 /**
  * Cache component to speed up some potential data retrievals
  */
-class Cache{
+class Cache {
 	
     /**
      * Underlying Cache object
      * @var CacheItemPoolInterface $cache
      */
-	protected $cache=null;
+	protected $cache = null;
 	
 	/**
 	 * Defines whether the cache has been initialised
@@ -59,7 +59,7 @@ 
 	 *
 	 */
 	protected function init() {		
-	    if(Apc::isAvailable()) {
+	    if (Apc::isAvailable()) {
 		    $driver = new Apc();
 		} else {
 			if (!is_dir(WT_DATA_DIR.DIRECTORY_SEPARATOR.'cache')) {
@@ -83,8 +83,8 @@ 
 	 * Initiliase the Cache if not done.
 	 *
 	 */
-	protected function checkInit(){
-		if(!$this->is_init) $this->init();
+	protected function checkInit() {
+		if (!$this->is_init) $this->init();
 	}
 	
 	/**
@@ -94,10 +94,10 @@ 
 	 * @param AbstractModule $mod Calling module
 	 * @return string Cached key name
 	 */
-	protected function getKeyName($value, AbstractModule $mod = null){
+	protected function getKeyName($value, AbstractModule $mod = null) {
 	    $this->checkInit();
 		$mod_name = 'myartjaub';
-		if($mod !== null) $mod_name = $mod->getName();
+		if ($mod !== null) $mod_name = $mod->getName();
 		return $mod_name.'_'.$value;
 	}
 	
@@ -108,7 +108,7 @@ 
 	 * @param AbstractModule $mod Calling module
 	 * @return \Psr\Cache\CacheItemInterface
 	 */
-	public function getI($value, AbstractModule $mod = null){
+	public function getI($value, AbstractModule $mod = null) {
 	    $this->checkInit();
 		return $this->cache->getItem($this->getKeyName($value, $mod));
 	}
@@ -120,7 +120,7 @@ 
 	 * @param AbstractModule $mod Calling module
 	 * @return \Psr\Cache\CacheItemInterface
 	 */
-	public static function get($value, AbstractModule $mod = null){
+	public static function get($value, AbstractModule $mod = null) {
 	    return self::getInstance()->getI($value, $mod);
 	}
 	
@@ -131,11 +131,11 @@ 
 	 * @param mixed $data Value
 	 * @param AbstractModule $mod Calling module
 	 */
-	public function saveI($value, $data, AbstractModule $mod = null){
+	public function saveI($value, $data, AbstractModule $mod = null) {
 		$this->checkInit();
 		
 		$item = $value;
-		if(!($value instanceof CacheItemInterface)) {
+		if (!($value instanceof CacheItemInterface)) {
 		    $item = new \Stash\Item();
     		$item->setKey($this->getKeyName($value, $mod));
 		}		
@@ -150,7 +150,7 @@ 
 	 * @param mixed $data Value
 	 * @param AbstractModule $mod Calling module
 	 */
-	public static function save($value, $data, AbstractModule $mod = null){
+	public static function save($value, $data, AbstractModule $mod = null) {
 	    self::getInstance()->saveI($value, $data, $mod);
 	}
 	
@@ -161,7 +161,7 @@ 
 	 * @param AbstractModule $mod Calling module
 	 * @return bool Deletion successful?
 	 */
-	public function deleteI($value, AbstractModule $mod = null){
+	public function deleteI($value, AbstractModule $mod = null) {
 	    $this->checkInit();	
 	    return $this->cache->deleteItem($this->getKeyName($value, $mod));
 	}
@@ -173,7 +173,7 @@ 
 	 * @param AbstractModule $mod Calling module
 	 * @return bool Deletion successful?
 	 */
-	public static function delete($value, AbstractModule $mod = null){
+	public static function delete($value, AbstractModule $mod = null) {
 	    return self::getInstance()->deleteI($value, $mod);
 	}
 	
@@ -181,7 +181,7 @@ 
 	 * Clean the cache
 	 *
 	 */
-	public function cleanI(){
+	public function cleanI() {
 	    $this->checkInit();
 		$this->cache->clear();
 	}

src/Webtrees/GedcomRecord.php

Spacing +23 added lines, -23 removed lines

@@ -23,14 +23,14 @@ 
 	protected $gedcomrecord;
 
 	/** @var bool Is the GedcomRecord sourced (cache) */ 
-	protected $_issourced=null;
+	protected $_issourced = null;
 
 	/**
 	 * Contructor for the decorator
 	 *
 	 * @param \Fisharebest\Webtrees\GedcomRecord $gedcomrecord_in The GedcomRecord to extend
 	 */
-	public function __construct(\Fisharebest\Webtrees\GedcomRecord $gedcomrecord_in){
+	public function __construct(\Fisharebest\Webtrees\GedcomRecord $gedcomrecord_in) {
 		$this->gedcomrecord = $gedcomrecord_in;
 	}
 
@@ -39,7 +39,7 @@ 
 	 *
 	 * @return \Fisharebest\Webtrees\GedcomRecord Embedded gedcom record
 	 */
-	public function getDerivedRecord(){
+	public function getDerivedRecord() {
 		return $this->gedcomrecord;
 	}
 	
@@ -85,7 +85,7 @@ 
 			if (($fact->getDate() || $fact->getPlace()) && $fact->canShow()) {
 				switch ($style) {
 					case 10:
-						return '<i>'.$fact->getLabel().' '. mw\Functions\FunctionsPrint::formatFactDateShort($fact) .'&nbsp;'. mw\Functions\FunctionsPrint::formatFactPlaceShort($fact, '%1') .'</i>';
+						return '<i>'.$fact->getLabel().' '.mw\Functions\FunctionsPrint::formatFactDateShort($fact).'&nbsp;'.mw\Functions\FunctionsPrint::formatFactPlaceShort($fact, '%1').'</i>';
 						break;
 					default:
 						return $this->gedcomrecord->formatFirstMajorFact($facts, $style);
@@ -101,11 +101,11 @@ 
 	 * @param int $access_level
 	 * @return boolean
 	 */
-	public function canDisplayIsSourced($access_level = null){
+	public function canDisplayIsSourced($access_level = null) {
 		global $global_facts;
 
-		if(!$this->gedcomrecord->canShow($access_level)) return false;
-		if($access_level === null )
+		if (!$this->gedcomrecord->canShow($access_level)) return false;
+		if ($access_level === null)
 		    $access_level = \Fisharebest\Webtrees\Auth::accessLevel($this->gedcomrecord->getTree());
 
 		if (isset($global_facts['SOUR'])) {
@@ -124,14 +124,14 @@ 
 	 *
 	 * @return int Level of sources
 	 */
-	public function isSourced(){
-		if($this->_issourced !== null) return $this->_issourced;
-		$this->_issourced=-1;
+	public function isSourced() {
+		if ($this->_issourced !== null) return $this->_issourced;
+		$this->_issourced = -1;
 		$sourcesfacts = $this->gedcomrecord->getFacts('SOUR');
-		foreach($sourcesfacts as $sourcefact){
-			$this->_issourced=max($this->_issourced, 1);
-			if($sourcefact->getAttribute('_ACT')){
-				$this->_issourced=max($this->_issourced, 2);
+		foreach ($sourcesfacts as $sourcefact) {
+			$this->_issourced = max($this->_issourced, 1);
+			if ($sourcefact->getAttribute('_ACT')) {
+				$this->_issourced = max($this->_issourced, 2);
 			}
 		}
 		return $this->_issourced;
@@ -143,19 +143,19 @@ 
 	 * @param string $eventslist
 	 * @return int Level of sources
 	 */
-	public function isFactSourced($eventslist){
-	    if(empty($eventslist)) return 0;
-		$isSourced=0;
+	public function isFactSourced($eventslist) {
+	    if (empty($eventslist)) return 0;
+		$isSourced = 0;
 		$facts = $this->gedcomrecord->getFacts($eventslist);
-		foreach($facts as $fact){
-			if($isSourced < Fact::MAX_IS_SOURCED_LEVEL){
+		foreach ($facts as $fact) {
+			if ($isSourced < Fact::MAX_IS_SOURCED_LEVEL) {
 				$dfact = new Fact($fact);
 				$tmpIsSourced = $dfact->isSourced();
-				if($tmpIsSourced != 0) {
-					if($isSourced==0) {
-						$isSourced =  $tmpIsSourced;
+				if ($tmpIsSourced != 0) {
+					if ($isSourced == 0) {
+						$isSourced = $tmpIsSourced;
 					}
-					else{
+					else {
 						$isSourced = max($isSourced, $tmpIsSourced);
 					}
 				}

Braces +13 added lines, -7 removed lines

@@ -104,9 +104,12 @@ 
 	public function canDisplayIsSourced($access_level = null){
 		global $global_facts;
 
-		if(!$this->gedcomrecord->canShow($access_level)) return false;
-		if($access_level === null )
-		    $access_level = \Fisharebest\Webtrees\Auth::accessLevel($this->gedcomrecord->getTree());
+		if(!$this->gedcomrecord->canShow($access_level)) {
+			return false;
+		}
+		if($access_level === null ) {
+				    $access_level = \Fisharebest\Webtrees\Auth::accessLevel($this->gedcomrecord->getTree());
+		}
 
 		if (isset($global_facts['SOUR'])) {
 			return $global_facts['SOUR'] >= $access_level;
@@ -125,7 +128,9 @@ 
 	 * @return int Level of sources
 	 */
 	public function isSourced(){
-		if($this->_issourced !== null) return $this->_issourced;
+		if($this->_issourced !== null) {
+			return $this->_issourced;
+		}
 		$this->_issourced=-1;
 		$sourcesfacts = $this->gedcomrecord->getFacts('SOUR');
 		foreach($sourcesfacts as $sourcefact){
@@ -144,7 +149,9 @@ 
 	 * @return int Level of sources
 	 */
 	public function isFactSourced($eventslist){
-	    if(empty($eventslist)) return 0;
+	    if(empty($eventslist)) {
+	    	return 0;
+	    }
 		$isSourced=0;
 		$facts = $this->gedcomrecord->getFacts($eventslist);
 		foreach($facts as $fact){
@@ -154,8 +161,7 @@ 
 				if($tmpIsSourced != 0) {
 					if($isSourced==0) {
 						$isSourced =  $tmpIsSourced;
-					}
-					else{
+					} else{
 						$isSourced = max($isSourced, $tmpIsSourced);
 					}
 				}

Indentation +2 added lines, -2 removed lines

@@ -91,7 +91,7 @@ 
 
 		if(!$this->gedcomrecord->canShow($access_level)) return false;
 		if($access_level === null )
-		    $access_level = \Fisharebest\Webtrees\Auth::accessLevel($this->gedcomrecord->getTree());
+			$access_level = \Fisharebest\Webtrees\Auth::accessLevel($this->gedcomrecord->getTree());
 
 		if (isset($global_facts['SOUR'])) {
 			return $global_facts['SOUR'] >= $access_level;
@@ -129,7 +129,7 @@ 
 	 * @return int Level of sources
 	 */
 	public function isFactSourced($eventslist){
-	    if(empty($eventslist)) return 0;
+		if(empty($eventslist)) return 0;
 		$isSourced=0;
 		$facts = $this->gedcomrecord->getFacts($eventslist);
 		foreach($facts as $fact){

src/Webtrees/Module/AdminTasksModule.php

Indentation +86 added lines, -86 removed lines

@@ -23,64 +23,64 @@ 
 class AdminTasksModule extends AbstractModule 
 implements ModuleConfigInterface, ModuleBlockInterface
 {
-    // How to update the database schema for this module
-    const SCHEMA_TARGET_VERSION   = 1;
-    const SCHEMA_SETTING_NAME     = 'MAJ_ADMTASKS_SCHEMA_VERSION';
-    const SCHEMA_MIGRATION_PREFIX = '\MyArtJaub\Webtrees\Module\AdminTasks\Schema';
+	// How to update the database schema for this module
+	const SCHEMA_TARGET_VERSION   = 1;
+	const SCHEMA_SETTING_NAME     = 'MAJ_ADMTASKS_SCHEMA_VERSION';
+	const SCHEMA_MIGRATION_PREFIX = '\MyArtJaub\Webtrees\Module\AdminTasks\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';
     
-    /**
-     * Admin Task provider
-     * @var \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskProviderInterface $provider
-     */
-    protected $provider;
+	/**
+	 * Admin Task provider
+	 * @var \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskProviderInterface $provider
+	 */
+	protected $provider;
     
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\AbstractModule::getTitle()
-     */
-    public function getTitle() {
-        return I18N::translate('Administration Tasks');
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\AbstractModule::getTitle()
+	 */
+	public function getTitle() {
+		return I18N::translate('Administration Tasks');
+	}
     
    /**
     * {@inheritDoc}
     * @see \Fisharebest\Webtrees\Module\AbstractModule::getDescription()
     */
-    public function getDescription() {
-        return I18N::translate('Manage and run nearly-scheduled administration tasks.');
-    }
+	public function getDescription() {
+		return I18N::translate('Manage and run nearly-scheduled administration tasks.');
+	}
     
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\AbstractModule::modAction()
-     */
-    public function modAction($mod_action) {
-        Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\AbstractModule::modAction()
+	 */
+	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);
+	}
     
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink()
-     */
-    public function getConfigLink() {
-        Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
+	/**
+	 * {@inheritDoc}
+	 * @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 \Fisharebest\Webtrees\Module\ModuleBlockInterface::getBlock()
-     */
-    public function getBlock($block_id, $template = true, $cfg = array()) {
-        global $controller;
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::getBlock()
+	 */
+	public function getBlock($block_id, $template = true, $cfg = array()) {
+		global $controller;
         
-        $controller->addInlineJavascript('
+		$controller->addInlineJavascript('
 			$(document).ready(function(){
 				$.ajax({
 					url: "module.php",
@@ -91,60 +91,60 @@ 
 				});
 			});
 		');
-        return '';
-    }
+		return '';
+	}
     
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::loadAjax()
-     */
-    public function loadAjax() {
-        return false;
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::loadAjax()
+	 */
+	public function loadAjax() {
+		return false;
+	}
     
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::isGedcomBlock()
-     */
-    public function isGedcomBlock() {
-        return true;
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::isGedcomBlock()
+	 */
+	public function isGedcomBlock() {
+		return true;
+	}
     
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::isUserBlock()
-     */
-    public function isUserBlock() {
-        return false;
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::isUserBlock()
+	 */
+	public function isUserBlock() {
+		return false;
+	}
     
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::configureBlock()
-     */
-    public function configureBlock($block_id) {
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::configureBlock()
+	 */
+	public function configureBlock($block_id) {
         
-    }
+	}
    
 /**
-	 * Get the Admin Tasks Provider (initialise it if not done yet).
-	 *
-	 * @return \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskProviderInterface
-	 */
-    public function getProvider() {        
-        if(!$this->provider) {
-            $this->provider = new TaskProvider(WT_ROOT.WT_MODULES_DIR.$this->getName().'/tasks/');
-        }
-        return $this->provider;
-    }
+ * Get the Admin Tasks Provider (initialise it if not done yet).
+ *
+ * @return \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskProviderInterface
+ */
+	public function getProvider() {        
+		if(!$this->provider) {
+			$this->provider = new TaskProvider(WT_ROOT.WT_MODULES_DIR.$this->getName().'/tasks/');
+		}
+		return $this->provider;
+	}
 	
 	/**
 	 * Set the Admin Tasks Provider.
 	 *
 	 * @return \MyArtJaub\Webtrees\Module\GeoDispersion\Model\TaskProviderInterface
 	 */
-    public function setProvider(TaskProviderInterface $provider) {
-        $this->provider = $provider;
-    }
+	public function setProvider(TaskProviderInterface $provider) {
+		$this->provider = $provider;
+	}
 }
  
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -64,7 +64,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';
     }
     
     /**
@@ -83,7 +83,7 @@ 
     public function getProvider() {
         global $WT_TREE;
         
-        if(!$this->provider) {
+        if (!$this->provider) {
             $this->provider = new GeoAnalysisProvider($WT_TREE);
         }
         return $this->provider;

src/Webtrees/Module/PatronymicLineage/Model/LineageBuilder.php

Spacing +55 added lines, -55 removed lines

@@ -54,30 +54,30 @@ 
 	public function buildLineages() {				
 		$indis = \Fisharebest\Webtrees\Query\QueryName::individuals($this->tree, $this->surname, null, null, false, false);
 		
-		if(count($indis) == 0) return null;
+		if (count($indis) == 0) return null;
 		
 		$root_lineages = array();
 		
-		foreach($indis as $indi) {
+		foreach ($indis as $indi) {
 			$pid = $indi->getXref();
-			if(!isset($this->used_indis[$pid])){
+			if (!isset($this->used_indis[$pid])) {
 				//Find the root of the lineage
 				/** @var Fisharebest\Webtrees\Individual $indiFirst  */
-				$indiFirst= $this->getLineageRootIndividual($indi);
-				if($indiFirst){
+				$indiFirst = $this->getLineageRootIndividual($indi);
+				if ($indiFirst) {
 					$this->used_indis[$indiFirst->getXref()] = true;
-					if($indiFirst->canShow()){
+					if ($indiFirst->canShow()) {
 						//Check if the root individual has brothers and sisters, without parents
 						$indiChildFamily = $indiFirst->getPrimaryChildFamily();
-						if($indiChildFamily !== null){
+						if ($indiChildFamily !== null) {
 							$root_node = new LineageRootNode(null); 
 							$root_node->addFamily($indiChildFamily);
 						}
-						else{
+						else {
 							$root_node = new LineageRootNode($indiFirst);
 						}
 						$root_node = $this->buildLineage($root_node);		
-						if($root_node) $root_lineages[] = $root_node;
+						if ($root_node) $root_lineages[] = $root_node;
 					}
 				}
 			}
@@ -94,45 +94,45 @@ 
 	 * @return (Individual|null) Root individual
 	 */
 	protected function getLineageRootIndividual(Individual $indi) {
-		$is_first=false;
+		$is_first = false;
 		$dindi = new \MyArtJaub\Webtrees\Individual($indi);
-		$indi_surname=$dindi->getUnprotectedPrimarySurname();
+		$indi_surname = $dindi->getUnprotectedPrimarySurname();
 		$resIndi = $indi;
-		while(!$is_first){
+		while (!$is_first) {
 			//Get the individual parents family
-			$fam=$resIndi->getPrimaryChildFamily();
-			if($fam){
-				$husb=$fam->getHusband();
-				$wife=$fam->getWife();
+			$fam = $resIndi->getPrimaryChildFamily();
+			if ($fam) {
+				$husb = $fam->getHusband();
+				$wife = $fam->getWife();
 				//If the father exists, take him
-				if($husb){
+				if ($husb) {
 					$dhusb = new \MyArtJaub\Webtrees\Individual($husb);
-					$dhusb->isNewAddition() ? $is_first = true : $resIndi=$husb;
+					$dhusb->isNewAddition() ? $is_first = true : $resIndi = $husb;
 				}
 				//If only a mother exists
-				else if($wife){
+				else if ($wife) {
 					$dwife = new \MyArtJaub\Webtrees\Individual($wife);
-					$wife_surname=$dwife->getUnprotectedPrimarySurname();
+					$wife_surname = $dwife->getUnprotectedPrimarySurname();
 					//Check if the child is a natural child of the mother (based on the surname - Warning : surname must be identical)
-					if(!$dwife->isNewAddition() && I18N::strcasecmp($wife_surname, $indi_surname) == 0){
-						$resIndi=$wife;
+					if (!$dwife->isNewAddition() && I18N::strcasecmp($wife_surname, $indi_surname) == 0) {
+						$resIndi = $wife;
 					}
-					else{
-						$is_first=true;
+					else {
+						$is_first = true;
 					}
 				}
-				else{
-					$is_first=true;
+				else {
+					$is_first = true;
 				}
 			}
-			else{
-				$is_first=true;
+			else {
+				$is_first = true;
 			}
 		}
-		if(isset($this->used_indis[$resIndi->getXref()])){
+		if (isset($this->used_indis[$resIndi->getXref()])) {
 			return null;
 		}
-		else{
+		else {
 			return $resIndi;
 		}
 	}
@@ -145,15 +145,15 @@ 
 	 * @return LineageNode Computed lineage
 	 */
 	protected function buildLineage(LineageNode $node) {
-		if($node === null) return;
+		if ($node === null) return;
 		
 		$indi_surname = null;
 		
 		$indi_node = $node->getIndividual();			
-		if($indi_node) {
-			if(count($node->getFamiliesNodes()) == 0) {
+		if ($indi_node) {
+			if (count($node->getFamiliesNodes()) == 0) {
 				$indiSpouseFamilies = $indi_node->getSpouseFamilies();
-				foreach($indiSpouseFamilies as $indiSpouseFamily) {
+				foreach ($indiSpouseFamilies as $indiSpouseFamily) {
 					$node->addFamily($indiSpouseFamily);
 				}
 			}
@@ -162,62 +162,62 @@ 
 			$indi_surname = $dindi_node->getUnprotectedPrimarySurname();
 			
 			//Get the estimated birth place and put it in the place table
-			$place=$dindi_node->getEstimatedBirthPlace(false);
-			if($place && strlen($place) > 0){
-				$place=trim($place);
+			$place = $dindi_node->getEstimatedBirthPlace(false);
+			if ($place && strlen($place) > 0) {
+				$place = trim($place);
 				$node->getRootNode()->addPlace(new Place($place, $this->tree));
 			}
 				
 			//Tag the individual as used
-			$this->used_indis[$indi_node->getXref()]=true;
+			$this->used_indis[$indi_node->getXref()] = true;
 		}
 		
-		foreach($node->getFamiliesNodes() as $family) {
+		foreach ($node->getFamiliesNodes() as $family) {
 			$spouse_surname = null;
-			if($indi_node && $spouse = $family->getSpouse($indi_node)) {
+			if ($indi_node && $spouse = $family->getSpouse($indi_node)) {
 				$dspouse = new \MyArtJaub\Webtrees\Individual($spouse);
-				$spouse_surname=$dspouse->getUnprotectedPrimarySurname();
+				$spouse_surname = $dspouse->getUnprotectedPrimarySurname();
 			}
 			
 			$children = $family->getChildren();
 
-			$nbChildren=0;
-			$nbNatural=0;
+			$nbChildren = 0;
+			$nbNatural = 0;
 			
-			foreach($children as $child){
+			foreach ($children as $child) {
 				$dchild = new \MyArtJaub\Webtrees\Individual($child);
-				$child_surname=$dchild->getUnprotectedPrimarySurname();
+				$child_surname = $dchild->getUnprotectedPrimarySurname();
 				
-				if(!$dchild->isNewAddition()) {
+				if (!$dchild->isNewAddition()) {
 					$nbChildren++;
 					//If the root individual is the mother
-					if($indi_node && I18N::strcasecmp($indi_node->getSex(), 'F') == 0) {
+					if ($indi_node && I18N::strcasecmp($indi_node->getSex(), 'F') == 0) {
 						//Print only lineages of children with the same surname as their mother (supposing they are natural children)
-						if(!$spouse || ($spouse_surname && I18N::strcasecmp($child_surname, $spouse_surname) != 0)){
-							if(I18N::strcasecmp($child_surname, $indi_surname) == 0){
+						if (!$spouse || ($spouse_surname && I18N::strcasecmp($child_surname, $spouse_surname) != 0)) {
+							if (I18N::strcasecmp($child_surname, $indi_surname) == 0) {
 								$nbNatural++;
 								$node_child = new LineageNode($child, $node->getRootNode());							
 								$node_child = $this->buildLineage($node_child);
-								if($node_child) $node->addChild($family, $node_child);
+								if ($node_child) $node->addChild($family, $node_child);
 							}
 						}
 					}
 					//If the root individual is the father
 					else {
 						//Print if the children does not bear the same name as his mother (and different from his father)
-						if( strlen($child_surname) == 0 || strlen($indi_surname) == 0 || strlen($spouse_surname) == 0 ||
+						if (strlen($child_surname) == 0 || strlen($indi_surname) == 0 || strlen($spouse_surname) == 0 ||
 							I18N::strcasecmp($child_surname, $indi_surname) == 0 ||
-							I18N::strcasecmp($child_surname, $spouse_surname) != 0 )
+							I18N::strcasecmp($child_surname, $spouse_surname) != 0)
 						{
 							$nbNatural++;
 							$node_child = new LineageNode($child, $node->getRootNode());							
 							$node_child = $this->buildLineage($node_child);
-							if($node_child) $node->addChild($family, $node_child);
+							if ($node_child) $node->addChild($family, $node_child);
 						}
 						else {
 							$nbNatural++;
 							$node_child = new LineageNode($child, $node->getRootNode(), $child_surname);
-							if($node_child) $node->addChild($family, $node_child);
+							if ($node_child) $node->addChild($family, $node_child);
 						}
 					}
 				}
@@ -225,7 +225,7 @@ 
 
 
 			//Do not print other children
-			if(($nbChildren-$nbNatural)>0){
+			if (($nbChildren - $nbNatural) > 0) {
 				$node->addChild($family, null);
 			}
 		}

Braces +24 added lines, -18 removed lines

@@ -54,7 +54,9 @@ 
 	public function buildLineages() {				
 		$indis = \Fisharebest\Webtrees\Query\QueryName::individuals($this->tree, $this->surname, null, null, false, false);
 		
-		if(count($indis) == 0) return null;
+		if(count($indis) == 0) {
+			return null;
+		}
 		
 		$root_lineages = array();
 		
@@ -72,12 +74,13 @@ 
 						if($indiChildFamily !== null){
 							$root_node = new LineageRootNode(null); 
 							$root_node->addFamily($indiChildFamily);
-						}
-						else{
+						} else{
 							$root_node = new LineageRootNode($indiFirst);
 						}
 						$root_node = $this->buildLineage($root_node);		
-						if($root_node) $root_lineages[] = $root_node;
+						if($root_node) {
+							$root_lineages[] = $root_node;
+						}
 					}
 				}
 			}
@@ -116,23 +119,19 @@ 
 					//Check if the child is a natural child of the mother (based on the surname - Warning : surname must be identical)
 					if(!$dwife->isNewAddition() && I18N::strcasecmp($wife_surname, $indi_surname) == 0){
 						$resIndi=$wife;
-					}
-					else{
+					} else{
 						$is_first=true;
 					}
-				}
-				else{
+				} else{
 					$is_first=true;
 				}
-			}
-			else{
+			} else{
 				$is_first=true;
 			}
 		}
 		if(isset($this->used_indis[$resIndi->getXref()])){
 			return null;
-		}
-		else{
+		} else{
 			return $resIndi;
 		}
 	}
@@ -145,7 +144,9 @@ 
 	 * @return LineageNode Computed lineage
 	 */
 	protected function buildLineage(LineageNode $node) {
-		if($node === null) return;
+		if($node === null) {
+			return;
+		}
 		
 		$indi_surname = null;
 		
@@ -198,7 +199,9 @@ 
 								$nbNatural++;
 								$node_child = new LineageNode($child, $node->getRootNode());							
 								$node_child = $this->buildLineage($node_child);
-								if($node_child) $node->addChild($family, $node_child);
+								if($node_child) {
+									$node->addChild($family, $node_child);
+								}
 							}
 						}
 					}
@@ -212,12 +215,15 @@ 
 							$nbNatural++;
 							$node_child = new LineageNode($child, $node->getRootNode());							
 							$node_child = $this->buildLineage($node_child);
-							if($node_child) $node->addChild($family, $node_child);
-						}
-						else {
+							if($node_child) {
+								$node->addChild($family, $node_child);
+							}
+						} else {
 							$nbNatural++;
 							$node_child = new LineageNode($child, $node->getRootNode(), $child_surname);
-							if($node_child) $node->addChild($family, $node_child);
+							if($node_child) {
+								$node->addChild($family, $node_child);
+							}
 						}
 					}
 				}

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

Indentation +92 added lines, -92 removed lines

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

Spacing +23 added lines, -23 removed lines

@@ -52,24 +52,24 @@ 
      * {@inhericDoc}
      * @see \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface::getRealCertificatesDirectory()
      */
-    public function getRealCertificatesDirectory(){
-        return WT_DATA_DIR . $this->root_path;
+    public function getRealCertificatesDirectory() {
+        return WT_DATA_DIR.$this->root_path;
     }
     
     /**
      * {@inhericDoc}
      * @see \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface::getCitiesList()
      */
-    public function getCitiesList(){
-        if(!isset($this->cities_list) || is_null($this->cities_list)){
+    public function getCitiesList() {
+        if (!isset($this->cities_list) || is_null($this->cities_list)) {
             $certdir = $this->getRealCertificatesDirectory();
             $this->cities_list = array();
     
             $dir = opendir($certdir);
             
-            while($entry = readdir($dir)){
-                if($entry != '.' && $entry != '..' && is_dir($certdir.$entry)){
-                    $this->cities_list[]= Functions::encodeFileSystemToUtf8($entry);
+            while ($entry = readdir($dir)) {
+                if ($entry != '.' && $entry != '..' && is_dir($certdir.$entry)) {
+                    $this->cities_list[] = Functions::encodeFileSystemToUtf8($entry);
                 }
             }
             sort($this->cities_list);
@@ -81,21 +81,21 @@ 
      * {@inhericDoc}
      * @see \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface::getCertificatesList()
      */
-    public function getCertificatesList($selCity){
+    public function getCertificatesList($selCity) {
     
         $selCity = Functions::encodeUtf8ToFileSystem($selCity);
     
         $certdir = $this->getRealCertificatesDirectory();
-        $tabCertif= array();
+        $tabCertif = array();
     
-        if(is_dir($certdir.$selCity)){
-            $dir=opendir($certdir.$selCity);
-            while($entry = readdir($dir)){
-                if($entry!='.' && $entry!='..' && !is_dir($certdir.$entry.'/')){
+        if (is_dir($certdir.$selCity)) {
+            $dir = opendir($certdir.$selCity);
+            while ($entry = readdir($dir)) {
+                if ($entry != '.' && $entry != '..' && !is_dir($certdir.$entry.'/')) {
                     $path = Functions::encodeFileSystemToUtf8($selCity.'/'.$entry);
                     $certificate = new Certificate($path, $this->tree, $this);
-                    if(Functions::isImageTypeSupported($certificate->extension())){
-                        $tabCertif[] = 	$certificate;
+                    if (Functions::isImageTypeSupported($certificate->extension())) {
+                        $tabCertif[] = $certificate;
                     }
                 }
             }
@@ -107,17 +107,17 @@ 
      * {@inhericDoc}
      * @see \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface::getCertificatesListBeginWith()
      */
-    public function getCertificatesListBeginWith($city, $contains, $limit= 9999){
-        $tabFiles= array();
-        $dirPath= $this->getRealCertificatesDirectory() . Functions::encodeUtf8ToFileSystem($city).'/';
+    public function getCertificatesListBeginWith($city, $contains, $limit = 9999) {
+        $tabFiles = array();
+        $dirPath = $this->getRealCertificatesDirectory().Functions::encodeUtf8ToFileSystem($city).'/';
         $contains = utf8_decode($contains);
         $nbCert = 0;
     
-        if(is_dir($dirPath)){
-            $dir=opendir($dirPath);
-            while(($entry = readdir($dir)) && $nbCert < $limit){
-                if($entry!='.' && $entry!='..' && $entry!='Thumbs.db' &&!is_dir($dirPath.$entry.'/') && stripos($entry, $contains)!== false){
-                    $tabFiles[]= Functions::encodeFileSystemToUtf8($entry);
+        if (is_dir($dirPath)) {
+            $dir = opendir($dirPath);
+            while (($entry = readdir($dir)) && $nbCert < $limit) {
+                if ($entry != '.' && $entry != '..' && $entry != 'Thumbs.db' && !is_dir($dirPath.$entry.'/') && stripos($entry, $contains) !== false) {
+                    $tabFiles[] = Functions::encodeFileSystemToUtf8($entry);
                     $nbCert++;
                 }
             }

src/Webtrees/Module/WelcomeBlockModule.php

Indentation +58 added lines, -58 removed lines

@@ -19,76 +19,76 @@
  * Welcome Block Module.
  */
 class WelcomeBlockModule extends AbstractModule
-    implements ModuleBlockInterface
+	implements ModuleBlockInterface
 {
-    /** @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 “WelcomeBlock” module */ I18N::translate('MyArtJaub Welcome Block');
-    }
+	/**
+	 * {@inhericDoc}
+	 */
+	public function getTitle() {
+		return /* I18N: Name of the “WelcomeBlock” module */ I18N::translate('MyArtJaub Welcome Block');
+	}
     
-    /**
-     * {@inhericDoc}
-     */
-    public function getDescription() {
-        return /* I18N: Description of the “WelcomeBlock” module */ I18N::translate('The MyArtJaub Welcome block welcomes the visitor to the site, allows a quick login to the site, and displays statistics on visits.');
-    }
+	/**
+	 * {@inhericDoc}
+	 */
+	public function getDescription() {
+		return /* I18N: Description of the “WelcomeBlock” module */ I18N::translate('The MyArtJaub Welcome block welcomes the visitor to the site, allows a quick login to the site, and displays statistics on visits.');
+	}
     
-    /**
-     * {@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\ModuleBlockInterface::getBlock()
-     */
+	/**
+	 * {@inhericDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::getBlock()
+	 */
 	public function getBlock($block_id, $template = true, $cfg = array()) {
-        global $controller, $WT_TREE;
+		global $controller, $WT_TREE;
         
-        $wb_controller = new WelcomeBlockController($this);           
-        return $wb_controller->index($controller, $WT_TREE, $block_id, $template);
-    }
+		$wb_controller = new WelcomeBlockController($this);           
+		return $wb_controller->index($controller, $WT_TREE, $block_id, $template);
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::loadAjax()
-     */
-    public function loadAjax() {
-        return false;
-    }
+	/**
+	 * {@inhericDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::loadAjax()
+	 */
+	public function loadAjax() {
+		return false;
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::isUserBlock()
-     */
-    public function isUserBlock() {
-        return false;
-    }
+	/**
+	 * {@inhericDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::isUserBlock()
+	 */
+	public function isUserBlock() {
+		return false;
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::isGedcomBlock()
-     */
-    public function isGedcomBlock() {
-        return true;
-    }
+	/**
+	 * {@inhericDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::isGedcomBlock()
+	 */
+	public function isGedcomBlock() {
+		return true;
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::configureBlock()
-     */
-    public function configureBlock($block_id) {
+	/**
+	 * {@inhericDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::configureBlock()
+	 */
+	public function configureBlock($block_id) {
 
-        $wb_controller = new WelcomeBlockController($this);
-        return $wb_controller->config($block_id);        
-    }
+		$wb_controller = new WelcomeBlockController($this);
+		return $wb_controller->config($block_id);        
+	}
 
 }
  
\ No newline at end of file