jon48 / webtrees-lib

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

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/Schema/Migration0.php

Spacing +2 added lines, -2 removed lines

@@ -28,8 +28,8 @@
 		    ' majat_name 		    VARCHAR(32)                      NOT NULL,'.
 		    ' majat_status          ENUM(\'enabled\',\'disabled\') 	 NOT NULL DEFAULT \'disabled\','.
 		    ' majat_last_run 		DATETIME 					     NOT NULL DEFAULT \'2000-01-01 00:00:00\','.
-		    ' majat_last_result 	TINYINT(1)					     NOT NULL DEFAULT 1,'.		// 0 means error, 1 is success
-		    ' majat_frequency		INTEGER						     NOT NULL DEFAULT 10080,'.	// In min, Default every week
+		    ' majat_last_result 	TINYINT(1)					     NOT NULL DEFAULT 1,'.// 0 means error, 1 is success
+		    ' majat_frequency		INTEGER						     NOT NULL DEFAULT 10080,'.// In min, Default every week
 		    ' majat_nb_occur	 	SMALLINT					     NOT NULL DEFAULT 0,'.
 		    ' majat_running 		TINYINT(1)					     NOT NULL DEFAULT 0,'.
 		    ' PRIMARY KEY (majat_name)'.