Passed
Branch feature/2.0 (2da243)
by Jonathan
05:05
created
src/Webtrees/Hook/HookInterfaces/PageHeaderExtenderInterface.php 1 patch
Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -1,13 +1,13 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
  /**
3
- * webtrees-lib: MyArtJaub library for webtrees
4
- *
5
- * @package MyArtJaub\Webtrees
6
- * @subpackage Hook
7
- * @author Jonathan Jaubart <[email protected]>
8
- * @copyright Copyright (c) 2011-2016, Jonathan Jaubart
9
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public License, version 3
10
- */
3
+  * webtrees-lib: MyArtJaub library for webtrees
4
+  *
5
+  * @package MyArtJaub\Webtrees
6
+  * @subpackage Hook
7
+  * @author Jonathan Jaubart <[email protected]>
8
+  * @copyright Copyright (c) 2011-2016, Jonathan Jaubart
9
+  * @license http://www.gnu.org/licenses/gpl.html GNU General Public License, version 3
10
+  */
11 11
 namespace MyArtJaub\Webtrees\Hook\HookInterfaces;
12 12
 
13 13
 /**
@@ -15,12 +15,12 @@  discard block
 block discarded – undo
15 15
  */
16 16
 interface PageHeaderExtenderInterface {
17 17
 		
18
-    /**
19
-     * Get HTML code for extending the header of a page.
20
-     * 
21
-     * @return string HTML code extension
22
-     */
23
-    public function hPrintHeader();
18
+	/**
19
+	 * Get HTML code for extending the header of a page.
20
+	 * 
21
+	 * @return string HTML code extension
22
+	 */
23
+	public function hPrintHeader();
24 24
 	
25 25
 }
26 26
 
Please login to merge, or discard this patch.
src/Webtrees/Hook/HookInterfaces/PageFooterExtenderInterface.php 1 patch
Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -1,13 +1,13 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
  /**
3
- * webtrees-lib: MyArtJaub library for webtrees
4
- *
5
- * @package MyArtJaub\Webtrees
6
- * @subpackage Hook
7
- * @author Jonathan Jaubart <[email protected]>
8
- * @copyright Copyright (c) 2011-2016, Jonathan Jaubart
9
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public License, version 3
10
- */
3
+  * webtrees-lib: MyArtJaub library for webtrees
4
+  *
5
+  * @package MyArtJaub\Webtrees
6
+  * @subpackage Hook
7
+  * @author Jonathan Jaubart <[email protected]>
8
+  * @copyright Copyright (c) 2011-2016, Jonathan Jaubart
9
+  * @license http://www.gnu.org/licenses/gpl.html GNU General Public License, version 3
10
+  */
11 11
 namespace MyArtJaub\Webtrees\Hook\HookInterfaces;
12 12
 
13 13
 /**
@@ -15,12 +15,12 @@  discard block
 block discarded – undo
15 15
  */
16 16
 interface PageFooterExtenderInterface {
17 17
 		
18
-    /**
19
-     * Get HTML code for extending the footer of a page.
20
-     * 
21
-     * @return string HTML code extension
22
-     */
23
-    public function hPrintFooter();
18
+	/**
19
+	 * Get HTML code for extending the footer of a page.
20
+	 * 
21
+	 * @return string HTML code extension
22
+	 */
23
+	public function hPrintFooter();
24 24
 	
25 25
 }
26 26
 
Please login to merge, or discard this patch.
src/Webtrees/Hook/HookInterfaces/IndividualHeaderExtenderInterface.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -1,13 +1,13 @@
 block discarded – undo
1 1
 <?php
2 2
  /**
3
- * webtrees-lib: MyArtJaub library for webtrees
4
- *
5
- * @package MyArtJaub\Webtrees
6
- * @subpackage Hook
7
- * @author Jonathan Jaubart <[email protected]>
8
- * @copyright Copyright (c) 2011-2016, Jonathan Jaubart
9
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public License, version 3
10
- */
3
+  * webtrees-lib: MyArtJaub library for webtrees
4
+  *
5
+  * @package MyArtJaub\Webtrees
6
+  * @subpackage Hook
7
+  * @author Jonathan Jaubart <[email protected]>
8
+  * @copyright Copyright (c) 2011-2016, Jonathan Jaubart
9
+  * @license http://www.gnu.org/licenses/gpl.html GNU General Public License, version 3
10
+  */
11 11
 namespace MyArtJaub\Webtrees\Hook\HookInterfaces;
12 12
 
13 13
 use Fisharebest\Webtrees\Controller\IndividualController;
Please login to merge, or discard this patch.
src/Webtrees/Hook/HookInterfaces/CustomSimpleTagManagerInterface.php 1 patch
Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -1,13 +1,13 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
  /**
3
- * webtrees-lib: MyArtJaub library for webtrees
4
- *
5
- * @package MyArtJaub\Webtrees
6
- * @subpackage Hook
7
- * @author Jonathan Jaubart <[email protected]>
8
- * @copyright Copyright (c) 2011-2016, Jonathan Jaubart
9
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public License, version 3
10
- */
3
+  * webtrees-lib: MyArtJaub library for webtrees
4
+  *
5
+  * @package MyArtJaub\Webtrees
6
+  * @subpackage Hook
7
+  * @author Jonathan Jaubart <[email protected]>
8
+  * @copyright Copyright (c) 2011-2016, Jonathan Jaubart
9
+  * @license http://www.gnu.org/licenses/gpl.html GNU General Public License, version 3
10
+  */
11 11
 namespace MyArtJaub\Webtrees\Hook\HookInterfaces;
