Completed
Push — develop ( 2c55ba...13abd6 )
by Greg
08:38
created
app/Database.php 1 patch
Spacing   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -85,8 +85,7 @@
 block discarded – undo
85 85
 		// Create the underlying PDO object
86 86
 		self::$pdo = new PDO(
87 87
 			(substr($DBHOST, 0, 1) === '/' ?
88
-				"mysql:unix_socket={$DBHOST};dbname={$DBNAME}" :
89
-				"mysql:host={$DBHOST};dbname={$DBNAME};port={$DBPORT}"
88
+				"mysql:unix_socket={$DBHOST};dbname={$DBNAME}" : "mysql:host={$DBHOST};dbname={$DBNAME};port={$DBPORT}"
90 89
 			),
91 90
 			$DBUSER, $DBPASS,
92 91
 			array(
Please login to merge, or discard this patch.
app/Report/ReportParserGenerate.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2743,7 +2743,7 @@
 block discarded – undo
2743 2743
 		$tags      = explode(':', $tag);
2744 2744
 		$origlevel = $level;
2745 2745
 		if ($level == 0) {
2746
-			$level = $gedrec{0} + 1;
2746
+			$level = $gedrec{0} +1;
2747 2747
 		}
2748 2748
 
2749 2749
 		$subrec = $gedrec;
Please login to merge, or discard this patch.
app/GedcomCode/GedcomCodeTemp.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -57,14 +57,14 @@
 block discarded – undo
57 57
 			'MADRI', 'MANAU', 'MANHA', 'MANIL', 'MANTI', 'MEDFO', 'MELBO', 'MEMPH',
58 58
 			'MERID', 'MEXIC', 'MNTVD', 'MONTE', 'MONTI', 'MONTR', 'MTIMP', 'NASHV',
59 59
 			'NAUV2', 'NAUVO', 'NBEAC', 'NUKUA', 'NYORK', 'NZEAL', 'OAKLA', 'OAXAC',
60
-			'OGDEN', 'OKLAH',	'OQUIR', 'ORLAN', 'PALEG', 'PALMY', 'PANAM', 'PAPEE',
61
-			'PAYSO', 'PERTH',	'PHOEN', 'POFFI', 'PORTL', 'PREST', 'PROCC', 'PROVO',
60
+			'OGDEN', 'OKLAH', 'OQUIR', 'ORLAN', 'PALEG', 'PALMY', 'PANAM', 'PAPEE',
61
+			'PAYSO', 'PERTH', 'PHOEN', 'POFFI', 'PORTL', 'PREST', 'PROCC', 'PROVO',
62 62
 			'QUETZ', 'RALEI', 'RECIF', 'REDLA', 'REGIN', 'RENO', 'REXBU', 'SACRA',
63
-			'SAMOA', 'SANTI',	'SANSA', 'SANTO', 'SDIEG', 'SDOMI', 'SEATT', 'SEOUL',
64
-			'SGEOR', 'SJOSE',	'SLAKE', 'SLOUI', 'SNOWF','SPAUL', 'SPMIN', 'SPOKA',
63
+			'SAMOA', 'SANTI', 'SANSA', 'SANTO', 'SDIEG', 'SDOMI', 'SEATT', 'SEOUL',
64
+			'SGEOR', 'SJOSE', 'SLAKE', 'SLOUI', 'SNOWF', 'SPAUL', 'SPMIN', 'SPOKA',
65 65
 			'STOCK', 'SUVA', 'SWISS', 'SYDNE', 'TAIPE', 'TAMPI', 'TEGUC', 'TGUTI',
66
-			'TIHUA', 'TOKYO',	'TORNO', 'TRUJI', 'TWINF', 'VANCO', 'VERAC', 'VERNA',
67
-			'VILLA', 'WASHI',	'WINTE',
66
+			'TIHUA', 'TOKYO', 'TORNO', 'TRUJI', 'TWINF', 'VANCO', 'VERAC', 'VERNA',
67
+			'VILLA', 'WASHI', 'WINTE',
68 68
 		);
69 69
 	}
70 70
 
Please login to merge, or discard this patch.
app/Mail.php 1 patch
Indentation   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -45,15 +45,15 @@  discard block
 block discarded – undo
45 45
 	 */
