Completed
Push — master ( 960061...3603f5 )
by Jonathan
01:43
created
src/Webtrees/Constants.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -61,7 +61,7 @@
 block discarded – undo
61 61
 	 * @return string $WT_RAPHAEL_JS_URL
62 62
 	 */
63 63
 	public static function WT_RAPHAEL_JS_URL() {
64
-	    return WT_STATIC_URL . 'packages/raphael-2.1.4/raphael-min.js';
64
+	    return WT_STATIC_URL.'packages/raphael-2.1.4/raphael-min.js';
65 65
 	}
66 66
 		
67 67
 }
68 68
\ No newline at end of file
Please login to merge, or discard this patch.
src/Webtrees/Module/AdminTasksModule.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
     public function getConfigLink() {
68 68
         Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
69 69
         
70
-        return 'module.php?mod=' . $this->getName() . '&mod_action=AdminConfig';
70
+        return 'module.php?mod='.$this->getName().'&mod_action=AdminConfig';
71 71
     }
72 72
     
73 73
     /**
@@ -129,7 +129,7 @@  discard block
 block discarded – undo
129 129
 	 * @return \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskProviderInterface
130 130
 	 */
131 131
     public function getProvider() {        
132
-        if(!$this->provider) {
132
+        if (!$this->provider) {
133 133
             $this->provider = new TaskProvider(WT_ROOT.WT_MODULES_DIR.$this->getName().'/tasks/');
134 134
         }
135 135
         return $this->provider;
Please login to merge, or discard this patch.
src/Webtrees/Module/AdminTasks/Model/TaskProvider.php 1 patch
Spacing   +34 added lines, -34 removed lines patch added patch discarded remove patch
@@ -42,15 +42,15 @@  discard block
 block discarded – undo
42 42
      */
43 43
 	protected function loadTask($task_name) {
44 44
 		try {
45
-			if (file_exists($this->root_path . $task_name .'.php')) {
46
-				$task = include $this->root_path . $task_name .'.php';
47
-				if($task instanceof AbstractTask) {
45
+			if (file_exists($this->root_path.$task_name.'.php')) {
46
+				$task = include $this->root_path.$task_name.'.php';
47
+				if ($task instanceof AbstractTask) {
48 48
 				    $task->setProvider($this);
49 49
 					return $task;
50 50
 				}
51 51
 			}
52 52
 		}
53
-		catch(\Exception $ex) { }
53
+		catch (\Exception $ex) { }
54 54
 		
55 55
 		return null;
56 56
 	}
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
     protected function loadTaskFromRow($row) {
73 73
         $task = $this->loadTask($row['majat_name']);
74 74
         
75
-		if($task) {
75
+		if ($task) {
76 76
 			$task->setParameters(
77 77
 				$row['majat_status'] == 'enabled',
78 78
 				new \DateTime($row['majat_last_run']), 
@@ -95,21 +95,21 @@  discard block
 block discarded – undo
95 95
      * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskProviderInterface::getTask()
96 96
      */
97 97
     public function getTask($task_name, $only_enabled = true) {
98
-        $args = array (
98
+        $args = array(
99 99
             'task_name' => $task_name
100 100
         );
101 101
     
102
-        $sql = 'SELECT majat_name, majat_status, majat_last_run, majat_last_result, majat_frequency, majat_nb_occur, majat_running' .
103
-            ' FROM `##maj_admintasks`' .
102
+        $sql = 'SELECT majat_name, majat_status, majat_last_run, majat_last_result, majat_frequency, majat_nb_occur, majat_running'.
103
+            ' FROM `##maj_admintasks`'.
104 104
             ' WHERE majat_name = :task_name';
105
-        if($only_enabled) {
105
+        if ($only_enabled) {
106 106
             $sql .= ' AND majat_status = :status';
107 107
             $args['status'] = 'enabled';
108 108
         }
109 109
     
110 110
         $task_array = Database::prepare($sql)->execute($args)->fetchOneRow(\PDO::FETCH_ASSOC);
111 111
     
112
-        if($task_array) {
112
+        if ($task_array) {
113 113
             return $this->loadTaskFromRow($task_array);
114 114
         }
115 115
     
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
136 136
     * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskProviderInterface::updateTask()
137 137
     */
138 138
     public function updateTask(AbstractTask $task) {        
139
-        try{
139
+        try {
140 140
             Database::prepare(
141 141
                 'UPDATE `##maj_admintasks`'.
142 142
                 ' SET majat_status = :status,'.
@@ -169,7 +169,7 @@  discard block
 block discarded – undo
169 169
 	 */
170 170
     public function getTasksCount() {
171 171
         return Database::prepare(
172
-            'SELECT COUNT(majat_name)' .
172
+            'SELECT COUNT(majat_name)'.
173 173
             ' FROM `##maj_admintasks`'
174 174
             )->execute()->fetchOne();
175 175
     }
@@ -194,20 +194,20 @@  discard block
 block discarded – undo
194 194
 			'time_out' => AbstractTask::TASK_TIME_OUT		
195 195
 		);
196 196
 		
197
-		if(!$force) {
197
+		if (!$force) {
198 198
 			$sql .= ' AND (DATE_ADD(majat_last_run, INTERVAL majat_frequency MINUTE) <= NOW() OR majat_last_result = 0)';
199 199
 		}
200 200
 		
201
-		if($task_name) {
201
+		if ($task_name) {
202 202
 			$sql .= ' AND majat_name = :task_name';
203 203
 			$args['task_name'] = $task_name;
204 204
 		}
205 205
 		
206 206
 		$data = Database::prepare($sql)->execute($args)->fetchAll(\PDO::FETCH_ASSOC);
207 207
 		
208
-		foreach($data as $task_row) {
208
+		foreach ($data as $task_row) {
209 209
             $task = $this->loadTaskFromRow($task_row);
210
-			if($task)
210
+			if ($task)
211 211
 			{
212 212
 				$res[] = $task;
213 213
 			} 
@@ -220,10 +220,10 @@  discard block
 block discarded – undo
220 220
 	 * {@inheritDoc}
221 221
 	 * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskProviderInterface::getFilteredTasksList()
222 222
 	 */
223
-    public function getFilteredTasksList($search = null, $order_by = null, $start = 0, $limit = null){
223
+    public function getFilteredTasksList($search = null, $order_by = null, $start = 0, $limit = null) {
224 224
         $res = array();
225 225
             
226
-        $sql = 'SELECT majat_name, majat_status, majat_last_run, majat_last_result, majat_frequency, majat_nb_occur, majat_running' .
226
+        $sql = 'SELECT majat_name, majat_status, majat_last_run, majat_last_result, majat_frequency, majat_nb_occur, majat_running'.
227 227
             ' FROM `##maj_admintasks`';
228 228
         
229 229
         $args = array();
@@ -238,10 +238,10 @@  discard block
 block discarded – undo
238 238
                 
239 239
                 switch ($value['dir']) {
240 240
                     case 'asc':
241
-                        $sql .= $value['column'] . ' ASC ';
241
+                        $sql .= $value['column'].' ASC ';
242 242
                         break;
243 243
                     case 'desc':
244
-                        $sql .= $value['column'] . ' DESC ';
244
+                        $sql .= $value['column'].' DESC ';
245 245
                         break;
246 246
                 }
247 247
                 $i++;
@@ -258,9 +258,9 @@  discard block
 block discarded – undo
258 258
             
259 259
         $data = Database::prepare($sql)->execute($args)->fetchAll(\PDO::FETCH_ASSOC);
260 260
 
261
-        foreach($data as $ga) {
261
+        foreach ($data as $ga) {
262 262
             $task = $this->loadTaskFromRow($ga);
263
-			if($task && (empty($search) || ($search && strpos($task->getTitle(), $search) !== false)))
263
+			if ($task && (empty($search) || ($search && strpos($task->getTitle(), $search) !== false)))
264 264
 			{
265 265
 				$res[] = $task;
266 266
 			}
@@ -275,13 +275,13 @@  discard block
 block discarded – undo
275 275
      * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskProviderInterface::getInstalledTasks()
276 276
      */
277 277
 	public function getInstalledTasks() {
278
-		$tasks=array();
279
-		$dir=opendir($this->root_path);
280
-		while (($file=readdir($dir))!==false){ 
278
+		$tasks = array();
279
+		$dir = opendir($this->root_path);
280
+		while (($file = readdir($dir)) !== false) { 
281 281
 			try {
282
-			    if($file == '.' || $file == '..') continue;
283
-				$task = include $this->root_path . $file;
284
-				if($task ) {
282
+			    if ($file == '.' || $file == '..') continue;
283
+				$task = include $this->root_path.$file;
284
+				if ($task) {
285 285
 				    $task->setProvider($this);
286 286
 					Database::prepare(
287 287
 						'INSERT IGNORE INTO `##maj_admintasks`'.
@@ -300,7 +300,7 @@  discard block
 block discarded – undo
300 300
 				}
301 301
 			}
302 302
 			catch (\Exception $ex) {
303
-				Log::addErrorLog('An error occured while trying to load the task in file ' . $file . '. Exception: ' . $ex->getMessage());
303
+				Log::addErrorLog('An error occured while trying to load the task in file '.$file.'. Exception: '.$ex->getMessage());
304 304
 			}
305 305
 		}
306 306
 		return $tasks;
@@ -311,14 +311,14 @@  discard block
 block discarded – undo
311 311
 	 * {inhericDoc}
312 312
 	 * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskProviderInterface::deleteTask()
313 313
 	 */
314
-	public function deleteTask($task_name){
315
-		try{
314
+	public function deleteTask($task_name) {
315
+		try {
316 316
 			Database::beginTransaction();
317 317
 			
318 318
 			Database::prepare('DELETE FROM  `##maj_admintasks` WHERE majat_name= :task_name')
319 319
 				->execute(array('task_name' => $task_name));
320 320
 			Database::prepare('DELETE FROM  `##gedcom_setting` WHERE setting_name LIKE :setting_name')
321
-				->execute(array('setting_name' => 'MAJ_AT_' . $task_name .'%'));
321
+				->execute(array('setting_name' => 'MAJ_AT_'.$task_name.'%'));
322 322
 				
323 323
 			Database::commit();
324 324
 			
@@ -326,10 +326,10 @@  discard block
 block discarded – undo
326 326
 			
327 327
 			return true;
328 328
 		}
329
-		catch(\Exception $ex) {
329
+		catch (\Exception $ex) {
330 330
 			Database::rollback();
331 331
 		
332
-			Log::addErrorLog('An error occurred while deleting Admin Task '.$task_name.'. Exception: '. $ex->getMessage());
332
+			Log::addErrorLog('An error occurred while deleting Admin Task '.$task_name.'. Exception: '.$ex->getMessage());
333 333
 			return false;
334 334
 		}
335 335
 	}
Please login to merge, or discard this patch.
src/Webtrees/Module/AdminTasks/Views/TaskEditView.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -104,7 +104,7 @@
 block discarded – undo
104 104
     			</div>
105 105
     		</div>
106 106
 			
107
-			<?php if($task instanceof ConfigurableTaskInterface) { ?>
107
+			<?php if ($task instanceof ConfigurableTaskInterface) { ?>
108 108
 			
109 109
 			<h3><?php echo I18N::translate('Options for “%s”', $task->getTitle()); ?></h3>
110 110
 			
Please login to merge, or discard this patch.
src/Webtrees/Module/AdminTasks/Views/AdminConfigView.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@
 block discarded – undo
40 40
 			<?php echo I18N::translate('In order to do so, use the following URL, with the optional parameter <em>%s</em> if you only want to force the execution of one task: ', 'task'); ?>
41 41
 		</p>
42 42
 		<p>
43
-			<code><?php echo $this->data->get('trigger_url_root') .'&force=<span id="token_url">'. $this->data->get('trigger_token') .'</span>[&task='. I18N::translate('task_name').']'; ?></code>
43
+			<code><?php echo $this->data->get('trigger_url_root').'&force=<span id="token_url">'.$this->data->get('trigger_token').'</span>[&task='.I18N::translate('task_name').']'; ?></code>
44 44
 		</p>
45 45
 		<p>
46 46
 			<button id="bt_genforcetoken" class="bt bt-primary" onClick="generate_force_token();">
Please login to merge, or discard this patch.
src/Webtrees/Module/Sosa/Schema/Migration0.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -22,17 +22,17 @@
 block discarded – undo
22 22
 	public function upgrade() {
23 23
 
24 24
 		Database::exec(
25
-		    'CREATE TABLE IF NOT EXISTS `##maj_sosa` (' .
26
-	        ' majs_gedcom_id      INTEGER 	        NOT NULL,' .
27
-		    ' majs_user_id        INTEGER           NOT NULL DEFAULT -1,' . 
28
-		    ' majs_sosa           BIGINT UNSIGNED 	NOT NULL,' . // Allow to calculate sosa on 64 generations
29
-            ' majs_i_id           VARCHAR(20)	    NOT NULL,' .	
30
-            ' majs_gen            TINYINT			NULL,' .
31
-            ' majs_birth_year	  SMALLINT			NULL,' .
32
-            ' majs_death_year	  SMALLINT			NULL,' .
33
-            ' PRIMARY KEY (majs_gedcom_id, majs_user_id, majs_sosa),' .
34
-		    ' FOREIGN KEY `##gedcom_id_fk1` (majs_gedcom_id) REFERENCES `##gedcom` (gedcom_id) ON DELETE CASCADE,' .
35
-		    ' FOREIGN KEY `##user_id_fk1` (majs_user_id) REFERENCES `##user` (user_id) ON DELETE CASCADE' .			
25
+		    'CREATE TABLE IF NOT EXISTS `##maj_sosa` ('.
26
+	        ' majs_gedcom_id      INTEGER 	        NOT NULL,'.
27
+		    ' majs_user_id        INTEGER           NOT NULL DEFAULT -1,'. 
28
+		    ' majs_sosa           BIGINT UNSIGNED 	NOT NULL,'.// Allow to calculate sosa on 64 generations
29
+            ' majs_i_id           VARCHAR(20)	    NOT NULL,'.	
30
+            ' majs_gen            TINYINT			NULL,'.
31
+            ' majs_birth_year	  SMALLINT			NULL,'.
32
+            ' majs_death_year	  SMALLINT			NULL,'.
33
+            ' PRIMARY KEY (majs_gedcom_id, majs_user_id, majs_sosa),'.
34
+		    ' FOREIGN KEY `##gedcom_id_fk1` (majs_gedcom_id) REFERENCES `##gedcom` (gedcom_id) ON DELETE CASCADE,'.
35
+		    ' FOREIGN KEY `##user_id_fk1` (majs_user_id) REFERENCES `##user` (user_id) ON DELETE CASCADE'.			
36 36
 		    ') COLLATE utf8_unicode_ci ENGINE=InnoDB'
37 37
 		);
38 38
 	}
Please login to merge, or discard this patch.
src/Webtrees/Module/Sosa/Views/SosaListView.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -28,11 +28,11 @@  discard block
 block discarded – undo
28 28
         <div id="maj-sosa-list-page" class="center">
29 29
 			<h2><?php echo $this->data->get('title'); ?></h2>
30 30
 			
31
-			<?php  if($this->data->get('is_setup')) { 
31
+			<?php  if ($this->data->get('is_setup')) { 
32 32
 			    $selectedgen = $this->data->get('generation');
33 33
 			    $this->renderSosaHeader();
34
-			    if($this->data->get('has_sosa') ) {
35
-			         if($selectedgen > 0) {
34
+			    if ($this->data->get('has_sosa')) {
35
+			         if ($selectedgen > 0) {
36 36
 			        ?>
37 37
 			<div id="sosalist-tabs">
38 38
 				<ul>
@@ -75,9 +75,9 @@  discard block
 block discarded – undo
75 75
         ?>
76 76
         
77 77
     	<form method="get" name="setgen" action="module.php">
78
-			<input type="hidden" name="mod" value="<?php echo $this->data->get('url_module');?>">
79
-			<input type="hidden" name="mod_action" value="<?php echo $this->data->get('url_action');?>">
80
-			<input type="hidden" name="ged" value="<?php echo $this->data->get('url_ged');?>">
78
+			<input type="hidden" name="mod" value="<?php echo $this->data->get('url_module'); ?>">
79
+			<input type="hidden" name="mod_action" value="<?php echo $this->data->get('url_action'); ?>">
80
+			<input type="hidden" name="ged" value="<?php echo $this->data->get('url_ged'); ?>">
81 81
 			<div class="maj-table">
82 82
 				<div class="maj-row">
83 83
 					<div class="label"><?php echo I18N::translate('Choose generation') ?></div>
@@ -85,9 +85,9 @@  discard block
 block discarded – undo
85 85
 				<div class="maj-row">
86 86
 					<div class="value">
87 87
 						<select name="gen">							
88
-						<?php for($i=$this->data->get('min_gen'); $i <= $max_gen;$i++) {?>
88
+						<?php for ($i = $this->data->get('min_gen'); $i <= $max_gen; $i++) {?>
89 89
 							<option value="<?php echo $i; ?>"
90
-							<?php if($selectedgen && $selectedgen==$i) { ?> selected="true" <?php } ?>
90
+							<?php if ($selectedgen && $selectedgen == $i) { ?> selected="true" <?php } ?>
91 91
                 			><?php echo I18N::translate('Generation %d', $i); ?>
92 92
                 			</option>
93 93
                 		<?php } ?>
@@ -95,21 +95,21 @@  discard block
 block discarded – undo
95 95
                 	</div>
96 96
                 </div>
97 97
       		</div>
98
-      		<input type="submit" value="<?php echo I18N::translate('Show');?>" />
98
+      		<input type="submit" value="<?php echo I18N::translate('Show'); ?>" />
99 99
       		<br />
100 100
       	</form>
101
-      	<?php if($selectedgen > 0) { ?>
101
+      	<?php if ($selectedgen > 0) { ?>
102 102
 		<h4>
103
-			<?php if($selectedgen > $this->data->get('min_gen')) { ?>
104
-			<a href="module.php?mod=<?php echo $this->data->get('url_module');?>&mod_action=<?php echo $this->data->get('url_action');?>&ged=<?php echo $this->data->get('url_ged');?>&gen=<?php echo $selectedgen-1; ?>">
103
+			<?php if ($selectedgen > $this->data->get('min_gen')) { ?>
104
+			<a href="module.php?mod=<?php echo $this->data->get('url_module'); ?>&mod_action=<?php echo $this->data->get('url_action'); ?>&ged=<?php echo $this->data->get('url_ged'); ?>&gen=<?php echo $selectedgen - 1; ?>">
105 105
 				<i class="icon-ldarrow" title="<?php echo I18N::translate('Previous generation'); ?>" ></i>
106 106
 			</a>
107 107
 			&nbsp;&nbsp;
108 108
 			<?php } ?>
109 109
 			<?php echo I18N::translate('Generation %d', $selectedgen); ?>
110
-			<?php if($selectedgen < $max_gen) { ?>
110
+			<?php if ($selectedgen < $max_gen) { ?>
111 111
 			&nbsp;&nbsp;
112
-			<a href="module.php?mod=<?php echo $this->data->get('url_module');?>&mod_action=<?php echo $this->data->get('url_action');?>&ged=<?php echo $this->data->get('url_ged');?>&gen=<?php echo $selectedgen+1; ?>">
112
+			<a href="module.php?mod=<?php echo $this->data->get('url_module'); ?>&mod_action=<?php echo $this->data->get('url_action'); ?>&ged=<?php echo $this->data->get('url_ged'); ?>&gen=<?php echo $selectedgen + 1; ?>">
113 113
 				<i class="icon-rdarrow" title="<?php echo I18N::translate('Next generation'); ?>" ></i>
114 114
 			</a>
115 115
 			<?php } ?>
Please login to merge, or discard this patch.
src/Webtrees/Module/Sosa/Views/SosaComputeResultView.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -25,14 +25,14 @@
 block discarded – undo
25 25
 	 */
26 26
     protected function renderContent() {        
27 27
         
28
-        if($this->data->get('is_success', false)) {
28
+        if ($this->data->get('is_success', false)) {
29 29
         ?>        
30 30
         	<i class="icon-maj-success" title="<?php echo I18N::translate('Success'); ?>"></i>&nbsp;
31 31
         	<?php echo I18N::translate('Success'); ?>
32 32
         <?php } else { ?>
33 33
 			<i class="icon-maj-error" title="<?php echo I18N::translate('Error'); ?>"></i>&nbsp;
34 34
 			<?php echo I18N::translate('Error'); ?>
35
-			<?php if($error = $this->data->get('error')) { echo '&nbsp;-&nbsp;' . $error; }
35
+			<?php if ($error = $this->data->get('error')) { echo '&nbsp;-&nbsp;'.$error; }
36 36
         }
37 37
     }
38 38
     
Please login to merge, or discard this patch.
src/Webtrees/Module/PatronymicLineage/Model/LineageNode.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
 	 * @param Fisharebest\Webtrees\Family $fams
58 58
 	 */
59 59
 	public function addFamily(Family $fams) {
60
-		if($fams && !isset($this->linked_fams[$fams])) {
60
+		if ($fams && !isset($this->linked_fams[$fams])) {
61 61
 			$this->linked_fams[$fams] = array();
62 62
 		}
63 63
 	}
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
 	 * @param LineageNode $child
70 70
 	 */
71 71
 	public function addChild(Family $fams, LineageNode $child = null) {
72
-		if($fams) {
72
+		if ($fams) {
73 73
 			$this->addFamily($fams);
74 74
 			$tmp = $this->linked_fams[$fams];
75 75
 			$tmp[] = $child;
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
 	 * @return boolean
120 120
 	 */
121 121
 	public function hasFollowUpSurname() {
122
-		return !is_null($this->alt_surname) && strlen($this->alt_surname) > 0 ;
122
+		return !is_null($this->alt_surname) && strlen($this->alt_surname) > 0;
123 123
 	}
124 124
 	
125 125
 }
Please login to merge, or discard this patch.