jon48 / webtrees-lib

phpunit.php

Spacing +1 added lines, -1 removed lines

@@ -23,6 +23,6 @@
 define('WT_REGEX_INTEGER', '-?\d+');
 define('WT_REGEX_BYTES', '[0-9]+[bBkKmMgG]?');
 define('WT_REGEX_IPV4', '\d{1,3}(\.\d{1,3}){3}');
-define('WT_REGEX_PASSWORD', '.{' . WT_MINIMUM_PASSWORD_LENGTH . ',}');
+define('WT_REGEX_PASSWORD', '.{'.WT_MINIMUM_PASSWORD_LENGTH.',}');
 
 I18N::init('en-US');
\ No newline at end of file

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

Spacing +1 added lines, -1 removed lines

@@ -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

Spacing +15 added lines, -15 removed lines

@@ -61,7 +61,7 @@ 
 	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\IndividualHeaderExtender::hExtendIndiHeaderIcons()
 	 */
 	public function hExtendIndiHeaderIcons(IndividualController $ctrlIndi) {
-	    if($ctrlIndi){
+	    if ($ctrlIndi) {
 	        $dindi = new Individual($ctrlIndi->getSignificantIndividual());
 	        if ($dindi->canDisplayIsSourced()) 
 	            return FunctionsPrint::formatIsSourcedIcon('R', $dindi->isSourced(), 'INDI', 1, 'large');
@@ -85,19 +85,19 @@ 
 	 * {@inheritDoc}
 	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\RecordNameTextExtender::hRecordNamePrepend()
 	 */
-	public function hRecordNamePrepend(GedcomRecord $grec){ }
+	public function hRecordNamePrepend(GedcomRecord $grec) { }
 	
 	/**
 	 * {@inheritDoc}
 	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\RecordNameTextExtender::hRecordNameAppend()
 	 */
-	public function hRecordNameAppend(GedcomRecord $grec){
+	public function hRecordNameAppend(GedcomRecord $grec) {
 	    $html = '';
-	    if($grec instanceof \Fisharebest\Webtrees\Individual){
+	    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())
+	        if ($grec->isDead())
 	            $html .= FunctionsPrint::formatIsSourcedIcon('E', $dindi->isDeathSourced(), 'DEAT', 1, 'small');
 	    }
 	    return $html;
@@ -115,7 +115,7 @@ 
 	 * {@inheritDoc}
 	 * @see \Fisharebest\Webtrees\Module\ModuleSidebarInterface::hasSidebarContent()
 	 */
-	public function hasSidebarContent(){ 
+	public function hasSidebarContent() { 
 	    return true;
 	}
 	
@@ -145,24 +145,24 @@ 
 	            echo '
 	                <table class="issourcedtable">
 	                   <tr>
-	                       <td class="slabel"> ' . GedcomTag::getLabel('INDI') . '</td>
+	                       <td class="slabel"> ' . GedcomTag::getLabel('INDI').'</td>
 	                       <td class="svalue">' . FunctionsPrint::formatIsSourcedIcon('R', $dindi->isSourced(), 'INDI', 1).'</td>
 	                   </tr>
 	                   <tr>
-	                       <td class="slabel">' . GedcomTag::getLabel('BIRT') . '</td>
+	                       <td class="slabel">' . GedcomTag::getLabel('BIRT').'</td>
 	                       <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){
+	            ($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;
+	                           <a href="' . $fam->getHtmlUrl().'"> '.GedcomTag::getLabel('MARR');
+	                if ($ct > 1) {
+	                    echo ' ', $nb;
 	                    $nb++;
 	                }
 	                echo '     </a>
@@ -171,10 +171,10 @@ 
 	                   </tr>';
 	            }
 	            
-	            if( $root->isDead() )
+	            if ($root->isDead())
 	                echo '
 	                    <tr>
-	                       <td class="slabel">' . GedcomTag::getLabel('DEAT') . '</td>
+	                       <td class="slabel">' . GedcomTag::getLabel('DEAT').'</td>
 	                       <td class="svalue">' . FunctionsPrint::formatIsSourcedIcon('E', $dindi->isDeathSourced(), 'DEAT', 1).'</td>
 	                   </tr>';
 	            

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/TaskController.php

Indentation +65 added lines, -65 removed lines

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

Spacing +25 added lines, -25 removed lines

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

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

Indentation +195 added lines, -195 removed lines

@@ -21,254 +21,254 @@
  */
 abstract class AbstractTask {
     
-    /**
-     * Time out for runnign tasks, in seconds. Default 5 min
-     * @var int TASK_TIME_OUT
-     */
-    const TASK_TIME_OUT = 300;
+	/**
+	 * Time out for runnign tasks, in seconds. Default 5 min
+	 * @var int TASK_TIME_OUT
+	 */
+	const TASK_TIME_OUT = 300;
               
-    /**
-     * Task provider
-     * @var TaskProviderInterface $provider
-     */
+	/**
+	 * Task provider
+	 * @var TaskProviderInterface $provider
+	 */
 	protected $provider;
 			
 	/**
 	 * Task name
 	 * @var string $name
 	 */
-    protected $name;
+	protected $name;
     
-    /**
-     * Status of the task
-     * @var bool $is_enabled
-     */
-    protected $is_enabled;
+	/**
+	 * Status of the task
+	 * @var bool $is_enabled
+	 */
+	protected $is_enabled;
     
-    /**
-     * Last updated date
-     * @var \DateTime $last_updated
-     */
-    protected $last_updated;
+	/**
+	 * Last updated date
+	 * @var \DateTime $last_updated
+	 */
+	protected $last_updated;
     
-    /**
-     * Last run result
-     * @var bool $last_result
-     */
-    protected $last_result;
+	/**
+	 * Last run result
+	 * @var bool $last_result
+	 */
+	protected $last_result;
     
-    /**
-     * Task run frequency
-     * @var int $frequency
-     */
-    protected $frequency;
+	/**
+	 * Task run frequency
+	 * @var int $frequency
+	 */
+	protected $frequency;
     
-    /**
-     * Task remaining runs
-     * @var int $nb_occurrences
-     */
-    protected $nb_occurrences;
+	/**
+	 * Task remaining runs
+	 * @var int $nb_occurrences
+	 */
+	protected $nb_occurrences;
     
-    /**
-     * Current running status of the task
-     * @var bool $is_running
-     */
-    protected $is_running;
+	/**
+	 * Current running status of the task
+	 * @var bool $is_running
+	 */
+	protected $is_running;
     
-    /**
-     * Constructor for the Admin task class
+	/**
+	 * Constructor for the Admin task class
 	 *
 	 * @param string $file Filename containing the task object
 	 * @param TaskProviderInterface $provider Provider for tasks
-     */
-    public function __construct($file, TaskProviderInterface $provider = null){
-        $this->name = trim(basename($file, '.php'));
+	 */
+	public function __construct($file, TaskProviderInterface $provider = null){
+		$this->name = trim(basename($file, '.php'));
 		$this->provider = $provider;
-    }
+	}
     
-    /**
-     * Get the provider.
-     *
-     * @return TaskProviderInterface 
-     */
-    public function getProvider(){
-        return $this->provider;
-    }
+	/**
+	 * Get the provider.
+	 *
+	 * @return TaskProviderInterface 
+	 */
+	public function getProvider(){
+		return $this->provider;
+	}
     
-    /**
-     * Set the provider.
-     *
-     * @param TaskProviderInterface $provider
-     * @return self Enable method-chaining
-     */
-    public function setProvider(TaskProviderInterface $provider){
-        $this->provider = $provider;
-        return $this;
-    }
+	/**
+	 * Set the provider.
+	 *
+	 * @param TaskProviderInterface $provider
+	 * @return self Enable method-chaining
+	 */
+	public function setProvider(TaskProviderInterface $provider){
+		$this->provider = $provider;
+		return $this;
+	}
     
-    /**
-     * Set parameters of the Task
-     *
-     * @param bool $is_enabled Status of the task
-     * @param \DateTime $lastupdated Time of the last task run
-     * @param bool $last_result Result of the last run, true for success, false for failure
-     * @param int $frequency Frequency of execution in minutes
-     * @param int $nb_occur Number of remaining occurrences, 0 for tasks not limited
-     * @param bool $is_running Indicates if the task is currently running
-     */
-    public function setParameters($is_enabled, \DateTime $last_updated, $last_result, $frequency, $nb_occur, $is_running){
-        $this->is_enabled = $is_enabled;
-        $this->last_updated = $last_updated;
-        $this->last_result = $last_result;
-        $this->frequency = $frequency;
-        $this->nb_occurrences = $nb_occur;
-        $this->is_running = $is_running;
-    }
+	/**
+	 * Set parameters of the Task
+	 *
+	 * @param bool $is_enabled Status of the task
+	 * @param \DateTime $lastupdated Time of the last task run
+	 * @param bool $last_result Result of the last run, true for success, false for failure
+	 * @param int $frequency Frequency of execution in minutes
+	 * @param int $nb_occur Number of remaining occurrences, 0 for tasks not limited
+	 * @param bool $is_running Indicates if the task is currently running
+	 */
+	public function setParameters($is_enabled, \DateTime $last_updated, $last_result, $frequency, $nb_occur, $is_running){
+		$this->is_enabled = $is_enabled;
+		$this->last_updated = $last_updated;
+		$this->last_result = $last_result;
+		$this->frequency = $frequency;
+		$this->nb_occurrences = $nb_occur;
+		$this->is_running = $is_running;
+	}
     
-    /**
-     * Get the name of the task
-     *
-     * @return string
-     */
-    public function getName(){
-        return $this->name;
-    }
+	/**
+	 * Get the name of the task
+	 *
+	 * @return string
+	 */
+	public function getName(){
+		return $this->name;
+	}
     
     
-    /**
-     * Return the status of the task in a boolean way
-     *
-     * @return boolean True if enabled
-     */
-    public function isEnabled(){
-        return $this->is_enabled;
-    }
+	/**
+	 * Return the status of the task in a boolean way
+	 *
+	 * @return boolean True if enabled
+	 */
+	public function isEnabled(){
+		return $this->is_enabled;
+	}
     
-    /**
-     * Get the last updated time.
-     *
-     * @return \DateTime
-     */
-    public function getLastUpdated(){
-        return $this->last_updated;
-    }
+	/**
+	 * Get the last updated time.
+	 *
+	 * @return \DateTime
+	 */
+	public function getLastUpdated(){
+		return $this->last_updated;
+	}
     
-    /**
-     * Check if the last result has been successful.
-     *
-     * @return bool
-     */
-    public function isLastRunSuccess(){
-        return $this->last_result;
-    }
+	/**
+	 * Check if the last result has been successful.
+	 *
+	 * @return bool
+	 */
+	public function isLastRunSuccess(){
+		return $this->last_result;
+	}
     
-    /**
-     * Get the task frequency.
-     *
-     * @return int
-     */
-    public function getFrequency(){
-        return $this->frequency;
-    }
+	/**
+	 * Get the task frequency.
+	 *
+	 * @return int
+	 */
+	public function getFrequency(){
+		return $this->frequency;
+	}
 	
 	/**
-     * Set the task frequency.
-     *
+	 * Set the task frequency.
+	 *
 	 * @param int $frequency
-     * @return self Enable method-chaining
-     */
-    public function setFrequency($frequency){
-        $this->frequency = $frequency;
+	 * @return self Enable method-chaining
+	 */
+	public function setFrequency($frequency){
+		$this->frequency = $frequency;
 		return $this;
-    }
+	}
     
-    /**
-     * Get the number of remaining occurrences.
-     *
-     * @return int
-     */
-    public function getRemainingOccurrences(){
-        return $this->nb_occurrences;
-    }
+	/**
+	 * Get the number of remaining occurrences.
+	 *
+	 * @return int
+	 */
+	public function getRemainingOccurrences(){
+		return $this->nb_occurrences;
+	}
 	
 	/**
-     * Set the number of remaining occurrences.
-     *
+	 * Set the number of remaining occurrences.
+	 *
 	 * @param int $nb_occur
-     * @return self Enable method-chaining
-     */
-    public function setRemainingOccurrences($nb_occur){
-        $this->nb_occurrences = $nb_occur;
+	 * @return self Enable method-chaining
+	 */
+	public function setRemainingOccurrences($nb_occur){
+		$this->nb_occurrences = $nb_occur;
 		return $this;
-    }
+	}
     
-    /**
-     * Check if the task if running.
-     *
-     * @return bool
-     */
-    public function isRunning(){
-        return $this->is_running;
-    }
+	/**
+	 * Check if the task if running.
+	 *
+	 * @return bool
+	 */
+	public function isRunning(){
+		return $this->is_running;
+	}
     
     
-    /**
-     * Return the name to display for the task
-     *
-     * @return string Title for the task
-     */
-    abstract public function getTitle();
+	/**
+	 * Return the name to display for the task
+	 *
+	 * @return string Title for the task
+	 */
+	abstract public function getTitle();
     
-    /**
-     * Return the default frequency for the execution of the task
-     *
-     * @return int Frequency for the execution of the task
-     */
-    abstract public function getDefaultFrequency();
+	/**
+	 * Return the default frequency for the execution of the task
+	 *
+	 * @return int Frequency for the execution of the task
+	 */
+	abstract public function getDefaultFrequency();
     
-    /**
-     * Execute the task's actions
-     */
-    abstract protected function executeSteps();
+	/**
+	 * Execute the task's actions
+	 */
+	abstract protected function executeSteps();
     
 	/**
 	 * Persist task state into database.
 	 * @return bool
 	 */
 	public function save() {
-	    if(!$this->provider) throw new \Exception('The task has not been initialised with a provider.');
+		if(!$this->provider) throw new \Exception('The task has not been initialised with a provider.');
 		return $this->provider->updateTask($this);
 	}
 	
-    /**
-     * Execute the task, default skeleton
-     *
-     */
-    public function execute(){
+	/**
+	 * Execute the task, default skeleton
+	 *
+	 */
+	public function execute(){
     
-        if($this->last_updated->add(new \DateInterval('PT'.self::TASK_TIME_OUT.'S')) < new \DateTime())
-            $this->is_running = false;
+		if($this->last_updated->add(new \DateInterval('PT'.self::TASK_TIME_OUT.'S')) < new \DateTime())
+			$this->is_running = false;
     
-        if(!$this->is_running){  //TODO put in place a time_out for running...
-            //TODO Log the executions in the logs
-            $this->last_result = false;
-            $this->is_running = true;
-            $this->save();
+		if(!$this->is_running){  //TODO put in place a time_out for running...
+			//TODO Log the executions in the logs
+			$this->last_result = false;
+			$this->is_running = true;
+			$this->save();
     
-            Log::addDebugLog('Start execution of Admin task: '.$this->getTitle());
-            $this->last_result = $this->executeSteps();
-            if($this->last_result){
-                $this->last_updated = new \DateTime();
-                if($this->nb_occurrences > 0){
-                    $this->nb_occurrences--;
-                    if($this->nb_occurrences == 0) $this->is_enabled = false;
-                }
-            }
-            $this->is_running = false;
-            $this->save();
-            Log::addDebugLog('Execution completed for Admin task: '.$this->getTitle().' - '.($this->last_result ? 'Success' : 'Failure'));
-        }
-    }
+			Log::addDebugLog('Start execution of Admin task: '.$this->getTitle());
+			$this->last_result = $this->executeSteps();
+			if($this->last_result){
+				$this->last_updated = new \DateTime();
+				if($this->nb_occurrences > 0){
+					$this->nb_occurrences--;
+					if($this->nb_occurrences == 0) $this->is_enabled = false;
+				}
+			}
+			$this->is_running = false;
+			$this->save();
+			Log::addDebugLog('Execution completed for Admin task: '.$this->getTitle().' - '.($this->last_result ? 'Success' : 'Failure'));
+		}
+	}
     
     
 }

Spacing +20 added lines, -20 removed lines

@@ -81,7 +81,7 @@ 
 	 * @param string $file Filename containing the task object
 	 * @param TaskProviderInterface $provider Provider for tasks
      */
-    public function __construct($file, TaskProviderInterface $provider = null){
+    public function __construct($file, TaskProviderInterface $provider = null) {
         $this->name = trim(basename($file, '.php'));
 		$this->provider = $provider;
     }
@@ -91,7 +91,7 @@ 
      *
      * @return TaskProviderInterface 
      */
-    public function getProvider(){
+    public function getProvider() {
         return $this->provider;
     }
     
@@ -101,7 +101,7 @@ 
      * @param TaskProviderInterface $provider
      * @return self Enable method-chaining
      */
-    public function setProvider(TaskProviderInterface $provider){
+    public function setProvider(TaskProviderInterface $provider) {
         $this->provider = $provider;
         return $this;
     }
@@ -116,7 +116,7 @@ 
      * @param int $nb_occur Number of remaining occurrences, 0 for tasks not limited
      * @param bool $is_running Indicates if the task is currently running
      */
-    public function setParameters($is_enabled, \DateTime $last_updated, $last_result, $frequency, $nb_occur, $is_running){
+    public function setParameters($is_enabled, \DateTime $last_updated, $last_result, $frequency, $nb_occur, $is_running) {
         $this->is_enabled = $is_enabled;
         $this->last_updated = $last_updated;
         $this->last_result = $last_result;
@@ -130,7 +130,7 @@ 
      *
      * @return string
      */
-    public function getName(){
+    public function getName() {
         return $this->name;
     }
     
@@ -140,7 +140,7 @@ 
      *
      * @return boolean True if enabled
      */
-    public function isEnabled(){
+    public function isEnabled() {
         return $this->is_enabled;
     }
     
@@ -149,7 +149,7 @@ 
      *
      * @return \DateTime
      */
-    public function getLastUpdated(){
+    public function getLastUpdated() {
         return $this->last_updated;
     }
     
@@ -158,7 +158,7 @@ 
      *
      * @return bool
      */
-    public function isLastRunSuccess(){
+    public function isLastRunSuccess() {
         return $this->last_result;
     }
     
@@ -167,7 +167,7 @@ 
      *
      * @return int
      */
-    public function getFrequency(){
+    public function getFrequency() {
         return $this->frequency;
     }
 	
@@ -177,7 +177,7 @@ 
 	 * @param int $frequency
      * @return self Enable method-chaining
      */
-    public function setFrequency($frequency){
+    public function setFrequency($frequency) {
         $this->frequency = $frequency;
 		return $this;
     }
@@ -187,7 +187,7 @@ 
      *
      * @return int
      */
-    public function getRemainingOccurrences(){
+    public function getRemainingOccurrences() {
         return $this->nb_occurrences;
     }
 	
@@ -197,7 +197,7 @@ 
 	 * @param int $nb_occur
      * @return self Enable method-chaining
      */
-    public function setRemainingOccurrences($nb_occur){
+    public function setRemainingOccurrences($nb_occur) {
         $this->nb_occurrences = $nb_occur;
 		return $this;
     }
@@ -207,7 +207,7 @@ 
      *
      * @return bool
      */
-    public function isRunning(){
+    public function isRunning() {
         return $this->is_running;
     }
     
@@ -236,7 +236,7 @@ 
 	 * @return bool
 	 */
 	public function save() {
-	    if(!$this->provider) throw new \Exception('The task has not been initialised with a provider.');
+	    if (!$this->provider) throw new \Exception('The task has not been initialised with a provider.');
 		return $this->provider->updateTask($this);
 	}
 	
@@ -244,12 +244,12 @@ 
      * Execute the task, default skeleton
      *
      */
-    public function execute(){
+    public function execute() {
     
-        if($this->last_updated->add(new \DateInterval('PT'.self::TASK_TIME_OUT.'S')) < new \DateTime())
+        if ($this->last_updated->add(new \DateInterval('PT'.self::TASK_TIME_OUT.'S')) < new \DateTime())
             $this->is_running = false;
     
-        if(!$this->is_running){  //TODO put in place a time_out for running...
+        if (!$this->is_running) {  //TODO put in place a time_out for running...
             //TODO Log the executions in the logs
             $this->last_result = false;
             $this->is_running = true;
@@ -257,11 +257,11 @@ 
     
             Log::addDebugLog('Start execution of Admin task: '.$this->getTitle());
             $this->last_result = $this->executeSteps();
-            if($this->last_result){
+            if ($this->last_result) {
                 $this->last_updated = new \DateTime();
-                if($this->nb_occurrences > 0){
+                if ($this->nb_occurrences > 0) {
                     $this->nb_occurrences--;
-                    if($this->nb_occurrences == 0) $this->is_enabled = false;
+                    if ($this->nb_occurrences == 0) $this->is_enabled = false;
                 }
             }
             $this->is_running = false;

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

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