jon48 / webtrees-lib

src/Webtrees/Module/CertificatesModule.php

Braces +15 added lines, -6 removed lines

@@ -115,7 +115,9 @@ 
         $sid=null;
         
         if($this->getSetting('MAJ_SHOW_CERT', Auth::PRIV_HIDE) >= Auth::accessLevel($wt_tree)){
-            if (!$srec || strlen($srec) == 0) return $html;
+            if (!$srec || strlen($srec) == 0) {
+            	return $html;
+            }
             	
             $certificate = null;
             $subrecords = explode("\n", $srec);
@@ -129,11 +131,14 @@ 
                 $subrecords[$i] = trim($subrecords[$i]);
                 $tag = substr($subrecords[$i], 2, 4);
                 $text = substr($subrecords[$i], 7);
-                if($tag == '_ACT') $certificate= new Certificate($text, $wt_tree, $this->getProvider());
+                if($tag == '_ACT') {
+                	$certificate= new Certificate($text, $wt_tree, $this->getProvider());
+                }
             }
             	
-            if($certificate && $certificate->canShow())
-                $html = $this->getDisplay_ACT($certificate, $sid);
+            if($certificate && $certificate->canShow()) {
+                            $html = $this->getDisplay_ACT($certificate, $sid);
+            }
                 	
         }
         return $html;
@@ -161,7 +166,9 @@ 
         $html = '';
         switch($tag){
             case '_ACT':
-                if($context == 'SOUR') $html = $this->getDisplay_ACT($value, $contextid);
+                if($context == 'SOUR') {
+                	$html = $this->getDisplay_ACT($value, $contextid);
+                }
                 break;
         }
         return $html;
@@ -189,7 +196,9 @@ 
 				$html .= '<select id="certifCity'.$element_id.'" class="_CITY">';
 				foreach ($tabCities as $cities){
 					$selectedCity='';
-					if($certificate && $cities== $certificate->getCity()) $selectedCity='selected="true"';
+					if($certificate && $cities== $certificate->getCity()) {
+						$selectedCity='selected="true"';
+					}
 					$html .= '<option value="'.$cities.'" '.$selectedCity.' />'.$cities.'</option>';
 				}
 				$html .= '</select>';

src/Webtrees/Module/Sosa/SosaConfigController.php

Braces +10 added lines, -5 removed lines

@@ -104,7 +104,9 @@ 
             }');
         
         $action = Filter::post('action');
-        if($action === 'update') $this->update($controller);
+        if($action === 'update') {
+        	$this->update($controller);
+        }
         
         $view_bag = new ViewBag();
         $view_bag->set('title', $controller->getPageTitle());
@@ -149,7 +151,9 @@ 
         $user = User::find(Filter::getInteger('userid', -1));
         if($user) {
             $calculator = new SosaCalculator(Globals::getTree(), $user);
-            if($calculator->computeAll()) $view_bag->set('is_success', true);
+            if($calculator->computeAll()) {
+            	$view_bag->set('is_success', true);
+            }
         }
         ViewFactory::make('SosaComputeResult', $this, $controller, $view_bag)->render();
     }
@@ -170,9 +174,10 @@ 
         
         if($user && $indi) {
             $calculator = new SosaCalculator($wt_tree, $user);
-            if($calculator->computeFromIndividual($indi)) $view_bag->set('is_success', true);
-        }
-        else {
+            if($calculator->computeFromIndividual($indi)) {
+            	$view_bag->set('is_success', true);
+            }
+        } else {
             $view_bag->set('error', I18N::translate('Non existing individual'));
         }
             

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

Braces +18 added lines, -11 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);		
@@ -130,8 +132,9 @@ 
 	 */
 	protected static function getBase64EncryptionKey() {	    
 	    $key = 'STANDARDKEYIFNOSERVER';
-	    if(!empty(Filter::server('SERVER_NAME')) && !empty(Filter::server('SERVER_SOFTWARE')))
-	        $key = md5(Filter::server('SERVER_NAME').Filter::server('SERVER_SOFTWARE'));
+	    if(!empty(Filter::server('SERVER_NAME')) && !empty(Filter::server('SERVER_SOFTWARE'))) {
+	    	        $key = md5(Filter::server('SERVER_NAME').Filter::server('SERVER_SOFTWARE'));
+	    }
 	    
 	    return $key;
 	}
