jon48 / webtrees-lib

src/Webtrees/Module/AdminTasks/AdminConfigController.php

Indentation +88 added lines, -88 removed lines

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

src/Webtrees/Module/AdminTasks/TaskController.php

Indentation +65 added lines, -65 removed lines

@@ -34,25 +34,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
@@ -76,35 +76,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);
         
-        $controller->encode($res);
-    }
+		$controller->encode($res);
+	}
 	
 	/**
 	 * Task@edit
@@ -112,15 +112,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();
@@ -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=' . $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);
@@ -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/WelcomeBlock/WelcomeBlockController.php

Indentation +66 added lines, -66 removed lines

@@ -29,30 +29,30 @@ 
 class WelcomeBlockController extends MvcController
 {   
     
-    /**
-     * Pages
-     */
+	/**
+	 * Pages
+	 */
         
-    /**
-     * WelcomeBlock@index
-     * 
-     * @param PageController $parent_controller
-     * @param Tree $tree
-     * @param string $block_id
-     * @param string $template
-     * @return $string
-     */
-    public function index(PageController $parent_controller, Tree $tree, $block_id, $template) {        
-        $view_bag = new ViewBag();
+	/**
+	 * WelcomeBlock@index
+	 * 
+	 * @param PageController $parent_controller
+	 * @param Tree $tree
+	 * @param string $block_id
+	 * @param string $template
+	 * @return $string
+	 */
+	public function index(PageController $parent_controller, Tree $tree, $block_id, $template) {        
+		$view_bag = new ViewBag();
         
-        if($parent_controller && $tree) {
+		if($parent_controller && $tree) {
         
-            $view_bag->set('tree', $tree);
-            $view_bag->set('indi', $parent_controller->getSignificantIndividual());
+			$view_bag->set('tree', $tree);
+			$view_bag->set('indi', $parent_controller->getSignificantIndividual());
         
-            $id = $this->module->getName().$block_id;
-            $class = $this->module->getName().'_block';
-            $parent_controller->addInlineJavascript('
+			$id = $this->module->getName().$block_id;
+			$class = $this->module->getName().'_block';
+			$parent_controller->addInlineJavascript('
                 jQuery("#maj-new_passwd").hide();
                 jQuery("#maj-passwd_click").click(function()
                 {
@@ -63,63 +63,63 @@ 
     				  });
     			');
     
-            if (Auth::isAdmin()) {
-                $title='<a class="icon-admin" title="'.I18N::translate('Configure').'" href="block_edit.php?block_id='.$block_id.'&amp;ged=' . $tree->getNameHtml() . '&amp;ctype=gedcom"></a>';
-            } else {
-                $title='';
-            }
-            $title .='<span dir="auto">'.$tree->getTitleHtml().'</span>';
+			if (Auth::isAdmin()) {
+				$title='<a class="icon-admin" title="'.I18N::translate('Configure').'" href="block_edit.php?block_id='.$block_id.'&amp;ged=' . $tree->getNameHtml() . '&amp;ctype=gedcom"></a>';
+			} else {
+				$title='';
+			}
+			$title .='<span dir="auto">'.$tree->getTitleHtml().'</span>';
     
-            $piwik_enabled = $this->module->getBlockSetting($block_id, 'piwik_enabled', false);
-            $view_bag->set('piwik_enabled', $piwik_enabled);
-            if($piwik_enabled) {
-                $parent_controller->addInlineJavascript(
-                    '$("#piwik_stats")
+			$piwik_enabled = $this->module->getBlockSetting($block_id, 'piwik_enabled', false);
+			$view_bag->set('piwik_enabled', $piwik_enabled);
+			if($piwik_enabled) {
+				$parent_controller->addInlineJavascript(
+					'$("#piwik_stats")
                         .load("module.php?mod='.$this->module->getName().'&mod_action=Piwik&block_id='.$block_id.'");'
-                );
-            }
+				);
+			}
     
-            $content = ViewFactory::make('WelcomeBlock', $this,  new BaseController(), $view_bag)->getHtmlPartial();   
+			$content = ViewFactory::make('WelcomeBlock', $this,  new BaseController(), $view_bag)->getHtmlPartial();   
             
-            if ($template) {
-                return Theme::theme()->formatBlock($id, $title, $class, $content);
-            } else {
-                return $content;
-            }
-        }
-    }
+			if ($template) {
+				return Theme::theme()->formatBlock($id, $title, $class, $content);
+			} else {
+				return $content;
+			}
+		}
+	}
     
     
     
-    /**
-     * WelcomeBlock@config
-     * 
-     * @param string $block_id
-     */
-    public function config($block_id) {
+	/**
+	 * WelcomeBlock@config
+	 * 
+	 * @param string $block_id
+	 */
+	public function config($block_id) {
 
-        if (Filter::postBool('save') && Filter::checkCsrf()) {
-            $this->module->setBlockSetting($block_id, 'piwik_enabled', Filter::postBool('piwik_enabled'));
-            $this->module->setBlockSetting($block_id, 'piwik_url', trim(Filter::postUrl('piwik_url')));
-            $this->module->setBlockSetting($block_id, 'piwik_siteid', trim(Filter::post('piwik_siteid')));
-            $this->module->setBlockSetting($block_id, 'piwik_token', trim(Filter::post('piwik_token'))); 
-            Cache::delete('piwikCountYear', $this->module);          
-            throw new MvcException(200); // Use this instead of exit
-        }
+		if (Filter::postBool('save') && Filter::checkCsrf()) {
+			$this->module->setBlockSetting($block_id, 'piwik_enabled', Filter::postBool('piwik_enabled'));
+			$this->module->setBlockSetting($block_id, 'piwik_url', trim(Filter::postUrl('piwik_url')));
+			$this->module->setBlockSetting($block_id, 'piwik_siteid', trim(Filter::post('piwik_siteid')));
+			$this->module->setBlockSetting($block_id, 'piwik_token', trim(Filter::post('piwik_token'))); 
+			Cache::delete('piwikCountYear', $this->module);          
+			throw new MvcException(200); // Use this instead of exit
+		}
         
-        $view_bag = new ViewBag();
+		$view_bag = new ViewBag();
         
-        // Is Piwik Statistic Enabled ?
-        $view_bag->set('piwik_enabled', $this->module->getBlockSetting($block_id, 'piwik_enabled', '0'));
-        //Piwik Root Url
-        $view_bag->set('piwik_url', $this->module->getBlockSetting($block_id, 'piwik_url', ''));
-        // Piwik token
-        $view_bag->set('piwik_token', $this->module->getBlockSetting($block_id, 'piwik_token', ''));
-        // Piwik side id
-        $view_bag->set('piwik_siteid', $this->module->getBlockSetting($block_id, 'piwik_siteid', ''));
+		// Is Piwik Statistic Enabled ?
+		$view_bag->set('piwik_enabled', $this->module->getBlockSetting($block_id, 'piwik_enabled', '0'));
+		//Piwik Root Url
+		$view_bag->set('piwik_url', $this->module->getBlockSetting($block_id, 'piwik_url', ''));
+		// Piwik token
+		$view_bag->set('piwik_token', $this->module->getBlockSetting($block_id, 'piwik_token', ''));
+		// Piwik side id
+		$view_bag->set('piwik_siteid', $this->module->getBlockSetting($block_id, 'piwik_siteid', ''));
         
-        ViewFactory::make('WelcomeBlockConfig', $this, new BaseController(), $view_bag)->renderPartial();
-    }
+		ViewFactory::make('WelcomeBlockConfig', $this, new BaseController(), $view_bag)->renderPartial();
+	}
     
     
     

src/Webtrees/Module/WelcomeBlock/PiwikController.php

Indentation +57 added lines, -57 removed lines

@@ -23,74 +23,74 @@
  */
 class PiwikController extends MvcController
 {   
-    /**
-     * Retrieve the number of visitors from Piwik, for a given period.
-     * 
-     * @param string $block_id
-     * @param string $period
-     * @param (null|int) Number of visits
-     */
-    private function getNumberOfVisitsPiwik($block_id, $period='year'){
+	/**
+	 * Retrieve the number of visitors from Piwik, for a given period.
+	 * 
+	 * @param string $block_id
+	 * @param string $period
+	 * @param (null|int) Number of visits
+	 */
+	private function getNumberOfVisitsPiwik($block_id, $period='year'){
     
-        $piwik_url = $this->module->getBlockSetting($block_id, 'piwik_url');
-        $piwik_siteid = $this->module->getBlockSetting($block_id, 'piwik_siteid');
-        $piwik_token = $this->module->getBlockSetting($block_id, 'piwik_token');
+		$piwik_url = $this->module->getBlockSetting($block_id, 'piwik_url');
+		$piwik_siteid = $this->module->getBlockSetting($block_id, 'piwik_siteid');
+		$piwik_token = $this->module->getBlockSetting($block_id, 'piwik_token');
     
-        if($piwik_url && strlen($piwik_url) > 0 &&
-            $piwik_siteid  && strlen($piwik_siteid) > 0 &&
-            $piwik_token && strlen($piwik_token)            
-            ) 
-        {        
-            // calling Piwik REST API
-            $url = $piwik_url;
-            $url .= '?module=API&method=VisitsSummary.getVisits';
-            $url .= '&idSite='.$piwik_siteid.'&period='.$period.'&date=today';
-            $url .= '&format=PHP';
-            $url .= '&token_auth='.$piwik_token;
+		if($piwik_url && strlen($piwik_url) > 0 &&
+			$piwik_siteid  && strlen($piwik_siteid) > 0 &&
+			$piwik_token && strlen($piwik_token)            
+			) 
+		{        
+			// calling Piwik REST API
+			$url = $piwik_url;
+			$url .= '?module=API&method=VisitsSummary.getVisits';
+			$url .= '&idSite='.$piwik_siteid.'&period='.$period.'&date=today';
+			$url .= '&format=PHP';
+			$url .= '&token_auth='.$piwik_token;
         
-            if($fetched = File::fetchUrl($url)) {
-                $content = @unserialize($fetched);
-                if(is_numeric($content)) return $content;
-            }
-        }
+			if($fetched = File::fetchUrl($url)) {
+				$content = @unserialize($fetched);
+				if(is_numeric($content)) return $content;
+			}
+		}
     
-        return null;
-    }
+		return null;
+	}
     
-    /**
-     * Pages
-     */
+	/**
+	 * Pages
+	 */
         
-    /**
-     * Piwik@index
-     */
-    public function index() {  
+	/**
+	 * Piwik@index
+	 */
+	public function index() {  
         
-        $ctrl = new AjaxController();
+		$ctrl = new AjaxController();
         
-        $data = new ViewBag();
-        $data->set('has_stats', false);
+		$data = new ViewBag();
+		$data->set('has_stats', false);
         
-        $block_id = Filter::get('block_id');        
-        if($block_id){
-            $cached_item = Cache::get('piwikCountYear', $this->module);
-            $visitCountYear = $cached_item->get();
-            if(!$cached_item->isHit()) {
-                $visitCountYear = $this->getNumberOfVisitsPiwik($block_id);
-                Cache::save($cached_item, $visitCountYear);
-            }
+		$block_id = Filter::get('block_id');        
+		if($block_id){
+			$cached_item = Cache::get('piwikCountYear', $this->module);
+			$visitCountYear = $cached_item->get();
+			if(!$cached_item->isHit()) {
+				$visitCountYear = $this->getNumberOfVisitsPiwik($block_id);
+				Cache::save($cached_item, $visitCountYear);
+			}
             
-            if($visitCountYear){
-                $visitCountToday = max(0, $this->getNumberOfVisitsPiwik($block_id, 'day'));
-                $visitCountYear = max( 0, $visitCountYear);
+			if($visitCountYear){
+				$visitCountToday = max(0, $this->getNumberOfVisitsPiwik($block_id, 'day'));
+				$visitCountYear = max( 0, $visitCountYear);
                 
-                $data->set('has_stats', true);
-                $data->set('visits_today', $visitCountToday);
-                $data->set('visits_year', $visitCountYear + $visitCountToday);                
-            }
-        }
+				$data->set('has_stats', true);
+				$data->set('visits_today', $visitCountToday);
+				$data->set('visits_year', $visitCountYear + $visitCountToday);                
+			}
+		}
         
-        ViewFactory::make('PiwikStats', $this, $ctrl, $data)->render();        
-    }
+		ViewFactory::make('PiwikStats', $this, $ctrl, $data)->render();        
+	}
     
 }
\ No newline at end of file

src/Webtrees/Cache.php

Indentation +22 added lines, -22 removed lines

@@ -22,10 +22,10 @@ 
  */
 class Cache{
 	
-    /**
-     * Underlying Cache object
-     * @var CacheItemPoolInterface $cache
-     */
+	/**
+	 * Underlying Cache object
+	 * @var CacheItemPoolInterface $cache
+	 */
 	protected $cache=null;
 	
 	/**
@@ -47,11 +47,11 @@ 
 	 */
 	protected static function getInstance()
 	{
-	    if (null === static::$instance) {
-	        static::$instance = new static();
-	    }
+		if (null === static::$instance) {
+			static::$instance = new static();
+		}
 	
-	    return static::$instance;
+		return static::$instance;
 	}
 	
 	/**
@@ -59,8 +59,8 @@ 
 	 *
 	 */
 	protected function init() {		
-	    if(Apc::isAvailable()) {
-		    $driver = new Apc();
+		if(Apc::isAvailable()) {
+			$driver = new Apc();
 		} else {
 			if (!is_dir(WT_DATA_DIR.DIRECTORY_SEPARATOR.'cache')) {
 				// We may not have permission - especially during setup, before we instruct
@@ -68,7 +68,7 @@ 
 				@mkdir(WT_DATA_DIR.DIRECTORY_SEPARATOR.'cache');
 			}
 			if (is_dir(WT_DATA_DIR.DIRECTORY_SEPARATOR.'cache')) {
-			    $driver = new FileSystem(array('path' => WT_DATA_DIR.DIRECTORY_SEPARATOR.'cache'));
+				$driver = new FileSystem(array('path' => WT_DATA_DIR.DIRECTORY_SEPARATOR.'cache'));
 			} else {
 				// No cache available, let's just use a basic one :-(
 				$driver = new Ephemeral();
@@ -95,7 +95,7 @@ 
 	 * @return string Cached key name
 	 */
 	protected function getKeyName($value, AbstractModule $mod = null){
-	    $this->checkInit();
+		$this->checkInit();
 		$mod_name = 'myartjaub';
 		if($mod !== null) $mod_name = $mod->getName();
 		return $mod_name.'_'.$value;
@@ -109,7 +109,7 @@ 
 	 * @return \Psr\Cache\CacheItemInterface
 	 */
 	public function getI($value, AbstractModule $mod = null){
-	    $this->checkInit();
+		$this->checkInit();
 		return $this->cache->getItem($this->getKeyName($value, $mod));
 	}
 	
@@ -121,7 +121,7 @@ 
 	 * @return \Psr\Cache\CacheItemInterface
 	 */
 	public static function get($value, AbstractModule $mod = null){
-	    return self::getInstance()->getI($value, $mod);
+		return self::getInstance()->getI($value, $mod);
 	}
 	
 	/**
@@ -136,8 +136,8 @@ 
 		
 		$item = $value;
 		if(!($value instanceof CacheItemInterface)) {
-		    $item = new \Stash\Item();
-    		$item->setKey($this->getKeyName($value, $mod));
+			$item = new \Stash\Item();
+			$item->setKey($this->getKeyName($value, $mod));
 		}		
 		$item->set($data);
 		$this->cache->save($item);
@@ -151,7 +151,7 @@ 
 	 * @param AbstractModule $mod Calling module
 	 */
 	public static function save($value, $data, AbstractModule $mod = null){
-	    self::getInstance()->saveI($value, $data, $mod);
+		self::getInstance()->saveI($value, $data, $mod);
 	}
 	
 	/**
@@ -162,8 +162,8 @@ 
 	 * @return bool Deletion successful?
 	 */
 	public function deleteI($value, AbstractModule $mod = null){
-	    $this->checkInit();	
-	    return $this->cache->deleteItem($this->getKeyName($value, $mod));
+		$this->checkInit();	
+		return $this->cache->deleteItem($this->getKeyName($value, $mod));
 	}
 	
 	/**
@@ -174,7 +174,7 @@ 
 	 * @return bool Deletion successful?
 	 */
 	public static function delete($value, AbstractModule $mod = null){
-	    return self::getInstance()->deleteI($value, $mod);
+		return self::getInstance()->deleteI($value, $mod);
 	}
 	
 	/**
@@ -182,7 +182,7 @@ 
 	 *
 	 */
 	public function cleanI(){
-	    $this->checkInit();
+		$this->checkInit();
 		$this->cache->clear();
 	}
 	
@@ -190,7 +190,7 @@ 
 	 * Static invocation of the *clean* method.
 	 */
 	public static function clean() {
-	    self::getInstance()->cleanI();
+		self::getInstance()->cleanI();
 	}
 	
 }
\ No newline at end of file

src/Webtrees/Functions/FunctionsPrintLists.php

Indentation +19 added lines, -19 removed lines

@@ -17,27 +17,27 @@
  */
 class FunctionsPrintLists {
     
-    /**
-     * Copy of core function, which is not public.
-     *
-     * @param Individual $individual
-     *
-     * @return string[]
-     * @see \Fisharebest\Webtrees\Functions\FunctionsPrintLists
-     */
-    public static function sortableNames(Individual $individual) {
-        $names   = $individual->getAllNames();
-        $primary = $individual->getPrimaryName();
+	/**
+	 * Copy of core function, which is not public.
+	 *
+	 * @param Individual $individual
+	 *
+	 * @return string[]
+	 * @see \Fisharebest\Webtrees\Functions\FunctionsPrintLists
+	 */
+	public static function sortableNames(Individual $individual) {
+		$names   = $individual->getAllNames();
+		$primary = $individual->getPrimaryName();
 
-        list($surn, $givn) = explode(',', $names[$primary]['sort']);
+		list($surn, $givn) = explode(',', $names[$primary]['sort']);
 
-        $givn = str_replace('@P.N.', 'AAAA', $givn);
-        $surn = str_replace('@N.N.', 'AAAA', $surn);
+		$givn = str_replace('@P.N.', 'AAAA', $givn);
+		$surn = str_replace('@N.N.', 'AAAA', $surn);
 
-        return array(
-            $surn . 'AAAA' . $givn,
-            $givn . 'AAAA' . $surn,
-        );
-    }
+		return array(
+			$surn . 'AAAA' . $givn,
+			$givn . 'AAAA' . $surn,
+		);
+	}
 
 }
\ No newline at end of file

src/Webtrees/Module/Sosa/Views/SosaListFamView.php

Indentation +85 added lines, -85 removed lines

@@ -32,11 +32,11 @@ 
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() { 
+	protected function renderContent() { 
         
-        if($this->data->get('has_sosa', false)) {
-            $table_id = $this->data->get('table_id');            
-        ?>   
+		if($this->data->get('has_sosa', false)) {
+			$table_id = $this->data->get('table_id');            
+		?>   
         
 		<div id="sosa-fam-list" class="sosa-list">
 			<table id="<?php echo $table_id; ?>">
@@ -176,58 +176,58 @@ 
 				<tbody>
 			
 			<?php foreach($this->data->get('sosa_list') as $sosa => $family) {
-			    /** @var \Fisharebest\Webtrees\Family $person */
+				/** @var \Fisharebest\Webtrees\Family $person */
 
-			    //PERSO Create decorator for Family
-			    $dfamily = new Family($family);
+				//PERSO Create decorator for Family
+				$dfamily = new Family($family);
 			    
-			    $husb = $family->getHusband();
-			    if (is_null($husb)) {
-			        $husb = new Individual('H', '0 @H@ INDI', null, $family->getTree());
-			    }
-			    $dhusb = new \MyArtJaub\Webtrees\Individual($husb);
-			    $wife = $family->getWife();
-			    if (is_null($wife)) {
-			        $wife = new Individual('W', '0 @W@ INDI', null, $family->getTree());
-			    }
-			    $dwife = new \MyArtJaub\Webtrees\Individual($wife);
+				$husb = $family->getHusband();
+				if (is_null($husb)) {
+					$husb = new Individual('H', '0 @H@ INDI', null, $family->getTree());
+				}
+				$dhusb = new \MyArtJaub\Webtrees\Individual($husb);
+				$wife = $family->getWife();
+				if (is_null($wife)) {
+					$wife = new Individual('W', '0 @W@ INDI', null, $family->getTree());
+				}
+				$dwife = new \MyArtJaub\Webtrees\Individual($wife);
 			    
-			    $mdate=$family->getMarriageDate();
+				$mdate=$family->getMarriageDate();
 			    
-			    if ($family->isPendingAddtion()) {
-			        $class = ' class="new"';
-			    } elseif ($family->isPendingDeletion()) {
-			        $class = ' class="old"';
-			    } else {
-			        $class = '';
-			    }
-			    ?>			
+				if ($family->isPendingAddtion()) {
+					$class = ' class="new"';
+				} elseif ($family->isPendingDeletion()) {
+					$class = ' class="old"';
+				} else {
+					$class = '';
+				}
+				?>			
         		<tr <?= $class ?>>
         			<td class="transparent" data-sort="<?= $sosa ?>"><?= I18N::translate('%1$d/%2$d', $sosa, ($sosa + 1) % 10) ?></td>
         			<!--  HUSBAND -->
         			<?php list($surn_givn, $givn_surn) = FunctionsPrintLists::sortableNames($husb); ?>
         			<td colspan="2" data-sort="<?= Filter::escapeHtml($givn_surn) ?>">        			
         			<?php foreach ($husb->getAllNames() as $num=>$name) {
-        				if ($name['type']=='NAME') {
-        					$title='';
-        				} else {
-        					$title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $husb)).'"';
-        				}
-        				if ($num==$husb->getPrimaryName()) {
-        					$class=' class="name2"';
-        					$sex_image=$husb->getSexImage();
-        				} else {
-        					$class='';
-        					$sex_image='';
-        				} ?>
+						if ($name['type']=='NAME') {
+							$title='';
+						} else {
+							$title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $husb)).'"';
+						}
+						if ($num==$husb->getPrimaryName()) {
+							$class=' class="name2"';
+							$sex_image=$husb->getSexImage();
+						} else {
+							$class='';
+							$sex_image='';
+						} ?>
         				<a <?php echo $title.' '.$class; ?> href="<?php echo $husb->getHtmlUrl(); ?>">
         					<?php echo \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($name['full']); ?>
         				</a>
         				<?php echo $sex_image.FunctionsPrint::formatSosaNumbers($dhusb->getSosaNumbers(), 1, 'smaller'); ?>
         				<br/>
             		<?php }
-            		echo $husb->getPrimaryParentsNames('parents details1', 'none');
-            		?>
+					echo $husb->getPrimaryParentsNames('parents details1', 'none');
+					?>
             		</td>
             		<td hidden data-sort="<?= Filter::escapeHtml($surn_givn) ?>"></td>
             		<?php $hdate=$husb->getBirthDate(); ?>
@@ -236,55 +236,55 @@ 
         			<?php list($surn_givn, $givn_surn) = FunctionsPrintLists::sortableNames($wife); ?>
         			<td colspan="2">
         			<?php foreach ($wife->getAllNames() as $num=>$name) {
-        				if ($name['type']=='NAME') {
-        					$title='';
-        				} else {
-        					$title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $wife)).'"';
-        				}
-        				if ($num==$wife->getPrimaryName()) {
-        					$class=' class="name2"';
-        					$sex_image=$wife->getSexImage();
-        				} else {
-        					$class='';
-        					$sex_image='';
-        				} ?>
+						if ($name['type']=='NAME') {
+							$title='';
+						} else {
+							$title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $wife)).'"';
+						}
+						if ($num==$wife->getPrimaryName()) {
+							$class=' class="name2"';
+							$sex_image=$wife->getSexImage();
+						} else {
+							$class='';
+							$sex_image='';
+						} ?>
         				<a <?= $title.' '.$class ?> href="<?= $wife->getHtmlUrl() ?>">
         					<?= \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($name['full']) ?>
         				</a>
         				<?= $sex_image.FunctionsPrint::formatSosaNumbers($dwife->getSosaNumbers(), 1, 'smaller') ?>
         				<br/>
             		<?php }
-            		echo $wife->getPrimaryParentsNames('parents details1', 'none');
-            		?>
+					echo $wife->getPrimaryParentsNames('parents details1', 'none');
+					?>
             		</td>
             		<td hidden data-sort="<?= Filter::escapeHtml($surn_givn) ?>"></td>
             		<?php $wdate=$wife->getBirthDate(); ?>
             		<td class="center" data-sort="<?= Date::getAge($wdate, $mdate, 1) ?>"><?= Date::getAge($wdate, $mdate, 2) ?></td>
             		<td data-sort="<?= $mdate->julianDay() ?>"><?php 
-            		if ($marriage_dates = $family->getAllMarriageDates()) {
-        				foreach ($marriage_dates as $n => $marriage_date) {
-        					if ($n) { echo '<br>'; } ?>
+					if ($marriage_dates = $family->getAllMarriageDates()) {
+						foreach ($marriage_dates as $n => $marriage_date) {
+							if ($n) { echo '<br>'; } ?>
         					<div><?= $marriage_date->display(true) ?></div>
         				<?php }
-            		} elseif ($family->getFacts('_NMR')) {
-            		    echo I18N::translate('no');
-            		} elseif ($family->getFacts('MARR')) {
-            		    echo I18N::translate('yes');
-            		} else {
-            		    echo '&nbsp;';
-            		} ?>
+					} elseif ($family->getFacts('_NMR')) {
+						echo I18N::translate('no');
+					} elseif ($family->getFacts('MARR')) {
+						echo I18N::translate('yes');
+					} else {
+						echo '&nbsp;';
+					} ?>
             		</td>
             		<td><?php 
-            		foreach ($family->getAllMarriagePlaces() as $n => $marriage_place) {
-				        $tmp = new Place($marriage_place, $family->getTree());
-        				if ($n) { ?><br><?php } ?>
+					foreach ($family->getAllMarriagePlaces() as $n => $marriage_place) {
+						$tmp = new Place($marriage_place, $family->getTree());
+						if ($n) { ?><br><?php } ?>
         				<a href="'<?= $tmp->getURL() ?>" title="<?= strip_tags($tmp->getFullName()) ?>">
         					<?= \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($tmp->getShortName()) ?>
         				</a>
         			<?php  } ?>
         			</td>
         			<?php if (ModuleManager::getInstance()->isOperational(Constants::MODULE_MAJ_ISSOURCED_NAME)) {
-				        $isMSourced = $dfamily->isMarriageSourced(); ?>
+						$isMSourced = $dfamily->isMarriageSourced(); ?>
 				   	<td data-sort=<?= $isMSourced ?>><?= FunctionsPrint::formatIsSourcedIcon('E', $isMSourced, 'MARR', 1, 'medium') ?></td>
 					<?php } else { ?>
 					<td>&nbsp;</td>
@@ -295,30 +295,30 @@ 
 					<td hidden><?php 
 					if (!$mdate->isOK()) { echo 'U'; }
 					else {
-					    if (Date::compare($mdate, new Date(date('Y') - 100)) > 0) { echo 'Y100'; }
-					    else { echo 'YES'; }
+						if (Date::compare($mdate, new Date(date('Y') - 100)) > 0) { echo 'Y100'; }
+						else { echo 'YES'; }
 					}
 					if ($family->getFacts(WT_EVENTS_DIV)) { echo 'D'; }
 					if (count($husb->getSpouseFamilies()) > 1 || count($wife->getSpouseFamilies()) > 1) {
-					    echo 'M';
+						echo 'M';
 					} ?>
 					</td>
 					<td hidden><?php 
-			         if ($husb->isDead() && $wife->isDead()) { echo 'Y'; }
-			         if ($husb->isDead() && !$wife->isDead()) {
-        				if ($wife->getSex() == 'F') { echo 'H'; }
-        				if ($wife->getSex() == 'M') { echo 'W'; } // male partners
-        			}
-        			if (!$husb->isDead() && $wife->isDead()) {
-        				if ($husb->getSex() == 'M') { echo 'W'; }
-        				if ($husb->getSex() == 'F') { echo  'H'; }  // female partners
-        			}
-        			if (!$husb->isDead() && !$wife->isDead()) { echo 'N'; } ?>
+					 if ($husb->isDead() && $wife->isDead()) { echo 'Y'; }
+					 if ($husb->isDead() && !$wife->isDead()) {
+						if ($wife->getSex() == 'F') { echo 'H'; }
+						if ($wife->getSex() == 'M') { echo 'W'; } // male partners
+					}
+					if (!$husb->isDead() && $wife->isDead()) {
+						if ($husb->getSex() == 'M') { echo 'W'; }
+						if ($husb->getSex() == 'F') { echo  'H'; }  // female partners
+					}
+					if (!$husb->isDead() && !$wife->isDead()) { echo 'N'; } ?>
         			</td>
         			<td hidden><?php 
-			         if (!$husb->getChildFamilies() && !$wife->getChildFamilies()) { echo 'R'; }
-			         elseif (!$husb->isDead() && !$wife->isDead() && $family->getNumberOfChildren() < 1) { echo 'L'; }
-			         else { echo '&nbsp;'; } ?>
+					 if (!$husb->getChildFamilies() && !$wife->getChildFamilies()) { echo 'R'; }
+					 elseif (!$husb->isDead() && !$wife->isDead() && $family->getNumberOfChildren() < 1) { echo 'L'; }
+					 else { echo '&nbsp;'; } ?>
 			         </td>
 				</tr>
         	<?php } ?>
@@ -356,7 +356,7 @@ 
         <p class="warning"><?= I18N::translate('No family has been found for generation %d', $this->data->get('generation')) ?></p>
         <?php 
 		}
-    }
+	}
     
 }
  
\ No newline at end of file

src/Webtrees/Module/Sosa/Views/SosaListIndiView.php

Indentation +66 added lines, -66 removed lines

@@ -31,11 +31,11 @@ 
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() { 
+	protected function renderContent() { 
         
-        if($this->data->get('has_sosa', false)) {
-            $table_id = $this->data->get('table_id');            
-        ?>   
+		if($this->data->get('has_sosa', false)) {
+			$table_id = $this->data->get('table_id');            
+		?>   
         
         <div id="sosa-indi-list" class="sosa-list">
         	<table id="<?= $table_id ?>">
@@ -177,62 +177,62 @@ 
 			<tbody>
 			
 			<?php foreach($this->data->get('sosa_list') as $sosa => $person) {
-			    /** @var \Fisharebest\Webtrees\Individual $person */
-			    if ($person->isPendingAddtion()) {
-			        $class = ' class="new"';
-			    } elseif ($person->isPendingDeletion()) {
-			        $class = ' class="old"';
-			    } else {
-			        $class = '';
-			    }
-			    $dperson = new \MyArtJaub\Webtrees\Individual($person);
-			    ?>			
+				/** @var \Fisharebest\Webtrees\Individual $person */
+				if ($person->isPendingAddtion()) {
+					$class = ' class="new"';
+				} elseif ($person->isPendingDeletion()) {
+					$class = ' class="old"';
+				} else {
+					$class = '';
+				}
+				$dperson = new \MyArtJaub\Webtrees\Individual($person);
+				?>			
         		<tr <?= $class ?>>
         			<td class="transparent"><?= $sosa ?></td>
         			<td hidden><?= $person->getXref() ?></td>
         			<?php list($surn_givn, $givn_surn) = FunctionsPrintLists::sortableNames($person); ?>
         			<td colspan="2" data-sort="<?= Filter::escapeHtml($givn_surn) ?>">
         			<?php foreach ($person->getAllNames() as $num=>$name) {
-        				if ($name['type']=='NAME') {
-        					$title='';
-        				} else {
-        					$title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $person)).'"';
-        				}
-        				if ($num==$person->getPrimaryName()) {
-        					$class=' class="name2"';
-        					$sex_image=$person->getSexImage();
-        				} else {
-        					$class='';
-        					$sex_image='';
-        				} ?>
+						if ($name['type']=='NAME') {
+							$title='';
+						} else {
+							$title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $person)).'"';
+						}
+						if ($num==$person->getPrimaryName()) {
+							$class=' class="name2"';
+							$sex_image=$person->getSexImage();
+						} else {
+							$class='';
+							$sex_image='';
+						} ?>
         				<a <?= $title.' '.$class; ?> href="<?= $person->getHtmlUrl() ?>">
         					<?= \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($name['full']) ?>
         				</a>
         				<?= $sex_image.FunctionsPrint::formatSosaNumbers($dperson->getSosaNumbers(), 1, 'smaller') ?>
         				<br/>
             		<?php }
-            		echo $person->getPrimaryParentsNames('parents details1', 'none');
-            		?>
+					echo $person->getPrimaryParentsNames('parents details1', 'none');
+					?>
             		</td>
             		<td hidden data-sort="<?= Filter::escapeHtml($surn_givn) ?>"></td>
             		<?php $birth_dates = $person->getAllBirthDates(); ?>
             		<td data-sort="<?= $person->getEstimatedBirthDate()->julianDay() ?>">
             		<?php foreach ($birth_dates as $n => $birth_date) {
-    					   if ($n > 0) { ?><br/><?php } ?>
+						   if ($n > 0) { ?><br/><?php } ?>
     						<?php  echo $birth_date->display(true);
-			        } ?>
+					} ?>
             		</td>
         			<td>
         			<?php foreach ($person->getAllBirthPlaces() as $n => $birth_place) {
-				        $tmp = new \Fisharebest\Webtrees\Place($birth_place, $person->getTree());
-        				if ($n > 0) { ?><br><?php } ?>
+						$tmp = new \Fisharebest\Webtrees\Place($birth_place, $person->getTree());
+						if ($n > 0) { ?><br><?php } ?>
         				<a href="'<?= $tmp->getURL() ?>" title="<?= strip_tags($tmp->getFullName()) ?>">
         					<?= \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($tmp->getShortName()) ?>
         				</a>
         			<?php } ?>
         			</td>
         			<?php if (ModuleManager::getInstance()->isOperational(Constants::MODULE_MAJ_ISSOURCED_NAME)) {
-				        $isBSourced = $dperson->isBirthSourced(); ?>
+						$isBSourced = $dperson->isBirthSourced(); ?>
 				   	<td data-sort="<?= $isBSourced ?>"><?= FunctionsPrint::formatIsSourcedIcon('E', $isBSourced, 'BIRT', 1, 'medium') ?></td>
 					<?php } else { ?>
 					<td>&nbsp;</td>
@@ -240,63 +240,63 @@ 
 					<?php $death_dates = $person->getAllDeathDates(); ?>
 					<td data-sort="<?= $person->getEstimatedDeathDate()->julianDay() ?>">
 					<?php foreach ($death_dates as $num => $death_date) {
-					       if ($num) { ?><br/><?php } ?>
+						   if ($num) { ?><br/><?php } ?>
 					 		<?php echo $death_date->display(true); 
-				     } ?>
+					 } ?>
 			         </td>
 			         <?php if (isset($birth_dates[0]) && isset($death_dates[0])) {
-			             $age_at_death = Date::getAge($birth_dates[0], $death_dates[0], 0);
-			             $age_at_death_sort = Date::getAge($birth_dates[0], $death_dates[0], 2);
-			         } else {
-			             $age_at_death      = '';
-			             $age_at_death_sort = PHP_INT_MAX;
-			         } ?>
+						 $age_at_death = Date::getAge($birth_dates[0], $death_dates[0], 0);
+						 $age_at_death_sort = Date::getAge($birth_dates[0], $death_dates[0], 2);
+					 } else {
+						 $age_at_death      = '';
+						 $age_at_death_sort = PHP_INT_MAX;
+					 } ?>
 			         <td class="center" data-sort="<?= $age_at_death_sort ?>"><?= $age_at_death ?></td>
 			         <td>
         			 <?php foreach ($person->getAllDeathPlaces() as $n => $death_place) {
-        				$tmp = new Place($death_place, $person->getTree());
-        				if ($n) { ?><br><?php } ?>
+						$tmp = new Place($death_place, $person->getTree());
+						if ($n) { ?><br><?php } ?>
         				<a href="'<?= $tmp->getURL() ?>" title="<?= strip_tags($tmp->getFullName()) ?>">
         					<?= \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($tmp->getShortName()) ?>
         				</a>
         			<?php } ?>
         			</td>
         			<?php if (ModuleManager::getInstance()->isOperational(Constants::MODULE_MAJ_ISSOURCED_NAME)) {
-        			    if($person->isDead()) {
-        			        $isDSourced = $dperson->isDeathSourced(); ?>
+						if($person->isDead()) {
+							$isDSourced = $dperson->isDeathSourced(); ?>
 				   	<td data-sort=<?= $isDSourced ?>><?= FunctionsPrint::formatIsSourcedIcon('E', $isDSourced, 'DEAT', 1, 'medium') ?></td>
 					<?php } else { ?>
 					<td data-sort="-99">&nbsp;</td>
 					<?php } 
-        			} else { ?>
+					} else { ?>
 					<td>&nbsp;</td>
 					<?php } ?>
 					<td hidden><?= $person->getSex() ?></td>
 					<td hidden>
 					<?php if (!$person->canShow() || Date::compare($person->getEstimatedBirthDate(), new Date(date('Y') - 100)) > 0) {
-					    echo 'Y100';
-        			} else {
-        				echo 'YES';
-        			} ?>
+						echo 'Y100';
+					} else {
+						echo 'YES';
+					} ?>
         			</td>
         			<td hidden>
         			<?php if (isset($death_dates[0]) && Date::compare($death_dates[0], new Date(date('Y') - 100)) > 0) {
-				        echo 'Y100';
-        			} elseif ($person->isDead()) {
-				        echo 'YES';
-        			} else {
-				        echo 'N';
-			         } ?>
+						echo 'Y100';
+					} elseif ($person->isDead()) {
+						echo 'YES';
+					} else {
+						echo 'N';
+					 } ?>
 			         </td>
 			         <td hidden>
 					<?php if (!$person->getChildFamilies()) {
-					    echo 'R';
+						echo 'R';
 					}  // roots
 					elseif (!$person->isDead() && $person->getNumberOfChildren() < 1) {
-            			echo 'L';
+						echo 'L';
 					} // leaves
 					else {
-					    echo '&nbsp;';
+						echo '&nbsp;';
 					} ?>
 					</td>
 				</tr>
