From 4b36c64267aa5a8a7fceea3317a6826a149156bc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Mon, 24 Nov 2008 16:24:23 +0000 Subject: [PATCH] Templates deprecated, and support templates fixed --- inc/databases.php | 2 +- inc/modules/member/what-support.php | 20 ++++++------- .../de/emails/admin/admin_support-order.tpl | 28 +------------------ .../de/emails/admin/admin_support-ordr.tpl | 2 +- .../de/emails/admin/admin_support-reflink.tpl | 2 +- .../admin/admin_support-unconfirmed.tpl | 2 +- .../de/emails/member/member_support-order.tpl | 23 +-------------- .../de/emails/member/member_support-ordr.tpl | 4 +-- .../emails/member/member_support-reflink.tpl | 2 +- .../member/member_support-unconfirmed.tpl | 4 +-- 10 files changed, 19 insertions(+), 70 deletions(-) diff --git a/inc/databases.php b/inc/databases.php index fae6e267e7..d25b6b5e20 100644 --- a/inc/databases.php +++ b/inc/databases.php @@ -114,7 +114,7 @@ define('USAGE_BASE', "usage"); define('SERVER_URL', "http://www.mxchange.org"); // This current patch level -define('CURR_SVN_REVISION', "554"); +define('CURR_SVN_REVISION', "555"); // Take a prime number which is long (if you know a longer one please try it out!) define('_PRIME', 591623); diff --git a/inc/modules/member/what-support.php b/inc/modules/member/what-support.php index 4dd06145e1..bf9dda5e2f 100644 --- a/inc/modules/member/what-support.php +++ b/inc/modules/member/what-support.php @@ -45,38 +45,34 @@ if (!defined('__SECURITY')) { // Add description as navigation point ADD_DESCR("member", __FILE__); -if ((!isset($_POST['ok'])) || (empty($_POST['qsummary']))) -{ +if ((!isset($_POST['ok'])) || (empty($_POST['qsummary']))) { // Output form LOAD_TEMPLATE("member_support_form"); -} - else -{ +} else { // Load mail template based on your member's decision if (GET_EXT_VERSION("admins") >= "0.4.1") { $a_tpl = "admin_support-".$_POST['qsummary']; } else { - $msg_a = LOAD_EMAIL_TEMPLATE("admin_support-".$_POST['qsummary'], $_POST['qdetails'], $GLOBALS['userid']); + $msg_a = LOAD_EMAIL_TEMPLATE("admin_support-".$_POST['qsummary'], array('text' => $_POST['qdetails']), $GLOBALS['userid']); } - $msg_m = LOAD_EMAIL_TEMPLATE("member_support-".$_POST['qsummary'], $_POST['qdetails'], $GLOBALS['userid']); + $msg_m = LOAD_EMAIL_TEMPLATE("member_support-".$_POST['qsummary'], array('text' => $_POST['qdetails']), $GLOBALS['userid']); // Select right subject - switch ($_POST['qsummary']) - { + switch ($_POST['qsummary']) { case "ordr" : $subj_a = SUPPORT_SUBJ_ADMIN_ORDER; $subj_m = SUPPORT_SUBJ_MEMBER_ORDER; break; case "reflink" : $subj_a = SUPPORT_SUBJ_ADMIN_REFLINK; $subj_m = SUPPORT_SUBJ_MEMBER_REFLINK; break; case "unconfirmed": $subj_a = SUPPORT_SUBJ_ADMIN_UNCONFIRMED; $subj_m = SUPPORT_SUBJ_MEMBER_UNCONFIRMED; break; - } + } // END - switch // Send mail to admin - SEND_ADMIN_NOTIFICATION($subj_a, $a_tpl, $_POST['qdetails'], $GLOBALS['userid']); + SEND_ADMIN_NOTIFICATION($subj_a, $a_tpl, array('text' => $_POST['qdetails']), $GLOBALS['userid']); // Send mail to user SEND_EMAIL($GLOBALS['userid'], $subj_m, $msg_m); // Drop a message in the admin's area $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_task_system (userid, assigned_admin, status, task_type, subject, text, task_created) VALUES ('%s','0','NEW','SUPPORT_MEMBER','%s','%s', UNIX_TIMESTAMP())", - array($GLOBALS['userid'], $subj_a, $_POST['qsummary'].":".$_POST['qdetails']), __FILE__, __LINE__); + array($GLOBALS['userid'], $subj_a, $_POST['qsummary'].":".array('text' => $_POST['qdetails'])), __FILE__, __LINE__); // Form sent LOAD_TEMPLATE("member_support_contcted"); diff --git a/templates/de/emails/admin/admin_support-order.tpl b/templates/de/emails/admin/admin_support-order.tpl index b604a534ce..7a33280ae2 100644 --- a/templates/de/emails/admin/admin_support-order.tpl +++ b/templates/de/emails/admin/admin_support-order.tpl @@ -1,27 +1 @@ -{--HELLO_ADMIN--}, - -Ein Mitglied aus Ihrem Mailtausch hat soeben das Support-Formular ausgefuellt und hat eine Frage zum Mailversand. - ------------------------------- -Seine Mitglieder-ID ist: $UID ------------------------------- -E-Mail Adresse: $content[email] ------------------------------- -Vor-, Nachname: $content[gender] $content[surname] $content[family] ------------------------------- -IP-Nummer: $REMOTE_ADDR ------------------------------- -Browser: $HTTP_USER_AGENT ------------------------------- - -$content - ------------------------------- - -Alternativ zum direkten Mailkontakt koennen Sie sich in den Admin-Bereich einloggen und das Support-System nutzen! - -Mit freundlichem Gruss, - Ihr {!MAIN_TITLE!} Script - -{!URL!}/admin.php - +DEPRECATED! \ No newline at end of file diff --git a/templates/de/emails/admin/admin_support-ordr.tpl b/templates/de/emails/admin/admin_support-ordr.tpl index 0f53880069..d19998f716 100644 --- a/templates/de/emails/admin/admin_support-ordr.tpl +++ b/templates/de/emails/admin/admin_support-ordr.tpl @@ -14,7 +14,7 @@ IP-Nummer: $REMOTE_ADDR Browser: $HTTP_USER_AGENT ------------------------------ -$content +$content[text] ------------------------------ diff --git a/templates/de/emails/admin/admin_support-reflink.tpl b/templates/de/emails/admin/admin_support-reflink.tpl index 6d39154639..b0e21d7a08 100644 --- a/templates/de/emails/admin/admin_support-reflink.tpl +++ b/templates/de/emails/admin/admin_support-reflink.tpl @@ -14,7 +14,7 @@ IP-Nummer: $REMOTE_ADDR Browser: $HTTP_USER_AGENT ------------------------------ -$content +$content[text] ------------------------------ diff --git a/templates/de/emails/admin/admin_support-unconfirmed.tpl b/templates/de/emails/admin/admin_support-unconfirmed.tpl index b9126e149e..01fa2fb2ea 100644 --- a/templates/de/emails/admin/admin_support-unconfirmed.tpl +++ b/templates/de/emails/admin/admin_support-unconfirmed.tpl @@ -14,7 +14,7 @@ IP-Nummer: $REMOTE_ADDR Browser: $HTTP_USER_AGENT ------------------------------ -$content +$content[text] ------------------------------ diff --git a/templates/de/emails/member/member_support-order.tpl b/templates/de/emails/member/member_support-order.tpl index d3882afc0e..7a33280ae2 100644 --- a/templates/de/emails/member/member_support-order.tpl +++ b/templates/de/emails/member/member_support-order.tpl @@ -1,22 +1 @@ -Hallo $content[gender] $content[surname] $content[family], - -Sie hatten eine Frage zur Mailbuchung an uns gestellt. Folgendes wurde an den Support weitergeleitet: - ------------------------------- -Ihr Mitglieder-ID ist: $UID ------------------------------- -E-Mail Adresse: $content[email] ------------------------------- -Vor-, Nachname: $content[gender] $content[surname] $content[family] ------------------------------- - -$content - ------------------------------- - -Einer unserer Mitarbeiter wird sich bald bei Ihnen direkt oder per Support-System melden. In beiden Faelllen erhalten Sie eine Mail! - -Mit freundlichem Gruss, - Ihr {!MAIN_TITLE!} Team - -{!URL!}/login.php ({!WEBMASTER!}) \ No newline at end of file +DEPRECATED! \ No newline at end of file diff --git a/templates/de/emails/member/member_support-ordr.tpl b/templates/de/emails/member/member_support-ordr.tpl index d3882afc0e..2ed23e17b3 100644 --- a/templates/de/emails/member/member_support-ordr.tpl +++ b/templates/de/emails/member/member_support-ordr.tpl @@ -10,7 +10,7 @@ E-Mail Adresse: $content[email] Vor-, Nachname: $content[gender] $content[surname] $content[family] ------------------------------ -$content +$content[text] ------------------------------ @@ -19,4 +19,4 @@ Einer unserer Mitarbeiter wird sich bald bei Ihnen direkt oder per Support-Syste Mit freundlichem Gruss, Ihr {!MAIN_TITLE!} Team -{!URL!}/login.php ({!WEBMASTER!}) \ No newline at end of file +{!URL!}/login.php ({!WEBMASTER!}) diff --git a/templates/de/emails/member/member_support-reflink.tpl b/templates/de/emails/member/member_support-reflink.tpl index 5ec63d3174..4bf6513734 100644 --- a/templates/de/emails/member/member_support-reflink.tpl +++ b/templates/de/emails/member/member_support-reflink.tpl @@ -10,7 +10,7 @@ E-Mail Adresse: $content[email] Vor-, Nachname: $content[gender] $content[surname] $content[family] ------------------------------ -$content +$content[text] ------------------------------ diff --git a/templates/de/emails/member/member_support-unconfirmed.tpl b/templates/de/emails/member/member_support-unconfirmed.tpl index d3b7b11f2c..fc90740ec6 100644 --- a/templates/de/emails/member/member_support-unconfirmed.tpl +++ b/templates/de/emails/member/member_support-unconfirmed.tpl @@ -10,7 +10,7 @@ E-Mail Adresse: $content[email] Vor-, Nachname: $content[gender] $content[surname] $content[family] ------------------------------ -$content +$content[text] ------------------------------ @@ -19,4 +19,4 @@ Einer unserer Mitarbeiter wird sich bald bei Ihnen direkt oder per Support-Syste Mit freundlichem Gruss, Ihr {!MAIN_TITLE!} Team -{!URL!}/login.php ({!WEBMASTER!}) \ No newline at end of file +{!URL!}/login.php ({!WEBMASTER!}) -- 2.39.5