46 46
 	public static function send(Tree $tree, $to_email, $to_name, $replyto_email, $replyto_name, $subject, $message) {
47 47
 		try {
48
-		    $mail = Swift_Message::newInstance()
49
-                ->setSubject($subject)
50
-                ->setFrom(Site::getPreference('SMTP_FROM_NAME'), $tree->getPreference('title'))
51
-                ->setTo($to_email, $to_name)
52
-                ->setReplyTo($replyto_email, $replyto_name)
53
-                ->setBody($message, 'text/html')
54
-                ->addPart(Filter::unescapeHtml($message), 'text/plain');
48
+				$mail = Swift_Message::newInstance()
49
+								->setSubject($subject)
50
+								->setFrom(Site::getPreference('SMTP_FROM_NAME'), $tree->getPreference('title'))
51
+								->setTo($to_email, $to_name)
52
+								->setReplyTo($replyto_email, $replyto_name)
53
+								->setBody($message, 'text/html')
54
+								->addPart(Filter::unescapeHtml($message), 'text/plain');
55 55
 		    
56
-            Swift_Mailer::newInstance(self::transport())->send($mail);
56
+						Swift_Mailer::newInstance(self::transport())->send($mail);
57 57
 		} catch (Exception $ex) {
58 58
 			Log::addErrorLog('Mail: ' . $ex->getMessage());
59 59
 
@@ -93,20 +93,20 @@  discard block
 block discarded – undo
93 93
 		case 'internal':
94 94
 			return Swift_MailTransport::newInstance();
95 95
 		case 'external':
96
-            $transport = Swift_SmtpTransport::newInstance()
97
-                ->setHost(Site::getPreference('SMTP_HOST'))
98
-                ->setPort(Site::getPreference('SMTP_PORT'))
99
-                ->setLocalDomain(Site::getPreference('SMTP_HELO'));
96
+						$transport = Swift_SmtpTransport::newInstance()
97
+								->setHost(Site::getPreference('SMTP_HOST'))
98
+								->setPort(Site::getPreference('SMTP_PORT'))
99
+								->setLocalDomain(Site::getPreference('SMTP_HELO'));
100 100
             
101
-            if (Site::getPreference('SMTP_AUTH')) {
102
-                $transport
103
-                    ->setUsername(Site::getPreference('SMTP_AUTH_USER'))
104
-                    ->setPassword(Site::getPreference('SMTP_AUTH_PASS'));
105
-            }
101
+						if (Site::getPreference('SMTP_AUTH')) {
102
+								$transport
103
+										->setUsername(Site::getPreference('SMTP_AUTH_USER'))
104
+										->setPassword(Site::getPreference('SMTP_AUTH_PASS'));
105
+						}
106 106
             
107
-            if (Site::getPreference('SMTP_SSL') !== 'none') {
108
-                $transport->setEncryption(Site::getPreference('SMTP_SSL'));
109
-            }
107
+						if (Site::getPreference('SMTP_SSL') !== 'none') {
108
+								$transport->setEncryption(Site::getPreference('SMTP_SSL'));
109
+						}
110 110
 			
111 111
 			return $transport;
112 112
 		default:
Please login to merge, or discard this patch.
edituser.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@
 block discarded – undo
44 44
 $form_pass2          = Filter::post('form_pass2', WT_REGEX_PASSWORD);
45 45
 $form_email          = Filter::postEmail('form_email');
46 46
 $form_rootid         = Filter::post('form_rootid', WT_REGEX_XREF);
47
-$form_theme          = Filter::post('form_theme', implode('|', array_keys(Theme::themeNames())), '');;
47
+$form_theme          = Filter::post('form_theme', implode('|', array_keys(Theme::themeNames())), ''); ;
48 48
 $form_language       = Filter::post('form_language');
49 49
 $form_timezone       = Filter::post('form_timezone');
50 50
 $form_contact_method = Filter::post('form_contact_method');
Please login to merge, or discard this patch.
app/Functions/FunctionsPrintLists.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1717,7 +1717,7 @@
 block discarded – undo
1717 1717
 					if ($endjd === $startjd) {
1718 1718
 						$html .= I18N::translate('No events exist for tomorrow.');
1719 1719
 					} else {
1720
-						$html .=  /* I18N: translation for %s==1 is unused; it is translated separately as “tomorrow” */ I18N::plural('No events exist for the next %s day.', 'No events exist for the next %s days.', $endjd - $startjd + 1, I18N::number($endjd - $startjd + 1));
1720
+						$html .= /* I18N: translation for %s==1 is unused; it is translated separately as “tomorrow” */ I18N::plural('No events exist for the next %s day.', 'No events exist for the next %s days.', $endjd - $startjd + 1, I18N::number($endjd - $startjd + 1));
1721 1721
 					}
1722 1722
 				} else {
1723 1723
 					if ($endjd === $startjd) {
Please login to merge, or discard this patch.