@@ -307,12 +307,12 @@ 
 					<th class="ui-state-default" colspan="15">
 						<div class="center">
 							<?= I18N::translate('Number of Sosa ancestors: %1$s known / %2$s theoretical (%3$s)',
-							    I18N::number($this->data->get('sosa_count')),
-							    I18N::number($this->data->get('sosa_theo')), 
-							    I18N::percentage($this->data->get('sosa_ratio'),2)
-							    ) ?>
+								I18N::number($this->data->get('sosa_count')),
+								I18N::number($this->data->get('sosa_theo')), 
+								I18N::percentage($this->data->get('sosa_ratio'),2)
+								) ?>
 							<?php if($this->data->get('sosa_hidden') > 0) {
-							    echo '['. I18N::translate('%s hidden', I18N::number($this->data->get('sosa_hidden'))).']';
+								echo '['. I18N::translate('%s hidden', I18N::number($this->data->get('sosa_hidden'))).']';
 							} ?>
 						</div>
 					</th>
@@ -346,8 +346,8 @@ 
 				</div>
 			</div>
 		<?php 
-        }
-    }
+		}
+	}
     
 }
  
\ No newline at end of file

src/Webtrees/Module/Sosa/Views/SosaListMissingView.php

Indentation +43 added lines, -43 removed lines

