jon48 / webtrees-lib

src/Webtrees/Module/IsSourcedModule.php

Indentation +60 added lines, -60 removed lines

@@ -28,29 +28,29 @@ 
 class IsSourcedModule extends AbstractModule 
 implements ModuleSidebarInterface, HookSubscriberInterface, IndividualHeaderExtenderInterface, RecordNameTextExtenderInterface
 {
-    /** @var string For custom modules - link for support, upgrades, etc. */
-    const CUSTOM_WEBSITE = 'https://github.com/jon48/webtrees-lib';
+	/** @var string For custom modules - link for support, upgrades, etc. */
+	const CUSTOM_WEBSITE = 'https://github.com/jon48/webtrees-lib';
     
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\AbstractModule::getTitle()
-     */
-    public function getTitle() {
-        return I18N::translate('Sourced events');
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\AbstractModule::getTitle()
+	 */
+	public function getTitle() {
+		return I18N::translate('Sourced events');
+	}
     
    /**
     * {@inheritDoc}
     * @see \Fisharebest\Webtrees\Module\AbstractModule::getDescription()
     */
-    public function getDescription() {
-        return I18N::translate('Indicate if events related to an record are sourced.');
-    }
+	public function getDescription() {
+		return I18N::translate('Indicate if events related to an record are sourced.');
+	}
     
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookSubscriberInterface::getSubscribedHooks()
-     */
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookSubscriberInterface::getSubscribedHooks()
+	 */
 	public function getSubscribedHooks() {
 		return array(
  			'hExtendIndiHeaderIcons' => 10,
@@ -63,12 +63,12 @@ 
 	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\IndividualHeaderExtenderInterface::hExtendIndiHeaderIcons()
 	 */
 	public function hExtendIndiHeaderIcons(IndividualController $ctrlIndi) {
-	    if($ctrlIndi){
-	        $dindi = new Individual($ctrlIndi->getSignificantIndividual());
-	        if ($dindi->canDisplayIsSourced()) 
-	            return FunctionsPrint::formatIsSourcedIcon('R', $dindi->isSourced(), 'INDI', 1, 'large');
-	    }
-	    return '';
+		if($ctrlIndi){
+			$dindi = new Individual($ctrlIndi->getSignificantIndividual());
+			if ($dindi->canDisplayIsSourced()) 
+				return FunctionsPrint::formatIsSourcedIcon('R', $dindi->isSourced(), 'INDI', 1, 'large');
+		}
+		return '';
 	}
 	
 	/**
@@ -94,15 +94,15 @@ 
 	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\RecordNameTextExtenderInterface::hRecordNameAppend()
 	 */
 	public function hRecordNameAppend(GedcomRecord $grec){
-	    $html = '';
-	    if($grec instanceof \Fisharebest\Webtrees\Individual){
-	        $dindi = new Individual($grec);
-	        $html .= FunctionsPrint::formatIsSourcedIcon('R', $dindi->isSourced(), 'INDI', 1, 'small');
-	        $html .= FunctionsPrint::formatIsSourcedIcon('E', $dindi->isBirthSourced(), 'BIRT', 1, 'small');
-	        if($grec->isDead())
-	            $html .= FunctionsPrint::formatIsSourcedIcon('E', $dindi->isDeathSourced(), 'DEAT', 1, 'small');
-	    }
-	    return $html;
+		$html = '';
+		if($grec instanceof \Fisharebest\Webtrees\Individual){
+			$dindi = new Individual($grec);
+			$html .= FunctionsPrint::formatIsSourcedIcon('R', $dindi->isSourced(), 'INDI', 1, 'small');
+			$html .= FunctionsPrint::formatIsSourcedIcon('E', $dindi->isBirthSourced(), 'BIRT', 1, 'small');
+			if($grec->isDead())
+				$html .= FunctionsPrint::formatIsSourcedIcon('E', $dindi->isDeathSourced(), 'DEAT', 1, 'small');
+		}
+		return $html;
 	}
 	
 	/**
@@ -110,7 +110,7 @@ 
 	 * @see \Fisharebest\Webtrees\Module\ModuleSidebarInterface::defaultSidebarOrder()
 	 */
 	public function defaultSidebarOrder() {
-	    return 15;
+		return 15;
 	}
 	
 	/**
@@ -118,7 +118,7 @@ 
 	 * @see \Fisharebest\Webtrees\Module\ModuleSidebarInterface::hasSidebarContent()
 	 */
 	public function hasSidebarContent(){ 
-	    return true;
+		return true;
 	}
 	
 	/**
@@ -126,7 +126,7 @@ 
 	 * @see \Fisharebest\Webtrees\Module\ModuleSidebarInterface::getSidebarAjaxContent()
 	 */
 	public function getSidebarAjaxContent() {
-	    return '';
+		return '';
 	}
 	
 	/**
@@ -134,17 +134,17 @@ 
 	 * @see \Fisharebest\Webtrees\Module\ModuleSidebarInterface::getSidebarContent()
 	 */
 	public function getSidebarContent() {
-	    global $controller;
+		global $controller;
 	    
-	    ob_start();
-	    $root = $controller->getSignificantIndividual();
-	    if ($root) {
-	        $dindi = new Individual($root);
+		ob_start();
+		$root = $controller->getSignificantIndividual();
+		if ($root) {
+			$dindi = new Individual($root);
 	        	
-	        if (!$dindi->canDisplayIsSourced()) {
-	            echo '<div class="error">', I18N::translate('This information is private and cannot be shown.'), '</div>';
-	        } else {
-	            echo '
+			if (!$dindi->canDisplayIsSourced()) {
+				echo '<div class="error">', I18N::translate('This information is private and cannot be shown.'), '</div>';
+			} else {
+				echo '
 	                <table class="issourcedtable">
 	                   <tr>
 	                       <td class="slabel"> ' . GedcomTag::getLabel('INDI') . '</td>
@@ -155,35 +155,35 @@ 
 	                       <td class="svalue">' . FunctionsPrint::formatIsSourcedIcon('E', $dindi->isBirthSourced(), 'BIRT', 1).'</td>
 	                   </tr>';
 	            
-	            $fams = $root->getSpouseFamilies();
-	            ($ct = count($fams)) > 1 ? $nb=1 : $nb=' ';	            
-	            foreach($fams as $fam){
-	                $dfam = new Family($fam);
-	                echo '
+				$fams = $root->getSpouseFamilies();
+				($ct = count($fams)) > 1 ? $nb=1 : $nb=' ';	            
+				foreach($fams as $fam){
+					$dfam = new Family($fam);
+					echo '
 	                    <tr>
 	                       <td class="slabel right">
 	                           <a href="' . $fam->getHtmlUrl() . '"> '. GedcomTag::getLabel('MARR');
-	                if($ct > 1){
-	                    echo ' ',$nb;
-	                    $nb++;
-	                }
-	                echo '     </a>
+					if($ct > 1){
+						echo ' ',$nb;
+						$nb++;
+					}
+					echo '     </a>
 	                       </td>
 	                       <td class="svalue">' . FunctionsPrint::formatIsSourcedIcon('E', $dfam->isMarriageSourced(), 'MARR', 1).'</td>
 	                   </tr>';
-	            }
+				}
 	            
-	            if( $root->isDead() )
-	                echo '
+				if( $root->isDead() )
+					echo '
 	                    <tr>
 	                       <td class="slabel">' . GedcomTag::getLabel('DEAT') . '</td>
 	                       <td class="svalue">' . FunctionsPrint::formatIsSourcedIcon('E', $dindi->isDeathSourced(), 'DEAT', 1).'</td>
 	                   </tr>';
 	            
-	            echo '</table>';
-	        }
-	    }
-	    return ob_get_clean();	    
+				echo '</table>';
+			}
+		}
+		return ob_get_clean();	    
 	}
 	
 	

src/Webtrees/Module/GeoDispersionModule.php

Indentation +54 added lines, -54 removed lines

@@ -24,82 +24,82 @@
 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() {
-        return !is_null(Module::getModuleByName(Constants::MODULE_MAJ_SOSA_NAME));
-    }
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Module\DependentInterface::validatePrerequisites()
+	 */
+	public function validatePrerequisites() {
+		return !is_null(Module::getModuleByName(Constants::MODULE_MAJ_SOSA_NAME));
+	}
     
 	/**
 	 * Get the GeoAnalysis Provider (initialise it if not done yet).
 	 *
 	 * @return \MyArtJaub\Webtrees\Module\GeoDispersion\Model\GeoAnalysisProvider
 	 */
-    public function getProvider() {
-        global $WT_TREE;
+	public function getProvider() {
+		global $WT_TREE;
         
-        if(!$this->provider) {
-            $this->provider = new GeoAnalysisProvider($WT_TREE);
-        }
-        return $this->provider;
-    }
+		if(!$this->provider) {
+			$this->provider = new GeoAnalysisProvider($WT_TREE);
+		}
+		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;
+	}
     
 
 }

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

src/Webtrees/Module/AdminTasks/AdminConfigController.php

Indentation +88 added lines, -88 removed lines

@@ -34,37 +34,37 @@ 
  */
 class AdminConfigController extends MvcController
 {    
-    /**
-     * Tasks Provider
-     * @var TaskProviderInterface $provider
-     */
-    protected $provider;    
+	/**
+	 * Tasks Provider
+	 * @var TaskProviderInterface $provider
+	 */
+	protected $provider;    
     
-    /**
-     * Constructor for Admin Config controller
-     * @param \Fisharebest\Webtrees\Module\AbstractModule $module
-     */
-    public function __construct(AbstractModule $module) {
-        parent::__construct($module);
+	/**
+	 * Constructor for Admin Config controller
+	 * @param \Fisharebest\Webtrees\Module\AbstractModule $module
+	 */
+	public function __construct(AbstractModule $module) {
+		parent::__construct($module);
         
-        $this->provider = $this->module->getProvider();
-    }    
+		$this->provider = $this->module->getProvider();
+	}    
     
-    /**
-     * Pages
-     */
+	/**
+	 * Pages
+	 */
         
-    /**
-     * AdminConfig@index
-     */
-    public function index() {
-        global $WT_TREE;
+	/**
+	 * AdminConfig@index
+	 */
+	public function index() {
+		global $WT_TREE;
         
-        Theme::theme(new AdministrationTheme)->init($WT_TREE);
-        $controller = new PageController();
-        $controller
-            ->restrictAccess(Auth::isAdmin())
-            ->setPageTitle($this->module->getTitle());
+		Theme::theme(new AdministrationTheme)->init($WT_TREE);
+		$controller = new PageController();
+		$controller
+			->restrictAccess(Auth::isAdmin())
+			->setPageTitle($this->module->getTitle());
 			
 		$token = $this->module->getSetting('MAJ_AT_FORCE_EXEC_TOKEN');
 		if(is_null($token)) {
@@ -72,11 +72,11 @@ 
 			$this->module->setSetting('PAT_FORCE_EXEC_TOKEN', $token);
 		}
         
-        $data = new ViewBag();
-        $data->set('title', $controller->getPageTitle());
+		$data = new ViewBag();
+		$data->set('title', $controller->getPageTitle());
         
-        $table_id = 'table-admintasks-' . Uuid::uuid4();
-        $data->set('table_id', $table_id);
+		$table_id = 'table-admintasks-' . Uuid::uuid4();
+		$data->set('table_id', $table_id);
 		
 		$data->set('trigger_url_root', WT_BASE_URL.'module.php?mod='.$this->module->getName().'&mod_action=Task@trigger');
 		$token = $this->module->getSetting('MAJ_AT_FORCE_EXEC_TOKEN');
@@ -89,9 +89,9 @@ 
 		$this->provider->getInstalledTasks();
 		
 		$controller
-            ->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
-            ->addExternalJavascript(WT_DATATABLES_BOOTSTRAP_JS_URL)
-            ->addInlineJavascript('
+			->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
+			->addExternalJavascript(WT_DATATABLES_BOOTSTRAP_JS_URL)
+			->addInlineJavascript('
                 //Datatable initialisation
 				jQuery.fn.dataTableExt.oSort["unicode-asc"  ]=function(a,b) {return a.replace(/<[^<]*>/, "").localeCompare(b.replace(/<[^<]*>/, ""))};
 				jQuery.fn.dataTableExt.oSort["unicode-desc" ]=function(a,b) {return b.replace(/<[^<]*>/, "").localeCompare(a.replace(/<[^<]*>/, ""))};
@@ -123,7 +123,7 @@ 
 				});
                 
                 ')
-                ->addInlineJavascript('					
+				->addInlineJavascript('					
 					function generate_force_token() {
 						jQuery("#bt_genforcetoken").attr("disabled", "disabled");
 						jQuery("#bt_tokentext").empty().html("<i class=\"fa fa-spinner fa-pulse fa-fw\"></i>");
@@ -171,56 +171,56 @@ 
                     } 
                 ');
         
-        ViewFactory::make('AdminConfig', $this, $controller, $data)->render();
-    }
+		ViewFactory::make('AdminConfig', $this, $controller, $data)->render();
+	}
     
-    /**
-     * AdminConfig@jsonTasksList
-     */
-    public function jsonTasksList() {
-        global $WT_TREE;
+	/**
+	 * AdminConfig@jsonTasksList
+	 */
+	public function jsonTasksList() {
+		global $WT_TREE;
     
-        $controller = new JsonController();
-        $controller
-            ->restrictAccess(Auth::isAdmin());
+		$controller = new JsonController();
+		$controller
+			->restrictAccess(Auth::isAdmin());
     
-        // Generate an AJAX/JSON response for datatables to load a block of rows
-        $search = Filter::postArray('search');
-        if($search) $search = $search['value'];
-        $start  = Filter::postInteger('start');
-        $length = Filter::postInteger('length');
-        $order  = Filter::postArray('order');
+		// Generate an AJAX/JSON response for datatables to load a block of rows
+		$search = Filter::postArray('search');
+		if($search) $search = $search['value'];
+		$start  = Filter::postInteger('start');
+		$length = Filter::postInteger('length');
+		$order  = Filter::postArray('order');
     
 		$order_by_name = false;
-        foreach($order as $key => &$value) {
-            switch($value['column']) {
-                case 3:
+		foreach($order as $key => &$value) {
+			switch($value['column']) {
+				case 3:
 					$order_by_name = true;
-                    unset($order[$key]);
-                    break;
-                case 4;
+					unset($order[$key]);
+					break;
+				case 4;
 					$value['column'] = 'majat_last_run';
 					break;
 				case 4;
 					$value['column'] = 'majat_last_result';
 					break;
-                default:
-                    unset($order[$key]);
-            }
-        }
+				default:
+					unset($order[$key]);
+			}
+		}
     
-        $list = $this->provider->getFilteredTasksList($search, $order, $start, $length);
+		$list = $this->provider->getFilteredTasksList($search, $order, $start, $length);
 		if($order_by_name) {
 			usort($list, function(AbstractTask $a, AbstractTask $b) { return I18N::strcasecmp($a->getTitle(), $b->getTitle()); });
 		}
-        $recordsFiltered = count($list);
-        $recordsTotal = $this->provider->getTasksCount();
+		$recordsFiltered = count($list);
+		$recordsTotal = $this->provider->getTasksCount();
     
-        $data = array();
-        foreach($list as $task) {    
-            $datum = array();
+		$data = array();
+		foreach($list as $task) {    
+			$datum = array();
 			
-            $datum[0] = '
+			$datum[0] = '
                 <div class="btn-group">
                     <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
                         <i class="fa fa-pencil"></i><span class="caret"></span>
@@ -238,50 +238,50 @@ 
                        </li>
                     </ul>
                 </div>';
-            $datum[1] = $task->getName();
-            $datum[2] = $task->isEnabled() ? 
+			$datum[1] = $task->getName();
+			$datum[2] = $task->isEnabled() ? 
 				'<i class="fa fa-check"></i><span class="sr-only">'.I18N::translate('Enabled').'</span>' : 
 				'<i class="fa fa-times"></i><span class="sr-only">'.I18N::translate('Disabled').'</span>';
-            $datum[3] = $task->getTitle();
-            $date_format = str_replace('%', '', I18N::dateFormat()) . ' H:i:s';
+			$datum[3] = $task->getTitle();
+			$date_format = str_replace('%', '', I18N::dateFormat()) . ' H:i:s';
 			$datum[4] = $task->getLastUpdated()->format($date_format);
-            $datum[5] = $task->isLastRunSuccess() ? 
+			$datum[5] = $task->isLastRunSuccess() ? 
 				'<i class="fa fa-check"></i><span class="sr-only">'.I18N::translate('Yes').'</span>' : 
 				'<i class="fa fa-times"></i><span class="sr-only">'.I18N::translate('No').'</span>';
-            $dtF = new \DateTime('@0');
-            $dtT = new \DateTime('@' . ($task->getFrequency() * 60));            
-            $datum[6] = $dtF->diff($dtT)->format(I18N::translate('%a d %h h %i m'));
+			$dtF = new \DateTime('@0');
+			$dtT = new \DateTime('@' . ($task->getFrequency() * 60));            
+			$datum[6] = $dtF->diff($dtT)->format(I18N::translate('%a d %h h %i m'));
 			$datum[7] = $task->getRemainingOccurrences() > 0 ? I18N::number($task->getRemainingOccurrences()) : I18N::translate('Unlimited');
 			$datum[8] = $task->isRunning() ? 
 				'<i class="fa fa-cog fa-spin fa-fw"></i><span class="sr-only">'.I18N::translate('Running').'</span>' : 
 				'<i class="fa fa-times"></i><span class="sr-only">'.I18N::translate('Not running').'</span>';
 			if($task->isEnabled() && !$task->isRunning()) {
-			    $datum[9] = '
+				$datum[9] = '
     			    <button id="bt_runtask_'. $task->getName() .'" class="btn btn-primary" href="#" onclick="return run_admintask(\''. $task->getName() .'\')">
     			         <div id="bt_runtasktext_'. $task->getName() .'"><i class="fa fa-cog fa-fw" ></i>' . I18N::translate('Run') . '</div>
     			    </button>';
 			}
 			else {
-			    $datum[9] = '';
+				$datum[9] = '';
 			}			    
 						
-            $data[] = $datum;
-        }
+			$data[] = $datum;
+		}
     
-        $controller->pageHeader();
+		$controller->pageHeader();
     
-        echo \Zend_Json::encode(array(
-            'draw'            => Filter::getInteger('draw'),
-            'recordsTotal'    => $recordsTotal,
-            'recordsFiltered' => $recordsFiltered,
-            'data'            => $data
-        ));
+		echo \Zend_Json::encode(array(
+			'draw'            => Filter::getInteger('draw'),
+			'recordsTotal'    => $recordsTotal,
+			'recordsFiltered' => $recordsFiltered,
+			'data'            => $data
+		));
     
-    }
+	}
 		
 	/**
 	 * AdminConfig@generateToken
-     *
+	 *
 	 * Ajax call to generate a new token. Display the token, if generated.
 	 * Tokens call only be generated by a site administrator.
 	 *

src/Webtrees/Module/PatronymicLineage/LineageController.php

Indentation +136 added lines, -136 removed lines

@@ -26,166 +26,166 @@
 class LineageController extends MvcController
 {   
     
-    /**
-     * Generate the patronymic lineage for this surname
-     * @var string $surname Reference surname
-     */
-    private $surname;   
+	/**
+	 * Generate the patronymic lineage for this surname
+	 * @var string $surname Reference surname
+	 */
+	private $surname;   
     
-    /**
-     * Initial letter
-     * @var string $alpha
-     */
-    private $alpha;
+	/**
+	 * Initial letter
+	 * @var string $alpha
+	 */
+	private $alpha;
     
-    /**
-     * Show all names (values: yes|no)
-     * @var bool $show
-     */
-    private $show_all;
+	/**
+	 * Show all names (values: yes|no)
+	 * @var bool $show
+	 */
+	private $show_all;
     
-    /**
-     * Page to display (values: surn|lineage)
-     * @var unknown $show
-     */
-    private $show;
+	/**
+	 * Page to display (values: surn|lineage)
+	 * @var unknown $show
+	 */
+	private $show;
     
-    /**
-     * Page title
-     * @var string $legend
-     */
-    private $legend;
+	/**
+	 * Page title
+	 * @var string $legend
+	 */
+	private $legend;
     
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Mvc\Controller\MvcController::__construct(AbstractModule $module)
-     */
-    public function __construct(AbstractModule $module) {
-        global $WT_TREE;
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Mvc\Controller\MvcController::__construct(AbstractModule $module)
+	 */
+	public function __construct(AbstractModule $module) {
+		global $WT_TREE;
         
-        parent::__construct($module);
+		parent::__construct($module);
         
-        $this->surname     = Filter::get('surname');
-        $this->alpha       = Filter::get('alpha'); // All surnames beginning with this letter where "@"=unknown and ","=none
-        $this->show_all    = Filter::get('show_all', 'no|yes', 'no'); // All indis
-        // Make sure selections are consistent.
-        // i.e. can’t specify show_all and surname at the same time.
-        if ($this->show_all === 'yes') {
-            $this->alpha   = '';
-            $this->surname = '';
-            $this->legend  = I18N::translate('All');
-            $this->show    = Filter::get('show', 'surn|lineage', 'surn');
-        } elseif ($this->surname) {
-            $this->alpha    = QueryName::initialLetter($this->surname); // so we can highlight the initial letter
-            $this->show_all = 'no';
-            if ($this->surname === '@N.N.') {
-                $this->legend = I18N::translateContext('Unknown surname', '…');
-            } else {
-                $this->legend = Filter::escapeHtml($this->surname);
-                // The surname parameter is a root/canonical form.
-                // Display it as the actual surname
-                foreach (QueryName::surnames($WT_TREE, $this->surname, $this->alpha, false, false) as $details) {
-                    $this->legend = implode('/', array_keys($details));
-                }                
-            }
-            $this->show = 'lineage'; // SURN list makes no sense here
-        } elseif ($this->alpha === '@') {
-            $this->show_all = 'no';
-            $this->legend   = I18N::translateContext('Unknown surname', '…');
-            $this->show     = 'lineage'; // SURN list makes no sense here
-        } elseif ($this->alpha === ',') {
-            $this->show_all = 'no';
-            $this->legend   = I18N::translate('None');
-            $this->show     = 'lineage'; // SURN list makes no sense here
-        } elseif ($this->alpha) {
-            $this->show_all = 'no';
-            $this->legend   = Filter::escapeHtml($this->alpha) . '…';
-            $this->show     = Filter::get('show', 'surn|lineage', 'surn');
-        } else {
-            $this->show_all = 'no';
-            $this->legend   = '…';
-            $this->show     = 'none'; // Don't show lists until something is chosen
-        }
-        $this->legend = '<span dir="auto">' . $this->legend . '</span>';
+		$this->surname     = Filter::get('surname');
+		$this->alpha       = Filter::get('alpha'); // All surnames beginning with this letter where "@"=unknown and ","=none
+		$this->show_all    = Filter::get('show_all', 'no|yes', 'no'); // All indis
+		// Make sure selections are consistent.
+		// i.e. can’t specify show_all and surname at the same time.
+		if ($this->show_all === 'yes') {
+			$this->alpha   = '';
+			$this->surname = '';
+			$this->legend  = I18N::translate('All');
+			$this->show    = Filter::get('show', 'surn|lineage', 'surn');
+		} elseif ($this->surname) {
+			$this->alpha    = QueryName::initialLetter($this->surname); // so we can highlight the initial letter
+			$this->show_all = 'no';
+			if ($this->surname === '@N.N.') {
+				$this->legend = I18N::translateContext('Unknown surname', '…');
+			} else {
+				$this->legend = Filter::escapeHtml($this->surname);
+				// The surname parameter is a root/canonical form.
+				// Display it as the actual surname
+				foreach (QueryName::surnames($WT_TREE, $this->surname, $this->alpha, false, false) as $details) {
+					$this->legend = implode('/', array_keys($details));
+				}                
+			}
+			$this->show = 'lineage'; // SURN list makes no sense here
+		} elseif ($this->alpha === '@') {
+			$this->show_all = 'no';
+			$this->legend   = I18N::translateContext('Unknown surname', '…');
+			$this->show     = 'lineage'; // SURN list makes no sense here
+		} elseif ($this->alpha === ',') {
+			$this->show_all = 'no';
+			$this->legend   = I18N::translate('None');
+			$this->show     = 'lineage'; // SURN list makes no sense here
+		} elseif ($this->alpha) {
+			$this->show_all = 'no';
+			$this->legend   = Filter::escapeHtml($this->alpha) . '…';
+			$this->show     = Filter::get('show', 'surn|lineage', 'surn');
+		} else {
+			$this->show_all = 'no';
+			$this->legend   = '…';
+			$this->show     = 'none'; // Don't show lists until something is chosen
+		}
+		$this->legend = '<span dir="auto">' . $this->legend . '</span>';
           
-    }
+	}
     
-    /**
-     * Indicates whether the list of surname should be displayed
-     * @return bool
-     */
-    protected function isShowingSurnames() {
-        return $this->show === 'surn';
-    }
+	/**
+	 * Indicates whether the list of surname should be displayed
+	 * @return bool
+	 */
+	protected function isShowingSurnames() {
+		return $this->show === 'surn';
+	}
     
-    /**
-     * Indicates whether the lineages should be displayed
-     * @return bool
-     */
-    protected function isShowingLineages() {
-        return $this->show === 'lineage';
-    } 
+	/**
+	 * Indicates whether the lineages should be displayed
+	 * @return bool
+	 */
+	protected function isShowingLineages() {
+		return $this->show === 'lineage';
+	} 
     
-    /**
-     * Get list of surnames, starting with the specified initial
-     * @return array
-     */
-    protected function getSurnamesList() {
-        global $WT_TREE;
+	/**
+	 * Get list of surnames, starting with the specified initial
+	 * @return array
+	 */
+	protected function getSurnamesList() {
+		global $WT_TREE;
         
-        return QueryName::surnames($WT_TREE, $this->surname, $this->alpha, false, false);
-    }
+		return QueryName::surnames($WT_TREE, $this->surname, $this->alpha, false, false);
+	}
     
-    /**
-     * Get the lineages for the controller's specified surname
-     */
-    protected function getLineages() {
+	/**
+	 * Get the lineages for the controller's specified surname
+	 */
+	protected function getLineages() {
 		global $WT_TREE;
 		
 		$builder = new LineageBuilder($this->surname, $WT_TREE);
 		$lineages = $builder->buildLineages();
 		
-    	return $lineages;
-    }    
+		return $lineages;
+	}    
     
-    /**
-     * Pages
-     */
+	/**
+	 * Pages
+	 */
     
-    /**
-     * Lineage@index
-     */
-    public function index() {
-        global $WT_TREE;
+	/**
+	 * Lineage@index
+	 */
+	public function index() {
+		global $WT_TREE;
         
-        $controller = new PageController();
-        $controller->setPageTitle(I18N::translate('Patronymic Lineages') . ' : ' . $this->legend);
+		$controller = new PageController();
+		$controller->setPageTitle(I18N::translate('Patronymic Lineages') . ' : ' . $this->legend);
         
-        $view_bag = new ViewBag();
-        $view_bag->set('title', $controller->getPageTitle());
-        $view_bag->set('tree', $WT_TREE);
-        $view_bag->set('alpha', $this->alpha);
-        $view_bag->set('surname', $this->surname);
-        $view_bag->set('legend', $this->legend);
-        $view_bag->set('show_all', $this->show_all);
-        if($this->isShowingSurnames()) {
-            $view_bag->set('issurnames', true);
-            $view_bag->set('surnameslist', $this->getSurnamesList());
-        }
-        if($this->isShowingLineages()) {
-            $view_bag->set('islineages', true);
-            $view_bag->set('lineages', $this->getLineages());
+		$view_bag = new ViewBag();
+		$view_bag->set('title', $controller->getPageTitle());
+		$view_bag->set('tree', $WT_TREE);
+		$view_bag->set('alpha', $this->alpha);
+		$view_bag->set('surname', $this->surname);
+		$view_bag->set('legend', $this->legend);
+		$view_bag->set('show_all', $this->show_all);
+		if($this->isShowingSurnames()) {
+			$view_bag->set('issurnames', true);
+			$view_bag->set('surnameslist', $this->getSurnamesList());
+		}
+		if($this->isShowingLineages()) {
+			$view_bag->set('islineages', true);
+			$view_bag->set('lineages', $this->getLineages());
 
-            if ($this->show_all==='no') {
-            	$view_bag->set('table_title', I18N::translate('Individuals in %s lineages', $this->legend));
-            }
-            else {
-            	$view_bag->set('table_title', I18N::translate('All lineages'));
-            }
-        }
+			if ($this->show_all==='no') {
+				$view_bag->set('table_title', I18N::translate('Individuals in %s lineages', $this->legend));
+			}
+			else {
+				$view_bag->set('table_title', I18N::translate('All lineages'));
+			}
+		}
         
-        ViewFactory::make('Lineage', $this, $controller, $view_bag)->render();   
-    }
+		ViewFactory::make('Lineage', $this, $controller, $view_bag)->render();   
+	}
     
     
     

src/Webtrees/Module/PatronymicLineage/Views/LineageView.php

Indentation +159 added lines, -159 removed lines

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

src/Webtrees/Module/SosaModule.php

Indentation +163 added lines, -163 removed lines

@@ -31,116 +31,116 @@ 
  * Sosa Module.
  */
 class SosaModule 
-    extends AbstractModule 
-    implements  ModuleMenuInterface, 
-                ModuleConfigInterface,
-                HookSubscriberInterface,
-                IndividualHeaderExtenderInterface,
-                RecordNameTextExtenderInterface
+	extends AbstractModule 
+	implements  ModuleMenuInterface, 
+				ModuleConfigInterface,
+				HookSubscriberInterface,
+				IndividualHeaderExtenderInterface,
+				RecordNameTextExtenderInterface
 {
-    // How to update the database schema for this module
-    const SCHEMA_TARGET_VERSION   = 1;
-    const SCHEMA_SETTING_NAME     = 'MAJ_SOSA_SCHEMA_VERSION';
-    const SCHEMA_MIGRATION_PREFIX = '\MyArtJaub\Webtrees\Module\Sosa\Schema';
+	// How to update the database schema for this module
+	const SCHEMA_TARGET_VERSION   = 1;
+	const SCHEMA_SETTING_NAME     = 'MAJ_SOSA_SCHEMA_VERSION';
+	const SCHEMA_MIGRATION_PREFIX = '\MyArtJaub\Webtrees\Module\Sosa\Schema';
 
-    /** @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('Sosa');
-    }
-    
-    /**
-     * {@inhericDoc}
-     */
-    public function getDescription() {
-        return /* I18N: Description of the “Hooks” module */ I18N::translate('Calculate and display Sosa ancestors of the root person.');
-    }
-    
-    /**
-     * {@inhericDoc}
-     */
-    public function modAction($mod_action) {
-        Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
+	/** @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('Sosa');
+	}
+    
+	/**
+	 * {@inhericDoc}
+	 */
+	public function getDescription() {
+		return /* I18N: Description of the “Hooks” module */ I18N::translate('Calculate and display Sosa ancestors of the root person.');
+	}
+    
+	/**
+	 * {@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);
+	}
     
-    /**********
+	/**********
      * ModuleConfigInterface
      **********/
     
-    /**
-     * {@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=SosaConfig';
-    }
+		return 'module.php?mod=' . $this->getName() . '&mod_action=SosaConfig';
+	}
     
-    /**********
+	/**********
      * ModuleMenuInterface
      **********/
     
-    /**
-     * {@inhericDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleMenuInterface::defaultMenuOrder()
-     */
-    public function defaultMenuOrder() {
-        return 5;
-    }
-    
-    /**
-     * {@inhericDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleMenuInterface::getMenu()
-     */
-    public function getMenu() { 
-        global $WT_TREE, $controller;
+	/**
+	 * {@inhericDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleMenuInterface::defaultMenuOrder()
+	 */
+	public function defaultMenuOrder() {
+		return 5;
+	}
+    
+	/**
+	 * {@inhericDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleMenuInterface::getMenu()
+	 */
+	public function getMenu() { 
+		global $WT_TREE, $controller;
         
-        $menu = null;
-        if(ModuleManager::getInstance()->isOperational($this->getName())) {
+		$menu = null;
+		if(ModuleManager::getInstance()->isOperational($this->getName())) {
             
-            $root_url = 'module.php?mod=' . $this->getName() . '&ged=' . $WT_TREE->getNameUrl() . '&';
-            $sosa_stat_menu = new Menu(I18N::translate('Sosa Statistics'), $root_url . 'mod_action=SosaStats', 'menu-maj-sosa-stats');
+			$root_url = 'module.php?mod=' . $this->getName() . '&ged=' . $WT_TREE->getNameUrl() . '&';
+			$sosa_stat_menu = new Menu(I18N::translate('Sosa Statistics'), $root_url . 'mod_action=SosaStats', 'menu-maj-sosa-stats');
             
-            $menu = clone $sosa_stat_menu;
-            $menu->setClass('menu-maj-sosa');
+			$menu = clone $sosa_stat_menu;
+			$menu->setClass('menu-maj-sosa');
             
-            $submenus = array_filter(array(
-                new Menu(I18N::translate('Sosa Ancestors'), $root_url . 'mod_action=SosaList', 'menu-maj-sosa-list', array('rel' => 'nofollow')),
-                new Menu(I18N::translate('Missing Ancestors'), $root_url . 'mod_action=SosaList@missing', 'menu-maj-sosa-missing', array('rel' => 'nofollow')),
-                $sosa_stat_menu                
-            ));
+			$submenus = array_filter(array(
+				new Menu(I18N::translate('Sosa Ancestors'), $root_url . 'mod_action=SosaList', 'menu-maj-sosa-list', array('rel' => 'nofollow')),
+				new Menu(I18N::translate('Missing Ancestors'), $root_url . 'mod_action=SosaList@missing', 'menu-maj-sosa-missing', array('rel' => 'nofollow')),
+				$sosa_stat_menu                
+			));
             
 
-            if (ModuleManager::getInstance()->isOperational(Constants::MODULE_MAJ_GEODISP_NAME)
-                && $ga_list = Module::getModuleByName(Constants::MODULE_MAJ_GEODISP_NAME)->getProvider()->getGeoAnalysisList()
-                )
-            {
-                if(count($ga_list) > 0) {
-                    $submenus[] = new Menu(I18N::translate('Geographical Dispersion'), 'module.php?mod=' . Constants::MODULE_MAJ_GEODISP_NAME . '&ged=' . $WT_TREE->getNameUrl() . '&mod_action=GeoAnalysis@listAll', 'menu-maj-sosa-geodispersion');
-                }
-            }
+			if (ModuleManager::getInstance()->isOperational(Constants::MODULE_MAJ_GEODISP_NAME)
+				&& $ga_list = Module::getModuleByName(Constants::MODULE_MAJ_GEODISP_NAME)->getProvider()->getGeoAnalysisList()
+				)
+			{
+				if(count($ga_list) > 0) {
+					$submenus[] = new Menu(I18N::translate('Geographical Dispersion'), 'module.php?mod=' . Constants::MODULE_MAJ_GEODISP_NAME . '&ged=' . $WT_TREE->getNameUrl() . '&mod_action=GeoAnalysis@listAll', 'menu-maj-sosa-geodispersion');
+				}
+			}
             
-            if(Auth::check()) {
-                $submenus[] = new Menu(
-                    I18N::translate('Sosa Configuration'),
-                    $this->getConfigLink(),
-                    'menu-maj-sosa-configuration',
-                    array('rel' => 'nofollow'));
-            }
+			if(Auth::check()) {
+				$submenus[] = new Menu(
+					I18N::translate('Sosa Configuration'),
+					$this->getConfigLink(),
+					'menu-maj-sosa-configuration',
+					array('rel' => 'nofollow'));
+			}
                         
-            //-- recompute Sosa submenu
-            if (!empty($controller) && $controller instanceof IndividualController 
-                && Auth::check() && $WT_TREE->getUserPreference(Auth::user(), 'MAJ_SOSA_ROOT_ID')
-                ) {
-                $controller
-                    ->addInlineJavascript('
+			//-- recompute Sosa submenu
+			if (!empty($controller) && $controller instanceof IndividualController 
+				&& Auth::check() && $WT_TREE->getUserPreference(Auth::user(), 'MAJ_SOSA_ROOT_ID')
+				) {
+				$controller
+					->addInlineJavascript('
                         function majComputeSosaFromIndi(){
                             if($("#computesosadlg").length == 0) {
                                 $("body").append("<div id=\"computesosadlg\" title=\"'. I18N::translate('Sosas computation') .'\"><div id=\"sosaloadingarea\"></div></div>");
@@ -163,87 +163,87 @@ 
 	                         });	
                         }');
                 	
-                $submenus[] = new Menu(
-                    I18N::translate('Complete Sosas'), 
-                    '#', 
-                    'menu-maj-sosa-recompute', 
-                    array(
-                        'rel' => 'nofollow',
-                        'onclick' => 'return majComputeSosaFromIndi();'
-                    ));
-            }
+				$submenus[] = new Menu(
+					I18N::translate('Complete Sosas'), 
+					'#', 
+					'menu-maj-sosa-recompute', 
+					array(
+						'rel' => 'nofollow',
+						'onclick' => 'return majComputeSosaFromIndi();'
+					));
+			}
             
-        }
+		}
         
-        $menu->setSubmenus($submenus);
+		$menu->setSubmenus($submenus);
         
-        return $menu;
+		return $menu;
         
-    }
+	}
     
-    /**********
+	/**********
      * Hooks
      **********/
     
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookSubscriberInterface::getSubscribedHooks()
-     */    
-    public function getSubscribedHooks() {
-        return array(
-            'hExtendIndiHeaderIcons' => 20,
-            'hExtendIndiHeaderRight' => 20,
-            'hRecordNameAppend' => 20
-        );
-    }
-    
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\IndividualHeaderExtenderInterface::hExtendIndiHeaderIcons()
-     */
-    public function hExtendIndiHeaderIcons(IndividualController $ctrlIndi) {
-        if($ctrlIndi){
-            $dindi = new Individual($ctrlIndi->getSignificantIndividual());
-            return FunctionsPrint::formatSosaNumbers($dindi->getSosaNumbers(), 1, 'large');
-        }
-        return '';
-    }
-    
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\IndividualHeaderExtenderInterface::hExtendIndiHeaderLeft()
-     */
-    public function hExtendIndiHeaderLeft(IndividualController $ctrlIndi) { }
-    
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\IndividualHeaderExtenderInterface::hExtendIndiHeaderRight()
-     */
-    public function hExtendIndiHeaderRight(IndividualController $ctrlIndi) {
-        if($ctrlIndi){
-            $dindi = new Individual($ctrlIndi->getSignificantIndividual());
-            return array('indi-header-sosa',  FunctionsPrint::formatSosaNumbers($dindi->getSosaNumbers(), 2, 'normal'));
-        }
-        return '';
-    }
-    
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\RecordNameTextExtenderInterface::hRecordNameAppend()
-     */
-    public function hRecordNameAppend(GedcomRecord $grec) {
-        if($grec instanceof \Fisharebest\Webtrees\Individual){ // Only apply to individuals
-            $dindi = new Individual($grec);
-            return FunctionsPrint::formatSosaNumbers($dindi->getSosaNumbers(), 1, 'small');
-        }
-        return '';
-    }
-    
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\RecordNameTextExtenderInterface::hRecordNamePrepend()
-     */
-    public function hRecordNamePrepend(GedcomRecord $grec) {}
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookSubscriberInterface::getSubscribedHooks()
+	 */    
+	public function getSubscribedHooks() {
+		return array(
+			'hExtendIndiHeaderIcons' => 20,
+			'hExtendIndiHeaderRight' => 20,
+			'hRecordNameAppend' => 20
+		);
+	}
+    
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\IndividualHeaderExtenderInterface::hExtendIndiHeaderIcons()
+	 */
+	public function hExtendIndiHeaderIcons(IndividualController $ctrlIndi) {
+		if($ctrlIndi){
+			$dindi = new Individual($ctrlIndi->getSignificantIndividual());
+			return FunctionsPrint::formatSosaNumbers($dindi->getSosaNumbers(), 1, 'large');
+		}
+		return '';
+	}
+    
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\IndividualHeaderExtenderInterface::hExtendIndiHeaderLeft()
+	 */
+	public function hExtendIndiHeaderLeft(IndividualController $ctrlIndi) { }
+    
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\IndividualHeaderExtenderInterface::hExtendIndiHeaderRight()
+	 */
+	public function hExtendIndiHeaderRight(IndividualController $ctrlIndi) {
+		if($ctrlIndi){
+			$dindi = new Individual($ctrlIndi->getSignificantIndividual());
+			return array('indi-header-sosa',  FunctionsPrint::formatSosaNumbers($dindi->getSosaNumbers(), 2, 'normal'));
+		}
+		return '';
+	}
+    
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\RecordNameTextExtenderInterface::hRecordNameAppend()
+	 */
+	public function hRecordNameAppend(GedcomRecord $grec) {
+		if($grec instanceof \Fisharebest\Webtrees\Individual){ // Only apply to individuals
+			$dindi = new Individual($grec);
+			return FunctionsPrint::formatSosaNumbers($dindi->getSosaNumbers(), 1, 'small');
+		}
+		return '';
+	}
+    
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\RecordNameTextExtenderInterface::hRecordNamePrepend()
+	 */
+	public function hRecordNamePrepend(GedcomRecord $grec) {}
     
     
     

src/Webtrees/Module/HooksModule.php

Indentation +33 added lines, -33 removed lines

@@ -19,46 +19,46 @@
  * Hooks Module.
  */
 class HooksModule extends AbstractModule implements ModuleConfigInterface {
-    // 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';
+	}
     
 
 }

src/Webtrees/Module/Certificates/AdminConfigController.php

Indentation +57 added lines, -57 removed lines

@@ -28,77 +28,77 @@
  */
 class AdminConfigController extends MvcController
 {
-    /**
-     * Manage updates sent from the AdminConfig@index form.
-     */
-    protected function update() {
+	/**
+	 * Manage updates sent from the AdminConfig@index form.
+	 */
+	protected function update() {
         
-        if(Auth::isAdmin()){
+		if(Auth::isAdmin()){
             
-            $this->module->setSetting('MAJ_SHOW_CERT', Filter::post('MAJ_SHOW_CERT'));
-            $this->module->setSetting('MAJ_SHOW_NO_WATERMARK', Filter::post('MAJ_SHOW_NO_WATERMARK'));
+			$this->module->setSetting('MAJ_SHOW_CERT', Filter::post('MAJ_SHOW_CERT'));
+			$this->module->setSetting('MAJ_SHOW_NO_WATERMARK', Filter::post('MAJ_SHOW_NO_WATERMARK'));
             
-            if($MAJ_WM_DEFAULT = Filter::post('MAJ_WM_DEFAULT')) {
-                $this->module->setSetting('MAJ_WM_DEFAULT', $MAJ_WM_DEFAULT);
-            }
+			if($MAJ_WM_DEFAULT = Filter::post('MAJ_WM_DEFAULT')) {
+				$this->module->setSetting('MAJ_WM_DEFAULT', $MAJ_WM_DEFAULT);
+			}
             
-            if($MAJ_WM_FONT_MAXSIZE = Filter::postInteger('MAJ_WM_FONT_MAXSIZE')) {
-                $this->module->setSetting('MAJ_WM_FONT_MAXSIZE', $MAJ_WM_FONT_MAXSIZE);
-            }
+			if($MAJ_WM_FONT_MAXSIZE = Filter::postInteger('MAJ_WM_FONT_MAXSIZE')) {
+				$this->module->setSetting('MAJ_WM_FONT_MAXSIZE', $MAJ_WM_FONT_MAXSIZE);
+			}
             
-            // Only accept valid color for MAJ_WM_FONT_COLOR
-            $MAJ_WM_FONT_COLOR = Filter::post('MAJ_WM_FONT_COLOR', '#([a-fA-F0-9]{3}){1,2}');            
-            if($MAJ_WM_FONT_COLOR) {
-                $this->module->setSetting('MAJ_WM_FONT_COLOR', $MAJ_WM_FONT_COLOR);
-            }
+			// Only accept valid color for MAJ_WM_FONT_COLOR
+			$MAJ_WM_FONT_COLOR = Filter::post('MAJ_WM_FONT_COLOR', '#([a-fA-F0-9]{3}){1,2}');            
+			if($MAJ_WM_FONT_COLOR) {
+				$this->module->setSetting('MAJ_WM_FONT_COLOR', $MAJ_WM_FONT_COLOR);
+			}
             
-            // Only accept valid folders for MAJ_CERT_ROOTDIR
-            $MAJ_CERT_ROOTDIR = preg_replace('/[\/\\\\]+/', '/', Filter::post('MAJ_CERT_ROOTDIR') . '/');
-            if (substr($MAJ_CERT_ROOTDIR, 0, 1) === '/') {
-                $MAJ_CERT_ROOTDIR = substr($MAJ_CERT_ROOTDIR, 1);
-            }
+			// Only accept valid folders for MAJ_CERT_ROOTDIR
+			$MAJ_CERT_ROOTDIR = preg_replace('/[\/\\\\]+/', '/', Filter::post('MAJ_CERT_ROOTDIR') . '/');
+			if (substr($MAJ_CERT_ROOTDIR, 0, 1) === '/') {
+				$MAJ_CERT_ROOTDIR = substr($MAJ_CERT_ROOTDIR, 1);
+			}
             
-            if ($MAJ_CERT_ROOTDIR) {
-                if (is_dir(WT_DATA_DIR . $MAJ_CERT_ROOTDIR)) {
-                    $this->module->setSetting('MAJ_CERT_ROOTDIR', $MAJ_CERT_ROOTDIR);
-                } elseif (File::mkdir(WT_DATA_DIR . $MAJ_CERT_ROOTDIR)) {
-                    $this->module->setSetting('MAJ_CERT_ROOTDIR', $MAJ_CERT_ROOTDIR);
-                    FlashMessages::addMessage(I18N::translate('The folder %s has been created.', Html::filename(WT_DATA_DIR . $MAJ_CERT_ROOTDIR)), 'info');
-                } else {
-                    FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Html::filename(WT_DATA_DIR . $MAJ_CERT_ROOTDIR)), 'danger');
-                }
-            }
+			if ($MAJ_CERT_ROOTDIR) {
+				if (is_dir(WT_DATA_DIR . $MAJ_CERT_ROOTDIR)) {
+					$this->module->setSetting('MAJ_CERT_ROOTDIR', $MAJ_CERT_ROOTDIR);
+				} elseif (File::mkdir(WT_DATA_DIR . $MAJ_CERT_ROOTDIR)) {
+					$this->module->setSetting('MAJ_CERT_ROOTDIR', $MAJ_CERT_ROOTDIR);
+					FlashMessages::addMessage(I18N::translate('The folder %s has been created.', Html::filename(WT_DATA_DIR . $MAJ_CERT_ROOTDIR)), 'info');
+				} else {
+					FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Html::filename(WT_DATA_DIR . $MAJ_CERT_ROOTDIR)), 'danger');
+				}
+			}
             
-            FlashMessages::addMessage(I18N::translate('The preferences for the module “%s” have been updated.', $this->module->getTitle()), 'success');
+			FlashMessages::addMessage(I18N::translate('The preferences for the module “%s” have been updated.', $this->module->getTitle()), 'success');
             
-            return;
-        }
-    }
+			return;
+		}
+	}
     
-    /**
-     * Pages
-     */
+	/**
+	 * Pages
+	 */
         
-    /**
-     * AdminConfig@index
-     */
-    public function index() {      
-        global $WT_TREE;
+	/**
+	 * AdminConfig@index
+	 */
+	public function index() {      
+		global $WT_TREE;
         
-        $action = Filter::post('action');        
-        if($action == 'update' && Filter::checkCsrf()) $this->update();
+		$action = Filter::post('action');        
+		if($action == 'update' && Filter::checkCsrf()) $this->update();
         
-        Theme::theme(new AdministrationTheme)->init($WT_TREE);        
-        $ctrl = new PageController();
-        $ctrl
-            ->restrictAccess(Auth::isAdmin())
-            ->setPageTitle($this->module->getTitle());
+		Theme::theme(new AdministrationTheme)->init($WT_TREE);        
+		$ctrl = new PageController();
+		$ctrl
+			->restrictAccess(Auth::isAdmin())
+			->setPageTitle($this->module->getTitle());
 
-        $view_bag = new ViewBag();
-        $view_bag->set('title', $ctrl->getPageTitle());
-        $view_bag->set('module', $this->module);
+		$view_bag = new ViewBag();
+		$view_bag->set('title', $ctrl->getPageTitle());
+		$view_bag->set('module', $this->module);
         
-        ViewFactory::make('AdminConfig', $this, $ctrl, $view_bag)->render();
-    }
+		ViewFactory::make('AdminConfig', $this, $ctrl, $view_bag)->render();
+	}
         
 }
\ No newline at end of file