projects
/
mailer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7f36841
)
Charset is now passed to PHPMailer, setOutputMode() does now cast to int, output...
author
Roland Häder
<roland@mxchange.org>
Sun, 1 Nov 2009 15:23:33 +0000
(15:23 +0000)
committer
Roland Häder
<roland@mxchange.org>
Sun, 1 Nov 2009 15:23:33 +0000
(15:23 +0000)
inc/classes/rdf.class.php
patch
|
blob
|
history
inc/functions.php
patch
|
blob
|
history
inc/libs/html_mail_functions.php
patch
|
blob
|
history
inc/libs/yoomedia_functions.php
patch
|
blob
|
history
inc/mysql-connect.php
patch
|
blob
|
history
inc/wrapper-functions.php
patch
|
blob
|
history
diff --git
a/inc/classes/rdf.class.php
b/inc/classes/rdf.class.php
index 7ab88f773e80ae0858c33106e54439313899b38f..dc1e85ca4539de1b62d62ab0fb0e8f5d12e5ebd8 100644
(file)
--- a/
inc/classes/rdf.class.php
+++ b/
inc/classes/rdf.class.php
@@
-845,7
+845,7
@@
class fase4_rdf {
* @access public
* @author Stefan Saasen <s@fase4.com>
* @return array
* @access public
* @author Stefan Saasen <s@fase4.com>
* @return array
- * @see
_array_item
+ * @see _array_item
*/
function get_array_item( )
{
*/
function get_array_item( )
{
@@
-858,7
+858,7
@@
class fase4_rdf {
* @access public
* @author Stefan Saasen <s@fase4.com>
* @return array
* @access public
* @author Stefan Saasen <s@fase4.com>
* @return array
- * @see
_array_textinput
+ * @see _array_textinput
*/
function get_array_textinput( )
{
*/
function get_array_textinput( )
{
@@
-868,9
+868,9
@@
class fase4_rdf {
/**
* Getter for parser id from resource
*
/**
* Getter for parser id from resource
*
- * @access private
- * @author
Roland Haeder <webmaster@mxchange.org>
- * @return
int
+ * @access
private
+ * @author Roland Haeder <webmaster@mxchange.org>
+ * @return int
*/
function get_parser_id ($parser) {
// Default is zero
*/
function get_parser_id ($parser) {
// Default is zero
@@
-892,7
+892,7
@@
class fase4_rdf {
* @access public
* @author Stefan Saasen <s@fase4.com>
* @return array
* @access public
* @author Stefan Saasen <s@fase4.com>
* @return array
- * @see
_array_image
+ * @see _array_image
*/
function get_array_image( )
{
*/
function get_array_image( )
{
diff --git
a/inc/functions.php
b/inc/functions.php
index 6cb2c7e5645fbf46cb4cedffd99011a4198e7f99..21938e565e2ac5a512350e0895d0abcc89252f25 100644
(file)
--- a/
inc/functions.php
+++ b/
inc/functions.php
@@
-353,7
+353,7
@@
function loadTemplate ($template, $return=false, $content=array()) {
$ret = '';
if ((strpos($GLOBALS['tpl_content'], '$') !== false) || (strpos($GLOBALS['tpl_content'], '{--') !== false) || (strpos($GLOBALS['tpl_content'], '{!') !== false) || (strpos($GLOBALS['tpl_content'], '{?') !== false)) {
// Normal HTML output?
$ret = '';
if ((strpos($GLOBALS['tpl_content'], '$') !== false) || (strpos($GLOBALS['tpl_content'], '{--') !== false) || (strpos($GLOBALS['tpl_content'], '{!') !== false) || (strpos($GLOBALS['tpl_content'], '{?') !== false)) {
// Normal HTML output?
- if (
$GLOBALS['output_mode']
== 0) {
+ if (
getOutputMode()
== 0) {
// Add surrounding HTML comments to help finding bugs faster
$ret = "<!-- Template " . $template . " - Start -->\n" . $GLOBALS['tpl_content'] . "<!-- Template " . $template . " - End -->\n";
// Add surrounding HTML comments to help finding bugs faster
$ret = "<!-- Template " . $template . " - Start -->\n" . $GLOBALS['tpl_content'] . "<!-- Template " . $template . " - End -->\n";
@@
-670,6
+670,11
@@
function sendRawEmail ($toEmail, $subject, $message, $from) {
// get new instance
$mail = new PHPMailer();
// get new instance
$mail = new PHPMailer();
+
+ // Set charset to UTF-8
+ $mail->CharSet('UTF-8');
+
+ // Path for PHPMailer
$mail->PluginDir = sprintf("%sinc/phpmailer/", getConfig('PATH'));
$mail->IsSMTP();
$mail->PluginDir = sprintf("%sinc/phpmailer/", getConfig('PATH'));
$mail->IsSMTP();
diff --git
a/inc/libs/html_mail_functions.php
b/inc/libs/html_mail_functions.php
index f72b7d595579a5248d9aef1ca2e9daedb2226bf8..6b951f8a00d52f07057f44527b5286727acdbf28 100644
(file)
--- a/
inc/libs/html_mail_functions.php
+++ b/
inc/libs/html_mail_functions.php
@@
-144,7
+144,7
@@
function insertUrlsIntoHtml ($text) {
$text = ''; $PARTS[] = $test;
foreach ($PARTS as $part) {
$text .= $part;
$text = ''; $PARTS[] = $test;
foreach ($PARTS as $part) {
$text .= $part;
- }
+ }
// END - foreach
// Replace new-lines agains <br />-s and finally compile possible own HTML tags out...
return compileCode(str_replace("\n", "<br />\n", $text));
// Replace new-lines agains <br />-s and finally compile possible own HTML tags out...
return compileCode(str_replace("\n", "<br />\n", $text));
@@
-156,7
+156,7
@@
function sendHtmlEmail($to, $subject, $message, $FROM) {
// Send mail away as HTML
$FROM = "Content-Type: text/html; charset=UTF-8\n" . $FROM;
sendEmail($to, $subject, $message, 'N', $FROM);
// Send mail away as HTML
$FROM = "Content-Type: text/html; charset=UTF-8\n" . $FROM;
sendEmail($to, $subject, $message, 'N', $FROM);
- }
+ }
// END - if
}
//
}
//
diff --git
a/inc/libs/yoomedia_functions.php
b/inc/libs/yoomedia_functions.php
index 588eea1ab419f5b739ce298867d6098bfba648ac..47015d5224dec9c41f13347b9fcdf01170fb3185 100644
(file)
--- a/
inc/libs/yoomedia_functions.php
+++ b/
inc/libs/yoomedia_functions.php
@@
-221,7
+221,7
@@
function YOOMEDIA_PREPARE_MAIL_DELIVERY ($data) {
$data['categories'] = generateCategoryOptionsList('normal');
// Decode entities
$data['categories'] = generateCategoryOptionsList('normal');
// Decode entities
- $data['text'] =
(decodeEntities($data['text'])
);
+ $data['text'] =
decodeEntities($data['text']
);
// Load template
loadTemplate('admin_send_yoomedia', false, $data);
// Load template
loadTemplate('admin_send_yoomedia', false, $data);
diff --git
a/inc/mysql-connect.php
b/inc/mysql-connect.php
index a733ea9abd2440a6c38aa14c0f974e3fcc7b151d..11ed8a13e4e5e58c2af4f47abd1ceae91a0ec957 100644
(file)
--- a/
inc/mysql-connect.php
+++ b/
inc/mysql-connect.php
@@
-144,9
+144,6
@@
if (!isInstalling()) {
setConfigEntry('OUTPUT_MODE', 'render');
} // END - if
setConfigEntry('OUTPUT_MODE', 'render');
} // END - if
- // Set other missing variables
- if (!isOutputModeSet()) setOutputMode(0);
-
// Include more
foreach (array('inc/databases.php','inc/versions.php','inc/db/lib.php','inc/session.php','inc/install-functions.php','inc/load_config.php') as $inc) {
// Load the include
// Include more
foreach (array('inc/databases.php','inc/versions.php','inc/db/lib.php','inc/session.php','inc/install-functions.php','inc/load_config.php') as $inc) {
// Load the include
diff --git
a/inc/wrapper-functions.php
b/inc/wrapper-functions.php
index f8b068dc3523cd20ea144b4de3b66d1935c90445..b76f513d39a06a91a60111ec4535c8be4051ab0b 100644
(file)
--- a/
inc/wrapper-functions.php
+++ b/
inc/wrapper-functions.php
@@
-593,7
+593,7
@@
function getOutputMode () {
// Setter for 'output_mode' value
function setOutputMode ($newOutputMode) {
// Setter for 'output_mode' value
function setOutputMode ($newOutputMode) {
- $GLOBALS['output_mode'] =
SQL_ESCAPE($newOutputMode)
;
+ $GLOBALS['output_mode'] =
(int) $newOutputMode
;
}
// Checks wether output_mode is set and optionally aborts on miss
}
// Checks wether output_mode is set and optionally aborts on miss