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/Module/Sosa/Views/SosaStatsView.php

Spacing +8 added lines, -8 removed lines

@@ -30,11 +30,11 @@ 
 			<?php 
 			/** @var \Fisharebest\Webtrees\Individual $root_indi */
 			$root_indi = $this->data->get('root_indi');
-			if($root_indi !== null && $root_indi->canShowName()) { ?>
+			if ($root_indi !== null && $root_indi->canShowName()) { ?>
 			<h4 class="center"><?= I18N::translate('%s: %s', I18N::translate('Root individual'), $root_indi->getFullName()); ?><h4>
 			<?php } ?>
 			
-			<?php  if($this->data->get('is_setup')) {  
+			<?php  if ($this->data->get('is_setup')) {  
 			    $general_stats = $this->data->get('general_stats'); ?>
 			<h3><?php echo I18N::translate('General statistics'); ?></h3>
 			<div class="maj-table">
@@ -56,7 +56,7 @@ 
 				</div>
 				<div class="maj-row">
 					<div class="label"><?php echo I18N::translate('Mean generation time'); ?></div>
-					<div class="value"><?php echo I18N::plural('%s year', '%s years', $general_stats['mean_gen_time'],  I18N::number($general_stats['mean_gen_time'], 1)); ?></div>
+					<div class="value"><?php echo I18N::plural('%s year', '%s years', $general_stats['mean_gen_time'], I18N::number($general_stats['mean_gen_time'], 1)); ?></div>
 				</div>
 			</div>
 			
@@ -96,7 +96,7 @@ 
 					</tr>
 				</thead>
 				<tbody>
-					<?php foreach($this->data->get('generation_stats') as $gen => $row) { ?>
+					<?php foreach ($this->data->get('generation_stats') as $gen => $row) { ?>
 					<tr class="maj-row">
 						<td class="label"><?php echo I18N::translate('<strong>G%d</strong>', $gen); ?></td>
 						<td class="label"><?php echo I18N::translate('%1$s <> %2$s', $row['gen_min_birth'], $row['gen_max_birth']); ?></td>
@@ -110,7 +110,7 @@ 
 						<td class="value"><?php echo I18N::number($row['different']); ?></td>
 						<td class="value left percent_container">
 							<div class="percent_frame">
-								<div class="percent_cell" style="width:<?php echo 100*$row['perc_different'] ?>%;">
+								<div class="percent_cell" style="width:<?php echo 100 * $row['perc_different'] ?>%;">
 									&nbsp;<?php echo I18N::percentage($row['perc_different']); ?>&nbsp;
 								</div>
 							</div>
@@ -123,7 +123,7 @@ 
 				<tfoot>
 					<tr class="maj-row">
 						<td class="label" colspan="13">
-							<?php echo I18N::translate('Generation-equivalent: %s generations', I18N::number($this->data->get('equivalent_gen'),2)); ?>
+							<?php echo I18N::translate('Generation-equivalent: %s generations', I18N::number($this->data->get('equivalent_gen'), 2)); ?>
 						</td>
 					</tr>
 				</tfoot>
@@ -132,8 +132,8 @@ 
 			
 			<h3><?php echo I18N::translate('Known Sosa ancestors\' family dispersion'); ?></h3>
 			<div class="center">
-				<?php echo $this->data->get('chart_img_g2') ?: '' ; ?>
-				<?php echo $this->data->get('chart_img_g3') ?: '' ; ?>				
+				<?php echo $this->data->get('chart_img_g2') ?: ''; ?>
+				<?php echo $this->data->get('chart_img_g3') ?: ''; ?>				
 				<!--  <canvas id="chart_ancestors_g2" width="300" height="300"></canvas>  -->
 			</div>
 			

src/Webtrees/Module/Sosa/Model/SosaProvider.php

Spacing +77 added lines, -77 removed lines

@@ -84,18 +84,18 @@ 
      * @param User $user
      */
     public function __construct(Tree $tree, User $user = null) {
-        if(self::$default_user === null) 
+        if (self::$default_user === null) 
             self::$default_user = User::find(-1);
         
         $this->tree = $tree;
         $this->user = $user;
         $this->is_setup = true;
-        if($this->user === null) $this->user = Auth::user();
-        if(strlen($this->user->getUserId()) == 0) $this->user = self::$default_user;
+        if ($this->user === null) $this->user = Auth::user();
+        if (strlen($this->user->getUserId()) == 0) $this->user = self::$default_user;
         
         // Check if the user, or the default user, has a root already setup;
-        if(empty($this->getRootIndiId())) {
-            if($this->user == self::$default_user) {  // If the default user is not setup
+        if (empty($this->getRootIndiId())) {
+            if ($this->user == self::$default_user) {  // If the default user is not setup
                 $this->is_setup = false;
             }
             else {
@@ -127,7 +127,7 @@ 
      */
     public function getRootIndi() {
         $root_indi_id = $this->getRootIndiId();
-        if(!empty($root_indi_id)) {
+        if (!empty($root_indi_id)) {
             return Individual::getInstance($root_indi_id, $this->tree);
         }
         return null;
@@ -141,7 +141,7 @@ 
      * Remove all Sosa entries related to the gedcom file and user
      */
     public function deleteAll() {
-        if(!$this->is_setup) return;
+        if (!$this->is_setup) return;
         Database::prepare(
             'DELETE FROM `##maj_sosa`'.
             ' WHERE majs_gedcom_id= :tree_id and majs_user_id = :user_id ')
@@ -157,12 +157,12 @@ 
      * @param int $sosa
      */
     public function deleteAncestors($sosa) {
-        if(!$this->is_setup) return;
+        if (!$this->is_setup) return;
         $gen = Functions::getGeneration($sosa);
         Database::prepare(
             'DELETE FROM `##maj_sosa`'.
-            ' WHERE majs_gedcom_id=:tree_id and majs_user_id = :user_id' .
-            ' AND majs_gen >= :gen' .
+            ' WHERE majs_gedcom_id=:tree_id and majs_user_id = :user_id'.
+            ' AND majs_gen >= :gen'.
             ' AND FLOOR(majs_sosa / (POW(2, (majs_gen - :gen)))) = :sosa'
         )->execute(array(
             'tree_id' => $this->tree->getTreeId(), 
@@ -177,7 +177,7 @@ 
      * @param array $sosa_records
      */
     public function insertOrUpdate($sosa_records) {
-        if(!$this->is_setup) return;
+        if (!$this->is_setup) return;
         
         $treeid = $this->tree->getTreeId();
         $userid = $this->user->getUserId();
@@ -185,9 +185,9 @@ 
         $values_table = array();
         
         $i = 0;
-        foreach  ($sosa_records as $row) {
+        foreach ($sosa_records as $row) {
             $gen = Functions::getGeneration($row['sosa']);
-            if($gen <= self::MAX_DB_GENERATIONS) {
+            if ($gen <= self::MAX_DB_GENERATIONS) {
                 $questionmarks_table[] = 
                     '(:tree_id'.$i.', :user_id'.$i.', :sosa'.$i.', :indi_id'.$i.', :gen'.$i.', :byear'.$i.', :dyear'.$i.')';
                 $values_table = array_merge(
@@ -206,9 +206,9 @@ 
             $i++;
         }
         
-        $sql = 'REPLACE INTO `##maj_sosa`' .
-            ' (majs_gedcom_id, majs_user_id, majs_sosa, majs_i_id, majs_gen, majs_birth_year, majs_death_year)' .
-            ' VALUES '. implode(',', $questionmarks_table);
+        $sql = 'REPLACE INTO `##maj_sosa`'.
+            ' (majs_gedcom_id, majs_user_id, majs_sosa, majs_i_id, majs_gen, majs_birth_year, majs_death_year)'.
+            ' VALUES '.implode(',', $questionmarks_table);
         Database::prepare($sql)->execute($values_table);
     }
     
@@ -224,7 +224,7 @@ 
      * @return array Array of sosa numbers
      */
     public function getSosaNumbers(Individual $indi) {
-        if(!$this->is_setup) return array();
+        if (!$this->is_setup) return array();
         return Database::prepare(
                 'SELECT majs_sosa, majs_gen FROM `##maj_sosa`'.
                 ' WHERE majs_i_id=:indi_id AND majs_gedcom_id=:tree_id AND majs_user_id=:user_id'
@@ -241,7 +241,7 @@ 
      * @return number Last generation if found, 1 otherwise
      */
     public function getLastGeneration() {
-        if(!$this->is_setup) return;
+        if (!$this->is_setup) return;
         return Database::prepare(
                 'SELECT MAX(majs_gen) FROM `##maj_sosa`'.
                 ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'
@@ -261,13 +261,13 @@ 
      * @param int $ged_id ID of the gedcom file
      * @return array Associative array of Sosa ancestors, with their generation, comma separated
      */
-    public function getAllSosaWithGenerations(){
-        if(!$this->is_setup) return array();
+    public function getAllSosaWithGenerations() {
+        if (!$this->is_setup) return array();
         return Database::prepare(
-            'SELECT majs_i_id AS indi,' .
-            ' GROUP_CONCAT(DISTINCT majs_gen ORDER BY majs_gen ASC SEPARATOR ",") AS generations' .
-            ' FROM `##maj_sosa`' .
-            ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id' .
+            'SELECT majs_i_id AS indi,'.
+            ' GROUP_CONCAT(DISTINCT majs_gen ORDER BY majs_gen ASC SEPARATOR ",") AS generations'.
+            ' FROM `##maj_sosa`'.
+            ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'.
             ' GROUP BY majs_i_id'
         )->execute(array(
             'tree_id' => $this->tree->getTreeId(),
@@ -281,13 +281,13 @@ 
      * @param number $gen Generation
      * @return array Array of Sosa individuals
      */
-    public function getSosaListAtGeneration($gen){
-        if(!$this->is_setup) return array();
-        if(!$this->sosa_list_by_gen)
+    public function getSosaListAtGeneration($gen) {
+        if (!$this->is_setup) return array();
+        if (!$this->sosa_list_by_gen)
             $this->sosa_list_by_gen = array();
         
-        if($gen){
-            if(!isset($this->sosa_list_by_gen[$gen])){
+        if ($gen) {
+            if (!isset($this->sosa_list_by_gen[$gen])) {
                 $this->sosa_list_by_gen[$gen] = Database::prepare(
                     'SELECT majs_sosa AS sosa, majs_i_id AS indi'.
                     ' FROM `##maj_sosa`'.
@@ -312,13 +312,13 @@ 
      * @param number $gen Generation
      * @return array Array of Sosa families
      */
-    public function getFamilySosaListAtGeneration($gen){
-        if(!$this->is_setup) return array();
-        if(!$this->sosa_fam_list_by_gen)
+    public function getFamilySosaListAtGeneration($gen) {
+        if (!$this->is_setup) return array();
+        if (!$this->sosa_fam_list_by_gen)
             $this->sosa_fam_list_by_gen = array();
         
-        if($gen){
-            if(!isset($this->sosa_fam_list_by_gen[$gen])){
+        if ($gen) {
+            if (!isset($this->sosa_fam_list_by_gen[$gen])) {
                 $this->sosa_fam_list_by_gen[$gen] = Database::prepare(
                     'SELECT s1.majs_sosa AS sosa, f_id AS fam'.
                     ' FROM `##families`'.
@@ -348,9 +348,9 @@ 
      * @param number $gen Generation
      * @return array Array of Sosa individuals
      */
-    public function getMissingSosaListAtGeneration($gen){
-        if(!$this->is_setup) return array();    
-        if($gen){
+    public function getMissingSosaListAtGeneration($gen) {
+        if (!$this->is_setup) return array();    
+        if ($gen) {
             return $this->sosa_list_by_gen[$gen] = Database::prepare(
                 'SELECT schild.majs_sosa sosa, schild.majs_i_id indi, sfat.majs_sosa IS NOT NULL has_father, smot.majs_sosa IS NOT NULL has_mother'.
                 ' FROM `##maj_sosa` schild'.
@@ -387,10 +387,10 @@ 
      * @return array Statistics array
      */
     public function getStatisticsByGeneration() {
-        if(!$this->is_setup) return array();
-        if(!$this->statistics_tab) {
+        if (!$this->is_setup) return array();
+        if (!$this->statistics_tab) {
             $this->statistics_tab = array();
-            if($maxGeneration = $this->getLastGeneration()) {
+            if ($maxGeneration = $this->getLastGeneration()) {
                 for ($gen = 1; $gen <= $maxGeneration; $gen++) {
                     $birthStats = $this->getStatsBirthYearInGeneration($gen);
                     $this->statistics_tab[$gen] = array(
@@ -413,9 +413,9 @@ 
 	 * @return int
 	 */
 	public function getTotalIndividuals() {
-	    if(!$this->is_setup) return 0;
+	    if (!$this->is_setup) return 0;
 	    return Database::prepare(
-	        'SELECT SQL_CACHE COUNT(*) FROM `##individuals`' .
+	        'SELECT SQL_CACHE COUNT(*) FROM `##individuals`'.
 	        ' WHERE i_file = :tree_id')
 	        ->execute(array('tree_id' => $this->tree->getTreeId()))
 	        ->fetchOne() ?: 0;
@@ -426,10 +426,10 @@ 
      *
      * @return number Number of Sosas
      */
-    public function getSosaCount(){
-        if(!$this->is_setup) return 0;
+    public function getSosaCount() {
+        if (!$this->is_setup) return 0;
         return Database::prepare(
-            'SELECT SQL_CACHE COUNT(majs_sosa) FROM `##maj_sosa`' .
+            'SELECT SQL_CACHE COUNT(majs_sosa) FROM `##maj_sosa`'.
             ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id')
             ->execute(array(
                 'tree_id' => $this->tree->getTreeId(), 
@@ -443,10 +443,10 @@ 
      * @param number $gen Generation
      * @return number Number of Sosas in generation
      */
-    public function getSosaCountAtGeneration($gen){
-        if(!$this->is_setup) return 0;
+    public function getSosaCountAtGeneration($gen) {
+        if (!$this->is_setup) return 0;
         return Database::prepare(
-            'SELECT SQL_CACHE COUNT(majs_sosa) FROM `##maj_sosa`' .
+            'SELECT SQL_CACHE COUNT(majs_sosa) FROM `##maj_sosa`'.
             ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'.
             ' AND majs_gen= :gen')
         ->execute(array(
@@ -462,10 +462,10 @@ 
      * @param number $gen Generation
      * @return number Total number of Sosas up to generation
      */
-    public function getSosaCountUpToGeneration($gen){
-        if(!$this->is_setup) return 0;
+    public function getSosaCountUpToGeneration($gen) {
+        if (!$this->is_setup) return 0;
         return Database::prepare(
-            'SELECT SQL_CACHE COUNT(majs_sosa) FROM `##maj_sosa`' .
+            'SELECT SQL_CACHE COUNT(majs_sosa) FROM `##maj_sosa`'.
             ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'.
             ' AND majs_gen <= :gen')
         ->execute(array(
@@ -480,10 +480,10 @@ 
      *
      * @return number Total number of distinct individual
      */
-    public function getDifferentSosaCount(){
-        if(!$this->is_setup) return 0;
+    public function getDifferentSosaCount() {
+        if (!$this->is_setup) return 0;
         return Database::prepare(
-            'SELECT SQL_CACHE COUNT(DISTINCT majs_i_id) FROM `##maj_sosa`' .
+            'SELECT SQL_CACHE COUNT(DISTINCT majs_i_id) FROM `##maj_sosa`'.
             ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id')
         ->execute(array(
                 'tree_id' => $this->tree->getTreeId(), 
@@ -497,10 +497,10 @@ 
      * @param number $gen Generation
      * @return number Number of distinct Sosa individuals up to generation
      */
-    public function getDifferentSosaCountUpToGeneration($gen){
-        if(!$this->is_setup) return 0;
+    public function getDifferentSosaCountUpToGeneration($gen) {
+        if (!$this->is_setup) return 0;
         return Database::prepare(
-            'SELECT SQL_CACHE COUNT(DISTINCT majs_i_id) FROM `##maj_sosa`' .
+            'SELECT SQL_CACHE COUNT(DISTINCT majs_i_id) FROM `##maj_sosa`'.
             ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'.
             ' AND majs_gen <= :gen')
         ->execute(array(
@@ -520,11 +520,11 @@ 
      * @param number $gen Generation
      * @return array Birth statistics array
      */
-    public function getStatsBirthYearInGeneration($gen){
-        if(!$this->is_setup) return array('first' => 0, 'avg' => 0, 'last' => 0);
+    public function getStatsBirthYearInGeneration($gen) {
+        if (!$this->is_setup) return array('first' => 0, 'avg' => 0, 'last' => 0);
         return Database::prepare(
             'SELECT MIN(majs_birth_year) AS first, AVG(majs_birth_year) AS avg, MAX(majs_birth_year) AS last'.
-            ' FROM `##maj_sosa`' .
+            ' FROM `##maj_sosa`'.
             ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'.
             ' AND majs_gen=:gen AND NOT majs_birth_year = :birth_year')
             ->execute(array(
@@ -540,26 +540,26 @@ 
      *
      * @return number|NULL Mean generation time
      */
-    public function getMeanGenerationTime(){
-        if(!$this->is_setup) return;
-        if(!$this->statistics_tab){
+    public function getMeanGenerationTime() {
+        if (!$this->is_setup) return;
+        if (!$this->statistics_tab) {
             $this->getStatisticsByGeneration();
         }
         //Linear regression on x=generation and y=birthdate
         $sum_xy = 0;
-        $sum_x=0;
-        $sum_y=0;
-        $sum_x2=0;
-        $n=count($this->statistics_tab);
-        foreach($this->statistics_tab as $gen=>$stats){
-            $sum_xy+=$gen*$stats['avgBirth'];
-            $sum_x+=$gen;
-            $sum_y+=$stats['avgBirth'];
-            $sum_x2+=$gen*$gen;
+        $sum_x = 0;
+        $sum_y = 0;
+        $sum_x2 = 0;
+        $n = count($this->statistics_tab);
+        foreach ($this->statistics_tab as $gen=>$stats) {
+            $sum_xy += $gen * $stats['avgBirth'];
+            $sum_x += $gen;
+            $sum_y += $stats['avgBirth'];
+            $sum_x2 += $gen * $gen;
         }
-        $denom=($n*$sum_x2)-($sum_x*$sum_x);
-        if($denom!=0){
-            return -(($n*$sum_xy)-($sum_x*$sum_y))/($denom);
+        $denom = ($n * $sum_x2) - ($sum_x * $sum_x);
+        if ($denom != 0) {
+            return -(($n * $sum_xy) - ($sum_x * $sum_y)) / ($denom);
         }
         return null;
     }
@@ -587,14 +587,14 @@ 
      * @return array
      */
     public function getAncestorDispersionForGen($gen) {
-        if(!$this->is_setup || $gen > 11) return array();  // Going further than 11 gen will be out of range in the query
+        if (!$this->is_setup || $gen > 11) return array(); // Going further than 11 gen will be out of range in the query
         return Database::prepare(
             'SELECT branches, count(i_id)'.
             ' FROM ('.
             '   SELECT i_id,'.
             '       CASE'.
             '           WHEN CEIL(LOG2(SUM(branch))) = LOG2(SUM(branch)) THEN SUM(branch)'.
-            '           ELSE -1'.   // We put all ancestors shared between some branches in the same bucket
+            '           ELSE -1'.// We put all ancestors shared between some branches in the same bucket
             '       END branches'.
             '   FROM ('.
             '       SELECT DISTINCT majs_i_id i_id,'.

src/Webtrees/Functions/Functions.php

Spacing +29 added lines, -29 removed lines

@@ -38,9 +38,9 @@ 
 	 *
 	 * @param string $text Text to display
 	 */
-	static public function promptAlert($text){
+	static public function promptAlert($text) {
 		echo '<script>';
-		echo 'alert("',fw\Filter::escapeHtml($text),'")';
+		echo 'alert("', fw\Filter::escapeHtml($text), '")';
 		echo '</script>';
 	}
 	
@@ -53,7 +53,7 @@ 
 	 * @return float Result of the safe division
 	 */
 	public static function safeDivision($num, $denom, $default = 0) {
-		if($denom && $denom!=0){
+		if ($denom && $denom != 0) {
 			return $num / $denom;
 		}
 		return $default;
@@ -67,7 +67,7 @@ 
 	 * @param float $default Default value if denominator null or 0
 	 * @return float Percentage
 	 */
-	public static function getPercentage($num, $denom, $default = 0){
+	public static function getPercentage($num, $denom, $default = 0) {
 		return 100 * self::safeDivision($num, $denom, $default);
 	}
 	
@@ -78,8 +78,8 @@ 
 	 * @param int $target	The final max width/height
 	 * @return array array of ($width, $height). One of them must be $target
 	 */
-	static public function getResizedImageSize($file, $target=25){
-		list($width, $height, , ) = getimagesize($file);
+	static public function getResizedImageSize($file, $target = 25) {
+		list($width, $height,,) = getimagesize($file);
 		$max = max($width, $height);
 		$rapp = $target / $max;
 		$width = intval($rapp * $width);
@@ -109,21 +109,21 @@ 
 	 * @param int $length Length of the token, default to 32
 	 * @return string Random token
 	 */
-	public static function generateRandomToken($length=32) {
+	public static function generateRandomToken($length = 32) {
 		$chars = str_split('abcdefghijkmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789');
 		$len_chars = count($chars);
 		$token = '';
 		
 		for ($i = 0; $i < $length; $i++)
-			$token .= $chars[ mt_rand(0, $len_chars - 1) ];
+			$token .= $chars[mt_rand(0, $len_chars - 1)];
 		
 		# Number of 32 char chunks
-		$chunks = ceil( strlen($token) / 32 );
+		$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);		
@@ -145,15 +145,15 @@ 
 	 * @param string $data Text to encrypt
 	 * @return string Encrypted and encoded text
 	 */
-	public static function encryptToSafeBase64($data){
-	    if(!self::isEncryptionCompatible())
+	public static function encryptToSafeBase64($data) {
+	    if (!self::isEncryptionCompatible())
 	        throw new \Exception('MCrypt PHP extension is required to use encryption.');
 	    
 		$key = 'STANDARDKEYIFNOSERVER';
-		if(!empty(Filter::server('SERVER_NAME')) && !empty(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'));
 		$iv = mcrypt_create_iv(self::ENCRYPTION_IV_SIZE, MCRYPT_RAND);
-		$id = mcrypt_encrypt(MCRYPT_RIJNDAEL_128, $key, $data, MCRYPT_MODE_CBC,$iv);
+		$id = mcrypt_encrypt(MCRYPT_RIJNDAEL_128, $key, $data, MCRYPT_MODE_CBC, $iv);
 		$encrypted = base64_encode($iv.$id);
 		// +, / and = are not URL-compatible
 		$encrypted = str_replace('+', '-', $encrypted);
@@ -168,25 +168,25 @@ 
 	 * @param string $encrypted Text to decrypt
 	 * @return string Decrypted text
 	 */
-	public static function decryptFromSafeBase64($encrypted){
-	    if(!self::isEncryptionCompatible())
+	public static function decryptFromSafeBase64($encrypted) {
+	    if (!self::isEncryptionCompatible())
 	        throw new \Exception('MCrypt PHP extension is required to use encryption.');
 	    
 		$key = 'STANDARDKEYIFNOSERVER';
-		if(!empty(Filter::server('SERVER_NAME')) && !empty(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'));
 		$encrypted = str_replace('-', '+', $encrypted);
 		$encrypted = str_replace('_', '/', $encrypted);
 		$encrypted = str_replace('*', '=', $encrypted);
 		$encrypted = base64_decode($encrypted);
-		if(!$encrypted)
+		if (!$encrypted)
 			throw new \InvalidArgumentException('The encrypted value is not in correct base64 format.');
-		if(strlen($encrypted) < self::ENCRYPTION_IV_SIZE) 
+		if (strlen($encrypted) < self::ENCRYPTION_IV_SIZE) 
 			throw new \InvalidArgumentException('The encrypted value does not contain enough characters for the key.');
 		$iv_dec = substr($encrypted, 0, self::ENCRYPTION_IV_SIZE);
 		$encrypted = substr($encrypted, self::ENCRYPTION_IV_SIZE);
 		$decrypted = mcrypt_decrypt(MCRYPT_RIJNDAEL_128, $key, $encrypted, MCRYPT_MODE_CBC, $iv_dec);
-		return  preg_replace('~(?:\\000+)$~','',$decrypted);
+		return  preg_replace('~(?:\\000+)$~', '', $decrypted);
 	}
 	
 	/**
@@ -195,9 +195,9 @@ 
 	 * @param string $string Filesystem encoded string to encode
 	 * @return string UTF-8 encoded string
 	 */
-	public static function encodeFileSystemToUtf8($string){
+	public static function encodeFileSystemToUtf8($string) {
 		if (strtoupper(substr(php_uname('s'), 0, 7)) === 'WINDOWS') {
-		    return iconv('cp1252', 'utf-8//IGNORE',$string);
+		    return iconv('cp1252', 'utf-8//IGNORE', $string);
 		}
 		return $string;
 	}
@@ -208,9 +208,9 @@ 
 	 * @param string $string UTF-8 encoded string to encode
 	 * @return string Filesystem encoded string
 	 */
-	public static function encodeUtf8ToFileSystem($string){
+	public static function encodeUtf8ToFileSystem($string) {
 		if (preg_match('//u', $string) && strtoupper(substr(php_uname('s'), 0, 7)) === 'WINDOWS') {
-			return iconv('utf-8', 'cp1252//IGNORE' ,  $string);
+			return iconv('utf-8', 'cp1252//IGNORE', $string);
 		}
 		return $string;
 	}
@@ -223,7 +223,7 @@ 
 	 * @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;
 	}
 	
@@ -235,7 +235,7 @@ 
 	 * @return array Array of month short names
 	 */
 	public static function getCalendarShortMonths($calendarId = 0) {
-		if(!isset(self::$calendarShortMonths[$calendarId])) {
+		if (!isset(self::$calendarShortMonths[$calendarId])) {
 			$calendar_info = cal_info($calendarId);
 			self::$calendarShortMonths[$calendarId] = $calendar_info['abbrevmonths'];
 		}		
@@ -248,8 +248,8 @@ 
 	 * @param int $sosa Sosa number
 	 * @return number
 	 */
-	public static function getGeneration($sosa){
-		return(int)log($sosa, 2)+1;
+	public static function getGeneration($sosa) {
+		return(int)log($sosa, 2) + 1;
 	}
 	
 	

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

Spacing +42 added lines, -42 removed lines

@@ -31,7 +31,7 @@ 
 	 * @return string List of elements
 	 */
 	public static function getListFromArray(array $array) {
-		$n=count($array);
+		$n = count($array);
 		switch ($n) {
 			case 0:
 				return '';
@@ -40,10 +40,10 @@ 
 			default:
 				return implode(
 						/* I18N: list separator */ I18N::translate(', '), 
-						array_slice($array, 0, $n-1)
-					) .
-					/* I18N: last list separator, " and " in English, " et " in French  */ I18N::translate(' and ') . 
-					$array[$n-1];
+						array_slice($array, 0, $n - 1)
+					).
+					/* I18N: last list separator, " and " in English, " et " in French  */ I18N::translate(' and '). 
+					$array[$n - 1];
 		}
 	}
 
@@ -59,10 +59,10 @@ 
 			\MyArtJaub\Webtrees\Map\MapProviderInterface $mapProvider
 	) {
 		$place = $fact->getPlace();
-		if(!$place->isEmpty()) {
-			$iconPlace= $mapProvider->getPlaceIcon($place);	
-			if($iconPlace && strlen($iconPlace) > 0){
-				return	'<div class="fact_flag">'. self::htmlPlaceIcon($place, $iconPlace, 50). '</div>';
+		if (!$place->isEmpty()) {
+			$iconPlace = $mapProvider->getPlaceIcon($place);	
+			if ($iconPlace && strlen($iconPlace) > 0) {
+				return	'<div class="fact_flag">'.self::htmlPlaceIcon($place, $iconPlace, 50).'</div>';
 			}
 		}
 		return '';
@@ -76,8 +76,8 @@ 
 	 * @param number $size
 	 * @return string HTML code of the inserted flag
 	 */
-	public static function htmlPlaceIcon(\Fisharebest\Webtrees\Place $place, $icon_path , $size = 50) {
-	    return '<img class="flag_gm_h'. $size . '" src="' . $icon_path . '" title="' . $place->getGedcomName() . '" alt="' . $place->getGedcomName() . '" />';
+	public static function htmlPlaceIcon(\Fisharebest\Webtrees\Place $place, $icon_path, $size = 50) {
+	    return '<img class="flag_gm_h'.$size.'" src="'.$icon_path.'" title="'.$place->getGedcomName().'" alt="'.$place->getGedcomName().'" />';
 	}
 	
 	/**
@@ -95,7 +95,7 @@ 
 		$minimum = PHP_INT_MAX;
 		$maximum = 1;
 		foreach ($list as $params) {
-			if(array_key_exists('count', $params)) {
+			if (array_key_exists('count', $params)) {
 				$maximum = max($maximum, $params['count']);
 				$minimum = min($minimum, $params['count']);
 			}
@@ -113,15 +113,15 @@ 
 				$size = 75.0 + 125.0 * ($count - $minimum) / ($maximum - $minimum);
 			}
 			
-			$html .= '<a style="font-size:' . $size . '%" href="' . $url . '">';
+			$html .= '<a style="font-size:'.$size.'%" href="'.$url.'">';
 			if ($totals) {
-				$html .= I18N::translate('%1$s (%2$s)', '<span dir="auto">' . $text . '</span>', I18N::number($count));
+				$html .= I18N::translate('%1$s (%2$s)', '<span dir="auto">'.$text.'</span>', I18N::number($count));
 			} else {
 				$html .= $text;
 			}
 			$html .= '</a>';
 		}
-		return '<div class="tag_cloud">' . $html . '</div>';
+		return '<div class="tag_cloud">'.$html.'</div>';
 	}
 	
 
@@ -156,11 +156,11 @@ 
 	 * @param bool $isStrong Bolden the name ?
 	 * @return string HTML Code for individual item
 	 */
-	public static function htmlIndividualForList(\Fisharebest\Webtrees\Individual $individual, $isStrong = true){
+	public static function htmlIndividualForList(\Fisharebest\Webtrees\Individual $individual, $isStrong = true) {
 		$html = '';
 		$tag = 'em';
-		if($isStrong) $tag = 'strong';
-		if($individual && $individual->canShow()){
+		if ($isStrong) $tag = 'strong';
+		if ($individual && $individual->canShow()) {
 			$dindi = new Individual($individual);
 			$html = $individual->getSexImage();
 			$html .= '<a class="list_item" href="'.
@@ -175,7 +175,7 @@ 
 			$html .= '</a>';
 		}
 		else {
-			$html .= '<span class=\"list_item\"><'.$tag.'>' . I18N::translate('Private') . '</'.$tag.'></span>';
+			$html .= '<span class=\"list_item\"><'.$tag.'>'.I18N::translate('Private').'</'.$tag.'></span>';
 		}
 		return $html;
 	}
@@ -187,22 +187,22 @@ 
 	 * @param boolean $anchor option to print a link to calendar
 	 * @return string HTML code for short date
 	 */
-	public static function formatFactDateShort(\Fisharebest\Webtrees\Fact $fact, $anchor=false) {
+	public static function formatFactDateShort(\Fisharebest\Webtrees\Fact $fact, $anchor = false) {
 		global $SEARCH_SPIDER;
 
-		$html='';
+		$html = '';
 		$date = $fact->getDate();
-		if($date->isOK()){
-			$html.=' '.$date->Display($anchor && !$SEARCH_SPIDER, '%Y');
+		if ($date->isOK()) {
+			$html .= ' '.$date->Display($anchor && !$SEARCH_SPIDER, '%Y');
 		}
-		else{
+		else {
 			// 1 DEAT Y with no DATE => print YES
 			// 1 BIRT 2 SOUR @S1@ => print YES
 			// 1 DEAT N is not allowed
 			// It is not proper GEDCOM form to use a N(o) value with an event tag to infer that it did not happen.
 			$factdetail = explode(' ', trim($fact->getGedcom()));
 			if (isset($factdetail) && (count($factdetail) == 3 && strtoupper($factdetail[2]) == 'Y') || (count($factdetail) == 4 && $factdetail[2] == 'SOUR')) {
-				$html.=I18N::translate('yes');
+				$html .= I18N::translate('yes');
 			}
 		}
 		return $html;
@@ -216,12 +216,12 @@ 
 	 * @param boolean $anchor option to print a link to placelist
 	 * @return string HTML code for short place
 	 */
-	public static function formatFactPlaceShort(\Fisharebest\Webtrees\Fact $fact, $format, $anchor=false){
-		$html='';
+	public static function formatFactPlaceShort(\Fisharebest\Webtrees\Fact $fact, $format, $anchor = false) {
+		$html = '';
 		
 		if ($fact === null) return $html;
 		$place = $fact->getPlace();
-		if($place){
+		if ($place) {
 			$dplace = new Place($place);
 			$html .= $dplace->htmlFormattedName($format, $anchor);
 		}
@@ -239,21 +239,21 @@ 
 	 * @param string $size CSS size for the icon. A CSS style css_$size is required
 	 * @return string HTML code for the formatted Sosa numbers
 	 */
-	public static function formatSosaNumbers(array $sosatab, $format = 1, $size = 'small'){
+	public static function formatSosaNumbers(array $sosatab, $format = 1, $size = 'small') {
 		$html = '';
-		switch($format){
+		switch ($format) {
 			case 1:
-				if(count($sosatab)>0){
+				if (count($sosatab) > 0) {
 					$html = '<i class="icon-maj-sosa_'.$size.'" title="'.I18N::translate('Sosa').'"></i>';
 				}
 				break;
 			case 2:
-				if(count($sosatab)>0){
+				if (count($sosatab) > 0) {
 					ksort($sosatab);
 					$tmp_html = array();
 					foreach ($sosatab as $sosa => $gen) {
 						$tmp_html[] = sprintf(
-								'<i class="icon-maj-sosa_%1$s" title="'.I18N::translate('Sosa').'"></i>&nbsp;<strong>%2$d&nbsp;'.I18N::translate('(G%s)', $gen) .'</strong>',
+								'<i class="icon-maj-sosa_%1$s" title="'.I18N::translate('Sosa').'"></i>&nbsp;<strong>%2$d&nbsp;'.I18N::translate('(G%s)', $gen).'</strong>',
 								$size,
 								$sosa
 							);
@@ -279,15 +279,15 @@ 
 	 * @param string $size CSS size for the icon. A CSS style css_$size is required
 	 * @return string HTML code for IsSourced icon
 	 */
-	public static function formatIsSourcedIcon($sourceType, $isSourced, $tag='EVEN', $format = 1, $size='normal'){
-		$html='';
-		$image=null;
-		$title=null;
-		switch($format){
+	public static function formatIsSourcedIcon($sourceType, $isSourced, $tag = 'EVEN', $format = 1, $size = 'normal') {
+		$html = '';
+		$image = null;
+		$title = null;
+		switch ($format) {
 			case 1:
-				switch($sourceType){
+				switch ($sourceType) {
 					case 'E':
-						switch($isSourced){
+						switch ($isSourced) {
 							case 0:
 								$image = 'event_unknown';
 								$title = I18N::translate('%s not found', GedcomTag::getLabel($tag));
@@ -317,7 +317,7 @@ 
 						}
 						break;
 					case 'R':
-						switch($isSourced){
+						switch ($isSourced) {
 							case -1:
 								$image = 'record_notsourced';
 								$title = I18N::translate('%s not sourced', GedcomTag::getLabel($tag));
@@ -337,7 +337,7 @@ 
 					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/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;
 			}
 		}