12 12
 
13 13
 /**
@@ -18,12 +18,12 @@  discard block
 block discarded – undo
18 18
 interface CustomSimpleTagManagerInterface {
19 19
 
20 20
 
21
-    /**
22
-     * Returns the list of expected tags, classified by type of records.
23
-     *
24
-     * @return array List of expected tags
25
-     */
26
-    public function hGetExpectedTags();
21
+	/**
22
+	 * Returns the list of expected tags, classified by type of records.
23
+	 *
24
+	 * @return array List of expected tags
25
+	 */
26
+	public function hGetExpectedTags();
27 27
     
28 28
 	/**
29 29
 	 * Return the HTML code to be display for this tag.
Please login to merge, or discard this patch.
src/Webtrees/Family.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -40,10 +40,10 @@
 block discarded – undo
40 40
 	}
41 41
 	
42 42
 	/**
43
-	* Check if this family's marriages are sourced
44
-	*
45
-	* @return int Level of sources
46
-	* */
43
+	 * Check if this family's marriages are sourced
44
+	 *
45
+	 * @return int Level of sources
46
+	 * */
47 47
 	function isMarriageSourced(){
48 48
 		if($this->is_marriage_sourced !== null) return $this->is_marriage_sourced;
49 49
 		$this->is_marriage_sourced = $this->isFactSourced(WT_EVENTS_MARR.'|MARC');
Please login to merge, or discard this patch.
src/Webtrees/Fact.php 1 patch
Indentation   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -34,26 +34,26 @@
 block discarded – undo
34 34
 	protected $fact; 
35 35
 	
36 36
 	/**
37
-	* Contructor for the decorator
38
-	*
39
-	* @param \Fisharebest\Webtrees\Fact $fact_in The Fact to extend
40
-	*/
37
+	 * Contructor for the decorator
38
+	 *
39
+	 * @param \Fisharebest\Webtrees\Fact $fact_in The Fact to extend
40
+	 */
41 41
 	public function __construct(\Fisharebest\Webtrees\Fact $fact_in){
42 42
 		$this->fact = $fact_in;
43 43
 	}
44 44
 	
45 45
 	/**
46
-	* Check if a fact has a date and is sourced
47
-	* Values:
48
-	* 		- 0, if no date is found for the fact
49
-	* 		- -1, if the date is not precise
50
-	* 		- -2, if the date is precise, but no source is found
51
-	* 		- 1, if the date is precise, and a source is found
52
-	* 		- 2, if the date is precise, a source exists, and is supported by a certificate (requires _ACT usage)
53
-	* 		- 3, if the date is precise, a source exists, and the certificate supporting the fact is within an acceptable range of date
54
-	*
55
-	* @return int Level of sources
56
-	*/
46
+	 * Check if a fact has a date and is sourced
47
+	 * Values:
48
+	 * 		- 0, if no date is found for the fact
49
+	 * 		- -1, if the date is not precise
50
+	 * 		- -2, if the date is precise, but no source is found
51
+	 * 		- 1, if the date is precise, and a source is found
52
+	 * 		- 2, if the date is precise, a source exists, and is supported by a certificate (requires _ACT usage)
53
+	 * 		- 3, if the date is precise, a source exists, and the certificate supporting the fact is within an acceptable range of date
54
+	 *
55
+	 * @return int Level of sources
56
+	 */
57 57
 	public function isSourced(){
58 58
 		$isSourced=0;
59 59
 		$date = $this->fact->getDate();
Please login to merge, or discard this patch.
src/Webtrees/Module/Sosa/Views/SosaListFamView.php 1 patch
Indentation   +93 added lines, -93 removed lines patch added patch discarded remove patch
@@ -32,11 +32,11 @@  discard block
 block discarded – undo
32 32
 	 * {@inhericDoc}
33 33
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
34 34
 	 */
35
-    protected function renderContent() { 
35
+	protected function renderContent() { 
36 36
         
37
-        if($this->data->get('has_sosa', false)) {
38
-            $table_id = $this->data->get('table_id');            
39
-        ?>   
37
+		if($this->data->get('has_sosa', false)) {
38
+			$table_id = $this->data->get('table_id');            
39
+		?>   
40 40
         
41 41
 		<div id="sosa-fam-list" class="sosa-list">
42 42
 			<table id="<?php echo $table_id; ?>">
@@ -176,61 +176,61 @@  discard block
 block discarded – undo
176 176
 				<tbody>
177 177
 			
178 178
 			<?php foreach($this->data->get('sosa_list') as $sosa => $family) {
179
-			    /** @var \Fisharebest\Webtrees\Family $person */
179
+				/** @var \Fisharebest\Webtrees\Family $person */
180 180
 
181
-			    //PERSO Create decorator for Family
182
-			    $dfamily = new Family($family);
181
+				//PERSO Create decorator for Family
182
+				$dfamily = new Family($family);
183 183
 			    
184
-			    $husb = $family->getHusband();
185
-			    if (is_null($husb)) {
186
-			        $husb = new Individual('H', '0 @H@ INDI', null, $family->getTree());
187
-			    }
188
-			    $wife = $family->getWife();
189
-			    if (is_null($wife)) {
190
-			        $wife = new Individual('W', '0 @W@ INDI', null, $family->getTree());
191
-			    }
184
+				$husb = $family->getHusband();
185
+				if (is_null($husb)) {
186
+					$husb = new Individual('H', '0 @H@ INDI', null, $family->getTree());
187
+				}
188
+				$wife = $family->getWife();
189
+				if (is_null($wife)) {
190
+					$wife = new Individual('W', '0 @W@ INDI', null, $family->getTree());
191
+				}
192 192
 			    
193
-			    $mdate=$family->getMarriageDate();
193
+				$mdate=$family->getMarriageDate();
194 194
 			    
195
-			    if ($family->isPendingAddtion()) {
196
-			        $class = ' class="new"';
197
-			    } elseif ($family->isPendingDeletion()) {
198
-			        $class = ' class="old"';
199
-			    } else {
200
-			        $class = '';
201
-			    }
202
-			    ?>			
195
+				if ($family->isPendingAddtion()) {
196
+					$class = ' class="new"';
197
+				} elseif ($family->isPendingDeletion()) {
198
+					$class = ' class="old"';
199
+				} else {
200
+					$class = '';
201
+				}
202
+				?>			
203 203
         		<tr <?= $class ?>>
204 204
         			<td class="transparent" data-sort="<?= $sosa ?>"><?= I18N::translate('%1$d/%2$d', $sosa, ($sosa + 1) % 10) ?></td>
205 205
         			<!--  HUSBAND -->
206 206
         			<?php list($surn_givn, $givn_surn) = FunctionsPrintLists::sortableNames($husb); ?>
207 207
         			<td colspan="2" data-sort="<?= Filter::escapeHtml($givn_surn) ?>">        			
208 208
         			<?php foreach ($husb->getAllNames() as $num=>$name) {
209
-        				if ($name['type']=='NAME') {
210
-        					$title='';
211
-        				} else {
212
-        					$title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $husb)).'"';
213
-        				}
214
-        				if ($num==$husb->getPrimaryName()) {
215
-        					$class=' class="name2"';
216
-        					$sex_image=$husb->getSexImage();
217
-        				} else {
218
-        					$class='';
219
-        					$sex_image='';
220
-        				} ?>
209
+						if ($name['type']=='NAME') {
210
+							$title='';
211
+						} else {
212
+							$title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $husb)).'"';
213
+						}
214
+						if ($num==$husb->getPrimaryName()) {
215
+							$class=' class="name2"';
216
+							$sex_image=$husb->getSexImage();
217
+						} else {
218
+							$class='';
219
+							$sex_image='';
220
+						} ?>
221 221
         				<a <?php echo $title.' '.$class; ?> href="<?php echo $husb->getHtmlUrl(); ?>">
222 222
         					<?php echo \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($name['full']); ?>
223 223
         				</a>
224 224
         				<?php echo $sex_image;
225
-        				echo implode('&nbsp;',
226
-        				    \MyArtJaub\Webtrees\Hook\HookProvider::getInstance()
227
-        				    ->get('hRecordNameAppend')
228
-        				    ->executeOnlyFor(array(Constants::MODULE_MAJ_SOSA_NAME),  $husb, 'smaller')); 
229
-        				?>
225
+						echo implode('&nbsp;',
226
+							\MyArtJaub\Webtrees\Hook\HookProvider::getInstance()
227
+							->get('hRecordNameAppend')
228
+							->executeOnlyFor(array(Constants::MODULE_MAJ_SOSA_NAME),  $husb, 'smaller')); 
229
+						?>
230 230
         				<br/>
231 231
             		<?php }
232
-            		echo $husb->getPrimaryParentsNames('parents details1', 'none');
233
-            		?>
232
+					echo $husb->getPrimaryParentsNames('parents details1', 'none');
233
+					?>
234 234
             		</td>
235 235
             		<td hidden data-sort="<?= Filter::escapeHtml($surn_givn) ?>"></td>
236 236
             		<?php $hdate=$husb->getBirthDate(); ?>
@@ -239,60 +239,60 @@  discard block
 block discarded – undo
239 239
         			<?php list($surn_givn, $givn_surn) = FunctionsPrintLists::sortableNames($wife); ?>
240 240
         			<td colspan="2">
241 241
         			<?php foreach ($wife->getAllNames() as $num=>$name) {
242
-        				if ($name['type']=='NAME') {
243
-        					$title='';
244
-        				} else {
245
-        					$title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $wife)).'"';
246
-        				}
247
-        				if ($num==$wife->getPrimaryName()) {
248
-        					$class=' class="name2"';
249
-        					$sex_image=$wife->getSexImage();
250
-        				} else {
251
-        					$class='';
252
-        					$sex_image='';
253
-        				} ?>
242
+						if ($name['type']=='NAME') {
243
+							$title='';
244
+						} else {
245
+							$title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $wife)).'"';
246
+						}
247
+						if ($num==$wife->getPrimaryName()) {
248
+							$class=' class="name2"';
249
+							$sex_image=$wife->getSexImage();
250
+						} else {
251
+							$class='';
252
+							$sex_image='';
253
+						} ?>
254 254
         				<a <?= $title.' '.$class ?> href="<?= $wife->getHtmlUrl() ?>">
