jon48 / webtrees-lib

src/Webtrees/Mvc/View/AbstractView.php

Braces +3 added lines, -1 removed lines

@@ -45,7 +45,9 @@
     public function render() {
         global $controller;        
         
-        if(!$this->ctrl) throw new \Exception('Controller not initialised');
+        if(!$this->ctrl) {
+        	throw new \Exception('Controller not initialised');
+        }
         
 		$controller = $this->ctrl;
         $this->ctrl->pageHeader();

src/Webtrees/Module/MiscExtensions/AdminConfigController.php

Braces +3 added lines, -1 removed lines

@@ -61,7 +61,9 @@
      */
     public function index() {
         $action = Filter::post('action');        
-        if($action == 'update' && Filter::checkCsrf()) $this->update();
+        if($action == 'update' && Filter::checkCsrf()) {
+        	$this->update();
+        }
         
         Theme::theme(new AdministrationTheme)->init(Globals::getTree());        
         $ctrl = new PageController();

src/Webtrees/Module/Hooks/AdminConfigController.php

Braces +6 added lines, -2 removed lines

@@ -47,7 +47,9 @@ 
                         $array_hook = explode('#', $ihook);
                         //Update status
                         $new_status= Filter::postBool('status-' . $params['id']);
-                        if(in_array($array_hook[0], $module_names)) $new_status = false;
+                        if(in_array($array_hook[0], $module_names)) {
+                        	$new_status = false;
+                        }
                         $previous_status = $params['status'];
                         if ($new_status !== null) {
                             $new_status= $new_status ? 'enabled' : 'disabled';
@@ -92,7 +94,9 @@ 
         HookProvider::getInstance()->updateHooks();
         
         $action = Filter::post('action');        
-        if($action == 'update' && Filter::checkCsrf()) $this->update();
+        if($action == 'update' && Filter::checkCsrf()) {
+        	$this->update();
+        }
         
         Theme::theme(new AdministrationTheme)->init(Globals::getTree());        
         $ctrl = new PageController();

src/Webtrees/Functions/FunctionsPrint.php

Braces +11 added lines, -7 removed lines

@@ -160,7 +160,9 @@ 
 	public static function htmlIndividualForList(\Fisharebest\Webtrees\Individual $individual, $isStrong = true){
 		$html = '';
 		$tag = 'em';
-		if($isStrong) $tag = 'strong';
+		if($isStrong) {
+			$tag = 'strong';
+		}
 		if($individual && $individual->canShow()){
 			$dindi = new Individual($individual);
 			$html = $individual->getSexImage();
@@ -174,8 +176,7 @@ 
 			$html .= '&nbsp;<span><small><em>'.$dindi->formatFirstMajorFact(WT_EVENTS_BIRT, 10).'</em></small></span>';
 			$html .= '&nbsp;<span><small><em>'.$dindi->formatFirstMajorFact(WT_EVENTS_DEAT, 10).'</em></small></span>';
 			$html .= '</a>';
-		}
-		else {
+		} else {
 			$html .= '<span class=\"list_item\"><'.$tag.'>' . I18N::translate('Private') . '</'.$tag.'></span>';
 		}
 		return $html;
@@ -193,8 +194,7 @@ 
 		$date = $fact->getDate();
 		if($date->isOK()){
 			$html.=' '.$date->Display($anchor && !Globals::isSearchSpider(), '%Y');
-		}
-		else{
+		} else{
 			// 1 DEAT Y with no DATE => print YES
 			// 1 BIRT 2 SOUR @S1@ => print YES
 			// 1 DEAT N is not allowed
@@ -218,7 +218,9 @@ 
 	public static function formatFactPlaceShort(\Fisharebest\Webtrees\Fact $fact, $format, $anchor=false){
 		$html='';
 		
-		if ($fact === null) return $html;
+		if ($fact === null) {
+			return $html;
+		}
 		$place = $fact->getPlace();
 		if($place){
 			$dplace = new Place($place);
@@ -336,7 +338,9 @@ 
 					default:
 						break;
 				}
-				if($image && $title) $html = '<i class="icon-maj-sourced-'.$size.'_'.$image.'" title="'.$title.'"></i>';
+				if($image && $title) {
+					$html = '<i class="icon-maj-sourced-'.$size.'_'.$image.'" title="'.$title.'"></i>';
+				}
 				break;
 			default:
 				break;

src/Webtrees/Module/ModuleMyArtJaubTrait.php

Braces +1 added lines, -2 removed lines

@@ -104,8 +104,7 @@
         
         if(file_exists($css_file)) {
             return $this->assetUrl('css/' . $theme->name() . '.min.css');
-        }
-        else {
+        } else {
             return $this->assetUrl('css/default.min.css');
         }
     }

src/Webtrees/Individual.php

Braces +2 added lines, -4 removed lines

@@ -57,8 +57,7 @@ 
 				$ct2 = preg_match_all($pattern, $titlefact->getValue(), $match2);
 				if($ct2>0){
 					$this->titles[$match2[1][0]][]= trim($match2[2][0]);
-				}
-				else{
+				} else{
 					$this->titles[$titlefact->getValue()][]='';
 				}
 			}
@@ -90,8 +89,7 @@ 
 		if($bplace = $this->gedcomrecord->getBirthPlace()){
 			if($perc){
 				return array ($bplace, 1);
-			}
-			else{
+			} else{
 				return $bplace;
 			}
 		}

src/Webtrees/Functions/Functions.php

Braces +9 added lines, -5 removed lines

@@ -108,16 +108,18 @@ 
 		$len_chars = count($chars);
 		$token = '';
 		
-		for ($i = 0; $i < $length; $i++)
-			$token .= $chars[ mt_rand(0, $len_chars - 1) ];
+		for ($i = 0; $i < $length; $i++) {
+					$token .= $chars[ mt_rand(0, $len_chars - 1) ];
+		}
 		
 		# Number of 32 char chunks
 		$chunks = ceil( strlen($token) / 32 );
 		$md5token = '';
 		
 		# Run each chunk through md5
-		for ( $i=1; $i<=$chunks; $i++ )
-			$md5token .= md5( substr($token, $i * 32 - 32, 32) );
+		for ( $i=1; $i<=$chunks; $i++ ) {
+					$md5token .= md5( substr($token, $i * 32 - 32, 32) );
+		}
 		
 			# Trim the token
 		return substr($md5token, 0, $length);		
@@ -157,7 +159,9 @@ 
 	 * @return boolean True if path valid
 	 */
 	public static function isValidPath($filename, $acceptfolder = FALSE) {		
-		if(strpbrk($filename, $acceptfolder ? '?%*:|"<>' : '\\/?%*:|"<>') === FALSE) return true;
+		if(strpbrk($filename, $acceptfolder ? '?%*:|"<>' : '\\/?%*:|"<>') === FALSE) {
+			return true;
+		}
 		return false;
 	}
 

src/Webtrees/Common/GeoDispersion/GeoAnalysis/GeoAnalysisPlace.php

Braces +9 added lines, -3 removed lines

@@ -64,10 +64,16 @@
      */
     private function extractPlace(?Place $place, int $depth, bool $strict_depth): ?Place
     {
-        if($place === null) return null;
-        if(mb_strlen($place->gedcomName()) === 0) return null;
+        if($place === null) {
+        	return null;
+        }
+        if(mb_strlen($place->gedcomName()) === 0) {
+        	return null;
+        }
         $parts = $place->lastParts($depth);
-        if($strict_depth && $parts->count() !== $depth) return new Place(self::INVALID_PLACE, $place->tree());
+        if($strict_depth && $parts->count() !== $depth) {
+        	return new Place(self::INVALID_PLACE, $place->tree());
+        }
         return new Place($parts->implode(', '), $place->tree());
     }
     

src/Webtrees/Common/GeoDispersion/Maps/SimpleFilesystemMap.php

Braces +1 added lines, -2 removed lines

@@ -77,8 +77,7 @@
             if($feature_collection instanceof FeatureCollection) {
                 return $feature_collection->getFeatures();
             }
-        }
-        catch(Throwable $ex) { }
+        } catch(Throwable $ex) { }
         return [];
     }