jon48 / webtrees-lib

src/Webtrees/Mvc/View/AbstractView.php

Indentation +49 added lines, -49 removed lines

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

Spacing +1 added lines, -1 removed lines

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

Braces +3 added lines, -1 removed lines

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

src/Webtrees/GedcomRecord.php

Braces +13 added lines, -7 removed lines

@@ -86,9 +86,12 @@ 
 	 * @return boolean
 	 */
 	public function canDisplayIsSourced($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(!$this->gedcomrecord->canShow($access_level)) {
+			return false;
+		}
+		if($access_level === null ) {
+				    $access_level = \Fisharebest\Webtrees\Auth::accessLevel($this->gedcomrecord->getTree());
+		}
 
 		$global_facts = Globals::getGlobalFacts();
 		if (isset($global_facts['SOUR'])) {
@@ -108,7 +111,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){
@@ -127,7 +132,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){
@@ -137,8 +144,7 @@ 
 				if($tmpIsSourced != 0) {
 					if($isSourced==0) {
 						$isSourced =  $tmpIsSourced;
-					}
-					else{
+					} else{
 						$isSourced = max($isSourced, $tmpIsSourced);
 					}
 				}

Indentation +3 added lines, -3 removed lines

@@ -70,7 +70,7 @@ 
 			if (($fact->getDate() || $fact->getPlace()) && $fact->canShow()) {
 				switch ($style) {
 					case 10:
-					    return '<i>'.$fact->getLabel().' '. \MyArtJaub\Webtrees\Functions\FunctionsPrint::formatFactDateShort($fact) .'&nbsp;'. \MyArtJaub\Webtrees\Functions\FunctionsPrint::formatFactPlaceShort($fact, '%1') .'</i>';
+						return '<i>'.$fact->getLabel().' '. \MyArtJaub\Webtrees\Functions\FunctionsPrint::formatFactDateShort($fact) .'&nbsp;'. \MyArtJaub\Webtrees\Functions\FunctionsPrint::formatFactPlaceShort($fact, '%1') .'</i>';
 					default:
 						return $this->gedcomrecord->formatFirstMajorFact($facts, $style);
 				}
@@ -88,7 +88,7 @@ 
 	public function canDisplayIsSourced($access_level = null){
 		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());
 
 		$global_facts = Globals::getGlobalFacts();
 		if (isset($global_facts['SOUR'])) {
@@ -127,7 +127,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){

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;
 	}
 	
@@ -70,7 +70,7 @@ 
 			if (($fact->getDate() || $fact->getPlace()) && $fact->canShow()) {
 				switch ($style) {
 					case 10:
-					    return '<i>'.$fact->getLabel().' '. \MyArtJaub\Webtrees\Functions\FunctionsPrint::formatFactDateShort($fact) .'&nbsp;'. \MyArtJaub\Webtrees\Functions\FunctionsPrint::formatFactPlaceShort($fact, '%1') .'</i>';
+					    return '<i>'.$fact->getLabel().' '.\MyArtJaub\Webtrees\Functions\FunctionsPrint::formatFactDateShort($fact).'&nbsp;'.\MyArtJaub\Webtrees\Functions\FunctionsPrint::formatFactPlaceShort($fact, '%1').'</i>';
 					default:
 						return $this->gedcomrecord->formatFirstMajorFact($facts, $style);
 				}
@@ -85,9 +85,9 @@ 
 	 * @param int $access_level
 	 * @return boolean
 	 */
-	public function canDisplayIsSourced($access_level = null){
-		if(!$this->gedcomrecord->canShow($access_level)) return false;
-		if($access_level === null )
+	public function canDisplayIsSourced($access_level = null) {
+		if (!$this->gedcomrecord->canShow($access_level)) return false;
+		if ($access_level === null)
 		    $access_level = \Fisharebest\Webtrees\Auth::accessLevel($this->gedcomrecord->getTree());
 
 		$global_facts = Globals::getGlobalFacts();
@@ -107,14 +107,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;
@@ -126,19 +126,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);
 					}
 				}

src/Webtrees/Module/AdminTasksModule.php

Indentation +85 added lines, -85 removed lines

@@ -23,62 +23,62 @@ 
 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()) {
-        Globals::getController()->addInlineJavascript('
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::getBlock()
+	 */
+	public function getBlock($block_id, $template = true, $cfg = array()) {
+		Globals::getController()->addInlineJavascript('
 			$(document).ready(function(){
 				$.ajax({
 					url: "module.php",
@@ -89,60 +89,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/TaskController.php

Indentation +66 added lines, -66 removed lines

@@ -35,25 +35,25 @@ 
  */
 class TaskController extends MvcController
 {    
-    /**
-     * Tasks Provider
-     * @var TaskProviderInterface $provider
-     */
-    protected $provider;    
+	/**
+	 * Tasks Provider
+	 * @var TaskProviderInterface $provider
+	 */
+	protected $provider;    
     
-    /**
-     * Constructor for Admin Config controller
-     * @param AbstractModule $module
-     */
-    public function __construct(AbstractModule $module) {
-        parent::__construct($module);
+	/**
+	 * Constructor for Admin Config controller
+	 * @param AbstractModule $module
+	 */
+	public function __construct(AbstractModule $module) {
+		parent::__construct($module);
         
-        $this->provider = $this->module->getProvider();
-    }    
+		$this->provider = $this->module->getProvider();
+	}    
     
-    /**
-     * Pages
-     */        
+	/**
+	 * Pages
+	 */        
 	
 	/**
 	 * Task@trigger
@@ -77,50 +77,50 @@ 
 	/**
 	 * Task@setStatus
 	 */
-    public function setStatus() {          
-        $controller = new JsonController();
+	public function setStatus() {          
+		$controller = new JsonController();
         
-        $task_name = Filter::get('task');
-        $task = $this->provider->getTask($task_name, false);
+		$task_name = Filter::get('task');
+		$task = $this->provider->getTask($task_name, false);
         
-        $controller->restrictAccess(
-            true // Filter::checkCsrf()   -- Cannot use CSRF on a GET request (modules can only work with GET requests)
-            &&  Auth::isAdmin() 
-            && $task
-        );
+		$controller->restrictAccess(
+			true // Filter::checkCsrf()   -- Cannot use CSRF on a GET request (modules can only work with GET requests)
+			&&  Auth::isAdmin() 
+			&& $task
+		);
         
-        $status = Filter::getBool('status');
-        $res = array('task' => $task->getName() , 'error' => null);
-        try{
-            $this->provider->setTaskStatus($task, $status);
-            $res['status'] = $status;
+		$status = Filter::getBool('status');
+		$res = array('task' => $task->getName() , 'error' => null);
+		try{
+			$this->provider->setTaskStatus($task, $status);
+			$res['status'] = $status;
 			Log::addConfigurationLog('Module '.$this->module->getName().' : Admin Task "'.$task->getName().'" has been '. ($status ? 'enabled' : 'disabled') .'.');
-        }
-        catch (\Exception $ex) {
-            $res['error'] = $ex->getMessage();
+		}
+		catch (\Exception $ex) {
+			$res['error'] = $ex->getMessage();
 			Log::addErrorLog('Module '.$this->module->getName().' : Admin Task "'.$task->getName().'" could not be ' . ($status ? 'enabled' : 'disabled') .'. Error: '. $ex->getMessage());
-        }
+		}
         
-        $controller->pageHeader();
-        if($res['error']) http_response_code(500);
+		$controller->pageHeader();
+		if($res['error']) http_response_code(500);
         
-        $controller->encode($res);
-    }
+		$controller->encode($res);
+	}
 	
 	/**
 	 * Task@edit
 	 */
 	public function edit() {
-	    $tree = Globals::getTree();
-        $task_name = Filter::get('task');
-        $task = $this->provider->getTask($task_name, false);
+		$tree = Globals::getTree();
+		$task_name = Filter::get('task');
+		$task = $this->provider->getTask($task_name, false);
 		
-        Theme::theme(new AdministrationTheme)->init($tree);
-        $controller = new PageController();        
-        $controller
-            ->restrictAccess(Auth::isAdmin() && $task)
+		Theme::theme(new AdministrationTheme)->init($tree);
+		$controller = new PageController();        
+		$controller
+			->restrictAccess(Auth::isAdmin() && $task)
 			->setPageTitle(I18N::translate('Edit the administrative task'))
-            ->addInlineJavascript('
+			->addInlineJavascript('
                 function toggleRemainingOccurrences() {
                     if($("input:radio[name=\'is_limited\']:checked").val() == 1) {
                         $("#nb_occurences").show();
@@ -133,39 +133,39 @@ 
                 $("[name=\'is_limited\']").on("change", toggleRemainingOccurrences);
                 toggleRemainingOccurrences();
             ')
-        ;
+		;
         
         
-        $data = new ViewBag();        
-        $data->set('title', $controller->getPageTitle());
+		$data = new ViewBag();        
+		$data->set('title', $controller->getPageTitle());
 		$data->set('admin_config_url', 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig&ged=' . $tree->getNameUrl());
-        $data->set('module_title', $this->module->getTitle());
+		$data->set('module_title', $this->module->getTitle());
 		$data->set('save_url', 'module.php?mod=' . $this->module->getName() . '&mod_action=Task@save&ged=' . $tree->getNameUrl());
 		$data->set('task', $task);
 		    
-        ViewFactory::make('TaskEdit', $this, $controller, $data)->render();	
+		ViewFactory::make('TaskEdit', $this, $controller, $data)->render();	
 	}	
 	
 	/**
 	 * Task@save
 	 */
 	public function save() {		
-        $tmp_contrl = new PageController();
+		$tmp_contrl = new PageController();
 				
-        $tmp_contrl->restrictAccess(
-            Auth::isAdmin() 
-            && Filter::checkCsrf()
-         );
+		$tmp_contrl->restrictAccess(
+			Auth::isAdmin() 
+			&& Filter::checkCsrf()
+		 );
         
 		$task_name      = Filter::post('task');
-        $frequency    	= Filter::postInteger('frequency');
-        $is_limited  	= Filter::postInteger('is_limited', 0, 1);
-        $nb_occur       = Filter::postInteger('nb_occur');
+		$frequency    	= Filter::postInteger('frequency');
+		$is_limited  	= Filter::postInteger('is_limited', 0, 1);
+		$nb_occur       = Filter::postInteger('nb_occur');
 				
 		$task = $this->provider->getTask($task_name, false);
         
-        $success = false; 
-        if($task) {
+		$success = false; 
+		if($task) {
 			$task->setFrequency($frequency);
 			if($is_limited == 1) {
 				$task->setRemainingOccurrences($nb_occur);
@@ -197,13 +197,13 @@ 
 				Log::addConfigurationLog('Module '.$this->module->getName().' : AdminTask “'. $task->getName() .'” could not be updated. See error log.');
 			}
 			
-        }
+		}
         
-        $redirection_url = 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig';
-        if(!$success) {
+		$redirection_url = 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig';
+		if(!$success) {
 			$redirection_url = 'module.php?mod=' . $this->module->getName() . '&mod_action=Task@edit&task='. $task->getName();
-        }        
-        header('Location: ' . WT_BASE_URL . $redirection_url);
+		}        
+		header('Location: ' . WT_BASE_URL . $redirection_url);
 	}
      
 }
\ No newline at end of file

Spacing +25 added lines, -25 removed lines

@@ -69,7 +69,7 @@ 
 		
 		$tasks = $this->provider->getTasksToRun($token == $token_submitted, $task_name);
 		
-		foreach($tasks as $task) {
+		foreach ($tasks as $task) {
 			$task->execute();		
 		}
 	}	
@@ -90,19 +90,19 @@ 
         );
         
         $status = Filter::getBool('status');
-        $res = array('task' => $task->getName() , 'error' => null);
-        try{
+        $res = array('task' => $task->getName(), 'error' => null);
+        try {
             $this->provider->setTaskStatus($task, $status);
             $res['status'] = $status;
-			Log::addConfigurationLog('Module '.$this->module->getName().' : Admin Task "'.$task->getName().'" has been '. ($status ? 'enabled' : 'disabled') .'.');
+			Log::addConfigurationLog('Module '.$this->module->getName().' : Admin Task "'.$task->getName().'" has been '.($status ? 'enabled' : 'disabled').'.');
         }
         catch (\Exception $ex) {
             $res['error'] = $ex->getMessage();
-			Log::addErrorLog('Module '.$this->module->getName().' : Admin Task "'.$task->getName().'" could not be ' . ($status ? 'enabled' : 'disabled') .'. Error: '. $ex->getMessage());
+			Log::addErrorLog('Module '.$this->module->getName().' : Admin Task "'.$task->getName().'" could not be '.($status ? 'enabled' : 'disabled').'. Error: '.$ex->getMessage());
         }
         
         $controller->pageHeader();
-        if($res['error']) http_response_code(500);
+        if ($res['error']) http_response_code(500);
         
         $controller->encode($res);
     }
@@ -138,9 +138,9 @@ 
         
         $data = new ViewBag();        
         $data->set('title', $controller->getPageTitle());
-		$data->set('admin_config_url', 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig&ged=' . $tree->getNameUrl());
+		$data->set('admin_config_url', 'module.php?mod='.$this->module->getName().'&mod_action=AdminConfig&ged='.$tree->getNameUrl());
         $data->set('module_title', $this->module->getTitle());
-		$data->set('save_url', 'module.php?mod=' . $this->module->getName() . '&mod_action=Task@save&ged=' . $tree->getNameUrl());
+		$data->set('save_url', 'module.php?mod='.$this->module->getName().'&mod_action=Task@save&ged='.$tree->getNameUrl());
 		$data->set('task', $task);
 		    
         ViewFactory::make('TaskEdit', $this, $controller, $data)->render();	
@@ -157,17 +157,17 @@ 
             && Filter::checkCsrf()
          );
         
-		$task_name      = Filter::post('task');
-        $frequency    	= Filter::postInteger('frequency');
-        $is_limited  	= Filter::postInteger('is_limited', 0, 1);
-        $nb_occur       = Filter::postInteger('nb_occur');
+		$task_name = Filter::post('task');
+        $frequency = Filter::postInteger('frequency');
+        $is_limited = Filter::postInteger('is_limited', 0, 1);
+        $nb_occur = Filter::postInteger('nb_occur');
 				
 		$task = $this->provider->getTask($task_name, false);
         
         $success = false; 
-        if($task) {
+        if ($task) {
 			$task->setFrequency($frequency);
-			if($is_limited == 1) {
+			if ($is_limited == 1) {
 				$task->setRemainingOccurrences($nb_occur);
 			}
 			else {
@@ -176,34 +176,34 @@ 
 			
 			$res = $task->save();
 						
-			if($res) {						
-				if($task instanceof MyArtJaub\Webtrees\Module\AdminTasks\Model\ConfigurableTaskInterface) {
+			if ($res) {						
+				if ($task instanceof MyArtJaub\Webtrees\Module\AdminTasks\Model\ConfigurableTaskInterface) {
 					$res = $task->saveConfig();
 					
-					if(!$res) {
+					if (!$res) {
 						FlashMessages::addMessage(I18N::translate('An error occured while updating the specific settings of administrative task “%s”', $task->getTitle()), 'danger');
-						Log::addConfigurationLog('Module '.$this->module->getName().' : AdminTask “'. $task->getName() .'” specific settings could not be updated. See error log.');
+						Log::addConfigurationLog('Module '.$this->module->getName().' : AdminTask “'.$task->getName().'” specific settings could not be updated. See error log.');
 					}
 				}
 			
-				if($res) {
+				if ($res) {
 					FlashMessages::addMessage(I18N::translate('The administrative task “%s” has been successfully updated', $task->getTitle()), 'success');
-					Log::addConfigurationLog('Module '.$this->module->getName().' : AdminTask “'.$task->getName() .'” has been updated.');
+					Log::addConfigurationLog('Module '.$this->module->getName().' : AdminTask “'.$task->getName().'” has been updated.');
 					$success = true;
 				}
 			}
 			else {
 				FlashMessages::addMessage(I18N::translate('An error occured while updating the administrative task “%s”', $task->getTitle()), 'danger');
-				Log::addConfigurationLog('Module '.$this->module->getName().' : AdminTask “'. $task->getName() .'” could not be updated. See error log.');
+				Log::addConfigurationLog('Module '.$this->module->getName().' : AdminTask “'.$task->getName().'” could not be updated. See error log.');
 			}
 			
         }
         
-        $redirection_url = 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig';
-        if(!$success) {
-			$redirection_url = 'module.php?mod=' . $this->module->getName() . '&mod_action=Task@edit&task='. $task->getName();
+        $redirection_url = 'module.php?mod='.$this->module->getName().'&mod_action=AdminConfig';
+        if (!$success) {
+			$redirection_url = 'module.php?mod='.$this->module->getName().'&mod_action=Task@edit&task='.$task->getName();
         }        
-        header('Location: ' . WT_BASE_URL . $redirection_url);
+        header('Location: '.WT_BASE_URL.$redirection_url);
 	}
      
 }
\ No newline at end of file

src/Webtrees/Module/AdminTasks/AdminConfigController.php

Indentation +87 added lines, -87 removed lines

@@ -35,37 +35,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() {
+	/**
+	 * AdminConfig@index
+	 */
+	public function index() {
         
-        $tree = Globals::getTree();
-        Theme::theme(new AdministrationTheme)->init($tree);
-        $controller = new PageController();
-        $controller
-            ->restrictAccess(Auth::isAdmin())
-            ->setPageTitle($this->module->getTitle());
+		$tree = Globals::getTree();
+		Theme::theme(new AdministrationTheme)->init($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)) {
@@ -73,11 +73,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');
@@ -90,9 +90,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(/<[^<]*>/, ""))};
@@ -124,7 +124,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>");
@@ -172,54 +172,54 @@ 
                     } 
                 ');
         
-        ViewFactory::make('AdminConfig', $this, $controller, $data)->render();
-    }
+		ViewFactory::make('AdminConfig', $this, $controller, $data)->render();
+	}
     
-    /**
-     * AdminConfig@jsonTasksList
-     */
-    public function jsonTasksList() {    
-        $controller = new JsonController();
-        $controller
-            ->restrictAccess(Auth::isAdmin());
+	/**
+	 * AdminConfig@jsonTasksList
+	 */
+	public function jsonTasksList() {    
+		$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>
@@ -237,50 +237,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();
     
-        $controller->encode(array(
-            'draw'            => Filter::getInteger('draw'),
-            'recordsTotal'    => $recordsTotal,
-            'recordsFiltered' => $recordsFiltered,
-            'data'            => $data
-        ));
+		$controller->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.
 	 *

Spacing +22 added lines, -25 removed lines

@@ -68,7 +68,7 @@ 
             ->setPageTitle($this->module->getTitle());
 			
 		$token = $this->module->getSetting('MAJ_AT_FORCE_EXEC_TOKEN');
-		if(is_null($token)) {
+		if (is_null($token)) {
 			$token = Functions::generateRandomToken();
 			$this->module->setSetting('PAT_FORCE_EXEC_TOKEN', $token);
 		}
@@ -76,12 +76,12 @@ 
         $data = new ViewBag();
         $data->set('title', $controller->getPageTitle());
         
-        $table_id = 'table-admintasks-' . Uuid::uuid4();
+        $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');
-		if(is_null($token)) {
+		if (is_null($token)) {
 			$token = Functions::generateRandomToken();
 			$this->module->setSetting('MAJ_AT_FORCE_EXEC_TOKEN', $token);
 		}
@@ -106,7 +106,7 @@ 
                     processing: true,
                     serverSide : true,
 					ajax : {
-						url : "module.php?mod='.$this->module->getName().'&mod_action=AdminConfig@jsonTasksList&ged='. $tree->getNameUrl().'",
+						url : "module.php?mod='.$this->module->getName().'&mod_action=AdminConfig@jsonTasksList&ged='.$tree->getNameUrl().'",
                         type : "POST"
 					},
                     columns: [
@@ -143,14 +143,14 @@ 
                             url: "module.php", 
                             type: "GET",
                             data: {
-                			    mod: "' . $this->module->getName() .'",
+                			    mod: "' . $this->module->getName().'",
                                 mod_action:  "Task@setStatus",
                 			    task: task,
                                 status: status
                             },
                             error: function(result, stat, error) {
                                 var err = typeof result.responseJSON === "undefined" ? error : result.responseJSON.error;
-                                alert("' . I18N::translate('An error occured while editing this task:') . '" + err);
+                                alert("' . I18N::translate('An error occured while editing this task:').'" + err);
                             },
                             complete: function(result, stat) {
                                 adminTasksTable.ajax.reload(null, false);
@@ -185,14 +185,14 @@ 
     
         // Generate an AJAX/JSON response for datatables to load a block of rows
         $search = Filter::postArray('search');
-        if($search) $search = $search['value'];
+        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']) {
+        foreach ($order as $key => &$value) {
+            switch ($value['column']) {
                 case 3:
 					$order_by_name = true;
                     unset($order[$key]);
@@ -209,14 +209,14 @@ 
         }
     
         $list = $this->provider->getFilteredTasksList($search, $order, $start, $length);
-		if($order_by_name) {
+		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();
     
         $data = array();
-        foreach($list as $task) {    
+        foreach ($list as $task) {    
             $datum = array();
 			
             $datum[0] = '
@@ -227,37 +227,34 @@ 
                     <ul class="dropdown-menu" role="menu">
                        <li>
                             <a href="#" onclick="return set_admintask_status(\''. $task->getName().'\', '.($task->isEnabled() ? 'false' : 'true').');">
-                                <i class="fa fa-fw '.($task->isEnabled() ? 'fa-times' : 'fa-check').'"></i> ' . ($task->isEnabled() ? I18N::translate('Disable') : I18N::translate('Enable')) . '
+                                <i class="fa fa-fw '.($task->isEnabled() ? 'fa-times' : 'fa-check').'"></i> '.($task->isEnabled() ? I18N::translate('Disable') : I18N::translate('Enable')).'
                             </a>
                        </li>
                         <li>
-                            <a href="module.php?mod='.$this->module->getName().'&mod_action=Task@edit&task='. $task->getName().'">
-                                <i class="fa fa-fw fa-pencil"></i> ' . I18N::translate('Edit') . '
+                            <a href="module.php?mod='.$this->module->getName().'&mod_action=Task@edit&task='.$task->getName().'">
+                                <i class="fa fa-fw fa-pencil"></i> ' . I18N::translate('Edit').'
                             </a>
                        </li>
                     </ul>
                 </div>';
             $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>';
+				'<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';
+            $date_format = str_replace('%', '', I18N::dateFormat()).' H:i:s';
 			$datum[4] = $task->getLastUpdated()->format($date_format);
             $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>';
+				'<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));            
+            $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()) {
+				'<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] = '
-    			    <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 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 {

src/Webtrees/Module/GeoDispersion/AdminConfigController.php

Indentation +216 added lines, -216 removed lines

@@ -36,58 +36,58 @@ 
  */
 class AdminConfigController extends MvcController
 {    
-    /**
-     * GeoAnalysis Provider
-     * @var GeoAnalysisProvider $provider
-     */
-    protected $provider;    
+	/**
+	 * GeoAnalysis Provider
+	 * @var GeoAnalysisProvider $provider
+	 */
+	protected $provider;    
     
-    /**
-     * Constructor for Admin Config controller
-     * @param AbstractModule $module
-     */
-    public function __construct(AbstractModule $module) {
-        parent::__construct($module);
+	/**
+	 * Constructor for Admin Config controller
+	 * @param 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() {
-        $wt_tree = Globals::getTree();
-        Theme::theme(new AdministrationTheme)->init($wt_tree);
-        $controller = new PageController();
-        $controller
-            ->restrictAccess(Auth::isManager($wt_tree))
-            ->setPageTitle($this->module->getTitle());
+	/**
+	 * AdminConfig@index
+	 */
+	public function index() {
+		$wt_tree = Globals::getTree();
+		Theme::theme(new AdministrationTheme)->init($wt_tree);
+		$controller = new PageController();
+		$controller
+			->restrictAccess(Auth::isManager($wt_tree))
+			->setPageTitle($this->module->getTitle());
         
-        $data = new ViewBag();
-        $data->set('title', $controller->getPageTitle());
-        $data->set('tree', $wt_tree);
+		$data = new ViewBag();
+		$data->set('title', $controller->getPageTitle());
+		$data->set('tree', $wt_tree);
         
-        $data->set('root_url', 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig');
+		$data->set('root_url', 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig');
                 
-        $table_id = 'table-geoanalysis-' . Uuid::uuid4();
-        $data->set('table_id', $table_id);
+		$table_id = 'table-geoanalysis-' . Uuid::uuid4();
+		$data->set('table_id', $table_id);
         
-        $other_trees = array();
-        foreach (Tree::getAll() as $tree) {
-            if($tree->getTreeId() != $wt_tree->getTreeId()) $other_trees[] = $tree;
-        }      
-        $data->set('other_trees', $other_trees);
+		$other_trees = array();
+		foreach (Tree::getAll() as $tree) {
+			if($tree->getTreeId() != $wt_tree->getTreeId()) $other_trees[] = $tree;
+		}      
+		$data->set('other_trees', $other_trees);
         
-        $data->set('places_hierarchy', $this->provider->getPlacesHierarchy());
+		$data->set('places_hierarchy', $this->provider->getPlacesHierarchy());
         
-        $controller
-            ->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
-            ->addExternalJavascript(WT_DATATABLES_BOOTSTRAP_JS_URL)
-            ->addInlineJavascript('
+		$controller
+			->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
+			->addExternalJavascript(WT_DATATABLES_BOOTSTRAP_JS_URL)
+			->addInlineJavascript('
 				jQuery.fn.dataTableExt.oSort["text-asc"] = textCompareAsc;
 				jQuery.fn.dataTableExt.oSort["text-desc"] = textCompareDesc;
                 
@@ -119,7 +119,7 @@ 
 				});
                 
                 ')
-                ->addInlineJavascript('				
+				->addInlineJavascript('				
                     function set_geoanalysis_status(ga_id, status, gedcom) {
                 		jQuery.ajax({
                             url: "module.php", 
@@ -163,54 +163,54 @@ 
                 ');
         
         
-        ViewFactory::make('AdminConfig', $this, $controller, $data)->render();
-    }
+		ViewFactory::make('AdminConfig', $this, $controller, $data)->render();
+	}
 
-    /**
-     * AdminConfig@jsonGeoAnalysisList
-     */
-    public function jsonGeoAnalysisList() {
-        $wt_tree = Globals::getTree();
-        $controller = new JsonController();
-        $controller
-            ->restrictAccess(Auth::isManager($wt_tree));
+	/**
+	 * AdminConfig@jsonGeoAnalysisList
+	 */
+	public function jsonGeoAnalysisList() {
+		$wt_tree = Globals::getTree();
+		$controller = new JsonController();
+		$controller
+			->restrictAccess(Auth::isManager($wt_tree));
         
-        // 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');
         
-        foreach($order as $key => &$value) {
-            switch($value['column']) {
-                case 3:
-                    $value['column'] = 'majgd_descr';
-                    break;
-                case 5;
-                    $value['column'] = 'majgd_sublevel';
-                    break;
-                default:
-                    unset($order[$key]);
-            }
-        }
+		foreach($order as $key => &$value) {
+			switch($value['column']) {
+				case 3:
+					$value['column'] = 'majgd_descr';
+					break;
+				case 5;
+					$value['column'] = 'majgd_sublevel';
+					break;
+				default:
+					unset($order[$key]);
+			}
+		}
         
-        /** @var GeoAnalysisProvider $provider */
-        $provider = $this->module->getProvider();
+		/** @var GeoAnalysisProvider $provider */
+		$provider = $this->module->getProvider();
         
-        $list = $provider->getFilteredGeoAnalysisList($search, $order, $start, $length);
-        $recordsFiltered = count($list);
-        $recordsTotal = $this->provider->getGeoAnalysisCount();
+		$list = $provider->getFilteredGeoAnalysisList($search, $order, $start, $length);
+		$recordsFiltered = count($list);
+		$recordsTotal = $this->provider->getGeoAnalysisCount();
         
-        $data = array();
-        $place_hierarchy = $this->provider->getPlacesHierarchy();
-        foreach($list as $ga) {
-            /** @var GeoAnalysis $ga */
+		$data = array();
+		$place_hierarchy = $this->provider->getPlacesHierarchy();
+		foreach($list as $ga) {
+			/** @var GeoAnalysis $ga */
             
-            $datum = array();
-            $options= $ga->getOptions();
+			$datum = array();
+			$options= $ga->getOptions();
             
-            $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>
@@ -234,107 +234,107 @@ 
                        </li>
                     </ul>
                 </div>';
-		    $datum[1] = $ga->getId();
-		    $datum[2] = $ga->isEnabled() ? 
+			$datum[1] = $ga->getId();
+			$datum[2] = $ga->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] = $ga->getTitle();
-		    $analysis_level = $ga->getAnalysisLevel();
-		    if($place_hierarchy['type'] == 'header') {
-		        $datum[4] = $place_hierarchy['hierarchy'][$analysis_level - 1];
-		    } else {
-		        $datum[4] = $analysis_level . '(' . $place_hierarchy['hierarchy'][$analysis_level - 1] . ')';
-		    }
-		    $datum[5] = $ga->getAnalysisLevel();
-		    $datum[6] = '<i class="fa fa-times"></i><span class="sr-only">'.I18N::translate('None').'</span>';
-		    $datum[7] = '<i class="fa fa-times"></i><span class="sr-only">'.I18N::translate('None').'</span>';
-		    if($ga->hasMap()) {
-		        $datum[6] = $options->getMap()->getDescription();
-		        $datum[7] = '<span data-toggle="tooltip" title="' . $options->getMap()->getTopLevelName() . '" />';
-		        $top_level = $options->getMapLevel();
-		        if($place_hierarchy['type'] == 'header') {
-		            $datum[7] .= $place_hierarchy['hierarchy'][$top_level - 1];
-		        } else {
-		            $datum[7] .= $top_level . '(' . $place_hierarchy['hierarchy'][$top_level - 1] . ')';
-		        }
-		        $datum[7] .= '</span>';
-		    }
-		    $datum[8] = $options->isUsingFlags() ? 
+			$datum[3] = $ga->getTitle();
+			$analysis_level = $ga->getAnalysisLevel();
+			if($place_hierarchy['type'] == 'header') {
+				$datum[4] = $place_hierarchy['hierarchy'][$analysis_level - 1];
+			} else {
+				$datum[4] = $analysis_level . '(' . $place_hierarchy['hierarchy'][$analysis_level - 1] . ')';
+			}
+			$datum[5] = $ga->getAnalysisLevel();
+			$datum[6] = '<i class="fa fa-times"></i><span class="sr-only">'.I18N::translate('None').'</span>';
+			$datum[7] = '<i class="fa fa-times"></i><span class="sr-only">'.I18N::translate('None').'</span>';
+			if($ga->hasMap()) {
+				$datum[6] = $options->getMap()->getDescription();
+				$datum[7] = '<span data-toggle="tooltip" title="' . $options->getMap()->getTopLevelName() . '" />';
+				$top_level = $options->getMapLevel();
+				if($place_hierarchy['type'] == 'header') {
+					$datum[7] .= $place_hierarchy['hierarchy'][$top_level - 1];
+				} else {
+					$datum[7] .= $top_level . '(' . $place_hierarchy['hierarchy'][$top_level - 1] . ')';
+				}
+				$datum[7] .= '</span>';
+			}
+			$datum[8] = $options->isUsingFlags() ? 
 				'<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>';
-		    $datum[9] = $options->getMaxDetailsInGen() > 0 ? $options->getMaxDetailsInGen() : I18N::translate('All');
+			$datum[9] = $options->getMaxDetailsInGen() > 0 ? $options->getMaxDetailsInGen() : I18N::translate('All');
 		    
-		    $data[] = $datum;
-        }
+			$data[] = $datum;
+		}
         
-        $controller->pageHeader();
+		$controller->pageHeader();
         
-        $controller->encode(array(
-            'draw'            => Filter::getInteger('draw'),
-            'recordsTotal'    => $recordsTotal,
-            'recordsFiltered' => $recordsFiltered,
-            'data'            => $data
-        ));
+		$controller->encode(array(
+			'draw'            => Filter::getInteger('draw'),
+			'recordsTotal'    => $recordsTotal,
+			'recordsFiltered' => $recordsFiltered,
+			'data'            => $data
+		));
         
-    }
+	}
 
-    /**
-     * AdminConfig@edit
-     */
-    public function edit() {
-        $ga_id = Filter::getInteger('ga_id');
-        $ga = $this->provider->getGeoAnalysis($ga_id, false);
+	/**
+	 * AdminConfig@edit
+	 */
+	public function edit() {
+		$ga_id = Filter::getInteger('ga_id');
+		$ga = $this->provider->getGeoAnalysis($ga_id, false);
         
-        $this->renderEdit($ga);
-    }
+		$this->renderEdit($ga);
+	}
     
-    /**
-     * AdminConfig@add
-     */
-    public function add() {
-        $this->renderEdit(null);
-    }
+	/**
+	 * AdminConfig@add
+	 */
+	public function add() {
+		$this->renderEdit(null);
+	}
     
-    /**
-     * AdminConfig@save
-     */
-    public function save() {
-        $wt_tree = Globals::getTree();
-        $tmp_contrl = new PageController();
-        $tmp_contrl->restrictAccess(
-            Auth::isManager($wt_tree) 
-            && Filter::checkCsrf()
-         );
+	/**
+	 * AdminConfig@save
+	 */
+	public function save() {
+		$wt_tree = Globals::getTree();
+		$tmp_contrl = new PageController();
+		$tmp_contrl->restrictAccess(
+			Auth::isManager($wt_tree) 
+			&& Filter::checkCsrf()
+		 );
         
-        $ga_id          = Filter::postInteger('ga_id');
-        $description    = Filter::post('description');
-        $analysislevel  = Filter::postInteger('analysislevel');
-        $use_map        = Filter::postBool('use_map');
-        if($use_map) {
-            $map_file   = base64_decode(Filter::post('map_file'));
-            $map_top_level   = Filter::postInteger('map_top_level');
-        }
-        $use_flags      = Filter::postBool('use_flags');
-        $gen_details    = Filter::postInteger('gen_details');
+		$ga_id          = Filter::postInteger('ga_id');
+		$description    = Filter::post('description');
+		$analysislevel  = Filter::postInteger('analysislevel');
+		$use_map        = Filter::postBool('use_map');
+		if($use_map) {
+			$map_file   = base64_decode(Filter::post('map_file'));
+			$map_top_level   = Filter::postInteger('map_top_level');
+		}
+		$use_flags      = Filter::postBool('use_flags');
+		$gen_details    = Filter::postInteger('gen_details');
         
-        $success = false; 
-        if($ga_id) {
-            $ga = $this->provider->getGeoAnalysis($ga_id, false);
-            if($ga) {
-                $ga->setTitle($description);
-                $ga->setAnalysisLevel($analysislevel + 1);
-                $options = $ga->getOptions();
-                if($options) {
-                    $options->setUsingFlags($use_flags);
-                    $options->setMaxDetailsInGen($gen_details);
-                    if($use_map) {
-                        $options->setMap(new OutlineMap($map_file));
-                        $options->setMapLevel($map_top_level + 1);
-                    }
-                    else {
-                        $options->setMap(null);
-                    }
-                }
+		$success = false; 
+		if($ga_id) {
+			$ga = $this->provider->getGeoAnalysis($ga_id, false);
+			if($ga) {
+				$ga->setTitle($description);
+				$ga->setAnalysisLevel($analysislevel + 1);
+				$options = $ga->getOptions();
+				if($options) {
+					$options->setUsingFlags($use_flags);
+					$options->setMaxDetailsInGen($gen_details);
+					if($use_map) {
+						$options->setMap(new OutlineMap($map_file));
+						$options->setMapLevel($map_top_level + 1);
+					}
+					else {
+						$options->setMap(null);
+					}
+				}
 				
 				$res = $this->provider->updateGeoAnalysis($ga);
 				if($res) {
@@ -347,8 +347,8 @@ 
 					FlashMessages::addMessage(I18N::translate('An error occured while updating the geographical dispersion analysis “%s”', $ga->getTitle()), 'danger');
 					Log::addConfigurationLog('Module '.$this->module->getName().' : Geo Analysis ID “'. $ga->getId() .'” could not be updated. See error log.');
 				}
-            }
-        } else {
+			}
+		} else {
 			$ga = $this->provider->createGeoAnalysis(
 				$description,
 				$analysislevel + 1,
@@ -366,33 +366,33 @@ 
 				FlashMessages::addMessage(I18N::translate('An error occured while adding the geographical dispersion analysis “%s”', $description), 'danger');
 				Log::addConfigurationLog('Module '.$this->module->getName().' : Geo Analysis “'.$description.'” could not be added. See error log.');
 			}
-        }
+		}
         
-        $redirection_url = 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig&ged=' . $wt_tree->getNameUrl();
-        if(!$success) {			
-            if($ga) {
-                $redirection_url = 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig@edit&ga_id='. $ga->getId() .'&ged=' . $wt_tree->getNameUrl();
-            }
-            else {
-                $redirection_url = 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig@add&ged=' . $wt_tree->getNameUrl();
-            }
-        }        
-        header('Location: ' . WT_BASE_URL . $redirection_url);
+		$redirection_url = 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig&ged=' . $wt_tree->getNameUrl();
+		if(!$success) {			
+			if($ga) {
+				$redirection_url = 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig@edit&ga_id='. $ga->getId() .'&ged=' . $wt_tree->getNameUrl();
+			}
+			else {
+				$redirection_url = 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig@add&ged=' . $wt_tree->getNameUrl();
+			}
+		}        
+		header('Location: ' . WT_BASE_URL . $redirection_url);
         
-    }
+	}
      
 	/**
 	 * Renders the edit form, whether it is an edition of an existing GeoAnalysis, or the addition of a new one.
 	 * 
 	 * @param (GeoAnalysis!null) $ga GeoAnalysis to edit
 	 */
-    protected function renderEdit(GeoAnalysis $ga = null) {
-        $wt_tree = Globals::getTree();
-        Theme::theme(new AdministrationTheme)->init($wt_tree);
-        $controller = new PageController();        
-        $controller
-            ->restrictAccess(Auth::isManager($wt_tree))
-            ->addInlineJavascript('
+	protected function renderEdit(GeoAnalysis $ga = null) {
+		$wt_tree = Globals::getTree();
+		Theme::theme(new AdministrationTheme)->init($wt_tree);
+		$controller = new PageController();        
+		$controller
+			->restrictAccess(Auth::isManager($wt_tree))
+			->addInlineJavascript('
                 function toggleMapOptions() {
                     if($("input:radio[name=\'use_map\']:checked").val() == 1) {
                         $("#map_options").show();
@@ -406,34 +406,34 @@ 
                 toggleMapOptions();
             ');
         
-        $data = new ViewBag();
-        if($ga) {
-            $controller->setPageTitle(I18N::translate('Edit the geographical dispersion analysis'));
-            $data->set('geo_analysis', $ga);
-        } else {
-            $controller->setPageTitle(I18N::translate('Add a geographical dispersion analysis'));
-        }
+		$data = new ViewBag();
+		if($ga) {
+			$controller->setPageTitle(I18N::translate('Edit the geographical dispersion analysis'));
+			$data->set('geo_analysis', $ga);
+		} else {
+			$controller->setPageTitle(I18N::translate('Add a geographical dispersion analysis'));
+		}
         
-        $data->set('title', $controller->getPageTitle());
-        $data->set('admin_config_url', 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig&ged=' . $wt_tree->getNameUrl());
-        $data->set('module_title', $this->module->getTitle());
-        $data->set('save_url', 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig@save&ged=' . $wt_tree->getNameUrl());
-        $data->set('places_hierarchy', $this->provider->getPlacesHierarchy());
+		$data->set('title', $controller->getPageTitle());
+		$data->set('admin_config_url', 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig&ged=' . $wt_tree->getNameUrl());
+		$data->set('module_title', $this->module->getTitle());
+		$data->set('save_url', 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig@save&ged=' . $wt_tree->getNameUrl());
+		$data->set('places_hierarchy', $this->provider->getPlacesHierarchy());
     
-        $map_list = array_map(
-            function(OutlineMap $map) {
-                return $map->getDescription();
-            },
-            $this->provider->getOutlineMapsList()
-            );
-        asort($map_list);
-        $data->set('map_list', $map_list);
+		$map_list = array_map(
+			function(OutlineMap $map) {
+				return $map->getDescription();
+			},
+			$this->provider->getOutlineMapsList()
+			);
+		asort($map_list);
+		$data->set('map_list', $map_list);
     
-        $gen_details = array(0 => I18N::translate('All'));
-        for($i = 1; $i <= 10 ; $i++) $gen_details[$i] = $i;
-        $data->set('generation_details', $gen_details);
+		$gen_details = array(0 => I18N::translate('All'));
+		for($i = 1; $i <= 10 ; $i++) $gen_details[$i] = $i;
+		$data->set('generation_details', $gen_details);
     
-        ViewFactory::make('GeoAnalysisEdit', $this, $controller, $data)->render();
-    }
+		ViewFactory::make('GeoAnalysisEdit', $this, $controller, $data)->render();
+	}
     
 }
\ No newline at end of file

Spacing +43 added lines, -45 removed lines

@@ -71,14 +71,14 @@ 
         $data->set('title', $controller->getPageTitle());
         $data->set('tree', $wt_tree);
         
-        $data->set('root_url', 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig');
+        $data->set('root_url', 'module.php?mod='.$this->module->getName().'&mod_action=AdminConfig');
                 
-        $table_id = 'table-geoanalysis-' . Uuid::uuid4();
+        $table_id = 'table-geoanalysis-'.Uuid::uuid4();
         $data->set('table_id', $table_id);
         
         $other_trees = array();
         foreach (Tree::getAll() as $tree) {
-            if($tree->getTreeId() != $wt_tree->getTreeId()) $other_trees[] = $tree;
+            if ($tree->getTreeId() != $wt_tree->getTreeId()) $other_trees[] = $tree;
         }      
         $data->set('other_trees', $other_trees);
         
@@ -101,7 +101,7 @@ 
                     processing: true,
                     serverSide : true,
 					ajax : {
-						url : "module.php?mod='.$this->module->getName().'&mod_action=AdminConfig@jsonGeoAnalysisList&ged='. $wt_tree->getNameUrl().'",
+						url : "module.php?mod='.$this->module->getName().'&mod_action=AdminConfig@jsonGeoAnalysisList&ged='.$wt_tree->getNameUrl().'",
                         type : "POST"
 					},
                     columns: [
@@ -125,7 +125,7 @@ 
                             url: "module.php", 
                             type: "GET",
                             data: {
-                			    mod: "' . $this->module->getName() .'",
+                			    mod: "' . $this->module->getName().'",
                                 mod_action:  "GeoAnalysis@setStatus",
                 			    ga_id: ga_id,
                 			    ged: typeof gedcom === "undefined" ? WT_GEDCOM : gedcom,
@@ -133,7 +133,7 @@ 
                             },
                             error: function(result, stat, error) {
                                 var err = typeof result.responseJSON === "undefined" ? error : result.responseJSON.error;
-                                alert("' . I18N::translate('An error occured while editing this analysis:') . '" + err);
+                                alert("' . I18N::translate('An error occured while editing this analysis:').'" + err);
                             },
                             complete: function(result, stat) {
                                 geoAnalysisTable.ajax.reload(null, false);
@@ -146,14 +146,14 @@ 
                             url: "module.php", 
                             type: "GET",
                             data: {
-                			    mod: "' . $this->module->getName() .'",
+                			    mod: "' . $this->module->getName().'",
                                 mod_action:  "GeoAnalysis@delete",
                 			    ga_id: ga_id,
                 			    ged: typeof gedcom === "undefined" ? WT_GEDCOM : gedcom
                             },
                             error: function(result, stat, error) {
                                 var err = typeof result.responseJSON === "undefined" ? error : result.responseJSON.error;
-                                alert("' . I18N::translate('An error occured while deleting this analysis:') . '" + err);
+                                alert("' . I18N::translate('An error occured while deleting this analysis:').'" + err);
                             },
                             complete: function(result, stat) {
                                 geoAnalysisTable.ajax.reload(null, false);
@@ -177,13 +177,13 @@ 
         
         // Generate an AJAX/JSON response for datatables to load a block of rows
         $search = Filter::postArray('search');
-        if($search) $search = $search['value'];
+        if ($search) $search = $search['value'];
         $start  = Filter::postInteger('start');
         $length = Filter::postInteger('length');
         $order  = Filter::postArray('order');
         
-        foreach($order as $key => &$value) {
-            switch($value['column']) {
+        foreach ($order as $key => &$value) {
+            switch ($value['column']) {
                 case 3:
                     $value['column'] = 'majgd_descr';
                     break;
@@ -204,11 +204,11 @@ 
         
         $data = array();
         $place_hierarchy = $this->provider->getPlacesHierarchy();
-        foreach($list as $ga) {
+        foreach ($list as $ga) {
             /** @var GeoAnalysis $ga */
             
             $datum = array();
-            $options= $ga->getOptions();
+            $options = $ga->getOptions();
             
             $datum[0] = '
                 <div class="btn-group">
@@ -218,50 +218,48 @@ 
                     <ul class="dropdown-menu" role="menu">
                        <li>
                             <a href="#" onclick="return set_geoanalysis_status('. $ga->getId().', '.($ga->isEnabled() ? 'false' : 'true').', \''.Filter::escapeJs($wt_tree->getName()).'\');">
-                                <i class="fa fa-fw '.($ga->isEnabled() ? 'fa-times' : 'fa-check').'"></i> ' . ($ga->isEnabled() ? I18N::translate('Disable') : I18N::translate('Enable')) . '
+                                <i class="fa fa-fw '.($ga->isEnabled() ? 'fa-times' : 'fa-check').'"></i> '.($ga->isEnabled() ? I18N::translate('Disable') : I18N::translate('Enable')).'
                             </a>
                        </li>
                         <li>
                             <a href="module.php?mod='.$this->module->getName().'&mod_action=AdminConfig@edit&ga_id='.$ga->getId().'&ged='.$wt_tree->getName().'">
-                                <i class="fa fa-fw fa-pencil"></i> ' . I18N::translate('Edit') . '
+                                <i class="fa fa-fw fa-pencil"></i> ' . I18N::translate('Edit').'
                             </a>
                        </li>
                        <li class="divider" />
                        <li>
                             <a href="#" onclick="return delete_geoanalysis('. $ga->getId().', \''.Filter::escapeJs($wt_tree->getName()).'\');">
-                                <i class="fa fa-fw fa-trash-o"></i> ' . I18N::translate('Delete') . '
+                                <i class="fa fa-fw fa-trash-o"></i> ' . I18N::translate('Delete').'
                             </a>
                        </li>
                     </ul>
                 </div>';
 		    $datum[1] = $ga->getId();
 		    $datum[2] = $ga->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>';
+				'<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] = $ga->getTitle();
 		    $analysis_level = $ga->getAnalysisLevel();
-		    if($place_hierarchy['type'] == 'header') {
+		    if ($place_hierarchy['type'] == 'header') {
 		        $datum[4] = $place_hierarchy['hierarchy'][$analysis_level - 1];
 		    } else {
-		        $datum[4] = $analysis_level . '(' . $place_hierarchy['hierarchy'][$analysis_level - 1] . ')';
+		        $datum[4] = $analysis_level.'('.$place_hierarchy['hierarchy'][$analysis_level - 1].')';
 		    }
 		    $datum[5] = $ga->getAnalysisLevel();
 		    $datum[6] = '<i class="fa fa-times"></i><span class="sr-only">'.I18N::translate('None').'</span>';
 		    $datum[7] = '<i class="fa fa-times"></i><span class="sr-only">'.I18N::translate('None').'</span>';
-		    if($ga->hasMap()) {
+		    if ($ga->hasMap()) {
 		        $datum[6] = $options->getMap()->getDescription();
-		        $datum[7] = '<span data-toggle="tooltip" title="' . $options->getMap()->getTopLevelName() . '" />';
+		        $datum[7] = '<span data-toggle="tooltip" title="'.$options->getMap()->getTopLevelName().'" />';
 		        $top_level = $options->getMapLevel();
-		        if($place_hierarchy['type'] == 'header') {
+		        if ($place_hierarchy['type'] == 'header') {
 		            $datum[7] .= $place_hierarchy['hierarchy'][$top_level - 1];
 		        } else {
-		            $datum[7] .= $top_level . '(' . $place_hierarchy['hierarchy'][$top_level - 1] . ')';
+		            $datum[7] .= $top_level.'('.$place_hierarchy['hierarchy'][$top_level - 1].')';
 		        }
 		        $datum[7] .= '</span>';
 		    }
 		    $datum[8] = $options->isUsingFlags() ? 
-				'<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>';
+				'<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>';
 		    $datum[9] = $options->getMaxDetailsInGen() > 0 ? $options->getMaxDetailsInGen() : I18N::translate('All');
 		    
 		    $data[] = $datum;
@@ -310,24 +308,24 @@ 
         $description    = Filter::post('description');
         $analysislevel  = Filter::postInteger('analysislevel');
         $use_map        = Filter::postBool('use_map');
-        if($use_map) {
+        if ($use_map) {
             $map_file   = base64_decode(Filter::post('map_file'));
-            $map_top_level   = Filter::postInteger('map_top_level');
+            $map_top_level = Filter::postInteger('map_top_level');
         }
         $use_flags      = Filter::postBool('use_flags');
         $gen_details    = Filter::postInteger('gen_details');
         
         $success = false; 
-        if($ga_id) {
+        if ($ga_id) {
             $ga = $this->provider->getGeoAnalysis($ga_id, false);
-            if($ga) {
+            if ($ga) {
                 $ga->setTitle($description);
                 $ga->setAnalysisLevel($analysislevel + 1);
                 $options = $ga->getOptions();
-                if($options) {
+                if ($options) {
                     $options->setUsingFlags($use_flags);
                     $options->setMaxDetailsInGen($gen_details);
-                    if($use_map) {
+                    if ($use_map) {
                         $options->setMap(new OutlineMap($map_file));
                         $options->setMapLevel($map_top_level + 1);
                     }
@@ -337,7 +335,7 @@ 
                 }
 				
 				$res = $this->provider->updateGeoAnalysis($ga);
-				if($res) {
+				if ($res) {
 					FlashMessages::addMessage(I18N::translate('The geographical dispersion analysis “%s” has been successfully updated', $res->getTitle()), 'success');
 					Log::addConfigurationLog('Module '.$this->module->getName().' : Geo Analysis ID “'.$res->getId().'” has been updated.');
 					$ga = $res;
@@ -345,7 +343,7 @@ 
 				}
 				else {
 					FlashMessages::addMessage(I18N::translate('An error occured while updating the geographical dispersion analysis “%s”', $ga->getTitle()), 'danger');
-					Log::addConfigurationLog('Module '.$this->module->getName().' : Geo Analysis ID “'. $ga->getId() .'” could not be updated. See error log.');
+					Log::addConfigurationLog('Module '.$this->module->getName().' : Geo Analysis ID “'.$ga->getId().'” could not be updated. See error log.');
 				}
             }
         } else {
@@ -357,7 +355,7 @@ 
 				$use_flags,
 				$gen_details
 			);
-			if($ga) {
+			if ($ga) {
 				FlashMessages::addMessage(I18N::translate('The geographical dispersion analysis “%s” has been successfully added.', $ga->getTitle()), 'success');
 				Log::addConfigurationLog('Module '.$this->module->getName().' : Geo Analysis ID “'.$ga->getId().'” has been added.');
 				$success = true;
@@ -368,16 +366,16 @@ 
 			}
         }
         
-        $redirection_url = 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig&ged=' . $wt_tree->getNameUrl();
-        if(!$success) {			
-            if($ga) {
-                $redirection_url = 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig@edit&ga_id='. $ga->getId() .'&ged=' . $wt_tree->getNameUrl();
+        $redirection_url = 'module.php?mod='.$this->module->getName().'&mod_action=AdminConfig&ged='.$wt_tree->getNameUrl();
+        if (!$success) {			
+            if ($ga) {
+                $redirection_url = 'module.php?mod='.$this->module->getName().'&mod_action=AdminConfig@edit&ga_id='.$ga->getId().'&ged='.$wt_tree->getNameUrl();
             }
             else {
-                $redirection_url = 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig@add&ged=' . $wt_tree->getNameUrl();
+                $redirection_url = 'module.php?mod='.$this->module->getName().'&mod_action=AdminConfig@add&ged='.$wt_tree->getNameUrl();
             }
         }        
-        header('Location: ' . WT_BASE_URL . $redirection_url);
+        header('Location: '.WT_BASE_URL.$redirection_url);
         
     }
      
@@ -407,7 +405,7 @@ 
             ');
         
         $data = new ViewBag();
-        if($ga) {
+        if ($ga) {
             $controller->setPageTitle(I18N::translate('Edit the geographical dispersion analysis'));
             $data->set('geo_analysis', $ga);
         } else {
@@ -415,9 +413,9 @@ 
         }
         
         $data->set('title', $controller->getPageTitle());
-        $data->set('admin_config_url', 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig&ged=' . $wt_tree->getNameUrl());
+        $data->set('admin_config_url', 'module.php?mod='.$this->module->getName().'&mod_action=AdminConfig&ged='.$wt_tree->getNameUrl());
         $data->set('module_title', $this->module->getTitle());
-        $data->set('save_url', 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig@save&ged=' . $wt_tree->getNameUrl());
+        $data->set('save_url', 'module.php?mod='.$this->module->getName().'&mod_action=AdminConfig@save&ged='.$wt_tree->getNameUrl());
         $data->set('places_hierarchy', $this->provider->getPlacesHierarchy());
     
         $map_list = array_map(
@@ -430,7 +428,7 @@ 
         $data->set('map_list', $map_list);
     
         $gen_details = array(0 => I18N::translate('All'));
-        for($i = 1; $i <= 10 ; $i++) $gen_details[$i] = $i;
+        for ($i = 1; $i <= 10; $i++) $gen_details[$i] = $i;
         $data->set('generation_details', $gen_details);
     
         ViewFactory::make('GeoAnalysisEdit', $this, $controller, $data)->render();

Braces +13 added lines, -11 removed lines

@@ -78,7 +78,9 @@ 
         
         $other_trees = array();
         foreach (Tree::getAll() as $tree) {
-            if($tree->getTreeId() != $wt_tree->getTreeId()) $other_trees[] = $tree;
+            if($tree->getTreeId() != $wt_tree->getTreeId()) {
+            	$other_trees[] = $tree;
+            }
         }      
         $data->set('other_trees', $other_trees);
         
@@ -177,7 +179,9 @@ 
         
         // Generate an AJAX/JSON response for datatables to load a block of rows
         $search = Filter::postArray('search');
-        if($search) $search = $search['value'];
+        if($search) {
+        	$search = $search['value'];
+        }
         $start  = Filter::postInteger('start');
         $length = Filter::postInteger('length');
         $order  = Filter::postArray('order');
@@ -330,8 +334,7 @@ 
                     if($use_map) {
                         $options->setMap(new OutlineMap($map_file));
                         $options->setMapLevel($map_top_level + 1);
-                    }
-                    else {
+                    } else {
                         $options->setMap(null);
                     }
                 }
@@ -342,8 +345,7 @@ 
 					Log::addConfigurationLog('Module '.$this->module->getName().' : Geo Analysis ID “'.$res->getId().'” has been updated.');
 					$ga = $res;
 					$success = true;
-				}
-				else {
+				} else {
 					FlashMessages::addMessage(I18N::translate('An error occured while updating the geographical dispersion analysis “%s”', $ga->getTitle()), 'danger');
 					Log::addConfigurationLog('Module '.$this->module->getName().' : Geo Analysis ID “'. $ga->getId() .'” could not be updated. See error log.');
 				}
@@ -361,8 +363,7 @@ 
 				FlashMessages::addMessage(I18N::translate('The geographical dispersion analysis “%s” has been successfully added.', $ga->getTitle()), 'success');
 				Log::addConfigurationLog('Module '.$this->module->getName().' : Geo Analysis ID “'.$ga->getId().'” has been added.');
 				$success = true;
-			}
-			else {
+			} else {
 				FlashMessages::addMessage(I18N::translate('An error occured while adding the geographical dispersion analysis “%s”', $description), 'danger');
 				Log::addConfigurationLog('Module '.$this->module->getName().' : Geo Analysis “'.$description.'” could not be added. See error log.');
 			}
@@ -372,8 +373,7 @@ 
         if(!$success) {			
             if($ga) {
                 $redirection_url = 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig@edit&ga_id='. $ga->getId() .'&ged=' . $wt_tree->getNameUrl();
-            }
-            else {
+            } else {
                 $redirection_url = 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig@add&ged=' . $wt_tree->getNameUrl();
             }
         }        
@@ -430,7 +430,9 @@ 
         $data->set('map_list', $map_list);
     
         $gen_details = array(0 => I18N::translate('All'));
-        for($i = 1; $i <= 10 ; $i++) $gen_details[$i] = $i;
+        for($i = 1; $i <= 10 ; $i++) {
+        	$gen_details[$i] = $i;
+        }
         $data->set('generation_details', $gen_details);
     
         ViewFactory::make('GeoAnalysisEdit', $this, $controller, $data)->render();

src/Webtrees/Module/GeoDispersion/GeoAnalysisController.php

Indentation +227 added lines, -227 removed lines

@@ -36,47 +36,47 @@ 
  */
 class GeoAnalysisController extends MvcController
 {
-    /**
-     * GeoAnalysis Provider
-     * @var GeoAnalysisProvider $provider
-     */
-    protected $provider;
+	/**
+	 * GeoAnalysis Provider
+	 * @var GeoAnalysisProvider $provider
+	 */
+	protected $provider;
     
-    /**
-     * Constructor for GeoAnalysis controller
-     * @param AbstractModule $module
-     */
-    public function __construct(AbstractModule $module) {
-        parent::__construct($module);
+	/**
+	 * Constructor for GeoAnalysis controller
+	 * @param AbstractModule $module
+	 */
+	public function __construct(AbstractModule $module) {
+		parent::__construct($module);
         
-        $this->provider = $this->module->getProvider();
-    }    
+		$this->provider = $this->module->getProvider();
+	}    
     
-    /**
-     * Pages
-     */
+	/**
+	 * Pages
+	 */
         
-    /**
-     * GeoAnalysis@index
-     */
-    public function index() {
+	/**
+	 * GeoAnalysis@index
+	 */
+	public function index() {
         
-        $controller = new PageController();
-        $controller->setPageTitle(I18N::translate('Sosa Geographical dispersion'));
+		$controller = new PageController();
+		$controller->setPageTitle(I18N::translate('Sosa Geographical dispersion'));
         
-        $data = new ViewBag();
-        $data->set('title', $controller->getPageTitle());
-        $data->set('has_analysis', false);
+		$data = new ViewBag();
+		$data->set('title', $controller->getPageTitle());
+		$data->set('has_analysis', false);
         
-        $ga_id = Filter::getInteger('ga_id');        
+		$ga_id = Filter::getInteger('ga_id');        
         
-        if($ga_id && $ga = $this->provider->getGeoAnalysis($ga_id)) {
-            $data->set('has_analysis', true);
-            $data->set('geoanalysis', $ga);
+		if($ga_id && $ga = $this->provider->getGeoAnalysis($ga_id)) {
+			$data->set('has_analysis', true);
+			$data->set('geoanalysis', $ga);
             
-            $controller
-                ->addExternalJavascript(Constants::WT_RAPHAEL_JS_URL())
-                ->addInlineJavascript('
+			$controller
+				->addExternalJavascript(Constants::WT_RAPHAEL_JS_URL())
+				->addInlineJavascript('
                 jQuery("#geodispersion-tabs").tabs();
                 jQuery("#geodispersion-tabs").css("visibility", "visible");
                 
@@ -97,128 +97,128 @@ 
 					"json"
 				);
             ');
-        }
+		}
         
-        ViewFactory::make('GeoAnalysis', $this, $controller, $data)->render();
-    }
+		ViewFactory::make('GeoAnalysis', $this, $controller, $data)->render();
+	}
     
-    /**
-     * GeoAnalysis@listAll
-     */
-    public function listAll() {
+	/**
+	 * GeoAnalysis@listAll
+	 */
+	public function listAll() {
         
-        $controller = new PageController();
-        $controller->setPageTitle(I18N::translate('Sosa Geographical dispersion'));
+		$controller = new PageController();
+		$controller->setPageTitle(I18N::translate('Sosa Geographical dispersion'));
         
-        $data = new ViewBag();
-        $data->set('title', $controller->getPageTitle());
-        $data->set('has_list', false);
+		$data = new ViewBag();
+		$data->set('title', $controller->getPageTitle());
+		$data->set('has_list', false);
         
-        $ga_list = $this->provider->getGeoAnalysisList();
-        if(count($ga_list) > 0 ) {
-             $data->set('has_list', true);
-             $data->set('geoanalysislist', $ga_list);
-        }
+		$ga_list = $this->provider->getGeoAnalysisList();
+		if(count($ga_list) > 0 ) {
+			 $data->set('has_list', true);
+			 $data->set('geoanalysislist', $ga_list);
+		}
         
-        ViewFactory::make('GeoAnalysisList', $this, $controller, $data)->render();        
-    }
+		ViewFactory::make('GeoAnalysisList', $this, $controller, $data)->render();        
+	}
     	
 	/**
 	 * GeoAnalysis@setStatus
 	 */
-    public function setStatus() {
-        $controller = new JsonController();
+	public function setStatus() {
+		$controller = new JsonController();
         
-        $ga_id = Filter::getInteger('ga_id');
-        $ga = $this->provider->getGeoAnalysis($ga_id, false);
+		$ga_id = Filter::getInteger('ga_id');
+		$ga = $this->provider->getGeoAnalysis($ga_id, false);
         
-        $controller->restrictAccess(
-            true // Filter::checkCsrf()   -- Cannot use CSRF on a GET request (modules can only work with GET requests)
-            &&  Auth::isManager(Globals::getTree()) 
-            && $ga !== null
-        );
+		$controller->restrictAccess(
+			true // Filter::checkCsrf()   -- Cannot use CSRF on a GET request (modules can only work with GET requests)
+			&&  Auth::isManager(Globals::getTree()) 
+			&& $ga !== null
+		);
         
-        $status = Filter::getBool('status');
-        $res = array('geoanalysis' => $ga->getId() , 'error' => null);
-        try{
-            $this->provider->setGeoAnalysisStatus($ga, $status);
-            $res['status'] = $status;
+		$status = Filter::getBool('status');
+		$res = array('geoanalysis' => $ga->getId() , 'error' => null);
+		try{
+			$this->provider->setGeoAnalysisStatus($ga, $status);
+			$res['status'] = $status;
 			Log::addConfigurationLog('Module '.$this->module->getName().' : Geo Analysis ID "'.$ga->getId().'" has been '. ($status ? 'enabled' : 'disabled') .'.');
-        }
-        catch (\Exception $ex) {
-            $res['error'] = $ex->getMessage();
+		}
+		catch (\Exception $ex) {
+			$res['error'] = $ex->getMessage();
 			Log::addErrorLog('Module '.$this->module->getName().' : Geo Analysis ID "'.$ga->getId().'" could not be ' . ($status ? 'enabled' : 'disabled') .'. Error: '. $ex->getMessage());
-        }
+		}
         
-        $controller->pageHeader();
-        if($res['error']) http_response_code(500);
+		$controller->pageHeader();
+		if($res['error']) http_response_code(500);
         
-        $controller->encode($res);
-    }
+		$controller->encode($res);
+	}
     
 	/**
-     * GeoAnalysis@delete
-     */
-    public function delete() {
-        $controller = new JsonController();
+	 * GeoAnalysis@delete
+	 */
+	public function delete() {
+		$controller = new JsonController();
     
-        $ga_id = Filter::getInteger('ga_id');
-        $ga = $this->provider->getGeoAnalysis($ga_id, false);
+		$ga_id = Filter::getInteger('ga_id');
+		$ga = $this->provider->getGeoAnalysis($ga_id, false);
     
-        $controller->restrictAccess(
-            true // Filter::checkCsrf()   -- Cannot use CSRF on a GET request (modules can only work with GET requests)
-            &&  Auth::isManager(Globals::getTree())
-            && $ga
-            );
+		$controller->restrictAccess(
+			true // Filter::checkCsrf()   -- Cannot use CSRF on a GET request (modules can only work with GET requests)
+			&&  Auth::isManager(Globals::getTree())
+			&& $ga
+			);
             
-        $res = array('geoanalysis' => $ga->getId() , 'error' => null);
-        try{
-            $this->provider->deleteGeoAnalysis($ga);
+		$res = array('geoanalysis' => $ga->getId() , 'error' => null);
+		try{
+			$this->provider->deleteGeoAnalysis($ga);
 			Log::addConfigurationLog('Module '.$this->module->getName().' : Geo Analysis ID "'.$ga->getId().'" has been deleted.');
-        }
-        catch (\Exception $ex) {
-            $res['error'] = $ex->getMessage();
+		}
+		catch (\Exception $ex) {
+			$res['error'] = $ex->getMessage();
 			Log::addErrorLog('Module '.$this->module->getName().' : Geo Analysis ID "'.$ga->getId().'" could not be deleted. Error: '. $ex->getMessage());
-        }
+		}
     
-        $controller->pageHeader();
-        if($res['error']) http_response_code(500);
+		$controller->pageHeader();
+		if($res['error']) http_response_code(500);
 
-        $controller->encode($res);
-    }
+		$controller->encode($res);
+	}
         	
-    /**
-     * GeoAnalysis@dataTabs
-     */
-    public function dataTabs() {
-        $wt_tree = Globals::getTree();
-        $controller = new JsonController();
+	/**
+	 * GeoAnalysis@dataTabs
+	 */
+	public function dataTabs() {
+		$wt_tree = Globals::getTree();
+		$controller = new JsonController();
         
-        $ga_id = Filter::getInteger('ga_id');
-        $ga = $this->provider->getGeoAnalysis($ga_id);
-        $sosa_provider = new SosaProvider($wt_tree, Auth::user());
+		$ga_id = Filter::getInteger('ga_id');
+		$ga = $this->provider->getGeoAnalysis($ga_id);
+		$sosa_provider = new SosaProvider($wt_tree, Auth::user());
         
-        $controller
-            ->restrictAccess($ga && $sosa_provider->isSetup())
-            ->pageHeader();
+		$controller
+			->restrictAccess($ga && $sosa_provider->isSetup())
+			->pageHeader();
         
-        $jsonArray = array();
+		$jsonArray = array();
         
-        list($placesDispGeneral, $placesDispGenerations) = $ga->getAnalysisResults($sosa_provider->getAllSosaWithGenerations());
+		list($placesDispGeneral, $placesDispGenerations) = $ga->getAnalysisResults($sosa_provider->getAllSosaWithGenerations());
         
-        $flags = array();
-        if($placesDispGeneral && $ga->getOptions() && $ga->getOptions()->isUsingFlags()) {
-            $mapProvider = new GoogleMapsProvider();            
-            foreach($placesDispGeneral['places'] as $place => $count) {
-                $flags[$place] = $mapProvider->getPlaceIcon(new Place($place, $wt_tree));
-            }
-        }
+		$flags = array();
+		if($placesDispGeneral && $ga->getOptions() && $ga->getOptions()->isUsingFlags()) {
+			$mapProvider = new GoogleMapsProvider();            
+			foreach($placesDispGeneral['places'] as $place => $count) {
+				$flags[$place] = $mapProvider->getPlaceIcon(new Place($place, $wt_tree));
+			}
+		}
         
-        $jsonArray['generaltab'] = $this->htmlPlacesAnalysisGeneralTab($ga, $placesDispGeneral, $flags);
-        $jsonArray['generationstab'] = $this->htmlPlacesAnalysisGenerationsTab($ga, $placesDispGenerations, $flags);
+		$jsonArray['generaltab'] = $this->htmlPlacesAnalysisGeneralTab($ga, $placesDispGeneral, $flags);
+		$jsonArray['generationstab'] = $this->htmlPlacesAnalysisGenerationsTab($ga, $placesDispGenerations, $flags);
 
-        $controller->encode($jsonArray);
-    }
+		$controller->encode($jsonArray);
+	}
     
 	/**
 	 * Returns HTML code for the GeoAnalysis general tab (can be either a map or a table).
@@ -228,68 +228,68 @@ 
 	 * @param (null|array) $flags Array of flags
 	 * @return string HTML code for the general tab
 	 */
-    protected function htmlPlacesAnalysisGeneralTab(GeoAnalysis $ga, $placesGeneralResults, $flags= null) {        
-        if(!empty($placesGeneralResults)){
-            $data = new ViewBag();
+	protected function htmlPlacesAnalysisGeneralTab(GeoAnalysis $ga, $placesGeneralResults, $flags= null) {        
+		if(!empty($placesGeneralResults)){
+			$data = new ViewBag();
             
-            $nb_found = $placesGeneralResults['knownsum'];
-            $nb_other = 0;
-            if(isset($placesGeneralResults['other'])) $nb_other =$placesGeneralResults['other'];
-            $nb_unknown = $placesGeneralResults['unknown'];
+			$nb_found = $placesGeneralResults['knownsum'];
+			$nb_other = 0;
+			if(isset($placesGeneralResults['other'])) $nb_other =$placesGeneralResults['other'];
+			$nb_unknown = $placesGeneralResults['unknown'];
             
-            $data->set('stats_gen_nb_found', $nb_found);
-            $data->set('stats_gen_nb_other', $nb_other);
-            $data->set('stats_gen_nb_unknown', $nb_unknown);
+			$data->set('stats_gen_nb_found', $nb_found);
+			$data->set('stats_gen_nb_other', $nb_other);
+			$data->set('stats_gen_nb_unknown', $nb_unknown);
             
-            $data->set('use_flags', $ga->getOptions() && $ga->getOptions()->isUsingFlags());
+			$data->set('use_flags', $ga->getOptions() && $ga->getOptions()->isUsingFlags());
             
-            if($ga->hasMap()) {
-                $max = $placesGeneralResults['max'];
-                $map = $ga->getOptions()->getMap();
-                $results_by_subdivs = $map->getSubdivisions();
-                $places_mappings = $map->getPlacesMappings();
-                foreach ($placesGeneralResults['places'] as $location => $count) {
-                    $levelvalues = array_reverse(array_map('trim',explode(',', $location)));
-                    $level_map = $ga->getAnalysisLevel() - $ga->getOptions()->getMapLevel();
-                    if($level_map >= 0 && $level_map < count($levelvalues)) {
-                        $levelref = $levelvalues[0] . '@' . $levelvalues[$level_map];
-                        if(!isset($results_by_subdivs[$levelref])) { $levelref = $levelvalues[0]; }
-                    }
-                    else {
-                        $levelref = $levelvalues[0];
-                    }
-                    if(isset($places_mappings[$levelref])) $levelref = $places_mappings[$levelref];
-                    if(isset($results_by_subdivs[$levelref])) {
-                        $count_subd = isset($results_by_subdivs[$levelref]['count']) ? $results_by_subdivs[$levelref]['count'] : 0;
-                        $count_subd  += $count;
-                        $results_by_subdivs[$levelref]['count'] = $count_subd;   
-                        $results_by_subdivs[$levelref]['transparency'] = Functions::safeDivision($count_subd, $max);
-                        if($ga->getOptions()->isUsingFlags() && $flags) {
-                            $results_by_subdivs[$levelref]['place'] = new Place($location, Globals::getTree());
-                            $results_by_subdivs[$levelref]['flag'] = $flags[$location];
-                        }
-                    }
-                }             
+			if($ga->hasMap()) {
+				$max = $placesGeneralResults['max'];
+				$map = $ga->getOptions()->getMap();
+				$results_by_subdivs = $map->getSubdivisions();
+				$places_mappings = $map->getPlacesMappings();
+				foreach ($placesGeneralResults['places'] as $location => $count) {
+					$levelvalues = array_reverse(array_map('trim',explode(',', $location)));
+					$level_map = $ga->getAnalysisLevel() - $ga->getOptions()->getMapLevel();
+					if($level_map >= 0 && $level_map < count($levelvalues)) {
+						$levelref = $levelvalues[0] . '@' . $levelvalues[$level_map];
+						if(!isset($results_by_subdivs[$levelref])) { $levelref = $levelvalues[0]; }
+					}
+					else {
+						$levelref = $levelvalues[0];
+					}
+					if(isset($places_mappings[$levelref])) $levelref = $places_mappings[$levelref];
+					if(isset($results_by_subdivs[$levelref])) {
+						$count_subd = isset($results_by_subdivs[$levelref]['count']) ? $results_by_subdivs[$levelref]['count'] : 0;
+						$count_subd  += $count;
+						$results_by_subdivs[$levelref]['count'] = $count_subd;   
+						$results_by_subdivs[$levelref]['transparency'] = Functions::safeDivision($count_subd, $max);
+						if($ga->getOptions()->isUsingFlags() && $flags) {
+							$results_by_subdivs[$levelref]['place'] = new Place($location, Globals::getTree());
+							$results_by_subdivs[$levelref]['flag'] = $flags[$location];
+						}
+					}
+				}             
                 
-                $data->set('map', $ga->getOptions()->getMap());
-                $data->set('results_by_subdivisions', $results_by_subdivs);
+				$data->set('map', $ga->getOptions()->getMap());
+				$data->set('results_by_subdivisions', $results_by_subdivs);
                 
-                $html = ViewFactory::make('GeoAnalysisTabGeneralMap', $this, new BaseController(), $data)->getHtmlPartial();
-            }
-            else {
-                $results = $placesGeneralResults['places'];
-                arsort($results);
-                $data->set('results', $results);
-                $data->set('analysis_level', $ga->getAnalysisLevel());
+				$html = ViewFactory::make('GeoAnalysisTabGeneralMap', $this, new BaseController(), $data)->getHtmlPartial();
+			}
+			else {
+				$results = $placesGeneralResults['places'];
+				arsort($results);
+				$data->set('results', $results);
+				$data->set('analysis_level', $ga->getAnalysisLevel());
                 
-                $html = ViewFactory::make('GeoAnalysisTabGeneralTable', $this, new BaseController(), $data)->getHtmlPartial();
-            }
-        }
-        else {
-            $html = '<p class="warning">' . I18N::translate('No data is available for the general analysis.') . '</p>';
-        }
-        return $html;
-    }
+				$html = ViewFactory::make('GeoAnalysisTabGeneralTable', $this, new BaseController(), $data)->getHtmlPartial();
+			}
+		}
+		else {
+			$html = '<p class="warning">' . I18N::translate('No data is available for the general analysis.') . '</p>';
+		}
+		return $html;
+	}
     
 	/**
 	 * Returns HTML code for the GeoAnalysis generations tab.
@@ -299,66 +299,66 @@ 
 	 * @param (null|array) $flags Array of flags
 	 * @return string HTML code for the generations tab
 	 */
-    protected function htmlPlacesAnalysisGenerationsTab(GeoAnalysis $ga, $placesGenerationsResults, $flags = null) {        
-        if(!empty($placesGenerationsResults) && $ga->getOptions()){
-            $data = new ViewBag();
+	protected function htmlPlacesAnalysisGenerationsTab(GeoAnalysis $ga, $placesGenerationsResults, $flags = null) {        
+		if(!empty($placesGenerationsResults) && $ga->getOptions()){
+			$data = new ViewBag();
             
-            ksort($placesGenerationsResults);
+			ksort($placesGenerationsResults);
             
-            $detailslevel = $ga->getOptions()->getMaxDetailsInGen();
-            $data->set('max_details_gen', $detailslevel);    
-            $data->set('use_flags', $ga->getOptions()->isUsingFlags());
-            $data->set('analysis_level', $ga->getAnalysisLevel());
-            $display_all_places = !is_null($detailslevel) && $detailslevel == 0;
-            $data->set('display_all_places', $display_all_places);
+			$detailslevel = $ga->getOptions()->getMaxDetailsInGen();
+			$data->set('max_details_gen', $detailslevel);    
+			$data->set('use_flags', $ga->getOptions()->isUsingFlags());
+			$data->set('analysis_level', $ga->getAnalysisLevel());
+			$display_all_places = !is_null($detailslevel) && $detailslevel == 0;
+			$data->set('display_all_places', $display_all_places);
             
-            $results_by_gen = array();
-            foreach($placesGenerationsResults as $gen => $genData){
-                $sum = 0;
-                $other = 0;
-                $unknown = 0;
-                if(isset($genData['sum'])) $sum = $genData['sum'];
-                if(isset($genData['other'])) $other = $genData['other'];
-                if(isset($genData['unknown'])) $unknown = $genData['unknown'];
+			$results_by_gen = array();
+			foreach($placesGenerationsResults as $gen => $genData){
+				$sum = 0;
+				$other = 0;
+				$unknown = 0;
+				if(isset($genData['sum'])) $sum = $genData['sum'];
+				if(isset($genData['other'])) $other = $genData['other'];
+				if(isset($genData['unknown'])) $unknown = $genData['unknown'];
                 
-                if($sum > 0) {                
-                    $results_by_gen[$gen]['sum'] = $sum;
-                    $results_by_gen[$gen]['other'] = $other;
-                    $results_by_gen[$gen]['unknown'] = $unknown;
-                    $results_by_gen[$gen]['places'] = array();                    
-                    arsort($genData['places']);
+				if($sum > 0) {                
+					$results_by_gen[$gen]['sum'] = $sum;
+					$results_by_gen[$gen]['other'] = $other;
+					$results_by_gen[$gen]['unknown'] = $unknown;
+					$results_by_gen[$gen]['places'] = array();                    
+					arsort($genData['places']);
                     
-                    if($display_all_places){
-                        foreach($genData['places'] as $placename=> $count){
-                            $results_by_gen[$gen]['places'][$placename]['count'] = $count;
+					if($display_all_places){
+						foreach($genData['places'] as $placename=> $count){
+							$results_by_gen[$gen]['places'][$placename]['count'] = $count;
                             
-                            if($ga->getOptions() && $ga->getOptions()->isUsingFlags() && ($flag = $flags[$placename]) != ''){
-                                $results_by_gen[$gen]['places'][$placename]['place'] = new Place($placename, Globals::getTree());
-                                $results_by_gen[$gen]['places'][$placename]['flag'] = $flag;
-                            }
-                        }
-                    }
-                    else {
-                        $tmp = $genData['places'];
-                        if($other > 0) {
-                            $tmp = array_slice($tmp, 0, 5, true);
-                            $tmp['other'] = $other;
-                            arsort($tmp);  
-                        }                      
-                        $results_by_gen[$gen]['places'] = array_slice($tmp, 0, 5, true);                        
-                    }
-                }
-            }
+							if($ga->getOptions() && $ga->getOptions()->isUsingFlags() && ($flag = $flags[$placename]) != ''){
+								$results_by_gen[$gen]['places'][$placename]['place'] = new Place($placename, Globals::getTree());
+								$results_by_gen[$gen]['places'][$placename]['flag'] = $flag;
+							}
+						}
+					}
+					else {
+						$tmp = $genData['places'];
+						if($other > 0) {
+							$tmp = array_slice($tmp, 0, 5, true);
+							$tmp['other'] = $other;
+							arsort($tmp);  
+						}                      
+						$results_by_gen[$gen]['places'] = array_slice($tmp, 0, 5, true);                        
+					}
+				}
+			}
             
-            $data->set('results_by_generations', $results_by_gen);
+			$data->set('results_by_generations', $results_by_gen);
             
-            $html = ViewFactory::make('GeoAnalysisTabGenerations', $this, new BaseController(), $data)->getHtmlPartial();
+			$html = ViewFactory::make('GeoAnalysisTabGenerations', $this, new BaseController(), $data)->getHtmlPartial();
             
-        }
-        else {
-            $html = '<p class="warning">' . I18N::translate('No data is available for the generations analysis.') . '</p>';
-        }
-        return $html;
-    }
+		}
+		else {
+			$html = '<p class="warning">' . I18N::translate('No data is available for the generations analysis.') . '</p>';
+		}
+		return $html;
+	}
         
 }
\ No newline at end of file

Spacing +38 added lines, -38 removed lines

@@ -70,7 +70,7 @@ 
         
         $ga_id = Filter::getInteger('ga_id');        
         
-        if($ga_id && $ga = $this->provider->getGeoAnalysis($ga_id)) {
+        if ($ga_id && $ga = $this->provider->getGeoAnalysis($ga_id)) {
             $data->set('has_analysis', true);
             $data->set('geoanalysis', $ga);
             
@@ -83,7 +83,7 @@ 
                 jQuery.get(
 					"module.php",
 					{
-                        "mod" : "'. $this->module->getName() .'",  
+                        "mod" : "'. $this->module->getName().'",  
                         "mod_action": "GeoAnalysis@dataTabs",
                         "ga_id" : "'.$ga_id.'"
                     },
@@ -115,7 +115,7 @@ 
         $data->set('has_list', false);
         
         $ga_list = $this->provider->getGeoAnalysisList();
-        if(count($ga_list) > 0 ) {
+        if (count($ga_list) > 0) {
              $data->set('has_list', true);
              $data->set('geoanalysislist', $ga_list);
         }
@@ -139,19 +139,19 @@ 
         );
         
         $status = Filter::getBool('status');
-        $res = array('geoanalysis' => $ga->getId() , 'error' => null);
-        try{
+        $res = array('geoanalysis' => $ga->getId(), 'error' => null);
+        try {
             $this->provider->setGeoAnalysisStatus($ga, $status);
             $res['status'] = $status;
-			Log::addConfigurationLog('Module '.$this->module->getName().' : Geo Analysis ID "'.$ga->getId().'" has been '. ($status ? 'enabled' : 'disabled') .'.');
+			Log::addConfigurationLog('Module '.$this->module->getName().' : Geo Analysis ID "'.$ga->getId().'" has been '.($status ? 'enabled' : 'disabled').'.');
         }
         catch (\Exception $ex) {
             $res['error'] = $ex->getMessage();
-			Log::addErrorLog('Module '.$this->module->getName().' : Geo Analysis ID "'.$ga->getId().'" could not be ' . ($status ? 'enabled' : 'disabled') .'. Error: '. $ex->getMessage());
+			Log::addErrorLog('Module '.$this->module->getName().' : Geo Analysis ID "'.$ga->getId().'" could not be '.($status ? 'enabled' : 'disabled').'. Error: '.$ex->getMessage());
         }
         
         $controller->pageHeader();
-        if($res['error']) http_response_code(500);
+        if ($res['error']) http_response_code(500);
         
         $controller->encode($res);
     }
@@ -171,18 +171,18 @@ 
             && $ga
             );
             
-        $res = array('geoanalysis' => $ga->getId() , 'error' => null);
-        try{
+        $res = array('geoanalysis' => $ga->getId(), 'error' => null);
+        try {
             $this->provider->deleteGeoAnalysis($ga);
 			Log::addConfigurationLog('Module '.$this->module->getName().' : Geo Analysis ID "'.$ga->getId().'" has been deleted.');
         }
         catch (\Exception $ex) {
             $res['error'] = $ex->getMessage();
-			Log::addErrorLog('Module '.$this->module->getName().' : Geo Analysis ID "'.$ga->getId().'" could not be deleted. Error: '. $ex->getMessage());
+			Log::addErrorLog('Module '.$this->module->getName().' : Geo Analysis ID "'.$ga->getId().'" could not be deleted. Error: '.$ex->getMessage());
         }
     
         $controller->pageHeader();
-        if($res['error']) http_response_code(500);
+        if ($res['error']) http_response_code(500);
 
         $controller->encode($res);
     }
@@ -207,9 +207,9 @@ 
         list($placesDispGeneral, $placesDispGenerations) = $ga->getAnalysisResults($sosa_provider->getAllSosaWithGenerations());
         
         $flags = array();
-        if($placesDispGeneral && $ga->getOptions() && $ga->getOptions()->isUsingFlags()) {
+        if ($placesDispGeneral && $ga->getOptions() && $ga->getOptions()->isUsingFlags()) {
             $mapProvider = new GoogleMapsProvider();            
-            foreach($placesDispGeneral['places'] as $place => $count) {
+            foreach ($placesDispGeneral['places'] as $place => $count) {
                 $flags[$place] = $mapProvider->getPlaceIcon(new Place($place, $wt_tree));
             }
         }
@@ -228,13 +228,13 @@ 
 	 * @param (null|array) $flags Array of flags
 	 * @return string HTML code for the general tab
 	 */
-    protected function htmlPlacesAnalysisGeneralTab(GeoAnalysis $ga, $placesGeneralResults, $flags= null) {        
-        if(!empty($placesGeneralResults)){
+    protected function htmlPlacesAnalysisGeneralTab(GeoAnalysis $ga, $placesGeneralResults, $flags = null) {        
+        if (!empty($placesGeneralResults)) {
             $data = new ViewBag();
             
             $nb_found = $placesGeneralResults['knownsum'];
             $nb_other = 0;
-            if(isset($placesGeneralResults['other'])) $nb_other =$placesGeneralResults['other'];
+            if (isset($placesGeneralResults['other'])) $nb_other = $placesGeneralResults['other'];
             $nb_unknown = $placesGeneralResults['unknown'];
             
             $data->set('stats_gen_nb_found', $nb_found);
@@ -243,28 +243,28 @@ 
             
             $data->set('use_flags', $ga->getOptions() && $ga->getOptions()->isUsingFlags());
             
-            if($ga->hasMap()) {
+            if ($ga->hasMap()) {
                 $max = $placesGeneralResults['max'];
                 $map = $ga->getOptions()->getMap();
                 $results_by_subdivs = $map->getSubdivisions();
                 $places_mappings = $map->getPlacesMappings();
                 foreach ($placesGeneralResults['places'] as $location => $count) {
-                    $levelvalues = array_reverse(array_map('trim',explode(',', $location)));
+                    $levelvalues = array_reverse(array_map('trim', explode(',', $location)));
                     $level_map = $ga->getAnalysisLevel() - $ga->getOptions()->getMapLevel();
-                    if($level_map >= 0 && $level_map < count($levelvalues)) {
-                        $levelref = $levelvalues[0] . '@' . $levelvalues[$level_map];
-                        if(!isset($results_by_subdivs[$levelref])) { $levelref = $levelvalues[0]; }
+                    if ($level_map >= 0 && $level_map < count($levelvalues)) {
+                        $levelref = $levelvalues[0].'@'.$levelvalues[$level_map];
+                        if (!isset($results_by_subdivs[$levelref])) { $levelref = $levelvalues[0]; }
                     }
                     else {
                         $levelref = $levelvalues[0];
                     }
-                    if(isset($places_mappings[$levelref])) $levelref = $places_mappings[$levelref];
-                    if(isset($results_by_subdivs[$levelref])) {
+                    if (isset($places_mappings[$levelref])) $levelref = $places_mappings[$levelref];
+                    if (isset($results_by_subdivs[$levelref])) {
                         $count_subd = isset($results_by_subdivs[$levelref]['count']) ? $results_by_subdivs[$levelref]['count'] : 0;
-                        $count_subd  += $count;
+                        $count_subd += $count;
                         $results_by_subdivs[$levelref]['count'] = $count_subd;   
                         $results_by_subdivs[$levelref]['transparency'] = Functions::safeDivision($count_subd, $max);
-                        if($ga->getOptions()->isUsingFlags() && $flags) {
+                        if ($ga->getOptions()->isUsingFlags() && $flags) {
                             $results_by_subdivs[$levelref]['place'] = new Place($location, Globals::getTree());
                             $results_by_subdivs[$levelref]['flag'] = $flags[$location];
                         }
@@ -286,7 +286,7 @@ 
             }
         }
         else {
-            $html = '<p class="warning">' . I18N::translate('No data is available for the general analysis.') . '</p>';
+            $html = '<p class="warning">'.I18N::translate('No data is available for the general analysis.').'</p>';
         }
         return $html;
     }
@@ -300,7 +300,7 @@ 
 	 * @return string HTML code for the generations tab
 	 */
     protected function htmlPlacesAnalysisGenerationsTab(GeoAnalysis $ga, $placesGenerationsResults, $flags = null) {        
-        if(!empty($placesGenerationsResults) && $ga->getOptions()){
+        if (!empty($placesGenerationsResults) && $ga->getOptions()) {
             $data = new ViewBag();
             
             ksort($placesGenerationsResults);
@@ -313,26 +313,26 @@ 
             $data->set('display_all_places', $display_all_places);
             
             $results_by_gen = array();
-            foreach($placesGenerationsResults as $gen => $genData){
+            foreach ($placesGenerationsResults as $gen => $genData) {
                 $sum = 0;
                 $other = 0;
                 $unknown = 0;
-                if(isset($genData['sum'])) $sum = $genData['sum'];
-                if(isset($genData['other'])) $other = $genData['other'];
-                if(isset($genData['unknown'])) $unknown = $genData['unknown'];
+                if (isset($genData['sum'])) $sum = $genData['sum'];
+                if (isset($genData['other'])) $other = $genData['other'];
+                if (isset($genData['unknown'])) $unknown = $genData['unknown'];
                 
-                if($sum > 0) {                
+                if ($sum > 0) {                
                     $results_by_gen[$gen]['sum'] = $sum;
                     $results_by_gen[$gen]['other'] = $other;
                     $results_by_gen[$gen]['unknown'] = $unknown;
                     $results_by_gen[$gen]['places'] = array();                    
                     arsort($genData['places']);
                     
-                    if($display_all_places){
-                        foreach($genData['places'] as $placename=> $count){
+                    if ($display_all_places) {
+                        foreach ($genData['places'] as $placename=> $count) {
                             $results_by_gen[$gen]['places'][$placename]['count'] = $count;
                             
-                            if($ga->getOptions() && $ga->getOptions()->isUsingFlags() && ($flag = $flags[$placename]) != ''){
+                            if ($ga->getOptions() && $ga->getOptions()->isUsingFlags() && ($flag = $flags[$placename]) != '') {
                                 $results_by_gen[$gen]['places'][$placename]['place'] = new Place($placename, Globals::getTree());
                                 $results_by_gen[$gen]['places'][$placename]['flag'] = $flag;
                             }
@@ -340,7 +340,7 @@ 
                     }
                     else {
                         $tmp = $genData['places'];
-                        if($other > 0) {
+                        if ($other > 0) {
                             $tmp = array_slice($tmp, 0, 5, true);
                             $tmp['other'] = $other;
                             arsort($tmp);  
@@ -356,7 +356,7 @@ 
             
         }
         else {
-            $html = '<p class="warning">' . I18N::translate('No data is available for the generations analysis.') . '</p>';
+            $html = '<p class="warning">'.I18N::translate('No data is available for the generations analysis.').'</p>';
         }
         return $html;
     }

src/Webtrees/Module/IsSourcedModule.php

Indentation +59 added lines, -59 removed lines

@@ -30,29 +30,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,
@@ -65,12 +65,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 '';
 	}
 	
 	/**
@@ -96,15 +96,15 @@ 
 	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\RecordNameTextExtenderInterface::hRecordNameAppend()
 	 */
 	public function hRecordNameAppend(GedcomRecord $grec, $size = 'small'){
-	    $html = '';
-	    if($grec instanceof \Fisharebest\Webtrees\Individual){
-	        $dindi = new Individual($grec);
-	        $html .= FunctionsPrint::formatIsSourcedIcon('R', $dindi->isSourced(), 'INDI', 1, $size);
-	        $html .= FunctionsPrint::formatIsSourcedIcon('E', $dindi->isBirthSourced(), 'BIRT', 1, $size);
-	        if($grec->isDead())
-	            $html .= FunctionsPrint::formatIsSourcedIcon('E', $dindi->isDeathSourced(), 'DEAT', 1, $size);
-	    }
-	    return $html;
+		$html = '';
+		if($grec instanceof \Fisharebest\Webtrees\Individual){
+			$dindi = new Individual($grec);
+			$html .= FunctionsPrint::formatIsSourcedIcon('R', $dindi->isSourced(), 'INDI', 1, $size);
+			$html .= FunctionsPrint::formatIsSourcedIcon('E', $dindi->isBirthSourced(), 'BIRT', 1, $size);
+			if($grec->isDead())
+				$html .= FunctionsPrint::formatIsSourcedIcon('E', $dindi->isDeathSourced(), 'DEAT', 1, $size);
+		}
+		return $html;
 	}
 	
 	/**
@@ -112,7 +112,7 @@ 
 	 * @see \Fisharebest\Webtrees\Module\ModuleSidebarInterface::defaultSidebarOrder()
 	 */
 	public function defaultSidebarOrder() {
-	    return 15;
+		return 15;
 	}
 	
 	/**
@@ -120,7 +120,7 @@ 
 	 * @see \Fisharebest\Webtrees\Module\ModuleSidebarInterface::hasSidebarContent()
 	 */
 	public function hasSidebarContent(){ 
-	    return true;
+		return true;
 	}
 	
 	/**
@@ -128,7 +128,7 @@ 
 	 * @see \Fisharebest\Webtrees\Module\ModuleSidebarInterface::getSidebarAjaxContent()
 	 */
 	public function getSidebarAjaxContent() {
-	    return '';
+		return '';
 	}
 	
 	/**
@@ -136,15 +136,15 @@ 
 	 * @see \Fisharebest\Webtrees\Module\ModuleSidebarInterface::getSidebarContent()
 	 */
 	public function getSidebarContent() {
-	    ob_start();
-	    $root = Globals::getController()->getSignificantIndividual();
-	    if ($root) {
-	        $dindi = new Individual($root);
+		ob_start();
+		$root = Globals::getController()->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/Certificates/CertificateController.php

Indentation +152 added lines, -152 removed lines

@@ -33,155 +33,155 @@ 
  */
 class CertificateController extends MvcController
 {
-    /**
-     * Certificate Provider
-     * @var CertificateProviderInterface $provider
-     */
-    protected $provider;
+	/**
+	 * Certificate Provider
+	 * @var CertificateProviderInterface $provider
+	 */
+	protected $provider;
     
-    /**
-     * Constructor for Certificate controller
-     * @param AbstractModule $module
-     */
-    public function __construct(AbstractModule $module) {
-        parent::__construct($module);
-        
-        $this->provider = $this->module->getProvider();
-    }
+	/**
+	 * Constructor for Certificate controller
+	 * @param AbstractModule $module
+	 */
+	public function __construct(AbstractModule $module) {
+		parent::__construct($module);
+        
+		$this->provider = $this->module->getProvider();
+	}
     
     
-    /**
-     * Pages
-     */
-        
-    /**
-     * Certificate@index
-     */
-    public function index() {        
-        $tree = Globals::getTree();
-        $controller = new PageController();
-        $controller
-        ->setPageTitle(I18N::translate('Certificate'))
-        ->restrictAccess(
-            $this->module->getSetting('MAJ_SHOW_CERT', Auth::PRIV_HIDE) >= Auth::accessLevel($tree)
-        );
-        
-        $cid = Filter::get('cid');
-        
-        $certificate = null;
-        if(!empty($cid) && strlen($cid) > 22){
-            $certificate = Certificate::getInstance($cid, $tree, null, $this->provider);
-        }
-        
-        $data = new ViewBag();
-        $data->set('title', $controller->getPageTitle());
-        
-        $data->set('has_certif', false);
-        if($certificate) {
-            $controller->restrictAccess($certificate->canShow());
-            $data->set('title', $certificate->getTitle());
-            $data->set('has_certif', true);
-            $data->set('certificate', $certificate);
+	/**
+	 * Pages
+	 */
+        
+	/**
+	 * Certificate@index
+	 */
+	public function index() {        
+		$tree = Globals::getTree();
+		$controller = new PageController();
+		$controller
+		->setPageTitle(I18N::translate('Certificate'))
+		->restrictAccess(
+			$this->module->getSetting('MAJ_SHOW_CERT', Auth::PRIV_HIDE) >= Auth::accessLevel($tree)
+		);
+        
+		$cid = Filter::get('cid');
+        
+		$certificate = null;
+		if(!empty($cid) && strlen($cid) > 22){
+			$certificate = Certificate::getInstance($cid, $tree, null, $this->provider);
+		}
+        
+		$data = new ViewBag();
+		$data->set('title', $controller->getPageTitle());
+        
+		$data->set('has_certif', false);
+		if($certificate) {
+			$controller->restrictAccess($certificate->canShow());
+			$data->set('title', $certificate->getTitle());
+			$data->set('has_certif', true);
+			$data->set('certificate', $certificate);
             
-            $data->set(
-                'url_certif_city', 
-                'module.php?mod=' . Constants::MODULE_MAJ_CERTIF_NAME . 
-                    '&mod_action=Certificate@listAll' .
-                    '&ged=' . $tree->getNameUrl() .
-                    '&city=' . Functions::encryptToSafeBase64($certificate->getCity())
-            );
+			$data->set(
+				'url_certif_city', 
+				'module.php?mod=' . Constants::MODULE_MAJ_CERTIF_NAME . 
+					'&mod_action=Certificate@listAll' .
+					'&ged=' . $tree->getNameUrl() .
+					'&city=' . Functions::encryptToSafeBase64($certificate->getCity())
+			);
             
-            $controller->addInlineJavascript('
+			$controller->addInlineJavascript('
                 jQuery("#certificate-tabs").tabs();
 			    jQuery("#certificate-tabs").css("visibility", "visible");    
             ');
             
-            $data->set('has_linked_indis', false);
-            $data->set('has_linked_fams', false);
+			$data->set('has_linked_indis', false);
+			$data->set('has_linked_fams', false);
             
-            $linked_indis = $certificate->linkedIndividuals();
-            $linked_fams = $certificate->linkedFamilies();
+			$linked_indis = $certificate->linkedIndividuals();
+			$linked_fams = $certificate->linkedFamilies();
                         
-            if($linked_indis && count($linked_indis) > 0) {
-                $data->set('has_linked_indis', true);
-                $data->set('linked_indis', $linked_indis);
-            }
+			if($linked_indis && count($linked_indis) > 0) {
+				$data->set('has_linked_indis', true);
+				$data->set('linked_indis', $linked_indis);
+			}
             
-            if(!empty($linked_fams)) {
-                $data->set('has_linked_fams', true);
-                $data->set('linked_fams', $linked_fams);
-            }
-        }
-        
-        ViewFactory::make('Certificate', $this, $controller, $data)->render();
-    }
+			if(!empty($linked_fams)) {
+				$data->set('has_linked_fams', true);
+				$data->set('linked_fams', $linked_fams);
+			}
+		}
+        
+		ViewFactory::make('Certificate', $this, $controller, $data)->render();
+	}
     
-    /**
-     * Certificate@image
-     */
-    public function image() {
-        $tree = Globals::getTree();
-        $cid   = Filter::get('cid');
-        $certificate = null;
-        if(!empty($cid)) $certificate =  Certificate::getInstance($cid, $tree, null, $this->provider);
-        
-        $imageBuilder = new ImageBuilder($certificate);
-        
-        if (!empty(Filter::get('cb'))) {
-            $imageBuilder->setExpireOffset($imageBuilder->getExpireOffset() * 7);
-        }
-        
-        $imageBuilder
-            ->setShowWatermark(Auth::accessLevel($tree) >= $this->module->getSetting('MAJ_SHOW_NO_WATERMARK', Auth::PRIV_HIDE))
-            ->setFontMaxSize($this->module->getSetting('MAJ_WM_FONT_MAXSIZE', 18))
-            ->setFontColor($this->module->getSetting('MAJ_WM_FONT_COLOR', '#4D6DF3'))
-        ;
-        
-        $imageBuilder->render();
-        
-    }
+	/**
+	 * Certificate@image
+	 */
+	public function image() {
+		$tree = Globals::getTree();
+		$cid   = Filter::get('cid');
+		$certificate = null;
+		if(!empty($cid)) $certificate =  Certificate::getInstance($cid, $tree, null, $this->provider);
+        
+		$imageBuilder = new ImageBuilder($certificate);
+        
+		if (!empty(Filter::get('cb'))) {
+			$imageBuilder->setExpireOffset($imageBuilder->getExpireOffset() * 7);
+		}
+        
+		$imageBuilder
+			->setShowWatermark(Auth::accessLevel($tree) >= $this->module->getSetting('MAJ_SHOW_NO_WATERMARK', Auth::PRIV_HIDE))
+			->setFontMaxSize($this->module->getSetting('MAJ_WM_FONT_MAXSIZE', 18))
+			->setFontColor($this->module->getSetting('MAJ_WM_FONT_COLOR', '#4D6DF3'))
+		;
+        
+		$imageBuilder->render();
+        
+	}
     
-    /**
-     * Certificate@listAll
-     */
-    public function listAll() {
-        $tree = Globals::getTree();
-        $controller = new PageController();
-        $controller
-            ->setPageTitle(I18N::translate('Certificates'))
-            ->restrictAccess(
-                $this->module->getSetting('MAJ_SHOW_CERT', Auth::PRIV_HIDE) >= Auth::accessLevel($tree)
-            );
-        
-        $city = Filter::get('city');
-        
-        if(!empty($city) && strlen($city) > 22){
-            $city = Functions::decryptFromSafeBase64($city);
-            $controller->setPageTitle(I18N::translate('Certificates for %s', $city));
-        }
-        
-        $data = new ViewBag();
-        $data->set('title', $controller->getPageTitle());
-        $data->set('url_module', $this->module->getName());
-        $data->set('url_action', 'Certificate@listAll');
-        $data->set('url_ged', $tree->getNameUrl());
-        
-        $data->set('cities', $this->provider->getCitiesList());
-        $data->set('selected_city', $city);
-        
-        $data->set('has_list', false);        
-        if(!empty($city)) {            
-            $table_id = 'table-certiflist-' . Uuid::uuid4();
+	/**
+	 * Certificate@listAll
+	 */
+	public function listAll() {
+		$tree = Globals::getTree();
+		$controller = new PageController();
+		$controller
+			->setPageTitle(I18N::translate('Certificates'))
+			->restrictAccess(
+				$this->module->getSetting('MAJ_SHOW_CERT', Auth::PRIV_HIDE) >= Auth::accessLevel($tree)
+			);
+        
+		$city = Filter::get('city');
+        
+		if(!empty($city) && strlen($city) > 22){
+			$city = Functions::decryptFromSafeBase64($city);
+			$controller->setPageTitle(I18N::translate('Certificates for %s', $city));
+		}
+        
+		$data = new ViewBag();
+		$data->set('title', $controller->getPageTitle());
+		$data->set('url_module', $this->module->getName());
+		$data->set('url_action', 'Certificate@listAll');
+		$data->set('url_ged', $tree->getNameUrl());
+        
+		$data->set('cities', $this->provider->getCitiesList());
+		$data->set('selected_city', $city);
+        
+		$data->set('has_list', false);        
+		if(!empty($city)) {            
+			$table_id = 'table-certiflist-' . Uuid::uuid4();
             
-            $certif_list = $this->provider->getCertificatesList($city);            
-            if(!empty($certif_list)) {                
-                $data->set('has_list', true);
-                $data->set('table_id', $table_id);
-                $data->set('certificate_list', $certif_list);
+			$certif_list = $this->provider->getCertificatesList($city);            
+			if(!empty($certif_list)) {                
+				$data->set('has_list', true);
+				$data->set('table_id', $table_id);
+				$data->set('certificate_list', $certif_list);
                 
-                $controller
-                    ->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
-                    ->addInlineJavascript('
+				$controller
+					->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
+					->addInlineJavascript('
 				        jQuery.fn.dataTableExt.oSort["text-asc"] = textCompareAsc;
 				        jQuery.fn.dataTableExt.oSort["text-desc"] = textCompareDesc;
                         
@@ -203,28 +203,28 @@ 
         				jQuery(".certificate-list").css("visibility", "visible");
         				jQuery(".loading-image").css("display", "none");
                     ');
-            }
-        }
+			}
+		}
         
-        ViewFactory::make('CertificatesList', $this, $controller, $data)->render();
+		ViewFactory::make('CertificatesList', $this, $controller, $data)->render();
         
-    }
+	}
     
-    /**
-     * Certificate@autocomplete
-     */
-    public function autocomplete() {
-        $tree = Globals::getTree();
-        $controller = new JsonController();
-        
-        $city = Filter::get('city');
-        $contains = Filter::get('term');        
+	/**
+	 * Certificate@autocomplete
+	 */
+	public function autocomplete() {
+		$tree = Globals::getTree();
+		$controller = new JsonController();
+        
+		$city = Filter::get('city');
+		$contains = Filter::get('term');        
 
-        $controller
-            ->restrictAccess(Auth::isEditor($tree) && !empty($city) && !empty($contains))
-            ->pageHeader();
+		$controller
+			->restrictAccess(Auth::isEditor($tree) && !empty($city) && !empty($contains))
+			->pageHeader();
         
-        $listCert = $this->provider->getCertificatesListBeginWith($city, $contains); 
-        $controller->encode($listCert);
-    }
+		$listCert = $this->provider->getCertificatesListBeginWith($city, $contains); 
+		$controller->encode($listCert);
+	}
 }
\ No newline at end of file

Spacing +15 added lines, -15 removed lines

@@ -69,7 +69,7 @@ 
         $cid = Filter::get('cid');
         
         $certificate = null;
-        if(!empty($cid) && strlen($cid) > 22){
+        if (!empty($cid) && strlen($cid) > 22) {
             $certificate = Certificate::getInstance($cid, $tree, null, $this->provider);
         }
         
@@ -77,7 +77,7 @@ 
         $data->set('title', $controller->getPageTitle());
         
         $data->set('has_certif', false);
-        if($certificate) {
+        if ($certificate) {
             $controller->restrictAccess($certificate->canShow());
             $data->set('title', $certificate->getTitle());
             $data->set('has_certif', true);
@@ -85,10 +85,10 @@ 
             
             $data->set(
                 'url_certif_city', 
-                'module.php?mod=' . Constants::MODULE_MAJ_CERTIF_NAME . 
-                    '&mod_action=Certificate@listAll' .
-                    '&ged=' . $tree->getNameUrl() .
-                    '&city=' . Functions::encryptToSafeBase64($certificate->getCity())
+                'module.php?mod='.Constants::MODULE_MAJ_CERTIF_NAME. 
+                    '&mod_action=Certificate@listAll'.
+                    '&ged='.$tree->getNameUrl().
+                    '&city='.Functions::encryptToSafeBase64($certificate->getCity())
             );
             
             $controller->addInlineJavascript('
@@ -102,12 +102,12 @@ 
             $linked_indis = $certificate->linkedIndividuals();
             $linked_fams = $certificate->linkedFamilies();
                         
-            if($linked_indis && count($linked_indis) > 0) {
+            if ($linked_indis && count($linked_indis) > 0) {
                 $data->set('has_linked_indis', true);
                 $data->set('linked_indis', $linked_indis);
             }
             
-            if(!empty($linked_fams)) {
+            if (!empty($linked_fams)) {
                 $data->set('has_linked_fams', true);
                 $data->set('linked_fams', $linked_fams);
             }
@@ -121,9 +121,9 @@ 
      */
     public function image() {
         $tree = Globals::getTree();
-        $cid   = Filter::get('cid');
+        $cid = Filter::get('cid');
         $certificate = null;
-        if(!empty($cid)) $certificate =  Certificate::getInstance($cid, $tree, null, $this->provider);
+        if (!empty($cid)) $certificate = Certificate::getInstance($cid, $tree, null, $this->provider);
         
         $imageBuilder = new ImageBuilder($certificate);
         
@@ -155,7 +155,7 @@ 
         
         $city = Filter::get('city');
         
-        if(!empty($city) && strlen($city) > 22){
+        if (!empty($city) && strlen($city) > 22) {
             $city = Functions::decryptFromSafeBase64($city);
             $controller->setPageTitle(I18N::translate('Certificates for %s', $city));
         }
@@ -170,11 +170,11 @@ 
         $data->set('selected_city', $city);
         
         $data->set('has_list', false);        
-        if(!empty($city)) {            
-            $table_id = 'table-certiflist-' . Uuid::uuid4();
+        if (!empty($city)) {            
+            $table_id = 'table-certiflist-'.Uuid::uuid4();
             
             $certif_list = $this->provider->getCertificatesList($city);            
-            if(!empty($certif_list)) {                
+            if (!empty($certif_list)) {                
                 $data->set('has_list', true);
                 $data->set('table_id', $table_id);
                 $data->set('certificate_list', $certif_list);
@@ -186,7 +186,7 @@ 
 				        jQuery.fn.dataTableExt.oSort["text-desc"] = textCompareDesc;
                         
                         jQuery("#'.$table_id.'").dataTable( {
-        					dom: \'<"H"<"filtersH_' . $table_id . '">T<"dt-clear">pf<"dt-clear">irl>t<"F"pl<"dt-clear"><"filtersF_' . $table_id . '">>\',
+        					dom: \'<"H"<"filtersH_' . $table_id.'">T<"dt-clear">pf<"dt-clear">irl>t<"F"pl<"dt-clear"><"filtersF_'.$table_id.'">>\',
     					    '.I18N::datatablesI18N().',
     					    jQueryUI: true,
         					autoWidth: false,

Braces +3 added lines, -1 removed lines

@@ -123,7 +123,9 @@
         $tree = Globals::getTree();
         $cid   = Filter::get('cid');
         $certificate = null;
-        if(!empty($cid)) $certificate =  Certificate::getInstance($cid, $tree, null, $this->provider);
+        if(!empty($cid)) {
+        	$certificate =  Certificate::getInstance($cid, $tree, null, $this->provider);
+        }
         
         $imageBuilder = new ImageBuilder($certificate);