255 255
         					<?= \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($name['full']) ?>
256 256
         				</a>
257 257
         				<?= $sex_image;
258
-        				echo implode('&nbsp;',
259
-        				    \MyArtJaub\Webtrees\Hook\HookProvider::getInstance()
260
-        				    ->get('hRecordNameAppend')
261
-        				    ->executeOnlyFor(array(Constants::MODULE_MAJ_SOSA_NAME),  $wife, 'smaller'));
262
-        				?>
258
+						echo implode('&nbsp;',
259
+							\MyArtJaub\Webtrees\Hook\HookProvider::getInstance()
260
+							->get('hRecordNameAppend')
261
+							->executeOnlyFor(array(Constants::MODULE_MAJ_SOSA_NAME),  $wife, 'smaller'));
262
+						?>
263 263
         				<br/>
264 264
             		<?php }
265
-            		echo $wife->getPrimaryParentsNames('parents details1', 'none');
266
-            		?>
265
+					echo $wife->getPrimaryParentsNames('parents details1', 'none');
266
+					?>
267 267
             		</td>
268 268
             		<td hidden data-sort="<?= Filter::escapeHtml($surn_givn) ?>"></td>
269 269
             		<?php $wdate=$wife->getBirthDate(); ?>
270 270
             		<td class="center" data-sort="<?= Date::getAge($wdate, $mdate, 1) ?>"><?= Date::getAge($wdate, $mdate, 2) ?></td>
