jon48 / webtrees-lib

src/Webtrees/Constants.php

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
 	 * @return string $WT_RAPHAEL_JS_URL
 	 */
 	public static function WT_RAPHAEL_JS_URL() {
-	    return WT_STATIC_URL . 'packages/raphael-2.1.4/raphael-min.js';
+	    return WT_STATIC_URL.'packages/raphael-2.1.4/raphael-min.js';
 	}
 		
 }
\ No newline at end of file

src/Webtrees/Module/IsSourcedModule.php

Braces +9 added lines, -6 removed lines

@@ -63,8 +63,9 @@ 
 	public function hExtendIndiHeaderIcons(IndividualController $ctrlIndi) {
 	    if($ctrlIndi){
 	        $dindi = new Individual($ctrlIndi->getSignificantIndividual());
-	        if ($dindi->canDisplayIsSourced()) 
-	            return FunctionsPrint::formatIsSourcedIcon('R', $dindi->isSourced(), 'INDI', 1, 'large');
+	        if ($dindi->canDisplayIsSourced()) {
+	        	            return FunctionsPrint::formatIsSourcedIcon('R', $dindi->isSourced(), 'INDI', 1, 'large');
+	        }
 	    }
 	    return '';
 	}
@@ -97,8 +98,9 @@ 
 	        $dindi = new Individual($grec);
 	        $html .= FunctionsPrint::formatIsSourcedIcon('R', $dindi->isSourced(), 'INDI', 1, 'small');
 	        $html .= FunctionsPrint::formatIsSourcedIcon('E', $dindi->isBirthSourced(), 'BIRT', 1, 'small');
-	        if($grec->isDead())
-	            $html .= FunctionsPrint::formatIsSourcedIcon('E', $dindi->isDeathSourced(), 'DEAT', 1, 'small');
+	        if($grec->isDead()) {
+	        	            $html .= FunctionsPrint::formatIsSourcedIcon('E', $dindi->isDeathSourced(), 'DEAT', 1, 'small');
+	        }
 	    }
 	    return $html;
 	}
@@ -171,12 +173,13 @@ 
 	                   </tr>';
 	            }
 	            
-	            if( $root->isDead() )
-	                echo '
+	            if( $root->isDead() ) {
+	            	                echo '
 	                    <tr>
 	                       <td class="slabel">' . GedcomTag::getLabel('DEAT') . '</td>
 	                       <td class="svalue">' . FunctionsPrint::formatIsSourcedIcon('E', $dindi->isDeathSourced(), 'DEAT', 1).'</td>
 	                   </tr>';
+	            }
 	            
 	            echo '</table>';
 	        }

Spacing +15 added lines, -15 removed lines