@@ -168,11 +171,13 @@ 
 		$encrypted = str_replace('_', '/', $encrypted);
 		$encrypted = str_replace('*', '=', $encrypted);
 		$encrypted = base64_decode($encrypted);
-		if($encrypted === false)
-			throw new \InvalidArgumentException('The encrypted value is not in correct base64 format.');
+		if($encrypted === false) {
+					throw new \InvalidArgumentException('The encrypted value is not in correct base64 format.');
+		}
 		
-		if (mb_strlen($encrypted, '8bit') < (SODIUM_CRYPTO_SECRETBOX_NONCEBYTES + SODIUM_CRYPTO_SECRETBOX_MACBYTES))
-		    throw new \InvalidArgumentException('The encrypted value does not contain enough characters for the key.');
+		if (mb_strlen($encrypted, '8bit') < (SODIUM_CRYPTO_SECRETBOX_NONCEBYTES + SODIUM_CRYPTO_SECRETBOX_MACBYTES)) {
+				    throw new \InvalidArgumentException('The encrypted value does not contain enough characters for the key.');
+		}
 
 	    $nonce = mb_substr($encrypted, 0, SODIUM_CRYPTO_SECRETBOX_NONCEBYTES, '8bit');
 	    $ciphertext = mb_substr($encrypted, SODIUM_CRYPTO_SECRETBOX_NONCEBYTES, null, '8bit');
@@ -222,7 +227,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/Module/GeoDispersion/Model/OutlineMap.php

Braces +25 added lines, -10 removed lines

@@ -71,7 +71,9 @@ 
         $this->is_loaded = false;
         $this->subdivisions = array();
         $this->mappings = array();
-        if($load) $this->load();
+        if($load) {
+        	$this->load();
+        }
     }
     
     /**
@@ -118,7 +120,9 @@ 
                 foreach($xml->subdivisions->children() as $subdivision){
                     $attributes = $subdivision->attributes();
                     $key = I18N::strtolower(trim($attributes['name']));
-                    if(isset($attributes['parent'])) $key .= '@'. I18N::strtolower(trim($attributes['parent']));
+                    if(isset($attributes['parent'])) {
+                    	$key .= '@'. I18N::strtolower(trim($attributes['parent']));
+                    }
                     $this->subdivisions[$key] = array(
                         'id' => trim($attributes['id']),
                         'displayname' => trim($attributes['name']),
@@ -145,9 +149,10 @@ 
      */
     public function isLoaded() {
         try{
-            if(!$this->is_loaded) $this->load();
-        }
-        catch (\Exception $ex) { }
+            if(!$this->is_loaded) {
+            	$this->load();
+            }
+        } catch (\Exception $ex) { }
         return $this->is_loaded;
     }
     
@@ -164,7 +169,9 @@ 
 	 * @return string
 	 */
     public function getDescription() {
-        if(!$this->is_loaded) $this->load();
+        if(!$this->is_loaded) {
+        	$this->load();
+        }
         return $this->description;
     }
     
@@ -173,7 +180,9 @@ 
 	 * @return string
 	 */
     public function getTopLevelName() {
-        if(!$this->is_loaded) $this->load();
+        if(!$this->is_loaded) {
+        	$this->load();
+        }
         return $this->top_level_name;
     }    
     
@@ -182,7 +191,9 @@ 
      * @return \MyArtJaub\Webtrees\Module\GeoDispersion\Model\OutlineMapCanvas
      */
     public function getCanvas() {
-        if(!$this->is_loaded) $this->load();
+        if(!$this->is_loaded) {
+        	$this->load();
+        }
         return $this->canvas;
     }
     