271 271
             		<td data-sort="<?= $mdate->julianDay() ?>"><?php 
272
-            		if ($marriage_dates = $family->getAllMarriageDates()) {
273
-        				foreach ($marriage_dates as $n => $marriage_date) {
274
-        					if ($n) { echo '<br>'; } ?>
272
+					if ($marriage_dates = $family->getAllMarriageDates()) {
273
+						foreach ($marriage_dates as $n => $marriage_date) {
274
+							if ($n) { echo '<br>'; } ?>
275 275
         					<div><?= $marriage_date->display(true) ?></div>
276 276
         				<?php }
277
-            		} elseif ($family->getFacts('_NMR')) {
278
-            		    echo I18N::translate('no');
279
-            		} elseif ($family->getFacts('MARR')) {
280
-            		    echo I18N::translate('yes');
281
-            		} else {
282
-            		    echo '&nbsp;';
283
-            		} ?>
277
+					} elseif ($family->getFacts('_NMR')) {
278
+						echo I18N::translate('no');
279
+					} elseif ($family->getFacts('MARR')) {
280
+						echo I18N::translate('yes');
281
+					} else {
282
+						echo '&nbsp;';
283
+					} ?>
284 284
             		</td>
285 285
             		<td><?php 
286
-            		foreach ($family->getAllMarriagePlaces() as $n => $marriage_place) {
287
-				        $tmp = new Place($marriage_place, $family->getTree());
288
-        				if ($n) { ?><br><?php } ?>
286
+					foreach ($family->getAllMarriagePlaces() as $n => $marriage_place) {
287
+						$tmp = new Place($marriage_place, $family->getTree());
288
+						if ($n) { ?><br><?php } ?>
289 289
         				<a href="'<?= $tmp->getURL() ?>" title="<?= strip_tags($tmp->getFullName()) ?>">
290 290
         					<?= \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($tmp->getShortName()) ?>
291 291
         				</a>
292 292
         			<?php  } ?>
293 293
         			</td>
294 294
         			<?php if (ModuleManager::getInstance()->isOperational(Constants::MODULE_MAJ_ISSOURCED_NAME)) {
295
-				        $isMSourced = $dfamily->isMarriageSourced(); ?>
295
+						$isMSourced = $dfamily->isMarriageSourced(); ?>
296 296
 				   	<td data-sort=<?= $isMSourced ?>><?= FunctionsPrint::formatIsSourcedIcon('E', $isMSourced, 'MARR', 1, 'medium') ?></td>
297 297
 					<?php } else { ?>
298 298
 					<td>&nbsp;</td>
@@ -303,30 +303,30 @@  discard block
 block discarded – undo
303 303
 					<td hidden><?php 
304 304
 					if (!$mdate->isOK()) { echo 'U'; }
305 305
 					else {
306
-					    if (Date::compare($mdate, new Date(date('Y') - 100)) > 0) { echo 'Y100'; }
307
-					    else { echo 'YES'; }
306
+						if (Date::compare($mdate, new Date(date('Y') - 100)) > 0) { echo 'Y100'; }
307
+						else { echo 'YES'; }
308 308
 					}
309 309
 					if ($family->getFacts(WT_EVENTS_DIV)) { echo 'D'; }
310 310
 					if (count($husb->getSpouseFamilies()) > 1 || count($wife->getSpouseFamilies()) > 1) {
311
-					    echo 'M';
311
+						echo 'M';
312 312
 					} ?>
313 313
 					</td>
314 314
 					<td hidden><?php 
315
-			         if ($husb->isDead() && $wife->isDead()) { echo 'Y'; }
316
-			         if ($husb->isDead() && !$wife->isDead()) {
317
-        				if ($wife->getSex() == 'F') { echo 'H'; }
318
-        				if ($wife->getSex() == 'M') { echo 'W'; } // male partners
319
-        			}
320
-        			if (!$husb->isDead() && $wife->isDead()) {
321
-        				if ($husb->getSex() == 'M') { echo 'W'; }
322
-        				if ($husb->getSex() == 'F') { echo  'H'; }  // female partners
323
-        			}
324
-        			if (!$husb->isDead() && !$wife->isDead()) { echo 'N'; } ?>
315
+					 if ($husb->isDead() && $wife->isDead()) { echo 'Y'; }
316
+					 if ($husb->isDead() && !$wife->isDead()) {
317
+						if ($wife->getSex() == 'F') { echo 'H'; }
318
+						if ($wife->getSex() == 'M') { echo 'W'; } // male partners
319
+					}
320
+					if (!$husb->isDead() && $wife->isDead()) {
321
+						if ($husb->getSex() == 'M') { echo 'W'; }
322
+						if ($husb->getSex() == 'F') { echo  'H'; }  // female partners
323
+					}
324
+					if (!$husb->isDead() && !$wife->isDead()) { echo 'N'; } ?>
325 325
         			</td>
326 326
         			<td hidden><?php 
327
-			         if (!$husb->getChildFamilies() && !$wife->getChildFamilies()) { echo 'R'; }
328
-			         elseif (!$husb->isDead() && !$wife->isDead() && $family->getNumberOfChildren() < 1) { echo 'L'; }
329
-			         else { echo '&nbsp;'; } ?>
327
+					 if (!$husb->getChildFamilies() && !$wife->getChildFamilies()) { echo 'R'; }
328
+					 elseif (!$husb->isDead() && !$wife->isDead() && $family->getNumberOfChildren() < 1) { echo 'L'; }
329
+					 else { echo '&nbsp;'; } ?>
330 330
 			         </td>
331 331
 				</tr>
332 332
         	<?php } ?>
@@ -364,7 +364,7 @@  discard block
 block discarded – undo
364 364
         <p class="warning"><?= I18N::translate('No family has been found for generation %d', $this->data->get('generation')) ?></p>
365 365
         <?php 
366 366
 		}
367
-    }
367
+	}
368 368
     
