jon48 / webtrees-lib

src/Webtrees/Constants.php

Indentation +10 added lines, -10 removed lines

@@ -14,17 +14,17 @@ 
  */
 class Constants {
     
-    const LIB_NAMESPACE = __NAMESPACE__;
+	const LIB_NAMESPACE = __NAMESPACE__;
 	
-    /** Internal name of the Certificates Module
-     * @var string
-     */
-    const MODULE_MAJ_CERTIF_NAME = 'myartjaub_certificates';
+	/** Internal name of the Certificates Module
+	 * @var string
+	 */
+	const MODULE_MAJ_CERTIF_NAME = 'myartjaub_certificates';
     
-    /** Internal name of the GeoDispersion Module
-     * @var string
-     */
-    const MODULE_MAJ_GEODISP_NAME = 'myartjaub_geodispersion';
+	/** Internal name of the GeoDispersion Module
+	 * @var string
+	 */
+	const MODULE_MAJ_GEODISP_NAME = 'myartjaub_geodispersion';
     
 	/** Internal name of the Hooks Module
 	 * @var string
@@ -61,7 +61,7 @@ 
 	 * @return string $WT_RAPHAEL_JS_URL
 	 */
 	public static function WT_RAPHAEL_JS_URL() {
-	    return WT_STATIC_URL . 'packages/raphael-2.1.4/raphael-min.js';
+		return WT_STATIC_URL . 'packages/raphael-2.1.4/raphael-min.js';
 	}
 		
 }
\ No newline at end of file

src/Webtrees/Module/IsSourcedModule.php

Braces +9 added lines, -6 removed lines

@@ -63,8 +63,9 @@ 
 	public function hExtendIndiHeaderIcons(IndividualController $ctrlIndi) {
 	    if($ctrlIndi){
 	        $dindi = new Individual($ctrlIndi->getSignificantIndividual());
-	        if ($dindi->canDisplayIsSourced()) 
-	            return FunctionsPrint::formatIsSourcedIcon('R', $dindi->isSourced(), 'INDI', 1, 'large');
+	        if ($dindi->canDisplayIsSourced()) {
+	        	            return FunctionsPrint::formatIsSourcedIcon('R', $dindi->isSourced(), 'INDI', 1, 'large');
+	        }
 	    }
 	    return '';
 	}
@@ -97,8 +98,9 @@ 
 	        $dindi = new Individual($grec);
 	        $html .= FunctionsPrint::formatIsSourcedIcon('R', $dindi->isSourced(), 'INDI', 1, 'small');
 	        $html .= FunctionsPrint::formatIsSourcedIcon('E', $dindi->isBirthSourced(), 'BIRT', 1, 'small');
-	        if($grec->isDead())
-	            $html .= FunctionsPrint::formatIsSourcedIcon('E', $dindi->isDeathSourced(), 'DEAT', 1, 'small');
+	        if($grec->isDead()) {
+	        	            $html .= FunctionsPrint::formatIsSourcedIcon('E', $dindi->isDeathSourced(), 'DEAT', 1, 'small');
+	        }
 	    }
 	    return $html;
 	}
@@ -171,12 +173,13 @@ 
 	                   </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>';
 	        }

Indentation +60 added lines, -60 removed lines

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

src/Webtrees/Module/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/TaskProviderInterface.php

Indentation +36 added lines, -36 removed lines

@@ -37,47 +37,47 @@
 	 */
 	public function setTaskStatus(AbstractTask $task, $status);
 		
-    /**
-     * Update an Admin Task in the database.
-     * 
-     * @param AbstractTask $task Task to update
-     * @return bool
-     */
-    function updateTask(AbstractTask $task);    
+	/**
+	 * Update an Admin Task in the database.
+	 * 
+	 * @param AbstractTask $task Task to update
+	 * @return bool
+	 */
+	function updateTask(AbstractTask $task);    
     
-    /**
-     * Delete the task from the database, in a transactional manner.
-     *
-     * @param string $task_name Task to delete
-     */
-    public function deleteTask($task_name);
+	/**
+	 * Delete the task from the database, in a transactional manner.
+	 *
+	 * @param string $task_name Task to delete
+	 */
+	public function deleteTask($task_name);
     
 
-    /**
-     * Returns the number of Admin Tasks (active and inactive).
-     *
-     * @return int
-     */
-    public function getTasksCount();
+	/**
+	 * Returns the number of Admin Tasks (active and inactive).
+	 *
+	 * @return int
+	 */
+	public function getTasksCount();
     
-    /**
-     * Return the list of Admin Tasks matching specified criterias.
-     *
-     * @param string $search Search criteria in analysis description
-     * @param array $order_by Columns to order by
-     * @param int $start Offset to start with (for pagination)
-     * @param int|null $limit Max number of items to return (for pagination)
-     * @return \MyArtJaub\Webtrees\Module\GeoDispersion\Model\GeoAnalysis[]
-     */
-    function getFilteredTasksList($search = null, $order_by = null, $start = 0, $limit = null);
+	/**
+	 * Return the list of Admin Tasks matching specified criterias.
+	 *
+	 * @param string $search Search criteria in analysis description
+	 * @param array $order_by Columns to order by
+	 * @param int $start Offset to start with (for pagination)
+	 * @param int|null $limit Max number of items to return (for pagination)
+	 * @return \MyArtJaub\Webtrees\Module\GeoDispersion\Model\GeoAnalysis[]
+	 */
+	function getFilteredTasksList($search = null, $order_by = null, $start = 0, $limit = null);
     
-    /**
-     * Returns the list of tasks that are currently meant to run.
-     * Tasks to run can be forced, or can be limited to only one.
-     * 
-     * @param string|null $force Force the enabled tasks to run.
-     * @param string|null $task_name Name of the specific task to run
-     */
+	/**
+	 * Returns the list of tasks that are currently meant to run.
+	 * Tasks to run can be forced, or can be limited to only one.
+	 * 
+	 * @param string|null $force Force the enabled tasks to run.
+	 * @param string|null $task_name Name of the specific task to run
+	 */
 	function getTasksToRun($force = false, $task_name = null);
 		
 	/**

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)'.

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

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;
 		}

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, , $download_url) = explode('|', $latest_version_txt);
-        } else {
-        	// Cannot determine the latest version
-        	list($latest_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, , $download_url) = explode('|', $latest_version_txt);
+		} else {
+			// Cannot determine the latest version
+			list($latest_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>';
 			

src/Webtrees/Module/AdminTasks/AdminConfigController.php

Braces +4 added lines, -3 removed lines

@@ -187,7 +187,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');
@@ -261,8 +263,7 @@ 
     			    <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 {
+			} else {
 			    $datum[9] = '';
 			}			    
 						

Indentation +88 added lines, -88 removed lines

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

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