Templates deprecated, and support templates fixed

diff --git a/inc/databases.php b/inc/databases.php
index fae6e267e7e74f847e504214a0c8f2ac891b686a..d25b6b5e20f65300ce708b7aa558eebe9d2a7d2b 100644 (file)
--- 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 4dd06145e19faa8f2154b5a0dbec52516859bb16..bf9dda5e2facf53e3d0e9310e5a0625fa193554f 100644 (file)
--- 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 b604a534cec9c7dd1e3d620fe4f3b783e7a9b03a..7a33280ae247cfa2030d68585deaf83bba3571e6 100644 (file)
--- 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 0f53880069cfbd53335e7e63a0f168bcbd40af27..d19998f716dbfc5de7bd470e9843f6ac1fc1e04a 100644 (file)
--- 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 6d391546395ace44a81aaa44f88b16fb68d7c704..b0e21d7a08f603e45767aacfb75f0aaeb9f428d2 100644 (file)
--- 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 b9126e149e067fb7deb97d4b42ac59b53d008042..01fa2fb2eaa336bc56afe398f2275928b01abfc4 100644 (file)
--- 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 d3882afc0edf3fab1dd1057125663e53afa44170..7a33280ae247cfa2030d68585deaf83bba3571e6 100644 (file)
--- 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 d3882afc0edf3fab1dd1057125663e53afa44170..2ed23e17b3f0cacfcc313be80b3ba2db6127b124 100644 (file)
--- 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 5ec63d31746a56866ef8a5f9d320dc47af9388ba..4bf6513734edfbc9a2172cc8cda90b609055ad2a 100644 (file)
--- 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 d3b7b11f2cc59b8db3246fdc2e8f551cc55ddc47..fc90740ec659eefec925b57b89a4c16716b5dfd1 100644 (file)
--- 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!})