369 369
 }
370 370
  
371 371
\ No newline at end of file
Please login to merge, or discard this patch.
src/Webtrees/Module/Sosa/Views/SosaListMissingView.php 1 patch
Indentation   +47 added lines, -47 removed lines patch added patch discarded remove patch
@@ -30,16 +30,16 @@  discard block
 block discarded – undo
30 30
 	 * {@inhericDoc}
31 31
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
32 32
 	 */
33
-    protected function renderContent() {
34
-        ?>
33
+	protected function renderContent() {
34
+		?>
35 35
             <div id="maj-sosa-missing-page" class="center">
36 36
     			<h2><?= $this->data->get('title') ?></h2>
37 37
     			
38 38
     			<?php  if($this->data->get('is_setup')) { 
39
-    			    $this->renderSosaHeader();
40
-    			    if($this->data->get('has_missing', false)) {
41
-    			        $table_id = $this->data->get('table_id');
42
-    			        ?>
39
+					$this->renderSosaHeader();
40
+					if($this->data->get('has_missing', false)) {
41
+						$table_id = $this->data->get('table_id');
42
+						?>
43 43
     			<div id="sosa-indi-missing" class="smissing-list">
44 44
                 	<table id="<?= $table_id ?>">
45 45
         				<thead>     
@@ -103,52 +103,52 @@  discard block
 block discarded – undo
103 103
         			<tbody>
104 104
         			
105 105
         			<?php foreach($this->data->get('missing_list') as $missing_tab) {
106
-        			    $person = $missing_tab['indi'];
106
+						$person = $missing_tab['indi'];
107 107
         			    
108
-        			    /** @var \Fisharebest\Webtrees\Individual $person */
109
-        			    if ($person->isPendingAddtion()) {
110
-        			        $class = ' class="new"';
111
-        			    } elseif ($person->isPendingDeletion()) {
112
-        			        $class = ' class="old"';
113
-        			    } else {
114
-        			        $class = '';
115
-        			    }
116
-        			    $dperson = new \MyArtJaub\Webtrees\Individual($person);
117
-        			    list($surn_givn, $givn_surn) = FunctionsPrintLists::sortableNames($person);
118
-        			    ?>			
108
+						/** @var \Fisharebest\Webtrees\Individual $person */
109
+						if ($person->isPendingAddtion()) {
110
+							$class = ' class="new"';
111
+						} elseif ($person->isPendingDeletion()) {
112
+							$class = ' class="old"';
113
+						} else {
114
+							$class = '';
115
+						}
116
+						$dperson = new \MyArtJaub\Webtrees\Individual($person);
117
+						list($surn_givn, $givn_surn) = FunctionsPrintLists::sortableNames($person);
118
+						?>			
119 119
                 		<tr <?= $class ?>>
120 120
                 			<td class="transparent"><?= $missing_tab['sosa'] ?></td>
121 121
                 			<td class="transparent"><?= $person->getXref() ?></td>
122 122
                 			<td colspan="2" data-sort="<?= Filter::escapeHtml($givn_surn) ?>">
123 123
                 			<?php foreach ($person->getAllNames() as $num=>$name) {
124
-                				if ($name['type']=='NAME') {
125
-                					$title='';
126
-                				} else {
127
-                					$title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $person)).'"';
128
-                				}
129
-                				if ($num==$person->getPrimaryName()) {
130
-                					$class=' class="name2"';
131
-                					$sex_image=$person->getSexImage();
132
-                				} else {
133
-                					$class='';
134
-                					$sex_image='';
135
-                				} ?>
124
+								if ($name['type']=='NAME') {
125
+									$title='';
126
+								} else {
127
+									$title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $person)).'"';
128
+								}
129
+								if ($num==$person->getPrimaryName()) {
130
+									$class=' class="name2"';
131
+									$sex_image=$person->getSexImage();
132
+								} else {
133
+									$class='';
134
+									$sex_image='';
135
+								} ?>
136 136
                 				<a <?= $title.' '.$class ?> href="<?= $person->getHtmlUrl() ?>">
137 137
                 					<?= \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($name['full']) ?>
138 138
                 				</a>
139 139
                 				<?= $sex_image;
140
-                				echo implode('&nbsp;',
141
-                				    \MyArtJaub\Webtrees\Hook\HookProvider::getInstance()
142
-                				    ->get('hRecordNameAppend')
143
-                				    ->executeOnlyFor(array(Constants::MODULE_MAJ_SOSA_NAME),  $person, 'smaller'));  ?>
140
+								echo implode('&nbsp;',
141
+									\MyArtJaub\Webtrees\Hook\HookProvider::getInstance()
142
+									->get('hRecordNameAppend')
143
+									->executeOnlyFor(array(Constants::MODULE_MAJ_SOSA_NAME),  $person, 'smaller'));  ?>
144 144
                 				<br/>
145 145
                     		<?php }
146
-                    		echo $person->getPrimaryParentsNames('parents details1', 'none');
147
-                    		?>
146
+							echo $person->getPrimaryParentsNames('parents details1', 'none');
147
+							?>
148 148
                     		</td>
149 149
 							<td hidden data-sort="<?= Filter::escapeHtml($surn_givn) ?>"></td>             		
150 150
                 			<?php if (ModuleManager::getInstance()->isOperational(Constants::MODULE_MAJ_ISSOURCED_NAME)) {
151
-        				        $isISourced = $dperson->isSourced(); ?>
151
+								$isISourced = $dperson->isSourced(); ?>
152 152
         				   	<td data-sort="<?= $isISourced ?>"><?= FunctionsPrint::formatIsSourcedIcon('R', $isISourced, 'INDI', 1, 'medium') ?></td>
153 153
         					<?php } else { ?>
154 154
         					<td>&nbsp;</td>
@@ -158,23 +158,23 @@  discard block
 block discarded – undo
158 158
                     		<?php $birth_dates = $person->getAllBirthDates(); ?>
159 159
                     		<td data-sort="<?= $person->getEstimatedBirthDate()->julianDay() ?>">
160 160
                     		<?php                     		
161
-                    		foreach ($birth_dates as $n => $birth_date) {
162
-                    		    if ($n > 0) { ?> <br> <?php  } 
163
-                    		    echo $birth_date->display(true);
164
-                    		}
165
-                    		?>
161
+							foreach ($birth_dates as $n => $birth_date) {
162
+								if ($n > 0) { ?> <br> <?php  } 
163
+								echo $birth_date->display(true);
164
+							}
165
+							?>
166 166
                     		</td>
167 167
                 			<td>
168 168
                 			<?php foreach ($person->getAllBirthPlaces() as $n => $birth_place) {
169
-        				        $tmp = new \Fisharebest\Webtrees\Place($birth_place, $person->getTree());
170
-                				if ($n > 0) { ?><br><?php } ?>
169
+								$tmp = new \Fisharebest\Webtrees\Place($birth_place, $person->getTree());
170
+								if ($n > 0) { ?><br><?php } ?>
171 171
                 				<a href="'<?= $tmp->getURL(); ?>" title="<?= strip_tags($tmp->getFullName()) ?>">
172 172
                 					<?= \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($tmp->getShortName()) ?>
173 173
                 				</a>
174 174
                 			<?php } ?>
175 175
                 			</td>
176 176
         					<?php if (ModuleManager::getInstance()->isOperational(Constants::MODULE_MAJ_ISSOURCED_NAME)) {
177
-        				        $isBSourced = $dperson->isBirthSourced(); ?>
177
+								$isBSourced = $dperson->isBirthSourced(); ?>
178 178
         				   	<td data-sort="<?= $isBSourced ?>"><?= FunctionsPrint::formatIsSourcedIcon('E', $isBSourced, 'BIRT', 1, 'medium') ?></td>
179 179
         					<?php } else { ?>
180 180
         					<td>&nbsp;</td>
@@ -199,7 +199,7 @@  discard block
 block discarded – undo
199 199
     			 <?php } else if ($this->data->get('generation', 0) > 0) { ?> 
200 200
     			<p><?= I18N::translate('No ancestors are missing for this generation. Generation complete at %s.', I18N::percentage($this->data->get('perc_sosa'), 2)) ?></p>
201 201
     			    <?php }   			    
202
-    			} else { ?>
202
+				} else { ?>
203 203
     			<p class="warning"><?= I18N::translate('The list could not be displayed. Reasons might be:') ?><br/>
204 204
     				<ul>
205 205
     					<li><?= I18N::translate('No Sosa root individual has been defined.') ?></li>
@@ -210,6 +210,6 @@  discard block
 block discarded – undo
210 210
     			<?php } ?>
211 211
     		</div> 
212 212
     		<?php 
213
-        }
213
+		}
214 214
 }
