jon48 / webtrees-lib

src/Webtrees/Cache.php

Doc Comments +1 added lines, -1 removed lines

@@ -146,7 +146,7 @@
 	/**
 	 * Static invocation of the *save* method.
 	 *
-	 * @param string|\Psr\Cache\CacheItemInterface $value Value name
+	 * @param CacheItemInterface $value Value name
 	 * @param mixed $data Value
 	 * @param AbstractModule $mod Calling module
 	 */

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

Spacing +15 added lines, -15 removed lines

@@ -20,13 +20,13 @@ 
 /**
  * Cache component to speed up some potential data retrievals
  */
-class Cache{
+class Cache {
 	
     /**
      * Underlying Cache object
      * @var CacheItemPoolInterface $cache
      */
-	protected $cache=null;
+	protected $cache = null;
 	
 	/**
 	 * Defines whether the cache has been initialised
@@ -59,7 +59,7 @@ 
 	 *
 	 */
 	protected function init() {		
-	    if(Apc::isAvailable()) {
+	    if (Apc::isAvailable()) {
 		    $driver = new Apc();
 		} else {
 			if (!is_dir(WT_DATA_DIR.DIRECTORY_SEPARATOR.'cache')) {
@@ -83,8 +83,8 @@ 
 	 * Initiliase the Cache if not done.
 	 *
 	 */
-	protected function checkInit(){
-		if(!$this->is_init) $this->init();
+	protected function checkInit() {
+		if (!$this->is_init) $this->init();
 	}
 	
 	/**
@@ -94,10 +94,10 @@ 
 	 * @param AbstractModule $mod Calling module
 	 * @return string Cached key name
 	 */
-	protected function getKeyName($value, AbstractModule $mod = null){
+	protected function getKeyName($value, AbstractModule $mod = null) {
 	    $this->checkInit();
 		$mod_name = 'myartjaub';
-		if($mod !== null) $mod_name = $mod->getName();
+		if ($mod !== null) $mod_name = $mod->getName();
 		return $mod_name.'_'.$value;
 	}
 	
@@ -108,7 +108,7 @@ 
 	 * @param AbstractModule $mod Calling module
 	 * @return \Psr\Cache\CacheItemInterface
 	 */
-	public function getI($value, AbstractModule $mod = null){
+	public function getI($value, AbstractModule $mod = null) {
 	    $this->checkInit();
 		return $this->cache->getItem($this->getKeyName($value, $mod));
 	}
@@ -120,7 +120,7 @@ 
 	 * @param AbstractModule $mod Calling module
 	 * @return \Psr\Cache\CacheItemInterface
 	 */
-	public static function get($value, AbstractModule $mod = null){
+	public static function get($value, AbstractModule $mod = null) {
 	    return self::getInstance()->getI($value, $mod);
 	}
 	
@@ -131,11 +131,11 @@ 
 	 * @param mixed $data Value
 	 * @param AbstractModule $mod Calling module
 	 */
-	public function saveI($value, $data, AbstractModule $mod = null){
+	public function saveI($value, $data, AbstractModule $mod = null) {
 		$this->checkInit();
 		
 		$item = $value;
-		if(!($value instanceof CacheItemInterface)) {
+		if (!($value instanceof CacheItemInterface)) {
 		    $item = new \Stash\Item();
     		$item->setKey($this->getKeyName($value, $mod));
 		}		
@@ -150,7 +150,7 @@ 
 	 * @param mixed $data Value
 	 * @param AbstractModule $mod Calling module
 	 */
-	public static function save($value, $data, AbstractModule $mod = null){
+	public static function save($value, $data, AbstractModule $mod = null) {
 	    self::getInstance()->saveI($value, $data, $mod);
 	}
 	
@@ -161,7 +161,7 @@ 
 	 * @param AbstractModule $mod Calling module
 	 * @return bool Deletion successful?
 	 */
-	public function deleteI($value, AbstractModule $mod = null){
+	public function deleteI($value, AbstractModule $mod = null) {
 	    $this->checkInit();	
 	    return $this->cache->deleteItem($this->getKeyName($value, $mod));
 	}
@@ -173,7 +173,7 @@ 
 	 * @param AbstractModule $mod Calling module
 	 * @return bool Deletion successful?
 	 */
-	public static function delete($value, AbstractModule $mod = null){
+	public static function delete($value, AbstractModule $mod = null) {
 	    return self::getInstance()->deleteI($value, $mod);
 	}
 	
@@ -181,7 +181,7 @@ 
 	 * Clean the cache
 	 *
 	 */
-	public function cleanI(){
+	public function cleanI() {
 	    $this->checkInit();
 		$this->cache->clear();
 	}

src/Webtrees/Controller/JsonController.php

Indentation +41 added lines, -41 removed lines

@@ -18,50 +18,50 @@
  */
 class JsonController extends BaseController {
     
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Controller\BaseController::pageHeader()
-     */
-    public function pageHeader() {        
-        header('Content-Type: application/json');
-        header('Cache-Control: no-cache, must-revalidate');
-        header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
-        // We've displayed the header - display the footer automatically
-        register_shutdown_function(array($this, 'pageFooter'));
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Controller\BaseController::pageHeader()
+	 */
+	public function pageHeader() {        
+		header('Content-Type: application/json');
+		header('Cache-Control: no-cache, must-revalidate');
+		header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+		// We've displayed the header - display the footer automatically
+		register_shutdown_function(array($this, 'pageFooter'));
         
-        return $this;
-    }
+		return $this;
+	}
     
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Controller\BaseController::pageFooter()
-     */
-    public function pageFooter() {
-        return $this;
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Controller\BaseController::pageFooter()
+	 */
+	public function pageFooter() {
+		return $this;
+	}
     
-    /**
-     * Restrict access.
-     *
-     * @param bool $condition
-     *
-     * @return $this
-     */
-    public function restrictAccess($condition) {
-        if ($condition !== true) {
-            throw new MvcException(403);
-        }
+	/**
+	 * Restrict access.
+	 *
+	 * @param bool $condition
+	 *
+	 * @return $this
+	 */
+	public function restrictAccess($condition) {
+		if ($condition !== true) {
+			throw new MvcException(403);
+		}
     
-        return $this;
-    }
+		return $this;
+	}
     
-    /**
-     * Encode the data to JSON format.
-     * 
-     * @param array $data Data to encode
-     * @param number $options JSON options mask. See http://php.net/manual/fr/json.constants.php
-     */
-    public function encode(array $data, $options = 0) {
-        echo json_encode($data, $options);
-    }
+	/**
+	 * Encode the data to JSON format.
+	 * 
+	 * @param array $data Data to encode
+	 * @param number $options JSON options mask. See http://php.net/manual/fr/json.constants.php
+	 */
+	public function encode(array $data, $options = 0) {
+		echo json_encode($data, $options);
+	}
 }

src/Webtrees/Module/GeoDispersion/AdminConfigController.php

Indentation +216 added lines, -216 removed lines

@@ -35,59 +35,59 @@ 
  */
 class AdminConfigController extends MvcController
 {    
-    /**
-     * GeoAnalysis Provider
-     * @var GeoAnalysisProvider $provider
-     */
-    protected $provider;    
+	/**
+	 * GeoAnalysis Provider
+	 * @var GeoAnalysisProvider $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
+	 */
         
-    /**
-     * 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::isManager($WT_TREE))
-            ->setPageTitle($this->module->getTitle());
+		Theme::theme(new AdministrationTheme)->init($WT_TREE);
+		$controller = new PageController();
+		$controller
+			->restrictAccess(Auth::isManager($WT_TREE))
+			->setPageTitle($this->module->getTitle());
         
-        $data = new ViewBag();
-        $data->set('title', $controller->getPageTitle());
-        $data->set('tree', $WT_TREE);
+		$data = new ViewBag();
+		$data->set('title', $controller->getPageTitle());
+		$data->set('tree', $WT_TREE);
         
-        $data->set('root_url', 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig');
+		$data->set('root_url', 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig');
                 
-        $table_id = 'table-geoanalysis-' . Uuid::uuid4();
-        $data->set('table_id', $table_id);
+		$table_id = 'table-geoanalysis-' . Uuid::uuid4();
+		$data->set('table_id', $table_id);
         
-        $other_trees = array();
-        foreach (Tree::getAll() as $tree) {
-            if($tree->getTreeId() != $WT_TREE->getTreeId()) $other_trees[] = $tree;
-        }      
-        $data->set('other_trees', $other_trees);
+		$other_trees = array();
+		foreach (Tree::getAll() as $tree) {
+			if($tree->getTreeId() != $WT_TREE->getTreeId()) $other_trees[] = $tree;
+		}      
+		$data->set('other_trees', $other_trees);
         
-        $data->set('places_hierarchy', $this->provider->getPlacesHierarchy());
+		$data->set('places_hierarchy', $this->provider->getPlacesHierarchy());
         
-        $controller
-            ->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
-            ->addExternalJavascript(WT_DATATABLES_BOOTSTRAP_JS_URL)
-            ->addInlineJavascript('
+		$controller
+			->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(/<[^<]*>/, ""))};
@@ -122,7 +122,7 @@ 
 				});
                 
                 ')
-                ->addInlineJavascript('				
+				->addInlineJavascript('				
                     function set_geoanalysis_status(ga_id, status, gedcom) {
                 		jQuery.ajax({
                             url: "module.php", 
@@ -166,55 +166,55 @@ 
                 ');
         
         
-        ViewFactory::make('AdminConfig', $this, $controller, $data)->render();
-    }
+		ViewFactory::make('AdminConfig', $this, $controller, $data)->render();
+	}
 
-    /**
-     * AdminConfig@jsonGeoAnalysisList
-     */
-    public function jsonGeoAnalysisList() {
-        global $WT_TREE;
+	/**
+	 * AdminConfig@jsonGeoAnalysisList
+	 */
+	public function jsonGeoAnalysisList() {
+		global $WT_TREE;
         
-        $controller = new JsonController();
-        $controller
-            ->restrictAccess(Auth::isManager($WT_TREE));
+		$controller = new JsonController();
+		$controller
+			->restrictAccess(Auth::isManager($WT_TREE));
         
-        // 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');
         
-        foreach($order as $key => &$value) {
-            switch($value['column']) {
-                case 3:
-                    $value['column'] = 'majgd_descr';
-                    break;
-                case 5;
-                    $value['column'] = 'majgd_sublevel';
-                    break;
-                default:
-                    unset($order[$key]);
-            }
-        }
+		foreach($order as $key => &$value) {
+			switch($value['column']) {
+				case 3:
+					$value['column'] = 'majgd_descr';
+					break;
+				case 5;
+					$value['column'] = 'majgd_sublevel';
+					break;
+				default:
+					unset($order[$key]);
+			}
+		}
         
-        /** @var GeoAnalysisProvider $provider */
-        $provider = $this->module->getProvider();
+		/** @var GeoAnalysisProvider $provider */
+		$provider = $this->module->getProvider();
         
-        $list = $provider->getFilteredGeoAnalysisList($search, $order, $start, $length);
-        $recordsFiltered = count($list);
-        $recordsTotal = $this->provider->getGeoAnalysisCount();
+		$list = $provider->getFilteredGeoAnalysisList($search, $order, $start, $length);
+		$recordsFiltered = count($list);
+		$recordsTotal = $this->provider->getGeoAnalysisCount();
         
-        $data = array();
-        $place_hierarchy = $this->provider->getPlacesHierarchy();
-        foreach($list as $ga) {
-            /** @var GeoAnalysis $ga */
+		$data = array();
+		$place_hierarchy = $this->provider->getPlacesHierarchy();
+		foreach($list as $ga) {
+			/** @var GeoAnalysis $ga */
             
-            $datum = array();
-            $options= $ga->getOptions();
+			$datum = array();
+			$options= $ga->getOptions();
             
-            $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,108 +238,108 @@ 
                        </li>
                     </ul>
                 </div>';
-		    $datum[1] = $ga->getId();
-		    $datum[2] = $ga->isEnabled() ? 
+			$datum[1] = $ga->getId();
+			$datum[2] = $ga->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] = $ga->getTitle();
-		    $analysis_level = $ga->getAnalysisLevel();
-		    if($place_hierarchy['type'] == 'header') {
-		        $datum[4] = $place_hierarchy['hierarchy'][$analysis_level - 1];
-		    } else {
-		        $datum[4] = $analysis_level . '(' . $place_hierarchy['hierarchy'][$analysis_level - 1] . ')';
-		    }
-		    $datum[5] = $ga->getAnalysisLevel();
-		    $datum[6] = '<i class="fa fa-times"></i><span class="sr-only">'.I18N::translate('None').'</span>';
-		    $datum[7] = '<i class="fa fa-times"></i><span class="sr-only">'.I18N::translate('None').'</span>';
-		    if($ga->hasMap()) {
-		        $datum[6] = $options->getMap()->getDescription();
-		        $datum[7] = '<span data-toggle="tooltip" title="' . $options->getMap()->getTopLevelName() . '" />';
-		        $top_level = $options->getMapLevel();
-		        if($place_hierarchy['type'] == 'header') {
-		            $datum[7] .= $place_hierarchy['hierarchy'][$top_level - 1];
-		        } else {
-		            $datum[7] .= $top_level . '(' . $place_hierarchy['hierarchy'][$top_level - 1] . ')';
-		        }
-		        $datum[7] .= '</span>';
-		    }
-		    $datum[8] = $options->isUsingFlags() ? 
+			$datum[3] = $ga->getTitle();
+			$analysis_level = $ga->getAnalysisLevel();
+			if($place_hierarchy['type'] == 'header') {
+				$datum[4] = $place_hierarchy['hierarchy'][$analysis_level - 1];
+			} else {
+				$datum[4] = $analysis_level . '(' . $place_hierarchy['hierarchy'][$analysis_level - 1] . ')';
+			}
+			$datum[5] = $ga->getAnalysisLevel();
+			$datum[6] = '<i class="fa fa-times"></i><span class="sr-only">'.I18N::translate('None').'</span>';
+			$datum[7] = '<i class="fa fa-times"></i><span class="sr-only">'.I18N::translate('None').'</span>';
+			if($ga->hasMap()) {
+				$datum[6] = $options->getMap()->getDescription();
+				$datum[7] = '<span data-toggle="tooltip" title="' . $options->getMap()->getTopLevelName() . '" />';
+				$top_level = $options->getMapLevel();
+				if($place_hierarchy['type'] == 'header') {
+					$datum[7] .= $place_hierarchy['hierarchy'][$top_level - 1];
+				} else {
+					$datum[7] .= $top_level . '(' . $place_hierarchy['hierarchy'][$top_level - 1] . ')';
+				}
+				$datum[7] .= '</span>';
+			}
+			$datum[8] = $options->isUsingFlags() ? 
 				'<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>';
-		    $datum[9] = $options->getMaxDetailsInGen() > 0 ? $options->getMaxDetailsInGen() : I18N::translate('All');
+			$datum[9] = $options->getMaxDetailsInGen() > 0 ? $options->getMaxDetailsInGen() : I18N::translate('All');
 		    
-		    $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@edit
-     */
-    public function edit() {
-        $ga_id = Filter::getInteger('ga_id');
-        $ga = $this->provider->getGeoAnalysis($ga_id, false);
+	/**
+	 * AdminConfig@edit
+	 */
+	public function edit() {
+		$ga_id = Filter::getInteger('ga_id');
+		$ga = $this->provider->getGeoAnalysis($ga_id, false);
         
-        $this->renderEdit($ga);
-    }
+		$this->renderEdit($ga);
+	}
     
-    /**
-     * AdminConfig@add
-     */
-    public function add() {
-        $this->renderEdit(null);
-    }
+	/**
+	 * AdminConfig@add
+	 */
+	public function add() {
+		$this->renderEdit(null);
+	}
     
-    /**
-     * AdminConfig@save
-     */
-    public function save() {
-        global $WT_TREE;
+	/**
+	 * AdminConfig@save
+	 */
+	public function save() {
+		global $WT_TREE;
         
-        $tmp_contrl = new PageController();
-        $tmp_contrl->restrictAccess(
-            Auth::isManager($WT_TREE) 
-            && Filter::checkCsrf()
-         );
+		$tmp_contrl = new PageController();
+		$tmp_contrl->restrictAccess(
+			Auth::isManager($WT_TREE) 
+			&& Filter::checkCsrf()
+		 );
         
-        $ga_id          = Filter::postInteger('ga_id');
-        $description    = Filter::post('description');
-        $analysislevel  = Filter::postInteger('analysislevel');
-        $use_map        = Filter::postBool('use_map');
-        if($use_map) {
-            $map_file   = base64_decode(Filter::post('map_file'));
-            $map_top_level   = Filter::postInteger('map_top_level');
-        }
-        $use_flags      = Filter::postBool('use_flags');
-        $gen_details    = Filter::postInteger('gen_details');
+		$ga_id          = Filter::postInteger('ga_id');
+		$description    = Filter::post('description');
+		$analysislevel  = Filter::postInteger('analysislevel');
+		$use_map        = Filter::postBool('use_map');
+		if($use_map) {
+			$map_file   = base64_decode(Filter::post('map_file'));
+			$map_top_level   = Filter::postInteger('map_top_level');
+		}
+		$use_flags      = Filter::postBool('use_flags');
+		$gen_details    = Filter::postInteger('gen_details');
         
-        $success = false; 
-        if($ga_id) {
-            $ga = $this->provider->getGeoAnalysis($ga_id, false);
-            if($ga) {
-                $ga->setTitle($description);
-                $ga->setAnalysisLevel($analysislevel + 1);
-                $options = $ga->getOptions();
-                if($options) {
-                    $options->setUsingFlags($use_flags);
-                    $options->setMaxDetailsInGen($gen_details);
-                    if($use_map) {
-                        $options->setMap(new OutlineMap($map_file));
-                        $options->setMapLevel($map_top_level + 1);
-                    }
-                    else {
-                        $options->setMap(null);
-                    }
-                }
+		$success = false; 
+		if($ga_id) {
+			$ga = $this->provider->getGeoAnalysis($ga_id, false);
+			if($ga) {
+				$ga->setTitle($description);
+				$ga->setAnalysisLevel($analysislevel + 1);
+				$options = $ga->getOptions();
+				if($options) {
+					$options->setUsingFlags($use_flags);
+					$options->setMaxDetailsInGen($gen_details);
+					if($use_map) {
+						$options->setMap(new OutlineMap($map_file));
+						$options->setMapLevel($map_top_level + 1);
+					}
+					else {
+						$options->setMap(null);
+					}
+				}
 				
 				$res = $this->provider->updateGeoAnalysis($ga);
 				if($res) {
@@ -352,8 +352,8 @@ 
 					FlashMessages::addMessage(I18N::translate('An error occured while updating the geographical dispersion analysis “%s”', $ga->getTitle()), 'danger');
 					Log::addConfigurationLog('Module '.$this->module->getName().' : Geo Analysis ID “'. $ga->getId() .'” could not be updated. See error log.');
 				}
-            }
-        } else {
+			}
+		} else {
 			$ga = $this->provider->createGeoAnalysis(
 				$description,
 				$analysislevel + 1,
@@ -371,34 +371,34 @@ 
 				FlashMessages::addMessage(I18N::translate('An error occured while adding the geographical dispersion analysis “%s”', $description), 'danger');
 				Log::addConfigurationLog('Module '.$this->module->getName().' : Geo Analysis “'.$description.'” could not be added. See error log.');
 			}
-        }
+		}
         
-        $redirection_url = 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig&ged=' . $WT_TREE->getNameUrl();
-        if(!$success) {			
-            if($ga) {
-                $redirection_url = 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig@edit&ga_id='. $ga->getId() .'&ged=' . $WT_TREE->getNameUrl();
-            }
-            else {
-                $redirection_url = 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig@add&ged=' . $WT_TREE->getNameUrl();
-            }
-        }        
-        header('Location: ' . WT_BASE_URL . $redirection_url);
+		$redirection_url = 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig&ged=' . $WT_TREE->getNameUrl();
+		if(!$success) {			
+			if($ga) {
+				$redirection_url = 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig@edit&ga_id='. $ga->getId() .'&ged=' . $WT_TREE->getNameUrl();
+			}
+			else {
+				$redirection_url = 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig@add&ged=' . $WT_TREE->getNameUrl();
+			}
+		}        
+		header('Location: ' . WT_BASE_URL . $redirection_url);
         
-    }
+	}
      
 	/**
 	 * Renders the edit form, whether it is an edition of an existing GeoAnalysis, or the addition of a new one.
 	 * 
 	 * @param (GeoAnalysis!null) $ga GeoAnalysis to edit
 	 */
-    protected function renderEdit(GeoAnalysis $ga = null) {
-        global $WT_TREE;
+	protected function renderEdit(GeoAnalysis $ga = null) {
+		global $WT_TREE;
         
-        Theme::theme(new AdministrationTheme)->init($WT_TREE);
-        $controller = new PageController();        
-        $controller
-            ->restrictAccess(Auth::isManager($WT_TREE))
-            ->addInlineJavascript('
+		Theme::theme(new AdministrationTheme)->init($WT_TREE);
+		$controller = new PageController();        
+		$controller
+			->restrictAccess(Auth::isManager($WT_TREE))
+			->addInlineJavascript('
                 function toggleMapOptions() {
                     if($("input:radio[name=\'use_map\']:checked").val() == 1) {
                         $("#map_options").show();
@@ -412,34 +412,34 @@ 
                 toggleMapOptions();
             ');
         
-        $data = new ViewBag();
-        if($ga) {
-            $controller->setPageTitle(I18N::translate('Edit the geographical dispersion analysis'));
-            $data->set('geo_analysis', $ga);
-        } else {
-            $controller->setPageTitle(I18N::translate('Add a geographical dispersion analysis'));
-        }
+		$data = new ViewBag();
+		if($ga) {
+			$controller->setPageTitle(I18N::translate('Edit the geographical dispersion analysis'));
+			$data->set('geo_analysis', $ga);
+		} else {
+			$controller->setPageTitle(I18N::translate('Add a geographical dispersion analysis'));
+		}
         
-        $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('save_url', 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig@save&ged=' . $WT_TREE->getNameUrl());
-        $data->set('places_hierarchy', $this->provider->getPlacesHierarchy());
+		$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('save_url', 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig@save&ged=' . $WT_TREE->getNameUrl());
+		$data->set('places_hierarchy', $this->provider->getPlacesHierarchy());
     
-        $map_list = array_map(
-            function(OutlineMap $map) {
-                return $map->getDescription();
-            },
-            $this->provider->getOutlineMapsList()
-            );
-        asort($map_list);
-        $data->set('map_list', $map_list);
+		$map_list = array_map(
+			function(OutlineMap $map) {
+				return $map->getDescription();
+			},
+			$this->provider->getOutlineMapsList()
+			);
+		asort($map_list);
+		$data->set('map_list', $map_list);
     
-        $gen_details = array(0 => I18N::translate('All'));
-        for($i = 1; $i <= 10 ; $i++) $gen_details[$i] = $i;
-        $data->set('generation_details', $gen_details);
+		$gen_details = array(0 => I18N::translate('All'));
+		for($i = 1; $i <= 10 ; $i++) $gen_details[$i] = $i;
+		$data->set('generation_details', $gen_details);
     
-        ViewFactory::make('GeoAnalysisEdit', $this, $controller, $data)->render();
-    }
+		ViewFactory::make('GeoAnalysisEdit', $this, $controller, $data)->render();
+	}
     
 }
\ No newline at end of file

src/Webtrees/Module/GeoDispersion/GeoAnalysisController.php

Indentation +231 added lines, -231 removed lines

@@ -35,47 +35,47 @@ 
  */
 class GeoAnalysisController extends MvcController
 {
-    /**
-     * GeoAnalysis Provider
-     * @var GeoAnalysisProvider $provider
-     */
-    protected $provider;
+	/**
+	 * GeoAnalysis Provider
+	 * @var GeoAnalysisProvider $provider
+	 */
+	protected $provider;
     
-    /**
-     * Constructor for GeoAnalysis controller
-     * @param AbstractModule $module
-     */
-    public function __construct(AbstractModule $module) {
-        parent::__construct($module);
+	/**
+	 * Constructor for GeoAnalysis controller
+	 * @param AbstractModule $module
+	 */
+	public function __construct(AbstractModule $module) {
+		parent::__construct($module);
         
-        $this->provider = $this->module->getProvider();
-    }    
+		$this->provider = $this->module->getProvider();
+	}    
     
-    /**
-     * Pages
-     */
+	/**
+	 * Pages
+	 */
         
-    /**
-     * GeoAnalysis@index
-     */
-    public function index() {
+	/**
+	 * GeoAnalysis@index
+	 */
+	public function index() {
         
-        $controller = new PageController();
-        $controller->setPageTitle(I18N::translate('Sosa Geographical dispersion'));
+		$controller = new PageController();
+		$controller->setPageTitle(I18N::translate('Sosa Geographical dispersion'));
         
-        $data = new ViewBag();
-        $data->set('title', $controller->getPageTitle());
-        $data->set('has_analysis', false);
+		$data = new ViewBag();
+		$data->set('title', $controller->getPageTitle());
+		$data->set('has_analysis', false);
         
-        $ga_id = Filter::getInteger('ga_id');        
+		$ga_id = Filter::getInteger('ga_id');        
         
-        if($ga_id && $ga = $this->provider->getGeoAnalysis($ga_id)) {
-            $data->set('has_analysis', true);
-            $data->set('geoanalysis', $ga);
+		if($ga_id && $ga = $this->provider->getGeoAnalysis($ga_id)) {
+			$data->set('has_analysis', true);
+			$data->set('geoanalysis', $ga);
             
-            $controller
-                ->addExternalJavascript(Constants::WT_RAPHAEL_JS_URL())
-                ->addInlineJavascript('
+			$controller
+				->addExternalJavascript(Constants::WT_RAPHAEL_JS_URL())
+				->addInlineJavascript('
                 jQuery("#geodispersion-tabs").tabs();
                 jQuery("#geodispersion-tabs").css("visibility", "visible");
                 
@@ -96,133 +96,133 @@ 
 					"json"
 				);
             ');
-        }
+		}
         
-        ViewFactory::make('GeoAnalysis', $this, $controller, $data)->render();
-    }
+		ViewFactory::make('GeoAnalysis', $this, $controller, $data)->render();
+	}
     
-    /**
-     * GeoAnalysis@listAll
-     */
-    public function listAll() {
+	/**
+	 * GeoAnalysis@listAll
+	 */
+	public function listAll() {
         
-        $controller = new PageController();
-        $controller->setPageTitle(I18N::translate('Sosa Geographical dispersion'));
+		$controller = new PageController();
+		$controller->setPageTitle(I18N::translate('Sosa Geographical dispersion'));
         
-        $data = new ViewBag();
-        $data->set('title', $controller->getPageTitle());
-        $data->set('has_list', false);
+		$data = new ViewBag();
+		$data->set('title', $controller->getPageTitle());
+		$data->set('has_list', false);
         
-        $ga_list = $this->provider->getGeoAnalysisList();
-        if(count($ga_list) > 0 ) {
-             $data->set('has_list', true);
-             $data->set('geoanalysislist', $ga_list);
-        }
+		$ga_list = $this->provider->getGeoAnalysisList();
+		if(count($ga_list) > 0 ) {
+			 $data->set('has_list', true);
+			 $data->set('geoanalysislist', $ga_list);
+		}
         
-        ViewFactory::make('GeoAnalysisList', $this, $controller, $data)->render();        
-    }
+		ViewFactory::make('GeoAnalysisList', $this, $controller, $data)->render();        
+	}
     	
 	/**
 	 * GeoAnalysis@setStatus
 	 */
-    public function setStatus() {  
-        global $WT_TREE;
+	public function setStatus() {  
+		global $WT_TREE;
         
-        $controller = new JsonController();
+		$controller = new JsonController();
         
-        $ga_id = Filter::getInteger('ga_id');
-        $ga = $this->provider->getGeoAnalysis($ga_id, false);
+		$ga_id = Filter::getInteger('ga_id');
+		$ga = $this->provider->getGeoAnalysis($ga_id, false);
         
-        $controller->restrictAccess(
-            true // Filter::checkCsrf()   -- Cannot use CSRF on a GET request (modules can only work with GET requests)
-            &&  Auth::isManager($WT_TREE) 
-            && $ga !== null
-        );
+		$controller->restrictAccess(
+			true // Filter::checkCsrf()   -- Cannot use CSRF on a GET request (modules can only work with GET requests)
+			&&  Auth::isManager($WT_TREE) 
+			&& $ga !== null
+		);
         
-        $status = Filter::getBool('status');
-        $res = array('geoanalysis' => $ga->getId() , 'error' => null);
-        try{
-            $this->provider->setGeoAnalysisStatus($ga, $status);
-            $res['status'] = $status;
+		$status = Filter::getBool('status');
+		$res = array('geoanalysis' => $ga->getId() , 'error' => null);
+		try{
+			$this->provider->setGeoAnalysisStatus($ga, $status);
+			$res['status'] = $status;
 			Log::addConfigurationLog('Module '.$this->module->getName().' : Geo Analysis ID "'.$ga->getId().'" 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().' : Geo Analysis ID "'.$ga->getId().'" 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);
+	}
     
 	/**
-     * GeoAnalysis@delete
-     */
-    public function delete() {
-        global $WT_TREE;
+	 * GeoAnalysis@delete
+	 */
+	public function delete() {
+		global $WT_TREE;
     
-        $controller = new JsonController();
+		$controller = new JsonController();
     
-        $ga_id = Filter::getInteger('ga_id');
-        $ga = $this->provider->getGeoAnalysis($ga_id, false);
+		$ga_id = Filter::getInteger('ga_id');
+		$ga = $this->provider->getGeoAnalysis($ga_id, false);
     
-        $controller->restrictAccess(
-            true // Filter::checkCsrf()   -- Cannot use CSRF on a GET request (modules can only work with GET requests)
-            &&  Auth::isManager($WT_TREE)
-            && $ga
-            );
+		$controller->restrictAccess(
+			true // Filter::checkCsrf()   -- Cannot use CSRF on a GET request (modules can only work with GET requests)
+			&&  Auth::isManager($WT_TREE)
+			&& $ga
+			);
             
-        $res = array('geoanalysis' => $ga->getId() , 'error' => null);
-        try{
-            $this->provider->deleteGeoAnalysis($ga);
+		$res = array('geoanalysis' => $ga->getId() , 'error' => null);
+		try{
+			$this->provider->deleteGeoAnalysis($ga);
 			Log::addConfigurationLog('Module '.$this->module->getName().' : Geo Analysis ID "'.$ga->getId().'" has been deleted.');
-        }
-        catch (\Exception $ex) {
-            $res['error'] = $ex->getMessage();
+		}
+		catch (\Exception $ex) {
+			$res['error'] = $ex->getMessage();
 			Log::addErrorLog('Module '.$this->module->getName().' : Geo Analysis ID "'.$ga->getId().'" could not be deleted. 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);
+	}
         	
-    /**
-     * GeoAnalysis@dataTabs
-     */
-    public function dataTabs() {
-        global $WT_TREE;
+	/**
+	 * GeoAnalysis@dataTabs
+	 */
+	public function dataTabs() {
+		global $WT_TREE;
         
-        $controller = new JsonController();
+		$controller = new JsonController();
         
-        $ga_id = Filter::getInteger('ga_id');
-        $ga = $this->provider->getGeoAnalysis($ga_id);
-        $sosa_provider = new SosaProvider($WT_TREE, Auth::user());
+		$ga_id = Filter::getInteger('ga_id');
+		$ga = $this->provider->getGeoAnalysis($ga_id);
+		$sosa_provider = new SosaProvider($WT_TREE, Auth::user());
         
-        $controller
-            ->restrictAccess($ga && $sosa_provider->isSetup())
-            ->pageHeader();
+		$controller
+			->restrictAccess($ga && $sosa_provider->isSetup())
+			->pageHeader();
         
-        $jsonArray = array();
+		$jsonArray = array();
         
-        list($placesDispGeneral, $placesDispGenerations) = $ga->getAnalysisResults($sosa_provider->getAllSosaWithGenerations());
+		list($placesDispGeneral, $placesDispGenerations) = $ga->getAnalysisResults($sosa_provider->getAllSosaWithGenerations());
         
-        $flags = array();
-        if($placesDispGeneral && $ga->getOptions() && $ga->getOptions()->isUsingFlags()) {
-            $mapProvider = new GoogleMapsProvider();            
-            foreach($placesDispGeneral['places'] as $place => $count) {
-                $flags[$place] = $mapProvider->getPlaceIcon(new Place($place, $WT_TREE));
-            }
-        }
+		$flags = array();
+		if($placesDispGeneral && $ga->getOptions() && $ga->getOptions()->isUsingFlags()) {
+			$mapProvider = new GoogleMapsProvider();            
+			foreach($placesDispGeneral['places'] as $place => $count) {
+				$flags[$place] = $mapProvider->getPlaceIcon(new Place($place, $WT_TREE));
+			}
+		}
         
-        $jsonArray['generaltab'] = $this->htmlPlacesAnalysisGeneralTab($ga, $placesDispGeneral, $flags);
-        $jsonArray['generationstab'] = $this->htmlPlacesAnalysisGenerationsTab($ga, $placesDispGenerations, $flags);
+		$jsonArray['generaltab'] = $this->htmlPlacesAnalysisGeneralTab($ga, $placesDispGeneral, $flags);
+		$jsonArray['generationstab'] = $this->htmlPlacesAnalysisGenerationsTab($ga, $placesDispGenerations, $flags);
 
-        $controller->encode($jsonArray);
-    }
+		$controller->encode($jsonArray);
+	}
     
 	/**
 	 * Returns HTML code for the GeoAnalysis general tab (can be either a map or a table).
@@ -232,70 +232,70 @@ 
 	 * @param (null|array) $flags Array of flags
 	 * @return string HTML code for the general tab
 	 */
-    protected function htmlPlacesAnalysisGeneralTab(GeoAnalysis $ga, $placesGeneralResults, $flags= null) {
-        global $WT_TREE;
+	protected function htmlPlacesAnalysisGeneralTab(GeoAnalysis $ga, $placesGeneralResults, $flags= null) {
+		global $WT_TREE;
         
-        if(!empty($placesGeneralResults)){
-            $data = new ViewBag();
+		if(!empty($placesGeneralResults)){
+			$data = new ViewBag();
             
-            $nb_found = $placesGeneralResults['knownsum'];
-            $nb_other = 0;
-            if(isset($placesGeneralResults['other'])) $nb_other =$placesGeneralResults['other'];
-            $nb_unknown = $placesGeneralResults['unknown'];
+			$nb_found = $placesGeneralResults['knownsum'];
+			$nb_other = 0;
+			if(isset($placesGeneralResults['other'])) $nb_other =$placesGeneralResults['other'];
+			$nb_unknown = $placesGeneralResults['unknown'];
             
-            $data->set('stats_gen_nb_found', $nb_found);
-            $data->set('stats_gen_nb_other', $nb_other);
-            $data->set('stats_gen_nb_unknown', $nb_unknown);
+			$data->set('stats_gen_nb_found', $nb_found);
+			$data->set('stats_gen_nb_other', $nb_other);
+			$data->set('stats_gen_nb_unknown', $nb_unknown);
             
-            $data->set('use_flags', $ga->getOptions() && $ga->getOptions()->isUsingFlags());
+			$data->set('use_flags', $ga->getOptions() && $ga->getOptions()->isUsingFlags());
             
-            if($ga->hasMap()) {
-                $max = $placesGeneralResults['max'];
-                $map = $ga->getOptions()->getMap();
-                $results_by_subdivs = $map->getSubdivisions();
-                $places_mappings = $map->getPlacesMappings();
-                foreach ($placesGeneralResults['places'] as $location => $count) {
-                    $levelvalues = array_reverse(array_map('trim',explode(',', $location)));
-                    $level_map = $ga->getAnalysisLevel() - $ga->getOptions()->getMapLevel();
-                    if($level_map >= 0 && $level_map < count($levelvalues)) {
-                        $levelref = $levelvalues[0] . '@' . $levelvalues[$level_map];
-                        if(!isset($results_by_subdivs[$levelref])) { $levelref = $levelvalues[0]; }
-                    }
-                    else {
-                        $levelref = $levelvalues[0];
-                    }
-                    if(isset($places_mappings[$levelref])) $levelref = $places_mappings[$levelref];
-                    if(isset($results_by_subdivs[$levelref])) {
-                        $count_subd = isset($results_by_subdivs[$levelref]['count']) ? $results_by_subdivs[$levelref]['count'] : 0;
-                        $count_subd  += $count;
-                        $results_by_subdivs[$levelref]['count'] = $count_subd;   
-                        $results_by_subdivs[$levelref]['transparency'] = Functions::safeDivision($count_subd, $max);
-                        if($ga->getOptions()->isUsingFlags() && $flags) {
-                            $results_by_subdivs[$levelref]['place'] = new Place($location, $WT_TREE);
-                            $results_by_subdivs[$levelref]['flag'] = $flags[$location];
-                        }
-                    }
-                }             
+			if($ga->hasMap()) {
+				$max = $placesGeneralResults['max'];
+				$map = $ga->getOptions()->getMap();
+				$results_by_subdivs = $map->getSubdivisions();
+				$places_mappings = $map->getPlacesMappings();
+				foreach ($placesGeneralResults['places'] as $location => $count) {
+					$levelvalues = array_reverse(array_map('trim',explode(',', $location)));
+					$level_map = $ga->getAnalysisLevel() - $ga->getOptions()->getMapLevel();
+					if($level_map >= 0 && $level_map < count($levelvalues)) {
+						$levelref = $levelvalues[0] . '@' . $levelvalues[$level_map];
+						if(!isset($results_by_subdivs[$levelref])) { $levelref = $levelvalues[0]; }
+					}
+					else {
+						$levelref = $levelvalues[0];
+					}
+					if(isset($places_mappings[$levelref])) $levelref = $places_mappings[$levelref];
+					if(isset($results_by_subdivs[$levelref])) {
+						$count_subd = isset($results_by_subdivs[$levelref]['count']) ? $results_by_subdivs[$levelref]['count'] : 0;
+						$count_subd  += $count;
+						$results_by_subdivs[$levelref]['count'] = $count_subd;   
+						$results_by_subdivs[$levelref]['transparency'] = Functions::safeDivision($count_subd, $max);
+						if($ga->getOptions()->isUsingFlags() && $flags) {
+							$results_by_subdivs[$levelref]['place'] = new Place($location, $WT_TREE);
+							$results_by_subdivs[$levelref]['flag'] = $flags[$location];
+						}
+					}
+				}             
                 
-                $data->set('map', $ga->getOptions()->getMap());
-                $data->set('results_by_subdivisions', $results_by_subdivs);
+				$data->set('map', $ga->getOptions()->getMap());
+				$data->set('results_by_subdivisions', $results_by_subdivs);
                 
-                $html = ViewFactory::make('GeoAnalysisTabGeneralMap', $this, new BaseController(), $data)->getHtmlPartial();
-            }
-            else {
-                $results = $placesGeneralResults['places'];
-                arsort($results);
-                $data->set('results', $results);
-                $data->set('analysis_level', $ga->getAnalysisLevel());
+				$html = ViewFactory::make('GeoAnalysisTabGeneralMap', $this, new BaseController(), $data)->getHtmlPartial();
+			}
+			else {
+				$results = $placesGeneralResults['places'];
+				arsort($results);
+				$data->set('results', $results);
+				$data->set('analysis_level', $ga->getAnalysisLevel());
                 
-                $html = ViewFactory::make('GeoAnalysisTabGeneralTable', $this, new BaseController(), $data)->getHtmlPartial();
-            }
-        }
-        else {
-            $html = '<p class="warning">' . I18N::translate('No data is available for the general analysis.') . '</p>';
-        }
-        return $html;
-    }
+				$html = ViewFactory::make('GeoAnalysisTabGeneralTable', $this, new BaseController(), $data)->getHtmlPartial();
+			}
+		}
+		else {
+			$html = '<p class="warning">' . I18N::translate('No data is available for the general analysis.') . '</p>';
+		}
+		return $html;
+	}
     
 	/**
 	 * Returns HTML code for the GeoAnalysis generations tab.
@@ -305,68 +305,68 @@ 
 	 * @param (null|array) $flags Array of flags
 	 * @return string HTML code for the generations tab
 	 */
-    protected function htmlPlacesAnalysisGenerationsTab(GeoAnalysis $ga, $placesGenerationsResults, $flags = null) {
-        global $WT_TREE;
+	protected function htmlPlacesAnalysisGenerationsTab(GeoAnalysis $ga, $placesGenerationsResults, $flags = null) {
+		global $WT_TREE;
         
-        if(!empty($placesGenerationsResults) && $ga->getOptions()){
-            $data = new ViewBag();
+		if(!empty($placesGenerationsResults) && $ga->getOptions()){
+			$data = new ViewBag();
             
-            ksort($placesGenerationsResults);
+			ksort($placesGenerationsResults);
             
-            $detailslevel = $ga->getOptions()->getMaxDetailsInGen();
-            $data->set('max_details_gen', $detailslevel);    
-            $data->set('use_flags', $ga->getOptions()->isUsingFlags());
-            $data->set('analysis_level', $ga->getAnalysisLevel());
-            $display_all_places = !is_null($detailslevel) && $detailslevel == 0;
-            $data->set('display_all_places', $display_all_places);
+			$detailslevel = $ga->getOptions()->getMaxDetailsInGen();
+			$data->set('max_details_gen', $detailslevel);    
+			$data->set('use_flags', $ga->getOptions()->isUsingFlags());
+			$data->set('analysis_level', $ga->getAnalysisLevel());
+			$display_all_places = !is_null($detailslevel) && $detailslevel == 0;
+			$data->set('display_all_places', $display_all_places);
             
-            $results_by_gen = array();
-            foreach($placesGenerationsResults as $gen => $genData){
-                $sum = 0;
-                $other = 0;
-                $unknown = 0;
-                if(isset($genData['sum'])) $sum = $genData['sum'];
-                if(isset($genData['other'])) $other = $genData['other'];
-                if(isset($genData['unknown'])) $unknown = $genData['unknown'];
+			$results_by_gen = array();
+			foreach($placesGenerationsResults as $gen => $genData){
+				$sum = 0;
+				$other = 0;
+				$unknown = 0;
+				if(isset($genData['sum'])) $sum = $genData['sum'];
+				if(isset($genData['other'])) $other = $genData['other'];
+				if(isset($genData['unknown'])) $unknown = $genData['unknown'];
                 
-                if($sum > 0) {                
-                    $results_by_gen[$gen]['sum'] = $sum;
-                    $results_by_gen[$gen]['other'] = $other;
-                    $results_by_gen[$gen]['unknown'] = $unknown;
-                    $results_by_gen[$gen]['places'] = array();                    
-                    arsort($genData['places']);
+				if($sum > 0) {                
+					$results_by_gen[$gen]['sum'] = $sum;
+					$results_by_gen[$gen]['other'] = $other;
+					$results_by_gen[$gen]['unknown'] = $unknown;
+					$results_by_gen[$gen]['places'] = array();                    
+					arsort($genData['places']);
                     
-                    if($display_all_places){
-                        foreach($genData['places'] as $placename=> $count){
-                            $results_by_gen[$gen]['places'][$placename]['count'] = $count;
+					if($display_all_places){
+						foreach($genData['places'] as $placename=> $count){
+							$results_by_gen[$gen]['places'][$placename]['count'] = $count;
                             
-                            if($ga->getOptions() && $ga->getOptions()->isUsingFlags() && ($flag = $flags[$placename]) != ''){
-                                $results_by_gen[$gen]['places'][$placename]['place'] = new Place($placename, $WT_TREE);
-                                $results_by_gen[$gen]['places'][$placename]['flag'] = $flag;
-                            }
-                        }
-                    }
-                    else {
-                        $tmp = $genData['places'];
-                        if($other > 0) {
-                            $tmp = array_slice($tmp, 0, 5, true);
-                            $tmp['other'] = $other;
-                            arsort($tmp);  
-                        }                      
-                        $results_by_gen[$gen]['places'] = array_slice($tmp, 0, 5, true);                        
-                    }
-                }
-            }
+							if($ga->getOptions() && $ga->getOptions()->isUsingFlags() && ($flag = $flags[$placename]) != ''){
+								$results_by_gen[$gen]['places'][$placename]['place'] = new Place($placename, $WT_TREE);
+								$results_by_gen[$gen]['places'][$placename]['flag'] = $flag;
+							}
+						}
+					}
+					else {
+						$tmp = $genData['places'];
+						if($other > 0) {
+							$tmp = array_slice($tmp, 0, 5, true);
+							$tmp['other'] = $other;
+							arsort($tmp);  
+						}                      
+						$results_by_gen[$gen]['places'] = array_slice($tmp, 0, 5, true);                        
+					}
+				}
+			}
             
-            $data->set('results_by_generations', $results_by_gen);
+			$data->set('results_by_generations', $results_by_gen);
             
-            $html = ViewFactory::make('GeoAnalysisTabGenerations', $this, new BaseController(), $data)->getHtmlPartial();
+			$html = ViewFactory::make('GeoAnalysisTabGenerations', $this, new BaseController(), $data)->getHtmlPartial();
             
-        }
-        else {
-            $html = '<p class="warning">' . I18N::translate('No data is available for the generations analysis.') . '</p>';
-        }
-        return $html;
-    }
+		}
+		else {
+			$html = '<p class="warning">' . I18N::translate('No data is available for the generations analysis.') . '</p>';
+		}
+		return $html;
+	}
         
 }
\ No newline at end of file

src/Webtrees/Module/Certificates/CertificateController.php

Indentation +148 added lines, -148 removed lines

@@ -32,158 +32,158 @@ 
  */
 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() {
-        global $WT_TREE;
-        
-        $controller = new PageController();
-        $controller
-        ->setPageTitle(I18N::translate('Certificate'))
-        ->restrictAccess(
-            $this->module->getSetting('MAJ_SHOW_CERT', Auth::PRIV_HIDE) >= Auth::accessLevel($WT_TREE)
-        );
-        
-        $cid = Filter::get('cid');
-        
-        $certificate = null;
-        if(!empty($cid) && strlen($cid) > 22){
-            $certificate = Certificate::getInstance($cid, $WT_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() {
+		global $WT_TREE;
+        
+		$controller = new PageController();
+		$controller
+		->setPageTitle(I18N::translate('Certificate'))
+		->restrictAccess(
+			$this->module->getSetting('MAJ_SHOW_CERT', Auth::PRIV_HIDE) >= Auth::accessLevel($WT_TREE)
+		);
+        
+		$cid = Filter::get('cid');
+        
+		$certificate = null;
+		if(!empty($cid) && strlen($cid) > 22){
+			$certificate = Certificate::getInstance($cid, $WT_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=' . $WT_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=' . $WT_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() {      
-        global $WT_TREE;
+	/**
+	 * Certificate@image
+	 */
+	public function image() {      
+		global $WT_TREE;
         
-        $cid   = Filter::get('cid');
-        $certificate = null;
-        if(!empty($cid)) $certificate =  Certificate::getInstance($cid, $WT_TREE, null, $this->provider);
+		$cid   = Filter::get('cid');
+		$certificate = null;
+		if(!empty($cid)) $certificate =  Certificate::getInstance($cid, $WT_TREE, null, $this->provider);
         
-        $imageBuilder = new ImageBuilder($certificate);
+		$imageBuilder = new ImageBuilder($certificate);
         
-        if (!empty(Filter::get('cb'))) {
-            $imageBuilder->setExpireOffset($imageBuilder->getExpireOffset() * 7);
-        }
+		if (!empty(Filter::get('cb'))) {
+			$imageBuilder->setExpireOffset($imageBuilder->getExpireOffset() * 7);
+		}
         
-        $imageBuilder
-            ->setShowWatermark(Auth::accessLevel($WT_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
+			->setShowWatermark(Auth::accessLevel($WT_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();
+		$imageBuilder->render();
         
-    }
+	}
     
-    /**
-     * Certificate@listAll
-     */
-    public function listAll() {
-        global $WT_TREE;
-        
-        $controller = new PageController();
-        $controller
-            ->setPageTitle(I18N::translate('Certificates'))
-            ->restrictAccess(
-                $this->module->getSetting('MAJ_SHOW_CERT', Auth::PRIV_HIDE) >= Auth::accessLevel($WT_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', $WT_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() {
+		global $WT_TREE;
+        
+		$controller = new PageController();
+		$controller
+			->setPageTitle(I18N::translate('Certificates'))
+			->restrictAccess(
+				$this->module->getSetting('MAJ_SHOW_CERT', Auth::PRIV_HIDE) >= Auth::accessLevel($WT_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', $WT_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('
                         /* Initialise datatables */
         				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(/<[^<]*>/, ""))};
@@ -210,29 +210,29 @@ 
         				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() {
-        global $WT_TREE;
+	/**
+	 * Certificate@autocomplete
+	 */
+	public function autocomplete() {
+		global $WT_TREE;
         
-        $controller = new JsonController();
+		$controller = new JsonController();
         
-        $city = Filter::get('city');
-        $contains = Filter::get('term');        
+		$city = Filter::get('city');
+		$contains = Filter::get('term');        
 
-        $controller
-            ->restrictAccess(Auth::isEditor($WT_TREE) && !empty($city) && !empty($contains))
-            ->pageHeader();
+		$controller
+			->restrictAccess(Auth::isEditor($WT_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/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

Spacing +9 added lines, -9 removed lines

@@ -30,14 +30,14 @@ 
      * @param string $period
      * @param (null|int) Number of visits
      */
-    private function getNumberOfVisitsPiwik($block_id, $period='year'){
+    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');
     
-        if($piwik_url && strlen($piwik_url) > 0 &&
-            $piwik_siteid  && strlen($piwik_siteid) > 0 &&
+        if ($piwik_url && strlen($piwik_url) > 0 &&
+            $piwik_siteid && strlen($piwik_siteid) > 0 &&
             $piwik_token && strlen($piwik_token)            
             ) 
         {        
@@ -48,9 +48,9 @@ 
             $url .= '&format=PHP';
             $url .= '&token_auth='.$piwik_token;
         
-            if($fetched = File::fetchUrl($url)) {
+            if ($fetched = File::fetchUrl($url)) {
                 $content = @unserialize($fetched);
-                if(is_numeric($content)) return $content;
+                if (is_numeric($content)) return $content;
             }
         }
     
@@ -72,17 +72,17 @@ 
         $data->set('has_stats', false);
         
         $block_id = Filter::get('block_id');        
-        if($block_id){
+        if ($block_id) {
             $cached_item = Cache::get('piwikCountYear', $this->module);
             $visitCountYear = $cached_item->get();
-            if(!$cached_item->isHit()) {
+            if (!$cached_item->isHit()) {
                 $visitCountYear = $this->getNumberOfVisitsPiwik($block_id);
                 Cache::save($cached_item, $visitCountYear);
             }
             
-            if($visitCountYear){
+            if ($visitCountYear) {
                 $visitCountToday = max(0, $this->getNumberOfVisitsPiwik($block_id, 'day'));
-                $visitCountYear = max( 0, $visitCountYear);
+                $visitCountYear = max(0, $visitCountYear);
                 
                 $data->set('has_stats', true);
                 $data->set('visits_today', $visitCountToday);

Braces +3 added lines, -1 removed lines

@@ -50,7 +50,9 @@
         
             if($fetched = File::fetchUrl($url)) {
                 $content = @unserialize($fetched);
-                if(is_numeric($content)) return $content;
+                if(is_numeric($content)) {
+                	return $content;
+                }
             }
         }