Passed
Branch feature/2.0 (2da243)
by Jonathan
05:05
created
src/Webtrees/Module/GeoDispersion/Model/GeoAnalysisProvider.php 1 patch
Spacing   +36 added lines, -36 removed lines patch added patch discarded remove patch
@@ -65,14 +65,14 @@  discard block
 block discarded – undo
65 65
         ->setUsingFlags($row['majgd_useflagsgen'] == 'yes')
66 66
         ->setMaxDetailsInGen($row['majgd_detailsgen']);
67 67
         
68
-        if($row['majgd_map']) {
68
+        if ($row['majgd_map']) {
69 69
             $options
70 70
             ->setMap(new OutlineMap($row['majgd_map']))
71 71
             ->setMapLevel($row['majgd_toplevel']);
72 72
         }
73 73
         
74 74
         $enabled = true;
75
-        if(isset($row['majgd_status']) && $row['majgd_status'] == 'disabled') {
75
+        if (isset($row['majgd_status']) && $row['majgd_status'] == 'disabled') {
76 76
             $enabled = false;
77 77
         }
78 78
         
@@ -93,8 +93,8 @@  discard block
 block discarded – undo
93 93
      */
94 94
     public function getGeoAnalysisCount() {
95 95
         return Database::prepare(
96
-            'SELECT COUNT(majgd_id)' .
97
-            ' FROM `##maj_geodispersion`' .
96
+            'SELECT COUNT(majgd_id)'.
97
+            ' FROM `##maj_geodispersion`'.
98 98
             ' WHERE majgd_file = :gedcom_id'
99 99
             )->execute(array(
100 100
                 'gedcom_id' => $this->tree->getTreeId()
@@ -110,15 +110,15 @@  discard block
 block discarded – undo
110 110
      * @return \MyArtJaub\Webtrees\Module\GeoDispersion\Model\GeoAnalysis|NULL
111 111
      */
112 112
     public function getGeoAnalysis($id, $only_enabled = true) {
113
-        $args = array (
113
+        $args = array(
114 114
             'gedcom_id' => $this->tree->getTreeId(),
115 115
             'ga_id' => $id
116 116
         );
117 117
         
118
-        $sql = 'SELECT majgd_id, majgd_descr, majgd_sublevel, majgd_map, majgd_toplevel, majgd_useflagsgen, majgd_detailsgen, majgd_status' .
119
-            ' FROM `##maj_geodispersion`' .
118
+        $sql = 'SELECT majgd_id, majgd_descr, majgd_sublevel, majgd_map, majgd_toplevel, majgd_useflagsgen, majgd_detailsgen, majgd_status'.
119
+            ' FROM `##maj_geodispersion`'.
120 120
             ' WHERE majgd_file = :gedcom_id AND majgd_id=:ga_id';
121
-        if($only_enabled) {
121
+        if ($only_enabled) {
122 122
             $sql .= ' AND majgd_status = :status';
123 123
             $args['status'] = 'enabled';
124 124
         }
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
         
127 127
         $ga_array = Database::prepare($sql)->execute($args)->fetchOneRow(\PDO::FETCH_ASSOC);
128 128
         
129
-        if($ga_array) {
129
+        if ($ga_array) {
130 130
             return $this->loadGeoAnalysisFromRow($ga_array);
131 131
         }
132 132
         
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
146 146
      * @return GeoAnalysis
147 147
      */
148 148
 	public function createGeoAnalysis($description, $analysis_level, $map_file, $map_top_level, $use_flags, $gen_details) {
149
-		try{
149
+		try {
150 150
 			Database::beginTransaction();
151 151
 		
152 152
 			Database::prepare(
@@ -168,7 +168,7 @@  discard block
 block discarded – undo
168 168
 			
169 169
 			Database::commit();
170 170
 		}
171
-		catch(\Exception $ex) {
171
+		catch (\Exception $ex) {
172 172
 			Database::rollback();
173 173
 			$ga = null;
174 174
 			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 @@  discard block
 block discarded – undo
211 211
 			
212 212
 			 Database::commit();
213 213
 		}
214
-		catch(\Exception $ex) {		    
214
+		catch (\Exception $ex) {		    
215 215
 			Database::rollback();
216
-			Log::addErrorLog('The Geo Analysis ID “' . $ga->getId() . '” failed to be updated. Transaction rollbacked. Exception: '.$ex->getMessage());
216
+			Log::addErrorLog('The Geo Analysis ID “'.$ga->getId().'” failed to be updated. Transaction rollbacked. Exception: '.$ex->getMessage());
217 217
 			$ga = null;
218 218
 		}
219 219
 		return $ga;
@@ -258,12 +258,12 @@  discard block
 block discarded – undo
258 258
      *
259 259
      * @return array List of enabled maps
260 260
      */
261
-    public function getGeoAnalysisList(){
261
+    public function getGeoAnalysisList() {
262 262
         $res = array();
263 263
         
264 264
         $list = Database::prepare(
265
-            'SELECT majgd_id, majgd_descr, majgd_sublevel, majgd_map, majgd_toplevel, majgd_useflagsgen, majgd_detailsgen' .
266
-            ' FROM `##maj_geodispersion`' .
265
+            'SELECT majgd_id, majgd_descr, majgd_sublevel, majgd_map, majgd_toplevel, majgd_useflagsgen, majgd_detailsgen'.
266
+            ' FROM `##maj_geodispersion`'.
267 267
             ' WHERE majgd_file = :gedcom_id AND majgd_status = :status'.
268 268
             ' ORDER BY majgd_descr'
269 269
         )->execute(array(
@@ -271,7 +271,7 @@  discard block
 block discarded – undo
271 271
             'status' => 'enabled'
272 272
         ))->fetchAll(\PDO::FETCH_ASSOC);
273 273
         
274
-        foreach($list as $ga) {
274
+        foreach ($list as $ga) {
275 275
            $res[] = $this->loadGeoAnalysisFromRow($ga);
276 276
         }
277 277
         
@@ -287,17 +287,17 @@  discard block
 block discarded – undo
287 287
      * @param int|null $limit Max number of items to return (for pagination)
288 288
      * @return \MyArtJaub\Webtrees\Module\GeoDispersion\Model\GeoAnalysis[]
289 289
      */
290
-    public function getFilteredGeoAnalysisList($search = null, $order_by = null, $start = 0, $limit = null){
290
+    public function getFilteredGeoAnalysisList($search = null, $order_by = null, $start = 0, $limit = null) {
291 291
         $res = array();
292 292
             
293 293
         $sql = 
294
-            'SELECT majgd_id, majgd_descr, majgd_sublevel, majgd_map, majgd_toplevel, majgd_useflagsgen, majgd_detailsgen, majgd_status' .
295
-            ' FROM `##maj_geodispersion`' .
294
+            'SELECT majgd_id, majgd_descr, majgd_sublevel, majgd_map, majgd_toplevel, majgd_useflagsgen, majgd_detailsgen, majgd_status'.
295
+            ' FROM `##maj_geodispersion`'.
296 296
             ' WHERE majgd_file = :gedcom_id';
297 297
         
298 298
         $args = array('gedcom_id'=> $this->tree->getTreeId());
299 299
         
300
-        if($search) {
300
+        if ($search) {
301 301
             $sql .= ' AND majgd_descr LIKE CONCAT(\'%\', :search, \'%\')';
302 302
             $args['search'] = $search;
303 303
         }
@@ -311,10 +311,10 @@  discard block
 block discarded – undo
311 311
                 
312 312
                 switch ($value['dir']) {
313 313
                     case 'asc':
314
-                        $sql .= $value['column'] . ' ASC ';
314
+                        $sql .= $value['column'].' ASC ';
315 315
                         break;
316 316
                     case 'desc':
317
-                        $sql .= $value['column'] . ' DESC ';
317
+                        $sql .= $value['column'].' DESC ';
318 318
                         break;
319 319
                 }
320 320
             }
@@ -330,7 +330,7 @@  discard block
 block discarded – undo
330 330
             
331 331
         $data = Database::prepare($sql)->execute($args)->fetchAll(\PDO::FETCH_ASSOC);
332 332
 
333
-        foreach($data as $ga) {
333
+        foreach ($data as $ga) {
334 334
             $res[] = $this->loadGeoAnalysisFromRow($ga);
335 335
         }
336 336
         
@@ -347,11 +347,11 @@  discard block
 block discarded – undo
347 347
      * @return array
348 348
      */
349 349
     public function getPlacesHierarchy() {
350
-        if(!$this->place_hierarchy) {
351
-            if($place_structure = $this->getPlacesHierarchyFromHeader()) {
350
+        if (!$this->place_hierarchy) {
351
+            if ($place_structure = $this->getPlacesHierarchyFromHeader()) {
352 352
                 $this->place_hierarchy = array('type' => 'header', 'hierarchy' => $place_structure);
353 353
             }
354
-            elseif ($place_structure = $this->getPlacesHierarchyFromData()){
354
+            elseif ($place_structure = $this->getPlacesHierarchyFromData()) {
355 355
                 $this->place_hierarchy = array('type' => 'data', 'hierarchy' => $place_structure);
356 356
             }
357 357
             else {
@@ -370,8 +370,8 @@  discard block
 block discarded – undo
370 370
     protected function getPlacesHierarchyFromHeader() {
371 371
         $head = GedcomRecord::getInstance('HEAD', $this->tree);
372 372
         $head_place = $head->getFirstFact('PLAC');
373
-        if($head_place && $head_place_value = $head_place->getAttribute('FORM')){
374
-            return array_reverse(array_map('trim',explode(',', $head_place_value)));
373
+        if ($head_place && $head_place_value = $head_place->getAttribute('FORM')) {
374
+            return array_reverse(array_map('trim', explode(',', $head_place_value)));
375 375
         }
376 376
         return null;
377 377
     }
@@ -387,7 +387,7 @@  discard block
 block discarded – undo
387 387
         $nb_levels = 0;
388 388
         
389 389
         //Select all '2 PLAC ' tags in the file and create array
390
-        $places_list=array();
390
+        $places_list = array();
391 391
         $ged_data = Database::prepare(
392 392
             'SELECT i_gedcom AS gedcom'.
393 393
             ' FROM `##individuals`'.
@@ -404,7 +404,7 @@  discard block
 block discarded – undo
404 404
             $matches = null;
405 405
             preg_match_all('/\n2 PLAC (.+)/', $ged_datum, $matches);
406 406
             foreach ($matches[1] as $match) {
407
-                $places_list[$match]=true;
407
+                $places_list[$match] = true;
408 408
             }
409 409
         }
410 410
         
@@ -415,7 +415,7 @@  discard block
 block discarded – undo
415 415
         foreach ($places_list as $place => $value) {
416 416
             $levels = array_filter(array_map('trim', explode(",", $place)));
417 417
             $parts = count($levels);
418
-            if($parts > $max_level) {
418
+            if ($parts > $max_level) {
419 419
                 $max_level = $parts;
420 420
                 $places_with_high_level = array($place);
421 421
             }
@@ -425,11 +425,11 @@  discard block
 block discarded – undo
425 425
         }
426 426
         
427 427
         // If empty array, then return null
428
-        if($max_level == 0) return null;
428
+        if ($max_level == 0) return null;
429 429
                 
430 430
         // Else, return the first alphabetical element -- cannot return random to ensure always the same example if used
431 431
         usort($places_with_high_level, array('Fisharebest\\Webtrees\\I18N', 'strcasecmp'));        
432
-        return array_reverse(array_map('trim',explode(',', $places_with_high_level[0])));
432
+        return array_reverse(array_map('trim', explode(',', $places_with_high_level[0])));
433 433
         
434 434
     }
435 435
     
@@ -441,9 +441,9 @@  discard block
 block discarded – undo
441 441
     public function getOutlineMapsList() {
442 442
         $res = array();
443 443
         $root_path = WT_ROOT.WT_MODULES_DIR.Constants::MODULE_MAJ_GEODISP_NAME.'/maps/';
444
-        if(is_dir($root_path)){
444
+        if (is_dir($root_path)) {
445 445
             $dir = opendir($root_path);
446
-            while (($file=readdir($dir))!== false) {
446
+            while (($file = readdir($dir)) !== false) {
447 447
                 if (preg_match('/^[a-zA-Z0-9_]+.xml$/', $file)) {
448 448
                     $res[base64_encode($file)] = new OutlineMap($file, true);
449 449
                 }
Please login to merge, or discard this patch.
src/Webtrees/Module/GeoDispersion/Views/GeoAnalysisEditView.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -42,13 +42,13 @@  discard block
 block discarded – undo
42 42
 		
43 43
 		<h1><?php echo $this->data->get('title'); ?></h1>
44 44
 		
45
-		<?php if($places_hierarchy['type'] == 'none') { ?>		
45
+		<?php if ($places_hierarchy['type'] == 'none') { ?>		
46 46
 		<div class="warning"><?php echo I18N::translate('No place structure could be determined. Please make sure that at least a place exists.'); ?></div>		
47 47
 		<?php } else { ?>
48 48
 		
49 49
 		<form class="form-horizontal" name="newform" method="post" role="form" action="<?php echo $this->data->get('save_url'); ?>" autocomplete="off">
50 50
     		<?php echo Filter::getCsrf(); ?>
51
-    		<?php if(!$is_new) { ?>
51
+    		<?php if (!$is_new) { ?>
52 52
     		<input type="hidden" name="ga_id" value="<?php echo $ga->getId(); ?>">
53 53
     		<?php } ?>
54 54
     
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
     				<?php echo I18N::translate('Description'); ?>
59 59
     			</label>
60 60
     			<div class="col-sm-9">
61
-    				<input class="form-control" type="text" id="description" name="description" required maxlength="70" <?php if(!$is_new) echo 'value="' . Filter::escapeHtml($ga->getTitle()) .'"'; ?> dir="auto">
61
+    				<input class="form-control" type="text" id="description" name="description" required maxlength="70" <?php if (!$is_new) echo 'value="'.Filter::escapeHtml($ga->getTitle()).'"'; ?> dir="auto">
62 62
     				<p class="small text-muted">
63 63
     					<?php echo I18N::translate('Description to be given to the geographical dispersion analysis. It will be used as the page title for it.'); ?>
64 64
     				</p>
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
         				<?php echo I18N::translate('Map'); ?>
102 102
         			</label>
103 103
         			<div class="col-sm-9">
104
-        				<?php echo FunctionsEdit::selectEditControl('map_file', $this->data->get('map_list') , null, ($is_new || ! $ga->hasMap()) ? '' : base64_encode($ga->getOptions()->getMap()->getFileName()), 'class="form-control"'); ?>
104
+        				<?php echo FunctionsEdit::selectEditControl('map_file', $this->data->get('map_list'), null, ($is_new || !$ga->hasMap()) ? '' : base64_encode($ga->getOptions()->getMap()->getFileName()), 'class="form-control"'); ?>
105 105
         				<p class="small text-muted">
106 106
         					<?php echo I18N::translate('Map outline to be used for the result display.'); ?>
107 107
         				</p>
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
         				<?php echo I18N::translate('Map parent level'); ?>
115 115
         			</label>
116 116
         			<div class="col-sm-9">
117
-        				<?php echo FunctionsEdit::selectEditControl('map_top_level', $places_hierarchy['hierarchy'], null, $is_new || ! $ga->hasMap() ? '' : $ga->getOptions()->getMapLevel() - 1, 'class="form-control"'); ?>
117
+        				<?php echo FunctionsEdit::selectEditControl('map_top_level', $places_hierarchy['hierarchy'], null, $is_new || !$ga->hasMap() ? '' : $ga->getOptions()->getMapLevel() - 1, 'class="form-control"'); ?>
118 118
         				<p class="small text-muted">
119 119
         					<?php echo I18N::translate('Subdivision level of the parent subdivision(s) represented by the map.'); ?><br />
120 120
         					<?php echo I18N::translate('For instance, if the map is intended to represent a country by county analysis, then the map parent level would be “Country”, and the analysis level would be “County”.'); ?>
Please login to merge, or discard this patch.
src/Webtrees/Module/GeoDispersion/Views/AdminConfigView.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -41,16 +41,16 @@  discard block
 block discarded – undo
41 41
 		
42 42
 		<h2>
43 43
 			<?php echo $tree->getTitleHtml(); ?>
44
-			<?php if(count($other_trees) > 0) {?>
44
+			<?php if (count($other_trees) > 0) {?>
45 45
 			<div class="btn-group">
46 46
 				<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
47 47
 					<?php echo I18N::translate('Change tree'); ?>
48 48
 					<span class="caret"></span>
49 49
 				</button>
50
-				<?php foreach($other_trees as $other_tree) { ?>
50
+				<?php foreach ($other_trees as $other_tree) { ?>
51 51
 				<ul class="dropdown-menu" role="menu">
52 52
 					<li>
53
-						<a href="<?php echo $root_url . '&ged=' . $other_tree->getNameUrl(); ?>">
53
+						<a href="<?php echo $root_url.'&ged='.$other_tree->getNameUrl(); ?>">
54 54
 							<i class="fa fa-fw fa-tree"></i>&nbsp;<?php echo $other_tree->getTitleHtml(); ?>
55 55
 						</a>
56 56
 					</li>
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
 		
63 63
 		<p>
64 64
 		<?php $places_hierarchy = $this->data->get('places_hierarchy'); 
65
-		if($places_hierarchy && $places_hierarchy['type'] != 'none') {
65
+		if ($places_hierarchy && $places_hierarchy['type'] != 'none') {
66 66
 		    switch ($places_hierarchy['type']) {
67 67
 		        case 'header':
68 68
 		            echo I18N::translate('According to the GEDCOM header, the places within your file follows the structure: ');
@@ -76,10 +76,10 @@  discard block
 block discarded – undo
76 76
 		            break;
77 77
 		    }
78 78
 		    $str_hierarchy = array();
79
-		    foreach($places_hierarchy['hierarchy'] as $key => $level) {
79
+		    foreach ($places_hierarchy['hierarchy'] as $key => $level) {
80 80
 		        $str_hierarchy[] = I18N::translate('(%d) %s', $key + 1, $level);
81 81
 		    }
82
-		    echo '<strong>' . implode(I18N::$list_separator, $str_hierarchy) . '</strong>';
82
+		    echo '<strong>'.implode(I18N::$list_separator, $str_hierarchy).'</strong>';
83 83
 		}
84 84
 		?>
85 85
 		</p>
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
103 103
     		</tbody>
104 104
     	</table>
105 105
     	
106
-        <a type="button" class="btn btn-primary" href="<?php echo $root_url . '@add&ged=' . $tree->getNameUrl(); ?>" title="<?php echo I18N::translate('Add'); ?>">
106
+        <a type="button" class="btn btn-primary" href="<?php echo $root_url.'@add&ged='.$tree->getNameUrl(); ?>" title="<?php echo I18N::translate('Add'); ?>">
107 107
         	<i class="fa fa-plus"></i>
108 108
         	<?php echo I18N::translate('Add'); ?>
109 109
         </a>
Please login to merge, or discard this patch.
src/Webtrees/Module/GeoDispersion/AdminConfigController.php 1 patch
Spacing   +44 added lines, -46 removed lines patch added patch discarded remove patch
@@ -71,14 +71,14 @@  discard block
 block discarded – undo
71 71
         $data->set('title', $controller->getPageTitle());
72 72
         $data->set('tree', $wt_tree);
73 73
         
74
-        $data->set('root_url', 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig');
74
+        $data->set('root_url', 'module.php?mod='.$this->module->getName().'&mod_action=AdminConfig');
75 75
                 
76
-        $table_id = 'table-geoanalysis-' . Uuid::uuid4();
76
+        $table_id = 'table-geoanalysis-'.Uuid::uuid4();
77 77
         $data->set('table_id', $table_id);
78 78
         
79 79
         $other_trees = array();
80 80
         foreach (Tree::getAll() as $tree) {
81
-            if($tree->getTreeId() != $wt_tree->getTreeId()) $other_trees[] = $tree;
81
+            if ($tree->getTreeId() != $wt_tree->getTreeId()) $other_trees[] = $tree;
82 82
         }      
83 83
         $data->set('other_trees', $other_trees);
84 84
         
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
                     processing: true,
102 102
                     serverSide : true,
103 103
 					ajax : {
104
-						url : "module.php?mod='.$this->module->getName().'&mod_action=AdminConfig@jsonGeoAnalysisList&ged='. $wt_tree->getNameUrl().'",
104
+						url : "module.php?mod='.$this->module->getName().'&mod_action=AdminConfig@jsonGeoAnalysisList&ged='.$wt_tree->getNameUrl().'",
105 105
                         type : "POST"
106 106
 					},
107 107
                     columns: [
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
                             url: "module.php", 
126 126
                             type: "GET",
127 127
                             data: {
128
-                			    mod: "' . $this->module->getName() .'",
128
+                			    mod: "' . $this->module->getName().'",
129 129
                                 mod_action:  "GeoAnalysis@setStatus",
130 130
                 			    ga_id: ga_id,
131 131
                 			    ged: typeof gedcom === "undefined" ? WT_GEDCOM : gedcom,
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
                             },
134 134
                             error: function(result, stat, error) {
135 135
                                 var err = typeof result.responseJSON === "undefined" ? error : result.responseJSON.error;
136
-                                alert("' . I18N::translate('An error occured while editing this analysis:') . '" + err);
136
+                                alert("' . I18N::translate('An error occured while editing this analysis:').'" + err);
137 137
                             },
138 138
                             complete: function(result, stat) {
139 139
                                 geoAnalysisTable.ajax.reload(null, false);
@@ -146,14 +146,14 @@  discard block
 block discarded – undo
146 146
                             url: "module.php", 
147 147
                             type: "GET",
148 148
                             data: {
149
-                			    mod: "' . $this->module->getName() .'",
149
+                			    mod: "' . $this->module->getName().'",
150 150
                                 mod_action:  "GeoAnalysis@delete",
151 151
                 			    ga_id: ga_id,
152 152
                 			    ged: typeof gedcom === "undefined" ? WT_GEDCOM : gedcom
153 153
                             },
154 154
                             error: function(result, stat, error) {
155 155
                                 var err = typeof result.responseJSON === "undefined" ? error : result.responseJSON.error;
156
-                                alert("' . I18N::translate('An error occured while deleting this analysis:') . '" + err);
156
+                                alert("' . I18N::translate('An error occured while deleting this analysis:').'" + err);
157 157
                             },
158 158
                             complete: function(result, stat) {
159 159
                                 geoAnalysisTable.ajax.reload(null, false);
@@ -177,13 +177,13 @@  discard block
 block discarded – undo
177 177
         
178 178
         // Generate an AJAX/JSON response for datatables to load a block of rows
179 179
         $search = Filter::postArray('search');
180
-        if($search) $search = $search['value'];
180
+        if ($search) $search = $search['value'];
181 181
         $start  = Filter::postInteger('start');
182 182
         $length = Filter::postInteger('length');
183 183
         $order  = Filter::postArray('order');
184 184
         
185
-        foreach($order as $key => &$value) {
186
-            switch($value['column']) {
185
+        foreach ($order as $key => &$value) {
186
+            switch ($value['column']) {
187 187
                 case 3:
188 188
                     $value['column'] = 'majgd_descr';
189 189
                     break;
@@ -204,11 +204,11 @@  discard block
 block discarded – undo
204 204
         
205 205
         $data = array();
206 206
         $place_hierarchy = $this->provider->getPlacesHierarchy();
207
-        foreach($list as $ga) {
207
+        foreach ($list as $ga) {
208 208
             /** @var GeoAnalysis $ga */
209 209
             
210 210
             $datum = array();
211
-            $options= $ga->getOptions();
211
+            $options = $ga->getOptions();
212 212
             
213 213
             $datum[0] = '
214 214
                 <div class="btn-group">
@@ -218,47 +218,46 @@  discard block
 block discarded – undo
218 218
                     <ul class="dropdown-menu" role="menu">
219 219
                        <li>
220 220
                             <a href="#" onclick="return set_geoanalysis_status('. $ga->getId().', '.($ga->isEnabled() ? 'false' : 'true').', \''.Filter::escapeJs($wt_tree->getName()).'\');">
221
-                                <i class="fa fa-fw '.($ga->isEnabled() ? 'fa-times' : 'fa-check').'"></i> ' . ($ga->isEnabled() ? I18N::translate('Disable') : I18N::translate('Enable')) . '
221
+                                <i class="fa fa-fw '.($ga->isEnabled() ? 'fa-times' : 'fa-check').'"></i> '.($ga->isEnabled() ? I18N::translate('Disable') : I18N::translate('Enable')).'
222 222
                             </a>
223 223
                        </li>
224 224
                         <li>
225 225
                             <a href="module.php?mod='.$this->module->getName().'&mod_action=AdminConfig@edit&ga_id='.$ga->getId().'&ged='.$wt_tree->getName().'">
226
-                                <i class="fa fa-fw fa-pencil"></i> ' . I18N::translate('Edit') . '
226
+                                <i class="fa fa-fw fa-pencil"></i> ' . I18N::translate('Edit').'
227 227
                             </a>
228 228
                        </li>
229 229
                        <li class="divider" />
230 230
                        <li>
231 231
                             <a href="#" onclick="return delete_geoanalysis('. $ga->getId().', \''.Filter::escapeJs($wt_tree->getName()).'\');">
232
-                                <i class="fa fa-fw fa-trash-o"></i> ' . I18N::translate('Delete') . '
232
+                                <i class="fa fa-fw fa-trash-o"></i> ' . I18N::translate('Delete').'
233 233
                             </a>
234 234
                        </li>
235 235
                     </ul>
236 236
                 </div>';
237 237
 		    $datum[1] = $ga->getId();
238 238
 		    $datum[2] = $ga->isEnabled() ? 
239
-				'<i class="fa fa-check"></i><span class="sr-only">'.I18N::translate('Enabled').'</span>' : 
240
-				'<i class="fa fa-times"></i><span class="sr-only">'.I18N::translate('Disabled').'</span>';
239
+				'<i class="fa fa-check"></i><span class="sr-only">'.I18N::translate('Enabled').'</span>' : '<i class="fa fa-times"></i><span class="sr-only">'.I18N::translate('Disabled').'</span>';
241 240
 		    $datum[3] = $ga->getTitle();
242 241
 		    $analysis_level = $ga->getAnalysisLevel();
243
-		    if($place_hierarchy['type'] == 'header') {
242
+		    if ($place_hierarchy['type'] == 'header') {
244 243
 		        $datum[4] = $place_hierarchy['hierarchy'][$analysis_level - 1];
245 244
 		    } elseif ($place_hierarchy['type'] == 'data') {
246
-		        $datum[4] = $analysis_level . ' (' . $place_hierarchy['hierarchy'][$analysis_level - 1] . ')';
245
+		        $datum[4] = $analysis_level.' ('.$place_hierarchy['hierarchy'][$analysis_level - 1].')';
247 246
 		    } else {
248 247
 		        $datum[4] = $analysis_level;
249 248
 		    }
250 249
 		    $datum[5] = $ga->getAnalysisLevel();
251 250
 		    $datum[6] = '<i class="fa fa-times"></i><span class="sr-only">'.I18N::translate('None').'</span>';
252 251
 		    $datum[7] = '<i class="fa fa-times"></i><span class="sr-only">'.I18N::translate('None').'</span>';
253
-		    if($ga->hasMap()) {
254
-		        if($options->getMap()->isLoaded()) {
252
+		    if ($ga->hasMap()) {
253
+		        if ($options->getMap()->isLoaded()) {
255 254
     		        $datum[6] = $options->getMap()->getDescription();
256
-    		        $datum[7] = '<span data-toggle="tooltip" title="' . $options->getMap()->getTopLevelName() . '" />';
255
+    		        $datum[7] = '<span data-toggle="tooltip" title="'.$options->getMap()->getTopLevelName().'" />';
257 256
     		        $top_level = $options->getMapLevel();
258
-    		        if($place_hierarchy['type'] == 'header') {
257
+    		        if ($place_hierarchy['type'] == 'header') {
259 258
     		            $datum[7] .= $place_hierarchy['hierarchy'][$top_level - 1];
260 259
     		        } elseif ($place_hierarchy['type'] == 'data') {
261
-    		            $datum[7] .= $top_level . ' (' . $place_hierarchy['hierarchy'][$top_level - 1] . ')';
260
+    		            $datum[7] .= $top_level.' ('.$place_hierarchy['hierarchy'][$top_level - 1].')';
262 261
     		        } else {
263 262
     		            $datum[7] .= $top_level;
264 263
     		        }
@@ -269,8 +268,7 @@  discard block
 block discarded – undo
269 268
 		        }
270 269
 		    }
271 270
 		    $datum[8] = $options->isUsingFlags() ? 
272
-				'<i class="fa fa-check"></i><span class="sr-only">'.I18N::translate('Yes').'</span>' : 
273
-				'<i class="fa fa-times"></i><span class="sr-only">'.I18N::translate('No').'</span>';
271
+				'<i class="fa fa-check"></i><span class="sr-only">'.I18N::translate('Yes').'</span>' : '<i class="fa fa-times"></i><span class="sr-only">'.I18N::translate('No').'</span>';
274 272
 		    $datum[9] = $options->getMaxDetailsInGen() > 0 ? $options->getMaxDetailsInGen() : I18N::translate('All');
275 273
 		    
276 274
 		    $data[] = $datum;
@@ -319,24 +317,24 @@  discard block
 block discarded – undo
319 317
         $description    = Filter::post('description');
320 318
         $analysislevel  = Filter::postInteger('analysislevel');
321 319
         $use_map        = Filter::postBool('use_map');
322
-        if($use_map) {
320
+        if ($use_map) {
323 321
             $map_file   = base64_decode(Filter::post('map_file'));
324
-            $map_top_level   = Filter::postInteger('map_top_level');
322
+            $map_top_level = Filter::postInteger('map_top_level');
325 323
         }
326 324
         $use_flags      = Filter::postBool('use_flags');
327 325
         $gen_details    = Filter::postInteger('gen_details');
328 326
         
329 327
         $success = false; 
330
-        if($ga_id) {
328
+        if ($ga_id) {
331 329
             $ga = $this->provider->getGeoAnalysis($ga_id, false);
332
-            if($ga) {
330
+            if ($ga) {
333 331
                 $ga->setTitle($description);
334 332
                 $ga->setAnalysisLevel($analysislevel + 1);
335 333
                 $options = $ga->getOptions();
336
-                if($options) {
334
+                if ($options) {
337 335
                     $options->setUsingFlags($use_flags);
338 336
                     $options->setMaxDetailsInGen($gen_details);
339
-                    if($use_map) {
337
+                    if ($use_map) {
340 338
                         $options->setMap(new OutlineMap($map_file));
341 339
                         $options->setMapLevel($map_top_level + 1);
342 340
                     }
@@ -346,7 +344,7 @@  discard block
 block discarded – undo
346 344
                 }
347 345
 				
348 346
 				$res = $this->provider->updateGeoAnalysis($ga);
349
-				if($res) {
347
+				if ($res) {
350 348
 					FlashMessages::addMessage(I18N::translate('The geographical dispersion analysis “%s” has been successfully updated', $res->getTitle()), 'success');
351 349
 					Log::addConfigurationLog('Module '.$this->module->getName().' : Geo Analysis ID “'.$res->getId().'” has been updated.');
352 350
 					$ga = $res;
@@ -354,7 +352,7 @@  discard block
 block discarded – undo
354 352
 				}
355 353
 				else {
356 354
 					FlashMessages::addMessage(I18N::translate('An error occured while updating the geographical dispersion analysis “%s”', $ga->getTitle()), 'danger');
357
-					Log::addConfigurationLog('Module '.$this->module->getName().' : Geo Analysis ID “'. $ga->getId() .'” could not be updated. See error log.');
355
+					Log::addConfigurationLog('Module '.$this->module->getName().' : Geo Analysis ID “'.$ga->getId().'” could not be updated. See error log.');
358 356
 				}
359 357
             }
360 358
         } else {
@@ -366,7 +364,7 @@  discard block
 block discarded – undo
366 364
 				$use_flags,
367 365
 				$gen_details
368 366
 			);
369
-			if($ga) {
367
+			if ($ga) {
370 368
 				FlashMessages::addMessage(I18N::translate('The geographical dispersion analysis “%s” has been successfully added.', $ga->getTitle()), 'success');
371 369
 				Log::addConfigurationLog('Module '.$this->module->getName().' : Geo Analysis ID “'.$ga->getId().'” has been added.');
372 370
 				$success = true;
@@ -377,16 +375,16 @@  discard block
 block discarded – undo
377 375
 			}
378 376
         }
379 377
         
380
-        $redirection_url = 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig&ged=' . $wt_tree->getNameUrl();
381
-        if(!$success) {			
382
-            if($ga) {
383
-                $redirection_url = 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig@edit&ga_id='. $ga->getId() .'&ged=' . $wt_tree->getNameUrl();
378
+        $redirection_url = 'module.php?mod='.$this->module->getName().'&mod_action=AdminConfig&ged='.$wt_tree->getNameUrl();
379
+        if (!$success) {			
380
+            if ($ga) {
381
+                $redirection_url = 'module.php?mod='.$this->module->getName().'&mod_action=AdminConfig@edit&ga_id='.$ga->getId().'&ged='.$wt_tree->getNameUrl();
384 382
             }
385 383
             else {
386
-                $redirection_url = 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig@add&ged=' . $wt_tree->getNameUrl();
384
+                $redirection_url = 'module.php?mod='.$this->module->getName().'&mod_action=AdminConfig@add&ged='.$wt_tree->getNameUrl();
387 385
             }
388 386
         }        
389
-        header('Location: ' . WT_BASE_URL . $redirection_url);
387
+        header('Location: '.WT_BASE_URL.$redirection_url);
390 388
         
391 389
     }
392 390
      
@@ -416,7 +414,7 @@  discard block
 block discarded – undo
416 414
             ');
417 415
         
418 416
         $data = new ViewBag();
419
-        if($ga) {
417
+        if ($ga) {
420 418
             $controller->setPageTitle(I18N::translate('Edit the geographical dispersion analysis'));
421 419
             $data->set('geo_analysis', $ga);
422 420
         } else {
@@ -424,9 +422,9 @@  discard block
 block discarded – undo
424 422
         }
425 423
         
426 424
         $data->set('title', $controller->getPageTitle());
427
-        $data->set('admin_config_url', 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig&ged=' . $wt_tree->getNameUrl());
425
+        $data->set('admin_config_url', 'module.php?mod='.$this->module->getName().'&mod_action=AdminConfig&ged='.$wt_tree->getNameUrl());
428 426
         $data->set('module_title', $this->module->getTitle());
429
-        $data->set('save_url', 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig@save&ged=' . $wt_tree->getNameUrl());
427
+        $data->set('save_url', 'module.php?mod='.$this->module->getName().'&mod_action=AdminConfig@save&ged='.$wt_tree->getNameUrl());
430 428
         $data->set('places_hierarchy', $this->provider->getPlacesHierarchy());
431 429
     
432 430
         $map_list = array_map(
@@ -439,7 +437,7 @@  discard block
 block discarded – undo
439 437
         $data->set('map_list', $map_list);
440 438
     
441 439
         $gen_details = array(0 => I18N::translate('All'));
442
-        for($i = 1; $i <= 10 ; $i++) $gen_details[$i] = $i;
440
+        for ($i = 1; $i <= 10; $i++) $gen_details[$i] = $i;
443 441
         $data->set('generation_details', $gen_details);
444 442
     
445 443
         ViewFactory::make('GeoAnalysisEdit', $this, $controller, $data)->render();
Please login to merge, or discard this patch.
src/Webtrees/Module/PatronymicLineage/Http/RequestHandlers/SurnamesList.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
         
70 70
         $initial = $request->getAttribute('alpha');
71 71
         $initials_list = collect($this->indilist_service->surnameAlpha(false, false, I18N::locale()))
72
-            ->reject(function ($count, $initial) {
72
+            ->reject(function($count, $initial) {
73 73
 
74 74
                 return $initial === '@' || $initial === ',';
75 75
             });
@@ -77,17 +77,17 @@  discard block
 block discarded – undo
77 77
         $show_all = $request->getQueryParams()['show_all'] ?? 'no';
78 78
         
79 79
         if ($show_all === 'yes') {
80
-            $title = I18N::translate('Patronymic Lineages') . ' — ' . I18N::translate('All');
80
+            $title = I18N::translate('Patronymic Lineages').' — '.I18N::translate('All');
81 81
             $surnames = $this->indilist_service->surnames('', '', false, false, I18N::locale());
82 82
         } elseif ($initial !== null && mb_strlen($initial) == 1) {
83
-            $title = I18N::translate('Patronymic Lineages') . ' — ' . $initial;
83
+            $title = I18N::translate('Patronymic Lineages').' — '.$initial;
84 84
             $surnames = $this->indilist_service->surnames('', $initial, false, false, I18N::locale());
85 85
         } else {
86
-            $title =  I18N::translate('Patronymic Lineages');
86
+            $title = I18N::translate('Patronymic Lineages');
87 87
             $surnames = [];
88 88
         }
89 89
         
90
-        return $this->viewResponse($this->module->name() . '::surnames-page', [
90
+        return $this->viewResponse($this->module->name().'::surnames-page', [
91 91
             'title'         =>  $title,
92 92
             'module'        =>  $this->module,
93 93
             'tree'          =>  $tree,
Please login to merge, or discard this patch.
src/Webtrees/Module/PatronymicLineage/Http/RequestHandlers/LineagesPage.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -72,16 +72,16 @@
 block discarded – undo
72 72
         
73 73
         $initial = mb_substr($surname, 0, 1);
74 74
         $initials_list = collect($this->indilist_service->surnameAlpha(false, false, I18N::locale()))
75
-            ->reject(function ($count, $initial) {
75
+            ->reject(function($count, $initial) {
76 76
 
77 77
                 return $initial === '@' || $initial === ',';
78 78
             });
79 79
             
80
-        $title = I18N::translate('Patronymic Lineages') . ' — ' . $surname;
80
+        $title = I18N::translate('Patronymic Lineages').' — '.$surname;
81 81
         
82 82
         $lineages = app()->make(LineageBuilder::class, ['surname' => $surname])->buildLineages();
83 83
         
84
-        return $this->viewResponse($this->module->name() . '::lineages-page', [
84
+        return $this->viewResponse($this->module->name().'::lineages-page', [
85 85
             'title'         =>  $title,
86 86
             'module'        =>  $this->module,
87 87
             'tree'          =>  $tree,
Please login to merge, or discard this patch.
src/Webtrees/Module/PatronymicLineage/PatronymicLineageModule.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -61,11 +61,11 @@  discard block
 block discarded – undo
61 61
      */
62 62
     public function loadRoutes(Map $router): void
63 63
     {
64
-        $router->attach('', '', static function (Map $router) {
64
+        $router->attach('', '', static function(Map $router) {
65 65
 
66
-            $router->attach('', '/module-maj/lineages', static function (Map $router) {
66
+            $router->attach('', '/module-maj/lineages', static function(Map $router) {
67 67
 
68
-                $router->attach('', '/Page', static function (Map $router) {
68
+                $router->attach('', '/Page', static function(Map $router) {
69 69
 
70 70
                     $router->get(SurnamesList::class, '/{tree}/list{/alpha}', SurnamesList::class);
71 71
                     $router->get(LineagesPage::class, '/{tree}/lineage/{surname}', LineagesPage::class);
@@ -113,6 +113,6 @@  discard block
 block discarded – undo
113 113
      */
114 114
     public function headContent(): string
115 115
     {
116
-        return '<link rel="stylesheet" href="' . e($this->moduleCssUrl()) . '">';
116
+        return '<link rel="stylesheet" href="'.e($this->moduleCssUrl()).'">';
117 117
     }
118 118
 }
Please login to merge, or discard this patch.
src/Webtrees/Module/PatronymicLineage/Model/LineageNode.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
     public function addFamily(Family $fams): object
69 69
     {
70 70
         if (!$this->linked_fams->has($fams->xref())) {
71
-            $this->linked_fams->put($fams->xref(), (object) [
71
+            $this->linked_fams->put($fams->xref(), (object)[
72 72
                 'family'   =>  $fams,
73 73
                 'children' =>  new Collection()
74 74
             ]);
@@ -135,6 +135,6 @@  discard block
 block discarded – undo
135 135
      */
136 136
     public function hasFollowUpSurname(): bool
137 137
     {
138
-        return mb_strlen($this->followUpSurname()) > 0 ;
138
+        return mb_strlen($this->followUpSurname()) > 0;
139 139
     }
140 140
 }
Please login to merge, or discard this patch.
src/Webtrees/Module/PatronymicLineage/Model/LineageBuilder.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -107,7 +107,7 @@
 block discarded – undo
107 107
             }
108 108
         }
109 109
       
110
-        return $root_lineages->sort(function (LineageRootNode $a, LineageRootNode $b) {
110
+        return $root_lineages->sort(function(LineageRootNode $a, LineageRootNode $b) {
111 111
 
112 112
             if ($a->numberChildNodes() == $b->numberChildNodes()) {
113 113
                 return 0;
Please login to merge, or discard this patch.