Completed
Push — master ( b746e6...94717f )
by Jonathan
06:37
created
src/Webtrees/Module/Certificates/Views/CertificatesListView.php 3 patches
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -39,13 +39,13 @@  discard block
 block discarded – undo
39 39
     			<input type="hidden" name="ged" value="<?= $this->data->get('url_ged') ?>">
40 40
     			<select name="city">
41 41
     			<?php foreach ($cities as $city) { ?>
42
-    				<option value="<?= Functions::encryptToSafeBase64($city) ?>" <?php if(trim($city) == trim($selected_city)) echo 'selected="selected"'?> ><?= $city ?></option>
42
+    				<option value="<?= Functions::encryptToSafeBase64($city) ?>" <?php if (trim($city) == trim($selected_city)) echo 'selected="selected"'?> ><?= $city ?></option>
43 43
     			<?php } ?>
44 44
     			</select>
45 45
     			<input type="submit" value="<?= I18N::translate('Show') ?>" />
46 46
     		</form>
47 47
     		
48
-    		<?php if($this->data->get('has_list', false)) { ?>
48
+    		<?php if ($this->data->get('has_list', false)) { ?>
49 49
     		<div class="loading-image">&nbsp;</div>
50 50
     		<div class="certificate-list">
51 51
     			<table id="<?= $this->data->get('table_id') ?>">
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
     				    ?>
63 63
     					<tr>
64 64
     						<!-- Certificate date -->
65
-    						<?php if($date = $certificate->getCertificateDate()) { ?>
65
+    						<?php if ($date = $certificate->getCertificateDate()) { ?>
66 66
     						<td data-sort="<?= $date->julianDay() ?>"><?= $date->display() ?></td>
67 67
     						<?php } else { ?>
68 68
     						<td data-sort="0">&nbsp;</td>
@@ -73,8 +73,8 @@  discard block
 block discarded – undo
73 73
     						<?php 
74 74
     						$name = $certificate->getCertificateDetails() ?: '';
75 75
     						$sortname = "";
76
-    						$ct_names=preg_match("/([A-Z]{2,})/", $name, $match);
77
-    						if($ct_names > 0) $sortname = $match[1].'_';
76
+    						$ct_names = preg_match("/([A-Z]{2,})/", $name, $match);
77
+    						if ($ct_names > 0) $sortname = $match[1].'_';
78 78
     						$sortname .= $name;
79 79
     						?>
80 80
     						<td data-sort="<?= Filter::escapeHtml($sortname) ?>">
Please login to merge, or discard this patch.
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -39,7 +39,8 @@  discard block
 block discarded – undo
39 39
     			<input type="hidden" name="ged" value="<?= $this->data->get('url_ged') ?>">
40 40
     			<select name="city">
41 41
     			<?php foreach ($cities as $city) { ?>
42
-    				<option value="<?= Functions::encryptToSafeBase64($city) ?>" <?php if(trim($city) == trim($selected_city)) echo 'selected="selected"'?> ><?= $city ?></option>
42
+    				<option value="<?= Functions::encryptToSafeBase64($city) ?>" <?php if(trim($city) == trim($selected_city)) {
43
+	echo 'selected="selected"'?> ><?= $city ?></option>
43 44
     			<?php } ?>
44 45
     			</select>
45 46
     			<input type="submit" value="<?= I18N::translate('Show') ?>" />
@@ -72,9 +73,12 @@  discard block
 block discarded – undo
72 73
     						<!--  Certificate Name -->
73 74
     						<?php 
74 75
     						$name = $certificate->getCertificateDetails() ?: '';
76
+}
75 77
     						$sortname = "";
76 78
     						$ct_names=preg_match("/([A-Z]{2,})/", $name, $match);
77
-    						if($ct_names > 0) $sortname = $match[1].'_';
79
+    						if($ct_names > 0) {
80
+    							$sortname = $match[1].'_';
81
+    						}
78 82
     						$sortname .= $name;
79 83
     						?>
80 84
     						<td data-sort="<?= Filter::escapeHtml($sortname) ?>">
Please login to merge, or discard this patch.
Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -24,12 +24,12 @@  discard block
 block discarded – undo
24 24
 	 * {@inhericDoc}
25 25
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
26 26
 	 */
27
-    protected function renderContent() {
27
+	protected function renderContent() {
28 28
         
29
-        $cities = $this->data->get('cities');
30
-        $selected_city = $this->data->get('selected_city');
29
+		$cities = $this->data->get('cities');
30
+		$selected_city = $this->data->get('selected_city');
31 31
         
32
-        ?>                
32
+		?>                
33 33
         <div id="maj-cert-list-page" class="center">
34 34
 			<h2><?= $this->data->get('title') ?></h2>
35 35
 			
@@ -58,8 +58,8 @@  discard block
 block discarded – undo
58 58
     				</thead>
59 59
     				<tbody>
60 60
     				<?php foreach ($this->data->get('certificate_list') as $certificate) { 
61
-    				    /** @var \MyArtJaub\Webtrees\Module\Certificates\Model\Certificate $certificate */
62
-    				    ?>
61
+						/** @var \MyArtJaub\Webtrees\Module\Certificates\Model\Certificate $certificate */
62
+						?>
63 63
     					<tr>
64 64
     						<!-- Certificate date -->
65 65
     						<?php if($date = $certificate->getCertificateDate()) { ?>
@@ -71,12 +71,12 @@  discard block
 block discarded – undo
71 71
     						<td><?= Filter::escapeHtml($certificate->getCertificateType() ?: '') ?></td>
72 72
     						<!--  Certificate Name -->
73 73
     						<?php 
74
-    						$name = $certificate->getCertificateDetails() ?: '';
75
-    						$sortname = "";
76
-    						$ct_names=preg_match("/([A-Z]{2,})/", $name, $match);
77
-    						if($ct_names > 0) $sortname = $match[1].'_';
78
-    						$sortname .= $name;
79
-    						?>
74
+							$name = $certificate->getCertificateDetails() ?: '';
75
+							$sortname = "";
76
+							$ct_names=preg_match("/([A-Z]{2,})/", $name, $match);
77
+							if($ct_names > 0) $sortname = $match[1].'_';
78
+							$sortname .= $name;
79
+							?>
80 80
     						<td data-sort="<?= Filter::escapeHtml($sortname) ?>">
81 81
     							<a href="<?= $certificate->getHtmlUrl() ?>"><?= Filter::escapeHtml($name) ?></a>
82 82
     						</td>
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
     	</div>
90 90
     	
91 91
     	<?php 
92
-    }
92
+	}
93 93
     
94 94
 }
95 95
  
96 96
\ No newline at end of file
Please login to merge, or discard this patch.
src/Webtrees/Hook/HookInterfaces/CustomSimpleTagManagerInterface.php 2 patches
Doc Comments   +2 added lines patch added patch discarded remove patch
@@ -45,6 +45,7 @@  discard block
 block discarded – undo
45 45
 	 * @param string $element_name Element name from the edit interface, used to POST values for update
46 46
 	 * @param string $context Tag context
47 47
 	 * @param string $contextid Id of tag context
48
+	 * @return string
48 49
 	 */
49 50
 	public function hHtmlSimpleTagEditor($tag, $value = null, $element_id = '', $element_name = '', $context = null, $contextid = null);
50 51
 	
@@ -53,6 +54,7 @@  discard block
 block discarded – undo
53 54
 	 * 
54 55
 	 * @param string $context Context of the edition
55 56
 	 * @param int $level Level to which add the tags
57
+	 * @return void
56 58
 	 */
57 59
 	public function hAddSimpleTag($context, $level);
58 60
 
Please login to merge, or discard this 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/Module/WelcomeBlockModule.php 3 patches
Indentation   +64 added lines, -64 removed lines patch added patch discarded remove patch
@@ -20,81 +20,81 @@
 block discarded – undo
20 20
  * Welcome Block Module.
21 21
  */
22 22
 class WelcomeBlockModule extends AbstractModule
23
-    implements ModuleBlockInterface
23
+	implements ModuleBlockInterface
24 24
 {
25
-    /** @var string For custom modules - link for support, upgrades, etc. */
26
-    const CUSTOM_WEBSITE = 'https://github.com/jon48/webtrees-lib';
25
+	/** @var string For custom modules - link for support, upgrades, etc. */
26
+	const CUSTOM_WEBSITE = 'https://github.com/jon48/webtrees-lib';
27 27
         
28
-    /**
29
-     * {@inhericDoc}
30
-     */
31
-    public function getTitle() {
32
-        return /* I18N: Name of the “WelcomeBlock” module */ I18N::translate('MyArtJaub Welcome Block');
33
-    }
28
+	/**
29
+	 * {@inhericDoc}
30
+	 */
31
+	public function getTitle() {
32
+		return /* I18N: Name of the “WelcomeBlock” module */ I18N::translate('MyArtJaub Welcome Block');
33
+	}
34 34
     
35
-    /**
36
-     * {@inhericDoc}
37
-     */
38
-    public function getDescription() {
39
-        return /* I18N: Description of the “WelcomeBlock” module */ I18N::translate('The MyArtJaub Welcome block welcomes the visitor to the site, allows a quick login to the site, and displays statistics on visits.');
40
-    }
35
+	/**
36
+	 * {@inhericDoc}
37
+	 */
38
+	public function getDescription() {
39
+		return /* I18N: Description of the “WelcomeBlock” module */ I18N::translate('The MyArtJaub Welcome block welcomes the visitor to the site, allows a quick login to the site, and displays statistics on visits.');
40
+	}
41 41
     
42
-    /**
43
-     * {@inhericDoc}
44
-     */
45
-    public function modAction($mod_action) {
46
-        \MyArtJaub\Webtrees\Mvc\Dispatcher::getInstance()->handle($this, $mod_action);
47
-    }
42
+	/**
43
+	 * {@inhericDoc}
44
+	 */
45
+	public function modAction($mod_action) {
46
+		\MyArtJaub\Webtrees\Mvc\Dispatcher::getInstance()->handle($this, $mod_action);
47
+	}
48 48
     
49
-    /**
50
-     * {@inhericDoc}
51
-     * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::getBlock()
52
-     */
49
+	/**
50
+	 * {@inhericDoc}
51
+	 * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::getBlock()
52
+	 */
53 53
 	public function getBlock($block_id, $template = true, $cfg = array()) {
54
-        global $controller, $WT_TREE;
54
+		global $controller, $WT_TREE;
55 55
         
56
-        $wb_controller = new WelcomeBlockController($this);           
57
-        return $wb_controller->index($controller, $WT_TREE, $block_id, $template);
58
-    }
56
+		$wb_controller = new WelcomeBlockController($this);           
57
+		return $wb_controller->index($controller, $WT_TREE, $block_id, $template);
58
+	}
59 59
     
60
-    /**
61
-     * {@inhericDoc}
62
-     * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::loadAjax()
63
-     */
64
-    public function loadAjax() {
65
-        return false;
66
-    }
60
+	/**
61
+	 * {@inhericDoc}
62
+	 * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::loadAjax()
63
+	 */
64
+	public function loadAjax() {
65
+		return false;
66
+	}
67 67
     
68
-    /**
69
-     * {@inhericDoc}
70
-     * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::isUserBlock()
71
-     */
72
-    public function isUserBlock() {
73
-        return false;
74
-    }
68
+	/**
69
+	 * {@inhericDoc}
70
+	 * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::isUserBlock()
71
+	 */
72
+	public function isUserBlock() {
73
+		return false;
74
+	}
75 75
     
76
-    /**
77
-     * {@inhericDoc}
78
-     * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::isGedcomBlock()
79
-     */
80
-    public function isGedcomBlock() {
81
-        return true;
82
-    }
76
+	/**
77
+	 * {@inhericDoc}
78
+	 * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::isGedcomBlock()
79
+	 */
80
+	public function isGedcomBlock() {
81
+		return true;
82
+	}
83 83
     
84
-    /**
85
-     * {@inhericDoc}
86
-     * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::configureBlock()
87
-     */
88
-    public function configureBlock($block_id) {
89
-        $wb_controller = new WelcomeBlockController($this);
90
-        try {
91
-            return $wb_controller->config($block_id);
92
-        }
93
-        catch (MvcException $ex) {
94
-            if($ex->getHttpCode() != 200) throw $ex;
95
-            return;
96
-        }     
97
-    }
84
+	/**
85
+	 * {@inhericDoc}
86
+	 * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::configureBlock()
87
+	 */
88
+	public function configureBlock($block_id) {
89
+		$wb_controller = new WelcomeBlockController($this);
90
+		try {
91
+			return $wb_controller->config($block_id);
92
+		}
93
+		catch (MvcException $ex) {
94
+			if($ex->getHttpCode() != 200) throw $ex;
95
+			return;
96
+		}     
97
+	}
98 98
 
99 99
 }
100 100
  
101 101
\ No newline at end of file
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -91,7 +91,7 @@
 block discarded – undo
91 91
             return $wb_controller->config($block_id);
92 92
         }
93 93
         catch (MvcException $ex) {
94
-            if($ex->getHttpCode() != 200) throw $ex;
94
+            if ($ex->getHttpCode() != 200) throw $ex;
95 95
             return;
96 96
         }     
97 97
     }
Please login to merge, or discard this patch.
Braces   +4 added lines, -3 removed lines patch added patch discarded remove patch
@@ -89,9 +89,10 @@
 block discarded – undo
89 89
         $wb_controller = new WelcomeBlockController($this);
90 90
         try {
91 91
             return $wb_controller->config($block_id);
92
-        }
93
-        catch (MvcException $ex) {
94
-            if($ex->getHttpCode() != 200) throw $ex;
92
+        } catch (MvcException $ex) {
93
+            if($ex->getHttpCode() != 200) {
94
+            	throw $ex;
95
+            }
95 96
             return;
96 97
         }     
97 98
     }
Please login to merge, or discard this patch.
src/Webtrees/Module/WelcomeBlock/WelcomeBlockController.php 3 patches
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -98,7 +98,9 @@
 block discarded – undo
98 98
      */
99 99
     public function config($block_id = null) {
100 100
         
101
-        if(empty($block_id)) throw new MvcException(404);
101
+        if(empty($block_id)) {
102
+        	throw new MvcException(404);
103
+        }
102 104
 
103 105
         if (Filter::postBool('save') && Filter::checkCsrf()) {
104 106
             $this->module->setBlockSetting($block_id, 'piwik_enabled', Filter::postBool('piwik_enabled'));
Please login to merge, or discard this patch.
Indentation   +67 added lines, -67 removed lines patch added patch discarded remove patch
@@ -29,30 +29,30 @@  discard block
 block discarded – undo
29 29
 class WelcomeBlockController extends MvcController
30 30
 {   
31 31
     
32
-    /**
33
-     * Pages
34
-     */
32
+	/**
33
+	 * Pages
34
+	 */
35 35
         
36
-    /**
37
-     * WelcomeBlock@index
38
-     * 
39
-     * @param PageController $parent_controller
40
-     * @param Tree $tree
41
-     * @param string $block_id
42
-     * @param string $template
43
-     * @return $string
44
-     */
45
-    public function index(PageController $parent_controller, Tree $tree, $block_id, $template) {        
46
-        $view_bag = new ViewBag();
36
+	/**
37
+	 * WelcomeBlock@index
38
+	 * 
39
+	 * @param PageController $parent_controller
40
+	 * @param Tree $tree
41
+	 * @param string $block_id
42
+	 * @param string $template
43
+	 * @return $string
44
+	 */
45
+	public function index(PageController $parent_controller, Tree $tree, $block_id, $template) {        
46
+		$view_bag = new ViewBag();
47 47
         
48
-        if($parent_controller && $tree) {
48
+		if($parent_controller && $tree) {
49 49
         
50
-            $view_bag->set('tree', $tree);
51
-            $view_bag->set('indi', $parent_controller->getSignificantIndividual());
50
+			$view_bag->set('tree', $tree);
51
+			$view_bag->set('indi', $parent_controller->getSignificantIndividual());
52 52
         
53
-            $id = $this->module->getName().$block_id;
54
-            $class = $this->module->getName().'_block';
55
-            $parent_controller->addInlineJavascript('
53
+			$id = $this->module->getName().$block_id;
54
+			$class = $this->module->getName().'_block';
55
+			$parent_controller->addInlineJavascript('
56 56
                 jQuery("#maj-new_passwd").hide();
57 57
                 jQuery("#maj-passwd_click").click(function()
58 58
                 {
@@ -63,65 +63,65 @@  discard block
 block discarded – undo
63 63
     				  });
64 64
     			');
65 65
     
66
-            if (Auth::isAdmin()) {
67
-                $title='<a class="icon-admin" title="'.I18N::translate('Preferences').'" href="block_edit.php?block_id='.$block_id.'&amp;ged=' . $tree->getNameHtml() . '&amp;ctype=gedcom"></a>';
68
-            } else {
69
-                $title='';
70
-            }
71
-            $title .='<span dir="auto">'.$tree->getTitleHtml().'</span>';
66
+			if (Auth::isAdmin()) {
67
+				$title='<a class="icon-admin" title="'.I18N::translate('Preferences').'" href="block_edit.php?block_id='.$block_id.'&amp;ged=' . $tree->getNameHtml() . '&amp;ctype=gedcom"></a>';
68
+			} else {
69
+				$title='';
70
+			}
71
+			$title .='<span dir="auto">'.$tree->getTitleHtml().'</span>';
72 72
     
73
-            $piwik_enabled = $this->module->getBlockSetting($block_id, 'piwik_enabled', false);
74
-            $view_bag->set('piwik_enabled', $piwik_enabled);
75
-            if($piwik_enabled) {
76
-                $parent_controller->addInlineJavascript(
77
-                    '$("#piwik_stats")
73
+			$piwik_enabled = $this->module->getBlockSetting($block_id, 'piwik_enabled', false);
74
+			$view_bag->set('piwik_enabled', $piwik_enabled);
75
+			if($piwik_enabled) {
76
+				$parent_controller->addInlineJavascript(
77
+					'$("#piwik_stats")
78 78
                         .load("module.php?mod='.$this->module->getName().'&mod_action=Piwik&block_id='.$block_id.'");'
79
-                );
80
-            }
79
+				);
80
+			}
81 81
     
82
-            $content = ViewFactory::make('WelcomeBlock', $this,  new BaseController(), $view_bag)->getHtmlPartial();   
82
+			$content = ViewFactory::make('WelcomeBlock', $this,  new BaseController(), $view_bag)->getHtmlPartial();   
83 83
             
84
-            if ($template) {
85
-                return Theme::theme()->formatBlock($id, $title, $class, $content);
86
-            } else {
87
-                return $content;
88
-            }
89
-        }
90
-    }
84
+			if ($template) {
85
+				return Theme::theme()->formatBlock($id, $title, $class, $content);
86
+			} else {
87
+				return $content;
88
+			}
89
+		}
90
+	}
91 91
     
92 92
     
93 93
     
94
-    /**
95
-     * WelcomeBlock@config
96
-     * 
97
-     * @param string $block_id
98
-     */
99
-    public function config($block_id = null) {
94
+	/**
95
+	 * WelcomeBlock@config
96
+	 * 
97
+	 * @param string $block_id
98
+	 */
99
+	public function config($block_id = null) {
100 100
         
101
-        if(empty($block_id)) throw new MvcException(404);
101
+		if(empty($block_id)) throw new MvcException(404);
102 102
 
103
-        if (Filter::postBool('save') && Filter::checkCsrf()) {
104
-            $this->module->setBlockSetting($block_id, 'piwik_enabled', Filter::postBool('piwik_enabled'));
105
-            $this->module->setBlockSetting($block_id, 'piwik_url', trim(Filter::postUrl('piwik_url')));
106
-            $this->module->setBlockSetting($block_id, 'piwik_siteid', trim(Filter::post('piwik_siteid')));
107
-            $this->module->setBlockSetting($block_id, 'piwik_token', trim(Filter::post('piwik_token'))); 
108
-            Cache::delete('piwikCountYear', $this->module);          
109
-            throw new MvcException(200); // Use this instead of exit
110
-        }
103
+		if (Filter::postBool('save') && Filter::checkCsrf()) {
104
+			$this->module->setBlockSetting($block_id, 'piwik_enabled', Filter::postBool('piwik_enabled'));
105
+			$this->module->setBlockSetting($block_id, 'piwik_url', trim(Filter::postUrl('piwik_url')));
106
+			$this->module->setBlockSetting($block_id, 'piwik_siteid', trim(Filter::post('piwik_siteid')));
107
+			$this->module->setBlockSetting($block_id, 'piwik_token', trim(Filter::post('piwik_token'))); 
108
+			Cache::delete('piwikCountYear', $this->module);          
109
+			throw new MvcException(200); // Use this instead of exit
110
+		}
111 111
         
112
-        $view_bag = new ViewBag();
112
+		$view_bag = new ViewBag();
113 113
         
114
-        // Is Piwik Statistic Enabled ?
115
-        $view_bag->set('piwik_enabled', $this->module->getBlockSetting($block_id, 'piwik_enabled', '0'));
116
-        //Piwik Root Url
117
-        $view_bag->set('piwik_url', $this->module->getBlockSetting($block_id, 'piwik_url', ''));
118
-        // Piwik token
119
-        $view_bag->set('piwik_token', $this->module->getBlockSetting($block_id, 'piwik_token', ''));
120
-        // Piwik side id
121
-        $view_bag->set('piwik_siteid', $this->module->getBlockSetting($block_id, 'piwik_siteid', ''));
114
+		// Is Piwik Statistic Enabled ?
115
+		$view_bag->set('piwik_enabled', $this->module->getBlockSetting($block_id, 'piwik_enabled', '0'));
116
+		//Piwik Root Url
117
+		$view_bag->set('piwik_url', $this->module->getBlockSetting($block_id, 'piwik_url', ''));
118
+		// Piwik token
119
+		$view_bag->set('piwik_token', $this->module->getBlockSetting($block_id, 'piwik_token', ''));
120
+		// Piwik side id
121
+		$view_bag->set('piwik_siteid', $this->module->getBlockSetting($block_id, 'piwik_siteid', ''));
122 122
         
123
-        return ViewFactory::make('WelcomeBlockConfig', $this, new BaseController(), $view_bag)->getHtmlPartial();
124
-    }
123
+		return ViewFactory::make('WelcomeBlockConfig', $this, new BaseController(), $view_bag)->getHtmlPartial();
124
+	}
125 125
     
126 126
     
127 127
     
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
     public function index(PageController $parent_controller, Tree $tree, $block_id, $template) {        
46 46
         $view_bag = new ViewBag();
47 47
         
48
-        if($parent_controller && $tree) {
48
+        if ($parent_controller && $tree) {
49 49
         
50 50
             $view_bag->set('tree', $tree);
51 51
             $view_bag->set('indi', $parent_controller->getSignificantIndividual());
@@ -64,22 +64,22 @@  discard block
 block discarded – undo
64 64
     			');
65 65
     
66 66
             if (Auth::isAdmin()) {
67
-                $title='<a class="icon-admin" title="'.I18N::translate('Preferences').'" href="block_edit.php?block_id='.$block_id.'&amp;ged=' . $tree->getNameHtml() . '&amp;ctype=gedcom"></a>';
67
+                $title = '<a class="icon-admin" title="'.I18N::translate('Preferences').'" href="block_edit.php?block_id='.$block_id.'&amp;ged='.$tree->getNameHtml().'&amp;ctype=gedcom"></a>';
68 68
             } else {
69
-                $title='';
69
+                $title = '';
70 70
             }
71
-            $title .='<span dir="auto">'.$tree->getTitleHtml().'</span>';
71
+            $title .= '<span dir="auto">'.$tree->getTitleHtml().'</span>';
72 72
     
73 73
             $piwik_enabled = $this->module->getBlockSetting($block_id, 'piwik_enabled', false);
74 74
             $view_bag->set('piwik_enabled', $piwik_enabled);
75
-            if($piwik_enabled) {
75
+            if ($piwik_enabled) {
76 76
                 $parent_controller->addInlineJavascript(
77 77
                     '$("#piwik_stats")
78 78
                         .load("module.php?mod='.$this->module->getName().'&mod_action=Piwik&block_id='.$block_id.'");'
79 79
                 );
80 80
             }
81 81
     
82
-            $content = ViewFactory::make('WelcomeBlock', $this,  new BaseController(), $view_bag)->getHtmlPartial();   
82
+            $content = ViewFactory::make('WelcomeBlock', $this, new BaseController(), $view_bag)->getHtmlPartial();   
83 83
             
84 84
             if ($template) {
85 85
                 return Theme::theme()->formatBlock($id, $title, $class, $content);
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
      */
99 99
     public function config($block_id = null) {
100 100
         
101
-        if(empty($block_id)) throw new MvcException(404);
101
+        if (empty($block_id)) throw new MvcException(404);
102 102
 
103 103
         if (Filter::postBool('save') && Filter::checkCsrf()) {
104 104
             $this->module->setBlockSetting($block_id, 'piwik_enabled', Filter::postBool('piwik_enabled'));
Please login to merge, or discard this patch.
src/Webtrees/Module/Sosa/Views/SosaListFamView.php 3 patches
Braces   +3 added lines, -7 removed lines patch added patch discarded remove patch
@@ -293,10 +293,8 @@  discard block
 block discarded – undo
293 293
 						<?= I18N::number($family->getNumberOfChildren()) ?>
294 294
 					</td>
295 295
 					<td hidden><?php 
296
-					if (!$mdate->isOK()) { echo 'U'; }
297
-					else {
298
-					    if (Date::compare($mdate, new Date(date('Y') - 100)) > 0) { echo 'Y100'; }
299
-					    else { echo 'YES'; }
296
+					if (!$mdate->isOK()) { echo 'U'; } else {
297
+					    if (Date::compare($mdate, new Date(date('Y') - 100)) > 0) { echo 'Y100'; } else { echo 'YES'; }
300 298
 					}
301 299
 					if ($family->getFacts(WT_EVENTS_DIV)) { echo 'D'; }
302 300
 					if (count($husb->getSpouseFamilies()) > 1 || count($wife->getSpouseFamilies()) > 1) {
@@ -316,9 +314,7 @@  discard block
 block discarded – undo
316 314
         			if (!$husb->isDead() && !$wife->isDead()) { echo 'N'; } ?>
317 315
         			</td>
318 316
         			<td hidden><?php 
319
-			         if (!$husb->getChildFamilies() && !$wife->getChildFamilies()) { echo 'R'; }
320
-			         elseif (!$husb->isDead() && !$wife->isDead() && $family->getNumberOfChildren() < 1) { echo 'L'; }
321
-			         else { echo '&nbsp;'; } ?>
317
+			         if (!$husb->getChildFamilies() && !$wife->getChildFamilies()) { echo 'R'; } elseif (!$husb->isDead() && !$wife->isDead() && $family->getNumberOfChildren() < 1) { echo 'L'; } else { echo '&nbsp;'; } ?>
322 318
 			         </td>
323 319
 				</tr>
324 320
         	<?php } ?>
Please login to merge, or discard this 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.
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 	 */
35 35
     protected function renderContent() { 
36 36
         
37
-        if($this->data->get('has_sosa', false)) {
37
+        if ($this->data->get('has_sosa', false)) {
38 38
             $table_id = $this->data->get('table_id');            
39 39
         ?>   
40 40
         
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
 										class="ui-state-default"
53 53
 										title="<?php echo I18N::translate('Show individuals who are alive or couples where both partners are alive.'); ?>"
54 54
 									>
55
-									<?php echo I18N::translate('Both alive');?>
55
+									<?php echo I18N::translate('Both alive'); ?>
56 56
 									</button>
57 57
 									<button
58 58
 										type="button"
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
 										class="ui-state-default"
62 62
 										title="<?php echo I18N::translate('Show couples where only the female partner is dead.'); ?>"
63 63
 									>
64
-									<?php echo I18N::translate('Widower');?>
64
+									<?php echo I18N::translate('Widower'); ?>
65 65
 									</button>
66 66
 									<button
67 67
 										type="button"
@@ -175,7 +175,7 @@  discard block
 block discarded – undo
175 175
 				</thead>
176 176
 				<tbody>
177 177
 			
178
-			<?php foreach($this->data->get('sosa_list') as $sosa => $family) {
178
+			<?php foreach ($this->data->get('sosa_list') as $sosa => $family) {
179 179
 			    /** @var \Fisharebest\Webtrees\Family $person */
180 180
 
181 181
 			    //PERSO Create decorator for Family
@@ -190,7 +190,7 @@  discard block
 block discarded – undo
190 190
 			        $wife = new Individual('W', '0 @W@ INDI', null, $family->getTree());
191 191
 			    }
192 192
 			    
193
-			    $mdate=$family->getMarriageDate();
193
+			    $mdate = $family->getMarriageDate();
194 194
 			    
195 195
 			    if ($family->isPendingAddtion()) {
196 196
 			        $class = ' class="new"';
@@ -206,17 +206,17 @@  discard block
 block discarded – undo
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='';
209
+        				if ($name['type'] == 'NAME') {
210
+        					$title = '';
211 211
         				} else {
212
-        					$title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $husb)).'"';
212
+        					$title = 'title="'.strip_tags(GedcomTag::getLabel($name['type'], $husb)).'"';
213 213
         				}
214
-        				if ($num==$husb->getPrimaryName()) {
215
-        					$class=' class="name2"';
216
-        					$sex_image=$husb->getSexImage();
214
+        				if ($num == $husb->getPrimaryName()) {
215
+        					$class = ' class="name2"';
216
+        					$sex_image = $husb->getSexImage();
217 217
         				} else {
218
-        					$class='';
219
-        					$sex_image='';
218
+        					$class = '';
219
+        					$sex_image = '';
220 220
         				} ?>
221 221
         				<a <?php echo $title.' '.$class; ?> href="<?php echo $husb->getHtmlUrl(); ?>">
222 222
         					<?php echo \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($name['full']); ?>
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
225 225
         				echo implode('&nbsp;',
226 226
         				    \MyArtJaub\Webtrees\Hook\HookProvider::getInstance()
227 227
         				    ->get('hRecordNameAppend')
228
-        				    ->executeOnlyFor(array(Constants::MODULE_MAJ_SOSA_NAME),  $husb, 'smaller')); 
228
+        				    ->executeOnlyFor(array(Constants::MODULE_MAJ_SOSA_NAME), $husb, 'smaller')); 
229 229
         				?>
230 230
         				<br/>
231 231
             		<?php }
@@ -233,23 +233,23 @@  discard block
 block discarded – undo
233 233
             		?>
234 234
             		</td>
235 235
             		<td hidden data-sort="<?= Filter::escapeHtml($surn_givn) ?>"></td>
236
-            		<?php $hdate=$husb->getBirthDate(); ?>
236
+            		<?php $hdate = $husb->getBirthDate(); ?>
237 237
             		<td class="center" data-sort="<?= Date::getAge($hdate, $mdate, 1) ?>"><?= Date::getAge($hdate, $mdate, 2) ?></td>
238 238
             		<!--  WIFE -->            		
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='';
242
+        				if ($name['type'] == 'NAME') {
243
+        					$title = '';
244 244
         				} else {
245
-        					$title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $wife)).'"';
245
+        					$title = 'title="'.strip_tags(GedcomTag::getLabel($name['type'], $wife)).'"';
246 246
         				}
247
-        				if ($num==$wife->getPrimaryName()) {
248
-        					$class=' class="name2"';
249
-        					$sex_image=$wife->getSexImage();
247
+        				if ($num == $wife->getPrimaryName()) {
248
+        					$class = ' class="name2"';
249
+        					$sex_image = $wife->getSexImage();
250 250
         				} else {
251
-        					$class='';
252
-        					$sex_image='';
251
+        					$class = '';
252
+        					$sex_image = '';
253 253
         				} ?>
254 254
         				<a <?= $title.' '.$class ?> href="<?= $wife->getHtmlUrl() ?>">
255 255
         					<?= \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($name['full']) ?>
@@ -258,7 +258,7 @@  discard block
 block discarded – undo
258 258
         				echo implode('&nbsp;',
259 259
         				    \MyArtJaub\Webtrees\Hook\HookProvider::getInstance()
260 260
         				    ->get('hRecordNameAppend')
261
-        				    ->executeOnlyFor(array(Constants::MODULE_MAJ_SOSA_NAME),  $wife, 'smaller'));
261
+        				    ->executeOnlyFor(array(Constants::MODULE_MAJ_SOSA_NAME), $wife, 'smaller'));
262 262
         				?>
263 263
         				<br/>
264 264
             		<?php }
@@ -266,7 +266,7 @@  discard block
 block discarded – undo
266 266
             		?>
267 267
             		</td>
268 268
             		<td hidden data-sort="<?= Filter::escapeHtml($surn_givn) ?>"></td>
269
-            		<?php $wdate=$wife->getBirthDate(); ?>
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 272
             		if ($marriage_dates = $family->getAllMarriageDates()) {
Please login to merge, or discard this patch.
src/Webtrees/Hook/HookInterfaces/RecordNameTextExtenderInterface.php 2 patches
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\GedcomRecord;
Please login to merge, or discard this patch.
Doc Comments   +2 added lines patch added patch discarded remove patch
@@ -22,6 +22,7 @@  discard block
 block discarded – undo
22 22
 	 * 
23 23
 	 * @param GedcomRecord $grec Gedcom record
24 24
 	 * @param string $size Prepend size
25
+	 * @return void
25 26
 	 */
26 27
 	public function hRecordNamePrepend(GedcomRecord $grec, $size);
27 28
 	
@@ -30,6 +31,7 @@  discard block
 block discarded – undo
30 31
 	 * 
31 32
 	 * @param GedcomRecord $grec Gedcom record
32 33
 	 * @param string $size Append size
34
+	 * @return string
33 35
 	 */
34 36
 	public function hRecordNameAppend(GedcomRecord $grec, $size);
35 37
 	
Please login to merge, or discard this patch.
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.