@@ -191,7 +202,9 @@ 
      * @return array
      */
     public function getSubdivisions() {
-        if(!$this->is_loaded) $this->load();
+        if(!$this->is_loaded) {
+        	$this->load();
+        }
         return $this->subdivisions;
     }
     
@@ -200,7 +213,9 @@ 
      * @return array
      */
     public function getPlacesMappings() {
-        if(!$this->is_loaded) $this->load();
+        if(!$this->is_loaded) {
+        	$this->load();
+        }
         return $this->mappings;
     }
     

src/Webtrees/Module/GeoDispersion/GeoAnalysisController.php

Braces +28 added lines, -21 removed lines

@@ -144,14 +144,15 @@ 
             $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) {
+        } 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);
+        if($res['error']) {
+        	http_response_code(500);
+        }
         
         $controller->encode($res);
     }
@@ -175,14 +176,15 @@ 
         try{
             $this->provider->deleteGeoAnalysis($ga);
 			Log::addConfigurationLog('Module '.$this->module->getName().' : Geo Analysis ID "'.$ga->getId().'" has been deleted.');
-        }
-        catch (\Exception $ex) {
+        } 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);
+        if($res['error']) {
+        	http_response_code(500);
+        }
 
         $controller->encode($res);
     }
@@ -234,7 +236,9 @@ 
             
             $nb_found = $placesGeneralResults['knownsum'];
             $nb_other = 0;
-            if(isset($placesGeneralResults['other'])) $nb_other =$placesGeneralResults['other'];
+            if(isset($placesGeneralResults['other'])) {
+            	$nb_other =$placesGeneralResults['other'];
+            }
             $nb_unknown = $placesGeneralResults['unknown'];
             
             $data->set('stats_gen_nb_found', $nb_found);
@@ -255,12 +259,13 @@ 
                         if($level_map >= 0 && $level_map < count($levelvalues)) {
                             $levelref = I18N::strtolower($levelvalues[0] . '@' . $levelvalues[$level_map]);
                             if(!isset($results_by_subdivs[$levelref])) { $levelref = $levelvalues[0]; }
-                        }
-                        else {
+                        } else {
                             $levelref = $levelvalues[0];
                         }
                         $levelref = I18N::strtolower($levelref);
-                        if(isset($places_mappings[$levelref])) $levelref = $places_mappings[$levelref];
+                        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;
@@ -278,8 +283,7 @@ 
                 }
                 
                 $html = ViewFactory::make('GeoAnalysisTabGeneralMap', $this, new BaseController(), $data)->getHtmlPartial();
-            }
-            else {
+            } else {
                 $results = $placesGeneralResults['places'];
                 arsort($results);
                 $data->set('results', $results);
@@ -287,8 +291,7 @@ 
                 
                 $html = ViewFactory::make('GeoAnalysisTabGeneralTable', $this, new BaseController(), $data)->getHtmlPartial();
             }
-        }
-        else {
+        } else {
             $html = '<p class="warning">' . I18N::translate('No data is available for the general analysis.') . '</p>';
         }
         return $html;
@@ -320,9 +323,15 @@ 
                 $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(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;
@@ -340,8 +349,7 @@ 
                                 $results_by_gen[$gen]['places'][$placename]['flag'] = $flag;
                             }
                         }
