jon48 / webtrees-lib

src/Webtrees/Module/AdminTasksModule.php

Indentation +85 added lines, -85 removed lines

@@ -23,62 +23,62 @@ 
 class AdminTasksModule extends AbstractModule 
 implements ModuleConfigInterface, ModuleBlockInterface
 {
-    // How to update the database schema for this module
-    const SCHEMA_TARGET_VERSION   = 1;
-    const SCHEMA_SETTING_NAME     = 'MAJ_ADMTASKS_SCHEMA_VERSION';
-    const SCHEMA_MIGRATION_PREFIX = '\MyArtJaub\Webtrees\Module\AdminTasks\Schema';
+	// How to update the database schema for this module
+	const SCHEMA_TARGET_VERSION   = 1;
+	const SCHEMA_SETTING_NAME     = 'MAJ_ADMTASKS_SCHEMA_VERSION';
+	const SCHEMA_MIGRATION_PREFIX = '\MyArtJaub\Webtrees\Module\AdminTasks\Schema';
     
-    /** @var string For custom modules - link for support, upgrades, etc. */
-    const CUSTOM_WEBSITE = 'https://github.com/jon48/webtrees-lib';
+	/** @var string For custom modules - link for support, upgrades, etc. */
+	const CUSTOM_WEBSITE = 'https://github.com/jon48/webtrees-lib';
     
-    /**
-     * Admin Task provider
-     * @var \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskProviderInterface $provider
-     */
-    protected $provider;
+	/**
+	 * Admin Task provider
+	 * @var \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskProviderInterface $provider
+	 */
+	protected $provider;
     
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\AbstractModule::getTitle()
-     */
-    public function getTitle() {
-        return I18N::translate('Administration Tasks');
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\AbstractModule::getTitle()
+	 */
+	public function getTitle() {
+		return I18N::translate('Administration Tasks');
+	}
     
    /**
     * {@inheritDoc}
     * @see \Fisharebest\Webtrees\Module\AbstractModule::getDescription()
     */
-    public function getDescription() {
-        return I18N::translate('Manage and run nearly-scheduled administration tasks.');
-    }
+	public function getDescription() {
+		return I18N::translate('Manage and run nearly-scheduled administration tasks.');
+	}
     
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\AbstractModule::modAction()
-     */
-    public function modAction($mod_action) {
-        Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\AbstractModule::modAction()
+	 */
+	public function modAction($mod_action) {
+		Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
                 
-        \MyArtJaub\Webtrees\Mvc\Dispatcher::getInstance()->handle($this, $mod_action);
-    }
+		\MyArtJaub\Webtrees\Mvc\Dispatcher::getInstance()->handle($this, $mod_action);
+	}
     
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink()
-     */
-    public function getConfigLink() {
-        Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink()
+	 */
+	public function getConfigLink() {
+		Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
         
-        return 'module.php?mod=' . $this->getName() . '&mod_action=AdminConfig';
-    }
+		return 'module.php?mod=' . $this->getName() . '&mod_action=AdminConfig';
+	}
     
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::getBlock()
-     */
-    public function getBlock($block_id, $template = true, $cfg = array()) {
-        Globals::getController()->addInlineJavascript('
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::getBlock()
+	 */
+	public function getBlock($block_id, $template = true, $cfg = array()) {
+		Globals::getController()->addInlineJavascript('
 			$(document).ready(function(){
 				$.ajax({
 					url: "module.php",
@@ -89,60 +89,60 @@ 
 				});
 			});
 		');
-        return '';
-    }
+		return '';
+	}
     
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::loadAjax()
-     */
-    public function loadAjax() {
-        return false;
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::loadAjax()
+	 */
+	public function loadAjax() {
+		return false;
+	}
     
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::isGedcomBlock()
-     */
-    public function isGedcomBlock() {
-        return true;
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::isGedcomBlock()
+	 */
+	public function isGedcomBlock() {
+		return true;
+	}
     
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::isUserBlock()
-     */
-    public function isUserBlock() {
-        return false;
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::isUserBlock()
+	 */
+	public function isUserBlock() {
+		return false;
+	}
     
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::configureBlock()
-     */
-    public function configureBlock($block_id) {
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::configureBlock()
+	 */
+	public function configureBlock($block_id) {
         
-    }
+	}
    
 /**
-	 * Get the Admin Tasks Provider (initialise it if not done yet).
-	 *
-	 * @return \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskProviderInterface
-	 */
-    public function getProvider() {        
-        if(!$this->provider) {
-            $this->provider = new TaskProvider(WT_ROOT.WT_MODULES_DIR.$this->getName().'/tasks/');
-        }
-        return $this->provider;
-    }
+ * Get the Admin Tasks Provider (initialise it if not done yet).
+ *
+ * @return \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskProviderInterface
+ */
+	public function getProvider() {        
+		if(!$this->provider) {
+			$this->provider = new TaskProvider(WT_ROOT.WT_MODULES_DIR.$this->getName().'/tasks/');
+		}
+		return $this->provider;
+	}
 	
 	/**
 	 * Set the Admin Tasks Provider.
 	 *
 	 * @return \MyArtJaub\Webtrees\Module\GeoDispersion\Model\TaskProviderInterface
 	 */
-    public function setProvider(TaskProviderInterface $provider) {
-        $this->provider = $provider;
-    }
+	public function setProvider(TaskProviderInterface $provider) {
+		$this->provider = $provider;
+	}
 }
  
\ No newline at end of file

src/Webtrees/Module/AdminTasks/TaskController.php

Indentation +66 added lines, -66 removed lines

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

src/Webtrees/Module/AdminTasks/AdminConfigController.php

Indentation +87 added lines, -87 removed lines

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

src/Webtrees/Module/IsSourcedModule.php

Indentation +59 added lines, -59 removed lines

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

src/Webtrees/Module/Certificates/CertificateController.php

Indentation +152 added lines, -152 removed lines

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

src/Webtrees/Module/Certificates/AdminConfigController.php

Indentation +56 added lines, -56 removed lines

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

src/Webtrees/Module/MiscExtensions/AdminConfigController.php

Indentation +37 added lines, -37 removed lines

@@ -27,52 +27,52 @@
  */
 class AdminConfigController extends MvcController
 {    
-    /**
-     * Manage updates sent from the AdminConfig@index form.
-     */
-    protected function update() {    
-        if(Auth::isAdmin()){
+	/**
+	 * Manage updates sent from the AdminConfig@index form.
+	 */
+	protected function update() {    
+		if(Auth::isAdmin()){
     
-            $this->module->setSetting('MAJ_TITLE_PREFIX', Filter::post('MAJ_TITLE_PREFIX'));
+			$this->module->setSetting('MAJ_TITLE_PREFIX', Filter::post('MAJ_TITLE_PREFIX'));
             
-            $this->module->setSetting('MAJ_ADD_HTML_HEADER', Filter::postInteger('MAJ_ADD_HTML_HEADER', 0, 1));
-            $this->module->setSetting('MAJ_SHOW_HTML_HEADER', Filter::postInteger('MAJ_SHOW_HTML_HEADER', Auth::PRIV_HIDE, Auth::PRIV_PRIVATE, Auth::PRIV_HIDE));
-            $this->module->setSetting('MAJ_HTML_HEADER', Filter::post('MAJ_HTML_HEADER'));
+			$this->module->setSetting('MAJ_ADD_HTML_HEADER', Filter::postInteger('MAJ_ADD_HTML_HEADER', 0, 1));
+			$this->module->setSetting('MAJ_SHOW_HTML_HEADER', Filter::postInteger('MAJ_SHOW_HTML_HEADER', Auth::PRIV_HIDE, Auth::PRIV_PRIVATE, Auth::PRIV_HIDE));
+			$this->module->setSetting('MAJ_HTML_HEADER', Filter::post('MAJ_HTML_HEADER'));
             
-            $this->module->setSetting('MAJ_ADD_HTML_FOOTER', Filter::postInteger('MAJ_ADD_HTML_FOOTER', 0, 1));
-            $this->module->setSetting('MAJ_SHOW_HTML_FOOTER', Filter::postInteger('MAJ_SHOW_HTML_FOOTER', Auth::PRIV_HIDE, Auth::PRIV_PRIVATE, Auth::PRIV_HIDE));
-            $this->module->setSetting('MAJ_HTML_FOOTER', Filter::post('MAJ_HTML_FOOTER'));
+			$this->module->setSetting('MAJ_ADD_HTML_FOOTER', Filter::postInteger('MAJ_ADD_HTML_FOOTER', 0, 1));
+			$this->module->setSetting('MAJ_SHOW_HTML_FOOTER', Filter::postInteger('MAJ_SHOW_HTML_FOOTER', Auth::PRIV_HIDE, Auth::PRIV_PRIVATE, Auth::PRIV_HIDE));
+			$this->module->setSetting('MAJ_HTML_FOOTER', Filter::post('MAJ_HTML_FOOTER'));
             
-            $this->module->setSetting('MAJ_DISPLAY_CNIL', Filter::postInteger('MAJ_DISPLAY_CNIL', 0, 1));
-            $this->module->setSetting('MAJ_CNIL_REFERENCE', Filter::post('MAJ_CNIL_REFERENCE'));
+			$this->module->setSetting('MAJ_DISPLAY_CNIL', Filter::postInteger('MAJ_DISPLAY_CNIL', 0, 1));
+			$this->module->setSetting('MAJ_CNIL_REFERENCE', Filter::post('MAJ_CNIL_REFERENCE'));
                 
-            FlashMessages::addMessage(I18N::translate('The preferences for the module “%s” have been updated.', $this->module->getTitle()), 'success');
+			FlashMessages::addMessage(I18N::translate('The preferences for the module “%s” have been updated.', $this->module->getTitle()), 'success');
     
-            return;
-        }
-    }
+			return;
+		}
+	}
     
-    /**
-     * Pages
-     */
+	/**
+	 * Pages
+	 */
         
-    /**
-     * AdminConfig@index
-     */
-    public function index() {
-        $action = Filter::post('action');        
-        if($action == 'update' && Filter::checkCsrf()) $this->update();
+	/**
+	 * AdminConfig@index
+	 */
+	public function index() {
+		$action = Filter::post('action');        
+		if($action == 'update' && Filter::checkCsrf()) $this->update();
         
-        Theme::theme(new AdministrationTheme)->init(Globals::getTree());        
-        $ctrl = new PageController();
-        $ctrl
-            ->restrictAccess(Auth::isAdmin())
-            ->setPageTitle($this->module->getTitle());
+		Theme::theme(new AdministrationTheme)->init(Globals::getTree());        
+		$ctrl = new PageController();
+		$ctrl
+			->restrictAccess(Auth::isAdmin())
+			->setPageTitle($this->module->getTitle());
             
-        $view_bag = new ViewBag();
-        $view_bag->set('title', $ctrl->getPageTitle());
-        $view_bag->set('module', $this->module);
+		$view_bag = new ViewBag();
+		$view_bag->set('title', $ctrl->getPageTitle());
+		$view_bag->set('module', $this->module);
         
-        ViewFactory::make('AdminConfig', $this, $ctrl, $view_bag)->render();
-    }
+		ViewFactory::make('AdminConfig', $this, $ctrl, $view_bag)->render();
+	}
 }
\ No newline at end of file

src/Webtrees/Module/WelcomeBlockModule.php

Indentation +63 added lines, -63 removed lines

@@ -21,79 +21,79 @@
  * Welcome Block Module.
  */
 class WelcomeBlockModule extends AbstractModule
-    implements ModuleBlockInterface
+	implements ModuleBlockInterface
 {
-    /** @var string For custom modules - link for support, upgrades, etc. */
-    const CUSTOM_WEBSITE = 'https://github.com/jon48/webtrees-lib';
+	/** @var string For custom modules - link for support, upgrades, etc. */
+	const CUSTOM_WEBSITE = 'https://github.com/jon48/webtrees-lib';
         
-    /**
-     * {@inhericDoc}
-     */
-    public function getTitle() {
-        return /* I18N: Name of the “WelcomeBlock” module */ I18N::translate('MyArtJaub Welcome Block');
-    }
+	/**
+	 * {@inhericDoc}
+	 */
+	public function getTitle() {
+		return /* I18N: Name of the “WelcomeBlock” module */ I18N::translate('MyArtJaub Welcome Block');
+	}
     
-    /**
-     * {@inhericDoc}
-     */
-    public function getDescription() {
-        return /* I18N: Description of the “WelcomeBlock” module */ I18N::translate('The MyArtJaub Welcome block welcomes the visitor to the site, allows a quick login to the site, and displays statistics on visits.');
-    }
+	/**
+	 * {@inhericDoc}
+	 */
+	public function getDescription() {
+		return /* I18N: Description of the “WelcomeBlock” module */ I18N::translate('The MyArtJaub Welcome block welcomes the visitor to the site, allows a quick login to the site, and displays statistics on visits.');
+	}
     
-    /**
-     * {@inhericDoc}
-     */
-    public function modAction($mod_action) {
-        \MyArtJaub\Webtrees\Mvc\Dispatcher::getInstance()->handle($this, $mod_action);
-    }
+	/**
+	 * {@inhericDoc}
+	 */
+	public function modAction($mod_action) {
+		\MyArtJaub\Webtrees\Mvc\Dispatcher::getInstance()->handle($this, $mod_action);
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::getBlock()
-     */
+	/**
+	 * {@inhericDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::getBlock()
+	 */
 	public function getBlock($block_id, $template = true, $cfg = array()) {
-        $wb_controller = new WelcomeBlockController($this);           
-        return $wb_controller->index(Globals::getController(), Globals::getTree(), $block_id, $template);
-    }
+		$wb_controller = new WelcomeBlockController($this);           
+		return $wb_controller->index(Globals::getController(), Globals::getTree(), $block_id, $template);
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::loadAjax()
-     */
-    public function loadAjax() {
-        return false;
-    }
+	/**
+	 * {@inhericDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::loadAjax()
+	 */
+	public function loadAjax() {
+		return false;
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::isUserBlock()
-     */
-    public function isUserBlock() {
-        return false;
-    }
+	/**
+	 * {@inhericDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::isUserBlock()
+	 */
+	public function isUserBlock() {
+		return false;
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::isGedcomBlock()
-     */
-    public function isGedcomBlock() {
-        return true;
-    }
+	/**
+	 * {@inhericDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::isGedcomBlock()
+	 */
+	public function isGedcomBlock() {
+		return true;
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::configureBlock()
-     */
-    public function configureBlock($block_id) {
-        $wb_controller = new WelcomeBlockController($this);
-        try {
-            return $wb_controller->config($block_id);
-        }
-        catch (MvcException $ex) {
-            if($ex->getHttpCode() != 200) throw $ex;
-            return;
-        }     
-    }
+	/**
+	 * {@inhericDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::configureBlock()
+	 */
+	public function configureBlock($block_id) {
+		$wb_controller = new WelcomeBlockController($this);
+		try {
+			return $wb_controller->config($block_id);
+		}
+		catch (MvcException $ex) {
+			if($ex->getHttpCode() != 200) throw $ex;
+			return;
+		}     
+	}
 
 }
  
\ No newline at end of file

src/Webtrees/Module/Sosa/SosaConfigController.php

Indentation +108 added lines, -108 removed lines

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