215 215
  
216 216
\ No newline at end of file
Please login to merge, or discard this patch.
src/Webtrees/Module/Sosa/Views/SosaListIndiView.php 1 patch
Indentation   +71 added lines, -71 removed lines patch added patch discarded remove patch
@@ -31,11 +31,11 @@  discard block
 block discarded – undo
31 31
 	 * {@inhericDoc}
32 32
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
33 33
 	 */
34
-    protected function renderContent() { 
34
+	protected function renderContent() { 
35 35
         
36
-        if($this->data->get('has_sosa', false)) {
37
-            $table_id = $this->data->get('table_id');            
38
-        ?>   
36
+		if($this->data->get('has_sosa', false)) {
37
+			$table_id = $this->data->get('table_id');            
38
+		?>   
39 39
         
40 40
         <div id="sosa-indi-list" class="sosa-list">
41 41
         	<table id="<?= $table_id ?>">
@@ -177,67 +177,67 @@  discard block
 block discarded – undo
177 177
 			<tbody>
178 178
 			
179 179
 			<?php foreach($this->data->get('sosa_list') as $sosa => $person) {
180
-			    /** @var \Fisharebest\Webtrees\Individual $person */
181
-			    if ($person->isPendingAddtion()) {
182
-			        $class = ' class="new"';
183
-			    } elseif ($person->isPendingDeletion()) {
184
-			        $class = ' class="old"';
185
-			    } else {
186
-			        $class = '';
187
-			    }
188
-			    $dperson = new \MyArtJaub\Webtrees\Individual($person);
189
-			    ?>			
180
+				/** @var \Fisharebest\Webtrees\Individual $person */
181
+				if ($person->isPendingAddtion()) {
182
+					$class = ' class="new"';
183
+				} elseif ($person->isPendingDeletion()) {
184
+					$class = ' class="old"';
185
+				} else {
186
+					$class = '';
187
+				}
188
+				$dperson = new \MyArtJaub\Webtrees\Individual($person);
189
+				?>			
190 190
         		<tr <?= $class ?>>
191 191
         			<td class="transparent"><?= $sosa ?></td>
192 192
         			<td hidden><?= $person->getXref() ?></td>
193 193
         			<?php list($surn_givn, $givn_surn) = FunctionsPrintLists::sortableNames($person); ?>
194 194
         			<td colspan="2" data-sort="<?= Filter::escapeHtml($givn_surn) ?>">
195 195
         			<?php foreach ($person->getAllNames() as $num=>$name) {
196
-        				if ($name['type']=='NAME') {
197
-        					$title='';
198
-        				} else {
199
-        					$title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $person)).'"';
200
-        				}
201
-        				if ($num==$person->getPrimaryName()) {
202
-        					$class=' class="name2"';
203
-        					$sex_image=$person->getSexImage();
204
-        				} else {
205
-        					$class='';
206
-        					$sex_image='';
207
-        				} ?>
196
+						if ($name['type']=='NAME') {
197
+							$title='';
198
+						} else {
199
+							$title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $person)).'"';
200
+						}
201
+						if ($num==$person->getPrimaryName()) {
202
+							$class=' class="name2"';
203
+							$sex_image=$person->getSexImage();
204
+						} else {
205
+							$class='';
206
+							$sex_image='';
207
+						} ?>
208 208
         				<a <?= $title.' '.$class; ?> href="<?= $person->getHtmlUrl() ?>">
209 209
         					<?= \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($name['full']) ?>
210 210
         				</a>
211 211
         				<?= $sex_image;
212
-        				echo implode('&nbsp;',
213
-        				    \MyArtJaub\Webtrees\Hook\HookProvider::getInstance()
214
-        				    ->get('hRecordNameAppend')
215
-        				    ->executeOnlyFor(array(Constants::MODULE_MAJ_SOSA_NAME),  $person, 'smaller')); 
216
-        				?>
212
+						echo implode('&nbsp;',
213
+							\MyArtJaub\Webtrees\Hook\HookProvider::getInstance()
214
+							->get('hRecordNameAppend')
215
+							->executeOnlyFor(array(Constants::MODULE_MAJ_SOSA_NAME),  $person, 'smaller')); 
216
+						?>
217 217
         				<br/>
218 218
             		<?php }
219
-            		echo $person->getPrimaryParentsNames('parents details1', 'none');
220
-            		?>
219
+					echo $person->getPrimaryParentsNames('parents details1', 'none');
220
+					?>
221 221
             		</td>
222 222
             		<td hidden data-sort="<?= Filter::escapeHtml($surn_givn) ?>"></td>
223 223
             		<?php $birth_dates = $person->getAllBirthDates(); ?>
224 224
             		<td data-sort="<?= $person->getEstimatedBirthDate()->julianDay() ?>">
225 225
             		<?php foreach ($birth_dates as $n => $birth_date) {
226
-    					   if ($n > 0) { ?><br/><?php } ?>
226
+						   if ($n > 0) { ?><br/><?php } ?>
227 227
     						<?php  echo $birth_date->display(true);
228
-			        } ?>
228
+					} ?>
229 229
             		</td>
