jon48 / webtrees-lib

src/Webtrees/Module/AdminTasksModule.php

Indentation +84 added lines, -84 removed lines

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

Spacing +2 added lines, -2 removed lines

@@ -67,7 +67,7 @@ 
     public function getConfigLink() {
         Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
         
-        return 'module.php?mod=' . $this->getName() . '&mod_action=AdminConfig';
+        return 'module.php?mod='.$this->getName().'&mod_action=AdminConfig';
     }
     
     /**
@@ -129,7 +129,7 @@ 
 	 * @return \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskProviderInterface
 	 */
     public function getProvider() {        
-        if(!$this->provider) {
+        if (!$this->provider) {
             $this->provider = new TaskProvider(WT_ROOT.WT_MODULES_DIR.$this->getName().'/tasks/');
         }
         return $this->provider;

src/Webtrees/Module/ModuleMenuItemInterface.php

Indentation +7 added lines, -7 removed lines

@@ -15,11 +15,11 @@
  */
 interface ModuleMenuItemInterface
 {
-    /**
-     * Returns a menu item for the module.
-     * 
-     * @param \Fisharebest\Webtrees\Tree|null $tree
-     * @param mixed $reference
-     */
-    public function getMenu(\Fisharebest\Webtrees\Tree $tree, $reference);
+	/**
+	 * Returns a menu item for the module.
+	 * 
+	 * @param \Fisharebest\Webtrees\Tree|null $tree
+	 * @param mixed $reference
+	 */
+	public function getMenu(\Fisharebest\Webtrees\Tree $tree, $reference);
 }
\ No newline at end of file

src/Webtrees/Module/AdminTasks/Model/ConfigurableTaskInterface.php

Indentation +5 added lines, -5 removed lines

@@ -15,11 +15,11 @@
  */
 interface ConfigurableTaskInterface {
     
-    /**
-     * Returns the HTML code to display the specific task configuration.
-     * 
-     * @return string HTML code
-     */
+	/**
+	 * Returns the HTML code to display the specific task configuration.
+	 * 
+	 * @return string HTML code
+	 */
 	function htmlConfigForm();
 	
 	/**

src/Webtrees/Module/AdminTasks/Model/TaskProvider.php

Indentation +147 added lines, -147 removed lines

@@ -20,32 +20,32 @@ 
  */
 class TaskProvider implements TaskProviderInterface {
     
-    /**
-     * Root path of thr folder containing the tasks
-     * @var string $root_path
-     */
-    protected $root_path;
+	/**
+	 * Root path of thr folder containing the tasks
+	 * @var string $root_path
+	 */
+	protected $root_path;
 	    
-    /**
-     * Constructor for the Task provider
-     * @param string $root_path
-     */
-    public function __construct($root_path) {
-        $this->root_path = $root_path;
+	/**
+	 * Constructor for the Task provider
+	 * @param string $root_path
+	 */
+	public function __construct($root_path) {
+		$this->root_path = $root_path;
 		$this->all_tasks = null;
-    }
+	}
 	
-    /**
-     * Load a task object from a file.
-     * 
-     * @param string $task_name Name of the task to load.
-     */
+	/**
+	 * Load a task object from a file.
+	 * 
+	 * @param string $task_name Name of the task to load.
+	 */
 	protected function loadTask($task_name) {
 		try {
 			if (file_exists($this->root_path . $task_name .'.php')) {
 				$task = include $this->root_path . $task_name .'.php';
 				if($task instanceof AbstractTask) {
-				    $task->setProvider($this);
+					$task->setProvider($this);
 					return $task;
 				}
 			}
@@ -55,22 +55,22 @@ 
 		return null;
 	}
 	
-    /**
-     * Creates and returns a Task object from a data row.
-     * The row data is expected to be an array with the indexes:
-     *  - majat_name: task name
-     *  - majat_status: task status
-     *  - majat_last_run: last run time
-     *  - majat_last_result: last run result
-     *  - majat_frequency: run frequency
-     *  - majat_nb_occur: remaining running occurrences
-     *  - majat_running: is task running
-     *
-     * @param array $row
-     * @return AbstractTask|null
-     */
-    protected function loadTaskFromRow($row) {
-        $task = $this->loadTask($row['majat_name']);
+	/**
+	 * Creates and returns a Task object from a data row.
+	 * The row data is expected to be an array with the indexes:
+	 *  - majat_name: task name
+	 *  - majat_status: task status
+	 *  - majat_last_run: last run time
+	 *  - majat_last_result: last run result
+	 *  - majat_frequency: run frequency
+	 *  - majat_nb_occur: remaining running occurrences
+	 *  - majat_running: is task running
+	 *
+	 * @param array $row
+	 * @return AbstractTask|null
+	 */
+	protected function loadTaskFromRow($row) {
+		$task = $this->loadTask($row['majat_name']);
         
 		if($task) {
 			$task->setParameters(
@@ -85,99 +85,99 @@ 
 			return $task;
 		}
 		else {
-		    $this->deleteTask($row['majat_name']);
+			$this->deleteTask($row['majat_name']);
 		}
 		return null;
-    }
+	}
     
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskProviderInterface::getTask()
-     */
-    public function getTask($task_name, $only_enabled = true) {
-        $args = array (
-            'task_name' => $task_name
-        );
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskProviderInterface::getTask()
+	 */
+	public function getTask($task_name, $only_enabled = true) {
+		$args = array (
+			'task_name' => $task_name
+		);
     
-        $sql = 'SELECT majat_name, majat_status, majat_last_run, majat_last_result, majat_frequency, majat_nb_occur, majat_running' .
-            ' FROM `##maj_admintasks`' .
-            ' WHERE majat_name = :task_name';
-        if($only_enabled) {
-            $sql .= ' AND majat_status = :status';
-            $args['status'] = 'enabled';
-        }
+		$sql = 'SELECT majat_name, majat_status, majat_last_run, majat_last_result, majat_frequency, majat_nb_occur, majat_running' .
+			' FROM `##maj_admintasks`' .
+			' WHERE majat_name = :task_name';
+		if($only_enabled) {
+			$sql .= ' AND majat_status = :status';
+			$args['status'] = 'enabled';
+		}
     
-        $task_array = Database::prepare($sql)->execute($args)->fetchOneRow(\PDO::FETCH_ASSOC);
+		$task_array = Database::prepare($sql)->execute($args)->fetchOneRow(\PDO::FETCH_ASSOC);
     
-        if($task_array) {
-            return $this->loadTaskFromRow($task_array);
-        }
+		if($task_array) {
+			return $this->loadTaskFromRow($task_array);
+		}
     
-        return null;
-    }
+		return null;
+	}
     
 	/**
 	 * {@inheritDoc}
 	 * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskProviderInterface::setTaskStatus()
 	 */
-    public function setTaskStatus(AbstractTask $task, $status) {
-        Database::prepare(
-            'UPDATE `##maj_admintasks`'.
-            ' SET majat_status = :status'.
-            ' WHERE majat_name = :name'
-        )->execute(array(
-                'name' => $task->getName(),
+	public function setTaskStatus(AbstractTask $task, $status) {
+		Database::prepare(
+			'UPDATE `##maj_admintasks`'.
+			' SET majat_status = :status'.
+			' WHERE majat_name = :name'
+		)->execute(array(
+				'name' => $task->getName(),
 				'status' => $status ? 'enabled' : 'disabled'
-        ));
-    }
+		));
+	}
 	
    /**
     * {@inheritDoc}
     * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskProviderInterface::updateTask()
     */
-    public function updateTask(AbstractTask $task) {        
-        try{
-            Database::prepare(
-                'UPDATE `##maj_admintasks`'.
-                ' SET majat_status = :status,'.
-                ' majat_last_run = :last_run,'.
-                ' majat_last_result = :last_result,'.
-                ' majat_frequency = :frequency,'.
-                ' majat_nb_occur = :nb_occurrences,'.
-                ' majat_running = :is_running'.
-                ' WHERE majat_name = :name'
-                )->execute(array(
-                    'name' => $task->getName(),
-                    'status' => $task->isEnabled() ? 'enabled' : 'disabled',
-                    'last_run' => $task->getLastUpdated()->format('Y-m-d H:i:s'),
-                    'last_result' =>  $task->isLastRunSuccess() ? 1 : 0,
-                    'frequency' => $task->getFrequency(),
-                    'nb_occurrences' => $task->getRemainingOccurrences(),
-                    'is_running' => $task->isRunning() ? 1 : 0
-                ));
-            return true;
-        }
-        catch (\Exception $ex) {
-            Log::addErrorLog(sprintf('Error while updating the Admin Task %s. Exception: %s', $task->getName(), $ex->getMessage()));
-            return false;
-        }        
-    }
+	public function updateTask(AbstractTask $task) {        
+		try{
+			Database::prepare(
+				'UPDATE `##maj_admintasks`'.
+				' SET majat_status = :status,'.
+				' majat_last_run = :last_run,'.
+				' majat_last_result = :last_result,'.
+				' majat_frequency = :frequency,'.
+				' majat_nb_occur = :nb_occurrences,'.
+				' majat_running = :is_running'.
+				' WHERE majat_name = :name'
+				)->execute(array(
+					'name' => $task->getName(),
+					'status' => $task->isEnabled() ? 'enabled' : 'disabled',
+					'last_run' => $task->getLastUpdated()->format('Y-m-d H:i:s'),
+					'last_result' =>  $task->isLastRunSuccess() ? 1 : 0,
+					'frequency' => $task->getFrequency(),
+					'nb_occurrences' => $task->getRemainingOccurrences(),
+					'is_running' => $task->isRunning() ? 1 : 0
+				));
+			return true;
+		}
+		catch (\Exception $ex) {
+			Log::addErrorLog(sprintf('Error while updating the Admin Task %s. Exception: %s', $task->getName(), $ex->getMessage()));
+			return false;
+		}        
+	}
 	
 	/**
 	 * {@inheritDoc}
 	 * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskProviderInterface::getTasksCount()
 	 */
-    public function getTasksCount() {
-        return Database::prepare(
-            'SELECT COUNT(majat_name)' .
-            ' FROM `##maj_admintasks`'
-            )->execute()->fetchOne();
-    }
+	public function getTasksCount() {
+		return Database::prepare(
+			'SELECT COUNT(majat_name)' .
+			' FROM `##maj_admintasks`'
+			)->execute()->fetchOne();
+	}
 	
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskProviderInterface::getTasksToRun()
-     */
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskProviderInterface::getTasksToRun()
+	 */
 	public function getTasksToRun($force = false, $task_name = null) 
 	{
 		$res = array();
@@ -206,12 +206,12 @@ 
 		$data = Database::prepare($sql)->execute($args)->fetchAll(\PDO::FETCH_ASSOC);
 		
 		foreach($data as $task_row) {
-            $task = $this->loadTaskFromRow($task_row);
+			$task = $this->loadTaskFromRow($task_row);
 			if($task)
 			{
 				$res[] = $task;
 			} 
-        }
+		}
 		
 		return $res;	
 	}
@@ -220,69 +220,69 @@ 
 	 * {@inheritDoc}
 	 * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskProviderInterface::getFilteredTasksList()
 	 */
-    public function getFilteredTasksList($search = null, $order_by = null, $start = 0, $limit = null){
-        $res = array();
+	public function getFilteredTasksList($search = null, $order_by = null, $start = 0, $limit = null){
+		$res = array();
             
-        $sql = 'SELECT majat_name, majat_status, majat_last_run, majat_last_result, majat_frequency, majat_nb_occur, majat_running' .
-            ' FROM `##maj_admintasks`';
+		$sql = 'SELECT majat_name, majat_status, majat_last_run, majat_last_result, majat_frequency, majat_nb_occur, majat_running' .
+			' FROM `##maj_admintasks`';
         
-        $args = array();
+		$args = array();
                 
-        if ($order_by) {
-            $sql .= ' ORDER BY ';
-            $i = 0;
-            foreach ($order_by as $key => $value) {
-                if ($i > 0) {
-                    $sql .= ',';
-                }
+		if ($order_by) {
+			$sql .= ' ORDER BY ';
+			$i = 0;
+			foreach ($order_by as $key => $value) {
+				if ($i > 0) {
+					$sql .= ',';
+				}
                 
-                switch ($value['dir']) {
-                    case 'asc':
-                        $sql .= $value['column'] . ' ASC ';
-                        break;
-                    case 'desc':
-                        $sql .= $value['column'] . ' DESC ';
-                        break;
-                }
-                $i++;
-            }
-        } else {
-            $sql .= ' ORDER BY majat_name ASC';
-        }
+				switch ($value['dir']) {
+					case 'asc':
+						$sql .= $value['column'] . ' ASC ';
+						break;
+					case 'desc':
+						$sql .= $value['column'] . ' DESC ';
+						break;
+				}
+				$i++;
+			}
+		} else {
+			$sql .= ' ORDER BY majat_name ASC';
+		}
         
-        if ($limit) {
-            $sql .= ' LIMIT :limit OFFSET :offset';
-            $args['limit']  = $limit;
-            $args['offset'] = $start;
-        }
+		if ($limit) {
+			$sql .= ' LIMIT :limit OFFSET :offset';
+			$args['limit']  = $limit;
+			$args['offset'] = $start;
+		}
             
-        $data = Database::prepare($sql)->execute($args)->fetchAll(\PDO::FETCH_ASSOC);
+		$data = Database::prepare($sql)->execute($args)->fetchAll(\PDO::FETCH_ASSOC);
 
-        foreach($data as $ga) {
-            $task = $this->loadTaskFromRow($ga);
+		foreach($data as $ga) {
+			$task = $this->loadTaskFromRow($ga);
 			if($task && (empty($search) || ($search && strpos($task->getTitle(), $search) !== false)))
 			{
 				$res[] = $task;
 			}
-        }
+		}
 		
-        return $res;
-    }
+		return $res;
+	}
 	
 	
-    /**
-     * {inhericDoc}
-     * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskProviderInterface::getInstalledTasks()
-     */
+	/**
+	 * {inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskProviderInterface::getInstalledTasks()
+	 */
 	public function getInstalledTasks() {
 		$tasks=array();
 		$dir=opendir($this->root_path);
 		while (($file=readdir($dir))!==false){ 
 			try {
-			    if($file == '.' || $file == '..') continue;
+				if($file == '.' || $file == '..') continue;
 				$task = include $this->root_path . $file;
 				if($task ) {
-				    $task->setProvider($this);
+					$task->setProvider($this);
 					Database::prepare(
 						'INSERT IGNORE INTO `##maj_admintasks`'.
 						' (majat_name, majat_status, majat_frequency)'.

Spacing +34 added lines, -34 removed lines

@@ -42,15 +42,15 @@ 
      */
 	protected function loadTask($task_name) {
 		try {
-			if (file_exists($this->root_path . $task_name .'.php')) {
-				$task = include $this->root_path . $task_name .'.php';
-				if($task instanceof AbstractTask) {
+			if (file_exists($this->root_path.$task_name.'.php')) {
+				$task = include $this->root_path.$task_name.'.php';
+				if ($task instanceof AbstractTask) {
 				    $task->setProvider($this);
 					return $task;
 				}
 			}
 		}
-		catch(\Exception $ex) { }
+		catch (\Exception $ex) { }
 		
 		return null;
 	}
@@ -72,7 +72,7 @@ 
     protected function loadTaskFromRow($row) {
         $task = $this->loadTask($row['majat_name']);
         
-		if($task) {
+		if ($task) {
 			$task->setParameters(
 				$row['majat_status'] == 'enabled',
 				new \DateTime($row['majat_last_run']), 
@@ -95,21 +95,21 @@ 
      * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskProviderInterface::getTask()
      */
     public function getTask($task_name, $only_enabled = true) {
-        $args = array (
+        $args = array(
             'task_name' => $task_name
         );
     
-        $sql = 'SELECT majat_name, majat_status, majat_last_run, majat_last_result, majat_frequency, majat_nb_occur, majat_running' .
-            ' FROM `##maj_admintasks`' .
+        $sql = 'SELECT majat_name, majat_status, majat_last_run, majat_last_result, majat_frequency, majat_nb_occur, majat_running'.
+            ' FROM `##maj_admintasks`'.
             ' WHERE majat_name = :task_name';
-        if($only_enabled) {
+        if ($only_enabled) {
             $sql .= ' AND majat_status = :status';
             $args['status'] = 'enabled';
         }
     
         $task_array = Database::prepare($sql)->execute($args)->fetchOneRow(\PDO::FETCH_ASSOC);
     
-        if($task_array) {
+        if ($task_array) {
             return $this->loadTaskFromRow($task_array);
         }
     
@@ -136,7 +136,7 @@ 
     * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskProviderInterface::updateTask()
     */
     public function updateTask(AbstractTask $task) {        
-        try{
+        try {
             Database::prepare(
                 'UPDATE `##maj_admintasks`'.
                 ' SET majat_status = :status,'.
@@ -169,7 +169,7 @@ 
 	 */
     public function getTasksCount() {
         return Database::prepare(
-            'SELECT COUNT(majat_name)' .
+            'SELECT COUNT(majat_name)'.
             ' FROM `##maj_admintasks`'
             )->execute()->fetchOne();
     }
@@ -194,20 +194,20 @@ 
 			'time_out' => AbstractTask::TASK_TIME_OUT		
 		);
 		
-		if(!$force) {
+		if (!$force) {
 			$sql .= ' AND (DATE_ADD(majat_last_run, INTERVAL majat_frequency MINUTE) <= NOW() OR majat_last_result = 0)';
 		}
 		
-		if($task_name) {
+		if ($task_name) {
 			$sql .= ' AND majat_name = :task_name';
 			$args['task_name'] = $task_name;
 		}
 		
 		$data = Database::prepare($sql)->execute($args)->fetchAll(\PDO::FETCH_ASSOC);
 		
-		foreach($data as $task_row) {
+		foreach ($data as $task_row) {
             $task = $this->loadTaskFromRow($task_row);
-			if($task)
+			if ($task)
 			{
 				$res[] = $task;
 			} 
@@ -220,10 +220,10 @@ 
 	 * {@inheritDoc}
 	 * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskProviderInterface::getFilteredTasksList()
 	 */
-    public function getFilteredTasksList($search = null, $order_by = null, $start = 0, $limit = null){
+    public function getFilteredTasksList($search = null, $order_by = null, $start = 0, $limit = null) {
         $res = array();
             
-        $sql = 'SELECT majat_name, majat_status, majat_last_run, majat_last_result, majat_frequency, majat_nb_occur, majat_running' .
+        $sql = 'SELECT majat_name, majat_status, majat_last_run, majat_last_result, majat_frequency, majat_nb_occur, majat_running'.
             ' FROM `##maj_admintasks`';
         
         $args = array();
@@ -238,10 +238,10 @@ 
                 
                 switch ($value['dir']) {
                     case 'asc':
-                        $sql .= $value['column'] . ' ASC ';
+                        $sql .= $value['column'].' ASC ';
                         break;
                     case 'desc':
-                        $sql .= $value['column'] . ' DESC ';
+                        $sql .= $value['column'].' DESC ';
                         break;
                 }
                 $i++;
@@ -258,9 +258,9 @@ 
             
         $data = Database::prepare($sql)->execute($args)->fetchAll(\PDO::FETCH_ASSOC);
 
-        foreach($data as $ga) {
+        foreach ($data as $ga) {
             $task = $this->loadTaskFromRow($ga);
-			if($task && (empty($search) || ($search && strpos($task->getTitle(), $search) !== false)))
+			if ($task && (empty($search) || ($search && strpos($task->getTitle(), $search) !== false)))
 			{
 				$res[] = $task;
 			}
@@ -275,13 +275,13 @@ 
      * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskProviderInterface::getInstalledTasks()
      */
 	public function getInstalledTasks() {
-		$tasks=array();
-		$dir=opendir($this->root_path);
-		while (($file=readdir($dir))!==false){ 
+		$tasks = array();
+		$dir = opendir($this->root_path);
+		while (($file = readdir($dir)) !== false) { 
 			try {
-			    if($file == '.' || $file == '..') continue;
-				$task = include $this->root_path . $file;
-				if($task ) {
+			    if ($file == '.' || $file == '..') continue;
+				$task = include $this->root_path.$file;
+				if ($task) {
 				    $task->setProvider($this);
 					Database::prepare(
 						'INSERT IGNORE INTO `##maj_admintasks`'.
@@ -300,7 +300,7 @@ 
 				}
 			}
 			catch (\Exception $ex) {
-				Log::addErrorLog('An error occured while trying to load the task in file ' . $file . '. Exception: ' . $ex->getMessage());
+				Log::addErrorLog('An error occured while trying to load the task in file '.$file.'. Exception: '.$ex->getMessage());
 			}
 		}
 		return $tasks;
@@ -311,14 +311,14 @@ 
 	 * {inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskProviderInterface::deleteTask()
 	 */
-	public function deleteTask($task_name){
-		try{
+	public function deleteTask($task_name) {
+		try {
 			Database::beginTransaction();
 			
 			Database::prepare('DELETE FROM  `##maj_admintasks` WHERE majat_name= :task_name')
 				->execute(array('task_name' => $task_name));
 			Database::prepare('DELETE FROM  `##gedcom_setting` WHERE setting_name LIKE :setting_name')
-				->execute(array('setting_name' => 'MAJ_AT_' . $task_name .'%'));
+				->execute(array('setting_name' => 'MAJ_AT_'.$task_name.'%'));
 				
 			Database::commit();
 			
@@ -326,10 +326,10 @@ 
 			
 			return true;
 		}
-		catch(\Exception $ex) {
+		catch (\Exception $ex) {
 			Database::rollback();
 		
-			Log::addErrorLog('An error occurred while deleting Admin Task '.$task_name.'. Exception: '. $ex->getMessage());
+			Log::addErrorLog('An error occurred while deleting Admin Task '.$task_name.'. Exception: '.$ex->getMessage());
 			return false;
 		}
 	}

Braces +9 added lines, -13 removed lines

@@ -49,8 +49,7 @@ 
 					return $task;
 				}
 			}
-		}
-		catch(\Exception $ex) { }
+		} catch(\Exception $ex) { }
 		
 		return null;
 	}
@@ -83,8 +82,7 @@ 
 				);
         
 			return $task;
-		}
-		else {
+		} else {
 		    $this->deleteTask($row['majat_name']);
 		}
 		return null;
@@ -156,8 +154,7 @@ 
                     'is_running' => $task->isRunning() ? 1 : 0
                 ));
             return true;
-        }
-        catch (\Exception $ex) {
+        } catch (\Exception $ex) {
             Log::addErrorLog(sprintf('Error while updating the Admin Task %s. Exception: %s', $task->getName(), $ex->getMessage()));
             return false;
         }        
@@ -279,7 +276,9 @@ 
 		$dir=opendir($this->root_path);
 		while (($file=readdir($dir))!==false){ 
 			try {
-			    if($file == '.' || $file == '..') continue;
+			    if($file == '.' || $file == '..') {
+			    	continue;
+			    }
 				$task = include $this->root_path . $file;
 				if($task ) {
 				    $task->setProvider($this);
@@ -294,12 +293,10 @@ 
 					));
 					
 					$tasks[] = $task;
-				}
-				else {
+				} else {
 					throw new \Exception;
 				}
-			}
-			catch (\Exception $ex) {
+			} catch (\Exception $ex) {
 				Log::addErrorLog('An error occured while trying to load the task in file ' . $file . '. Exception: ' . $ex->getMessage());
 			}
 		}
@@ -325,8 +322,7 @@ 
 			Log::addConfigurationLog('Admin Task '.$task_name.' has been deleted from disk - deleting it from DB');
 			
 			return true;
-		}
-		catch(\Exception $ex) {
+		} catch(\Exception $ex) {
 			Database::rollback();
 		
 			Log::addErrorLog('An error occurred while deleting Admin Task '.$task_name.'. Exception: '. $ex->getMessage());

src/Webtrees/Module/AdminTasks/Tasks/HealthCheckEmailTask.php

Indentation +21 added lines, -21 removed lines

@@ -29,11 +29,11 @@ 
  */
 class HealthCheckEmailTask extends AbstractTask implements ConfigurableTaskInterface {
     
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\AbstractTask::getTitle()
-     */
-    public function getTitle() {
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\AbstractTask::getTitle()
+	 */
+	public function getTitle() {
 		return I18N::translate('Healthcheck Email');
 	}
 	
@@ -41,7 +41,7 @@ 
 	 * {@inheritDoc}
 	 * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\AbstractTask::getDefaultFrequency()
 	 */
-    public function getDefaultFrequency() {
+	public function getDefaultFrequency() {
 		return 10080;  // = 1 week = 7 * 24 * 60 min
 	}
     
@@ -49,7 +49,7 @@ 
 	 * {@inheritDoc}
 	 * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\AbstractTask::executeSteps()
 	 */
-    protected function executeSteps() {
+	protected function executeSteps() {
 	
 		$res = false;		
 		
@@ -63,14 +63,14 @@ 
 		$interval = max($this->frequency, $interval_sincelast);
 		$nbdays = ceil($interval / (24 * 60));
 				
-        // Check for updates
-        $latest_version_txt = Functions::fetchLatestVersion();
-        if (preg_match('/^[0-9.]+\|[0-9.]+\|/', $latest_version_txt)) {
-        	list($latest_version, $earliest_version, $download_url) = explode('|', $latest_version_txt);
-        } else {
-        	// Cannot determine the latest version
-        	list($latest_version, $earliest_version, $download_url) = explode('|', '||');
-        }
+		// Check for updates
+		$latest_version_txt = Functions::fetchLatestVersion();
+		if (preg_match('/^[0-9.]+\|[0-9.]+\|/', $latest_version_txt)) {
+			list($latest_version, $earliest_version, $download_url) = explode('|', $latest_version_txt);
+		} else {
+			// Cannot determine the latest version
+			list($latest_version, $earliest_version, $download_url) = explode('|', '||');
+		}
 		
 		// Users statistics
 		$warnusers = 0;
@@ -213,15 +213,15 @@ 
 		$html = '
 			<div class="form-group">
     			<label class="control-label col-sm-3"> '.
-    				I18N::translate('Enable healthcheck emails for') .
-    			'</label>
+					I18N::translate('Enable healthcheck emails for') .
+				'</label>
     			<div class="col-sm-9">';
 
 		foreach(Tree::getAll() as $tree){
 			if(Auth::isManager($tree)){	
-			    $html .= '<div class="form-group row">
+				$html .= '<div class="form-group row">
 			        <span class="col-sm-3 control-label">' .
-			             $tree->getTitle() .
+						 $tree->getTitle() .
 					'</span>
 					 <div class="col-sm-2">';
 				$html .= FunctionsEdit::editFieldYesNo('HEALTHCHECK_ENABLED_' . $tree->getTreeId(), $tree->getPreference('MAJ_AT_'.$this->getName().'_ENABLED', 1), 'class="radio-inline"');
@@ -230,8 +230,8 @@ 
 		}
 		
 		$html .= '	<p class="small text-muted">'.
-    					I18N::translate('Enable the health check emails for each of the selected trees.') .
-    				'</p>
+						I18N::translate('Enable the health check emails for each of the selected trees.') .
+					'</p>
     			</div>
     		</div>';
 			

Spacing +22 added lines, -22 removed lines

@@ -42,7 +42,7 @@ 
 	 * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\AbstractTask::getDefaultFrequency()
 	 */
     public function getDefaultFrequency() {
-		return 10080;  // = 1 week = 7 * 24 * 60 min
+		return 10080; // = 1 week = 7 * 24 * 60 min
 	}
     
 	/**
@@ -55,9 +55,9 @@ 
 		
 		// Get the number of days to take into account, either last 7 days or since last check
 		$interval_sincelast = 0;
-		if($this->last_updated){
+		if ($this->last_updated) {
 			$tmpInt = $this->last_updated->diff(new \DateTime('now'), true);
-			$interval_sincelast = ( $tmpInt->days * 24  + $tmpInt->h ) * 60 + $tmpInt->i;
+			$interval_sincelast = ($tmpInt->days * 24 + $tmpInt->h) * 60 + $tmpInt->i;
 		}
 		
 		$interval = max($this->frequency, $interval_sincelast);
@@ -76,7 +76,7 @@ 
 		$warnusers = 0;
 		$nverusers = 0;
 		$applusers = 0;
-		foreach(User::all() as $user) {
+		foreach (User::all() as $user) {
 			if (((date("U") - (int)$user->getPreference('reg_timestamp')) > 604800) && !$user->getPreference('verified')) {
 				$warnusers++;
 			}
@@ -90,20 +90,20 @@ 
 		
 		// Tree specifics checks
 		$one_tree_done = false;
-		foreach(Tree::getAll() as $tree){
+		foreach (Tree::getAll() as $tree) {
 			$isTreeEnabled = $tree->getPreference('MAJ_AT_'.$this->getName().'_ENABLED');
-			if((is_null($isTreeEnabled) || $isTreeEnabled) && $webmaster = User::find($tree->getPreference('WEBMASTER_USER_ID'))){
+			if ((is_null($isTreeEnabled) || $isTreeEnabled) && $webmaster = User::find($tree->getPreference('WEBMASTER_USER_ID'))) {
 				I18N::init($webmaster->getPreference('language'));
 				
 				$subject = I18N::translate('Health Check Report').' - '.I18N::translate('Tree %s', $tree->getTitle());
 				$message = 
-					I18N::translate('Health Check Report for the last %d days', $nbdays). Mail::EOL. Mail::EOL.
+					I18N::translate('Health Check Report for the last %d days', $nbdays).Mail::EOL.Mail::EOL.
 					I18N::translate('Tree %s', $tree->getTitle()).Mail::EOL.
 					'=========================================='.Mail::EOL.Mail::EOL;
 				
 				// News
 				$message_version = '';
-				if($latest_version && version_compare(WT_VERSION, $latest_version)<0){
+				if ($latest_version && version_compare(WT_VERSION, $latest_version) < 0) {
 					$message_version = I18N::translate('News').Mail::EOL.
 							'-------------'.Mail::EOL.
 							I18N::translate('A new version of *webtrees* is available: %s. Upgrade as soon as possible.', $latest_version).Mail::EOL.
@@ -119,7 +119,7 @@ 
 						I18N::translate('Not verified by the user')."\t\t".$applusers.Mail::EOL.
 						I18N::translate('Not approved by an administrator')."\t".$nverusers.Mail::EOL.
 						Mail::EOL;
-				$message  .= $message_users;
+				$message .= $message_users;
 								
 				// Statistics tree:				
 				$stats = new Stats($tree);
@@ -159,7 +159,7 @@ 
 							' AND log_time >= DATE_ADD( NOW(), INTERVAL - :nb_days DAY)'.
 							' GROUP BY log_message, gedcom_id'.
 							' ORDER BY lastoccurred DESC';
-				$errors=Database::prepare($sql)->execute(array(
+				$errors = Database::prepare($sql)->execute(array(
 					'log_type' => Log::TYPE_ERROR, 
 					'gedcom_id' => $tree->getTreeId(), 
 					'nb_days' => $nbdays
@@ -175,7 +175,7 @@ 
 					$tmp_message .= str_replace("\n", "\n\t\t\t\t\t\t", $error->log_message).Mail::EOL;
 					$nb_errors += $error->nblogs;
 				}
-				if($nb_errors > 0){
+				if ($nb_errors > 0) {
 					$message .= I18N::translate('Errors [%d]', $nb_errors).Mail::EOL.
 						'-------------'.Mail::EOL.
 						WT_BASE_URL.'admin_site_logs.php'.Mail::EOL.
@@ -186,12 +186,12 @@ 
 						str_repeat('-', $nb_char_count_title)."\t".str_repeat('-', $nb_char_type)."\t".str_repeat('-', 20)."\t".str_repeat('-', strlen(I18N::translate('Error'))).Mail::EOL.
 						$tmp_message.Mail::EOL;
 				}
-				else{
+				else {
 					$message .= I18N::translate('No errors', $nb_errors).Mail::EOL.Mail::EOL;
 				}
 				
 				$tmpres = true;
-				if($webmaster->getPreference('contactmethod') !== 'messaging' 
+				if ($webmaster->getPreference('contactmethod') !== 'messaging' 
 						&& $webmaster->getPreference('contactmethod') !== 'none') {
 					$tmpres = Mail::systemMessage($tree, $webmaster, $subject, $message);
 				}		
@@ -213,24 +213,24 @@ 
 		$html = '
 			<div class="form-group">
     			<label class="control-label col-sm-3"> '.
-    				I18N::translate('Enable healthcheck emails for') .
+    				I18N::translate('Enable healthcheck emails for').
     			'</label>
     			<div class="col-sm-9">';
 
-		foreach(Tree::getAll() as $tree){
-			if(Auth::isManager($tree)){	
+		foreach (Tree::getAll() as $tree) {
+			if (Auth::isManager($tree)) {	
 			    $html .= '<div class="form-group row">
 			        <span class="col-sm-3 control-label">' .
-			             $tree->getTitle() .
+			             $tree->getTitle().
 					'</span>
 					 <div class="col-sm-2">';
-				$html .= FunctionsEdit::editFieldYesNo('HEALTHCHECK_ENABLED_' . $tree->getTreeId(), $tree->getPreference('MAJ_AT_'.$this->getName().'_ENABLED', 1), 'class="radio-inline"');
+				$html .= FunctionsEdit::editFieldYesNo('HEALTHCHECK_ENABLED_'.$tree->getTreeId(), $tree->getPreference('MAJ_AT_'.$this->getName().'_ENABLED', 1), 'class="radio-inline"');
 				$html .= '</div></div>';
 			}
 		}
 		
 		$html .= '	<p class="small text-muted">'.
-    					I18N::translate('Enable the health check emails for each of the selected trees.') .
+    					I18N::translate('Enable the health check emails for each of the selected trees.').
     				'</p>
     			</div>
     		</div>';
@@ -244,9 +244,9 @@ 
 	 */
 	public function saveConfig() {
 		try {
-			foreach(Tree::getAll() as $tree){		
-				if(Auth::isManager($tree)){
-					$tree_enabled = Filter::postInteger('HEALTHCHECK_ENABLED_' . $tree->getTreeId(), 0, 1);
+			foreach (Tree::getAll() as $tree) {		
+				if (Auth::isManager($tree)) {
+					$tree_enabled = Filter::postInteger('HEALTHCHECK_ENABLED_'.$tree->getTreeId(), 0, 1);
 					$tree->setPreference('MAJ_AT_'.$this->getName().'_ENABLED', $tree_enabled);
 				}
 			}

Braces +2 added lines, -4 removed lines

@@ -185,8 +185,7 @@ 
 						I18N::translate('Error').Mail::EOL.
 						str_repeat('-', $nb_char_count_title)."\t".str_repeat('-', $nb_char_type)."\t".str_repeat('-', 20)."\t".str_repeat('-', strlen(I18N::translate('Error'))).Mail::EOL.
 						$tmp_message.Mail::EOL;
-				}
-				else{
+				} else{
 					$message .= I18N::translate('No errors', $nb_errors).Mail::EOL.Mail::EOL;
 				}
 				
@@ -251,8 +250,7 @@ 
 				}
 			}
 			return true;
-		}
-		catch (\Exception $ex) {
+		} catch (\Exception $ex) {
 			Log::addErrorLog(sprintf('Error while updating the Admin Task "%s". Exception: %s', $this->getName(), $ex->getMessage()));
 			return false;
 		}

src/Webtrees/Module/AdminTasks/Schema/Migration0.php

Indentation +10 added lines, -10 removed lines

@@ -24,16 +24,16 @@
 	 */
 	public function upgrade() {
 		Database::exec(
-		    'CREATE TABLE IF NOT EXISTS `##maj_admintasks` ('.
-		    ' majat_name 		    VARCHAR(32)                      NOT NULL,'.
-		    ' majat_status          ENUM(\'enabled\',\'disabled\') 	 NOT NULL DEFAULT \'disabled\','.
-		    ' majat_last_run 		DATETIME 					     NOT NULL DEFAULT \'2000-01-01 00:00:00\','.
-		    ' majat_last_result 	TINYINT(1)					     NOT NULL DEFAULT 1,'.		// 0 for error, 1 for success
-		    ' majat_frequency		INTEGER						     NOT NULL DEFAULT 10080,'.	// In min, Default every week
-		    ' majat_nb_occur	 	SMALLINT					     NOT NULL DEFAULT 0,'.
-		    ' majat_running 		TINYINT(1)					     NOT NULL DEFAULT 0,'.
-		    ' PRIMARY KEY (majat_name)'.
-		    ') COLLATE utf8_unicode_ci ENGINE=InnoDB'
+			'CREATE TABLE IF NOT EXISTS `##maj_admintasks` ('.
+			' majat_name 		    VARCHAR(32)                      NOT NULL,'.
+			' majat_status          ENUM(\'enabled\',\'disabled\') 	 NOT NULL DEFAULT \'disabled\','.
+			' majat_last_run 		DATETIME 					     NOT NULL DEFAULT \'2000-01-01 00:00:00\','.
+			' majat_last_result 	TINYINT(1)					     NOT NULL DEFAULT 1,'.		// 0 for error, 1 for success
+			' majat_frequency		INTEGER						     NOT NULL DEFAULT 10080,'.	// In min, Default every week
+			' majat_nb_occur	 	SMALLINT					     NOT NULL DEFAULT 0,'.
+			' majat_running 		TINYINT(1)					     NOT NULL DEFAULT 0,'.
+			' PRIMARY KEY (majat_name)'.
+			') COLLATE utf8_unicode_ci ENGINE=InnoDB'
 		);
 	}
 }

Spacing +2 added lines, -2 removed lines

@@ -28,8 +28,8 @@
 		    ' majat_name 		    VARCHAR(32)                      NOT NULL,'.
 		    ' majat_status          ENUM(\'enabled\',\'disabled\') 	 NOT NULL DEFAULT \'disabled\','.
 		    ' majat_last_run 		DATETIME 					     NOT NULL DEFAULT \'2000-01-01 00:00:00\','.
-		    ' majat_last_result 	TINYINT(1)					     NOT NULL DEFAULT 1,'.		// 0 for error, 1 for success
-		    ' majat_frequency		INTEGER						     NOT NULL DEFAULT 10080,'.	// In min, Default every week
+		    ' majat_last_result 	TINYINT(1)					     NOT NULL DEFAULT 1,'.// 0 for error, 1 for success
+		    ' majat_frequency		INTEGER						     NOT NULL DEFAULT 10080,'.// In min, Default every week
 		    ' majat_nb_occur	 	SMALLINT					     NOT NULL DEFAULT 0,'.
 		    ' majat_running 		TINYINT(1)					     NOT NULL DEFAULT 0,'.
 		    ' PRIMARY KEY (majat_name)'.

src/Webtrees/Module/AdminTasks/Views/TaskEditView.php

Indentation +5 added lines, -5 removed lines

@@ -26,11 +26,11 @@ 
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() {
+	protected function renderContent() {
         
-        /** @var AbstractTask $task */
-        $task = $this->data->get('task');
-        ?>        
+		/** @var AbstractTask $task */
+		$task = $this->data->get('task');
+		?>        
         <ol class="breadcrumb small">
         	<li><a href="admin.php"><?php echo I18N::translate('Control panel'); ?></a></li>
 			<li><a href="admin_modules.php"><?php echo I18N::translate('Module administration'); ?></a></li>
@@ -122,7 +122,7 @@ 
     	</form>
 		
 		<?php        
-    }
+	}
     
 }
  
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -104,7 +104,7 @@
     			</div>
     		</div>
 			
-			<?php if($task instanceof ConfigurableTaskInterface) { ?>
+			<?php if ($task instanceof ConfigurableTaskInterface) { ?>
 			
 			<h3><?php echo I18N::translate('Options for “%s”', $task->getTitle()); ?></h3>
 			

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

Indentation +4 added lines, -4 removed lines

@@ -22,10 +22,10 @@ 
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() {
+	protected function renderContent() {
         
-        $table_id = $this->data->get('table_id');
-        ?>        
+		$table_id = $this->data->get('table_id');
+		?>        
         <ol class="breadcrumb small">
         	<li><a href="admin.php"><?php echo I18N::translate('Control panel'); ?></a></li>
 			<li><a href="admin_modules.php"><?php echo I18N::translate('Module administration'); ?></a></li>
@@ -68,7 +68,7 @@ 
     	</table>
 		
 		<?php        
-    }
+	}
     
 }
  
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
 			<?php echo I18N::translate('In order to do so, use the following URL, with the optional parameter <em>%s</em> if you only want to force the execution of one task: ', 'task'); ?>
 		</p>
 		<p>
-			<code><?php echo $this->data->get('trigger_url_root') .'&force=<span id="token_url">'. $this->data->get('trigger_token') .'</span>[&task='. I18N::translate('task_name').']'; ?></code>
+			<code><?php echo $this->data->get('trigger_url_root').'&force=<span id="token_url">'.$this->data->get('trigger_token').'</span>[&task='.I18N::translate('task_name').']'; ?></code>
 		</p>
 		<p>
 			<button id="bt_genforcetoken" class="bt bt-primary" onClick="generate_force_token();">

src/Webtrees/Module/Sosa/SosaConfigController.php

Indentation +110 added lines, -110 removed lines

@@ -29,66 +29,66 @@ 
  */
 class SosaConfigController extends MvcController
 {      
-    /**
-     * Check if the user can update the sosa ancestors list
-     * 
-     * @return bool
-     */
-    protected function canUpdate() {
-        global $WT_TREE;
+	/**
+	 * Check if the user can update the sosa ancestors list
+	 * 
+	 * @return bool
+	 */
+	protected function canUpdate() {
+		global $WT_TREE;
         
-        $user_id = Filter::postInteger('userid', -1) ?: Filter::getInteger('userid', -1);
-        return Auth::check() && 
-            ( 
-                $user_id == Auth::user()->getUserId() ||        // Allow update for yourself
-                ($user_id == -1 && Auth::isManager($WT_TREE))   // Allow a manager to update the default user
-             );
-    }
+		$user_id = Filter::postInteger('userid', -1) ?: Filter::getInteger('userid', -1);
+		return Auth::check() && 
+			( 
+				$user_id == Auth::user()->getUserId() ||        // Allow update for yourself
+				($user_id == -1 && Auth::isManager($WT_TREE))   // Allow a manager to update the default user
+			 );
+	}
     
-    /**
-     * Saves Sosa's user preferences (root individual for the user).
-     * 
-     * @param BaseController $controller
-     * @return bool True is saving successfull
-     */
-    protected function update(BaseController $controller) {
-        global $WT_TREE;          
-        if($this->canUpdate() && Filter::checkCsrf()) 
-        {            
-            $indi = Individual::getInstance(Filter::post('rootid'), $WT_TREE);
-            $user = User::find(Filter::postInteger('userid', -1));
+	/**
+	 * Saves Sosa's user preferences (root individual for the user).
+	 * 
+	 * @param BaseController $controller
+	 * @return bool True is saving successfull
+	 */
+	protected function update(BaseController $controller) {
+		global $WT_TREE;          
+		if($this->canUpdate() && Filter::checkCsrf()) 
+		{            
+			$indi = Individual::getInstance(Filter::post('rootid'), $WT_TREE);
+			$user = User::find(Filter::postInteger('userid', -1));
             
-            if($user  && $indi) {
-                $WT_TREE->setUserPreference($user, 'MAJ_SOSA_ROOT_ID', $indi->getXref());
-                $controller->addInlineJavascript('
+			if($user  && $indi) {
+				$WT_TREE->setUserPreference($user, 'MAJ_SOSA_ROOT_ID', $indi->getXref());
+				$controller->addInlineJavascript('
                     $( document ).ready(function() {
                         majComputeSosa('.$user->getUserId().');
                     });');
-                FlashMessages::addMessage(I18N::translate('The preferences have been updated.'));
-                return true;
-            }
-        }
-        FlashMessages::addMessage(I18N::translate('An error occurred while saving data...'), 'danger');
-        return false;
-    }
+				FlashMessages::addMessage(I18N::translate('The preferences have been updated.'));
+				return true;
+			}
+		}
+		FlashMessages::addMessage(I18N::translate('An error occurred while saving data...'), 'danger');
+		return false;
+	}
     
-    /**
-     * Pages
-     */
+	/**
+	 * Pages
+	 */
     
-    /**
-     * SosaConfig@index
-     */
-    public function index() {
-        global $WT_TREE;
+	/**
+	 * SosaConfig@index
+	 */
+	public function index() {
+		global $WT_TREE;
         
-        $controller = new PageController();
-        $controller
-        ->setPageTitle(I18N::translate('Sosa Configuration'))
-        ->restrictAccess(Auth::check())
-        ->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL)
-        ->addInlineJavascript('autocomplete();')
-        ->addInlineJavascript('
+		$controller = new PageController();
+		$controller
+		->setPageTitle(I18N::translate('Sosa Configuration'))
+		->restrictAccess(Auth::check())
+		->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL)
+		->addInlineJavascript('autocomplete();')
+		->addInlineJavascript('
             $( document ).ready(function() {
                 $("#bt_sosa_compute").click(function() {
                     majComputeSosa($("#maj_sosa_input_userid, #maj-sosa-config-select option:selected").val());
@@ -105,83 +105,83 @@ 
                   });
             }');
         
-        $action = Filter::post('action');
-        if($action === 'update') $this->update($controller);
+		$action = Filter::post('action');
+		if($action === 'update') $this->update($controller);
         
-        $view_bag = new ViewBag();
-        $view_bag->set('title', $controller->getPageTitle());
-        $view_bag->set('tree', $WT_TREE);
-        $view_bag->set('form_url', 'module.php?mod='.$this->module->getName().'&mod_action=SosaConfig&ged='.$WT_TREE->getNameUrl());
+		$view_bag = new ViewBag();
+		$view_bag->set('title', $controller->getPageTitle());
+		$view_bag->set('tree', $WT_TREE);
+		$view_bag->set('form_url', 'module.php?mod='.$this->module->getName().'&mod_action=SosaConfig&ged='.$WT_TREE->getNameUrl());
         
-        $users_root = array();
-        $users_js_array = 'var users_array = [];';
-        if(Auth::check()) {
-            $root_id = $WT_TREE->getUserPreference(Auth::user(), 'MAJ_SOSA_ROOT_ID');
-            $users_root[] = array( 'user' => Auth::user(), 'rootid' => $root_id);
-            $users_js_array .=  'users_array["'.Auth::user()->getUserId().'"] = "' . $root_id . '";';
+		$users_root = array();
+		$users_js_array = 'var users_array = [];';
+		if(Auth::check()) {
+			$root_id = $WT_TREE->getUserPreference(Auth::user(), 'MAJ_SOSA_ROOT_ID');
+			$users_root[] = array( 'user' => Auth::user(), 'rootid' => $root_id);
+			$users_js_array .=  'users_array["'.Auth::user()->getUserId().'"] = "' . $root_id . '";';
             
-            if(Auth::isManager($WT_TREE)) {
-                $default_user = User::find(-1);
-                $default_root_id = $WT_TREE->getUserPreference($default_user, 'MAJ_SOSA_ROOT_ID');
-                $users_root[] = array( 'user' => $default_user, 'rootid' => $default_root_id);
-                $users_js_array .=  'users_array["'.$default_user->getUserId().'"] = "' . $default_root_id . '";';
-            }
-        }
-        $view_bag->set('users_settings', $users_root);       
+			if(Auth::isManager($WT_TREE)) {
+				$default_user = User::find(-1);
+				$default_root_id = $WT_TREE->getUserPreference($default_user, 'MAJ_SOSA_ROOT_ID');
+				$users_root[] = array( 'user' => $default_user, 'rootid' => $default_root_id);
+				$users_js_array .=  'users_array["'.$default_user->getUserId().'"] = "' . $default_root_id . '";';
+			}
+		}
+		$view_bag->set('users_settings', $users_root);       
         
-        $controller->addInlineJavascript($users_js_array . '            
+		$controller->addInlineJavascript($users_js_array . '            
                 $("#maj-sosa-config-select").change(function() {
                     $("#rootid").val(users_array[this.value]);
                 });
              ');
         
-        ViewFactory::make('SosaConfig', $this, $controller, $view_bag)->render();   
-    }
+		ViewFactory::make('SosaConfig', $this, $controller, $view_bag)->render();   
+	}
     
-    /**
-     * SosaConfig@computeAll
-     */
-    public function computeAll() {
-        global $WT_TREE;
+	/**
+	 * SosaConfig@computeAll
+	 */
+	public function computeAll() {
+		global $WT_TREE;
         
-        $controller = new AjaxController();
-        $controller->restrictAccess($this->canUpdate());
+		$controller = new AjaxController();
+		$controller->restrictAccess($this->canUpdate());
         
-        $view_bag = new ViewBag();
-        $view_bag->set('is_success', false);
+		$view_bag = new ViewBag();
+		$view_bag->set('is_success', false);
         
-        $user = User::find(Filter::getInteger('userid', -1));
-        if($user) {
-            $calculator = new SosaCalculator($WT_TREE, $user);
-            if($calculator->computeAll()) $view_bag->set('is_success', true);
-        }
-        ViewFactory::make('SosaComputeResult', $this, $controller, $view_bag)->render();
-    }
+		$user = User::find(Filter::getInteger('userid', -1));
+		if($user) {
+			$calculator = new SosaCalculator($WT_TREE, $user);
+			if($calculator->computeAll()) $view_bag->set('is_success', true);
+		}
+		ViewFactory::make('SosaComputeResult', $this, $controller, $view_bag)->render();
+	}
     
-    /**
-     * SosaConfig@computePartial
-     */
-    public function computePartial() {
-        global $WT_TREE;
+	/**
+	 * SosaConfig@computePartial
+	 */
+	public function computePartial() {
+		global $WT_TREE;
     
-        $controller = new AjaxController();
-        $controller->restrictAccess($this->canUpdate());
+		$controller = new AjaxController();
+		$controller->restrictAccess($this->canUpdate());
     
-        $view_bag = new ViewBag();
-        $view_bag->set('is_success', false);
+		$view_bag = new ViewBag();
+		$view_bag->set('is_success', false);
     
-        $user = User::find(Filter::getInteger('userid', -1));
-        $indi = Individual::getInstance(Filter::get('pid', WT_REGEX_XREF), $WT_TREE);
+		$user = User::find(Filter::getInteger('userid', -1));
+		$indi = Individual::getInstance(Filter::get('pid', WT_REGEX_XREF), $WT_TREE);
         
-        if($user && $indi) {
-            $calculator = new SosaCalculator($WT_TREE, $user);
-            if($calculator->computeFromIndividual($indi)) $view_bag->set('is_success', true);
-        }
-        else {
-            $view_bag->set('error', I18N::translate('Non existing individual'));
-        }
+		if($user && $indi) {
+			$calculator = new SosaCalculator($WT_TREE, $user);
+			if($calculator->computeFromIndividual($indi)) $view_bag->set('is_success', true);
+		}
+		else {
+			$view_bag->set('error', I18N::translate('Non existing individual'));
+		}
             
-        ViewFactory::make('SosaComputeResult', $this, $controller, $view_bag)->render();
-    }
+		ViewFactory::make('SosaComputeResult', $this, $controller, $view_bag)->render();
+	}
     
 }
\ No newline at end of file

Spacing +16 added lines, -16 removed lines

@@ -40,7 +40,7 @@ 
         $user_id = Filter::postInteger('userid', -1) ?: Filter::getInteger('userid', -1);
         return Auth::check() && 
             ( 
-                $user_id == Auth::user()->getUserId() ||        // Allow update for yourself
+                $user_id == Auth::user()->getUserId() || // Allow update for yourself
                 ($user_id == -1 && Auth::isManager($WT_TREE))   // Allow a manager to update the default user
              );
     }
@@ -53,12 +53,12 @@ 
      */
     protected function update(BaseController $controller) {
         global $WT_TREE;          
-        if($this->canUpdate() && Filter::checkCsrf()) 
+        if ($this->canUpdate() && Filter::checkCsrf()) 
         {            
             $indi = Individual::getInstance(Filter::post('rootid'), $WT_TREE);
             $user = User::find(Filter::postInteger('userid', -1));
             
-            if($user  && $indi) {
+            if ($user && $indi) {
                 $WT_TREE->setUserPreference($user, 'MAJ_SOSA_ROOT_ID', $indi->getXref());
                 $controller->addInlineJavascript('
                     $( document ).ready(function() {
@@ -97,7 +97,7 @@ 
             
             function majComputeSosa(user_id) {
                 jQuery("#bt_sosa_compute").prop( "disabled", true );
-                jQuery("#bt_sosa_computing").empty().html("<i class=\"icon-loading-small\"></i>&nbsp;'. I18N::translate('Computing...') .'");
+                jQuery("#bt_sosa_computing").empty().html("<i class=\"icon-loading-small\"></i>&nbsp;'. I18N::translate('Computing...').'");
                 jQuery("#bt_sosa_computing").load(
 		          "module.php?mod='.$this->module->getName().'&mod_action=SosaConfig@computeAll&ged='.$WT_TREE->getNameUrl().'&userid=" + user_id,
 		          function() {
@@ -106,7 +106,7 @@ 
             }');
         
         $action = Filter::post('action');
-        if($action === 'update') $this->update($controller);
+        if ($action === 'update') $this->update($controller);
         
         $view_bag = new ViewBag();
         $view_bag->set('title', $controller->getPageTitle());
@@ -115,21 +115,21 @@ 
         
         $users_root = array();
         $users_js_array = 'var users_array = [];';
-        if(Auth::check()) {
+        if (Auth::check()) {
             $root_id = $WT_TREE->getUserPreference(Auth::user(), 'MAJ_SOSA_ROOT_ID');
-            $users_root[] = array( 'user' => Auth::user(), 'rootid' => $root_id);
-            $users_js_array .=  'users_array["'.Auth::user()->getUserId().'"] = "' . $root_id . '";';
+            $users_root[] = array('user' => Auth::user(), 'rootid' => $root_id);
+            $users_js_array .= 'users_array["'.Auth::user()->getUserId().'"] = "'.$root_id.'";';
             
-            if(Auth::isManager($WT_TREE)) {
+            if (Auth::isManager($WT_TREE)) {
                 $default_user = User::find(-1);
                 $default_root_id = $WT_TREE->getUserPreference($default_user, 'MAJ_SOSA_ROOT_ID');
-                $users_root[] = array( 'user' => $default_user, 'rootid' => $default_root_id);
-                $users_js_array .=  'users_array["'.$default_user->getUserId().'"] = "' . $default_root_id . '";';
+                $users_root[] = array('user' => $default_user, 'rootid' => $default_root_id);
+                $users_js_array .= 'users_array["'.$default_user->getUserId().'"] = "'.$default_root_id.'";';
             }
         }
         $view_bag->set('users_settings', $users_root);       
         
-        $controller->addInlineJavascript($users_js_array . '            
+        $controller->addInlineJavascript($users_js_array.'            
                 $("#maj-sosa-config-select").change(function() {
                     $("#rootid").val(users_array[this.value]);
                 });
@@ -151,9 +151,9 @@ 
         $view_bag->set('is_success', false);
         
         $user = User::find(Filter::getInteger('userid', -1));
-        if($user) {
+        if ($user) {
             $calculator = new SosaCalculator($WT_TREE, $user);
-            if($calculator->computeAll()) $view_bag->set('is_success', true);
+            if ($calculator->computeAll()) $view_bag->set('is_success', true);
         }
         ViewFactory::make('SosaComputeResult', $this, $controller, $view_bag)->render();
     }
@@ -173,9 +173,9 @@ 
         $user = User::find(Filter::getInteger('userid', -1));
         $indi = Individual::getInstance(Filter::get('pid', WT_REGEX_XREF), $WT_TREE);
         
-        if($user && $indi) {
+        if ($user && $indi) {
             $calculator = new SosaCalculator($WT_TREE, $user);
-            if($calculator->computeFromIndividual($indi)) $view_bag->set('is_success', true);
+            if ($calculator->computeFromIndividual($indi)) $view_bag->set('is_success', true);
         }
         else {
             $view_bag->set('error', I18N::translate('Non existing individual'));

Braces +10 added lines, -5 removed lines

@@ -106,7 +106,9 @@ 
             }');
         
         $action = Filter::post('action');
-        if($action === 'update') $this->update($controller);
+        if($action === 'update') {
+        	$this->update($controller);
+        }
         
         $view_bag = new ViewBag();
         $view_bag->set('title', $controller->getPageTitle());
@@ -153,7 +155,9 @@ 
         $user = User::find(Filter::getInteger('userid', -1));
         if($user) {
             $calculator = new SosaCalculator($WT_TREE, $user);
-            if($calculator->computeAll()) $view_bag->set('is_success', true);
+            if($calculator->computeAll()) {
+            	$view_bag->set('is_success', true);
+            }
         }
         ViewFactory::make('SosaComputeResult', $this, $controller, $view_bag)->render();
     }
@@ -175,9 +179,10 @@ 
         
         if($user && $indi) {
             $calculator = new SosaCalculator($WT_TREE, $user);
-            if($calculator->computeFromIndividual($indi)) $view_bag->set('is_success', true);
-        }
-        else {
+            if($calculator->computeFromIndividual($indi)) {
+            	$view_bag->set('is_success', true);
+            }
+        } else {
             $view_bag->set('error', I18N::translate('Non existing individual'));
         }