Completed
Push — develop ( 0b9305...5676bf )
by Greg
09:41
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/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.
medialist.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -109,7 +109,7 @@
 block discarded – undo
109 109
 						</option>
110 110
 					</select>
111 111
 				</td>
112
-				<?php else: ?>
112
+				<?php else : ?>
113 113
 					<td class="descriptionbox wrap"></td>
114 114
 					<td class="optionbox wrap"></td>
115 115
 				<?php endif ?>
Please login to merge, or discard this patch.
app/Theme/ColorsTheme.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@
 block discarded – undo
49 49
 	protected function formatSecondaryMenu() {
50 50
 		return
51 51
 			'<ul class="secondary-menu">' .
52
-			implode('', array_map(function(Menu $menu) { return $this->formatSecondaryMenuItem($menu); }, $this->secondaryMenu())) .
52
+			implode('', array_map(function (Menu $menu) { return $this->formatSecondaryMenuItem($menu); }, $this->secondaryMenu())) .
53 53
 			'<li>' .
54 54
 			$this->formQuickSearch() .
55 55
 			'</li>' .
Please login to merge, or discard this patch.
app/Module/BatchUpdate/BatchUpdateBasePlugin.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -148,7 +148,7 @@
 block discarded – undo
148 148
 	public static function createEditLinks($gedrec, GedcomRecord $record) {
149 149
 		return preg_replace(
150 150
 			"/@([^#@\n]+)@/m",
151
-			'<a href="edit_interface.php?action=editraw&amp;ged=' . $record->getTree()->getNameHtml() . '&amp;xref=' . $record->getXref() .'">@\\1@</a>',
151
+			'<a href="edit_interface.php?action=editraw&amp;ged=' . $record->getTree()->getNameHtml() . '&amp;xref=' . $record->getXref() . '">@\\1@</a>',
152 152
 			$gedrec
153 153
 		);
154 154
 	}
Please login to merge, or discard this patch.
app/Functions/FunctionsPrintLists.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1089,7 +1089,7 @@  discard block
 block discarded – undo
1089 1089
 			"SELECT CONCAT(l_to, '@', l_file), COUNT(*) FROM `##sources` JOIN `##link` ON l_from = s_id AND l_file = s_file AND l_type = 'NOTE' GROUP BY l_to, l_file"
1090 1090
 		)->fetchAssoc();
1091 1091
 
1092
-		$html     = '';
1092
+		$html = '';
1093 1093
 		$html .= '<table ' . Datatables::noteTableAttributes() . '><thead><tr>';
1094 1094
 		$html .= '<th>' . I18N::translate('Title') . '</th>';
1095 1095
 		$html .= '<th>' . I18N::translate('Individuals') . '</th>';
@@ -1155,7 +1155,7 @@  discard block
 block discarded – undo
1155 1155
 		)->fetchAssoc();
1156 1156
 
1157 1157
 		$html = '';
1158
-		$html .= '<table ' . Datatables::repositoryTableAttributes() . '"><thead><tr>';		$html .= '<th>' . I18N::translate('Repository name') . '</th>';
1158
+		$html .= '<table ' . Datatables::repositoryTableAttributes() . '"><thead><tr>'; $html .= '<th>' . I18N::translate('Repository name') . '</th>';
1159 1159
 		$html .= '<th>' . I18N::translate('Sources') . '</th>';
1160 1160
 		$html .= '<th>' . I18N::translate('Last change') . '</th>';
1161 1161
 		$html .= '<th>' . I18N::translate('Delete') . '</th>';
@@ -1585,7 +1585,7 @@  discard block
 block discarded – undo
1585 1585
 					if ($endjd === $startjd) {
1586 1586
 						$html .= I18N::translate('No events exist for tomorrow.');
1587 1587
 					} else {
1588
-						$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));
1588
+						$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));
1589 1589
 					}
1590 1590
 				} else {
1591 1591
 					if ($endjd === $startjd) {
Please login to merge, or discard this patch.
app/Datatables.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -64,7 +64,7 @@
 block discarded – undo
64 64
 
65 65
 		return [
66 66
 			'data-language'    => json_encode($language),
67
-		  'data-length-menu' => json_encode([array_keys($length_menu), array_values($length_menu)])
67
+			'data-length-menu' => json_encode([array_keys($length_menu), array_values($length_menu)])
68 68
 		];
69 69
 	}
70 70
 
Please login to merge, or discard this patch.
app/Theme/AbstractTheme.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -765,7 +765,7 @@  discard block
 block discarded – undo
765 765
 				'<div class="noprint icons">' .
766 766
 				'<span class="iconz icon-zoomin" title="' . I18N::translate('Zoom in/out on this box.') . '"></span>' .
767 767
 				'<div class="itr"><i class="icon-pedigree"></i><div class="popup">' .
768
-				'<ul class="' . $personBoxClass . '">' . implode('', array_map(function(Menu $menu) { return $menu->bootstrap4(); }, $this->individualBoxMenu($individual))) . '</ul>' .
768
+				'<ul class="' . $personBoxClass . '">' . implode('', array_map(function (Menu $menu) { return $menu->bootstrap4(); }, $this->individualBoxMenu($individual))) . '</ul>' .
769 769
 				'</div>' .
770 770
 				'</div>' .
771 771
 				'</div>';
@@ -817,7 +817,7 @@  discard block
 block discarded – undo
817 817
 				'<div class="noprint icons">' .
818 818
 				'<span class="iconz icon-zoomin" title="' . I18N::translate('Zoom in/out on this box.') . '"></span>' .
819 819
 				'<div class="itr"><i class="icon-pedigree"></i><div class="popup">' .
820
-				'<ul class="' . $personBoxClass . '">' . implode('', array_map(function(Menu $menu) { return $menu->bootstrap4(); }, $this->individualBoxMenu($individual))) . '</ul>' .
820
+				'<ul class="' . $personBoxClass . '">' . implode('', array_map(function (Menu $menu) { return $menu->bootstrap4(); }, $this->individualBoxMenu($individual))) . '</ul>' .
821 821
 				'</div>' .
822 822
 				'</div>' .
823 823
 				'</div>';
Please login to merge, or discard this patch.
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -90,9 +90,9 @@
 block discarded – undo
90 90
 		'info'    => 'fa fa-info-circle',
91 91
 		'warning' => 'fa fa-exclamation-circle',
92 92
 
93
-	  // Icons for file types
94
-	  'mime-application-pdf' => '',
95
-	  'mime-text-html'       => '',
93
+		// Icons for file types
94
+		'mime-application-pdf' => '',
95
+		'mime-text-html'       => '',
96 96
 
97 97
 		// Other icons
98 98
 		'mail'    => 'fa fa-envelope-o',
Please login to merge, or discard this patch.
individual.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -89,7 +89,7 @@
 block discarded – undo
89 89
 if (Auth::isAdmin()) {
90 90
 	$user = User::findByGenealogyRecord($controller->record);
91 91
 	if ($user) {
92
-		$user_link =  ' —  <a href="admin_users.php?filter=' . Filter::escapeHtml($user->getUserName()) . '">' . Filter::escapeHtml($user->getUserName()) . '</a>';
92
+		$user_link = ' —  <a href="admin_users.php?filter=' . Filter::escapeHtml($user->getUserName()) . '">' . Filter::escapeHtml($user->getUserName()) . '</a>';
93 93
 	};
94 94
 }
95 95
 
Please login to merge, or discard this patch.