Fix autoloader bug, and properly set up SMTP when debug mode is disabled

master
Sven Slootweg 11 years ago
parent 7767b76277
commit 4edf737869

@ -32,7 +32,7 @@ function autoload_redonate($class_name)
} }
} }
spl_autoload_register(autoload_redonate); spl_autoload_register('autoload_redonate');
/* Set global templater variables */ /* Set global templater variables */
NewTemplater::SetGlobalVariable("logged-in", !empty($_SESSION['user_id'])); NewTemplater::SetGlobalVariable("logged-in", !empty($_SESSION['user_id']));
@ -101,6 +101,14 @@ function flash_notice($message)
$_SESSION['notices'][] = $message; $_SESSION['notices'][] = $message;
} }
if($cphp_config->debugmode === false)
{
$smtp = Swift_SmtpTransport::newInstance($cphp_config->smtp->host, $cphp_config->smtp->port)
->setUsername($cphp_config->smtp->user)->setPassword($cphp_config->smtp->pass);
$mail_transport = Swift_Mailer::newInstance($smtp);
}
function send_mail($to, $subject, $text, $html) function send_mail($to, $subject, $text, $html)
{ {
global $mail_transport, $cphp_config; global $mail_transport, $cphp_config;
@ -111,21 +119,26 @@ function send_mail($to, $subject, $text, $html)
$sMessage->setBody($text); $sMessage->setBody($text);
$sMessage->addPart($html, "text/html"); $sMessage->addPart($html, "text/html");
echo("<div style=\"border: 1px solid black; padding: 8px; background-color: white; margin: 8px; margin-bottom: 24px;\"> if($cphp_config->debugmode)
<div style=\"font-size: 14px;\"> {
<strong>From:</strong> {$cphp_config->smtp->from}<br> echo("<div style=\"border: 1px solid black; padding: 8px; background-color: white; margin: 8px; margin-bottom: 24px;\">
<strong>To:</strong> {$to}<br> <div style=\"font-size: 14px;\">
<strong>Subject:</strong> {$subject} <strong>From:</strong> {$cphp_config->smtp->from}<br>
</div> <strong>To:</strong> {$to}<br>
<hr> <strong>Subject:</strong> {$subject}
<pre class=\"debug\">{$text}</pre> </div>
<hr> <hr>
<div> <pre class=\"debug\">{$text}</pre>
{$html} <hr>
</div> <div>
</div>"); {$html}
</div>
//$mail_transport->send($sMessage); </div>");
}
else
{
$mail_transport->send($sMessage);
}
} }
function generate_urlname($input, $iteration) function generate_urlname($input, $iteration)

Loading…
Cancel
Save