@@ -30,16 +30,16 @@ 
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() {
-        ?>
+	protected function renderContent() {
+		?>
             <div id="maj-sosa-missing-page" class="center">
     			<h2><?= $this->data->get('title') ?></h2>
     			
     			<?php  if($this->data->get('is_setup')) { 
-    			    $this->renderSosaHeader();
-    			    if($this->data->get('has_missing', false)) {
-    			        $table_id = $this->data->get('table_id');
-    			        ?>
+					$this->renderSosaHeader();
+					if($this->data->get('has_missing', false)) {
+						$table_id = $this->data->get('table_id');
+						?>
     			<div id="sosa-indi-missing" class="smissing-list">
                 	<table id="<?= $table_id ?>">
         				<thead>     
@@ -103,48 +103,48 @@ 
         			<tbody>
         			
         			<?php foreach($this->data->get('missing_list') as $missing_tab) {
-        			    $person = $missing_tab['indi'];
+						$person = $missing_tab['indi'];
         			    
-        			    /** @var \Fisharebest\Webtrees\Individual $person */
-        			    if ($person->isPendingAddtion()) {
-        			        $class = ' class="new"';
-        			    } elseif ($person->isPendingDeletion()) {
-        			        $class = ' class="old"';
-        			    } else {
-        			        $class = '';
-        			    }
-        			    $dperson = new \MyArtJaub\Webtrees\Individual($person);
-        			    list($surn_givn, $givn_surn) = FunctionsPrintLists::sortableNames($person);
-        			    ?>			
+						/** @var \Fisharebest\Webtrees\Individual $person */
+						if ($person->isPendingAddtion()) {
+							$class = ' class="new"';
+						} elseif ($person->isPendingDeletion()) {
+							$class = ' class="old"';
+						} else {
+							$class = '';
+						}
+						$dperson = new \MyArtJaub\Webtrees\Individual($person);
+						list($surn_givn, $givn_surn) = FunctionsPrintLists::sortableNames($person);
+						?>			
                 		<tr <?= $class ?>>
                 			<td class="transparent"><?= $missing_tab['sosa'] ?></td>
                 			<td class="transparent"><?= $person->getXref() ?></td>
                 			<td colspan="2" data-sort="<?= Filter::escapeHtml($givn_surn) ?>">
                 			<?php foreach ($person->getAllNames() as $num=>$name) {
-                				if ($name['type']=='NAME') {
-                					$title='';
-                				} else {
-                					$title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $person)).'"';
-                				}
-                				if ($num==$person->getPrimaryName()) {
-                					$class=' class="name2"';
-                					$sex_image=$person->getSexImage();
-                				} else {
-                					$class='';
-                					$sex_image='';
-                				} ?>
+								if ($name['type']=='NAME') {
+									$title='';
+								} else {
+									$title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $person)).'"';
+								}
+								if ($num==$person->getPrimaryName()) {
+									$class=' class="name2"';
+									$sex_image=$person->getSexImage();
+								} else {
+									$class='';
+									$sex_image='';
+								} ?>
                 				<a <?= $title.' '.$class ?> href="<?= $person->getHtmlUrl() ?>">
                 					<?= \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($name['full']) ?>
                 				</a>
                 				<?= $sex_image.FunctionsPrint::formatSosaNumbers($dperson->getSosaNumbers(), 1, 'smaller') ?>
                 				<br/>
                     		<?php }
-                    		echo $person->getPrimaryParentsNames('parents details1', 'none');
-                    		?>
+							echo $person->getPrimaryParentsNames('parents details1', 'none');
+							?>
                     		</td>
 							<td hidden data-sort="<?= Filter::escapeHtml($surn_givn) ?>"></td>             		
                 			<?php if (ModuleManager::getInstance()->isOperational(Constants::MODULE_MAJ_ISSOURCED_NAME)) {
-        				        $isISourced = $dperson->isSourced(); ?>
+								$isISourced = $dperson->isSourced(); ?>
         				   	<td data-sort="<?= $isISourced ?>"><?= FunctionsPrint::formatIsSourcedIcon('R', $isISourced, 'INDI', 1, 'medium') ?></td>
         					<?php } else { ?>
         					<td>&nbsp;</td>
@@ -154,23 +154,23 @@ 
                     		<?php $birth_dates = $person->getAllBirthDates(); ?>
                     		<td data-sort="<?= $person->getEstimatedBirthDate()->julianDay() ?>">
                     		<?php                     		
-                    		foreach ($birth_dates as $n => $birth_date) {
-                    		    if ($n > 0) { ?> <br> <?php  } 
-                    		    echo $birth_date->display(true);
-                    		}
-                    		?>
+							foreach ($birth_dates as $n => $birth_date) {
+								if ($n > 0) { ?> <br> <?php  } 
+								echo $birth_date->display(true);
+							}
+							?>
                     		</td>
                 			<td>
                 			<?php foreach ($person->getAllBirthPlaces() as $n => $birth_place) {
-        				        $tmp = new \Fisharebest\Webtrees\Place($birth_place, $person->getTree());
-                				if ($n > 0) { ?><br><?php } ?>
+								$tmp = new \Fisharebest\Webtrees\Place($birth_place, $person->getTree());
+								if ($n > 0) { ?><br><?php } ?>
                 				<a href="'<?= $tmp->getURL(); ?>" title="<?= strip_tags($tmp->getFullName()) ?>">
                 					<?= \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($tmp->getShortName()) ?>
                 				</a>
                 			<?php } ?>
                 			</td>
         					<?php if (ModuleManager::getInstance()->isOperational(Constants::MODULE_MAJ_ISSOURCED_NAME)) {
-        				        $isBSourced = $dperson->isBirthSourced(); ?>
+								$isBSourced = $dperson->isBirthSourced(); ?>
         				   	<td data-sort="<?= $isBSourced ?>"><?= FunctionsPrint::formatIsSourcedIcon('E', $isBSourced, 'BIRT', 1, 'medium') ?></td>
         					<?php } else { ?>
         					<td>&nbsp;</td>
@@ -195,7 +195,7 @@ 
     			 <?php } else if ($this->data->get('generation', 0) > 0) { ?> 
     			<p><?= I18N::translate('No ancestors are missing for this generation. Generation complete at %s.', I18N::percentage($this->data->get('perc_sosa'), 2)) ?></p>
     			    <?php }   			    
-    			} else { ?>
+				} else { ?>
     			<p class="warning"><?= I18N::translate('The list could not be displayed. Reasons might be:') ?><br/>
     				<ul>
     					<li><?= I18N::translate('No Sosa root individual has been defined.') ?></li>
@@ -206,6 +206,6 @@ 
     			<?php } ?>
     		</div> 
     		<?php 
-        }
+		}
 }
  
\ No newline at end of file