@@ -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 | array( |
@@ -2743,7 +2743,7 @@ |
||
| 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; |
@@ -57,14 +57,14 @@ |
||
| 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 | |
@@ -37,15 +37,15 @@ discard block |
||
| 37 | 37 | */ |
| 38 | 38 | public static function send(Tree $tree, $to_email, $to_name, $replyto_email, $replyto_name, $subject, $message) { |
| 39 | 39 | try { |
| 40 | - $mail = \Swift_Message::newInstance() |
|
| 41 | - ->setSubject($subject) |
|
| 42 | - ->setFrom(Site::getPreference('SMTP_FROM_NAME'), $tree->getPreference('title')) |
|
| 43 | - ->setTo($to_email, $to_name) |
|
| 44 | - ->setReplyTo($replyto_email, $replyto_name) |
|
| 45 | - ->setBody($message, 'text/html') |
|
| 46 | - ->addPart(Filter::unescapeHtml($message), 'text/plain'); |
|
| 40 | + $mail = \Swift_Message::newInstance() |
|
| 41 | + ->setSubject($subject) |
|
| 42 | + ->setFrom(Site::getPreference('SMTP_FROM_NAME'), $tree->getPreference('title')) |
|
| 43 | + ->setTo($to_email, $to_name) |
|
| 44 | + ->setReplyTo($replyto_email, $replyto_name) |
|
| 45 | + ->setBody($message, 'text/html') |
|
| 46 | + ->addPart(Filter::unescapeHtml($message), 'text/plain'); |
|
| 47 | 47 | |
| 48 | - \Swift_Mailer::newInstance(self::transport())->send($mail); |
|
| 48 | + \Swift_Mailer::newInstance(self::transport())->send($mail); |
|
| 49 | 49 | } catch (\Exception $ex) { |
| 50 | 50 | Log::addErrorLog('Mail: ' . $ex->getMessage()); |
| 51 | 51 | |
@@ -85,20 +85,20 @@ discard block |
||
| 85 | 85 | case 'internal': |
| 86 | 86 | return \Swift_MailTransport::newInstance(); |
| 87 | 87 | case 'external': |
| 88 | - $transport = \Swift_SmtpTransport::newInstance() |
|
| 89 | - ->setHost(Site::getPreference('SMTP_HOST')) |
|
| 90 | - ->setPort(Site::getPreference('SMTP_PORT')) |
|
| 91 | - ->setLocalDomain(Site::getPreference('SMTP_HELO')); |
|
| 88 | + $transport = \Swift_SmtpTransport::newInstance() |
|
| 89 | + ->setHost(Site::getPreference('SMTP_HOST')) |
|
| 90 | + ->setPort(Site::getPreference('SMTP_PORT')) |
|
| 91 | + ->setLocalDomain(Site::getPreference('SMTP_HELO')); |
|
| 92 | 92 | |
| 93 | - if (Site::getPreference('SMTP_AUTH')) { |
|
| 94 | - $transport |
|
| 95 | - ->setUsername(Site::getPreference('SMTP_AUTH_USER')) |
|
| 96 | - ->setPassword(Site::getPreference('SMTP_AUTH_PASS')); |
|
| 97 | - } |
|
| 93 | + if (Site::getPreference('SMTP_AUTH')) { |
|
| 94 | + $transport |
|
| 95 | + ->setUsername(Site::getPreference('SMTP_AUTH_USER')) |
|
| 96 | + ->setPassword(Site::getPreference('SMTP_AUTH_PASS')); |
|
| 97 | + } |
|
| 98 | 98 | |
| 99 | - if (Site::getPreference('SMTP_SSL') !== 'none') { |
|
| 100 | - $transport->setEncryption(Site::getPreference('SMTP_SSL')); |
|
| 101 | - } |
|
| 99 | + if (Site::getPreference('SMTP_SSL') !== 'none') { |
|
| 100 | + $transport->setEncryption(Site::getPreference('SMTP_SSL')); |
|
| 101 | + } |
|
| 102 | 102 | |
| 103 | 103 | return $transport; |
| 104 | 104 | default: |