-                    }
-                    else {
+                    } else {
                         $tmp = $genData['places'];
                         if($other > 0) {
                             $tmp = array_slice($tmp, 0, 5, true);
@@ -357,8 +365,7 @@ 
             
             $html = ViewFactory::make('GeoAnalysisTabGenerations', $this, new BaseController(), $data)->getHtmlPartial();
             
-        }
-        else {
+        } else {
             $html = '<p class="warning">' . I18N::translate('No data is available for the generations analysis.') . '</p>';
         }
         return $html;

src/Webtrees/ImageBuilder.php

Braces +16 added lines, -7 removed lines

@@ -95,7 +95,9 @@ 
 	 * @return ImageBuilder
 	 */
 	public function setExpireOffset($expireOffset) {
-	    if($expireOffset) $this->expire_offset = $expireOffset;
+	    if($expireOffset) {
+	    	$this->expire_offset = $expireOffset;
+	    }
 	    return $this;
 	}
 	
@@ -115,7 +117,9 @@ 
 	 * @return ImageBuilder
 	 */
 	public function setShowWatermark($show_watermark) {
-	    if(!is_null($show_watermark)) $this->show_watermark = $show_watermark;
+	    if(!is_null($show_watermark)) {
+	    	$this->show_watermark = $show_watermark;
+	    }
 	    return $this;
 	}
 	
@@ -126,7 +130,9 @@ 
 	 * @return ImageBuilder
 	 */
 	public function setFontMaxSize($font_max_size) {
-	    if($font_max_size) $this->font_max_size = $font_max_size;
+	    if($font_max_size) {
+	    	$this->font_max_size = $font_max_size;
+	    }
 	    return $this;
 	}
 	
@@ -137,7 +143,9 @@ 
 	 * @return ImageBuilder
 	 */
 	public function setFontColor($font_color) {
-	    if($font_color) $this->font_color = $font_color;
+	    if($font_color) {
+	    	$this->font_color = $font_color;
+	    }
 	    return $this;
 	}
 	
@@ -148,7 +156,9 @@ 
 	 * @return ImageBuilder
 	 */
 	public function setAsAttachment($is_attachement) {
-	    if(is_bool($is_attachement)) $this->as_attachment = $is_attachement;
+	    if(is_bool($is_attachement)) {
+	    	$this->as_attachment = $is_attachement;
+	    }
 	    return $this;
 	}
 	
@@ -300,8 +310,7 @@ 
 	    // text to watermark with	    
 	    if(method_exists($this->media, 'getWatermarkText')) {
 	       $word1_text = $this->media->getWatermarkText();
-	    }
-	    else {
+	    } else {
 	        $word1_text = $this->media->getTitle();
 	    }
 	

src/Webtrees/Module/Sosa/SosaStatsController.php

Braces +13 added lines, -6 removed lines

@@ -93,8 +93,12 @@ 
             foreach($stats_gen as $gen => $tab){
                 $genY1= I18N::translate('-');
                 $genY2= I18N::translate('-');
-                if($tab['firstBirth']>0) $genY1=$tab['firstEstimatedBirth'];
-                if($tab['lastBirth']>0) $genY2=$tab['lastEstimatedBirth'];
+                if($tab['firstBirth']>0) {
+                	$genY1=$tab['firstEstimatedBirth'];
+                }
+                if($tab['lastBirth']>0) {
+                	$genY2=$tab['lastEstimatedBirth'];
+                }
                 $total_theoretical += $gen_theoretical;
                 $perc_sosa_count_theor = Functions::safeDivision($tab['sosaCount'], $gen_theoretical);
                 $missing=2*$prev_known - $tab['sosaCount'];
@@ -169,7 +173,9 @@ 
      private function htmlAncestorDispersionG2()
     {
         $ancestorsDispGen2 = $this->sosa_provider->getAncestorDispersionForGen(2);
-        if(count($ancestorsDispGen2) == 0) return;
+        if(count($ancestorsDispGen2) == 0) {
+        	return;
+        }
         
         $size = '600x300';
         
@@ -251,7 +257,9 @@ 
      */
     private function htmlAncestorGenDepthG3() {
         $ancestorsGenDepth3 = $this->sosa_provider->getGenerationDepthStatsAtGen(3);
-        if(count($ancestorsGenDepth3) == 0) return;
+        if(count($ancestorsGenDepth3) == 0) {
+        	return;
+        }
         
         $ancestors = array();
         $chd_mean = array();
@@ -262,8 +270,7 @@ 
             if($ancestor !== null && $ancestor->canShowName()) {
                 $tmp = $ancestor->getAllNames();
                 $ancestors[] = Filter::escapeUrl($tmp[$ancestor->getPrimaryName()]['fullNN']);
-            }
-            else {
+            } else {
                 $ancestors[] = I18N::translate('Sosa %s', I18N::number($sosa));
             }
             $chd_mean[] = $genDepthStat['mean_gen_depth'];