jon48 / webtrees-lib

src/Webtrees/Module/AdminTasks/Schema/Migration0.php

Spacing +2 added lines, -2 removed lines

@@ -28,8 +28,8 @@
 		    ' majat_name 		    VARCHAR(32)                      NOT NULL,'.
 		    ' majat_status          ENUM(\'enabled\',\'disabled\') 	 NOT NULL DEFAULT \'disabled\','.
 		    ' majat_last_run 		DATETIME 					     NOT NULL DEFAULT \'2000-01-01 00:00:00\','.
-		    ' majat_last_result 	TINYINT(1)					     NOT NULL DEFAULT 1,'.		// 0 means error, 1 is success
-		    ' majat_frequency		INTEGER						     NOT NULL DEFAULT 10080,'.	// In min, Default every week
+		    ' majat_last_result 	TINYINT(1)					     NOT NULL DEFAULT 1,'.// 0 means error, 1 is success
+		    ' majat_frequency		INTEGER						     NOT NULL DEFAULT 10080,'.// In min, Default every week
 		    ' majat_nb_occur	 	SMALLINT					     NOT NULL DEFAULT 0,'.
 		    ' majat_running 		TINYINT(1)					     NOT NULL DEFAULT 0,'.
 		    ' PRIMARY KEY (majat_name)'.

src/Webtrees/Module/GeoDispersion/Model/GeoAnalysisProvider.php

Spacing +38 added lines, -38 removed lines

@@ -65,14 +65,14 @@ 
         ->setUsingFlags($row['majgd_useflagsgen'] == 'yes')
         ->setMaxDetailsInGen($row['majgd_detailsgen']);
         