@@ -63,7 +63,7 @@ 
 	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\IndividualHeaderExtenderInterface::hExtendIndiHeaderIcons()
 	 */
 	public function hExtendIndiHeaderIcons(IndividualController $ctrlIndi) {
-	    if($ctrlIndi){
+	    if ($ctrlIndi) {
 	        $dindi = new Individual($ctrlIndi->getSignificantIndividual());
 	        if ($dindi->canDisplayIsSourced()) 
 	            return FunctionsPrint::formatIsSourcedIcon('R', $dindi->isSourced(), 'INDI', 1, 'large');
@@ -87,19 +87,19 @@ 
 	 * {@inheritDoc}
 	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\RecordNameTextExtenderInterface::hRecordNamePrepend()
 	 */
-	public function hRecordNamePrepend(GedcomRecord $grec){ }
+	public function hRecordNamePrepend(GedcomRecord $grec) { }
 	
 	/**
 	 * {@inheritDoc}
 	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\RecordNameTextExtenderInterface::hRecordNameAppend()
 	 */
-	public function hRecordNameAppend(GedcomRecord $grec){
+	public function hRecordNameAppend(GedcomRecord $grec) {
 	    $html = '';
-	    if($grec instanceof \Fisharebest\Webtrees\Individual){
+	    if ($grec instanceof \Fisharebest\Webtrees\Individual) {
 	        $dindi = new Individual($grec);
 	        $html .= FunctionsPrint::formatIsSourcedIcon('R', $dindi->isSourced(), 'INDI', 1, 'small');
 	        $html .= FunctionsPrint::formatIsSourcedIcon('E', $dindi->isBirthSourced(), 'BIRT', 1, 'small');
-	        if($grec->isDead())
+	        if ($grec->isDead())
 	            $html .= FunctionsPrint::formatIsSourcedIcon('E', $dindi->isDeathSourced(), 'DEAT', 1, 'small');
 	    }
 	    return $html;
@@ -117,7 +117,7 @@ 
 	 * {@inheritDoc}
 	 * @see \Fisharebest\Webtrees\Module\ModuleSidebarInterface::hasSidebarContent()
 	 */
-	public function hasSidebarContent(){ 
+	public function hasSidebarContent() { 
 	    return true;
 	}
 	
@@ -147,24 +147,24 @@ 
 	            echo '
 	                <table class="issourcedtable">
 	                   <tr>
-	                       <td class="slabel"> ' . GedcomTag::getLabel('INDI') . '</td>
+	                       <td class="slabel"> ' . GedcomTag::getLabel('INDI').'</td>
 	                       <td class="svalue">' . FunctionsPrint::formatIsSourcedIcon('R', $dindi->isSourced(), 'INDI', 1).'</td>
 	                   </tr>
 	                   <tr>
-	                       <td class="slabel">' . GedcomTag::getLabel('BIRT') . '</td>
+	                       <td class="slabel">' . GedcomTag::getLabel('BIRT').'</td>
 	                       <td class="svalue">' . FunctionsPrint::formatIsSourcedIcon('E', $dindi->isBirthSourced(), 'BIRT', 1).'</td>
 	                   </tr>';
 	            
 	            $fams = $root->getSpouseFamilies();
-	            ($ct = count($fams)) > 1 ? $nb=1 : $nb=' ';	            
-	            foreach($fams as $fam){
+	            ($ct = count($fams)) > 1 ? $nb = 1 : $nb = ' ';	            
+	            foreach ($fams as $fam) {
 	                $dfam = new Family($fam);
 	                echo '
 	                    <tr>
 	                       <td class="slabel right">
-	                           <a href="' . $fam->getHtmlUrl() . '"> '. GedcomTag::getLabel('MARR');
-	                if($ct > 1){
-	                    echo ' ',$nb;
+	                           <a href="' . $fam->getHtmlUrl().'"> '.GedcomTag::getLabel('MARR');
+	                if ($ct > 1) {
+	                    echo ' ', $nb;
 	                    $nb++;
 	                }
 	                echo '     </a>
@@ -173,10 +173,10 @@ 
 	                   </tr>';
 	            }
 	            
-	            if( $root->isDead() )
+	            if ($root->isDead())
 	                echo '
 	                    <tr>
-	                       <td class="slabel">' . GedcomTag::getLabel('DEAT') . '</td>
+	                       <td class="slabel">' . GedcomTag::getLabel('DEAT').'</td>
 	                       <td class="svalue">' . FunctionsPrint::formatIsSourcedIcon('E', $dindi->isDeathSourced(), 'DEAT', 1).'</td>
 	                   </tr>';
 	            

src/Webtrees/Module/AdminTasksModule.php

Spacing +2 added lines, -2 removed lines

@@ -67,7 +67,7 @@ 
     public function getConfigLink() {
         Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
         
-        return 'module.php?mod=' . $this->getName() . '&mod_action=AdminConfig';
+        return 'module.php?mod='.$this->getName().'&mod_action=AdminConfig';
     }
     
     /**
@@ -129,7 +129,7 @@ 
 	 * @return \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskProviderInterface
 	 */
     public function getProvider() {        
-        if(!$this->provider) {
+        if (!$this->provider) {
             $this->provider = new TaskProvider(WT_ROOT.WT_MODULES_DIR.$this->getName().'/tasks/');
         }
         return $this->provider;

src/Webtrees/Module/AdminTasks/Model/TaskProvider.php

Spacing +34 added lines, -34 removed lines

@@ -42,15 +42,15 @@ 
      */
 	protected function loadTask($task_name) {
 		try {
-			if (file_exists($this->root_path . $task_name .'.php')) {
-				$task = include $this->root_path . $task_name .'.php';
-				if($task instanceof AbstractTask) {
+			if (file_exists($this->root_path.$task_name.'.php')) {
+				$task = include $this->root_path.$task_name.'.php';
+				if ($task instanceof AbstractTask) {
 				    $task->setProvider($this);
 					return $task;
 				}
 			}
 		}
-		catch(\Exception $ex) { }
+		catch (\Exception $ex) { }
 		
 		return null;
 	}
@@ -72,7 +72,7 @@ 
     protected function loadTaskFromRow($row) {
         $task = $this->loadTask($row['majat_name']);
         
-		if($task) {
+		if ($task) {
 			$task->setParameters(
 				$row['majat_status'] == 'enabled',
 				new \DateTime($row['majat_last_run']), 
@@ -95,21 +95,21 @@ 
      * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskProviderInterface::getTask()
      */
     public function getTask($task_name, $only_enabled = true) {
-        $args = array (
+        $args = array(
             'task_name' => $task_name
         );
     
-        $sql = 'SELECT majat_name, majat_status, majat_last_run, majat_last_result, majat_frequency, majat_nb_occur, majat_running' .
-            ' FROM `##maj_admintasks`' .
+        $sql = 'SELECT majat_name, majat_status, majat_last_run, majat_last_result, majat_frequency, majat_nb_occur, majat_running'.
+            ' FROM `##maj_admintasks`'.
             ' WHERE majat_name = :task_name';
-        if($only_enabled) {
+        if ($only_enabled) {
             $sql .= ' AND majat_status = :status';
             $args['status'] = 'enabled';
         }
     
         $task_array = Database::prepare($sql)->execute($args)->fetchOneRow(\PDO::FETCH_ASSOC);
     
-        if($task_array) {
+        if ($task_array) {
             return $this->loadTaskFromRow($task_array);
         }
     
@@ -136,7 +136,7 @@ 
     * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskProviderInterface::updateTask()
     */
     public function updateTask(AbstractTask $task) {        
-        try{
+        try {
             Database::prepare(
                 'UPDATE `##maj_admintasks`'.
                 ' SET majat_status = :status,'.
@@ -169,7 +169,7 @@ 
 	 */
     public function getTasksCount() {
         return Database::prepare(
-            'SELECT COUNT(majat_name)' .
+            'SELECT COUNT(majat_name)'.
             ' FROM `##maj_admintasks`'
             )->execute()->fetchOne();
     }
@@ -194,20 +194,20 @@ 
 			'time_out' => AbstractTask::TASK_TIME_OUT		
 		);
 		
-		if(!$force) {
+		if (!$force) {
 			$sql .= ' AND (DATE_ADD(majat_last_run, INTERVAL majat_frequency MINUTE) <= NOW() OR majat_last_result = 0)';
 		}
 		
-		if($task_name) {
+		if ($task_name) {
 			$sql .= ' AND majat_name = :task_name';
 			$args['task_name'] = $task_name;
 		}
 		
 		$data = Database::prepare($sql)->execute($args)->fetchAll(\PDO::FETCH_ASSOC);
 		
-		foreach($data as $task_row) {
+		foreach ($data as $task_row) {
             $task = $this->loadTaskFromRow($task_row);
-			if($task)
+			if ($task)
 			{
 				$res[] = $task;
 			} 
@@ -220,10 +220,10 @@ 
 	 * {@inheritDoc}
 	 * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskProviderInterface::getFilteredTasksList()
 	 */
-    public function getFilteredTasksList($search = null, $order_by = null, $start = 0, $limit = null){
+    public function getFilteredTasksList($search = null, $order_by = null, $start = 0, $limit = null) {
         $res = array();
             
-        $sql = 'SELECT majat_name, majat_status, majat_last_run, majat_last_result, majat_frequency, majat_nb_occur, majat_running' .
+        $sql = 'SELECT majat_name, majat_status, majat_last_run, majat_last_result, majat_frequency, majat_nb_occur, majat_running'.
             ' FROM `##maj_admintasks`';
         
         $args = array();
@@ -238,10 +238,10 @@ 
                 
                 switch ($value['dir']) {
                     case 'asc':
-                        $sql .= $value['column'] . ' ASC ';
+                        $sql .= $value['column'].' ASC ';
                         break;
                     case 'desc':
-                        $sql .= $value['column'] . ' DESC ';
+                        $sql .= $value['column'].' DESC ';
                         break;
                 }
                 $i++;
@@ -258,9 +258,9 @@ 
             
         $data = Database::prepare($sql)->execute($args)->fetchAll(\PDO::FETCH_ASSOC);
 
-        foreach($data as $ga) {
+        foreach ($data as $ga) {
             $task = $this->loadTaskFromRow($ga);
-			if($task && (empty($search) || ($search && strpos($task->getTitle(), $search) !== false)))
+			if ($task && (empty($search) || ($search && strpos($task->getTitle(), $search) !== false)))
 			{
 				$res[] = $task;
 			}
@@ -275,13 +275,13 @@ 
      * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskProviderInterface::getInstalledTasks()
      */
 	public function getInstalledTasks() {
-		$tasks=array();
-		$dir=opendir($this->root_path);
-		while (($file=readdir($dir))!==false){ 
+		$tasks = array();
+		$dir = opendir($this->root_path);
+		while (($file = readdir($dir)) !== false) { 
 			try {
-			    if($file == '.' || $file == '..') continue;
-				$task = include $this->root_path . $file;
-				if($task ) {
+			    if ($file == '.' || $file == '..') continue;
+				$task = include $this->root_path.$file;
+				if ($task) {
 				    $task->setProvider($this);
 					Database::prepare(
 						'INSERT IGNORE INTO `##maj_admintasks`'.
@@ -300,7 +300,7 @@ 
 				}
 			}
 			catch (\Exception $ex) {
-				Log::addErrorLog('An error occured while trying to load the task in file ' . $file . '. Exception: ' . $ex->getMessage());
+				Log::addErrorLog('An error occured while trying to load the task in file '.$file.'. Exception: '.$ex->getMessage());
 			}
 		}
 		return $tasks;
@@ -311,14 +311,14 @@ 
 	 * {inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskProviderInterface::deleteTask()
 	 */
-	public function deleteTask($task_name){
-		try{
+	public function deleteTask($task_name) {
+		try {
 			Database::beginTransaction();
 			
 			Database::prepare('DELETE FROM  `##maj_admintasks` WHERE majat_name= :task_name')
 				->execute(array('task_name' => $task_name));
 			Database::prepare('DELETE FROM  `##gedcom_setting` WHERE setting_name LIKE :setting_name')
-				->execute(array('setting_name' => 'MAJ_AT_' . $task_name .'%'));
+				->execute(array('setting_name' => 'MAJ_AT_'.$task_name.'%'));
 				
 			Database::commit();
 			
@@ -326,10 +326,10 @@ 
 			
 			return true;
 		}
-		catch(\Exception $ex) {
+		catch (\Exception $ex) {
 			Database::rollback();
 		
-			Log::addErrorLog('An error occurred while deleting Admin Task '.$task_name.'. Exception: '. $ex->getMessage());
+			Log::addErrorLog('An error occurred while deleting Admin Task '.$task_name.'. Exception: '.$ex->getMessage());
 			return false;
 		}
 	}

Braces +9 added lines, -13 removed lines

@@ -49,8 +49,7 @@ 
 					return $task;
 				}
 			}
-		}
-		catch(\Exception $ex) { }
+		} catch(\Exception $ex) { }
 		
 		return null;
 	}
@@ -83,8 +82,7 @@ 
 				);
         
 			return $task;
-		}
-		else {
+		} else {
 		    $this->deleteTask($row['majat_name']);
 		}
 		return null;
@@ -156,8 +154,7 @@ 
                     'is_running' => $task->isRunning() ? 1 : 0
                 ));
             return true;
-        }
-        catch (\Exception $ex) {
+        } catch (\Exception $ex) {
             Log::addErrorLog(sprintf('Error while updating the Admin Task %s. Exception: %s', $task->getName(), $ex->getMessage()));
             return false;
         }        
@@ -279,7 +276,9 @@ 
 		$dir=opendir($this->root_path);
 		while (($file=readdir($dir))!==false){ 
 			try {
-			    if($file == '.' || $file == '..') continue;
+			    if($file == '.' || $file == '..') {
+			    	continue;
+			    }
 				$task = include $this->root_path . $file;
 				if($task ) {
 				    $task->setProvider($this);
@@ -294,12 +293,10 @@ 
 					));
 					
 					$tasks[] = $task;
-				}
-				else {
+				} else {
 					throw new \Exception;
 				}
-			}
-			catch (\Exception $ex) {
+			} catch (\Exception $ex) {
 				Log::addErrorLog('An error occured while trying to load the task in file ' . $file . '. Exception: ' . $ex->getMessage());
 			}
 		}
@@ -325,8 +322,7 @@ 
 			Log::addConfigurationLog('Admin Task '.$task_name.' has been deleted from disk - deleting it from DB');
 			
 			return true;
-		}
-		catch(\Exception $ex) {
+		} catch(\Exception $ex) {
 			Database::rollback();
 		
 			Log::addErrorLog('An error occurred while deleting Admin Task '.$task_name.'. Exception: '. $ex->getMessage());

src/Webtrees/Module/AdminTasks/Tasks/HealthCheckEmailTask.php

Braces +2 added lines, -4 removed lines

@@ -185,8 +185,7 @@ 
 						I18N::translate('Error').Mail::EOL.
 						str_repeat('-', $nb_char_count_title)."\t".str_repeat('-', $nb_char_type)."\t".str_repeat('-', 20)."\t".str_repeat('-', strlen(I18N::translate('Error'))).Mail::EOL.
 						$tmp_message.Mail::EOL;
-				}
-				else{
+				} else{
 					$message .= I18N::translate('No errors', $nb_errors).Mail::EOL.Mail::EOL;
 				}
 				
@@ -251,8 +250,7 @@ 
 				}
 			}
 			return true;
-		}
-		catch (\Exception $ex) {
+		} catch (\Exception $ex) {
 			Log::addErrorLog(sprintf('Error while updating the Admin Task "%s". Exception: %s', $this->getName(), $ex->getMessage()));
 			return false;
 		}

Spacing +24 added lines, -24 removed lines

@@ -42,7 +42,7 @@ 
 	 * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\AbstractTask::getDefaultFrequency()
 	 */
     public function getDefaultFrequency() {
-		return 10080;  // = 1 week = 7 * 24 * 60 min
+		return 10080; // = 1 week = 7 * 24 * 60 min
 	}
     
 	/**
@@ -55,9 +55,9 @@ 
 		
 		// Get the number of days to take into account, either last 7 days or since last check
 		$interval_sincelast = 0;
-		if($this->last_updated){
+		if ($this->last_updated) {
 			$tmpInt = $this->last_updated->diff(new \DateTime('now'), true);
-			$interval_sincelast = ( $tmpInt->days * 24  + $tmpInt->h ) * 60 + $tmpInt->i;
+			$interval_sincelast = ($tmpInt->days * 24 + $tmpInt->h) * 60 + $tmpInt->i;
 		}
 		
 		$interval = max($this->frequency, $interval_sincelast);
@@ -66,17 +66,17 @@ 
         // Check for updates
         $latest_version_txt = Functions::fetchLatestVersion();
         if (preg_match('/^[0-9.]+\|[0-9.]+\|/', $latest_version_txt)) {
-        	list($latest_version, , $download_url) = explode('|', $latest_version_txt);
+        	list($latest_version,, $download_url) = explode('|', $latest_version_txt);
         } else {
         	// Cannot determine the latest version
-        	list($latest_version, , $download_url) = explode('|', '||');
+        	list($latest_version,, $download_url) = explode('|', '||');
         }
 		
 		// Users statistics
 		$warnusers = 0;
 		$nverusers = 0;
 		$applusers = 0;
-		foreach(User::all() as $user) {
+		foreach (User::all() as $user) {
 			if (((date("U") - (int)$user->getPreference('reg_timestamp')) > 604800) && !$user->getPreference('verified')) {
 				$warnusers++;
 			}
@@ -90,20 +90,20 @@ 
 		
 		// Tree specifics checks
 		$one_tree_done = false;
-		foreach(Tree::getAll() as $tree){
+		foreach (Tree::getAll() as $tree) {
 			$isTreeEnabled = $tree->getPreference('MAJ_AT_'.$this->getName().'_ENABLED');
-			if((is_null($isTreeEnabled) || $isTreeEnabled) && $webmaster = User::find($tree->getPreference('WEBMASTER_USER_ID'))){
+			if ((is_null($isTreeEnabled) || $isTreeEnabled) && $webmaster = User::find($tree->getPreference('WEBMASTER_USER_ID'))) {
 				I18N::init($webmaster->getPreference('language'));
 				
 				$subject = I18N::translate('Health Check Report').' - '.I18N::translate('Tree %s', $tree->getTitle());
 				$message = 
-					I18N::translate('Health Check Report for the last %d days', $nbdays). Mail::EOL. Mail::EOL.
+					I18N::translate('Health Check Report for the last %d days', $nbdays).Mail::EOL.Mail::EOL.
 					I18N::translate('Tree %s', $tree->getTitle()).Mail::EOL.
 					'=========================================='.Mail::EOL.Mail::EOL;
 				
 				// News
 				$message_version = '';
-				if($latest_version && version_compare(WT_VERSION, $latest_version)<0){
+				if ($latest_version && version_compare(WT_VERSION, $latest_version) < 0) {
 					$message_version = I18N::translate('News').Mail::EOL.
 							'-------------'.Mail::EOL.
 							I18N::translate('A new version of *webtrees* is available: %s. Upgrade as soon as possible.', $latest_version).Mail::EOL.
@@ -119,7 +119,7 @@ 
 						I18N::translate('Not verified by the user')."\t\t".$applusers.Mail::EOL.
 						I18N::translate('Not approved by an administrator')."\t".$nverusers.Mail::EOL.
 						Mail::EOL;
-				$message  .= $message_users;
+				$message .= $message_users;
 								
 				// Statistics tree:				
 				$stats = new Stats($tree);
@@ -159,7 +159,7 @@ 
 							' AND log_time >= DATE_ADD( NOW(), INTERVAL - :nb_days DAY)'.
 							' GROUP BY log_message, gedcom_id'.
 							' ORDER BY lastoccurred DESC';
-				$errors=Database::prepare($sql)->execute(array(
+				$errors = Database::prepare($sql)->execute(array(
 					'log_type' => Log::TYPE_ERROR, 
 					'gedcom_id' => $tree->getTreeId(), 
 					'nb_days' => $nbdays
@@ -175,7 +175,7 @@ 
 					$tmp_message .= str_replace("\n", "\n\t\t\t\t\t\t", $error->log_message).Mail::EOL;
 					$nb_errors += $error->nblogs;
 				}
-				if($nb_errors > 0){
+				if ($nb_errors > 0) {
 					$message .= I18N::translate('Errors [%d]', $nb_errors).Mail::EOL.
 						'-------------'.Mail::EOL.
 						WT_BASE_URL.'admin_site_logs.php'.Mail::EOL.
@@ -186,12 +186,12 @@ 
 						str_repeat('-', $nb_char_count_title)."\t".str_repeat('-', $nb_char_type)."\t".str_repeat('-', 20)."\t".str_repeat('-', strlen(I18N::translate('Error'))).Mail::EOL.
 						$tmp_message.Mail::EOL;
 				}
-				else{
+				else {
 					$message .= I18N::translate('No errors', $nb_errors).Mail::EOL.Mail::EOL;
 				}
 				
 				$tmpres = true;
-				if($webmaster->getPreference('contactmethod') !== 'messaging' 
+				if ($webmaster->getPreference('contactmethod') !== 'messaging' 
 						&& $webmaster->getPreference('contactmethod') !== 'none') {
 					$tmpres = Mail::systemMessage($tree, $webmaster, $subject, $message);
 				}		
@@ -213,24 +213,24 @@ 
 		$html = '
 			<div class="form-group">
     			<label class="control-label col-sm-3"> '.
-    				I18N::translate('Enable healthcheck emails for') .
+    				I18N::translate('Enable healthcheck emails for').
     			'</label>
     			<div class="col-sm-9">';
 
-		foreach(Tree::getAll() as $tree){
-			if(Auth::isManager($tree)){	
+		foreach (Tree::getAll() as $tree) {
+			if (Auth::isManager($tree)) {	
 			    $html .= '<div class="form-group row">
 			        <span class="col-sm-3 control-label">' .
-			             $tree->getTitle() .
+			             $tree->getTitle().
 					'</span>
 					 <div class="col-sm-2">';
-				$html .= FunctionsEdit::editFieldYesNo('HEALTHCHECK_ENABLED_' . $tree->getTreeId(), $tree->getPreference('MAJ_AT_'.$this->getName().'_ENABLED', 1), 'class="radio-inline"');
+				$html .= FunctionsEdit::editFieldYesNo('HEALTHCHECK_ENABLED_'.$tree->getTreeId(), $tree->getPreference('MAJ_AT_'.$this->getName().'_ENABLED', 1), 'class="radio-inline"');
 				$html .= '</div></div>';
 			}
 		}
 		
 		$html .= '	<p class="small text-muted">'.
-    					I18N::translate('Enable the health check emails for each of the selected trees.') .
+    					I18N::translate('Enable the health check emails for each of the selected trees.').
     				'</p>
     			</div>
     		</div>';
@@ -244,9 +244,9 @@ 
 	 */
 	public function saveConfig() {
 		try {
-			foreach(Tree::getAll() as $tree){		
-				if(Auth::isManager($tree)){
-					$tree_enabled = Filter::postInteger('HEALTHCHECK_ENABLED_' . $tree->getTreeId(), 0, 1);
+			foreach (Tree::getAll() as $tree) {		
+				if (Auth::isManager($tree)) {
+					$tree_enabled = Filter::postInteger('HEALTHCHECK_ENABLED_'.$tree->getTreeId(), 0, 1);
 					$tree->setPreference('MAJ_AT_'.$this->getName().'_ENABLED', $tree_enabled);
 				}
 			}

src/Webtrees/Module/AdminTasks/AdminConfigController.php

Spacing +22 added lines, -25 removed lines

@@ -68,7 +68,7 @@ 
             ->setPageTitle($this->module->getTitle());
 			
 		$token = $this->module->getSetting('MAJ_AT_FORCE_EXEC_TOKEN');
-		if(is_null($token)) {
+		if (is_null($token)) {
 			$token = Functions::generateRandomToken();
 			$this->module->setSetting('PAT_FORCE_EXEC_TOKEN', $token);
 		}
@@ -76,12 +76,12 @@ 
         $data = new ViewBag();
         $data->set('title', $controller->getPageTitle());
         
-        $table_id = 'table-admintasks-' . Uuid::uuid4();
+        $table_id = 'table-admintasks-'.Uuid::uuid4();
         $data->set('table_id', $table_id);
 		
 		$data->set('trigger_url_root', WT_BASE_URL.'module.php?mod='.$this->module->getName().'&mod_action=Task@trigger');
 		$token = $this->module->getSetting('MAJ_AT_FORCE_EXEC_TOKEN');
-		if(is_null($token)) {
+		if (is_null($token)) {
 			$token = Functions::generateRandomToken();
 			$this->module->setSetting('MAJ_AT_FORCE_EXEC_TOKEN', $token);
 		}
@@ -106,7 +106,7 @@ 
                     processing: true,
                     serverSide : true,
 					ajax : {
-						url : "module.php?mod='.$this->module->getName().'&mod_action=AdminConfig@jsonTasksList&ged='. $WT_TREE->getNameUrl().'",
+						url : "module.php?mod='.$this->module->getName().'&mod_action=AdminConfig@jsonTasksList&ged='.$WT_TREE->getNameUrl().'",
                         type : "POST"
 					},
                     columns: [
@@ -143,14 +143,14 @@ 
                             url: "module.php", 
                             type: "GET",
                             data: {
-                			    mod: "' . $this->module->getName() .'",
+                			    mod: "' . $this->module->getName().'",
                                 mod_action:  "Task@setStatus",
                 			    task: task,
                                 status: status
                             },
                             error: function(result, stat, error) {
                                 var err = typeof result.responseJSON === "undefined" ? error : result.responseJSON.error;
-                                alert("' . I18N::translate('An error occured while editing this task:') . '" + err);
+                                alert("' . I18N::translate('An error occured while editing this task:').'" + err);
                             },
                             complete: function(result, stat) {
                                 adminTasksTable.ajax.reload(null, false);
@@ -187,14 +187,14 @@ 
     
         // Generate an AJAX/JSON response for datatables to load a block of rows
         $search = Filter::postArray('search');
-        if($search) $search = $search['value'];
+        if ($search) $search = $search['value'];
         $start  = Filter::postInteger('start');
         $length = Filter::postInteger('length');
         $order  = Filter::postArray('order');
     
 		$order_by_name = false;
-        foreach($order as $key => &$value) {
-            switch($value['column']) {
+        foreach ($order as $key => &$value) {
+            switch ($value['column']) {
                 case 3:
 					$order_by_name = true;
                     unset($order[$key]);
@@ -211,14 +211,14 @@ 
         }
     
         $list = $this->provider->getFilteredTasksList($search, $order, $start, $length);
-		if($order_by_name) {
+		if ($order_by_name) {
 			usort($list, function(AbstractTask $a, AbstractTask $b) { return I18N::strcasecmp($a->getTitle(), $b->getTitle()); });
 		}
         $recordsFiltered = count($list);
         $recordsTotal = $this->provider->getTasksCount();
     
         $data = array();
-        foreach($list as $task) {    
+        foreach ($list as $task) {    
             $datum = array();
 			
             $datum[0] = '
@@ -229,37 +229,34 @@ 
                     <ul class="dropdown-menu" role="menu">
                        <li>
                             <a href="#" onclick="return set_admintask_status(\''. $task->getName().'\', '.($task->isEnabled() ? 'false' : 'true').');">
-                                <i class="fa fa-fw '.($task->isEnabled() ? 'fa-times' : 'fa-check').'"></i> ' . ($task->isEnabled() ? I18N::translate('Disable') : I18N::translate('Enable')) . '
+                                <i class="fa fa-fw '.($task->isEnabled() ? 'fa-times' : 'fa-check').'"></i> '.($task->isEnabled() ? I18N::translate('Disable') : I18N::translate('Enable')).'
                             </a>
                        </li>
                         <li>
-                            <a href="module.php?mod='.$this->module->getName().'&mod_action=Task@edit&task='. $task->getName().'">
-                                <i class="fa fa-fw fa-pencil"></i> ' . I18N::translate('Edit') . '
+                            <a href="module.php?mod='.$this->module->getName().'&mod_action=Task@edit&task='.$task->getName().'">
+                                <i class="fa fa-fw fa-pencil"></i> ' . I18N::translate('Edit').'
                             </a>
                        </li>
                     </ul>
                 </div>';
             $datum[1] = $task->getName();
             $datum[2] = $task->isEnabled() ? 
-				'<i class="fa fa-check"></i><span class="sr-only">'.I18N::translate('Enabled').'</span>' : 
-				'<i class="fa fa-times"></i><span class="sr-only">'.I18N::translate('Disabled').'</span>';
+				'<i class="fa fa-check"></i><span class="sr-only">'.I18N::translate('Enabled').'</span>' : '<i class="fa fa-times"></i><span class="sr-only">'.I18N::translate('Disabled').'</span>';
             $datum[3] = $task->getTitle();
-            $date_format = str_replace('%', '', I18N::dateFormat()) . ' H:i:s';
+            $date_format = str_replace('%', '', I18N::dateFormat()).' H:i:s';
 			$datum[4] = $task->getLastUpdated()->format($date_format);
             $datum[5] = $task->isLastRunSuccess() ? 
-				'<i class="fa fa-check"></i><span class="sr-only">'.I18N::translate('Yes').'</span>' : 
-				'<i class="fa fa-times"></i><span class="sr-only">'.I18N::translate('No').'</span>';
+				'<i class="fa fa-check"></i><span class="sr-only">'.I18N::translate('Yes').'</span>' : '<i class="fa fa-times"></i><span class="sr-only">'.I18N::translate('No').'</span>';
             $dtF = new \DateTime('@0');
-            $dtT = new \DateTime('@' . ($task->getFrequency() * 60));            
+            $dtT = new \DateTime('@'.($task->getFrequency() * 60));            
             $datum[6] = $dtF->diff($dtT)->format(I18N::translate('%a d %h h %i m'));
 			$datum[7] = $task->getRemainingOccurrences() > 0 ? I18N::number($task->getRemainingOccurrences()) : I18N::translate('Unlimited');
 			$datum[8] = $task->isRunning() ? 
-				'<i class="fa fa-cog fa-spin fa-fw"></i><span class="sr-only">'.I18N::translate('Running').'</span>' : 
-				'<i class="fa fa-times"></i><span class="sr-only">'.I18N::translate('Not running').'</span>';
-			if($task->isEnabled() && !$task->isRunning()) {
+				'<i class="fa fa-cog fa-spin fa-fw"></i><span class="sr-only">'.I18N::translate('Running').'</span>' : '<i class="fa fa-times"></i><span class="sr-only">'.I18N::translate('Not running').'</span>';
+			if ($task->isEnabled() && !$task->isRunning()) {
 			    $datum[9] = '
-    			    <button id="bt_runtask_'. $task->getName() .'" class="btn btn-primary" href="#" onclick="return run_admintask(\''. $task->getName() .'\')">
-    			         <div id="bt_runtasktext_'. $task->getName() .'"><i class="fa fa-cog fa-fw" ></i>' . I18N::translate('Run') . '</div>
+    			    <button id="bt_runtask_'. $task->getName().'" class="btn btn-primary" href="#" onclick="return run_admintask(\''.$task->getName().'\')">
+    			         <div id="bt_runtasktext_'. $task->getName().'"><i class="fa fa-cog fa-fw" ></i>'.I18N::translate('Run').'</div>
     			    </button>';
 			}
 			else {

Braces +4 added lines, -3 removed lines

@@ -187,7 +187,9 @@ 
     
         // Generate an AJAX/JSON response for datatables to load a block of rows
         $search = Filter::postArray('search');
-        if($search) $search = $search['value'];
+        if($search) {
+        	$search = $search['value'];
+        }
         $start  = Filter::postInteger('start');
         $length = Filter::postInteger('length');
         $order  = Filter::postArray('order');
@@ -261,8 +263,7 @@ 
     			    <button id="bt_runtask_'. $task->getName() .'" class="btn btn-primary" href="#" onclick="return run_admintask(\''. $task->getName() .'\')">
     			         <div id="bt_runtasktext_'. $task->getName() .'"><i class="fa fa-cog fa-fw" ></i>' . I18N::translate('Run') . '</div>
     			    </button>';
-			}
-			else {
+			} else {
 			    $datum[9] = '';
 			}			    
 						

src/Webtrees/Module/AdminTasks/Views/TaskEditView.php

Spacing +1 added lines, -1 removed lines

@@ -104,7 +104,7 @@
     			</div>
     		</div>
 			
-			<?php if($task instanceof ConfigurableTaskInterface) { ?>
+			<?php if ($task instanceof ConfigurableTaskInterface) { ?>
 			
 			<h3><?php echo I18N::translate('Options for “%s”', $task->getTitle()); ?></h3>
 			

src/Webtrees/Module/AdminTasks/Views/AdminConfigView.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
 			<?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'); ?>
 		</p>
 		<p>
-			<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>
+			<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>
 		</p>
 		<p>
 			<button id="bt_genforcetoken" class="bt bt-primary" onClick="generate_force_token();">

src/Webtrees/Module/Sosa/SosaConfigController.php

Spacing +16 added lines, -16 removed lines

@@ -40,7 +40,7 @@ 
         $user_id = Filter::postInteger('userid', -1) ?: Filter::getInteger('userid', -1);
         return Auth::check() && 
             ( 
-                $user_id == Auth::user()->getUserId() ||        // Allow update for yourself
+                $user_id == Auth::user()->getUserId() || // Allow update for yourself
                 ($user_id == -1 && Auth::isManager($WT_TREE))   // Allow a manager to update the default user
              );
     }
@@ -53,12 +53,12 @@ 
      */
     protected function update(BaseController $controller) {
         global $WT_TREE;          
-        if($this->canUpdate() && Filter::checkCsrf()) 
+        if ($this->canUpdate() && Filter::checkCsrf()) 
         {            
             $indi = Individual::getInstance(Filter::post('rootid'), $WT_TREE);
             $user = User::find(Filter::postInteger('userid', -1));
             
-            if($user  && $indi) {
+            if ($user && $indi) {
                 $WT_TREE->setUserPreference($user, 'MAJ_SOSA_ROOT_ID', $indi->getXref());
                 $controller->addInlineJavascript('
                     $( document ).ready(function() {
@@ -97,7 +97,7 @@ 
             
             function majComputeSosa(user_id) {
                 jQuery("#bt_sosa_compute").prop( "disabled", true );
-                jQuery("#bt_sosa_computing").empty().html("<i class=\"icon-loading-small\"></i>&nbsp;'. I18N::translate('Computing...') .'");
+                jQuery("#bt_sosa_computing").empty().html("<i class=\"icon-loading-small\"></i>&nbsp;'. I18N::translate('Computing...').'");
                 jQuery("#bt_sosa_computing").load(
 		          "module.php?mod='.$this->module->getName().'&mod_action=SosaConfig@computeAll&ged='.$WT_TREE->getNameUrl().'&userid=" + user_id,
 		          function() {
@@ -106,7 +106,7 @@ 
             }');
         
         $action = Filter::post('action');
-        if($action === 'update') $this->update($controller);
+        if ($action === 'update') $this->update($controller);
         
         $view_bag = new ViewBag();
         $view_bag->set('title', $controller->getPageTitle());
@@ -115,21 +115,21 @@ 
         
         $users_root = array();
         $users_js_array = 'var users_array = [];';
-        if(Auth::check()) {
+        if (Auth::check()) {
             $root_id = $WT_TREE->getUserPreference(Auth::user(), 'MAJ_SOSA_ROOT_ID');
-            $users_root[] = array( 'user' => Auth::user(), 'rootid' => $root_id);
-            $users_js_array .=  'users_array["'.Auth::user()->getUserId().'"] = "' . $root_id . '";';
+            $users_root[] = array('user' => Auth::user(), 'rootid' => $root_id);
+            $users_js_array .= 'users_array["'.Auth::user()->getUserId().'"] = "'.$root_id.'";';
             
-            if(Auth::isManager($WT_TREE)) {
+            if (Auth::isManager($WT_TREE)) {
                 $default_user = User::find(-1);
                 $default_root_id = $WT_TREE->getUserPreference($default_user, 'MAJ_SOSA_ROOT_ID');
-                $users_root[] = array( 'user' => $default_user, 'rootid' => $default_root_id);
-                $users_js_array .=  'users_array["'.$default_user->getUserId().'"] = "' . $default_root_id . '";';
+                $users_root[] = array('user' => $default_user, 'rootid' => $default_root_id);
+                $users_js_array .= 'users_array["'.$default_user->getUserId().'"] = "'.$default_root_id.'";';
             }
         }
         $view_bag->set('users_settings', $users_root);       
         
-        $controller->addInlineJavascript($users_js_array . '            
+        $controller->addInlineJavascript($users_js_array.'            
                 $("#maj-sosa-config-select").change(function() {
                     $("#rootid").val(users_array[this.value]);
                 });
@@ -151,9 +151,9 @@ 
         $view_bag->set('is_success', false);
         
         $user = User::find(Filter::getInteger('userid', -1));
-        if($user) {
+        if ($user) {
             $calculator = new SosaCalculator($WT_TREE, $user);
-            if($calculator->computeAll()) $view_bag->set('is_success', true);
+            if ($calculator->computeAll()) $view_bag->set('is_success', true);
         }
         ViewFactory::make('SosaComputeResult', $this, $controller, $view_bag)->render();
     }
@@ -173,9 +173,9 @@ 
         $user = User::find(Filter::getInteger('userid', -1));
         $indi = Individual::getInstance(Filter::get('pid', WT_REGEX_XREF), $WT_TREE);
         
-        if($user && $indi) {
+        if ($user && $indi) {
             $calculator = new SosaCalculator($WT_TREE, $user);
-            if($calculator->computeFromIndividual($indi)) $view_bag->set('is_success', true);
+            if ($calculator->computeFromIndividual($indi)) $view_bag->set('is_success', true);
         }
         else {
             $view_bag->set('error', I18N::translate('Non existing individual'));

Braces +10 added lines, -5 removed lines

@@ -106,7 +106,9 @@ 
             }');
         
         $action = Filter::post('action');
-        if($action === 'update') $this->update($controller);
+        if($action === 'update') {
+        	$this->update($controller);
+        }
         
         $view_bag = new ViewBag();
         $view_bag->set('title', $controller->getPageTitle());
@@ -153,7 +155,9 @@ 
         $user = User::find(Filter::getInteger('userid', -1));
         if($user) {
             $calculator = new SosaCalculator($WT_TREE, $user);
-            if($calculator->computeAll()) $view_bag->set('is_success', true);
+            if($calculator->computeAll()) {
+            	$view_bag->set('is_success', true);
+            }
         }
         ViewFactory::make('SosaComputeResult', $this, $controller, $view_bag)->render();
     }
@@ -175,9 +179,10 @@ 
         
         if($user && $indi) {
             $calculator = new SosaCalculator($WT_TREE, $user);
-            if($calculator->computeFromIndividual($indi)) $view_bag->set('is_success', true);
-        }
-        else {
+            if($calculator->computeFromIndividual($indi)) {
+            	$view_bag->set('is_success', true);
+            }
+        } else {
             $view_bag->set('error', I18N::translate('Non existing individual'));
         }