@@ -1717,7 +1717,7 @@ |
||
| 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) { |
@@ -85,8 +85,7 @@ |
||
| 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 | [ |
@@ -103,20 +103,20 @@ |
||
| 103 | 103 | case 'sendmail': |
| 104 | 104 | return Swift_SendmailTransport::newInstance(); |
| 105 | 105 | case 'external': |
| 106 | - $transport = Swift_SmtpTransport::newInstance() |
|
| 107 | - ->setHost(Site::getPreference('SMTP_HOST')) |
|
| 108 | - ->setPort(Site::getPreference('SMTP_PORT')) |
|
| 109 | - ->setLocalDomain(Site::getPreference('SMTP_HELO')); |
|
| 106 | + $transport = Swift_SmtpTransport::newInstance() |
|
| 107 | + ->setHost(Site::getPreference('SMTP_HOST')) |
|
| 108 | + ->setPort(Site::getPreference('SMTP_PORT')) |
|
| 109 | + ->setLocalDomain(Site::getPreference('SMTP_HELO')); |
|
| 110 | 110 | |
| 111 | - if (Site::getPreference('SMTP_AUTH')) { |
|
| 112 | - $transport |
|
| 113 | - ->setUsername(Site::getPreference('SMTP_AUTH_USER')) |
|
| 114 | - ->setPassword(Site::getPreference('SMTP_AUTH_PASS')); |
|
| 115 | - } |
|
| 111 | + if (Site::getPreference('SMTP_AUTH')) { |
|
| 112 | + $transport |
|
| 113 | + ->setUsername(Site::getPreference('SMTP_AUTH_USER')) |
|
| 114 | + ->setPassword(Site::getPreference('SMTP_AUTH_PASS')); |
|
| 115 | + } |
|
| 116 | 116 | |
| 117 | - if (Site::getPreference('SMTP_SSL') !== 'none') { |
|
| 118 | - $transport->setEncryption(Site::getPreference('SMTP_SSL')); |
|
| 119 | - } |
|
| 117 | + if (Site::getPreference('SMTP_SSL') !== 'none') { |
|
| 118 | + $transport->setEncryption(Site::getPreference('SMTP_SSL')); |
|
| 119 | + } |
|
| 120 | 120 | |
| 121 | 121 | return $transport; |
| 122 | 122 | default: |
@@ -343,7 +343,7 @@ discard block |
||
| 343 | 343 | // Check the script used by each name, so we can match cyrillic with cyrillic, greek with greek, etc. |
| 344 | 344 | $husb_names = []; |
| 345 | 345 | if ($this->husb) { |
| 346 | - $husb_names = array_filter($this->husb->getAllNames(), function(array $x) { return $x['type'] !== '_MARNM'; } ); |
|
| 346 | + $husb_names = array_filter($this->husb->getAllNames(), function (array $x) { return $x['type'] !== '_MARNM'; } ); |
|
| 347 | 347 | } |
| 348 | 348 | // If the individual only has married names, create a dummy birth name. |
| 349 | 349 | if (empty($husb_names)) { |
@@ -359,7 +359,7 @@ discard block |
||
| 359 | 359 | |
| 360 | 360 | $wife_names = []; |
| 361 | 361 | if ($this->wife) { |
| 362 | - $wife_names = array_filter($this->wife->getAllNames(), function(array $x) { return $x['type'] !== '_MARNM'; } ); |
|
| 362 | + $wife_names = array_filter($this->wife->getAllNames(), function (array $x) { return $x['type'] !== '_MARNM'; } ); |
|
| 363 | 363 | } |
| 364 | 364 | // If the individual only has married names, create a dummy birth name. |
| 365 | 365 | if (empty($wife_names)) { |