230 230
         			<td>
231 231
         			<?php foreach ($person->getAllBirthPlaces() as $n => $birth_place) {
232
-				        $tmp = new \Fisharebest\Webtrees\Place($birth_place, $person->getTree());
233
-        				if ($n > 0) { ?><br><?php } ?>
232
+						$tmp = new \Fisharebest\Webtrees\Place($birth_place, $person->getTree());
233
+						if ($n > 0) { ?><br><?php } ?>
234 234
         				<a href="'<?= $tmp->getURL() ?>" title="<?= strip_tags($tmp->getFullName()) ?>">
235 235
         					<?= \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($tmp->getShortName()) ?>
236 236
         				</a>
237 237
         			<?php } ?>
238 238
         			</td>
239 239
         			<?php if (ModuleManager::getInstance()->isOperational(Constants::MODULE_MAJ_ISSOURCED_NAME)) {
240
-				        $isBSourced = $dperson->isBirthSourced(); ?>
240
+						$isBSourced = $dperson->isBirthSourced(); ?>
241 241
 				   	<td data-sort="<?= $isBSourced ?>"><?= FunctionsPrint::formatIsSourcedIcon('E', $isBSourced, 'BIRT', 1, 'medium') ?></td>
242 242
 					<?php } else { ?>
243 243
 					<td>&nbsp;</td>
@@ -245,63 +245,63 @@  discard block
 block discarded – undo
245 245
 					<?php $death_dates = $person->getAllDeathDates(); ?>
246 246
 					<td data-sort="<?= $person->getEstimatedDeathDate()->julianDay() ?>">
247 247
 					<?php foreach ($death_dates as $num => $death_date) {
248
-					       if ($num) { ?><br/><?php } ?>
248
+						   if ($num) { ?><br/><?php } ?>
249 249
 					 		<?php echo $death_date->display(true); 
250
-				     } ?>
250
+					 } ?>
251 251
 			         </td>