-        if($row['majgd_map']) {
+        if ($row['majgd_map']) {
             $options
             ->setMap(new OutlineMap($row['majgd_map']))
             ->setMapLevel($row['majgd_toplevel']);
         }
         
         $enabled = true;
-        if(isset($row['majgd_status']) && $row['majgd_status'] == 'disabled') {
+        if (isset($row['majgd_status']) && $row['majgd_status'] == 'disabled') {
             $enabled = false;
         }
         
@@ -93,8 +93,8 @@ 
      */
     public function getGeoAnalysisCount() {
         return Database::prepare(
-            'SELECT COUNT(majgd_id)' .
-            ' FROM `##maj_geodispersion`' .
+            'SELECT COUNT(majgd_id)'.
+            ' FROM `##maj_geodispersion`'.
             ' WHERE majgd_file = :gedcom_id'
             )->execute(array(
                 'gedcom_id' => $this->tree->getTreeId()
@@ -110,15 +110,15 @@ 
      * @return \MyArtJaub\Webtrees\Module\GeoDispersion\Model\GeoAnalysis|NULL
      */
     public function getGeoAnalysis($id, $only_enabled = true) {
-        $args = array (
+        $args = array(
             'gedcom_id' => $this->tree->getTreeId(),
             'ga_id' => $id
         );
         
-        $sql = 'SELECT majgd_id, majgd_descr, majgd_sublevel, majgd_map, majgd_toplevel, majgd_useflagsgen, majgd_detailsgen, majgd_status' .
-            ' FROM `##maj_geodispersion`' .
+        $sql = 'SELECT majgd_id, majgd_descr, majgd_sublevel, majgd_map, majgd_toplevel, majgd_useflagsgen, majgd_detailsgen, majgd_status'.
+            ' FROM `##maj_geodispersion`'.
             ' WHERE majgd_file = :gedcom_id AND majgd_id=:ga_id';
-        if($only_enabled) {
+        if ($only_enabled) {
             $sql .= ' AND majgd_status = :status';
             $args['status'] = 'enabled';
         }
@@ -126,7 +126,7 @@ 
         
         $ga_array = Database::prepare($sql)->execute($args)->fetchOneRow(\PDO::FETCH_ASSOC);
         
-        if($ga_array) {
+        if ($ga_array) {
             return $this->loadGeoAnalysisFromRow($ga_array);
         }
         
@@ -146,7 +146,7 @@ 
      * @return GeoAnalysis
      */
 	public function createGeoAnalysis($description, $analysis_level, $map_file, $map_top_level, $use_flags, $gen_details) {
-		try{
+		try {
 			Database::beginTransaction();
 		
 			Database::prepare(
@@ -168,7 +168,7 @@ 
 			
 			Database::commit();
 		}
-		catch(\Exception $ex) {
+		catch (\Exception $ex) {
 			Database::rollback();
 			$ga = null;
 			Log::addErrorLog('A new Geo Analysis failed to be created. Transaction rollbacked. Parameters ['.$description.', '.$analysis_level.','.$map_file.','.$map_top_level.','.$use_flags.', '.$gen_details.']. Exception: '.$ex->getMessage());
@@ -211,9 +211,9 @@ 
 			
 			 Database::commit();
 		}
-		catch(\Exception $ex) {		    
+		catch (\Exception $ex) {		    
 			Database::rollback();
-			Log::addErrorLog('The Geo Analysis ID “' . $ga->getId() . '” failed to be updated. Transaction rollbacked. Exception: '.$ex->getMessage());
+			Log::addErrorLog('The Geo Analysis ID “'.$ga->getId().'” failed to be updated. Transaction rollbacked. Exception: '.$ex->getMessage());
 			$ga = null;
 		}
 		return $ga;
@@ -258,12 +258,12 @@ 
      *
      * @return array List of enabled maps
      */
-    public function getGeoAnalysisList(){
+    public function getGeoAnalysisList() {
         $res = array();
         
         $list = Database::prepare(
-            'SELECT majgd_id, majgd_descr, majgd_sublevel, majgd_map, majgd_toplevel, majgd_useflagsgen, majgd_detailsgen' .
-            ' FROM `##maj_geodispersion`' .
+            'SELECT majgd_id, majgd_descr, majgd_sublevel, majgd_map, majgd_toplevel, majgd_useflagsgen, majgd_detailsgen'.
+            ' FROM `##maj_geodispersion`'.
             ' WHERE majgd_file = :gedcom_id AND majgd_status = :status'.
             ' ORDER BY majgd_descr'
         )->execute(array(
@@ -271,7 +271,7 @@ 
             'status' => 'enabled'
         ))->fetchAll(\PDO::FETCH_ASSOC);
         
-        foreach($list as $ga) {
+        foreach ($list as $ga) {
            $res[] = $this->loadGeoAnalysisFromRow($ga);
         }
         
@@ -287,17 +287,17 @@ 
      * @param int|null $limit Max number of items to return (for pagination)
      * @return \MyArtJaub\Webtrees\Module\GeoDispersion\Model\GeoAnalysis[]
      */
-    public function getFilteredGeoAnalysisList($search = null, $order_by = null, $start = 0, $limit = null){
+    public function getFilteredGeoAnalysisList($search = null, $order_by = null, $start = 0, $limit = null) {
         $res = array();
             
         $sql = 
-            'SELECT majgd_id, majgd_descr, majgd_sublevel, majgd_map, majgd_toplevel, majgd_useflagsgen, majgd_detailsgen, majgd_status' .
-            ' FROM `##maj_geodispersion`' .
+            'SELECT majgd_id, majgd_descr, majgd_sublevel, majgd_map, majgd_toplevel, majgd_useflagsgen, majgd_detailsgen, majgd_status'.
+            ' FROM `##maj_geodispersion`'.
             ' WHERE majgd_file = :gedcom_id';
         
         $args = array('gedcom_id'=> $this->tree->getTreeId());
         
-        if($search) {
+        if ($search) {
             $sql .= ' AND majgd_descr LIKE CONCAT(\'%\', :search, \'%\')';
             $args['search'] = $search;
         }
@@ -311,10 +311,10 @@ 
                 
                 switch ($value['dir']) {
                     case 'asc':
-                        $sql .= $value['column'] . ' ASC ';
+                        $sql .= $value['column'].' ASC ';
                         break;
                     case 'desc':
-                        $sql .= $value['column'] . ' DESC ';
+                        $sql .= $value['column'].' DESC ';
                         break;
                 }
             }
@@ -330,7 +330,7 @@ 
             
         $data = Database::prepare($sql)->execute($args)->fetchAll(\PDO::FETCH_ASSOC);
 
-        foreach($data as $ga) {
+        foreach ($data as $ga) {
             $res[] = $this->loadGeoAnalysisFromRow($ga);
         }
         
@@ -347,8 +347,8 @@ 
      * @return array
      */
     public function getPlacesHierarchy() {
-        if(!$this->place_hierarchy) {
-            if($place_structure = $this->getPlacesHierarchyFromHeader()) {
+        if (!$this->place_hierarchy) {
+            if ($place_structure = $this->getPlacesHierarchyFromHeader()) {
                 $this->place_hierarchy = array('type' => 'header', 'hierarchy' => $place_structure);
             }
             else {
@@ -367,8 +367,8 @@ 
     protected function getPlacesHierarchyFromHeader() {
         $head = GedcomRecord::getInstance('HEAD', $this->tree);
         $head_place = $head->getFirstFact('PLAC');
-        if($head_place && $head_place_value = $head_place->getAttribute('FORM')){
-            return array_reverse(array_map('trim',explode(',', $head_place_value)));
+        if ($head_place && $head_place_value = $head_place->getAttribute('FORM')) {
+            return array_reverse(array_map('trim', explode(',', $head_place_value)));
         }
         return null;
     }
@@ -384,7 +384,7 @@ 
         $nb_levels = 0;
         
         //Select all '2 PLAC ' tags in the file and create array
-        $places_list=array();
+        $places_list = array();
         $ged_data = Database::prepare(
             'SELECT i_gedcom AS gedcom'.
             ' FROM `##individuals`'.
@@ -401,33 +401,33 @@ 
             $matches = null;
             preg_match_all('/\n2 PLAC (.+)/', $ged_datum, $matches);
             foreach ($matches[1] as $match) {
-                $places_list[$match]=true;
+                $places_list[$match] = true;
             }
         }
         
         // Unique list of places
-        $places_list=array_keys($places_list);
+        $places_list = array_keys($places_list);
         
         //sort the array, limit to unique values, and count them
         usort($places_list, array('I18N', 'strcasecmp'));
         
         //calculate maximum no. of levels to display
         $has_found_good_example = false;
-        foreach($places_list as $place){
+        foreach ($places_list as $place) {
             $levels = explode(",", $place);
             $parts = count($levels);
-            if ($parts >= $nb_levels){
+            if ($parts >= $nb_levels) {
                 $nb_levels = $parts;
-                if(!$has_found_good_example){
+                if (!$has_found_good_example) {
                     $random_place = $place;
-                    if(min(array_map('strlen', $levels)) > 0){
+                    if (min(array_map('strlen', $levels)) > 0) {
                         $has_found_good_example = true;
                     }
                 }
             }
         }
         
-        return array_reverse(array_map('trim',explode(',', $random_place)));
+        return array_reverse(array_map('trim', explode(',', $random_place)));
     }
     
     /**
@@ -438,9 +438,9 @@ 
     public function getOutlineMapsList() {
         $res = array();
         $root_path = WT_ROOT.WT_MODULES_DIR.Constants::MODULE_MAJ_GEODISP_NAME.'/maps/';
-        if(is_dir($root_path)){
+        if (is_dir($root_path)) {
             $dir = opendir($root_path);
-            while (($file=readdir($dir))!== false) {
+            while (($file = readdir($dir)) !== false) {
                 if (preg_match('/^[a-zA-Z0-9_]+.xml$/', $file)) {
                     $res[base64_encode($file)] = new OutlineMap($file, true);
                 }

src/Webtrees/Mvc/Dispatcher.php

Spacing +8 added lines, -8 removed lines

@@ -49,10 +49,10 @@ 
     public function handle(fw\Module\AbstractModule $module, $request) {
 		
 		$fq_modclass_name = get_class($module);
-		$ctrl_namespace = substr($fq_modclass_name, 0, - strlen('Module')) . '\\';
+		$ctrl_namespace = substr($fq_modclass_name, 0, - strlen('Module')).'\\';
 		
-		$args = explode( '@', $request, 2);
-		switch(count($args)) {
+		$args = explode('@', $request, 2);
+		switch (count($args)) {
 			case 1:
 				$ctrl_name = $args[0];
 				$method = 'index';
@@ -64,16 +64,16 @@ 
 				break;
 		}
 		
-		$ctrl_class = $ctrl_namespace . $ctrl_name . 'Controller';
-		if(class_exists($ctrl_class) 
+		$ctrl_class = $ctrl_namespace.$ctrl_name.'Controller';
+		if (class_exists($ctrl_class) 
 		    && is_subclass_of($ctrl_class, '\\MyArtJaub\\Webtrees\\Mvc\\Controller\\MvcController')
-			&& $ctrl = new $ctrl_class($module) ) {
-			if(method_exists($ctrl, $method)) {
+			&& $ctrl = new $ctrl_class($module)) {
+			if (method_exists($ctrl, $method)) {
 			    try {
 			        call_user_func_array(array($ctrl, $method), array());
 			    }
 			    catch (MvcException $ex) {
-			        if(!headers_sent()) {
+			        if (!headers_sent()) {
 			            http_response_code($ex->getHttpCode());
 			        }
 			        echo $ex->getMessage();			        

src/Webtrees/Mvc/MvcException.php

Spacing +3 added lines, -3 removed lines

@@ -17,7 +17,7 @@ 
 class MvcException extends \Exception {
 
     /** @var int[] $VALID_HTTP List of valid HTTP codes */
-    protected static $VALID_HTTP =  array(
+    protected static $VALID_HTTP = array(
         100, 101,
         200, 201, 202, 203, 204, 205, 206,
         300, 301, 302, 303, 304, 305, 306, 307,
@@ -58,9 +58,9 @@ 
      * @throws InvalidArgumentException Thrown if not valid Http code
      */
     public function setHttpCode($http_code) {
-        if(!in_array($http_code, self::$VALID_HTTP))
+        if (!in_array($http_code, self::$VALID_HTTP))
             throw new \InvalidArgumentException('Invalid HTTP code');
-        $this->http_code= $http_code;
+        $this->http_code = $http_code;
     }   
 
 }

src/Webtrees/Map/GoogleMapsProvider.php

Spacing +7 added lines, -7 removed lines

@@ -25,14 +25,14 @@ 
 	 * @see \MyArtJaub\Webtrees\Map\MapProviderInterface::getProviderPlaceId()
 	 */
 	public function getProviderPlaceId(\Fisharebest\Webtrees\Place $place) {
-		if(!$place->isEmpty()) {
-			$parent = array_reverse(explode (',', $place->getGedcomName()));
+		if (!$place->isEmpty()) {
+			$parent = array_reverse(explode(',', $place->getGedcomName()));
 			$place_id = 0;
 			$nb_levels = count($parent);
-			for ($i=0; $i < $nb_levels; $i++) {
+			for ($i = 0; $i < $nb_levels; $i++) {
 				$parent[$i] = trim($parent[$i]);
-				if (empty($parent[$i])) $parent[$i]='unknown';// GoogleMap module uses "unknown" while GEDCOM uses , ,
-				$pl_id=Database::prepare('SELECT pl_id FROM `##placelocation` WHERE pl_level=? AND pl_parent_id=? AND pl_place LIKE ? ORDER BY pl_place')
+				if (empty($parent[$i])) $parent[$i] = 'unknown'; // GoogleMap module uses "unknown" while GEDCOM uses , ,
+				$pl_id = Database::prepare('SELECT pl_id FROM `##placelocation` WHERE pl_level=? AND pl_parent_id=? AND pl_place LIKE ? ORDER BY pl_place')
 					->execute(array($i, $place_id, $parent[$i]))
 					->fetchOne();
 				if (empty($pl_id)) break;
@@ -48,12 +48,12 @@ 
 	 * @see \MyArtJaub\Webtrees\Map\MapProviderInterface::getPlaceIcon()
 	 */
 	public function getPlaceIcon(\Fisharebest\Webtrees\Place $place) {
-		if(!$place->isEmpty()){
+		if (!$place->isEmpty()) {
 			$place_details =
 				Database::prepare('SELECT SQL_CACHE pl_icon FROM `##placelocation` WHERE pl_id=? ORDER BY pl_place')	
 				->execute(array($this->getProviderPlaceId($place)))
 				->fetchOneRow();
-			if($place_details){
+			if ($place_details) {
 				return WT_MODULES_DIR.'googlemap/'.$place_details->pl_icon;
 			}
 		}

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

Spacing +3 added lines, -3 removed lines

@@ -47,13 +47,13 @@
         			<div class="value">
         				<?php 
         				    $users = $this->data->get('users_settings');
-        				    if(count($users) == 1) {
-        				        $root_indi = $users[0]['rootid'];  ?>
+        				    if (count($users) == 1) {
+        				        $root_indi = $users[0]['rootid']; ?>
         					<label>
         						<input id="maj_sosa_input_userid" type="hidden" name="userid" value="<?php echo $users[0]['user']->getUserId(); ?>" />
         						<?php echo $users[0]['user']->getRealNameHtml() ?>
         					</label>
-        				<?php  } else if(count($users) > 1) { ?>
+        				<?php  } else if (count($users) > 1) { ?>
         					<select id='maj-sosa-config-select' name="userid">
         					<?php 
         					   $root_indi = $users[0]['rootid'];

src/Webtrees/Hook/HookProvider.php

Spacing +25 added lines, -25 removed lines

@@ -71,7 +71,7 @@ 
 	 * @see \MyArtJaub\Webtrees\Hook\HookProviderInterface::getPossibleHooks()
 	 */
 	public function getPossibleHooks() {
-		static $hooks=null;
+		static $hooks = null;
 		if ($hooks === null) {
 		    $hooks = array();
 		    
@@ -83,31 +83,31 @@ 
 		        'SELECT SQL_CACHE module_name FROM `##module`'
 		    )->fetchOneColumn();
 		    
-		    foreach($module_names as $module_name) {
+		    foreach ($module_names as $module_name) {
 		        $module = Module::getModuleByName($module_name);
 		        
-		        if($module instanceof HookSubscriberInterface){
+		        if ($module instanceof HookSubscriberInterface) {
 					$subscribedhooks = $module->getSubscribedHooks();
-					if(is_array($subscribedhooks)){
-						foreach($subscribedhooks as $key => $value){
-							if(is_int($key)) {
+					if (is_array($subscribedhooks)) {
+						foreach ($subscribedhooks as $key => $value) {
+							if (is_int($key)) {
 								$hook_item = $value;
 								$priority = self::DEFAULT_PRIORITY;
 							}
-							else{
+							else {
 								$hook_item = explode('#', $key, 2);
 								$priority = $value;
 							}
-							if($hook_item && count($hook_item) == 2){
+							if ($hook_item && count($hook_item) == 2) {
 								$hook_func = $hook_item[0];
 								$hook_cont = $hook_item[1];
 							}
-							else{
+							else {
 								$hook_func = $hook_item[0];
 								$hook_cont = 'all';
 							}
-							if(method_exists($module, $hook_func)){
-								$hooks[$module->getName().'#'.$hook_func.'#'.$hook_cont]=$priority;
+							if (method_exists($module, $hook_func)) {
+								$hooks[$module->getName().'#'.$hook_func.'#'.$hook_cont] = $priority;
 							}
 						}
 					}
@@ -121,8 +121,8 @@ 
 	 * {@inheritDoc}
 	 * @see \MyArtJaub\Webtrees\Hook\HookProviderInterface::getRawInstalledHooks()
 	 */
-	public function getRawInstalledHooks(){
-		if(self::isModuleOperational()){
+	public function getRawInstalledHooks() {
+		if (self::isModuleOperational()) {
 			return Database::prepare(
 					"SELECT majh_id AS id, majh_module_name AS module, majh_hook_function AS hook, majh_hook_context as context, majh_module_priority AS priority,  majh_status AS status".
 					" FROM `##maj_hooks`".
@@ -136,11 +136,11 @@ 
 	 * {@inheritDoc}
 	 * @see \MyArtJaub\Webtrees\Hook\HookProviderInterface::getInstalledHooks()
 	 */
-	public function getInstalledHooks(){
-		static $installedhooks =null;
-		if($installedhooks===null){
-			$dbhooks=self::getRawInstalledHooks();
-			foreach($dbhooks as $dbhook){
+	public function getInstalledHooks() {
+		static $installedhooks = null;
+		if ($installedhooks === null) {
+			$dbhooks = self::getRawInstalledHooks();
+			foreach ($dbhooks as $dbhook) {
 				$installedhooks[($dbhook->module).'#'.($dbhook->hook).'#'.($dbhook->context)] = array('id' => $dbhook->id, 'status' => $dbhook->status, 'priority' => $dbhook->priority);
 			}
 		}
@@ -153,15 +153,15 @@ 
 	 */
 	public function updateHooks() {
 	    
-	    if(Auth::isAdmin()){
+	    if (Auth::isAdmin()) {
 	        $ihooks = self::getInstalledHooks();
 	        $phooks = self::getPossibleHooks();
 	        	
 	        // Insert hooks not existing yet in the DB
-	        if($phooks !== null){
-	            foreach($phooks as $phook => $priority){
+	        if ($phooks !== null) {
+	            foreach ($phooks as $phook => $priority) {
 	                $array_hook = explode('#', $phook);
-	                if($ihooks === null || !array_key_exists($phook, $ihooks)){
+	                if ($ihooks === null || !array_key_exists($phook, $ihooks)) {
 	                    $chook = new Hook($array_hook[1], $array_hook[2]);
 	                    $chook->subscribe($array_hook[0]);
 	                    $chook->setPriority($array_hook[0], $priority);
@@ -170,10 +170,10 @@ 
 	        }
 	        	
 	        //Remove hooks not existing any more in the file system
-	        if($ihooks !== null){
-	            foreach(array_keys($ihooks) as $ihook){
+	        if ($ihooks !== null) {
+	            foreach (array_keys($ihooks) as $ihook) {
 	                $array_hook = explode('#', $ihook);
-	                if($phooks === null || !array_key_exists($ihook, $phooks)){
+	                if ($phooks === null || !array_key_exists($ihook, $phooks)) {
 	                    $chook = new Hook($array_hook[1], $array_hook[2]);
 	                    $chook->remove($array_hook[0]);
 	                }

src/Webtrees/Cache.php

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/Functions/FunctionsPrintLists.php

Spacing +2 added lines, -2 removed lines

@@ -35,8 +35,8 @@
         $surn = str_replace('@N.N.', 'AAAA', $surn);
 
         return array(
-            $surn . 'AAAA' . $givn,
-            $givn . 'AAAA' . $surn,
+            $surn.'AAAA'.$givn,
+            $givn.'AAAA'.$surn,
         );
     }