admin_new_ext.tpl now resists in right folder, some minor changes

diff --git a/.gitattributes b/.gitattributes
index cff1cc367f8dcd7c1502a7f43b5120ea5d54e1a2..d79865ca9367ab6e0c7f03a8cb3495e04c44b809 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -607,7 +607,6 @@ templates/de/emails/admin/admin_holiday_unlock.tpl -text
 templates/de/emails/admin/admin_lock_confirmed_surfbar_urls.tpl -text
 templates/de/emails/admin/admin_lock_locked_surfbar_urls.tpl -text
 templates/de/emails/admin/admin_mydata_notify.tpl -text
-templates/de/emails/admin/admin_new_ext.tpl -text
 templates/de/emails/admin/admin_newsletter_request.tpl -text
 templates/de/emails/admin/admin_newsletter_reset.tpl -text
 templates/de/emails/admin/admin_payout_request.tpl -text
@@ -1013,6 +1012,7 @@ templates/de/html/admin/admin_mods_stats.tpl -text
 templates/de/html/admin/admin_mods_stats2.tpl -text
 templates/de/html/admin/admin_mods_stats2_row.tpl -text
 templates/de/html/admin/admin_mods_stats_row.tpl -text
+templates/de/html/admin/admin_new_ext.tpl -text
 templates/de/html/admin/admin_newsletter.tpl -text
 templates/de/html/admin/admin_newsletter_nohtml.tpl -text
 templates/de/html/admin/admin_newsletter_tsk.tpl -text

diff --git a/inc/databases.php b/inc/databases.php
index 8a746edb986d5dbe36ef89e304acaea1daa84dda..a3cdd8e66e20b47c98dd1f8e43b743e0b8aa1aa6 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', "331");
+define('CURR_SVN_REVISION', "332");
 
 // 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-holiday.php b/inc/modules/member/what-holiday.php
index 42144cd8d9934d834708128753655f008274a473..800ee5a0c3248e98f5b31fef4e537c2c4935219f 100644 (file)
--- a/inc/modules/member/what-holiday.php
+++ b/inc/modules/member/what-holiday.php
@@ -131,7 +131,6 @@ WHERE userid=%s LIMIT 1",
                SEND_EMAIL($GLOBALS['userid'], HOLIDAY_MEMBER_SUBJECT, $msg);
 
                // Send mail to all admins
-               $msg = LOAD_EMAIL_TEMPLATE("admin_holiday_request", $_POST['comments'], $GLOBALS['userid']);
                SEND_ADMIN_NOTIFICATION(HOLIDAY_ADMIN_SUBJECT, "admin_holiday_request", $_POST['comments'], $GLOBALS['userid']);
 
                // Create task

diff --git a/inc/modules/member/what-support.php b/inc/modules/member/what-support.php
index 9d01670d98eb0ed50f314200cf86e5d0ec0d92c7..db91df95f94c26843cce33a298e4cf5c296534dd 100644 (file)
--- a/inc/modules/member/what-support.php
+++ b/inc/modules/member/what-support.php
@@ -58,12 +58,9 @@ if ((!isset($_POST['ok'])) || (empty($_POST['qsummary'])))
  else
 {
        // Load mail template based on your member's decision
-       if (GET_EXT_VERSION("admins") >= "0.4.1")
-       {
+       if (GET_EXT_VERSION("admins") >= "0.4.1") {
                $a_tpl = "admin_support-".$_POST['qsummary'];
-       }
-        else
-       {
+       } else {
                $msg_a = LOAD_EMAIL_TEMPLATE("admin_support-".$_POST['qsummary'], $_POST['qdetails'], $GLOBALS['userid']);
        }
        $msg_m = LOAD_EMAIL_TEMPLATE("member_support-".$_POST['qsummary'], $_POST['qdetails'], $GLOBALS['userid']);

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index ad02fe75d7d97711cf2329abe7055c5f7c97187a..f787a3701e5ef0ad72165efea9bc5af248b4d8d0 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -1768,7 +1768,7 @@ function CREATE_NEW_EXTENSION_TASK ($admin_id, $subject, $ext) {
                        $msg = LOAD_TEMPLATE("ext_".$ext, true);
                } else {
                        // Load default message
-                       $msg = LOAD_EMAIL_TEMPLATE("admin_new_ext","", 0);
+                       $msg = LOAD_TEMPLATE("admin_new_ext", "", 0);
                }
 
                // Task not created so it's a brand-new extension which we need to register and create a task for!

diff --git a/inc/stats_bonus.php b/inc/stats_bonus.php
index 48492c69f067f9583a46edecfac8872b03cd6d69..a064faedeac557ea7aad41c135bafef0d720a385 100644 (file)
--- a/inc/stats_bonus.php
+++ b/inc/stats_bonus.php
@@ -44,14 +44,12 @@ FROM "._MYSQL_PREFIX."_user_stats
 WHERE max_rec=clicks AND clicks>0 AND bonus_stats='N'
 ORDER BY userid", __FILE__, __LINE__);
 
-if (SQL_NUMROWS($result_bonus) > 0)
-{
+if (SQL_NUMROWS($result_bonus) > 0) {
        // Remember stats bonus in constant
        define('__STATS_BONUS', TRANSLATE_COMMA($_CONFIG['bonus_stats']));
 
        // We found some mail orders...
-       while(list($id, $uid, $subj, $stamp, $clicks, $url) = SQL_FETCHROW($result_bonus))
-       {
+       while(list($id, $uid, $subj, $stamp, $clicks, $url) = SQL_FETCHROW($result_bonus)) {
                // Add points
                $result_points = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET bonus_stats=bonus_stats+%s WHERE userid=%s LIMIT 1",
                 array($_CONFIG['bonus_stats'], bigintval($uid)), __FILE__, __LINE__);

diff --git a/templates/de/emails/admin/admin_new_ext.tpl b/templates/de/emails/admin/admin_new_ext.tpl
deleted file mode 100644 (file)
index b88a2cc..0000000
--- a/templates/de/emails/admin/admin_new_ext.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<!-- Dies ist kein E-Mail Template! -->
-Sie haben eine neue Erweiterung hochgeladen. Diese muss erst noch in Ihrem {!MT_WORD!} registriert werden, damit Sie diese auch aktivieren und nutzen k&ouml;nnen.
-<!-- Dies ist kein E-Mail Template! -->

diff --git a/templates/de/html/admin/admin_new_ext.tpl b/templates/de/html/admin/admin_new_ext.tpl
new file mode 100644 (file)
index 0000000..cb2ab46
--- /dev/null
+++ b/templates/de/html/admin/admin_new_ext.tpl
@@ -0,0 +1,3 @@
+Sie haben eine neue Erweiterung hochgeladen. Diese muss erst noch in Ihrem
+{!MT_WORD!} registriert werden, damit Sie diese auch aktivieren und nutzen
+können.

diff --git a/templates/de/html/login_failtures.tpl b/templates/de/html/login_failtures.tpl
index 971f17dc7131b43cfc15b68971cb57468a2159fa..8c14796294200aea335f7684281f1ab3607d56d6 100644 (file)
--- a/templates/de/html/login_failtures.tpl
+++ b/templates/de/html/login_failtures.tpl
@@ -1,4 +1,7 @@
 <div class="login_failtures">
+       <div class="login_failture_header">
+               Warnung!
+       </div>
        Letzten <strong>$content[login_failtures]</strong> Loginversuche waren
        fehlgeschlagen, der letzte war am <strong>$content[last_failture]</strong>
 </div>