252 252
 			         <?php if (isset($birth_dates[0]) && isset($death_dates[0])) {
253
-			             $age_at_death = Date::getAge($birth_dates[0], $death_dates[0], 0);
254
-			             $age_at_death_sort = Date::getAge($birth_dates[0], $death_dates[0], 2);
255
-			         } else {
256
-			             $age_at_death      = '';
257
-			             $age_at_death_sort = PHP_INT_MAX;
258
-			         } ?>
253
+						 $age_at_death = Date::getAge($birth_dates[0], $death_dates[0], 0);
254
+						 $age_at_death_sort = Date::getAge($birth_dates[0], $death_dates[0], 2);
255
+					 } else {
256
+						 $age_at_death      = '';
257
+						 $age_at_death_sort = PHP_INT_MAX;
258
+					 } ?>
259 259
 			         <td class="center" data-sort="<?= $age_at_death_sort ?>"><?= $age_at_death ?></td>
260 260
 			         <td>
261 261
         			 <?php foreach ($person->getAllDeathPlaces() as $n => $death_place) {
262
-        				$tmp = new Place($death_place, $person->getTree());
263
-        				if ($n) { ?><br><?php } ?>
262
+						$tmp = new Place($death_place, $person->getTree());
263
+						if ($n) { ?><br><?php } ?>
264 264
         				<a href="'<?= $tmp->getURL() ?>" title="<?= strip_tags($tmp->getFullName()) ?>">
265 265
         					<?= \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($tmp->getShortName()) ?>
266 266
         				</a>
267 267
         			<?php } ?>
268 268
         			</td>
269 269
         			<?php if (ModuleManager::getInstance()->isOperational(Constants::MODULE_MAJ_ISSOURCED_NAME)) {
270
-        			    if($person->isDead()) {
271
-        			        $isDSourced = $dperson->isDeathSourced(); ?>
270
+						if($person->isDead()) {
271
+							$isDSourced = $dperson->isDeathSourced(); ?>
272 272
 				   	<td data-sort=<?= $isDSourced ?>><?= FunctionsPrint::formatIsSourcedIcon('E', $isDSourced, 'DEAT', 1, 'medium') ?></td>
273 273
 					<?php } else { ?>
274 274
 					<td data-sort="-99">&nbsp;</td>
275 275
 					<?php } 
276
-        			} else { ?>
276
+					} else { ?>
277 277
 					<td>&nbsp;</td>
278 278
 					<?php } ?>
279 279
 					<td hidden><?= $person->getSex() ?></td>
280 280
 					<td hidden>
281 281
 					<?php if (!$person->canShow() || Date::compare($person->getEstimatedBirthDate(), new Date(date('Y') - 100)) > 0) {
282
-					    echo 'Y100';
283
-        			} else {
284
-        				echo 'YES';
285
-        			} ?>
282
+						echo 'Y100';
283
+					} else {
284
+						echo 'YES';
285
+					} ?>
286 286
         			</td>
287 287
         			<td hidden>
288 288
         			<?php if (isset($death_dates[0]) && Date::compare($death_dates[0], new Date(date('Y') - 100)) > 0) {
289
-				        echo 'Y100';
290
-        			} elseif ($person->isDead()) {
291
-				        echo 'YES';
292
-        			} else {
293
-				        echo 'N';
294
-			         } ?>
289
+						echo 'Y100';
290
+					} elseif ($person->isDead()) {
291
+						echo 'YES';
292
+					} else {
293
+						echo 'N';
294
+					 } ?>
295 295
 			         </td>
296 296
 			         <td hidden>
297 297
 					<?php if (!$person->getChildFamilies()) {
298
-					    echo 'R';
298
+						echo 'R';
299 299
 					}  // roots
300 300
 					elseif (!$person->isDead() && $person->getNumberOfChildren() < 1) {
301
-            			echo 'L';
301
+						echo 'L';
302 302
 					} // leaves
303 303
 					else {
304
-					    echo '&nbsp;';
304
+						echo '&nbsp;';
305 305
 					} ?>
306 306
 					</td>
307 307
 				</tr>
@@ -312,12 +312,12 @@  discard block
 block discarded – undo
312 312
 					<th class="ui-state-default" colspan="15">
313 313
 						<div class="center">
314 314
 							<?= I18N::translate('Number of Sosa ancestors: %1$s known / %2$s theoretical (%3$s)',
315
-							    I18N::number($this->data->get('sosa_count')),
316
-							    I18N::number($this->data->get('sosa_theo')), 
317
-							    I18N::percentage($this->data->get('sosa_ratio'),2)
318
-							    ) ?>
315
+								I18N::number($this->data->get('sosa_count')),
316
+								I18N::number($this->data->get('sosa_theo')), 
317
+								I18N::percentage($this->data->get('sosa_ratio'),2)
318
+								) ?>
319 319
 							<?php if($this->data->get('sosa_hidden') > 0) {
320
-							    echo '['. I18N::translate('%s hidden', I18N::number($this->data->get('sosa_hidden'))).']';
320
+								echo '['. I18N::translate('%s hidden', I18N::number($this->data->get('sosa_hidden'))).']';
321 321
 							} ?>
322 322
 						</div>
323 323
 					</th>
@@ -351,8 +351,8 @@  discard block
 block discarded – undo
351 351
 				</div>
352 352
 			</div>
353 353
 		<?php 
354
-        }
355
-    }
354
+		}
355
+	}
356 356
     
357 357
 }
358 358
  
359 359
\ No newline at end of file
Please login to merge, or discard this patch.