Entire rewrite of mail part in app! Not kidding here...

- SEND_EMAIL() and LOAD_EMAIL_TEMPLATE() rewritten
- $content in LOAD_TEMPLATE() and LOAD_EMAIL_TEMPLATE() should now always be an array
- Fixed that some (many! opps) emails to users are messed up in first line: "Hello   ,"
- Surfbar extended with URL migration from mail orders (unfinished!)
- Several small glitches fixed

diff --git a/.gitattributes b/.gitattributes
index 3acdc2afb74979c4284b46841b955998bf56ae58..10239c20614c870f4b3cc2c61339f2f479383be7 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -626,6 +626,7 @@ templates/de/emails/admin/admin_support-ordr.tpl -text
 templates/de/emails/admin/admin_support-reflink.tpl -text
 templates/de/emails/admin/admin_support-unconfirmed.tpl -text
 templates/de/emails/admin/admin_surfbar_url_confirmed.tpl -text
 templates/de/emails/admin/admin_support-reflink.tpl -text
 templates/de/emails/admin/admin_support-unconfirmed.tpl -text
 templates/de/emails/admin/admin_surfbar_url_confirmed.tpl -text

+templates/de/emails/admin/admin_surfbar_url_migrate.tpl -text

 templates/de/emails/admin/admin_surfbar_url_reg.tpl -text
 templates/de/emails/admin/admin_surfbar_url_rejected.tpl -text
 templates/de/emails/admin/admin_surfbar_url_unlock.tpl -text
 templates/de/emails/admin/admin_surfbar_url_reg.tpl -text
 templates/de/emails/admin/admin_surfbar_url_rejected.tpl -text
 templates/de/emails/admin/admin_surfbar_url_unlock.tpl -text


@@ -695,6 +696,7 @@ templates/de/emails/member/member_support-ordr.tpl -text
 templates/de/emails/member/member_support-reflink.tpl -text
 templates/de/emails/member/member_support-unconfirmed.tpl -text
 templates/de/emails/member/member_surfbar_url_confirmed.tpl -text
 templates/de/emails/member/member_support-reflink.tpl -text
 templates/de/emails/member/member_support-unconfirmed.tpl -text
 templates/de/emails/member/member_surfbar_url_confirmed.tpl -text

+templates/de/emails/member/member_surfbar_url_migrate.tpl -text

 templates/de/emails/member/member_surfbar_url_reg.tpl -text
 templates/de/emails/member/member_surfbar_url_rejected.tpl -text
 templates/de/emails/member/member_surfbar_url_unlock.tpl -text
 templates/de/emails/member/member_surfbar_url_reg.tpl -text
 templates/de/emails/member/member_surfbar_url_rejected.tpl -text
 templates/de/emails/member/member_surfbar_url_unlock.tpl -text


@@ -712,7 +714,6 @@ templates/de/emails/order-admin.tpl -text
 templates/de/emails/order-deleted.tpl -text
 templates/de/emails/order-member.tpl -text
 templates/de/emails/order-reject.tpl -text
 templates/de/emails/order-deleted.tpl -text
 templates/de/emails/order-member.tpl -text
 templates/de/emails/order-reject.tpl -text

-templates/de/emails/order_accept_sb.tpl -text

 templates/de/emails/profile-updte.tpl -text
 templates/de/emails/register-admin.tpl -text
 templates/de/emails/register-member.tpl -text
 templates/de/emails/profile-updte.tpl -text
 templates/de/emails/register-admin.tpl -text
 templates/de/emails/register-member.tpl -text


@@ -1289,6 +1290,8 @@ templates/de/html/member/member_points_bonus_disabled.tpl -text
 templates/de/html/member/member_points_bonus_rows.tpl -text
 templates/de/html/member/member_points_row.tpl -text
 templates/de/html/member/member_points_upgrade.tpl -text
 templates/de/html/member/member_points_bonus_rows.tpl -text
 templates/de/html/member/member_points_row.tpl -text
 templates/de/html/member/member_points_upgrade.tpl -text

+templates/de/html/member/member_pool_row.tpl -text
+templates/de/html/member/member_pool_table.tpl -text

 templates/de/html/member/member_primera.tpl -text
 templates/de/html/member/member_primera_form.tpl -text
 templates/de/html/member/member_primera_mode_list.tpl -text
 templates/de/html/member/member_primera.tpl -text
 templates/de/html/member/member_primera_form.tpl -text
 templates/de/html/member/member_primera_mode_list.tpl -text


@@ -1297,11 +1300,13 @@ templates/de/html/member/member_primera_mode_pay.tpl -text
 templates/de/html/member/member_receive_table.tpl -text
 templates/de/html/member/member_reflinks_row.tpl -text
 templates/de/html/member/member_reflinks_table.tpl -text
 templates/de/html/member/member_receive_table.tpl -text
 templates/de/html/member/member_reflinks_row.tpl -text
 templates/de/html/member/member_reflinks_table.tpl -text

+templates/de/html/member/member_stats_pool.tpl -text

 templates/de/html/member/member_stats_row.tpl -text
 templates/de/html/member/member_stats_table.tpl -text
 templates/de/html/member/member_support_contcted.tpl -text
 templates/de/html/member/member_support_form.tpl -text
 templates/de/html/member/member_surfbar_book_dynamic.tpl -text
 templates/de/html/member/member_stats_row.tpl -text
 templates/de/html/member/member_stats_table.tpl -text
 templates/de/html/member/member_support_contcted.tpl -text
 templates/de/html/member/member_support_form.tpl -text
 templates/de/html/member/member_surfbar_book_dynamic.tpl -text

+templates/de/html/member/member_surfbar_book_static.tp -text

 templates/de/html/member/member_surfbar_book_static.tpl -text
 templates/de/html/member/member_surfbar_link.tpl -text
 templates/de/html/member/member_surfbar_list.tpl -text
 templates/de/html/member/member_surfbar_book_static.tpl -text
 templates/de/html/member/member_surfbar_link.tpl -text
 templates/de/html/member/member_surfbar_list.tpl -text

diff --git a/beg.php b/beg.php
index f4a0bd13f3aba0935318e6d761095b764f60036b..168c5ad45e8444f996e56eef94a7072314acff1e 100644 (file)
--- a/beg.php
+++ b/beg.php
@@ -126,7 +126,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                                        // Remember remote address, userid and timestamp for next click
                                        // but only when there is no admin begging.
                                        // Admins shall be able to test it!
                                        // Remember remote address, userid and timestamp for next click
                                        // but only when there is no admin begging.
                                        // Admins shall be able to test it!

-                                       $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_beg_ips (userid, remote_ip, timeout) VALUES('%s', '%s', UNIX_TIMESTAMP())",
+                                       $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_beg_ips (userid, remote_ip, timeout) VALUES('%s','%s', UNIX_TIMESTAMP())",

                                         array($uid, getenv('REMOTE_ADDR')), __FILE__, __LINE__);
                                }
 
                                         array($uid, getenv('REMOTE_ADDR')), __FILE__, __LINE__);
                                }
 

diff --git a/doubler.php b/doubler.php
index 87f177fc6e0f1b53fbf5c3ebc9e19f423f88cef7..6470aae80dff7e92c48a0171fe44861bfbf590fe 100644 (file)
--- a/doubler.php
+++ b/doubler.php
@@ -37,7 +37,8 @@ require_once("inc/libs/security_functions.php");
 // Init "action" and "what"
 global $what, $action, $startTime;
 $GLOBALS['startTime'] = microtime(true);
 // Init "action" and "what"
 global $what, $action, $startTime;
 $GLOBALS['startTime'] = microtime(true);

-$GLOBALS['what'] = ""; $GLOBALS['action'] = "";
+$GLOBALS['what'] = "";
+$GLOBALS['action'] = "";

 
 // Set module
 $GLOBALS['module'] = "doubler";
 
 // Set module
 $GLOBALS['module'] = "doubler";


@@ -48,21 +49,17 @@ $CSS = 0;
 require ("inc/config.php");
 
 // Is the script installed?
 require ("inc/config.php");
 
 // Is the script installed?

-if (isBooleanConstantAndTrue('mxchange_installed'))
-{
+if (isBooleanConstantAndTrue('mxchange_installed')) {

        // Probe for referral ID
        if (!empty($_GET['refid'])) $GLOBALS['refid'] = bigintval($_GET['refid']);
 
        // Probe for nickname extension and if a nickname was supplied by URL
        $probe_nickname = ((EXT_IS_ACTIVE("nickname")) && (("".round($GLOBALS['refid'])."") != $GLOBALS['refid']));
        // Probe for referral ID
        if (!empty($_GET['refid'])) $GLOBALS['refid'] = bigintval($_GET['refid']);
 
        // Probe for nickname extension and if a nickname was supplied by URL
        $probe_nickname = ((EXT_IS_ACTIVE("nickname")) && (("".round($GLOBALS['refid'])."") != $GLOBALS['refid']));

-       if ($probe_nickname)
-       {
+       if ($probe_nickname) {

                // Nickname in URL, so load the ID
                $result = SQL_QUERY_ESC("SELECT userid, status FROM "._MYSQL_PREFIX."_user_data WHERE nickname='%s' LIMIT 1",
                 array(bigintval($GLOBALS['refid'])), __FILE__, __LINE__);
                // Nickname in URL, so load the ID
                $result = SQL_QUERY_ESC("SELECT userid, status FROM "._MYSQL_PREFIX."_user_data WHERE nickname='%s' LIMIT 1",
                 array(bigintval($GLOBALS['refid'])), __FILE__, __LINE__);

-       }
-        else
-       {
+       } else {

                // Direct userid entered
                $result = SQL_QUERY_ESC("SELECT userid, status FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
                 array(bigintval($GLOBALS['refid'])), __FILE__, __LINE__);
                // Direct userid entered
                $result = SQL_QUERY_ESC("SELECT userid, status FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
                 array(bigintval($GLOBALS['refid'])), __FILE__, __LINE__);


@@ -77,27 +74,25 @@ if (isBooleanConstantAndTrue('mxchange_installed'))
        $uid = 0;
 
        // If no account was found set default refid and status to CONFIRMED
        $uid = 0;
 
        // If no account was found set default refid and status to CONFIRMED

-       if (empty($GLOBALS['refid'])) { $GLOBALS['refid'] = $_CONFIG['def_refid']; $status = "CONFIRMED"; }
+       if (empty($GLOBALS['refid'])) {
+               $GLOBALS['refid'] = $_CONFIG['def_refid'];
+               $status = "CONFIRMED";
+       } // END - if

 
        // Begin with doubler script...
 
        // Begin with doubler script...

-       if (isset($_POST['ok']))
-       {
+       if (isset($_POST['ok'])) {

                // Secure points (so only integer/double values are allowed
                $_POST['points'] = bigintval($_POST['points']);
 
                // Begin with doubling process
                // Secure points (so only integer/double values are allowed
                $_POST['points'] = bigintval($_POST['points']);
 
                // Begin with doubling process

-               if ((!empty($_POST['userid'])) && (!empty($_POST['pass'])) && (!empty($_POST['points'])))
-               {
+               if ((!empty($_POST['userid'])) && (!empty($_POST['pass'])) && (!empty($_POST['points']))) {

                        // Probe for nickname extension and if a nickname was entered
                        $probe_nickname = ((EXT_IS_ACTIVE("nickname")) && (("".round($_POST['userid'])."") != $_POST['userid']));
                        // Probe for nickname extension and if a nickname was entered
                        $probe_nickname = ((EXT_IS_ACTIVE("nickname")) && (("".round($_POST['userid'])."") != $_POST['userid']));

-                       if ($probe_nickname)
-                       {
+                       if ($probe_nickname) {

                                // Nickname in URL, so load the ID
                                $result = SQL_QUERY_ESC("SELECT userid, status, password FROM "._MYSQL_PREFIX."_user_data WHERE nickname='%s' LIMIT 1",
                                 array($_POST['userid']), __FILE__, __LINE__);
                                // Nickname in URL, so load the ID
                                $result = SQL_QUERY_ESC("SELECT userid, status, password FROM "._MYSQL_PREFIX."_user_data WHERE nickname='%s' LIMIT 1",
                                 array($_POST['userid']), __FILE__, __LINE__);

-                       }
-                        else
-                       {
+                       } else {

                                // Direct userid entered
                                $result = SQL_QUERY_ESC("SELECT userid, status, password FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
                                 array(bigintval($_POST['userid'])), __FILE__, __LINE__);
                                // Direct userid entered
                                $result = SQL_QUERY_ESC("SELECT userid, status, password FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
                                 array(bigintval($_POST['userid'])), __FILE__, __LINE__);


@@ -117,8 +112,7 @@ if (isBooleanConstantAndTrue('mxchange_installed'))
                        $probe_points = (($_POST['points'] >= $_CONFIG['doubler_min']) && ($_POST['points'] <= $_CONFIG['doubler_max']));
 
                        // Check all together
                        $probe_points = (($_POST['points'] >= $_CONFIG['doubler_min']) && ($_POST['points'] <= $_CONFIG['doubler_max']));
 
                        // Check all together

-                       if ((!empty($uid)) && ($password == generateHash($_POST['pass'], substr($password, 0, -40))) && ($status == "CONFIRMED") && ($probe_points))
-                       {
+                       if ((!empty($uid)) && ($password == generateHash($_POST['pass'], substr($password, 0, -40))) && ($status == "CONFIRMED") && ($probe_points)) {

                                // Nickname resolved to a unique userid or direct userid entered by the member
                                $DOUBLER_UID = $uid;
 
                                // Nickname resolved to a unique userid or direct userid entered by the member
                                $DOUBLER_UID = $uid;
 


@@ -130,7 +124,7 @@ if (isBooleanConstantAndTrue('mxchange_installed'))
                                {
                                        // Enough points are left so let's continue with the doubling process
                                        // Create doubling "account" width *DOUBLED* points
                                {
                                        // Enough points are left so let's continue with the doubling process
                                        // Create doubling "account" width *DOUBLED* points

-                                       $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_doubler (userid, refid, points, remote_ip, timemark, completed, is_ref) VALUES ('%s', '%s', '%s', '".$_SERVER['REMOTE_ADDR']."', UNIX_TIMESTAMP(), 'N', 'N')",
+                                       $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_doubler (userid, refid, points, remote_ip, timemark, completed, is_ref) VALUES ('%s','%s','%s','".$_SERVER['REMOTE_ADDR']."', UNIX_TIMESTAMP(), 'N','N')",

                                         array($uid, bigintval($GLOBALS['refid']), bigintval($_POST['points'] * 2)), __FILE__, __LINE__);
 
                                        // Subtract entered points
                                         array($uid, bigintval($GLOBALS['refid']), bigintval($_POST['points'] * 2)), __FILE__, __LINE__);
 
                                        // Subtract entered points


@@ -142,14 +136,13 @@ if (isBooleanConstantAndTrue('mxchange_installed'))
                                        $_CONFIG['doubler_points'] += $points;
 
                                        // Add second line for the referral but only when uid != refid
                                        $_CONFIG['doubler_points'] += $points;
 
                                        // Add second line for the referral but only when uid != refid

-                                       if (($GLOBALS['refid'] > 0) && ($GLOBALS['refid'] != $uid))
-                                       {
+                                       if (($GLOBALS['refid'] > 0) && ($GLOBALS['refid'] != $uid)) {

                                                // Okay add a refid line and apply refid percents
                                                // Okay add a refid line and apply refid percents

-                                               $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_doubler (userid, refid, points, remote_ip, timemark, completed, is_ref) VALUES ('%s', '0', '%s', '".$_SERVER['REMOTE_ADDR']."', UNIX_TIMESTAMP(), 'N', 'Y')",
-                                                array(bigintval($GLOBALS['refid']), bigintval($_POST['points'] * 2 * $_CONFIG['doubler_ref'])), __FILE__, __LINE__);
+                                               $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_doubler (userid,refid,points,remote_ip,timemark,completed,is_ref) VALUES ('%s',0,'%s','".$_SERVER['REMOTE_ADDR']."',UNIX_TIMESTAMP(),'N','Y')",
+                                                       array(bigintval($GLOBALS['refid']), bigintval($_POST['points'] * 2 * $_CONFIG['doubler_ref'])), __FILE__, __LINE__);

 
                                                // And that's why we dont't want to you more than one referral level of doubler-points. ^^^
 
                                                // And that's why we dont't want to you more than one referral level of doubler-points. ^^^

-                                       }
+                                       } // END - if

 
                                        // Update usage counter
                                        UPDATE_CONFIG("doubler_counter", 1, "+");
 
                                        // Update usage counter
                                        UPDATE_CONFIG("doubler_counter", 1, "+");


@@ -157,62 +150,39 @@ if (isBooleanConstantAndTrue('mxchange_installed'))
 
                                        // Set constant
                                        define('__DOUBLER_MSG', LOAD_TEMPLATE("doubler_reflink", true, $_POST['userid']));
 
                                        // Set constant
                                        define('__DOUBLER_MSG', LOAD_TEMPLATE("doubler_reflink", true, $_POST['userid']));

-                               }
-                                else
-                               {
+                               } else {

                                        // Not enougth points left
                                        define('__ERROR_MSG', DOUBLER_FORM_NO_POINTS_LEFT);
                                }
                                        // Not enougth points left
                                        define('__ERROR_MSG', DOUBLER_FORM_NO_POINTS_LEFT);
                                }

-
-                       }
-                        elseif ($status == "CONFIRMED")
-                       {
+                       } elseif ($status == "CONFIRMED") {

                                // Account is unconfirmed!
                                define('__ERROR_MSG', DOUBLER_FORM_WRONG_PASS);
                                // Account is unconfirmed!
                                define('__ERROR_MSG', DOUBLER_FORM_WRONG_PASS);

-                       }
-                        elseif ($status == "UNCONFIRMED")
-                       {
+                       } elseif ($status == "UNCONFIRMED") {

                                // Account is unconfirmed!
                                define('__ERROR_MSG', DOUBLER_FORM_STATUS_UNCONFIRMED);
                                // Account is unconfirmed!
                                define('__ERROR_MSG', DOUBLER_FORM_STATUS_UNCONFIRMED);

-                       }
-                        elseif ($status == "LOCKED")
-                       {
+                       } elseif ($status == "LOCKED") {

                                // Account is locked by admin / holiday!
                                define('__ERROR_MSG', DOUBLER_FORM_STATUS_LOCKED);
                                // Account is locked by admin / holiday!
                                define('__ERROR_MSG', DOUBLER_FORM_STATUS_LOCKED);

-                       }
-                        elseif ($_POST['points'] < $_CONFIG['doubler_min'])
-                       {
+                       } elseif ($_POST['points'] < $_CONFIG['doubler_min']) {

                                // Not enougth points entered
                                define('__ERROR_MSG', DOUBLER_FORM_POINTS_MIN);
                                // Not enougth points entered
                                define('__ERROR_MSG', DOUBLER_FORM_POINTS_MIN);

-                       }
-                        elseif ($_POST['points'] > $_CONFIG['doubler_max'])
-                       {
+                       } elseif ($_POST['points'] > $_CONFIG['doubler_max']) {

                                // Too much points entered
                                define('__ERROR_MSG', DOUBLER_FORM_POINTS_MAX);
                                // Too much points entered
                                define('__ERROR_MSG', DOUBLER_FORM_POINTS_MAX);

-                       }
-                        elseif ($probe_nickname)
-                       {
+                       } elseif ($probe_nickname) {

                                // Cannot resolv nickname -> userid
                                define('__ERROR_MSG', DOUBLER_FORM_404_NICKNAME);
                                // Cannot resolv nickname -> userid
                                define('__ERROR_MSG', DOUBLER_FORM_404_NICKNAME);

-                       }
-                        else
-                       {
+                       } else {

                                // Wrong password or account not found
                                define('__ERROR_MSG', DOUBLER_FORM_404_MEMBER);
                        }
                                // Wrong password or account not found
                                define('__ERROR_MSG', DOUBLER_FORM_404_MEMBER);
                        }

-               }
-                elseif (empty($_POST['userid']))
-               {
+               } elseif (empty($_POST['userid'])) {

                        // Login not entered
                        define('__ERROR_MSG', DOUBLER_FORM_404_LOGIN);
                        // Login not entered
                        define('__ERROR_MSG', DOUBLER_FORM_404_LOGIN);

-               }
-                elseif (empty($_POST['pass']))
-               {
+               } elseif (empty($_POST['pass'])) {

                        // Password not entered
                        define('__ERROR_MSG', DOUBLER_FORM_404_PASSWORD);
                        // Password not entered
                        define('__ERROR_MSG', DOUBLER_FORM_404_PASSWORD);

-               }
-                elseif (empty($_POST['points']))
-               {
+               } elseif (empty($_POST['points'])) {

                        // points not entered
                        define('__ERROR_MSG', DOUBLER_FORM_404_POINTS);
                }
                        // points not entered
                        define('__ERROR_MSG', DOUBLER_FORM_404_POINTS);
                }


@@ -235,18 +205,13 @@ if (isBooleanConstantAndTrue('mxchange_installed'))
        define('__DOUBLER_HEADER', LOAD_TEMPLATE("doubler_header", true));
        define('__DOUBLER_FOOTER', LOAD_TEMPLATE("doubler_footer", true));
 
        define('__DOUBLER_HEADER', LOAD_TEMPLATE("doubler_header", true));
        define('__DOUBLER_FOOTER', LOAD_TEMPLATE("doubler_footer", true));
 

-       if (!empty($uid))
-       {
+       if (!empty($uid)) {

                // Transfer userid/nickname to constant
                define('__REFID', $uid);
                // Transfer userid/nickname to constant
                define('__REFID', $uid);

-       }
-        elseif (!empty($GLOBALS['refid']))
-       {
+       } elseif (!empty($GLOBALS['refid'])) {

                // Transfer userid/nickname to constant
                define('__REFID', $GLOBALS['refid']);
                // Transfer userid/nickname to constant
                define('__REFID', $GLOBALS['refid']);

-       }
-        else
-       {
+       } else {

                // Transfer default refid to constant
                define('__REFID', $_CONFIG['def_refid']);
        }
                // Transfer default refid to constant
                define('__REFID', $_CONFIG['def_refid']);
        }


@@ -259,13 +224,10 @@ if (isBooleanConstantAndTrue('mxchange_installed'))
        define('__MAX_VALUE'   , TRANSLATE_COMMA($_CONFIG['doubler_max']));
 
        // Text "Enter login"
        define('__MAX_VALUE'   , TRANSLATE_COMMA($_CONFIG['doubler_max']));
 
        // Text "Enter login"

-       if (EXT_IS_ACTIVE("nickname"))
-       {
+       if (EXT_IS_ACTIVE("nickname")) {

                // Choose login/nickname
                define('DOUBLER_ENTER_LOGIN', GUEST_ENTER_LOGIN_NICKNAME);
                // Choose login/nickname
                define('DOUBLER_ENTER_LOGIN', GUEST_ENTER_LOGIN_NICKNAME);

-       }
-        else
-       {
+       } else {

                // Simple login ID
                define('DOUBLER_ENTER_LOGIN', GUEST_ENTER_LOGIN);
        }
                // Simple login ID
                define('DOUBLER_ENTER_LOGIN', GUEST_ENTER_LOGIN);
        }


@@ -283,7 +245,7 @@ if (isBooleanConstantAndTrue('mxchange_installed'))
        }
 
        // Generate table with already payed out doubles
        }
 
        // Generate table with already payed out doubles

-       define('__DOUBLER_PAYOUT_HISTORY', DOUBLER_GENERATE_TABLE("0", 'Y', 'N', "DESC"));
+       define('__DOUBLER_PAYOUT_HISTORY', DOUBLER_GENERATE_TABLE("0", "Y", "N", "DESC"));

 
        // Generate timemark
        define('__TIMEOUT_MARK', CREATE_FANCY_TIME($_CONFIG['doubler_timeout']));
 
        // Generate timemark
        define('__TIMEOUT_MARK', CREATE_FANCY_TIME($_CONFIG['doubler_timeout']));


@@ -299,9 +261,7 @@ if (isBooleanConstantAndTrue('mxchange_installed'))
 
        // Output footer
        include(PATH."inc/footer.php");
 
        // Output footer
        include(PATH."inc/footer.php");

-}
- else
-{
+} else {

        // You have to configure first!
        LOAD_URL("install.php");
 }
        // You have to configure first!
        LOAD_URL("install.php");
 }

diff --git a/inc/autopurge/purge-inact.php b/inc/autopurge/purge-inact.php
index c7c658ea9118b509aa705623d9ab4a4c3b332fa6..fb96fc0f1fab1a293219bb45963151dab8cf84ad 100644 (file)
--- a/inc/autopurge/purge-inact.php
+++ b/inc/autopurge/purge-inact.php
@@ -57,7 +57,7 @@ if ($_CONFIG['ap_inactive'] == "Y") {
        // Check for new holiday extension
        if (GET_EXT_VERSION("holiday") >= "0.1.3") {
                // Include only users with no active holiday
        // Check for new holiday extension
        if (GET_EXT_VERSION("holiday") >= "0.1.3") {
                // Include only users with no active holiday

-               $EXCLUDE_LIST .= " AND d.holiday_active = 'N'";
+               $EXCLUDE_LIST .= " AND d.holiday_active='N'";

        } // END - if
 
        // Check for all accounts
        } // END - if
 
        // Check for all accounts

diff --git a/inc/databases.php b/inc/databases.php
index 770290d6340ff8537c000b5751259d76a411982c..2ffde3fecbb97fa5b04b9ab1414b9019afed25db 100644 (file)
--- a/inc/databases.php
+++ b/inc/databases.php
@@ -113,7 +113,7 @@ define('USAGE_BASE', "usage");
 define('SERVER_URL', "http://www.mxchange.org");
 
 // This current patch level
 define('SERVER_URL', "http://www.mxchange.org");
 
 // This current patch level

-define('CURR_SVN_REVISION', "388");
+define('CURR_SVN_REVISION', "389");

 
 // Take a prime number which is long (if you know a longer one please try it out!)
 define('_PRIME', 591623);
 
 // Take a prime number which is long (if you know a longer one please try it out!)
 define('_PRIME', 591623);

diff --git a/inc/extensions.php b/inc/extensions.php
index 3973f4132afb746d5403111617ac69ccaf6819dc..608efa6227dea95ea363a96639f43ab3243da597 100644 (file)
--- a/inc/extensions.php
+++ b/inc/extensions.php
@@ -189,7 +189,7 @@ function EXTENSION_REGISTER ($ext_name, $id, $dry_run=false)
                                } // END - if
 
                                // Register extension
                                } // END - if
 
                                // Register extension

-                               $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_extensions (ext_name, ext_lang_file, ext_active, ext_version) VALUES ('%s', '%s', '%s', '%s')",
+                               $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_extensions (ext_name, ext_lang_file, ext_active, ext_version) VALUES ('%s','%s','%s','%s')",

                                 array($ext_name, $EXT_LANG_PREFIX, $EXT_ALWAYS_ACTIVE, $EXT_VERSION), __FILE__, __LINE__);
 
                                // Update task management
                                 array($ext_name, $EXT_LANG_PREFIX, $EXT_ALWAYS_ACTIVE, $EXT_VERSION), __FILE__, __LINE__);
 
                                // Update task management

diff --git a/inc/extensions/ext-active.php b/inc/extensions/ext-active.php
index 53c823118581b9ce4ccc0730c9a6a8a0ecd4a0fc..82f8c63625bbe0169876a290d1f97e8d3d29e421 100644 (file)
--- a/inc/extensions/ext-active.php
+++ b/inc/extensions/ext-active.php
@@ -50,7 +50,7 @@ switch ($EXT_LOAD_MODE)
 {
 case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called)
        // SQL commands to run
 {
 case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called)
        // SQL commands to run

-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_guest_menu (action, what, title, sort, visible, locked) VALUES ('main','active','Heute Online', 10, 'N','Y')";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_guest_menu (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','active','Heute Online', 10, 'N','Y')";

 
        // Load CSS file?
        $EXT_CSS = "Y";
 
        // Load CSS file?
        $EXT_CSS = "Y";


@@ -97,7 +97,7 @@ case "update": // Update an extension
 
        case "0.0.5": // SQL queries for v0.0.5
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD active_limit BIGINT(20) UNSIGNED NOT NULL DEFAULT '10'";
 
        case "0.0.5": // SQL queries for v0.0.5
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD active_limit BIGINT(20) UNSIGNED NOT NULL DEFAULT '10'";

-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES('setup','config_active','Aktiv-Liste','Einstellungen an der Aktiv-Liste (<STRONG>Heute Online</STRONG> im Gastbereich) vornehmen.', 8)";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES('setup','config_active','Aktiv-Liste','Einstellungen an der Aktiv-Liste (<STRONG>Heute Online</STRONG> im Gastbereich) vornehmen.', 8)";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Aktiven-Liste im Gastbereich ist nun einschr&auml;nkbar.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Aktiven-Liste im Gastbereich ist nun einschr&auml;nkbar.";

diff --git a/inc/extensions/ext-admins.php b/inc/extensions/ext-admins.php
index 427830c0c4aa5aee04ed085a144d6c7f6a149554..2fd08526e0c5da278bdcdfb850285c359bdfb3bd 100644 (file)
--- a/inc/extensions/ext-admins.php
+++ b/inc/extensions/ext-admins.php
@@ -51,9 +51,9 @@ switch ($EXT_LOAD_MODE)
 case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called)
        // SQL commands to run
        $SQLs[] = "DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_admin_menu WHERE action='admins' LIMIT 1";
 case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called)
        // SQL commands to run
        $SQLs[] = "DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_admin_menu WHERE action='admins' LIMIT 1";

-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('admins', NULL, 'Admin-Management','Administratoren anlegen, löschen oder Passwort/E-Mail Adresse ändern.','1')";
-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('admins','admins_add','Admin hinzufügen','Neuen Admin-Account anlegen','0')";
-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('admins','admins_edit','Admin-Account ändern','Bestehende Admin-Accounts bearbeiten: E-Mail-Adresse, Passwort und/oder Login-Name ändern.','1')";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('admins', NULL, 'Admin-Management','Administratoren anlegen, löschen oder Passwort/E-Mail Adresse ändern.','1')";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('admins','admins_add','Admin hinzufügen','Neuen Admin-Account anlegen','0')";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('admins','admins_edit','Admin-Account ändern','Bestehende Admin-Accounts bearbeiten: E-Mail-Adresse, Passwort und/oder Login-Name ändern.','1')";

        break;
 
 case "remove": // Do stuff when removing extension
        break;
 
 case "remove": // Do stuff when removing extension


@@ -77,7 +77,7 @@ case "update": // Update an extension
        switch ($EXT_VER)
        {
        case "0.2": // SQL queries for v0.2
        switch ($EXT_VER)
        {
        case "0.2": // SQL queries for v0.2

-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('admins','admins_contact','Admin kontaktieren','Kontaktiert einen Admin per Mail oder Nachricht (nur wenn messaging-Erweiterung installiert ist).','2')";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('admins','admins_contact','Admin kontaktieren','Kontaktiert einen Admin per Mail oder Nachricht (nur wenn messaging-Erweiterung installiert ist).','2')";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Fügt den Menüpunkt "Admin kontaktieren" hinzu.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Fügt den Menüpunkt "Admin kontaktieren" hinzu.";


@@ -85,7 +85,7 @@ case "update": // Update an extension
 
        case "0.3": // SQL queries for v0.3
                // Add admin menu
 
        case "0.3": // SQL queries for v0.3
                // Add admin menu

-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('admins','config_admins','ACL einstellen','Richten Sie Zugriffskontrollzeilen für jeden Admin individuell ein, um ihm nur bestimmte Bereiche des Admin-Bereiches zugänglich zu machen oder zu sperren.','4')";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('admins','config_admins','ACL einstellen','Richten Sie Zugriffskontrollzeilen für jeden Admin individuell ein, um ihm nur bestimmte Bereiche des Admin-Bereiches zugänglich zu machen oder zu sperren.','4')";

 
                // Which is the default setting when you create a new admin login?
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD admins_default_acl ENUM('deny','allow') NOT NULL DEFAULT 'deny'";
 
                // Which is the default setting when you create a new admin login?
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD admins_default_acl ENUM('deny','allow') NOT NULL DEFAULT 'deny'";


@@ -123,7 +123,7 @@ mail_template VARCHAR(255) NOT NULL,
 KEY (admin_id),
 PRIMARY KEY (id)
 ) TYPE=MyISAM";
 KEY (admin_id),
 PRIMARY KEY (id)
 ) TYPE=MyISAM";

-               $SQLs[] = "INSERT INTO  "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('admins','admins_mails','Admin-Mails','Stellen Sie hier ein, welcher Admin welche Mail erhalten soll. Sie können dies (derzeit) jedoch erst, wenn einmal die Mail versendet wurde!','5')";
+               $SQLs[] = "INSERT INTO  "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('admins','admins_mails','Admin-Mails','Stellen Sie hier ein, welcher Admin welche Mail erhalten soll. Sie können dies (derzeit) jedoch erst, wenn einmal die Mail versendet wurde!','5')";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Kontrollieren Sie, welche Mails welcher Admin oder alle (admin_id=0) bekommen soll oder im UserLog (admin_id=-1) verzeichnet werden soll. Standartmässig wird weiter an alle versendet.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Kontrollieren Sie, welche Mails welcher Admin oder alle (admin_id=0) bekommen soll oder im UserLog (admin_id=-1) verzeichnet werden soll. Standartmässig wird weiter an alle versendet.";

diff --git a/inc/extensions/ext-autopurge.php b/inc/extensions/ext-autopurge.php
index 1d9c2b17830655a7bbb12900a36f6cc8d98c8138..bda89153c8f5680e0596e7817bf4432d0bcaeca6 100644 (file)
--- a/inc/extensions/ext-autopurge.php
+++ b/inc/extensions/ext-autopurge.php
@@ -87,8 +87,8 @@ case "update": // Update an extension
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD ap_inactive_since BIGINT(20) UNSIGNED NOT NULL DEFAULT '2592000'";
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD ap_inactive_time BIGINT(20) UNSIGNED NOT NULL DEFAULT '25200'";
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD ap_unconfirmed_time BIGINT(20) UNSIGNED NOT NULL DEFAULT '432000'";
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD ap_inactive_since BIGINT(20) UNSIGNED NOT NULL DEFAULT '2592000'";
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD ap_inactive_time BIGINT(20) UNSIGNED NOT NULL DEFAULT '25200'";
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD ap_unconfirmed_time BIGINT(20) UNSIGNED NOT NULL DEFAULT '432000'";

-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('setup','config_autopurge','Auto-Löschung','Automatisch inaktive oder nicht bestätigte Accounts löschen.','12')";
-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('user','list_autopurge','Inaktive finden','Lassen Sie sich vor dem täglichen Reset anzeigen, welche Mitglieder als inaktiv erkannt werden und welche gelöscht werden.','10')";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_autopurge','Auto-Löschung','Automatisch inaktive oder nicht bestätigte Accounts löschen.','12')";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('user','list_autopurge','Inaktive finden','Lassen Sie sich vor dem täglichen Reset anzeigen, welche Mitglieder als inaktiv erkannt werden und welche gelöscht werden.','10')";

                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD ap_notified BIGINT(20) UNSIGNED NOT NULL DEFAULT '0'";
 
                // Update notes (these will be set as task text!)
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD ap_notified BIGINT(20) UNSIGNED NOT NULL DEFAULT '0'";
 
                // Update notes (these will be set as task text!)

diff --git a/inc/extensions/ext-bank.php b/inc/extensions/ext-bank.php
index 4154f01a340d82dcdedf301a9b2022c278b85995..24e410c436c497fc02aa51c25f81237450f799c9 100644 (file)
--- a/inc/extensions/ext-bank.php
+++ b/inc/extensions/ext-bank.php
@@ -126,30 +126,30 @@ UNIQUE (account_id, tan)
 ) TYPE=MyISAM";
 
        // Admin menu queries
 ) TYPE=MyISAM";
 
        // Admin menu queries

-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('bank', NULL, 'Bank-Accounts','Verwalten Sie hier alle Bank-Accounts Ihrer Mitglieder, sowie Angebotspakete und Überweisungen.', 6)";
-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('bank','add_bank_package','Angebotspaket hinzufügen','Neues Angebotspaket erstellen.', 1)";
-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('bank','list_bank_package','Angebotspakete auflisten','Listet alle erstellten Angebotspakete auf.', 2)";
-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('bank','edit_bank_package','Angebotspaket ändern','Nach Auswahl eines Angebotspaketes können Sie dieses hier verändern. Bitte beachten Sie, dass Ihre Mitglieder keine Mail dabei erhalten!', 3)";
-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('bank','lock_bank_package','Angebotspaket ent-/sperren','Nehmen Sie Angebotspakete zur temporären Überarbeitung zuvor heraus, dann können Sie in Ruhe drüber nachdenken und Berechnungen anstellen. Freigabe ist hier auch möglich.', 4)";
-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('bank','del_bank_package','Angebotspaket löschen','Nach Auswahl eines Angebotspaketes können Sie mit abschliessender Bestätigung Angebotspakete ganz löschen. Bitte beachten Sie, dass dies nur möglich ist, wenn auch alle Accounts dieses nicht mehr nutzen!', 5)";
-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('bank','add_bank_account','Konto anlegen','Legen Sie hier Konten für die Mitglieder an (falls Ihre Mitglieder nicht zurecht kommen).', 6)";
-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('bank','list_bank_account','Konten auflisten','Auflistung aller Konto oder eines ausw&auuml;hlbaren Mitglieds.', 7)";
-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('bank','edit_bank_account','Konto ändern','Ändern Sie hier bestehende Konten, z.B. den Dispositionskredit usw. PINs und TANs sind hier nicht änderbar! Bestätigungsmails sind optional versendbar.', 8)";
-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('bank','lock_bank_account','Konto ent-/sperren','Sperren Sie hier Konten bei Bedarf. Auch das Freischalten ist hier möglich. Eine Benachrichtigung per Mail wird dann an das Mitglied ausgesendet.', 9)";
-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('bank','del_bank_account','Konto löschen','Löschen von Konten mit Bestätigungsmail. Wenn Sie ein Mitglieder-Account löschen, so müssen Sie derzeit seine angelegten Konten auch löschen!', 10)";
-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('bank','send_bank_tanlist','TAN-Liste aussenden','Listet zuerst Anfragen von Mitgliedern auf, die eine neue (i)TAN-Liste benötigen, anschliessend kann die Liste dann ausgesendet werden.', 11)";
-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('bank','lock_bank_tanlist','TAN-Liste ent-/sperren','Bestehende TAN-Listen können auf Kundenwunsch hin gesperrt und wieder entsperrt werden. Dies passiert auch, wenn der Kunde x-mal (siehe Angebotspakete) eine verkehrte TAN eingegeben hat. Einzelne TANs sind nicht ent-/sperrbar.', 12)";
-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('bank','list_bank_trans','Überweisungen auflisten','Nach Auswahl eines Mitgliedes und einem Konto (benötgt JavaScript!) können Sie seitenweise die Überweisungen durchschauen.', 13)";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('bank', NULL, 'Bank-Accounts','Verwalten Sie hier alle Bank-Accounts Ihrer Mitglieder, sowie Angebotspakete und Überweisungen.', 6)";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('bank','add_bank_package','Angebotspaket hinzufügen','Neues Angebotspaket erstellen.', 1)";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('bank','list_bank_package','Angebotspakete auflisten','Listet alle erstellten Angebotspakete auf.', 2)";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('bank','edit_bank_package','Angebotspaket ändern','Nach Auswahl eines Angebotspaketes können Sie dieses hier verändern. Bitte beachten Sie, dass Ihre Mitglieder keine Mail dabei erhalten!', 3)";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('bank','lock_bank_package','Angebotspaket ent-/sperren','Nehmen Sie Angebotspakete zur temporären Überarbeitung zuvor heraus, dann können Sie in Ruhe drüber nachdenken und Berechnungen anstellen. Freigabe ist hier auch möglich.', 4)";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('bank','del_bank_package','Angebotspaket löschen','Nach Auswahl eines Angebotspaketes können Sie mit abschliessender Bestätigung Angebotspakete ganz löschen. Bitte beachten Sie, dass dies nur möglich ist, wenn auch alle Accounts dieses nicht mehr nutzen!', 5)";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('bank','add_bank_account','Konto anlegen','Legen Sie hier Konten für die Mitglieder an (falls Ihre Mitglieder nicht zurecht kommen).', 6)";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('bank','list_bank_account','Konten auflisten','Auflistung aller Konto oder eines ausw&auuml;hlbaren Mitglieds.', 7)";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('bank','edit_bank_account','Konto ändern','Ändern Sie hier bestehende Konten, z.B. den Dispositionskredit usw. PINs und TANs sind hier nicht änderbar! Bestätigungsmails sind optional versendbar.', 8)";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('bank','lock_bank_account','Konto ent-/sperren','Sperren Sie hier Konten bei Bedarf. Auch das Freischalten ist hier möglich. Eine Benachrichtigung per Mail wird dann an das Mitglied ausgesendet.', 9)";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('bank','del_bank_account','Konto löschen','Löschen von Konten mit Bestätigungsmail. Wenn Sie ein Mitglieder-Account löschen, so müssen Sie derzeit seine angelegten Konten auch löschen!', 10)";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('bank','send_bank_tanlist','TAN-Liste aussenden','Listet zuerst Anfragen von Mitgliedern auf, die eine neue (i)TAN-Liste benötigen, anschliessend kann die Liste dann ausgesendet werden.', 11)";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('bank','lock_bank_tanlist','TAN-Liste ent-/sperren','Bestehende TAN-Listen können auf Kundenwunsch hin gesperrt und wieder entsperrt werden. Dies passiert auch, wenn der Kunde x-mal (siehe Angebotspakete) eine verkehrte TAN eingegeben hat. Einzelne TANs sind nicht ent-/sperrbar.', 12)";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('bank','list_bank_trans','Überweisungen auflisten','Nach Auswahl eines Mitgliedes und einem Konto (benötgt JavaScript!) können Sie seitenweise die Überweisungen durchschauen.', 13)";

 
        // Member menu
 
        // Member menu

-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, visible, locked, sort) VALUES ('bank', NULL, 'Bank-Account','N','Y', 3)";
-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, visible, locked, sort) VALUES ('bank','bank_infos','Angebotspakete','N','Y', 1)";
-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, visible, locked, sort) VALUES ('bank','bank_create','Konto anlegen','N','Y', 2)";
-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, visible, locked, sort) VALUES ('bank','bank_deposit','Einzahlen','N','Y', 3)";
-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, visible, locked, sort) VALUES ('bank','bank_withdraw','Auszahlen','N','Y', 4)";
-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, visible, locked, sort) VALUES ('bank','bank_output','Kontoauszug','N','Y', 5)";
-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, visible, locked, sort) VALUES ('bank','bank_change','Paket wechseln','N','Y', 6)";
-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, visible, locked, sort) VALUES ('bank','bank_remove','Kündigen','N','Y', 7)";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('bank', NULL, 'Bank-Account','N','Y', 3)";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('bank','bank_infos','Angebotspakete','N','Y', 1)";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('bank','bank_create','Konto anlegen','N','Y', 2)";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('bank','bank_deposit','Einzahlen','N','Y', 3)";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('bank','bank_withdraw','Auszahlen','N','Y', 4)";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('bank','bank_output','Kontoauszug','N','Y', 5)";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('bank','bank_change','Paket wechseln','N','Y', 6)";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('bank','bank_remove','Kündigen','N','Y', 7)";

        break;
 
 case "remove": // Do stuff when removing extension
        break;
 
 case "remove": // Do stuff when removing extension

diff --git a/inc/extensions/ext-beg.php b/inc/extensions/ext-beg.php
index a0dacc28554230da307dd4790f43338e6b6784d7..9adc3583d9b470cf3be3df978b89cbec157508ef 100644 (file)
--- a/inc/extensions/ext-beg.php
+++ b/inc/extensions/ext-beg.php
@@ -50,9 +50,9 @@ switch ($EXT_LOAD_MODE)
 {
 case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called)
        // SQL commands to run
 {
 case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called)
        // SQL commands to run

-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES('setup','config_beg','Bettel-Link','IP-Sperre, {!POINTS!}-Vergütung usw. können Sie hier einstellen.', 10)";
-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_guest_menu (action, what, title, sort, visible, locked) VALUES ('main','beg','{!POINTS!} erbetteln!', 4, 'Y','Y')";
-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, sort, visible, locked) VALUES ('main','beg','Ihr Bettel-Link', 6, 'Y','Y')";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES('setup','config_beg','Bettel-Link','IP-Sperre, {!POINTS!}-Vergütung usw. können Sie hier einstellen.', 10)";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_guest_menu (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','beg','{!POINTS!} erbetteln!',4,'Y','Y')";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','beg','Ihr Bettel-Link',6,'Y','Y')";

        $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD beg_timeout BIGINT(20) UNSIGNED NOT NULL DEFAULT '600'";
        $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD beg_uid_timeout BIGINT(20) UNSIGNED NOT NULL DEFAULT '1800'";
        $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD beg_points DOUBLE(20,5) UNSIGNED NOT NULL DEFAULT '0.00100'";
        $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD beg_timeout BIGINT(20) UNSIGNED NOT NULL DEFAULT '600'";
        $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD beg_uid_timeout BIGINT(20) UNSIGNED NOT NULL DEFAULT '1800'";
        $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD beg_points DOUBLE(20,5) UNSIGNED NOT NULL DEFAULT '0.00100'";


@@ -161,8 +161,8 @@ case "update": // Update an extension
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD beg_points DOUBLE(21,5) NOT NULL DEFAULT '0.00000'";
                $VIS = "N"; $LOCKED = "Y";
                if (EXT_IS_ACTIVE("beg")) { $VIS = "Y"; $LOCKED = "N"; }
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD beg_points DOUBLE(21,5) NOT NULL DEFAULT '0.00000'";
                $VIS = "N"; $LOCKED = "Y";
                if (EXT_IS_ACTIVE("beg")) { $VIS = "Y"; $LOCKED = "N"; }

-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, visible, locked, sort) VALUES ('main','beg2','Bettel-Rallye','".$VIS."','".$LOCKED."','7')";
-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES('user','list_beg','Bettel-Rallye','Listet alle Teilnehmer der monatlichen Bettel-Rallye auf.','12')";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('main','beg2','Bettel-Rallye','".$VIS."','".$LOCKED."','7')";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES('user','list_beg','Bettel-Rallye','Listet alle Teilnehmer der monatlichen Bettel-Rallye auf.','12')";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Optionale Bettel-Rallye möglich. Und die erbettelten {!POINTS!} können entweder nur dem bettelndem Mitglied direkt oder auch seinem Werber gutgeschrieben werden können.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Optionale Bettel-Rallye möglich. Und die erbettelten {!POINTS!} können entweder nur dem bettelndem Mitglied direkt oder auch seinem Werber gutgeschrieben werden können.";

diff --git a/inc/extensions/ext-birthday.php b/inc/extensions/ext-birthday.php
index 0c4d8d80d1616efcc8322cda86dd01825d52d62e..94f1ae0667f8c26b2faa3d82e127fa5644c9b009 100644 (file)
--- a/inc/extensions/ext-birthday.php
+++ b/inc/extensions/ext-birthday.php
@@ -89,7 +89,7 @@ chk_value VARCHAR(255) NOT NULL DEFAULT '',
 KEY(userid),
 PRIMARY KEY(id)
 ) Type=MyISAM";
 KEY(userid),
 PRIMARY KEY(id)
 ) Type=MyISAM";

-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('setup','config_birthday','Geburtstagsmails','Stellen Sie hier ein, ob die Mitglieder {!POINTS!} (nicht automatisch) gutgeschrieben kommen sollen oder nicht.', 9)";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_birthday','Geburtstagsmails','Stellen Sie hier ein, ob die Mitglieder {!POINTS!} (nicht automatisch) gutgeschrieben kommen sollen oder nicht.', 9)";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Es kann nun eine Gutschrift an die Geburtstagmail angehängt werden. Diese wird erst beim Klick auf einen Bestätigungslink gutgeschrieben.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Es kann nun eine Gutschrift an die Geburtstagmail angehängt werden. Diese wird erst beim Klick auf einen Bestätigungslink gutgeschrieben.";

diff --git a/inc/extensions/ext-bonus.php b/inc/extensions/ext-bonus.php
index 33704b410131559cd23b84ebd1558f4c78d66dda..9787b3e02dcc73ee5a2d290e3d554db14aa68535 100644 (file)
--- a/inc/extensions/ext-bonus.php
+++ b/inc/extensions/ext-bonus.php
@@ -227,7 +227,7 @@ KEY userid (userid)
                break;
 
        case "0.3.4": // SQL queries for v0.3.4
                break;
 
        case "0.3.4": // SQL queries for v0.3.4

-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('user','list_bonus','Aktiv-Rallye-Teilnehmer','Listet alle Mitglieder auf, die einen Aktiv-Bonus haben und zeigt die derzeit möglichen Gewinner an.', 10)";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('user','list_bonus','Aktiv-Rallye-Teilnehmer','Listet alle Mitglieder auf, die einen Aktiv-Bonus haben und zeigt die derzeit möglichen Gewinner an.', 10)";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Link <U>Aktiv-Rallye-Teilnehmer</U> hinzugef&uuml;gt, inklusive manuelle Vorbereitung der Verg&uuml;tung.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Link <U>Aktiv-Rallye-Teilnehmer</U> hinzugef&uuml;gt, inklusive manuelle Vorbereitung der Verg&uuml;tung.";

diff --git a/inc/extensions/ext-cache.php b/inc/extensions/ext-cache.php
index b5c5977bfe6f4e86c0ffcc2409890ad5724e44c9..b57a15f2b377dbf66f98eb31c1f8d5ed3508aa75 100644 (file)
--- a/inc/extensions/ext-cache.php
+++ b/inc/extensions/ext-cache.php
@@ -54,7 +54,7 @@ case "register": // Do stuff when installtion is running (modules.php?module=adm
        $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD cache_update BIGINT(20) UNSIGNED NOT NULL DEFAULT '3600'";
        $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD cache_path VARCHAR(255) NOT NULL DEFAULT 'cache/'";
        $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD cache_tested tinyint(1) NOT NULL DEFAULT '0'";
        $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD cache_update BIGINT(20) UNSIGNED NOT NULL DEFAULT '3600'";
        $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD cache_path VARCHAR(255) NOT NULL DEFAULT 'cache/'";
        $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD cache_tested tinyint(1) NOT NULL DEFAULT '0'";

-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('setup','config_cache','Cache-Einstellungen','Update-Interval des Caches usw. können Sie hier ändern.', 9)";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_cache','Cache-Einstellungen','Update-Interval des Caches usw. können Sie hier ändern.', 9)";

        break;
 
 case "remove": // Do stuff when removing extension
        break;
 
 case "remove": // Do stuff when removing extension


@@ -113,7 +113,7 @@ case "update": // Update an extension
        case "0.0.7": // SQL queries for v0.0.7
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD db_hits BIGINT(20) UNSIGNED NOT NULL DEFAULT '0'";
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD cache_hits BIGINT(20) UNSIGNED NOT NULL DEFAULT '0'";
        case "0.0.7": // SQL queries for v0.0.7
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD db_hits BIGINT(20) UNSIGNED NOT NULL DEFAULT '0'";
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD cache_hits BIGINT(20) UNSIGNED NOT NULL DEFAULT '0'";

-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('stats','cache_stats','DB-Cache','Auf Cache und gesamte Datenbank registrierte Anfragen anzeigen.', 4)";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('stats','cache_stats','DB-Cache','Auf Cache und gesamte Datenbank registrierte Anfragen anzeigen.', 4)";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Hits auf den Cache werden gezählt.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Hits auf den Cache werden gezählt.";

diff --git a/inc/extensions/ext-country.php b/inc/extensions/ext-country.php
index 13052bde5d203d8f71ec957ada8af2b853f49315..c1bfb2b7b18e2d43078b2dc2d19e79b03f04d0f1 100644 (file)
--- a/inc/extensions/ext-country.php
+++ b/inc/extensions/ext-country.php
@@ -62,8 +62,8 @@ PRIMARY KEY(id)
        $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_countries (code, descr, is_active) VALUES ('DE','Deutschland','Y')";
 
        // Admin menu
        $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_countries (code, descr, is_active) VALUES ('DE','Deutschland','Y')";
 
        // Admin menu

-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES('country', NULL, 'Ländercodes verwalten','Stellen Sie hier Ländercodes ein, damit auch internationale Mitglieder sich zu Ihrem ".MT_WORD." anmelden können.', 8)";
-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES('country','list_country','Verwalten','Hinzufügen, Ändern und Löschen von Ländercodes.', 1)";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES('country', NULL, 'Ländercodes verwalten','Stellen Sie hier Ländercodes ein, damit auch internationale Mitglieder sich zu Ihrem ".MT_WORD." anmelden können.', 8)";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES('country','list_country','Verwalten','Hinzufügen, Ändern und Löschen von Ländercodes.', 1)";

 
        // Add entry to user table
        $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD country_code BIGINT(20) UNSIGNED NOT NULL DEFAULT '1'";
 
        // Add entry to user table
        $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD country_code BIGINT(20) UNSIGNED NOT NULL DEFAULT '1'";

diff --git a/inc/extensions/ext-doubler.php b/inc/extensions/ext-doubler.php
index 66eadecfcb1b5b26278c2c3d8aff58c5f27f3c10..c2bf7992cd847904f0d4fca92b43519e40a92844 100644 (file)
--- a/inc/extensions/ext-doubler.php
+++ b/inc/extensions/ext-doubler.php
@@ -104,15 +104,15 @@ PRIMARY KEY(id)
        // --- MENU SYSTEMS ---
        //
        // Admin menu
        // --- MENU SYSTEMS ---
        //
        // Admin menu

-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('doubler', NULL, '{!POINTS!}-Verdoppler','Einstellungen und Einträge auflisten.', 4)";
-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('doubler','list_doubler','Auflisten','Einträge aus der Verdiensttabelle auflisten', 1)";
-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('doubler','config_doubler','Einstellungen','Prozentuale Gebühr usw. einstellen.', 2)";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('doubler', NULL, '{!POINTS!}-Verdoppler','Einstellungen und Einträge auflisten.', 4)";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('doubler','list_doubler','Auflisten','Einträge aus der Verdiensttabelle auflisten', 1)";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('doubler','config_doubler','Einstellungen','Prozentuale Gebühr usw. einstellen.', 2)";

 
        // Guest menu (informations / default doubler link)
 
        // Guest menu (informations / default doubler link)

-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_guest_menu (action, what, title, sort, visible, locked) VALUES ('main','doubler','Verdoppeln!', 3, 'Y','Y')";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_guest_menu (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','doubler','Verdoppeln!',3,'Y','Y')";

 
        // Member menu
 
        // Member menu

-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, visible, locked, sort) VALUES ('main','doubler','Verdoppeln!','Y','Y', 7)";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('main','doubler','Verdoppeln!','Y','Y',7)";

        break;
 
 case "remove": // Do stuff when removing extension
        break;
 
 case "remove": // Do stuff when removing extension

diff --git a/inc/extensions/ext-holiday.php b/inc/extensions/ext-holiday.php
index 43c5459af375516c40215da5657b23406eb9c287..5a8c2a98236b032b6c1555a3dcf2fa52e1419f59 100644 (file)
--- a/inc/extensions/ext-holiday.php
+++ b/inc/extensions/ext-holiday.php
@@ -65,7 +65,7 @@ PRIMARY KEY(id)
        $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD holiday_max BIGINT(20) UNSIGNED NOT NULL DEFAULT '30'";
 
        // Add member menu
        $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD holiday_max BIGINT(20) UNSIGNED NOT NULL DEFAULT '30'";
 
        // Add member menu

-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, sort, visible, locked) VALUES ('main','holiday','Urlaubsschaltung','4','Y','Y')";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','holiday','Urlaubsschaltung','4','Y','Y')";

 
        // Add admin menus
        $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, sort, descr) VALUES ('holiday', NULL, 'Urlaubsmanagement','4','Hier können Sie Urlaubsschaltungen Ihrer Mitglieder auflisten oder auch wieder aufheben.')";
 
        // Add admin menus
        $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, sort, descr) VALUES ('holiday', NULL, 'Urlaubsmanagement','4','Hier können Sie Urlaubsschaltungen Ihrer Mitglieder auflisten oder auch wieder aufheben.')";

diff --git a/inc/extensions/ext-html_mail.php b/inc/extensions/ext-html_mail.php
index 01a98f8bc2f0a3fdfa6e487b4287ad2d83a46a87..aa270798f125baf18c914472cc2e0b21ee493192 100644 (file)
--- a/inc/extensions/ext-html_mail.php
+++ b/inc/extensions/ext-html_mail.php
@@ -53,7 +53,7 @@ case "register": // Do stuff when installtion is running (modules.php?module=adm
        $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD html ENUM('Y','N') NOT NULL DEFAULT 'Y'";
        $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_bonus ADD html_msg ENUM('Y','N') NOT NULL DEFAULT 'N'";
        $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_pool ADD html_msg ENUM('Y','N') NOT NULL DEFAULT 'N'";
        $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD html ENUM('Y','N') NOT NULL DEFAULT 'Y'";
        $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_bonus ADD html_msg ENUM('Y','N') NOT NULL DEFAULT 'N'";
        $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_pool ADD html_msg ENUM('Y','N') NOT NULL DEFAULT 'N'";

-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, sort, visible, locked) VALUES ('main','html_mail','HTML-Empfang','3','Y','Y')";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','html_mail','HTML-Empfang','3','Y','Y')";

        break;
 
 case "remove": // Do stuff when removing extension
        break;
 
 case "remove": // Do stuff when removing extension

diff --git a/inc/extensions/ext-maintenance.php b/inc/extensions/ext-maintenance.php
index 0b100a3f04480b49b33d191e443de8767d72dddb..e3e299e2db2840b7469c7e1afd01de4f32781554 100644 (file)
--- a/inc/extensions/ext-maintenance.php
+++ b/inc/extensions/ext-maintenance.php
@@ -51,7 +51,7 @@ switch ($EXT_LOAD_MODE)
 case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called)
        // SQL commands to run
        $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD maintenance ENUM('Y','N') NOT NULL DEFAULT 'N';";
 case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called)
        // SQL commands to run
        $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD maintenance ENUM('Y','N') NOT NULL DEFAULT 'N';";

-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES('setup','maintenance','Wartungsmodus','Schalten Sie den Wartungsmodus ein, nur wenn sehr schwerwiegende Fehler vorliegen, die Sie oder mxchange.org nicht schenll genug beheben können.','10')";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES('setup','maintenance','Wartungsmodus','Schalten Sie den Wartungsmodus ein, nur wenn sehr schwerwiegende Fehler vorliegen, die Sie oder mxchange.org nicht schenll genug beheben können.','10')";

        break;
 
 case "remove": // Do stuff when removing extension
        break;
 
 case "remove": // Do stuff when removing extension

diff --git a/inc/extensions/ext-mediadata.php b/inc/extensions/ext-mediadata.php
index d585b7f71bb34d8d2f7ec4e7bae7316f9baa8bf2..2b13616708c6c568ca9bae8d94f1f7003de38d1f 100644 (file)
--- a/inc/extensions/ext-mediadata.php
+++ b/inc/extensions/ext-mediadata.php
@@ -113,7 +113,7 @@ PRIMARY KEY(media_key)
        case "0.0.7": // SQL queries for v0.0.7
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD mt_start BIGINT(20) UNSIGNED NOT NULL DEFAULT '0'";
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD mt_stage BIGINT(20) UNSIGNED NOT NULL DEFAULT '500'";
        case "0.0.7": // SQL queries for v0.0.7
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD mt_start BIGINT(20) UNSIGNED NOT NULL DEFAULT '0'";
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD mt_stage BIGINT(20) UNSIGNED NOT NULL DEFAULT '500'";

-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES('setup','config_mediadata','Mediendaten','Stellen Sie allgemeine Einstellungen zu den Mediendaten ein.', 10)";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES('setup','config_mediadata','Mediendaten','Stellen Sie allgemeine Einstellungen zu den Mediendaten ein.', 10)";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Start des ".MT_WORD2." und Anzahl Anmeldungen aufgenommen. (Task #13)<br />
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Start des ".MT_WORD2." und Anzahl Anmeldungen aufgenommen. (Task #13)<br />

diff --git a/inc/extensions/ext-mods.php b/inc/extensions/ext-mods.php
index 6d61d4afd6890c60fb5d9c92d0f50c7ebe7dd5c0..506759b45e304f8377cacc602459253e5b873482 100644 (file)
--- a/inc/extensions/ext-mods.php
+++ b/inc/extensions/ext-mods.php
@@ -50,9 +50,9 @@ switch ($EXT_LOAD_MODE)
 {
 case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called)
        // SQL commands to run
 {
 case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called)
        // SQL commands to run

-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('mods', NULL, 'Modul-Management','Verwalten Sie die Basis-Module index, login, admin usw.', 4)";
-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('mods','config_mods','Module ändern','Ändern Sie hier die Zugtiffsrechte auf die Module. Was dennoch nicht geht: Mitglied- oder Gastzugriffsrtechte auf Admin-Module bzw. Gastzugriffsrechte auf Mitglieder-Module. Diese sind extra abgesichert.', 1)";
-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('mods','stats_mods','Modul-Statistiken','Sehen Sie sich hier die Statistiken der Module und die damit verknüpften action- und what-Dateien an. Bei einigen Modulen gibt es allerdings keine verknüpften Dateien und somit keine Extra-Statistik.', 2)";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('mods', NULL, 'Modul-Management','Verwalten Sie die Basis-Module index, login, admin usw.', 4)";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('mods','config_mods','Module ändern','Ändern Sie hier die Zugtiffsrechte auf die Module. Was dennoch nicht geht: Mitglied- oder Gastzugriffsrtechte auf Admin-Module bzw. Gastzugriffsrechte auf Mitglieder-Module. Diese sind extra abgesichert.', 1)";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('mods','stats_mods','Modul-Statistiken','Sehen Sie sich hier die Statistiken der Module und die damit verknüpften action- und what-Dateien an. Bei einigen Modulen gibt es allerdings keine verknüpften Dateien und somit keine Extra-Statistik.', 2)";

        break;
 
 case "remove": // Do stuff when removing extension
        break;
 
 case "remove": // Do stuff when removing extension

diff --git a/inc/extensions/ext-newsletter.php b/inc/extensions/ext-newsletter.php
index fbb0581c90f21308c32e7497386c25383ae73a77..89757dba25ebfbfaaa8313fe1ec139b42cf4ec50 100644 (file)
--- a/inc/extensions/ext-newsletter.php
+++ b/inc/extensions/ext-newsletter.php
@@ -73,11 +73,11 @@ case "update": // Update an extension
        switch ($EXT_VER)
        {
        case "0.0.1": // SQL queries for v0.0.1
        switch ($EXT_VER)
        {
        case "0.0.1": // SQL queries for v0.0.1

-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('newsletter', NULL, 'Newsletter','Einstellungen am Newsletter, Newsletter versenden, Abbestellungen auflisten usw.', 3)";
-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('newsletter','list_newsletter','Abbestellungen','Alle Abbestellungen auflisten und bearbeiten.', 2)";
-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('newsletter','config_newsletter','Einstellungen','Gebühr zum Abbestellen des Newsletters usw. sind hier einstellbar.', 3)";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('newsletter', NULL, 'Newsletter','Einstellungen am Newsletter, Newsletter versenden, Abbestellungen auflisten usw.', 3)";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('newsletter','list_newsletter','Abbestellungen','Alle Abbestellungen auflisten und bearbeiten.', 2)";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('newsletter','config_newsletter','Einstellungen','Gebühr zum Abbestellen des Newsletters usw. sind hier einstellbar.', 3)";

                $SQLs[] = "UPDATE "._MYSQL_PREFIX."_admin_menu SET action='newsletter', what='send_newsletter', title='Versenden', sort='1' WHERE what='newsletter' LIMIT 1";
                $SQLs[] = "UPDATE "._MYSQL_PREFIX."_admin_menu SET action='newsletter', what='send_newsletter', title='Versenden', sort='1' WHERE what='newsletter' LIMIT 1";

-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, visible, locked, sort) VALUES ('main','newsletter','Newsletter-Empfang','N','Y', 10)";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('main','newsletter','Newsletter-Empfang','N','Y', 10)";

                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD nl_charge FLOAT(10,2) UNSIGNED NOT NULL DEFAULT '5.00'";
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD nl_receive ENUM('Y','N') NOT NULL DEFAULT 'Y'";
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD nl_until VARCHAR(10) NOT NULL DEFAULT '0'";
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD nl_charge FLOAT(10,2) UNSIGNED NOT NULL DEFAULT '5.00'";
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD nl_receive ENUM('Y','N') NOT NULL DEFAULT 'Y'";
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD nl_until VARCHAR(10) NOT NULL DEFAULT '0'";

diff --git a/inc/extensions/ext-nickname.php b/inc/extensions/ext-nickname.php
index 76a5f625a4c1d4b002fd1c6bf92a4a6b23ed492c..f226afa7cf92e82dd0128262de974374733ad2a1 100644 (file)
--- a/inc/extensions/ext-nickname.php
+++ b/inc/extensions/ext-nickname.php
@@ -52,7 +52,7 @@ case "register": // Do stuff when installtion is running (modules.php?module=adm
        // SQL commands to run
        $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD nickname VARCHAR(255) NOT NULL DEFAULT ''";
        $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD nick_uid ENUM ('nick','uid') NOT NULL DEFAULT 'uid'";
        // SQL commands to run
        $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD nickname VARCHAR(255) NOT NULL DEFAULT ''";
        $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD nick_uid ENUM ('nick','uid') NOT NULL DEFAULT 'uid'";

-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, sort, visible, locked) VALUES ('main','nickname','Nicknamen','5','Y','Y')";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','nickname','Nicknamen','5','Y','Y')";

 
        // Load CSS file?
        $EXT_CSS = "Y";
 
        // Load CSS file?
        $EXT_CSS = "Y";


@@ -107,7 +107,7 @@ case "update": // Update an extension
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD nickname_len TINYINT(3) UNSIGNED NOT NULL DEFAULT '5'";
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD nickname_pattern VARCHAR(255) NOT NULL DEFAULT 'a-zA-Z0-9_'";
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD nickname_chars VARCHAR(255) NOT NULL DEFAULT 'a-z, A-Z, 0-9, _'";
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD nickname_len TINYINT(3) UNSIGNED NOT NULL DEFAULT '5'";
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD nickname_pattern VARCHAR(255) NOT NULL DEFAULT 'a-zA-Z0-9_'";
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD nickname_chars VARCHAR(255) NOT NULL DEFAULT 'a-z, A-Z, 0-9, _'";

-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES('setup','config_nickname','Nicknamen','Stellen Sie minimale Nicknamenlänge, sowie erlaubte Zeichen hier ein.', 12)";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES('setup','config_nickname','Nicknamen','Stellen Sie minimale Nicknamenlänge, sowie erlaubte Zeichen hier ein.', 12)";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Minimale Länge, sowie erlaubte Zeichen sind per Adminbereich änderbar. Setzen Sie als erlaubte Zeichen nur URL-konforme Zeichen ein!";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Minimale Länge, sowie erlaubte Zeichen sind per Adminbereich änderbar. Setzen Sie als erlaubte Zeichen nur URL-konforme Zeichen ein!";


@@ -178,7 +178,7 @@ case "update": // Update an extension
                break;
 
        case "0.1.9": // SQL queries for v0.1.9
                break;
 
        case "0.1.9": // SQL queries for v0.1.9

-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES('user','list_nickname','Nickname-Historie','Listet alle verwendeten Nicknames der Mitglieder auf.', 12)";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES('user','list_nickname','Nickname-Historie','Listet alle verwendeten Nicknames der Mitglieder auf.', 12)";

                $SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_nickname_history";
                $SQLs[] = "CREATE TABLE "._MYSQL_PREFIX."_nickname_history (
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
                $SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_nickname_history";
                $SQLs[] = "CREATE TABLE "._MYSQL_PREFIX."_nickname_history (
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,

diff --git a/inc/extensions/ext-online.php b/inc/extensions/ext-online.php
index eea20c913c98aca54118e3edfbbaf91a8d7fc33f..196d3cfe6bef3b8210f88f1f688924f575ae9736 100644 (file)
--- a/inc/extensions/ext-online.php
+++ b/inc/extensions/ext-online.php
@@ -67,7 +67,7 @@ PRIMARY KEY(id),
 KEY(userid),
 KEY(refid)
 ) TYPE=MyISAM";
 KEY(userid),
 KEY(refid)
 ) TYPE=MyISAM";

-       $SQLs[]="INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES('misc','usr_online','Online-Statistik','Eine Liste von derzeit "Online" Usern. Doppelte Einträge könnte auf mangelnden Cookie-Support des Browsers oder auf einen Spider hindeuten.', 1)";
+       $SQLs[]="INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES('misc','usr_online','Online-Statistik','Eine Liste von derzeit "Online" Usern. Doppelte Einträge könnte auf mangelnden Cookie-Support des Browsers oder auf einen Spider hindeuten.', 1)";

        break;
 
 case "remove": // Do stuff when removing extension
        break;
 
 case "remove": // Do stuff when removing extension

diff --git a/inc/extensions/ext-optimize.php b/inc/extensions/ext-optimize.php
index 0437c75a029ff3a20efe8e47cf0960859f9a19e6..695c60b100bed6fe363aa6ed44cf87f6f0f6a623 100644 (file)
--- a/inc/extensions/ext-optimize.php
+++ b/inc/extensions/ext-optimize.php
@@ -55,7 +55,7 @@ case "register": // Do stuff when installtion is running (modules.php?module=adm
   gain decimal(10,3) NOT NULL DEFAULT '0.000',
   PRIMARY KEY(id)
 ) TYPE=MyISAM";
   gain decimal(10,3) NOT NULL DEFAULT '0.000',
   PRIMARY KEY(id)
 ) TYPE=MyISAM";

-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('misc','optimize','DB optimieren','Führen Sie dies ab und an aus, damit überflüssige Daten aus der Datenbank entfernt werden.','5')";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('misc','optimize','DB optimieren','Führen Sie dies ab und an aus, damit überflüssige Daten aus der Datenbank entfernt werden.','5')";

        break;
 
 case "remove": // Do stuff when removing extension
        break;
 
 case "remove": // Do stuff when removing extension

diff --git a/inc/extensions/ext-order.php b/inc/extensions/ext-order.php
index a7d0b9c2606714430a0933bf2b9cf37abb8988ba..56d730d0bdaacd08dc9d2ab47d2cdef3570a7db3 100644 (file)
--- a/inc/extensions/ext-order.php
+++ b/inc/extensions/ext-order.php
@@ -271,8 +271,8 @@ nicht die vom Mitglied eingegebene. Resultat: Das Script beschwerte sich, der Us
                break;
 
        case "0.4.6": // SQL queries for v0.4.6
                break;
 
        case "0.4.6": // SQL queries for v0.4.6

-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, sort, visible, locked) VALUES ('order', NULL, 'Mailbuchungen', 3, 'Y','N')";
-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, sort, visible, locked) VALUES ('order','order2','Framekiller-Mails', 2, 'Y','N')";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('order',NULL,'Mailbuchungen',3,'Y','N')";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('order','order2','Framekiller-Mails',2,'Y','N')";

                $SQLs[] = "UPDATE "._MYSQL_PREFIX."_member_menu SET action='order', sort='1', title='Klick-Mails' WHERE what='order' LIMIT 1";
 
                // Update notes (these will be set as task text!)
                $SQLs[] = "UPDATE "._MYSQL_PREFIX."_member_menu SET action='order', sort='1', title='Klick-Mails' WHERE what='order' LIMIT 1";
 
                // Update notes (these will be set as task text!)

diff --git a/inc/extensions/ext-payout.php b/inc/extensions/ext-payout.php
index 029dcd91354d59daaa5dd06189560ead00b0a9ff..c11afdca2615d09c8fff91fefa87e720dfc4fff2 100644 (file)
--- a/inc/extensions/ext-payout.php
+++ b/inc/extensions/ext-payout.php
@@ -72,9 +72,9 @@ rate DOUBLE(22,3) UNSIGNED NOT NULL DEFAULT '0.000',
 min_points BIGINT(20) UNSIGNED NOT NULL DEFAULT '0',
 PRIMARY KEY(id)
 ) TYPE=MyISAM";
 min_points BIGINT(20) UNSIGNED NOT NULL DEFAULT '0',
 PRIMARY KEY(id)
 ) TYPE=MyISAM";

-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES('setup','config_payouts','Auszahlungen','Auszahlungsarten einstellen, neu anlegen oder löschen.','15')";
-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES('payouts','list_payouts','Anfragen auflisten','Listet alle Auszahlungsanfragen Ihrer Mitglieder auf.','16')";
-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, visible, locked, sort) VALUES('main','payout','Auszahlungen','N','N','11')";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES('setup','config_payouts','Auszahlungen','Auszahlungsarten einstellen, neu anlegen oder löschen.','15')";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES('payouts','list_payouts','Anfragen auflisten','Listet alle Auszahlungsanfragen Ihrer Mitglieder auf.','16')";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES('main','payout','Auszahlungen','N','N','11')";

        break;
 
 case "remove": // Do stuff when removing extension
        break;
 
 case "remove": // Do stuff when removing extension


@@ -99,7 +99,7 @@ case "update": // Update an extension
        switch ($EXT_VER)
        {
        case "0.1.2": // SQL queries for v0.1.2
        switch ($EXT_VER)
        {
        case "0.1.2": // SQL queries for v0.1.2

-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES('payouts', NULL, 'Auszahlungsmanagement','Management der Auszahlungsarten.','8')";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES('payouts', NULL, 'Auszahlungsmanagement','Management der Auszahlungsarten.','8')";

                $SQLs[] = "UPDATE "._MYSQL_PREFIX."_admin_menu SET action='payouts', title='Einstellungen' WHERE action='setup' AND what='config_payouts' LIMIT 1";
                break;
 
                $SQLs[] = "UPDATE "._MYSQL_PREFIX."_admin_menu SET action='payouts', title='Einstellungen' WHERE action='setup' AND what='config_payouts' LIMIT 1";
                break;
 

diff --git a/inc/extensions/ext-primera.php b/inc/extensions/ext-primera.php
index 4ea33b11c2cfa2f9954e883ddc0b50bbee842ad5..8e2253d0e536dbb8216a96c1a310350e9f220485 100644 (file)
--- a/inc/extensions/ext-primera.php
+++ b/inc/extensions/ext-primera.php
@@ -74,12 +74,12 @@ PRIMARY KEY(id)
        $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD primera_userid VARCHAR(255) NOT NULL DEFAULT ''";
 
        // Admin menu
        $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD primera_userid VARCHAR(255) NOT NULL DEFAULT ''";
 
        // Admin menu

-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES('primera', NULL, 'Primera-Management','Konfiguration zur Primera-API einstellen, Auszahlungen auflisten usw..', 15)";
-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES('primera','config_primera','Primera-API-Einstellungen','Konfiguration zur Primera-API einstellen.', 1)";
-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES('primera','list_primera','Primera-Anfragen auflisten','Listet alle Primera-Auszahlungsanfragen Ihrer Mitglieder auf.', 2)";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES('primera', NULL, 'Primera-Management','Konfiguration zur Primera-API einstellen, Auszahlungen auflisten usw..', 15)";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES('primera','config_primera','Primera-API-Einstellungen','Konfiguration zur Primera-API einstellen.', 1)";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES('primera','list_primera','Primera-Anfragen auflisten','Listet alle Primera-Auszahlungsanfragen Ihrer Mitglieder auf.', 2)";

 
        // Member menu
 
        // Member menu

-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, visible, locked, sort) VALUES('main','primera','Primera-Ein-/Auszahlungen','N','N','11')";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES('main','primera','Primera-Ein-/Auszahlungen','N','N','11')";

        break;
 
 case "remove": // Do stuff when removing extension
        break;
 
 case "remove": // Do stuff when removing extension

diff --git a/inc/extensions/ext-rallye.php b/inc/extensions/ext-rallye.php
index b6c1e76399d5f3224077ae1d7182ef1124b88400..4424c369a3125b1bf14070b6de1378996b8a64c6 100644 (file)
--- a/inc/extensions/ext-rallye.php
+++ b/inc/extensions/ext-rallye.php
@@ -87,14 +87,14 @@ KEY (userid),
 PRIMARY KEY(id)
 ) TYPE=MyISAM";
        // Admin menu
 PRIMARY KEY(id)
 ) TYPE=MyISAM";
        // Admin menu

-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES('rallye', NULL, 'Rallye-Management','Richten Sie neue Ref-Rallyes ein, die zeitgesteuert anfangen und aufhöhren. Dabei wird alles weitere automatisch geregelt.','9')";
-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES('rallye','add_rallye','Neue Rallye hinzufügen','Neue Ref-Rallye hinzufügen.','1')";
-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES('rallye','config_rallye_prices','Preise einrichten','Richten Sie Preise zu den Rallyes ein.','2')";
-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES('rallye','list_rallyes','Rallyes verwalten','Alle bestehenden Ref-Rallyes auflisten, bearbeiten, stoppen, löschen usw.','3')";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES('rallye', NULL, 'Rallye-Management','Richten Sie neue Ref-Rallyes ein, die zeitgesteuert anfangen und aufhöhren. Dabei wird alles weitere automatisch geregelt.','9')";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES('rallye','add_rallye','Neue Rallye hinzufügen','Neue Ref-Rallye hinzufügen.','1')";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES('rallye','config_rallye_prices','Preise einrichten','Richten Sie Preise zu den Rallyes ein.','2')";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES('rallye','list_rallyes','Rallyes verwalten','Alle bestehenden Ref-Rallyes auflisten, bearbeiten, stoppen, löschen usw.','3')";

        // Guest menu
        // Guest menu

-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_guest_menu (action, what, title, visible, locked, sort) VALUES ('main','rallyes','Ref-Rallyes','Y','Y','9')";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_guest_menu (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('main','rallyes','Ref-Rallyes','Y','Y','9')";

        // Member menu
        // Member menu

-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, visible, locked, sort) VALUES('main','rallyes','Ref-Rallyes','Y','Y','9')";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES('main','rallyes','Ref-Rallyes','Y','Y','9')";

        break;
 
 case "remove": // Do stuff when removing extension
        break;
 
 case "remove": // Do stuff when removing extension

diff --git a/inc/extensions/ext-register.php b/inc/extensions/ext-register.php
index 68a632d88b5ed30c0f47b6c17f9c20accb6344da..a179131f51debf53c00037ef2a6352dbdd87a52c 100644 (file)
--- a/inc/extensions/ext-register.php
+++ b/inc/extensions/ext-register.php
@@ -92,7 +92,7 @@ PRIMARY KEY(id)
                $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_must_register (field_name, field_required) VALUES ('city','Y')";
 
                // Add admin menu
                $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_must_register (field_name, field_required) VALUES ('city','Y')";
 
                // Add admin menu

-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES('setup','config_register','Pflichtfelder','Stellen Sie hier die Pflichtfelder sowohl im Anmeldeformular, als auch im Mitgliedsbereich unter <STRONG>Profildaten &auml;ndern</STRONG> ein.', 12)";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES('setup','config_register','Pflichtfelder','Stellen Sie hier die Pflichtfelder sowohl im Anmeldeformular, als auch im Mitgliedsbereich unter <STRONG>Profildaten &auml;ndern</STRONG> ein.', 12)";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Einstellbare Pflichtfelder hinzugef&uuml;gt.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Einstellbare Pflichtfelder hinzugef&uuml;gt.";

diff --git a/inc/extensions/ext-rewrite.php b/inc/extensions/ext-rewrite.php
index e0776b6246f46ebc074e75f25c86992ec0d70359..fc04a655f121b1d32378b5546b37bc25820289b0 100644 (file)
--- a/inc/extensions/ext-rewrite.php
+++ b/inc/extensions/ext-rewrite.php
@@ -111,7 +111,7 @@ case "update": // Update an extension
 
        case "0.0.9": // SQL queries for v0.0.9
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD rewrite_skip VARCHAR(255) NOT NULL DEFAULT 'login:admin:frametester:mailid'";
 
        case "0.0.9": // SQL queries for v0.0.9
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD rewrite_skip VARCHAR(255) NOT NULL DEFAULT 'login:admin:frametester:mailid'";

-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('setup','config_rewrite','Rewrite-Engine','Stellen Sie hier ein, welche Module übersprungen werden sollen, in denen also kein Umschreiben des HTML-Codes stattfinden soll.', 8)";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_rewrite','Rewrite-Engine','Stellen Sie hier ein, welche Module übersprungen werden sollen, in denen also kein Umschreiben des HTML-Codes stattfinden soll.', 8)";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Zu überspringende Module können per Admin-Bereich eingestellt werden.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Zu überspringende Module können per Admin-Bereich eingestellt werden.";

diff --git a/inc/extensions/ext-safe.php b/inc/extensions/ext-safe.php
index 378bb109cdd97cb760183b0d22431e45915145c1..759bce29eef042a1ead6f3487e103e18962100ce 100644 (file)
--- a/inc/extensions/ext-safe.php
+++ b/inc/extensions/ext-safe.php
@@ -51,9 +51,6 @@ switch ($EXT_LOAD_MODE)
 {
 case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called)
        // SQL commands to run
 {
 case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called)
        // SQL commands to run

-
-       // Load CSS file?
-       $EXT_CSS = 'Y';

        break;
 
 case "remove": // Do stuff when removing extension
        break;
 
 case "remove": // Do stuff when removing extension


@@ -88,7 +85,7 @@ default: // Do stuff when extension is loaded
 $EXT_LANG_PREFIX = "safe";
 
 // Extension is always active?
 $EXT_LANG_PREFIX = "safe";
 
 // Extension is always active?

-$EXT_ALWAYS_ACTIVE = 'N';
+$EXT_ALWAYS_ACTIVE = "N";

 
 //
 ?>
 
 //
 ?>

diff --git a/inc/extensions/ext-sponsor.php b/inc/extensions/ext-sponsor.php
index ac3c4db799d3294c7f6b054dc9df72ef45479108..584b365a109a88afb478a0b60e68ecba7060060c 100644 (file)
--- a/inc/extensions/ext-sponsor.php
+++ b/inc/extensions/ext-sponsor.php
@@ -306,29 +306,29 @@ PRIMARY KEY(id)
                //
                // Admin menu
                //
                //
                // Admin menu
                //

-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('sponsor', NULL, 'Sponsorenbereich','Den Sponsorenbereich verwalten. Hier können Sie auch Sonderaktionen seperat deakvieren oder wieder aktivieren, Sponsorenaccounts verwalten usw.', 7)";
-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('sponsor','add_sponsor','Neuer Sponsor','Neues Sponsorenaccount hinzufügen.', 1)";
-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('sponsor','unlock_sponsor','Sponsor freischalten','Sponsorenaccounts freigeben / sperren.', 2)";
-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('sponsor','list_sponsor','Sponsoren auflisten','Listet alle verfügbaren Sponsorenaccounts auf.', 3)";
-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('sponsor','edit_sponsor','Sponsor ändern','Sponsorenaccount ändern (Grundaten, nicht Freigabe!).', 4)";
-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('sponsor','lock_sponsor','Sponsor ent-/sperren','Sponsorenaccount sperren und entsperren.', 5)";
-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('sponsor','del_sponsor','Sponsor löschen','Sponsorenaccount löschen.', 6)";
-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('sponsor','allow_sponsor_data','Datenverwaltung','Stellen Sie hier ein, welche Daten der Sponsor im Mitgliedsbereich über sicht anzeigen darf und welche nicht.', 7)";
-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('sponsor','list_sponsor_pays','Bestellungen...','Bestellungen der Sponsoren auflisten / bearbeiten.', 8)";
-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('sponsor','list_sponsor_menu','Sponsorenmenü','Das Sponsorenmenü kann hier geändert werden.', 9)";
-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('sponsor','list_sponsor_campaigns','Kampagnen...','Verwaltung aller von Ihren Sponsoren eingerichteten Kampagnen.', 10)";
-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('sponsor','list_sponsor_urls','URL-Verwaltung','Verwaltung (freischalten, sperren, löschen, testen, bearbeiten usw.) von gebuchten URLs.', 11)";
-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('sponsor','list_sponsor_banner','Banner-Verwaltung','Verwaltung (freischalten, sperren, löschen, testen, bearbeiten usw.) von gebuchten Bannern.', 12)";
-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('sponsor','list_sponsor_reg','Sponsor-Aktionen','Alle Sponsor-Aktionen auflisten und verwalten.', 13)";
-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('sponsor','list_sponsor_pay','Buchungspakete','Die Sponsoren können sich {--POINTS--}-Pakete kaufen. Hier können Sie diese verwalten.', 14)";
-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('sponsor','list_sponsor_conv','{--POINTS--} umwandeln...','Mit den vom Sponsor gekauften {--POINTS--} kann er Aktionen buchen. Hier stellen Sie die Umrechnungsrate von {--POINTS--} nach Sponsoraktionen um. Beispiel: 1 {--POINTS--} = 10 Mails.', 15)";
-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('sponsor','config_sponsor','Einstellungen','Allgemeine Einstellungen am Sponsoring-System.', 16)";
-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('repair','repr_sponsor','Sponsormenü','Gewichtung des Sponsormenüs reparieren.', 5)";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('sponsor', NULL, 'Sponsorenbereich','Den Sponsorenbereich verwalten. Hier können Sie auch Sonderaktionen seperat deakvieren oder wieder aktivieren, Sponsorenaccounts verwalten usw.', 7)";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('sponsor','add_sponsor','Neuer Sponsor','Neues Sponsorenaccount hinzufügen.', 1)";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('sponsor','unlock_sponsor','Sponsor freischalten','Sponsorenaccounts freigeben / sperren.', 2)";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('sponsor','list_sponsor','Sponsoren auflisten','Listet alle verfügbaren Sponsorenaccounts auf.', 3)";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('sponsor','edit_sponsor','Sponsor ändern','Sponsorenaccount ändern (Grundaten, nicht Freigabe!).', 4)";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('sponsor','lock_sponsor','Sponsor ent-/sperren','Sponsorenaccount sperren und entsperren.', 5)";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('sponsor','del_sponsor','Sponsor löschen','Sponsorenaccount löschen.', 6)";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('sponsor','allow_sponsor_data','Datenverwaltung','Stellen Sie hier ein, welche Daten der Sponsor im Mitgliedsbereich über sicht anzeigen darf und welche nicht.', 7)";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('sponsor','list_sponsor_pays','Bestellungen...','Bestellungen der Sponsoren auflisten / bearbeiten.', 8)";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('sponsor','list_sponsor_menu','Sponsorenmenü','Das Sponsorenmenü kann hier geändert werden.', 9)";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('sponsor','list_sponsor_campaigns','Kampagnen...','Verwaltung aller von Ihren Sponsoren eingerichteten Kampagnen.', 10)";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('sponsor','list_sponsor_urls','URL-Verwaltung','Verwaltung (freischalten, sperren, löschen, testen, bearbeiten usw.) von gebuchten URLs.', 11)";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('sponsor','list_sponsor_banner','Banner-Verwaltung','Verwaltung (freischalten, sperren, löschen, testen, bearbeiten usw.) von gebuchten Bannern.', 12)";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('sponsor','list_sponsor_reg','Sponsor-Aktionen','Alle Sponsor-Aktionen auflisten und verwalten.', 13)";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('sponsor','list_sponsor_pay','Buchungspakete','Die Sponsoren können sich {--POINTS--}-Pakete kaufen. Hier können Sie diese verwalten.', 14)";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('sponsor','list_sponsor_conv','{--POINTS--} umwandeln...','Mit den vom Sponsor gekauften {--POINTS--} kann er Aktionen buchen. Hier stellen Sie die Umrechnungsrate von {--POINTS--} nach Sponsoraktionen um. Beispiel: 1 {--POINTS--} = 10 Mails.', 15)";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('sponsor','config_sponsor','Einstellungen','Allgemeine Einstellungen am Sponsoring-System.', 16)";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('repair','repr_sponsor','Sponsormenü','Gewichtung des Sponsormenüs reparieren.', 5)";

                //
                // Menu system (still admin menu)
                //
                //
                // Menu system (still admin menu)
                //

-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('menu','sponsor_medit','Sponsor-Menü editieren','Hier können Sie das Sponsorenmenü verändern: Positionen verändern, Menütitel ändern usw.', 7)";
-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('menu','sponsor_madd','Sponsor-Menü hinzufügen','Hier können Sie einen neuen Menüpunkt hinzufügen (falls Sie z.B. eigene Sponsoraktionen entwickelt haben oder welche versehendlich gelöscht haben.', 8)";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('menu','sponsor_medit','Sponsor-Menü editieren','Hier können Sie das Sponsorenmenü verändern: Positionen verändern, Menütitel ändern usw.', 7)";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('menu','sponsor_madd','Sponsor-Menü hinzufügen','Hier können Sie einen neuen Menüpunkt hinzufügen (falls Sie z.B. eigene Sponsoraktionen entwickelt haben oder welche versehendlich gelöscht haben.', 8)";

                //
                // Guest menu
                //
                //
                // Guest menu
                //

diff --git a/inc/extensions/ext-sql_patches.php b/inc/extensions/ext-sql_patches.php
index f5569d760ceb8cd3afa28b7c1ddc8ed6f3269669..88543231a82dbee74b3296bd03840c0aad090450 100644 (file)
--- a/inc/extensions/ext-sql_patches.php
+++ b/inc/extensions/ext-sql_patches.php
@@ -137,7 +137,7 @@ case "update": // Update an extension
        {
        case "0.0.1": // SQL queries for v0.0.1
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD ext_autopurge ENUM('Y','N') NOT NULL DEFAULT 'Y'";
        {
        case "0.0.1": // SQL queries for v0.0.1
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD ext_autopurge ENUM('Y','N') NOT NULL DEFAULT 'Y'";

-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('setup','config_extensions','Erweitungsmanagement','Alle Einstellungen am Erweiterungsmanagement.', 10)";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_extensions','Erweitungsmanagement','Alle Einstellungen am Erweiterungsmanagement.', 10)";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Es kann nun bestimmt werden, ob vom Server gelöschte ext-xxx.php erkannt werden sollen und die verknüpften Daten auch aus der Datenbank entfernt werden sollen.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Es kann nun bestimmt werden, ob vom Server gelöschte ext-xxx.php erkannt werden sollen und die verknüpften Daten auch aus der Datenbank entfernt werden sollen.";


@@ -166,7 +166,7 @@ case "update": // Update an extension
 
        case "0.0.5": // SQL queries for v0.0.5
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD index_home VARCHAR(255) NOT NULL DEFAULT 'welcome'";
 
        case "0.0.5": // SQL queries for v0.0.5
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD index_home VARCHAR(255) NOT NULL DEFAULT 'welcome'";

-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('setup','config_home','Home-Seite festlegen','Stellen Sie hier ein, welcher Menüpunkt (what-welcome ist Standart) als Einstiegspunkt in das Menüsystem genutzt werden soll.', 5)";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_home','Home-Seite festlegen','Stellen Sie hier ein, welcher Menüpunkt (what-welcome ist Standart) als Einstiegspunkt in das Menüsystem genutzt werden soll.', 5)";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Die what-welcome.php ist derzeit die "Home"-Seite (Eingangsseite). Dies kann nun per Datenbank geändert werden.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Die what-welcome.php ist derzeit die "Home"-Seite (Eingangsseite). Dies kann nun per Datenbank geändert werden.";


@@ -194,7 +194,7 @@ case "update": // Update an extension
                break;
 
        case "0.0.9": // SQL queries for v0.0.9
                break;
 
        case "0.0.9": // SQL queries for v0.0.9

-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('email','list_unconfirmed','Unbest. Mails auflisten','Schauen Sie sich hier unbestätigte Maillinks an. Bitte diesen Link nur über dem EMail-Archiv oder EMail-Details aufrufen, direkt aufgerufen bekommen Sie eine Fehlermeldung.', 8)";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('email','list_unconfirmed','Unbest. Mails auflisten','Schauen Sie sich hier unbestätigte Maillinks an. Bitte diesen Link nur über dem EMail-Archiv oder EMail-Details aufrufen, direkt aufgerufen bekommen Sie eine Fehlermeldung.', 8)";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Unbestätigte Maillinks können unter Email-Management -> Unbest. Mails auflisten aufgelistet werden.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Unbestätigte Maillinks können unter Email-Management -> Unbest. Mails auflisten aufgelistet werden.";


@@ -217,7 +217,7 @@ case "update": // Update an extension
                break;
 
        case "0.1.2": // SQL queries for v0.1.2
                break;
 
        case "0.1.2": // SQL queries for v0.1.2

-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('setup','config_refid','Standart-Ref-ID','Stellen Sie hier die User-ID ein, die genommen werden soll, wenn der Gast n icht per Referral-Link Ihren Mailtausch aufgerufen hat.', 7)";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_refid','Standart-Ref-ID','Stellen Sie hier die User-ID ein, die genommen werden soll, wenn der Gast n icht per Referral-Link Ihren Mailtausch aufgerufen hat.', 7)";

                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD def_refid BIGINT(20) UNSIGNED NOT NULL DEFAULT '0'";
 
                // Update notes (these will be set as task text!)
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD def_refid BIGINT(20) UNSIGNED NOT NULL DEFAULT '0'";
 
                // Update notes (these will be set as task text!)


@@ -234,11 +234,11 @@ case "update": // Update an extension
        case "0.1.4": // SQL queries for v0.1.4
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD default_theme VARCHAR(255) NOT NULL DEFAULT '".GET_CURR_THEME()."'";
                $SQLs[] = "DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_admin_menu WHERE action='theme' LIMIT 3";
        case "0.1.4": // SQL queries for v0.1.4
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD default_theme VARCHAR(255) NOT NULL DEFAULT '".GET_CURR_THEME()."'";
                $SQLs[] = "DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_admin_menu WHERE action='theme' LIMIT 3";

-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('theme', NULL, 'Themes','Verwalten Sie hier alle Designs (Themes) Ihres Mailtausch-Scriptes.', 8)";
-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('theme','theme_import','Importieren','Es wird das Verzeichnis "theme" nach neuen Ordnern durchsucht und anschliessend in die Datenbank gesperrt aufgenommen.', 1)";
-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('theme','theme_edit','Modifizieren','Ändern Sie Titel, Freigaben usw. an den Themes. Sie können bis auf das Standart-Theme "default" auch Themes aus der Datenbank entfernen. Vorher sollten Sie es jedoch vom Server löschen, damit es niht erneut importiert werden kann.', 2)";
-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_guest_menu (action, what, title, sort, visible, locked) VALUES ('themes', NULL, 'Design-Auswahl', 4, 'Y','N')";
-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, sort, visible, locked) VALUES ('themes', NULL, 'Design-Auswahl', 3, 'Y','N')";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('theme', NULL, 'Themes','Verwalten Sie hier alle Designs (Themes) Ihres Mailtausch-Scriptes.', 8)";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('theme','theme_import','Importieren','Es wird das Verzeichnis "theme" nach neuen Ordnern durchsucht und anschliessend in die Datenbank gesperrt aufgenommen.', 1)";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('theme','theme_edit','Modifizieren','Ändern Sie Titel, Freigaben usw. an den Themes. Sie können bis auf das Standart-Theme "default" auch Themes aus der Datenbank entfernen. Vorher sollten Sie es jedoch vom Server löschen, damit es niht erneut importiert werden kann.', 2)";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_guest_menu (action,what,title,sort,visible,locked) VALUES ('themes',NULL,'Design-Auswahl',4,'Y','N')";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action,what,title,sort,visible,locked) VALUES ('themes',NULL,'Design-Auswahl',3,'Y','N')";

                $SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_themes";
                $SQLs[] = "CREATE TABLE "._MYSQL_PREFIX."_themes (
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
                $SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_themes";
                $SQLs[] = "CREATE TABLE "._MYSQL_PREFIX."_themes (
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,


@@ -266,7 +266,7 @@ PRIMARY KEY(id)
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD title_right VARCHAR(10) NOT NULL DEFAULT '--]'";
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD enable_mod_title ENUM('Y','N') NOT NULL DEFAULT 'Y'";
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD enable_what_title ENUM('Y','N') NOT NULL DEFAULT 'Y'";
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD title_right VARCHAR(10) NOT NULL DEFAULT '--]'";
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD enable_mod_title ENUM('Y','N') NOT NULL DEFAULT 'Y'";
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD enable_what_title ENUM('Y','N') NOT NULL DEFAULT 'Y'";

-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('setup','config_title','Seitentitel ändern','De-/aktivieren Sie hier die Dekorationen, sowie Modul-Titel und what-Titel im Seitentitel.', 8)";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_title','Seitentitel ändern','De-/aktivieren Sie hier die Dekorationen, sowie Modul-Titel und what-Titel im Seitentitel.', 8)";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Dekorationen des Seitentiteles lassen sich ein- und ausschalten und selber definieren; Modul-Titel und Titel der <STRONG>what</STRONG>-Dateien kann hinzugef&uuml;gt werden.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Dekorationen des Seitentiteles lassen sich ein- und ausschalten und selber definieren; Modul-Titel und Titel der <STRONG>what</STRONG>-Dateien kann hinzugef&uuml;gt werden.";


@@ -343,7 +343,7 @@ PRIMARY KEY(id)
                break;
 
        case "0.2.6": // SQL queries for v0.2.6
                break;
 
        case "0.2.6": // SQL queries for v0.2.6

-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('user','sub_points','{!POINTS!} abziehen','Allen oder einem Mitglied {!POINTS!} abziehen.', 8)";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('user','sub_points','{!POINTS!} abziehen','Allen oder einem Mitglied {!POINTS!} abziehen.', 8)";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Abzug von {!POINTS!} nun m&ouml;glich.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Abzug von {!POINTS!} nun m&ouml;glich.";


@@ -455,7 +455,7 @@ PRIMARY KEY(id)
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD admin_menu ENUM('NEW','OLD') NOT NULL DEFAULT 'OLD'";
 
                // Insert menus
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD admin_menu ENUM('NEW','OLD') NOT NULL DEFAULT 'OLD'";
 
                // Insert menus

-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('setup','config_admin','Adminmen&uuml;','Diverse Einstellungen am Adminmen&uuml; vornehmen.', 9)";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_admin','Adminmen&uuml;','Diverse Einstellungen am Adminmen&uuml; vornehmen.', 9)";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Logische Bereiche (Logical Areas = LAs) eingef&uuml;hrt. Dadurch wird das immer st&auml;rker anwachsende Admin-Men&uuml; in grosse Hauptgruppen unterteilt, wodurch ein Auffinden von Men&uuml;punkten verbessert wird.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Logische Bereiche (Logical Areas = LAs) eingef&uuml;hrt. Dadurch wird das immer st&auml;rker anwachsende Admin-Men&uuml; in grosse Hauptgruppen unterteilt, wodurch ein Auffinden von Men&uuml;punkten verbessert wird.";


@@ -482,7 +482,7 @@ PRIMARY KEY (id)
 
        case "0.3.4": // SQL queries for v0.3.4
                // List accounts with no referral
 
        case "0.3.4": // SQL queries for v0.3.4
                // List accounts with no referral

-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('user','list_norefs','Mitglieder ohne Werber','Finden Sie hier alle Mitglieder-Accounts, die von niemandem ({--MAIN_TITLE--} wird in der Mail als Werber angegebenen) geworben wurden.', 7)";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('user','list_norefs','Mitglieder ohne Werber','Finden Sie hier alle Mitglieder-Accounts, die von niemandem ({--MAIN_TITLE--} wird in der Mail als Werber angegebenen) geworben wurden.', 7)";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "F&uuml;gt den Men&uuml;punkt &quot;Mitglieder ohne Werber&quot; in die Mitglieder-Management hinzu. Mit dieser neuen Funktion k&ouml;nnen Sie nach Mitglieder-Accounts ohne Werber suchen. TODO-ID #2 CLOSED";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "F&uuml;gt den Men&uuml;punkt &quot;Mitglieder ohne Werber&quot; in die Mitglieder-Management hinzu. Mit dieser neuen Funktion k&ouml;nnen Sie nach Mitglieder-Accounts ohne Werber suchen. TODO-ID #2 CLOSED";


@@ -490,11 +490,11 @@ PRIMARY KEY (id)
 
        case "0.3.5": // SQL queries for v0.3.5
                // List accounts with no referral
 
        case "0.3.5": // SQL queries for v0.3.5
                // List accounts with no referral

-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, sort, visible, locked) VALUES ('stats', NULL, 'Statistiken', 4, 'Y','N')";
-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, sort, visible, locked) VALUES ('stats','stats2','Framekiller-Mails', 2, 'Y','N')";
-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, sort, visible, locked) VALUES ('extras', NULL, 'Extras', 5, 'Y','N')";
-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, sort, visible, locked) VALUES ('rals', NULL, 'Rallyes', 6, 'Y','N')";
-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, sort, visible, locked) VALUES ('account', NULL, 'Ihr Account', 7, 'Y','N')";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('stats',NULL,'Statistiken',4,'Y','N')";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('stats','stats2','Framekiller-Mails',2,'Y','N')";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('extras',NULL,'Extras',5,'Y','N')";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('rals',NULL,'Rallyes',6,'Y','N')";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('account',NULL,'Ihr Account',7,'Y','N')";

                $SQLs[] = "UPDATE "._MYSQL_PREFIX."_member_menu SET sort='8' WHERE action='themes' LIMIT 1";
                $SQLs[] = "UPDATE "._MYSQL_PREFIX."_member_menu SET action='stats', sort='1', title='Klick-Mails' WHERE what='stats' LIMIT 1";
                $SQLs[] = "UPDATE "._MYSQL_PREFIX."_member_menu SET action='account', sort='1', title='Designs' WHERE what='themes' LIMIT 1";
                $SQLs[] = "UPDATE "._MYSQL_PREFIX."_member_menu SET sort='8' WHERE action='themes' LIMIT 1";
                $SQLs[] = "UPDATE "._MYSQL_PREFIX."_member_menu SET action='stats', sort='1', title='Klick-Mails' WHERE what='stats' LIMIT 1";
                $SQLs[] = "UPDATE "._MYSQL_PREFIX."_member_menu SET action='account', sort='1', title='Designs' WHERE what='themes' LIMIT 1";


@@ -559,7 +559,7 @@ PRIMARY KEY (id)
                break;
 
        case "0.4.2": // SQL queries for v0.4.2
                break;
 
        case "0.4.2": // SQL queries for v0.4.2

-               $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_online` ADD INDEX `admin_member` (`is_admin`, `is_member`)";
+               $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_online` ADD INDEX `admin_member` (`is_admin`,`is_member`)";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Neuen Schl&uuml;ssel zur Online-Tabelle hinzugef&uuml;gt.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Neuen Schl&uuml;ssel zur Online-Tabelle hinzugef&uuml;gt.";


@@ -570,7 +570,7 @@ PRIMARY KEY (id)
                $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD `proxy_port` INT(5) UNSIGNED NOT NULL DEFAULT '0'";
                $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD `proxy_username` VARCHAR(255) NOT NULL DEFAULT ''";
                $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD `proxy_password` VARCHAR(255) NOT NULL DEFAULT ''";
                $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD `proxy_port` INT(5) UNSIGNED NOT NULL DEFAULT '0'";
                $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD `proxy_username` VARCHAR(255) NOT NULL DEFAULT ''";
                $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD `proxy_password` VARCHAR(255) NOT NULL DEFAULT ''";

-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('setup','config_proxy','Proxy-Einstellungen','Sollte Ihr Webserver sich hinter einem Proxy befinden, so k&ouml;nnen Sie hier MXChange so konfigurieren, dass es Updates durch diesen hindurch sucht!', 15)";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_proxy','Proxy-Einstellungen','Sollte Ihr Webserver sich hinter einem Proxy befinden, so k&ouml;nnen Sie hier MXChange so konfigurieren, dass es Updates durch diesen hindurch sucht!', 15)";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Proxy-Einstellungen hinzugef&uuml;gt.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Proxy-Einstellungen hinzugef&uuml;gt.";

diff --git a/inc/extensions/ext-surfbar.php b/inc/extensions/ext-surfbar.php
index 69f2dc264052f76ff224a6b31b70da59abd2be8b..6338270d2b283d19ed21ba87b2e2fa9cb00352f9 100644 (file)
--- a/inc/extensions/ext-surfbar.php
+++ b/inc/extensions/ext-surfbar.php
@@ -58,13 +58,15 @@ case "register": // Do stuff when installtion is running (modules.php?module=adm
 `payment_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `last_salt` VARCHAR(255) NOT NULL DEFAULT '',
 `views_total` BIGINT(20) UNSIGNED  NOT NULL DEFAULT '0',
 `payment_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `last_salt` VARCHAR(255) NOT NULL DEFAULT '',
 `views_total` BIGINT(20) UNSIGNED  NOT NULL DEFAULT '0',

+`views_max` BIGINT(20) UNSIGNED  NOT NULL DEFAULT '0',
+`views_allowed` BIGINT(20) UNSIGNED  NOT NULL DEFAULT '0',

 `status` ENUM('PENDING','ACTIVE','LOCKED','STOPPED','REJECTED','DELETED','MIGRATED') NOT NULL DEFAULT 'PENDING',
 `registered` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 `last_locked` TIMESTAMP NOT NULL DEFAULT '0000-00-00 00:00:00',
 `lock_reason` VARCHAR(255) NOT NULL DEFAULT '',
 `reject_reason` VARCHAR(255) NOT NULL DEFAULT '',
 PRIMARY KEY(`id`),
 `status` ENUM('PENDING','ACTIVE','LOCKED','STOPPED','REJECTED','DELETED','MIGRATED') NOT NULL DEFAULT 'PENDING',
 `registered` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 `last_locked` TIMESTAMP NOT NULL DEFAULT '0000-00-00 00:00:00',
 `lock_reason` VARCHAR(255) NOT NULL DEFAULT '',
 `reject_reason` VARCHAR(255) NOT NULL DEFAULT '',
 PRIMARY KEY(`id`),

-UNIQUE KEY `userid_url` (`userid`, `url`),
+UNIQUE KEY `userid_url` (`userid`,`url`),

 INDEX (`payment_id`)
 ) TYPE=MyISAM COMMENT='Surfbar URLs'";
 
 INDEX (`payment_id`)
 ) TYPE=MyISAM COMMENT='Surfbar URLs'";
 


@@ -156,6 +158,11 @@ INDEX (`status`)
        $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD `surfbar_stats_reload` BIGINT(20) UNSIGNED NOT NULL DEFAULT 30";
        $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD `surfbar_purge_deleted` BIGINT(20) UNSIGNED NOT NULL DEFAULT ".(ONE_DAY*7)."";
        $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD `surfbar_purge_migrated` BIGINT(20) UNSIGNED NOT NULL DEFAULT ".(ONE_DAY*3)."";
        $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD `surfbar_stats_reload` BIGINT(20) UNSIGNED NOT NULL DEFAULT 30";
        $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD `surfbar_purge_deleted` BIGINT(20) UNSIGNED NOT NULL DEFAULT ".(ONE_DAY*7)."";
        $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD `surfbar_purge_migrated` BIGINT(20) UNSIGNED NOT NULL DEFAULT ".(ONE_DAY*3)."";

+       $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD `surfbar_pause_mode` ENUM('INTERNAL','EXERNAL') NOT NULL DEFAULT 'INTERNAL'";
+       $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD `surfbar_pause_url` VARCHAR(255) NOT NULL DEFAULT ''";
+       $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD `surfbar_notify_limits` ENUM('Y','N') NOT NULL DEFAULT 'Y'";
+       $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD `surfbar_warn_low_points` BIGINT(20) NOT NULL DEFAULT 100";
+       $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD `surfbar_migrate_order` ENUM('Y','N') NOT NULL DEFAULT 'Y'";

 
        // Member menus
        $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('surfbar',NULL,'Surfbar','Y','Y',4)";
 
        // Member menus
        $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('surfbar',NULL,'Surfbar','Y','Y',4)";

diff --git a/inc/extensions/ext-theme.php b/inc/extensions/ext-theme.php
index 95ef2185752ec60a56102b6e0c3ca8cca99fa03d..20520b2b738479757d8636ff36f80a9274662384 100644 (file)
--- a/inc/extensions/ext-theme.php
+++ b/inc/extensions/ext-theme.php
@@ -50,7 +50,7 @@ switch ($EXT_LOAD_MODE)
 {
 case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called)
        // SQL commands to run
 {
 case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called)
        // SQL commands to run

-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('theme','theme_check','Prüfen','Nach neuen Themes suchen bzw. nach Updates zu den Themes suchen.', 3)";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('theme','theme_check','Prüfen','Nach neuen Themes suchen bzw. nach Updates zu den Themes suchen.', 3)";

        break;
 
 case "remove": // Do stuff when removing extension
        break;
 
 case "remove": // Do stuff when removing extension

diff --git a/inc/extensions/ext-top10.php b/inc/extensions/ext-top10.php
index b888a9ad0d2471f5eb263fe566270669dde7d8ba..1b48c0953bd1810d2f9bc45fc05f987efb75abb6 100644 (file)
--- a/inc/extensions/ext-top10.php
+++ b/inc/extensions/ext-top10.php
@@ -50,8 +50,8 @@ switch ($EXT_LOAD_MODE)
 {
 case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called)
        // SQL commands to run
 {
 case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called)
        // SQL commands to run

-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_guest_menu (action, what, title, visible, locked, sort) VALUES ('main','top10','TOP-10','Y','Y', 7)";
-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('setup','config_top10','TOP-10 Listen','Stellen Sie hier ein, wie lang die TOP-Listen sein sollen, also wie viele Plätze angezeigt werden sollen.', 8)";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_guest_menu (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('main','top10','TOP-10','Y','Y', 7)";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_top10','TOP-10 Listen','Stellen Sie hier ein, wie lang die TOP-Listen sein sollen, also wie viele Plätze angezeigt werden sollen.', 8)";

        $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD top10_max TINYINT(3) UNSIGNED NOT NULL DEFAULT '10'";
 
        // Load CSS file?
        $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD top10_max TINYINT(3) UNSIGNED NOT NULL DEFAULT '10'";
 
        // Load CSS file?

diff --git a/inc/extensions/ext-transfer.php b/inc/extensions/ext-transfer.php
index 9b301b93b560dc3b48186673edc184848171f0a6..5bb8a5a029db0c64a396973fea0876be870f2d7b 100644 (file)
--- a/inc/extensions/ext-transfer.php
+++ b/inc/extensions/ext-transfer.php
@@ -82,13 +82,13 @@ PRIMARY KEY(id)
 ) Type=MyISAM";
 
        // Admin menu
 ) Type=MyISAM";
 
        // Admin menu

-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('transfer', NULL, '{!POINTS!}-Transfer','Verwalten Sie hier die {!POINTS!}-Transaktionen zwischen Ihren Mitgliedern.', 7)";
-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('transfer','list_transfer','Auflisten','Hier bekommen Sie alle ein- und ausgehende Transaktionen aufgelistet.', 1)";
-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('transfer','config_transfer','Einstellungen','Stellen Sie ein, wie viele Transaktionen aufgelistet werden sollen und wie alt diese werden dürfen. Die evtl. installierte autopurge-Erweiterung kann dann automatisch die veralteten Transktionen löschen.', 2)";
-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('transfer','del_transfer','Manuell löschen','Hier können Sie - abgesehen von der automatischen Löschung - Transaktionen selber löschen. Bitte beachten Sie, dass immer aus- und eingehende Transaktionen gleichzeitig gelöscht werden.', 3)";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('transfer', NULL, '{!POINTS!}-Transfer','Verwalten Sie hier die {!POINTS!}-Transaktionen zwischen Ihren Mitgliedern.', 7)";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('transfer','list_transfer','Auflisten','Hier bekommen Sie alle ein- und ausgehende Transaktionen aufgelistet.', 1)";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('transfer','config_transfer','Einstellungen','Stellen Sie ein, wie viele Transaktionen aufgelistet werden sollen und wie alt diese werden dürfen. Die evtl. installierte autopurge-Erweiterung kann dann automatisch die veralteten Transktionen löschen.', 2)";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('transfer','del_transfer','Manuell löschen','Hier können Sie - abgesehen von der automatischen Löschung - Transaktionen selber löschen. Bitte beachten Sie, dass immer aus- und eingehende Transaktionen gleichzeitig gelöscht werden.', 3)";

 
        // Member menu
 
        // Member menu

-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, visible, locked, sort) VALUES ('main','transfer','{!POINTS!}-Transfer','Y','Y', 5)";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('main','transfer','{!POINTS!}-Transfer','Y','Y', 5)";

 
        // Add config values
        $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD transfer_max BIGINT(20) UNSIGNED NOT NULL DEFAULT '50'";
 
        // Add config values
        $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD transfer_max BIGINT(20) UNSIGNED NOT NULL DEFAULT '50'";

diff --git a/inc/extensions/ext-user.php b/inc/extensions/ext-user.php
index 159b71ad6a97afd927e0db6d5e6280a3c9725c67..d62590ede9c0fa942366da8b57b29a8797c0c38c 100644 (file)
--- a/inc/extensions/ext-user.php
+++ b/inc/extensions/ext-user.php
@@ -138,7 +138,7 @@ case "update": // Update an extension
 
        case "0.2.1": // SQL queries for v0.2.1
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD user_alpha TINYINT(3) UNSIGNED NOT NULL DEFAULT '10'";
 
        case "0.2.1": // SQL queries for v0.2.1
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD user_alpha TINYINT(3) UNSIGNED NOT NULL DEFAULT '10'";

-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES('setup','config_user','Mitgliederliste','Anzahl Mitglieder pro Seite, Anzahl Buchstaben pro Zeile usw.', 8)";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES('setup','config_user','Mitgliederliste','Anzahl Mitglieder pro Seite, Anzahl Buchstaben pro Zeile usw.', 8)";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "User-Liste ist konfigurierbar: Anzahl Mitglieder pro Seite und Anzahl Buchstaben pro Zeile; Template-Fehler beseitigt.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "User-Liste ist konfigurierbar: Anzahl Mitglieder pro Seite und Anzahl Buchstaben pro Zeile; Template-Fehler beseitigt.";


@@ -182,7 +182,7 @@ case "update": // Update an extension
                break;
 
        case "0.2.9": // SQL queries for v0.2.9
                break;
 
        case "0.2.9": // SQL queries for v0.2.9

-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES('user','user_contct','Mitglied kontaktieren','Kontaktieren Sie hier Ihre Mitglieder ganz direkt über ein Webformular. Sie brauchen somit kein EMail-Programm mehr starten!', 8)";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES('user','user_contct','Mitglied kontaktieren','Kontaktieren Sie hier Ihre Mitglieder ganz direkt über ein Webformular. Sie brauchen somit kein EMail-Programm mehr starten!', 8)";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Admin-Kontaktformular hinzugefügt.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Admin-Kontaktformular hinzugefügt.";

diff --git a/inc/extensions/ext-wernis.php b/inc/extensions/ext-wernis.php
index c88c31d6c87e609e59ac2e0c69c794109bd259ec..5518a3feca20499ad1e4126de0f0d4b3c6e07982 100644 (file)
--- a/inc/extensions/ext-wernis.php
+++ b/inc/extensions/ext-wernis.php
@@ -76,15 +76,15 @@ PRIMARY KEY(id)
        $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD wernis_userid VARCHAR(6) NOT NULL DEFAULT ''";
 
        // Admin menu
        $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD wernis_userid VARCHAR(6) NOT NULL DEFAULT ''";
 
        // Admin menu

-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES('wernis', NULL, 'Wernis-Management','Konfiguration zur WDS66-API einstellen, Auszahlungen auflisten usw..', 15)";
-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES('wernis','config_wernis','WDS66-API-Einstellungen','Konfiguration zur WDS66-API einstellen.', 1)";
-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES('wernis','list_wernis','Wernis-Anfragen auflisten','Listet alle Wernis-Auszahlungsanfragen Ihrer Mitglieder auf.', 2)";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES('wernis', NULL, 'Wernis-Management','Konfiguration zur WDS66-API einstellen, Auszahlungen auflisten usw..', 15)";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES('wernis','config_wernis','WDS66-API-Einstellungen','Konfiguration zur WDS66-API einstellen.', 1)";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES('wernis','list_wernis','Wernis-Anfragen auflisten','Listet alle Wernis-Auszahlungsanfragen Ihrer Mitglieder auf.', 2)";

 
        // Member menu
 
        // Member menu

-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, visible, locked, sort) VALUES('main','wernis','Wernis-Ein-/Auszahlungen','N','N', 11)";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES('main','wernis','Wernis-Ein-/Auszahlungen','N','N', 11)";

 
        // Guest menu
 
        // Guest menu

-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_guest_menu (action, what, title, visible, locked, sort) VALUES('main','wernis_portal','WDS66-News','N','N', 7)";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_guest_menu (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES('main','wernis_portal','WDS66-News','N','N', 7)";

        break;
 
 case "remove": // Do stuff when removing extension
        break;
 
 case "remove": // Do stuff when removing extension

diff --git a/inc/functions.php b/inc/functions.php
index a71c939e3713fe52ba65f8435cb164b1ec9f954e..b99dff14971ff4126d3e88e5899a51f62af288b5 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -197,7 +197,7 @@ function ADD_FATAL ($message, $extra="") {
 }
 
 // Load a template file and return it's content (only it's name; do not use ' or ")
 }
 
 // Load a template file and return it's content (only it's name; do not use ' or ")

-function LOAD_TEMPLATE($template, $return=false, $content="") {
+function LOAD_TEMPLATE($template, $return=false, $content=array()) {

        // Add more variables which you want to use in your template files
        global $DATA, $_CONFIG, $username;
 
        // Add more variables which you want to use in your template files
        global $DATA, $_CONFIG, $username;
 


@@ -327,9 +327,9 @@ function LOAD_TEMPLATE($template, $return=false, $content="") {
 (".basename($file).")<br />
 <br />
 ".TEMPLATE_CONTENT."
 (".basename($file).")<br />
 <br />
 ".TEMPLATE_CONTENT."

-<PRE>".print_r($content, true)."</PRE>
+<pre>".print_r($content, true)."</pre>

 ".TEMPLATE_DATA."
 ".TEMPLATE_DATA."

-<PRE>".print_r($DATA, true)."</PRE>
+<pre>".print_r($DATA, true)."</pre>

 <br /><br />";
        }
 
 <br /><br />";
        }
 


@@ -350,20 +350,23 @@ function LOAD_TEMPLATE($template, $return=false, $content="") {
 }
 
 // Send mail out to an email address
 }
 
 // Send mail out to an email address

-function SEND_EMAIL($TO, $SUBJECT, $MSG, $HTML = 'N', $FROM = "") {
+function SEND_EMAIL($TO, $SUBJECT, $MSG, $HTML = "N", $FROM = "") {
+       //* DEBUG: */ echo __FUNCTION__.":TO={$TO},SUBJECT={$SUBJECT}<br />\n";
+

        // Compile subject line (for POINTS constant etc.)
        $eval = "\$SUBJECT = html_entity_decode(\"".COMPILE_CODE(addslashes($SUBJECT))."\");";
        eval($eval);
 
        // Set from header
        if ((!eregi("@", $TO)) && ($TO > 0)) {
        // Compile subject line (for POINTS constant etc.)
        $eval = "\$SUBJECT = html_entity_decode(\"".COMPILE_CODE(addslashes($SUBJECT))."\");";
        eval($eval);
 
        // Set from header
        if ((!eregi("@", $TO)) && ($TO > 0)) {

-               // Value detected, load email from database
+               // Value detected, is the message extension installed?

                if (EXT_IS_ACTIVE("msg")) {
                        ADD_MESSAGE_TO_BOX($TO, $SUBJECT, $MSG, $HTML);
                        return;
                } else {
                        // Load email address
                        $result_email = SQL_QUERY_ESC("SELECT email FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1", array(bigintval($TO)), __FILE__, __LINE__);
                if (EXT_IS_ACTIVE("msg")) {
                        ADD_MESSAGE_TO_BOX($TO, $SUBJECT, $MSG, $HTML);
                        return;
                } else {
                        // Load email address
                        $result_email = SQL_QUERY_ESC("SELECT email FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1", array(bigintval($TO)), __FILE__, __LINE__);

+                       //* DEBUG: */ echo __FUNCTION__.":numRows=".SQL_NUMROWS($result_email)."<br />\n";

 
                        // Does the user exist?
                        if (SQL_NUMROWS($result_email)) {
 
                        // Does the user exist?
                        if (SQL_NUMROWS($result_email)) {


@@ -381,6 +384,7 @@ function SEND_EMAIL($TO, $SUBJECT, $MSG, $HTML = 'N', $FROM = "") {
                // Is the webmaster!
                $TO = WEBMASTER;
        }
                // Is the webmaster!
                $TO = WEBMASTER;
        }

+       //* DEBUG: */ echo __FUNCTION__.":TO={$TO}<br />\n";

 
        // Check for PHPMailer or debug-mode
        if (!CHECK_PHPMAILER_USAGE()) {
 
        // Check for PHPMailer or debug-mode
        if (!CHECK_PHPMAILER_USAGE()) {


@@ -410,12 +414,12 @@ function SEND_EMAIL($TO, $SUBJECT, $MSG, $HTML = 'N', $FROM = "") {
        if (empty($HTML)) $HTML = "N";
        if (isBooleanConstantAndTrue('DEBUG_MODE')) {
                // In debug mode we want to display the mail instead of sending it away so we can debug this part
        if (empty($HTML)) $HTML = "N";
        if (isBooleanConstantAndTrue('DEBUG_MODE')) {
                // In debug mode we want to display the mail instead of sending it away so we can debug this part

-               echo "<PRE>
+               echo "<pre>

 ".htmlentities(trim($FROM))."
 To      : ".$TO."
 Subject : ".$SUBJECT."
 Message : ".$MSG."
 ".htmlentities(trim($FROM))."
 To      : ".$TO."
 Subject : ".$SUBJECT."
 Message : ".$MSG."

-</PRE>\n";
+</pre>\n";

        } elseif (($HTML == "Y") && (EXT_IS_ACTIVE("html_mail", true))) {
                // Send mail as HTML away
                SEND_HTML_EMAIL($TO, $SUBJECT, $MSG, $FROM);
        } elseif (($HTML == "Y") && (EXT_IS_ACTIVE("html_mail", true))) {
                // Send mail as HTML away
                SEND_HTML_EMAIL($TO, $SUBJECT, $MSG, $FROM);


@@ -600,24 +604,6 @@ function TRANSLATE_GENDER ($gender) {
        return $ret;
 }
 //
        return $ret;
 }
 //

-function GET_POOL_TYPE($PT) {
-       // Unknown pool type is default
-       $ret = POOL_UNKNOWN." (".$PT.")";
-
-       // Generate constant name
-       $constantName = sprintf("POOL_%s", $PT);
-
-       // Is the type known?
-       if (defined($constantName)) {
-               // Prepare eval command
-               $eval = sprintf("\$ret = %s;", $constantName);
-               eval($eval);
-       } // END - if
-
-       // Return result
-       return $ret;
-}
-//

 function FRAMETESTER($URL) {
        // Prepare frametester URL
        $frametesterUrl = sprintf("%s/modules.php?module=frametester&amp;url=%s",
 function FRAMETESTER($URL) {
        // Prepare frametester URL
        $frametesterUrl = sprintf("%s/modules.php?module=frametester&amp;url=%s",


@@ -702,7 +688,7 @@ function SET_LANGUAGE($lang) {
        set_session("mx_lang", $lang);
 }
 //
        set_session("mx_lang", $lang);
 }
 //

-function LOAD_EMAIL_TEMPLATE($template, $content="", $UID="0") {
+function LOAD_EMAIL_TEMPLATE($template, $content=array(), $UID="0") {

        global $DATA, $_CONFIG, $REPLACER;
 
        // Make sure all template names are lowercase!
        global $DATA, $_CONFIG, $REPLACER;
 
        // Make sure all template names are lowercase!


@@ -714,12 +700,6 @@ function LOAD_EMAIL_TEMPLATE($template, $content="", $UID="0") {
        // Keept for backward-compatiblity (please replace these variables against our new {!CONST!} syntax!)
        // No longer used: $MAIN_TITLE = MAIN_TITLE; $URL = URL; $WEBMASTER = WEBMASTER;
 
        // Keept for backward-compatiblity (please replace these variables against our new {!CONST!} syntax!)
        // No longer used: $MAIN_TITLE = MAIN_TITLE; $URL = URL; $WEBMASTER = WEBMASTER;
 

-       // Init variables (DEPRECATED! Use $content[bla] instead.
-       $surname = "";
-       $family  = "";
-       $nick    = "";
-       $gender     = "N";
-

        // Prepare IP number and User Agent
        $REMOTE_ADDR     = getenv('REMOTE_ADDR');
        $HTTP_USER_AGENT = getenv('HTTP_USER_AGENT');
        // Prepare IP number and User Agent
        $REMOTE_ADDR     = getenv('REMOTE_ADDR');
        $HTTP_USER_AGENT = getenv('HTTP_USER_AGENT');


@@ -733,6 +713,9 @@ function LOAD_EMAIL_TEMPLATE($template, $content="", $UID="0") {
                SQL_FREERESULT($result);
        } // END - if
 
                SQL_FREERESULT($result);
        } // END - if
 

+       // Neutral email address is default
+       $email = WEBMASTER;
+

        // Expiration in a nice output format
        if ($_CONFIG['auto_purge'] == 0) {
                // Will never expire!
        // Expiration in a nice output format
        if ($_CONFIG['auto_purge'] == 0) {
                // Will never expire!


@@ -752,40 +735,39 @@ function LOAD_EMAIL_TEMPLATE($template, $content="", $UID="0") {
        } // END - if
 
        // Load user's data
        } // END - if
 
        // Load user's data

+       //* DEBUG: */ echo __FUNCTION__.":UID={$UID},template={$template}<br />\n";

        if ($UID > 0) {
                if (EXT_IS_ACTIVE("nickname")) {
        if ($UID > 0) {
                if (EXT_IS_ACTIVE("nickname")) {

+                       //* DEBUG: */ echo __FUNCTION__.":NICKNAME!<br />\n";

                        // Load nickname
                        $result = SQL_QUERY_ESC("SELECT surname, family, gender, email, nickname FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
                                array(bigintval($UID)), __FILE__, __LINE__);
                        // Load nickname
                        $result = SQL_QUERY_ESC("SELECT surname, family, gender, email, nickname FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
                                array(bigintval($UID)), __FILE__, __LINE__);

-                       list($surname, $family, $gender, $email, $nick) = SQL_FETCHROW($result);
-                       SQL_FREERESULT($result);

                } else {
                } else {

+                       //* DEBUG: */ echo __FUNCTION__.":NO-NICK!<br />\n";

                        // Load normal data
                        $result = SQL_QUERY_ESC("SELECT surname, family, gender, email FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
                                array(bigintval($UID)), __FILE__, __LINE__);
                        // Load normal data
                        $result = SQL_QUERY_ESC("SELECT surname, family, gender, email FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
                                array(bigintval($UID)), __FILE__, __LINE__);

-                       list($surname, $family, $gender, $email) = SQL_FETCHROW($result);
-                       SQL_FREERESULT($result);

                }
                }

-       } else {
-               // Neutral gender and email address is default
-               $gender = "N";
-               $email = WEBMASTER;
-       }

 
 

-       // Translate M to male or F to female
-       $gender = TRANSLATE_GENDER($gender);
+               // Is content an array?
+               //* DEBUG: */ echo __FUNCTION__.":content[]=".gettype($content)."<br />\n";
+               if (is_array($content)) {
+                       // Fetch and migrate data
+                       //* DEBUG: */ echo __FUNCTION__.":content()=".count($content)." - PRE<br />\n";
+                       $content = array_merge($content, SQL_FETCHARRAY($result));
+                       //* DEBUG: */ echo __FUNCTION__.":content()=".count($content)." - AFTER<br />\n";
+               } // END - if

 
 

-       // Insert data if content is an array
-       if (is_array($content)) {
-               // Please do no longer use direct variable names, use $content[bla]
-               // instead.
-               $content['gender']  = $gender;
-               $content['surname'] = $surname;
-               $content['family']  = $family;
-               $content['email']   = $email;
-               $content['nick']    = $nick;
+               // Free result
+               SQL_FREERESULT($result);

        } // END - if
 
        } // END - if
 

+       // Translate M to male or F to female if present
+       if (isset($content['gender'])) $content['gender'] = TRANSLATE_GENDER($content['gender']);
+
+       // Overwrite email from data if present
+       if (isset($content['email']))  $email = $content['email'];
+

        // Store email for some functions in global data array
        $DATA['email'] = $email;
 
        // Store email for some functions in global data array
        $DATA['email'] = $email;
 


@@ -824,22 +806,19 @@ function LOAD_EMAIL_TEMPLATE($template, $content="", $UID="0") {
        $newContent = "";
        if (FILE_READABLE($file)) {
                // The local file does exists so we load it. :)
        $newContent = "";
        if (FILE_READABLE($file)) {
                // The local file does exists so we load it. :)

-               $tmpl_file = @implode("", @file($file));
+               $tmpl_file = implode("", file($file));

                $tmpl_file = addslashes($tmpl_file);
 
                // Run code
                $tmpl_file = addslashes($tmpl_file);
 
                // Run code

-               $tmpl_file = "\$newContent=\"".COMPILE_CODE($tmpl_file)."\";";
+               $tmpl_file = "\$newContent=html_entity_decode(\"".COMPILE_CODE($tmpl_file)."\");";

                eval($tmpl_file);
                eval($tmpl_file);

-
-               // Replace HTML conform chars
-               $newContent = html_entity_decode($newContent);

        } elseif (!empty($template)) {
                // Template file not found!
                $newContent = TEMPLATE_404.": ".$template."<br />
 ".TEMPLATE_CONTENT."
        } elseif (!empty($template)) {
                // Template file not found!
                $newContent = TEMPLATE_404.": ".$template."<br />
 ".TEMPLATE_CONTENT."

-<PRE>".print_r($content, true)."</PRE>
+<pre>".print_r($content, true)."</pre>

 ".TEMPLATE_DATA."
 ".TEMPLATE_DATA."

-<PRE>".print_r($DATA, true)."</PRE>
+<pre>".print_r($DATA, true)."</pre>

 <br /><br />";
 
                // Debug mode not active? Then remove the HTML tags
 <br /><br />";
 
                // Debug mode not active? Then remove the HTML tags


@@ -927,11 +906,11 @@ function COMPILE_CODE($code, $simple = false, $constants = true, $full = true) {
        if ($constants) {
                // BEFORE 0.2.1 : Language and data constants
                // WITH 0.2.1+  : Only language constants
        if ($constants) {
                // BEFORE 0.2.1 : Language and data constants
                // WITH 0.2.1+  : Only language constants

-               $code = str_replace('{--', '".', str_replace('--}', '."', $code));
+               $code = str_replace('{--','".', str_replace('--}','."', $code));

 
                // BEFORE 0.2.1 : Not used
                // WITH 0.2.1+  : Data constants
 
                // BEFORE 0.2.1 : Not used
                // WITH 0.2.1+  : Data constants

-               $code = str_replace('{!', '".', str_replace("!}", '."', $code));
+               $code = str_replace('{!','".', str_replace("!}", '."', $code));

        }
 
        // Compile QUOT and other non-HTML codes
        }
 
        // Compile QUOT and other non-HTML codes


@@ -1687,7 +1666,7 @@ function POST_URL ($script, $postData) {
        $host = EXTRACT_HOST($script);
 
        // Construct request
        $host = EXTRACT_HOST($script);
 
        // Construct request

-       $data = http_build_query($postData, '', '&');
+       $data = http_build_query($postData, '','&');

 
        // Generate POST request header
        $request  = "POST /" . trim($script) . " HTTP/1.1\r\n";
 
        // Generate POST request header
        $request  = "POST /" . trim($script) . " HTTP/1.1\r\n";


@@ -2273,7 +2252,7 @@ function get_session($var) {
        return $value;
 }
 // Send notification to admin
        return $value;
 }
 // Send notification to admin

-function SEND_ADMIN_NOTIFICATION($subject, $templateName, $content="", $uid="0") {
+function SEND_ADMIN_NOTIFICATION($subject, $templateName, $content=array(), $uid="0") {

        if (GET_EXT_VERSION("admins") >= "0.4.1") {
                // Send new way
                SEND_ADMIN_EMAILS_PRO($subject, $templateName, $content, $uid);
        if (GET_EXT_VERSION("admins") >= "0.4.1") {
                // Send new way
                SEND_ADMIN_EMAILS_PRO($subject, $templateName, $content, $uid);


@@ -2551,6 +2530,23 @@ function CACHE_PURGE_ADMIN_MENU ($id=0, $action="", $what="", $str="") {
        // Experiemental feature!
        trigger_error("You have to delete the admin_*.cache files by yourself at this point.");
 }
        // Experiemental feature!
        trigger_error("You have to delete the admin_*.cache files by yourself at this point.");
 }

+// Translates the "pool type" into human-readable
+function TRANSLATE_POOL_TYPE ($type) {
+       // Default type is unknown
+       $translated = sprintf(POOL_TYPE_UNKNOWN, $type);
+
+       // Generate constant
+       $constName = sprintf("POOL_TYPE_%s", $type);
+
+       // Does it exist?
+       if (defined($constName)) {
+               // Then use it
+               $translated = constant($constName);
+       } // END - if
+
+       // Return "translation"
+       return $translated;
+}

 //
 //////////////////////////////////////////////////
 //                                              //
 //
 //////////////////////////////////////////////////
 //                                              //

diff --git a/inc/language/de.php b/inc/language/de.php
index 3a3d55879202a3c56a4b85ce0ca8ce3d2eefab8d..cba80180876db2f1519149b98a92c355a5fabb24 100644 (file)
--- a/inc/language/de.php
+++ b/inc/language/de.php
@@ -114,7 +114,7 @@ define('ADMIN_LOGIN_ALREADY_REG', "Das von Ihnen eingegebene Admin-Login existie
 define('ADMIN_REGISTER_FAILED', "Bei der Registrierung eines Admin-Accounts ist ein unerwarteter Fehler unterlaufen!");
 define('ADMIN_REGISTER_DONE', "Das Admin-Account wurde soeben erstellt. Sie können sich nun mit den eingegeben Login-Daten einloggen.");
 define('ADMIN_CANNOT_COMPLETE', "Kann die Regsitrierung des Admin-Accounts nicht abschliessen!");
 define('ADMIN_REGISTER_FAILED', "Bei der Registrierung eines Admin-Accounts ist ein unerwarteter Fehler unterlaufen!");
 define('ADMIN_REGISTER_DONE', "Das Admin-Account wurde soeben erstellt. Sie können sich nun mit den eingegeben Login-Daten einloggen.");
 define('ADMIN_CANNOT_COMPLETE', "Kann die Regsitrierung des Admin-Accounts nicht abschliessen!");

-define('ADMIN_LOGIN_NOW', "Sie k&ouml;nnen sich nun in den Administratorbereich einloggen.<br />Geben Sie dazu Ihren Admin-Login (nicht Benutzer-Login!) und das Passwort dazu ein.");
+define('ADMIN_LOGIN_NOW', "Sie k&ouml;nnen sich nun in den Administratorbereich einloggen.<br />Geben Sie dazu Ihren Admin-Login (nicht Mitglied-Login!) und das Passwort dazu ein.");

 define('ENTER_ADMIN_LOGIN', "Administrator-Login");
 define('ENTER_ADMIN_PASS', "Passwort zum Admin-Account");
 define('ADMIN_LOGIN_SUBMIT', "Einloggen zum Admin-Bereich");
 define('ENTER_ADMIN_LOGIN', "Administrator-Login");
 define('ENTER_ADMIN_PASS', "Passwort zum Admin-Account");
 define('ADMIN_LOGIN_SUBMIT', "Einloggen zum Admin-Bereich");


@@ -350,7 +350,7 @@ define('GENDER_C', "&quot;Firma&quot;");
 define('SAVE_CHANGES', "&Auml;nderungen speichern");
 define('MYDATA_NOTE', "Geben Sie nur bei <strong>Passwort</strong> Ihr aktuelles Passwort ein, wenn Sie nur Daten &auml;ndern wollen. Geben Sie bei <strong>Passwortbest&auml;tigung</strong> das neue Passwort erneut ein, wenn Sie Ihr aktuelles Passwort &auml;ndern wollen.");
 define('MEMBER_UPDATE_PWD_WRONG', "Bitte geben Sie Ihr aktuelles Passwort zum &Auml;ndern Ihrer Einstellungen ein. Wir haben dies zur Sicherheit unserer Mitglieder eingebaut.");
 define('SAVE_CHANGES', "&Auml;nderungen speichern");
 define('MYDATA_NOTE', "Geben Sie nur bei <strong>Passwort</strong> Ihr aktuelles Passwort ein, wenn Sie nur Daten &auml;ndern wollen. Geben Sie bei <strong>Passwortbest&auml;tigung</strong> das neue Passwort erneut ein, wenn Sie Ihr aktuelles Passwort &auml;ndern wollen.");
 define('MEMBER_UPDATE_PWD_WRONG', "Bitte geben Sie Ihr aktuelles Passwort zum &Auml;ndern Ihrer Einstellungen ein. Wir haben dies zur Sicherheit unserer Mitglieder eingebaut.");

-define('MEMBER_HAVE_CHANGED_DATA', "Sie haben heute Ihr Benutzerprofil ge&auml;ndert.");
+define('MEMBER_HAVE_CHANGED_DATA', "Sie haben heute Ihr Mitgliedsprofil ge&auml;ndert.");

 define('YOUR_NEW_DATA', "Hier sind Ihre neuen Profildaten");
 define('PLEASE_NOTIFY_ABUSE_MYDATA', "Sollten Sie diese &auml;nderungen nicht durchgef&uuml;hrt haben, benachrichten Sie uns bitte! (".WEBMASTER.")");
 define('MEMBER_UNKNOWN_MODE', "Unbekannter Modus erkannt");
 define('YOUR_NEW_DATA', "Hier sind Ihre neuen Profildaten");
 define('PLEASE_NOTIFY_ABUSE_MYDATA', "Sollten Sie diese &auml;nderungen nicht durchgef&uuml;hrt haben, benachrichten Sie uns bitte! (".WEBMASTER.")");
 define('MEMBER_UNKNOWN_MODE', "Unbekannter Modus erkannt");


@@ -427,7 +427,7 @@ define('MEMBER_URL_BLACK_LISTED', "Ihre eingegebene URL wurde in unsere Ausschlu
 define('MEMBER_BLIST_TIME', "Datum der Sperrung war");
 define('MEMBER_SELECTED_MORE_RECS', "Sie haben f&uuml;r diese Kategorie zu viele Empf&auml;nger eingegeben!");
 define('MEMBER_GO_BACK', "Zur&uuml;ck zum Buchungsformular");
 define('MEMBER_BLIST_TIME', "Datum der Sperrung war");
 define('MEMBER_SELECTED_MORE_RECS', "Sie haben f&uuml;r diese Kategorie zu viele Empf&auml;nger eingegeben!");
 define('MEMBER_GO_BACK', "Zur&uuml;ck zum Buchungsformular");

-define('MEMBER_DO_ORDER', "Mailbuchung jetzt durchf&uuml;hren");
+define('MEMBER_DO_ORDER', "Mailbuchung so aufgeben!");

 define('LOADER_NOT_WORKING', "Falls die Weiterleitung nicht automatisch in einer Sekunde klappen sollte,");
 define('LOADER_CLICK_HERE', "so kommen Sie hier zur externen Seite weiter");
 define('ADMIN_NEW_MAIL_IN_QUEUE', "Ein Mitglied hat soeben eine Mailbuchung durchgef&uuml;hrt!\n\nSeine Buchung befindet sich nun im Sende-Pool und wird automatisch in 100-Mail-Bloecken versand.\n\nHier sind nochmals seine Daten, gebuchter Text und URL zur Verifizierung");
 define('LOADER_NOT_WORKING', "Falls die Weiterleitung nicht automatisch in einer Sekunde klappen sollte,");
 define('LOADER_CLICK_HERE', "so kommen Sie hier zur externen Seite weiter");
 define('ADMIN_NEW_MAIL_IN_QUEUE', "Ein Mitglied hat soeben eine Mailbuchung durchgef&uuml;hrt!\n\nSeine Buchung befindet sich nun im Sende-Pool und wird automatisch in 100-Mail-Bloecken versand.\n\nHier sind nochmals seine Daten, gebuchter Text und URL zur Verifizierung");


@@ -446,12 +446,13 @@ define('MEMBER_CONTINUE_AREA', "Weiter zum Mitgliedsbereich");
 define('MEMBER_THANX_ORDER', "Vielen Dank f&uuml;r Ihre Mailbuchung! Es ist eine Mail zu Ihnen unterwegs.");
 define('ADMIN_NO_MAILS_IN_POOL', "Es wurden noch keine Mailbuchungen aufgegeben, kann somit keine Mails anzeigen!");
 define('ADMIN_POOL_CONTENT', "Mailbuchungen im Sende-Pool");
 define('MEMBER_THANX_ORDER', "Vielen Dank f&uuml;r Ihre Mailbuchung! Es ist eine Mail zu Ihnen unterwegs.");
 define('ADMIN_NO_MAILS_IN_POOL', "Es wurden noch keine Mailbuchungen aufgegeben, kann somit keine Mails anzeigen!");
 define('ADMIN_POOL_CONTENT', "Mailbuchungen im Sende-Pool");

-define('POOL_UNKNOWN', "Unbekannt");
-define('POOL_TEMP', "Neuer Auftrag");
-define('POOL_SEND', "Gesendet");
-define('POOL_NEW', "Wartet auf Versand");
-define('POOL_QUEUE', "Wird versendet");
-define('POOL_ADMIN', "Wartet auf Freischaltung");
+define('POOL_TYPE_UNKNOWN', "Unbekannt (%s)");
+define('POOL_TYPE_TEMP', "Neuer Auftrag");
+define('POOL_TYPE_SEND', "Gesendet");
+define('POOL_TYPE_NEW', "Wartet auf Versand");
+define('POOL_TYPE_ACTIVE', "Wird versendet");
+define('POOL_TYPE_ADMIN', "Wartet auf Freischaltung");
+define('EMAIL_ID', "Email-ID");

 define('EMAIL_SENDER', "Versender");
 define('EMAIL_SUBJECT', "Betreffzeile");
 define('EMAIL_TEXT', "Gebuchter Text");
 define('EMAIL_SENDER', "Versender");
 define('EMAIL_SUBJECT', "Betreffzeile");
 define('EMAIL_TEXT', "Gebuchter Text");


@@ -462,6 +463,8 @@ define('EMAIL_RUIDS', "User-IDs");
 define('EMAIL_POOL_TYPE', "Derzeitiger Status");
 define('EMAIL_TSEND', "Noch zu sendene Mails");
 define('EMAIL_URL', "Beworbene URL");
 define('EMAIL_POOL_TYPE', "Derzeitiger Status");
 define('EMAIL_TSEND', "Noch zu sendene Mails");
 define('EMAIL_URL', "Beworbene URL");

+define('EMAIL_TYPE', "Sendestatus");
+define('EMAIL_ZIP', "PLZ");

 define('ADMIN_TEST_URL', "URL testen");
 define('EMAIL_TIMESTAMP', "Gebucht am");
 define('GUEST_FRAMETESTER_TOP', "Sollte dieser Text verschwinden, enth&auml;lt Ihre Webseite einen Frame-Killer!");
 define('ADMIN_TEST_URL', "URL testen");
 define('EMAIL_TIMESTAMP', "Gebucht am");
 define('GUEST_FRAMETESTER_TOP', "Sollte dieser Text verschwinden, enth&auml;lt Ihre Webseite einen Frame-Killer!");


@@ -489,6 +492,7 @@ define('MEMBER_SUBJ_SEND_DONE', "Ihre Werbebuchung wurde versandt");
 define('GUEST_SELECT_LEAST_CATS_1', "Bitte w&auml;hlen Sie mindestens <strong><BIG>");
 define('GUEST_SELECT_LEAST_CATS_2', "</BIG></strong> Kategorien aus. Anderfalls erfolgt keine Anmeldung!");
 define('MEMBER_POOL_CONTENT', "Ihre Mails im Sende-Pool");
 define('GUEST_SELECT_LEAST_CATS_1', "Bitte w&auml;hlen Sie mindestens <strong><BIG>");
 define('GUEST_SELECT_LEAST_CATS_2', "</BIG></strong> Kategorien aus. Anderfalls erfolgt keine Anmeldung!");
 define('MEMBER_POOL_CONTENT', "Ihre Mails im Sende-Pool");

+define('MEMBER_STATS_CONTENT', "Statistiken versandter Mails");

 define('EMAIL_END_SEND', "Vollst&auml;ndig versendet");
 define('EMAIL_CONFIRMED', "Best&auml;tigt");
 define('EMAIL_PERCENT', "Klickrate");
 define('EMAIL_END_SEND', "Vollst&auml;ndig versendet");
 define('EMAIL_CONFIRMED', "Best&auml;tigt");
 define('EMAIL_PERCENT', "Klickrate");


@@ -563,8 +567,7 @@ define('EMAIL_POINTS', "Verg&uuml;tung");
 define('EMAIL_SECONDS', "Wartezeit");
 define('POOL_ACTIVE', "Wird gerade versendet");
 define('ALL_MEMBERS', "Alle Mitglieder");
 define('EMAIL_SECONDS', "Wartezeit");
 define('POOL_ACTIVE', "Wird gerade versendet");
 define('ALL_MEMBERS', "Alle Mitglieder");

-define('ADMIN_SELECT_USERID', "Benuzter ausw&auml;hlen");
-define('ADMIN_SELECT_USER', "Benuzter ausw&auml;hlen");
+define('ADMIN_SELECT_USER', "Mitglied ausw&auml;hlen");

 define('ENTER_POINTS_ADD', "{!POINTS!} zum Aufbuchen");
 define('ENTER_ADD_REASON', "Grund der Aufbuchung");
 define('ADMIN_ADDED_POINTS_1', "Einer unserer Administratoren hat Ihnen soeben");
 define('ENTER_POINTS_ADD', "{!POINTS!} zum Aufbuchen");
 define('ENTER_ADD_REASON', "Grund der Aufbuchung");
 define('ADMIN_ADDED_POINTS_1', "Einer unserer Administratoren hat Ihnen soeben");


@@ -1158,6 +1161,12 @@ define('ADMIN_SOME_ENTRIES_NOT_DELETED', "Es wurden <u>%s</u> von <u>%s</u> ausg
 define('ADMIN_ALL_ENTRIES_EDITED', "Alle ausgew&auml;hlten Eintr&auml;ge sind ge&auml;ndert.");
 define('ADMIN_SOME_ENTRIES_NOT_EDITED', "Es wurden <u>%s</u> von <u>%s</u> ausgew&auml;hlten Eintr&auml;ge ge&auml;ndert.");
 define('USER_NOT_REGISTERED', "Anmeldung hat nicht geklappt! :-( Ist unten eine Fehlermeldung eingeblendet? Bitte beim Support melden.");
 define('ADMIN_ALL_ENTRIES_EDITED', "Alle ausgew&auml;hlten Eintr&auml;ge sind ge&auml;ndert.");
 define('ADMIN_SOME_ENTRIES_NOT_EDITED', "Es wurden <u>%s</u> von <u>%s</u> ausgew&auml;hlten Eintr&auml;ge ge&auml;ndert.");
 define('USER_NOT_REGISTERED', "Anmeldung hat nicht geklappt! :-( Ist unten eine Fehlermeldung eingeblendet? Bitte beim Support melden.");

+define('ADMIN_SELECTION_BOX_TITLE', "Mitglied f&uuml;r Aktion ausw&auml;hlen");
+define('ADMIN_DO_ACTION', "Aktion ausf&uuml;hren");
+define('MEMBER_ORDER_PLEASE_WAIT_TESTER', "Bitte warten Sie den Framekiller-Test ab!");
+define('MEMBER_ORDER_TEST_STARTED', "Framekiller-Test startet...");
+define('MEMBER_ORDER_PLEASE_WAIT_1', "Ihre Seite wird auf Framekiller getestet. Bitte noch ");
+define('MEMBER_ORDER_PLEASE_WAIT_2', " Sekunden warten.");

 
 //
 ?>
 
 //
 ?>

diff --git a/inc/language/en.ph b/inc/language/en.ph
index 261ed215650e469b7a5521f486b1c8cd5437e521..465cd1857c244235464cc709386290c36a621f3e 100644 (file)
--- a/inc/language/en.ph
+++ b/inc/language/en.ph
@@ -37,7 +37,7 @@ define('GENDER_C', "Company");
 define('SAVE_CHANGES', "Save changes");
 define('MYDATA_NOTE', "Geben Sie nur bei <STRONG>Passwort</STRONG> Ihr aktuelles Passwort ein, wenn Sie nur Daten &auml;ndern wollen. Geben Sie bei <STRONG>Passwortbest&auml;tigung</STRONG> das neue Passwort erneut ein, wenn Sie Ihr aktuelles Passwort &auml;ndern wollen.");
 define('MEMBER_UPDATE_PWD_WRONG', "Bitte geben Sie Ihr aktuelles Passwort zum &Auml;ndern Ihrer Einstellungen ein. Wir haben dies zur Sicherheit unserer Mitglieder eingebaut.");
 define('SAVE_CHANGES', "Save changes");
 define('MYDATA_NOTE', "Geben Sie nur bei <STRONG>Passwort</STRONG> Ihr aktuelles Passwort ein, wenn Sie nur Daten &auml;ndern wollen. Geben Sie bei <STRONG>Passwortbest&auml;tigung</STRONG> das neue Passwort erneut ein, wenn Sie Ihr aktuelles Passwort &auml;ndern wollen.");
 define('MEMBER_UPDATE_PWD_WRONG', "Bitte geben Sie Ihr aktuelles Passwort zum &Auml;ndern Ihrer Einstellungen ein. Wir haben dies zur Sicherheit unserer Mitglieder eingebaut.");

-define('MEMBER_HAVE_CHANGED_DATA', "Sie haben heute Ihr Benutzerprofil ge&auml;ndert.");
+define('MEMBER_HAVE_CHANGED_DATA', "Sie haben heute Ihr Mitgliedsprofil ge&auml;ndert.");

 define('YOUR_NEW_DATA', "Hier sind Ihre neuen Profildaten");
 define('PLEASE_NOTIFY_ABUSE_MYDATA', "Sollten Sie diese &Auml;nderungen nicht durchgef&uuml;hrt haben, benachrichten Sie uns bitte! (".WEBMASTER.")");
 define('MEMBER_UNKNOWN_MODE', "Unbekannter Modus erkannt");
 define('YOUR_NEW_DATA', "Hier sind Ihre neuen Profildaten");
 define('PLEASE_NOTIFY_ABUSE_MYDATA', "Sollten Sie diese &Auml;nderungen nicht durchgef&uuml;hrt haben, benachrichten Sie uns bitte! (".WEBMASTER.")");
 define('MEMBER_UNKNOWN_MODE', "Unbekannter Modus erkannt");


@@ -130,10 +130,6 @@ define('MEMBER_SUBJECT', "Betreffzeile in den Mails");
 define('MEMBER_URL', "Gebuchte URL");
 define('MEMBER_NEW_MAIL_IN_QUEUE', "Ihre Mailbuchung befindet sich derzeit in Warteschleife und wird bald ausgesendet!\n\nHier sind nochmals Ihre Daten aus dem Buchungsformular");
 define('MEMBER_SECOND_MAIL', "Sobald Ihre Mailbuchung vollst&auml;ndig gesendet wurde, erhalten Sie eine zweite Mail! Sie k&ouml;nnen bereits eine weitere Mailbuchung durchf&uuml;hren!");
 define('MEMBER_URL', "Gebuchte URL");
 define('MEMBER_NEW_MAIL_IN_QUEUE', "Ihre Mailbuchung befindet sich derzeit in Warteschleife und wird bald ausgesendet!\n\nHier sind nochmals Ihre Daten aus dem Buchungsformular");
 define('MEMBER_SECOND_MAIL', "Sobald Ihre Mailbuchung vollst&auml;ndig gesendet wurde, erhalten Sie eine zweite Mail! Sie k&ouml;nnen bereits eine weitere Mailbuchung durchf&uuml;hren!");

-define('ADMIN_AUTOSEND_INACTIVE', "\nDer Auto-Versand ist in Ihrem {!MT_WORD!} derzeit deaktiviert. Bitte loggen Sie sich in den Admin-Bereich ein und schalten Sie diese Mailbuchung frei!\n");
-define('ADMIN_AUTOSEND_ACTIVE', "\nDer Auto-Versand ist in Ihrem {!MT_WORD!} derzeit aktiviert. Die Mailbuchung wird aktiviert und dann automatisch versand.\n");
-define('MEMBER_AUTOSEND_INACTIVE', "\nDer Auto-Versand ist in unserem {!MT_WORD!} derzeit deaktiviert. Ihre Mailbuchung wird bald von einem Administrator ueberprueft und dann freigegeben.\n");
-define('MEMBER_AUTOSEND_ACTIVE', "\nDer Auto-Versand ist in unserem {!MT_WORD!} derzeit aktiviert. Ihr Mailbuchung wurde aktiviert und wird bald automatisch versant.\n");

 define('ADMIN_NEW_QUEUE', "Mailbuchung in Ihrem {!MT_WORD!}");
 define('MEMBER_NEW_QUEUE', "Vielen Dank fuer die Mailbuchung!");
 define('MEMBER_CONTINUE_AREA', "Weiter zum Mitgliedsbereich");
 define('ADMIN_NEW_QUEUE', "Mailbuchung in Ihrem {!MT_WORD!}");
 define('MEMBER_NEW_QUEUE', "Vielen Dank fuer die Mailbuchung!");
 define('MEMBER_CONTINUE_AREA', "Weiter zum Mitgliedsbereich");


@@ -258,8 +254,7 @@ define('EMAIL_POINTS', "Verg&uuml;tung");
 define('EMAIL_SECONDS', "Wartezeit");
 define('POOL_ACTIVE', "Wird gerade versendet");
 define('ALL_MEMBERS', "Alle Mitglieder");
 define('EMAIL_SECONDS', "Wartezeit");
 define('POOL_ACTIVE', "Wird gerade versendet");
 define('ALL_MEMBERS', "Alle Mitglieder");

-define('ADMIN_SELECT_USERID', "Benuzter ausw&auml;hlen");
-define('ADMIN_SELECT_USER', "Benuzter ausw&auml;hlen");
+define('ADMIN_SELECT_USER', "Mitglied ausw&auml;hlen");

 define('ENTER_POINTS_ADD', "{!POINTS!} zum Aufbuchen");
 define('ENTER_ADD_REASON', "Grund der Aufbuchung");
 define('ADMIN_ADDED_POINTS_1', "Einer unserer Administratoren hat Ihnen soeben");
 define('ENTER_POINTS_ADD', "{!POINTS!} zum Aufbuchen");
 define('ENTER_ADD_REASON', "Grund der Aufbuchung");
 define('ADMIN_ADDED_POINTS_1', "Einer unserer Administratoren hat Ihnen soeben");

diff --git a/inc/language/surfbar_de.php b/inc/language/surfbar_de.php
index 6b6d171830c72cca5b1cf5d783a354b6d5638a0d..054d732ed84884a4fe8fc6a37cd4fb5e2b95bca5 100644 (file)
--- a/inc/language/surfbar_de.php
+++ b/inc/language/surfbar_de.php
@@ -53,7 +53,14 @@ define('ADMIN_CONFIG_SURFBAR_AUTOSTART', "Surfbar soll nach Ruhezeit automatisch
 define('ADMIN_CONFIG_SURFBAR_STATS_RELOAD', "Reload-Zeit der Statistik unterhalb der beworbenen Seite:");
 define('ADMIN_CONFIG_SURFBAR_PURGE_DELETED', "Verweildauer gelöschter URLs in der Datenbank:");
 define('ADMIN_CONFIG_SURFBAR_PURGE_MIGRATED', "Verweildauer migrierter URLs in der Datenbank:");
 define('ADMIN_CONFIG_SURFBAR_STATS_RELOAD', "Reload-Zeit der Statistik unterhalb der beworbenen Seite:");
 define('ADMIN_CONFIG_SURFBAR_PURGE_DELETED', "Verweildauer gelöschter URLs in der Datenbank:");
 define('ADMIN_CONFIG_SURFBAR_PURGE_MIGRATED', "Verweildauer migrierter URLs in der Datenbank:");

-define('ADMIN_CONFIG_SURFBAR_NOTE', "<strong>Hinweise:</strong>&nbsp;Es wird empfohlen, die Ruhezeit etwas l&auml;nger als die Reload-Sperre einzustellen. Migrierte URLs sind aus Mailbuchungen &uuml;bernommene URLs, die das Mitglied noch best&auml;tigen muss.");
+define('ADMIN_CONFIG_SURFBAR_NOTE', "<strong>Hinweise:</strong>&nbsp;Es wird empfohlen, die Ruhezeit etwas l&auml;nger als die Reload-Sperre einzustellen. Migrierte URLs sind aus Mailbuchungen &uuml;bernommene URLs, die das Mitglied noch best&auml;tigen muss. Werden URLs aus freigeschalteten Mailbuchungen in die Surfbar &quot;migriert&quot; so muss erst das Mitglied der Aufnahme zustimmen. Tut es dies nicht, wird die URL wieder aus der Surfbar entfernt. Eine sofortige Freischaltung ist nicht m&ouml;glich.");
+define('ADMIN_CONFIG_SURFBAR_PAUSE_MODE', "Auf welche Seite soll umgeleitet werden, wenn der User alle gebuchten URLs besucht hat? (Wenn sie also im Reload-Lock sind)");
+define('ADMIN_CONFIG_SURFBAR_PAUSE_MODE_INTERNAL', "Auf interne Pausenseite umleiten.");
+define('ADMIN_CONFIG_SURFBAR_PAUSE_MODE_EXTERNAL', "Auf externe Seite umleiten.<br /><span class=\"admin_note\">(Bitte angeben)</span>");
+define('ADMIN_CONFIG_SURFBAR_PAUSE_URL', "Externe Pausenseite (leer lassen, wenn auf interne umgeleitet werden soll)");
+define('ADMIN_CONFIG_SURFBAR_NOTIFY_LIMITS', "Soll das Mitglied per Mail benachrichtigt werden, wenn aufrufbegrenzte URLs abgelaufen und auf &quot;pausierend&quot; gesetzt sind?");
+define('ADMIN_CONFIG_SURFBAR_WARN_LOW_POINTS', "Mitglied warnen, wenn {!POINTS!}-Guthaben unterschritten ist: (0=keine Warnung aussenden)");
+define('ADMIN_CONFIG_SURFBAR_MIGRATE_ORDER', "Sollen URLs aus Mailfreischaltungen in die Surfbar migriert werden?");

 
 // General admin text
 define('ADMIN_SURFBAR_NO_REF_LEVELS_FOUND', "Zur Zeit sind keine Referal-Ebenen f&uuml;r die Surfbar eingestellt.<br />\nBitte installieren Sie die Erweiterung <strong>surfbar</strong> neu.");
 
 // General admin text
 define('ADMIN_SURFBAR_NO_REF_LEVELS_FOUND', "Zur Zeit sind keine Referal-Ebenen f&uuml;r die Surfbar eingestellt.<br />\nBitte installieren Sie die Erweiterung <strong>surfbar</strong> neu.");


@@ -114,6 +121,7 @@ define('MEMBER_SURFBAR_ACTION_FAILED', "Ausgew&auml;hlte Aktion konnte nicht vol
 // Subject lines for admins
 define('ADMIN_SURFBAR_NOTIFY_URL_UNLOCK_SUBJECT', "[Surfbar:] URL hinzugef&uuml;gt durch Admin");
 define('ADMIN_SURFBAR_NOTIFY_URL_REG_SUBJECT', "[Surfbar:] Mitgliedsbuchung einer URL");
 // Subject lines for admins
 define('ADMIN_SURFBAR_NOTIFY_URL_UNLOCK_SUBJECT', "[Surfbar:] URL hinzugef&uuml;gt durch Admin");
 define('ADMIN_SURFBAR_NOTIFY_URL_REG_SUBJECT', "[Surfbar:] Mitgliedsbuchung einer URL");

+define('ADMIN_SURFBAR_NOTIFY_URL_MIGRATE_SUBJECT', "[Surfbar:] Migrierung einer Mailbuchung");

 define('ADMIN_SURFBAR_NOTIFY_URL_ACTIVE_SUBJECT', "[Surfbar:] Freigabe einer URL");
 define('ADMIN_SURFBAR_NOTIFY_URL_DELETED_SUBJECT', "[Surfbar:] URL gel&ouml;scht");
 define('ADMIN_SURFBAR_NOTIFY_URL_REJECTED_SUBJECT', "[Surfbar:] URL abgelehnt");
 define('ADMIN_SURFBAR_NOTIFY_URL_ACTIVE_SUBJECT', "[Surfbar:] Freigabe einer URL");
 define('ADMIN_SURFBAR_NOTIFY_URL_DELETED_SUBJECT', "[Surfbar:] URL gel&ouml;scht");
 define('ADMIN_SURFBAR_NOTIFY_URL_REJECTED_SUBJECT', "[Surfbar:] URL abgelehnt");


@@ -128,6 +136,7 @@ define('ADMIN_LOCKED_SURFBAR_URLS_SUBJECT', "[Surfbar:] Sperrung einer URL");
 // Subject lines for members
 define('MEMBER_SURFBAR_NOTIFY_URL_UNLOCK_SUBJECT', "Ihre URL wurde in die Surfbar aufgenommen");
 define('MEMBER_SURFBAR_NOTIFY_URL_REG_SUBJECT', "Ihre URL in der Surfbar wartet auf Freischaltung");
 // Subject lines for members
 define('MEMBER_SURFBAR_NOTIFY_URL_UNLOCK_SUBJECT', "Ihre URL wurde in die Surfbar aufgenommen");
 define('MEMBER_SURFBAR_NOTIFY_URL_REG_SUBJECT', "Ihre URL in der Surfbar wartet auf Freischaltung");

+define('MEMBER_SURFBAR_NOTIFY_URL_MIGRATE_SUBJECT', "Ihre Mailbuchung wurde in die Surfbar migriert");

 define('MEMBER_SURFBAR_NOTIFY_URL_ACTIVE_SUBJECT', "Ihre URL wurde f&uuml;r die Surfbar freigegeben");
 define('MEMBER_SURFBAR_NOTIFY_URL_DELETED_SUBJECT', "L&ouml;schung Ihrer URL aus der Surfbar");
 define('MEMBER_SURFBAR_NOTIFY_URL_REJECTED_SUBJECT', "Ihre URL wurde f&uuml;r die Surfbar abgelehnt!");
 define('MEMBER_SURFBAR_NOTIFY_URL_ACTIVE_SUBJECT', "Ihre URL wurde f&uuml;r die Surfbar freigegeben");
 define('MEMBER_SURFBAR_NOTIFY_URL_DELETED_SUBJECT', "L&ouml;schung Ihrer URL aus der Surfbar");
 define('MEMBER_SURFBAR_NOTIFY_URL_REJECTED_SUBJECT', "Ihre URL wurde f&uuml;r die Surfbar abgelehnt!");


@@ -146,6 +155,7 @@ define('SURFBAR_URL_STATUS_PENDING', "Wartend");
 define('SURFBAR_URL_STATUS_STOPPED', "Angehalten");
 define('SURFBAR_URL_STATUS_REJECTED', "Abgelehnt");
 define('SURFBAR_URL_STATUS_DELETED', "Gel&ouml;scht");
 define('SURFBAR_URL_STATUS_STOPPED', "Angehalten");
 define('SURFBAR_URL_STATUS_REJECTED', "Abgelehnt");
 define('SURFBAR_URL_STATUS_DELETED', "Gel&ouml;scht");

+define('SURFBAR_URL_STATUS_MIGRATED', "Migriert");

 
 // Member actions - submit buttons
 define('MEMBER_SURFBAR_ACTION_RETREAT_SUBMIT', "Zur&uuml;cknehmen");
 
 // Member actions - submit buttons
 define('MEMBER_SURFBAR_ACTION_RETREAT_SUBMIT', "Zur&uuml;cknehmen");

diff --git a/inc/libs/newsletter_functions.php b/inc/libs/newsletter_functions.php
index 2a1553a3fc2a92f394f750f391e6824607004f4a..2b03a73f11db3ee23eee893ff35f514d59b71bfc 100644 (file)
--- a/inc/libs/newsletter_functions.php
+++ b/inc/libs/newsletter_functions.php
@@ -167,17 +167,17 @@ function SEND_NEWSLETTER($TO, $SUBJECT, $MSG, $MODE)
                // Automatically insert URLs into newsletter
                if ((EXT_IS_ACTIVE("html")) && ($MODE == "html")) {
                        // Send HTML mail
                // Automatically insert URLs into newsletter
                if ((EXT_IS_ACTIVE("html")) && ($MODE == "html")) {
                        // Send HTML mail

-                       SEND_EMAIL($TO, $SUBJECT, HTML_INSERT_URLS($MSG), 'Y');
+                       SEND_EMAIL($TO, $SUBJECT, HTML_INSERT_URLS($MSG), "Y");

                } else {
                        // Send normal mail
                } else {
                        // Send normal mail

-                       SEND_EMAIL($TO, $SUBJECT, NL_INSERT_URLS($MSG), 'N');
+                       SEND_EMAIL($TO, $SUBJECT, NL_INSERT_URLS($MSG), "N");

                }
        } else {
                // Regular send-out
                if ((EXT_IS_ACTIVE("html")) && ($MODE == "html")) {
                }
        } else {
                // Regular send-out
                if ((EXT_IS_ACTIVE("html")) && ($MODE == "html")) {

-                       SEND_EMAIL($TO, $SUBJECT, $MSG, 'Y');
+                       SEND_EMAIL($TO, $SUBJECT, $MSG, "Y");

                } else {
                } else {

-                       SEND_EMAIL($TO, $SUBJECT, $MSG);
+                       SEND_EMAIL($TO, $SUBJECT, $MSG, "N");

                }
        }
 }
                }
        }
 }

diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php
index dcf0902e2ab86ce6d2b0a8dc8b8250428e9bb196..da4aba5a0c4e9a97f916fc22642469a5e71c213f 100644 (file)
--- a/inc/libs/surfbar_functions.php
+++ b/inc/libs/surfbar_functions.php
@@ -59,7 +59,27 @@ function SURFBAR_ADMIN_ADD_URL ($url) {
        }
 
        // Register the new URL
        }
 
        // Register the new URL

-       return SURFBAR_REGISTER_URL($url, "0", "0", "ACTIVE", "unlock");
+       return SURFBAR_REGISTER_URL($url, "0", "ACTIVE", "unlock");
+}
+// Admin unlocked an email so we can migrate the URL
+function SURFBAR_ADMIN_MIGRATE_URL ($url, $uid) {
+       // Do some pre-checks
+       if (!IS_ADMIN()) {
+               // Not an admin
+               return false;
+       } elseif (!VALIDATE_URL($url)) {
+               // URL invalid
+               return false;
+       } elseif (SURFBAR_LOOKUP_BY_URL($url, $uid)) {
+               // URL already found in surfbar!
+               return false;
+       } elseif (!SURFBAR_IF_USER_BOOK_MORE_URLS($uid)) {
+               // No more allowed!
+               return false;
+       }
+
+       // Register the new URL
+       return SURFBAR_REGISTER_URL($url, $uid, "MIGRATED", "migrate");

 }
 // Admin function for unlocking URLs
 function SURFBAR_ADMIN_UNLOCK_URL_IDS ($IDs) {
 }
 // Admin function for unlocking URLs
 function SURFBAR_ADMIN_UNLOCK_URL_IDS ($IDs) {


@@ -319,7 +339,7 @@ ORDER BY %s %s
        return $lastUrlData;
 }
 // Registers an URL with the surfbar. You should have called SURFBAR_LOOKUP_BY_URL() first!
        return $lastUrlData;
 }
 // Registers an URL with the surfbar. You should have called SURFBAR_LOOKUP_BY_URL() first!

-function SURFBAR_REGISTER_URL ($url, $uid, $paymentId=0, $status="PENDING", $addMode="reg") {
+function SURFBAR_REGISTER_URL ($url, $uid, $status="PENDING", $addMode="reg") {

        global $_CONFIG;
 
        // Make sure by the user registered URLs are always pending
        global $_CONFIG;
 
        // Make sure by the user registered URLs are always pending


@@ -408,7 +428,7 @@ function SURFBAR_NOTIFY_USER ($messageType, $content) {
        @eval($eval);
 
        // Load template
        @eval($eval);
 
        // Load template

-       $mailText = LOAD_EMAIL_TEMPLATE($templateName, $content);
+       $mailText = LOAD_EMAIL_TEMPLATE($templateName, $content, $content['uid']);

 
        // Send the email
        return SEND_EMAIL($content['uid'], $subject, $mailText);
 
        // Send the email
        return SEND_EMAIL($content['uid'], $subject, $mailText);


@@ -1049,7 +1069,7 @@ LEFT JOIN "._MYSQL_PREFIX."_surfbar_salts AS sbs
 ON sbu.id=sbs.url_id
 LEFT JOIN "._MYSQL_PREFIX."_surfbar_locks AS l
 ON sbu.id=l.url_id
 ON sbu.id=sbs.url_id
 LEFT JOIN "._MYSQL_PREFIX."_surfbar_locks AS l
 ON sbu.id=l.url_id

-WHERE sbu.userid NOT IN (".implode(",", $UIDs).") AND sbu.status='ACTIVE'".$ADD."
+WHERE sbu.userid NOT IN (".implode(",", $UIDs).") AND (sbu.views_allowed=0 OR (sbu.views_allowed > 0 AND sbu.views_max > 0)) AND sbu.status='ACTIVE'".$ADD."

 GROUP BY sbu.id", __FILE__, __LINE__);
 
        // Log last query
 GROUP BY sbu.id", __FILE__, __LINE__);
 
        // Log last query


@@ -1114,6 +1134,20 @@ function SURFBAR_GET_ACTION_ARRAY ($status) {
        // Return result
        return $returnArray;
 }
        // Return result
        return $returnArray;
 }

+// Reload to configured stop page
+function SURFBAR_RELOAD_TO_STOP_PAGE($page="stop") {
+       global $_CONFIG;
+
+       // Internal or external?
+       if (($_CONFIG['surfbar_pause_mode'] == "INTERNAL") || (empty($_CONFIG['surfbar_pause_url']))) {
+               // Reload to internal page
+               LOAD_URL("surfbar.php?frame=".$page);
+       } else {
+               // Reload to external page
+               LOAD_URL($_CONFIG['surfbar_pause_url']);
+       }
+}
+

 // Determine next id for surfbar or get data for given id, always call this before you call other
 // getters below this function!!!
 function SURFBAR_DETERMINE_NEXT_ID ($urlId = 0) {
 // Determine next id for surfbar or get data for given id, always call this before you call other
 // getters below this function!!!
 function SURFBAR_DETERMINE_NEXT_ID ($urlId = 0) {


@@ -1162,7 +1196,7 @@ LEFT JOIN "._MYSQL_PREFIX."_surfbar_salts AS sbs
 ON sbu.id=sbs.url_id
 LEFT JOIN "._MYSQL_PREFIX."_surfbar_locks AS l
 ON sbu.id=l.url_id
 ON sbu.id=sbs.url_id
 LEFT JOIN "._MYSQL_PREFIX."_surfbar_locks AS l
 ON sbu.id=l.url_id

-WHERE sbu.userid NOT IN (".implode(",", $UIDs).") AND sbu.status='ACTIVE'".$ADD."
+WHERE sbu.userid NOT IN (".implode(",", $UIDs).") AND sbu.status='ACTIVE' AND (sbu.views_allowed=0 OR (sbu.views_allowed > 0 AND sbu.views_max > 0))".$ADD."

 GROUP BY sbu.id
 ORDER BY l.last_surfed ASC, sbu.id ASC
 LIMIT %s,1",
 GROUP BY sbu.id
 ORDER BY l.last_surfed ASC, sbu.id ASC
 LIMIT %s,1",


@@ -1176,7 +1210,7 @@ LEFT JOIN "._MYSQL_PREFIX."_surfbar_salts AS sbs
 ON sbu.id=sbs.url_id
 LEFT JOIN "._MYSQL_PREFIX."_surfbar_locks AS l
 ON sbu.id=l.url_id
 ON sbu.id=sbs.url_id
 LEFT JOIN "._MYSQL_PREFIX."_surfbar_locks AS l
 ON sbu.id=l.url_id

-WHERE sbu.userid != %s AND sbu.status='ACTIVE' AND sbu.id=%s
+WHERE sbu.userid != %s AND sbu.status='ACTIVE' AND sbu.id=%s AND (sbu.views_allowed=0 OR (sbu.views_allowed > 0 AND sbu.views_max > 0))

 LIMIT 1",
                        array($GLOBALS['userid'], bigintval($urlId)), __FILE__, __LINE__
                );
 LIMIT 1",
                        array($GLOBALS['userid'], bigintval($urlId)), __FILE__, __LINE__
                );

diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php
index 20e653b4bd823b4d8d3907b80ce783afdeed0433..7437043b4634d4f9dbb9daf20794a252386888bd 100644 (file)
--- a/inc/libs/task_functions.php
+++ b/inc/libs/task_functions.php
@@ -279,7 +279,7 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
                if (EXT_IS_ACTIVE("beg"))                  $EXCLUDE_LIST .= " AND d.userid != c.beg_uid";
                if (EXT_IS_ACTIVE("bonus"))                $EXCLUDE_LIST .= " AND d.userid != c.bonus_uid";
                if (EXT_IS_ACTIVE("doubler"))              $EXCLUDE_LIST .= " AND d.userid != c.doubler_uid";
                if (EXT_IS_ACTIVE("beg"))                  $EXCLUDE_LIST .= " AND d.userid != c.beg_uid";
                if (EXT_IS_ACTIVE("bonus"))                $EXCLUDE_LIST .= " AND d.userid != c.bonus_uid";
                if (EXT_IS_ACTIVE("doubler"))              $EXCLUDE_LIST .= " AND d.userid != c.doubler_uid";

-               if (GET_EXT_VERSION("holiday") >= "0.1.3") $EXCLUDE_LIST .= " AND d.holiday_active = 'N'";
+               if (GET_EXT_VERSION("holiday") >= "0.1.3") $EXCLUDE_LIST .= " AND d.holiday_active='N'";

 
                // Check for all accounts
                $SQLs[] = "SELECT DISTINCT d.userid, d.email, d.last_online
 
                // Check for all accounts
                $SQLs[] = "SELECT DISTINCT d.userid, d.email, d.last_online

diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index 7304579282886d6572c1650016c61dcb3e2b2cbf..115bec72f7a4c7f858e289a8153e8dc7698eb2f8 100644 (file)
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -45,7 +45,7 @@ function alpha($sortby, $colspan, $return=false)
        if (!empty($_GET['mode'])) $ADD .= "&mode=".SQL_ESCAPE($_GET['mode']);
 
        /* Creates the list of letters and makes them a link. */
        if (!empty($_GET['mode'])) $ADD .= "&mode=".SQL_ESCAPE($_GET['mode']);
 
        /* Creates the list of letters and makes them a link. */

-       $alphabet = array(_ALL2, "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", 'N', "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", 'Y', "Z", _OTHERS);
+       $alphabet = array(_ALL2,"A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z",_OTHERS);

        $num = count($alphabet) - 1;
        $OUT = "";
        while (list($counter, $ltr) = each($alphabet))
        $num = count($alphabet) - 1;
        $OUT = "";
        while (list($counter, $ltr) = each($alphabet))

diff --git a/inc/mails/beg_mails.php b/inc/mails/beg_mails.php
index d6206350aef535f0271897ba44e1af680becf002..06ed2b85def8b03cd4804f9f3313d9881e9c1a7c 100644 (file)
--- a/inc/mails/beg_mails.php
+++ b/inc/mails/beg_mails.php
@@ -132,7 +132,7 @@ SET beg_ral_notify='%s', beg_ral_%s_notify='%s' WHERE userid=%s LIMIT 1",
                         else
                        {
                                // Send normal notification mail to the members
                         else
                        {
                                // Send normal notification mail to the members

-                               $MSG = LOAD_EMAIL_TEMPLATE("beg_".$MODE."_notify", "", $uid);
+                               $MSG = LOAD_EMAIL_TEMPLATE("beg_".$MODE."_notify", array(), $uid);

                                SEND_EMAIL($email, $SUBJECT, $MSG);
                        }
                }
                                SEND_EMAIL($email, $SUBJECT, $MSG);
                        }
                }


@@ -144,7 +144,7 @@ SET beg_ral_notify='%s', beg_ral_%s_notify='%s' WHERE userid=%s LIMIT 1",
                        $RECEIVER = implode(";", $UIDs);
                        $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_bonus
 (subject, text, receivers, points, time, data_type, timestamp, url, cat_id, target_send, mails_sent, is_notify)
                        $RECEIVER = implode(";", $UIDs);
                        $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_bonus
 (subject, text, receivers, points, time, data_type, timestamp, url, cat_id, target_send, mails_sent, is_notify)

-VALUES ('%s', '%s', '%s', '%s', '%s', 'NEW', UNIX_TIMESTAMP(), '%s', '%s', '%s', '%s', 'Y')",
+VALUES ('%s','%s','%s','%s','%s','NEW', UNIX_TIMESTAMP(), '%s','%s','%s','%s','Y')",

  array(
        $SUBJECT,
        $MSG,
  array(
        $SUBJECT,
        $MSG,

diff --git a/inc/mails/birthday_mails.php b/inc/mails/birthday_mails.php
index 634e41d3ba91cc5fc292692bbc1af6b02cf5c0a7..6758f0343ddbb83470d7b4c7bfe8516eba7b0a80 100644 (file)
--- a/inc/mails/birthday_mails.php
+++ b/inc/mails/birthday_mails.php
@@ -85,7 +85,7 @@ if (SQL_NUMROWS($result_birthday) > 0) {
                        }
 
                        // Insert row into database
                        }
 
                        // Insert row into database

-                       $result_insert = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_birthday (userid, points, chk_value) VALUES ('%s', '%s', '%s' )",
+                       $result_insert = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_birthday (userid, points, chk_value) VALUES ('%s','%s','%s' )",

                         array(bigintval($uid), $_CONFIG['birthday_points'], $content['check']), __FILE__, __LINE__);
 
                        // Load email template with confirmation link
                         array(bigintval($uid), $_CONFIG['birthday_points'], $content['check']), __FILE__, __LINE__);
 
                        // Load email template with confirmation link

diff --git a/inc/mails/bonus_mails.php b/inc/mails/bonus_mails.php
index bbcaa83e472891584b3079c77e1030363fcd2b6d..8634d0a496fc917fa961a2659c9003abf754eb76 100644 (file)
--- a/inc/mails/bonus_mails.php
+++ b/inc/mails/bonus_mails.php
@@ -117,7 +117,7 @@ SET bonus_ral_notify='%s', bonus_ral_%s_notify='%s' WHERE userid=%s LIMIT 1",
                         else
                        {
                                // Send normal notification mail to the members
                         else
                        {
                                // Send normal notification mail to the members

-                               $MSG = LOAD_EMAIL_TEMPLATE("bonus_".$MODE."_notify", "", $uid);
+                               $MSG = LOAD_EMAIL_TEMPLATE("bonus_".$MODE."_notify", array(), $uid);

                                SEND_EMAIL($email, $SUBJECT, $MSG);
                        }
                }
                                SEND_EMAIL($email, $SUBJECT, $MSG);
                        }
                }


@@ -129,7 +129,7 @@ SET bonus_ral_notify='%s', bonus_ral_%s_notify='%s' WHERE userid=%s LIMIT 1",
                        $RECEIVER = implode(";", $UIDs);
                        $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_bonus
 (subject, text, receivers, points, time, data_type, timestamp, url, cat_id, target_send, mails_sent, is_notify)
                        $RECEIVER = implode(";", $UIDs);
                        $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_bonus
 (subject, text, receivers, points, time, data_type, timestamp, url, cat_id, target_send, mails_sent, is_notify)

-VALUES ('%s', '%s', '%s', '%s', '%s', 'NEW', UNIX_TIMESTAMP(), '%s', '%s', '%s', '%s', 'Y')",
+VALUES ('%s','%s','%s','%s','%s','NEW', UNIX_TIMESTAMP(), '%s','%s','%s','%s','Y')",

  array(
        $SUBJECT,
        $MSG,
  array(
        $SUBJECT,
        $MSG,

diff --git a/inc/modules/admin/what-add_rallye.php b/inc/modules/admin/what-add_rallye.php
index 9bd259c9f0858ae99f4efa94f2360baa7583135b..b9cafd89476b054354d991c630f79793bf6c3bf4 100644 (file)
--- a/inc/modules/admin/what-add_rallye.php
+++ b/inc/modules/admin/what-add_rallye.php
@@ -54,7 +54,7 @@ if (isset($_POST['ok']))
        {
                // Ok, start and end time did not overlap
                $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_rallye_data (admin_id, title, descr, template, start_time, end_time, auto_add_new_user, is_active, send_notify)
        {
                // Ok, start and end time did not overlap
                $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_rallye_data (admin_id, title, descr, template, start_time, end_time, auto_add_new_user, is_active, send_notify)

-VALUES ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s')",
+VALUES ('%s','%s','%s','%s','%s','%s','%s','%s','%s')",

  array(
        GET_ADMIN_ID(get_session('admin_login')),
        $_POST['title'],
  array(
        GET_ADMIN_ID(get_session('admin_login')),
        $_POST['title'],


@@ -95,9 +95,9 @@ VALUES ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s')",
 }
 
 // Prepare some constants for the template
 }
 
 // Prepare some constants for the template

-define('_AUTO_ADD_OPTIONS', ADD_OPTION_LINES("/ARRAY/", array('Y', 'N'), array(YES, NO )));
-define('_ACTIVE_OPTIONS'  , ADD_OPTION_LINES("/ARRAY/", array('N', 'Y'), array(NO , YES)));
-define('_NOTIFY_OPTIONS'  , ADD_OPTION_LINES("/ARRAY/", array('Y', 'N'), array(YES, NO )));
+define('_AUTO_ADD_OPTIONS', ADD_OPTION_LINES("/ARRAY/", array('Y','N'), array(YES, NO )));
+define('_ACTIVE_OPTIONS'  , ADD_OPTION_LINES("/ARRAY/", array('N','Y'), array(NO , YES)));
+define('_NOTIFY_OPTIONS'  , ADD_OPTION_LINES("/ARRAY/", array('Y','N'), array(YES, NO )));

 
 // Starting day
 define('_START_SEC'  , ADD_SELECTION("sec"  , "0"              , "start"));
 
 // Starting day
 define('_START_SEC'  , ADD_SELECTION("sec"  , "0"              , "start"));

diff --git a/inc/modules/admin/what-admin_add.php b/inc/modules/admin/what-admin_add.php
index 3553b701792627ee84ee6de996d44c80786f0d6b..fa44c2de380af8a0ece0ccf0876240d565493d43 100644 (file)
--- a/inc/modules/admin/what-admin_add.php
+++ b/inc/modules/admin/what-admin_add.php
@@ -170,8 +170,8 @@ if (!isset($_POST['ok']))
        if (!empty($_POST['menu']))
        {
                // Add sub menu
        if (!empty($_POST['menu']))
        {
                // Add sub menu

-               $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort)
-VALUES('%s', '%s', '%s', '%s', '%s')",
+               $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`)
+VALUES('%s','%s','%s','%s','%s')",

  array(
        $_POST['menu'],
        $_POST['name'],
  array(
        $_POST['menu'],
        $_POST['name'],


@@ -185,7 +185,7 @@ VALUES('%s', '%s', '%s', '%s', '%s')",
        {
                // Add main menu
                $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, title, descr, sort)
        {
                // Add main menu
                $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, title, descr, sort)

-VALUES('%s', '%s', '%s', '%s')",
+VALUES('%s','%s','%s','%s')",

  array(
        $_POST['name'],
        $_POST['title'],
  array(
        $_POST['name'],
        $_POST['title'],

diff --git a/inc/modules/admin/what-admins_add.php b/inc/modules/admin/what-admins_add.php
index 27956bc37fab19c2a7c8287bb31b4427daddd995..667568fff6564d9ede5f40941bc8508333e953f9 100644 (file)
--- a/inc/modules/admin/what-admins_add.php
+++ b/inc/modules/admin/what-admins_add.php
@@ -54,7 +54,7 @@ if ((isset($_POST['add'])) && (!empty($_POST['login'])) && (!empty($_POST['email
        {
                // Login does not exist so we can create it.
                $FORM = false;
        {
                // Login does not exist so we can create it.
                $FORM = false;

-               $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_admins (login, password, email) VALUES ('%s', '%s', '%s')",
+               $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_admins (login, password, email) VALUES ('%s','%s','%s')",

                 array($_POST['login'], generateHash($_POST['pass1']), $_POST['email']), __FILE__, __LINE__);
 
                // Admin login saved
                 array($_POST['login'], generateHash($_POST['pass1']), $_POST['email']), __FILE__, __LINE__);
 
                // Admin login saved

diff --git a/inc/modules/admin/what-admins_mails.php b/inc/modules/admin/what-admins_mails.php
index 874fdc605f198143b94d9af42f9c0d0e321fee28..3d7e951eff67f322159bee5e7b81e51c58785613 100644 (file)
--- a/inc/modules/admin/what-admins_mails.php
+++ b/inc/modules/admin/what-admins_mails.php
@@ -141,7 +141,7 @@ ORDER BY m.admin_id, m.mail_template", __FILE__, __LINE__);
                                if ($_POST['admin_new'][$_POST['template'][$id]] > 0)
                                {
                                        // Add new admin
                                if ($_POST['admin_new'][$_POST['template'][$id]] > 0)
                                {
                                        // Add new admin

-                                       $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_admins_mails (admin_id, mail_template) VALUES ('%s', '%s')",
+                                       $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_admins_mails (admin_id, mail_template) VALUES ('%s','%s')",

                                         array($aid, $_POST['template'][$id]), __FILE__, __LINE__);
                                }
                        }
                                         array($aid, $_POST['template'][$id]), __FILE__, __LINE__);
                                }
                        }

diff --git a/inc/modules/admin/what-config_admins.php b/inc/modules/admin/what-config_admins.php
index bd5c7a93e09c96842d278416c2a58e3e4d10a691..2ab08abfae87d3bae9d2f0be2313aa796e378e73 100644 (file)
--- a/inc/modules/admin/what-config_admins.php
+++ b/inc/modules/admin/what-config_admins.php
@@ -182,7 +182,7 @@ if ((isset($_POST['edit'])) && ($SEL > 0)) {
                        if (SQL_NUMROWS($result) == 0) {
                                // Finally add the new ACL
                                $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_admins_acls (admin_id, action_menu, what_menu, access_mode)
                        if (SQL_NUMROWS($result) == 0) {
                                // Finally add the new ACL
                                $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_admins_acls (admin_id, action_menu, what_menu, access_mode)

-VALUES ('%s', '%s', '%s', '%s')",
+VALUES ('%s','%s','%s','%s')",

  array(
        bigintval($_POST['admin_id']),
        $_POST['action_menu'],
  array(
        bigintval($_POST['admin_id']),
        $_POST['action_menu'],

diff --git a/inc/modules/admin/what-config_cats.php b/inc/modules/admin/what-config_cats.php
index d42c6bd2e8acd682a9f81db7ee0f70d83a10d441..3f9584d921b7ff3fa2a0c21d7b4979cfa98d3743 100644 (file)
--- a/inc/modules/admin/what-config_cats.php
+++ b/inc/modules/admin/what-config_cats.php
@@ -50,7 +50,7 @@ if (isset($_POST['add'])) {
         array(addslashes($_POST['catname'])), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 0) {
                // Category does not exists, we simply add it...
         array(addslashes($_POST['catname'])), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 0) {
                // Category does not exists, we simply add it...

-               $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_cats (cat, visible, sort) VALUES ('%s', '%s', '%s')",
+               $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_cats (cat, visible, sort) VALUES ('%s','%s','%s')",

                 array(addslashes($_POST['catname']), $_POST['visible'], bigintval($_POST['parent'] + 1)), __FILE__, __LINE__);
                $content = "<SPAN class=\"admin_done\">".CATEGORY_ADDED."</SPAN>";
        } else {
                 array(addslashes($_POST['catname']), $_POST['visible'], bigintval($_POST['parent'] + 1)), __FILE__, __LINE__);
                $content = "<SPAN class=\"admin_done\">".CATEGORY_ADDED."</SPAN>";
        } else {

diff --git a/inc/modules/admin/what-config_email.php b/inc/modules/admin/what-config_email.php
index e36c9f5bb6396ac87b83498ce90de303655babb5..c41ae6c5ce837da0eff35238bff20e9c12bda3c1 100644 (file)
--- a/inc/modules/admin/what-config_email.php
+++ b/inc/modules/admin/what-config_email.php
@@ -49,7 +49,7 @@ if (isset($_POST['add_max'])) {
         array(bigintval($_POST['max'])), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 0) {
                // Add this value (including comment)
         array(bigintval($_POST['max'])), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 0) {
                // Add this value (including comment)

-               $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_max_receive (value, comment) VALUES ('%s', '%s')",
+               $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_max_receive (value, comment) VALUES ('%s','%s')",

                 array(bigintval($_POST['max']), $_POST['comment']),__FILE__, __LINE__);
                $content = "<SPAN class=\"admin_done\">".MAX_VALUE_SAVED."</SPAN>";
        } else {
                 array(bigintval($_POST['max']), $_POST['comment']),__FILE__, __LINE__);
                $content = "<SPAN class=\"admin_done\">".MAX_VALUE_SAVED."</SPAN>";
        } else {

diff --git a/inc/modules/admin/what-config_payouts.php b/inc/modules/admin/what-config_payouts.php
index 3b3af308e05f0111ecdf1607c2f081fdb0fca651..58e04477de046797243f46724d9cc586ef937442 100644 (file)
--- a/inc/modules/admin/what-config_payouts.php
+++ b/inc/modules/admin/what-config_payouts.php
@@ -52,7 +52,7 @@ if ((isset($_POST['add'])) && (!empty($_POST['title'])) && ($_POST['rate'] > 0))
                // Add now
                $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_payout_types
 (type, rate, min_points, from_account, from_pass, engine_url, engine_ret_ok, engine_ret_failed, pass_enc, allow_url)
                // Add now
                $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_payout_types
 (type, rate, min_points, from_account, from_pass, engine_url, engine_ret_ok, engine_ret_failed, pass_enc, allow_url)

-VALUES ('%s', %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s')",
+VALUES ('%s', %d, %d,'%s','%s','%s','%s','%s','%s','%s')",

  array(
        $_POST['title'],
        bigintval($_POST['rate']),
  array(
        $_POST['title'],
        bigintval($_POST['rate']),

diff --git a/inc/modules/admin/what-config_points.php b/inc/modules/admin/what-config_points.php
index a4f604a8ba7747ac0fa81f4bcd4bf684e2d7e7a1..8307ed99a081e2d0f9d72bcc1bc36d7f740787ff 100644 (file)
--- a/inc/modules/admin/what-config_points.php
+++ b/inc/modules/admin/what-config_points.php
@@ -74,7 +74,7 @@ if (isset($_POST['ok'])) {
                switch ($_GET['do'])
                {
                case "add":
                switch ($_GET['do'])
                {
                case "add":

-                       $SQL[] = "INSERT INTO "._MYSQL_PREFIX."_refdepths (level, percents) VALUES ('".$_POST['lvl']."', '".$_POST['perc']."')";
+                       $SQL[] = "INSERT INTO "._MYSQL_PREFIX."_refdepths (level, percents) VALUES ('".$_POST['lvl']."','".$_POST['perc']."')";

                        break;
 
                case "edit": // Change entries
                        break;
 
                case "edit": // Change entries

diff --git a/inc/modules/admin/what-config_rallye_prices.php b/inc/modules/admin/what-config_rallye_prices.php
index c06f365fc452055551a586472a69c917da0e6add..463e7ed90d1b423a6216adbf6eb96999ecd3d40e 100644 (file)
--- a/inc/modules/admin/what-config_rallye_prices.php
+++ b/inc/modules/admin/what-config_rallye_prices.php
@@ -55,7 +55,7 @@ if (!empty($_GET['rallye']))
                        {
                                // Ok, new price level entered!
                                $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_rallye_prices (rallye_id, price_level, points, info)
                        {
                                // Ok, new price level entered!
                                $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_rallye_prices (rallye_id, price_level, points, info)

-VALUES ('%s', '%s', '%s', '%s')",
+VALUES ('%s','%s','%s','%s')",

  array(
        bigintval($_GET['rallye']),
        bigintval($_POST['level']),
  array(
        bigintval($_GET['rallye']),
        bigintval($_POST['level']),

diff --git a/inc/modules/admin/what-config_surfbar.php b/inc/modules/admin/what-config_surfbar.php
index 409b10507352280ca4f5ab16bbc307f5e85f1cbc..0a3eb8bc07198fdb13f63909aed12d5251ea798d 100644 (file)
--- a/inc/modules/admin/what-config_surfbar.php
+++ b/inc/modules/admin/what-config_surfbar.php
@@ -44,6 +44,7 @@ ADD_DESCR("admin", basename(__FILE__));
 if (isset($_POST['ok'])) {
        // Replace german decimal comma with computer decimal dot
        if (isset($_POST['surfbar_static_reward']))   $_POST['surfbar_static_reward']   = str_replace(",", ".", $_POST['surfbar_static_reward']);
 if (isset($_POST['ok'])) {
        // Replace german decimal comma with computer decimal dot
        if (isset($_POST['surfbar_static_reward']))   $_POST['surfbar_static_reward']   = str_replace(",", ".", $_POST['surfbar_static_reward']);

+       if (isset($_POST['surfbar_static_costs']))    $_POST['surfbar_static_costs']    = str_replace(",", ".", $_POST['surfbar_static_costs']);

        if (isset($_POST['surfbar_dynamic_percent'])) $_POST['surfbar_dynamic_percent'] = str_replace(",", ".", $_POST['surfbar_dynamic_percent']);
 
        // Save settings
        if (isset($_POST['surfbar_dynamic_percent'])) $_POST['surfbar_dynamic_percent'] = str_replace(",", ".", $_POST['surfbar_dynamic_percent']);
 
        // Save settings


@@ -65,7 +66,9 @@ if (isset($_POST['ok'])) {
                // @TODO Rewrite this to tiny selection boxes
                'surfbar_purge_deleted'   => $_CONFIG['surfbar_purge_deleted'],
                // @TODO Rewrite this to tiny selection boxes
                // @TODO Rewrite this to tiny selection boxes
                'surfbar_purge_deleted'   => $_CONFIG['surfbar_purge_deleted'],
                // @TODO Rewrite this to tiny selection boxes

-               'surfbar_purge_migrated'  => $_CONFIG['surfbar_purge_migrated']
+               'surfbar_purge_migrated'  => $_CONFIG['surfbar_purge_migrated'],
+               'surfbar_pause_url'       => $_CONFIG['surfbar_pause_url'],
+               'surfbar_warn_low_points' => $_CONFIG['surfbar_warn_low_points']

        );
 
        // Prepare payment model for template
        );
 
        // Prepare payment model for template


@@ -90,6 +93,39 @@ if (isset($_POST['ok'])) {
                define('__CONFIG_SURFBAR_AUTOSTART_N', " checked=\"checked\"");
        }
 
                define('__CONFIG_SURFBAR_AUTOSTART_N', " checked=\"checked\"");
        }
 

+       // Prepare notify limits
+       if ($_CONFIG['surfbar_notify_limits'] == "Y") {
+               // Yes selected
+               define('__CONFIG_SURFBAR_NOTIFY_LIMITS_Y' , " checked=\"checked\"");
+               define('__CONFIG_SURFBAR_NOTIFY_LIMITS_N', "");
+       } else {
+               // No selected
+               define('__CONFIG_SURFBAR_NOTIFY_LIMITS_Y' , "");
+               define('__CONFIG_SURFBAR_NOTIFY_LIMITS_N', " checked=\"checked\"");
+       }
+
+       // Prepare order migration
+       if ($_CONFIG['surfbar_migrate_order'] == "Y") {
+               // Yes selected
+               define('__CONFIG_SURFBAR_MIGRATE_ORDER_Y' , " checked=\"checked\"");
+               define('__CONFIG_SURFBAR_MIGRATE_ORDER_N', "");
+       } else {
+               // No selected
+               define('__CONFIG_SURFBAR_MIGRATE_ORDER_Y' , "");
+               define('__CONFIG_SURFBAR_MIGRATE_ORDER_N', " checked=\"checked\"");
+       }
+
+       // Pause URL mode
+       if ($_CONFIG['surfbar_pause_mode'] == "INTERNAL") {
+               // Internal pause page
+               define('__CONFIG_SURFBAR_PAUSE_MODE_INTERNAL', " checked=\"checked\"");
+               define('__CONFIG_SURFBAR_PAUSE_MODE_EXTERNAL', "");
+       } else {
+               // External pause page (if not empty)
+               define('__CONFIG_SURFBAR_PAUSE_MODE_INTERNAL', "");
+               define('__CONFIG_SURFBAR_PAUSE_MODE_EXTERNAL', " checked=\"checked\"");
+       }
+

        // Load template
        LOAD_TEMPLATE("admin_config_surfbar", false, $content);
 }
        // Load template
        LOAD_TEMPLATE("admin_config_surfbar", false, $content);
 }

diff --git a/inc/modules/admin/what-del_email.php b/inc/modules/admin/what-del_email.php
index 35ad5a9ab947541816fad16f308f904f928c97b0..66ac239b2009063f46625eb0faf2407228725e67 100644 (file)
--- a/inc/modules/admin/what-del_email.php
+++ b/inc/modules/admin/what-del_email.php
@@ -71,7 +71,7 @@ if (!empty($_GET['mid'])) {
                $DATA = array($url, $subject);
 
                // Load email template and send the email away
                $DATA = array($url, $subject);
 
                // Load email template and send the email away

-               $msg_user = LOAD_EMAIL_TEMPLATE("order-deleted", "", $sender);
+               $msg_user = LOAD_EMAIL_TEMPLATE("order-deleted", array(), $sender);

                SEND_EMAIL($sender, MEMBER_ORDER_DELETED, $msg_user);
 
                // Delete mail from queue
                SEND_EMAIL($sender, MEMBER_ORDER_DELETED, $msg_user);
 
                // Delete mail from queue

diff --git a/inc/modules/admin/what-email_archiv.php b/inc/modules/admin/what-email_archiv.php
index 449109d57437bceb09312456492e904c6b1abc45..4644ae63bcfd0ea92136b484b8460f38515bca61 100644 (file)
--- a/inc/modules/admin/what-email_archiv.php
+++ b/inc/modules/admin/what-email_archiv.php
@@ -110,7 +110,7 @@ if (SQL_NUMROWS($result) > 0)
                        'sent'        => $sent,
                        'ruids'       => str_replace(";", ", ", $pool[4]),
                        'unconfirmed' => $unconfirmed,
                        'sent'        => $sent,
                        'ruids'       => str_replace(";", ", ", $pool[4]),
                        'unconfirmed' => $unconfirmed,

-                       'type'        => GET_POOL_TYPE($pool[6]),
+                       'type'        => TRANSLATE_POOL_TYPE($pool[6]),

                        'tsend'       => $pool[9],
                        'url'         => FRAMETESTER($pool[8]),
                        'stamp'       => MAKE_DATETIME($pool[7], "0"),
                        'tsend'       => $pool[9],
                        'url'         => FRAMETESTER($pool[8]),
                        'stamp'       => MAKE_DATETIME($pool[7], "0"),

diff --git a/inc/modules/admin/what-email_details.php b/inc/modules/admin/what-email_details.php
index 14eccfe180c1e2dfa76424df254144b61936348f..7e58510f76c1bf8cdd285758f2edcaa4476e048d 100644 (file)
--- a/inc/modules/admin/what-email_details.php
+++ b/inc/modules/admin/what-email_details.php
@@ -53,9 +53,10 @@ ADD_DESCR("admin", basename(__FILE__));
 // Normal mails ordered by your members
 //              0     1       2       3       4           5          6          7       8        9          10
 $SQL = "SELECT id, sender, subject, text, receivers, payment_id, data_type, timestamp, url, target_send, cat_id
 // Normal mails ordered by your members
 //              0     1       2       3       4           5          6          7       8        9          10
 $SQL = "SELECT id, sender, subject, text, receivers, payment_id, data_type, timestamp, url, target_send, cat_id

- FROM "._MYSQL_PREFIX."_pool
- WHERE data_type IN('ADMIN', 'TEMP', 'NEW', 'ACTIVE')
- ORDER BY timestamp DESC";
+FROM "._MYSQL_PREFIX."_pool
+WHERE data_type IN('ADMIN','TEMP','NEW','ACTIVE')
+ORDER BY timestamp DESC";
+

 $WHO = _ALL;
 $SQL2 = "";
 
 $WHO = _ALL;
 $SQL2 = "";
 


@@ -150,7 +151,7 @@ if (SQL_NUMROWS($result_list) > 0) {
                $content['payment']     = GET_PAYMENT($pool['payment_id']);
                $content['category']    = GET_CATEGORY($pool['cat_id']);
                $content['receivers']   = str_replace(";", ", ", $pool['receivers']);
                $content['payment']     = GET_PAYMENT($pool['payment_id']);
                $content['category']    = GET_CATEGORY($pool['cat_id']);
                $content['receivers']   = str_replace(";", ", ", $pool['receivers']);

-               $content['type']        = GET_POOL_TYPE($pool['data_type']);
+               $content['type']        = TRANSLATE_POOL_TYPE($pool['data_type']);

                $content['frametester'] = FRAMETESTER($pool['url']);
                $content['timestamp']   = MAKE_DATETIME($pool['timestamp'], "0");
 
                $content['frametester'] = FRAMETESTER($pool['url']);
                $content['timestamp']   = MAKE_DATETIME($pool['timestamp'], "0");
 


@@ -202,7 +203,7 @@ if ((EXT_IS_ACTIVE("bonus")) && ($WHO == _ALL)) {
                        $content['time']        = CREATE_FANCY_TIME($content['time']);
                        $content['category']    = GET_CATEGORY($content['cat_id']);
                        $content['receivers']   = str_replace(";", ", ", $content['receivers']);
                        $content['time']        = CREATE_FANCY_TIME($content['time']);
                        $content['category']    = GET_CATEGORY($content['cat_id']);
                        $content['receivers']   = str_replace(";", ", ", $content['receivers']);

-                       $content['type']        = GET_POOL_TYPE($content['data_type']);
+                       $content['type']        = TRANSLATE_POOL_TYPE($content['data_type']);

                        $content['frametester'] = FRAMETESTER($content['url']);
                        $content['timestamp']   = MAKE_DATETIME($content['timestamp'], "0");
 
                        $content['frametester'] = FRAMETESTER($content['url']);
                        $content['timestamp']   = MAKE_DATETIME($content['timestamp'], "0");
 

diff --git a/inc/modules/admin/what-guest_add.php b/inc/modules/admin/what-guest_add.php
index a671024710892ba20a577f27308b04581dd8c945..1cd194de59affa11e7077d17cc032b3c7b13f023 100644 (file)
--- a/inc/modules/admin/what-guest_add.php
+++ b/inc/modules/admin/what-guest_add.php
@@ -176,8 +176,8 @@ WHERE action='%s' AND what != '' AND what IS NOT NULL ORDER BY sort",
        if (!empty($_POST['menu']))
        {
                $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_guest_menu
        if (!empty($_POST['menu']))
        {
                $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_guest_menu

-(action, what, title, sort, visible, locked)
-VALUES('%s', '%s', '%s', '%s', '%s', '%s')",
+(`action`,`what`,`title`,`sort`,`visible`,`locked`)
+VALUES('%s','%s','%s','%s','%s','%s')",

  array(
        $_POST['menu'],
        $_POST['name'],
  array(
        $_POST['menu'],
        $_POST['name'],


@@ -191,7 +191,7 @@ VALUES('%s', '%s', '%s', '%s', '%s', '%s')",
        {
                $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_guest_menu
 (action, title, sort, visible, locked)
        {
                $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_guest_menu
 (action, title, sort, visible, locked)

-VALUES('%s', '%s', '%s', '%s', '%s')",
+VALUES('%s','%s','%s','%s','%s')",

  array(
        $_POST['name'],
        $_POST['title'],
  array(
        $_POST['name'],
        $_POST['title'],

diff --git a/inc/modules/admin/what-list_country.php b/inc/modules/admin/what-list_country.php
index 4ff4155f4255a6534c5d02624d48175848a324dd..5b227d84ce893aa7defa5e7460467be24e2e7ed5 100644 (file)
--- a/inc/modules/admin/what-list_country.php
+++ b/inc/modules/admin/what-list_country.php
@@ -50,7 +50,7 @@ if ((isset($_POST['add'])) && (!empty($_POST['code'])) && (!empty($_POST['descr'
        {
                // Save entry
                $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_countries (code, descr, is_active)
        {
                // Save entry
                $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_countries (code, descr, is_active)

- VALUES('%s', '%s', '%s')",
+ VALUES('%s','%s','%s')",

  array(strtoupper(substr($_POST['code'], 0, 2)), $_POST['descr'], $_POST['is_active']), __FILE__, __LINE__);
 
                // Country added
  array(strtoupper(substr($_POST['code'], 0, 2)), $_POST['descr'], $_POST['is_active']), __FILE__, __LINE__);
 
                // Country added


@@ -124,7 +124,7 @@ if ((isset($_POST['add'])) && (!empty($_POST['code'])) && (!empty($_POST['descr'
                                if ($post == "modify")
                                {
                                        // Generate default selection in edit-mode
                                if ($post == "modify")
                                {
                                        // Generate default selection in edit-mode

-                                       $content['status'] = ADD_OPTION_LINES("/ARRAY/", array('Y', 'N'), array(YES, NO ), $status);
+                                       $content['status'] = ADD_OPTION_LINES("/ARRAY/", array("Y","N"), array(YES, NO ), $status);

                                }
                                 else
                                {
                                }
                                 else
                                {

diff --git a/inc/modules/admin/what-list_sponsor_pay.php b/inc/modules/admin/what-list_sponsor_pay.php
index 884cb24adb2d99744d0804ec5cf91b0beaf41480..9f49ed635a8c272e9826c1dd58e428b3b9d23dc5 100644 (file)
--- a/inc/modules/admin/what-list_sponsor_pay.php
+++ b/inc/modules/admin/what-list_sponsor_pay.php
@@ -96,7 +96,7 @@ if (isset($_POST['add'])) {
        if (SQL_NUMROWS($result) == 0) {
                // No entry found so add this line
                $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_sponsor_paytypes (pay_name, pay_rate, pay_min_count, pay_currency)
        if (SQL_NUMROWS($result) == 0) {
                // No entry found so add this line
                $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_sponsor_paytypes (pay_name, pay_rate, pay_min_count, pay_currency)

- VALUES ('%s', '%s', '%s', '%s')",
+ VALUES ('%s','%s','%s','%s')",

  array(htmlspecialchars($_POST['pay_name']), str_replace(",", ".", $_POST['pay_rate']), bigintval($_POST['pay_min_count']), htmlspecialchars($_POST['pay_currency'])),
  __FILE__, __LINE__);
 
  array(htmlspecialchars($_POST['pay_name']), str_replace(",", ".", $_POST['pay_rate']), bigintval($_POST['pay_min_count']), htmlspecialchars($_POST['pay_currency'])),
  __FILE__, __LINE__);
 

diff --git a/inc/modules/admin/what-mem_add.php b/inc/modules/admin/what-mem_add.php
index 99fc355d900e37fda1e70bf9e1a49dd36287e7a7..60ff92960f2326af97efbd9943c1b949fb433bbf 100644 (file)
--- a/inc/modules/admin/what-mem_add.php
+++ b/inc/modules/admin/what-mem_add.php
@@ -176,8 +176,8 @@ if (!isset($_POST['ok']))
        if (!empty($_POST['menu']))
        {
                $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_member_menu
        if (!empty($_POST['menu']))
        {
                $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_member_menu

-(action, what, title, visible, locked, sort)
-VALUES('%s', '%s', '%s', '%s', '%s', '%s')",
+(`action`,`what`,`title`,`visible`,`locked`,`sort`)
+VALUES('%s','%s','%s','%s','%s','%s')",

  array(
        $_POST['menu'],
        $_POST['name'],
  array(
        $_POST['menu'],
        $_POST['name'],


@@ -190,8 +190,8 @@ VALUES('%s', '%s', '%s', '%s', '%s', '%s')",
         else
        {
                $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_member_menu
         else
        {
                $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_member_menu

-(action, title, visible, locked, sort)
-VALUES('%s', '%s', '%s', '%s', '%s')",
+(`action`,`title`,`visible`,`locked`,`sort`)
+VALUES('%s','%s','%s','%s','%s')",

  array(
        $_POST['name'],
        $_POST['title'],
  array(
        $_POST['name'],
        $_POST['title'],

diff --git a/inc/modules/admin/what-payments.php b/inc/modules/admin/what-payments.php
index fae04f5a98a784f688e121939f17bb4606a59b70..d727b205782572e55529a5c67900d91983af8dbb 100644 (file)
--- a/inc/modules/admin/what-payments.php
+++ b/inc/modules/admin/what-payments.php
@@ -51,7 +51,7 @@ if (isset($_POST['ok']))
        switch ($_GET['do'])
        {
        case "add":
        switch ($_GET['do'])
        {
        case "add":

-               $SQL[] = "INSERT INTO "._MYSQL_PREFIX."_payments (time, payment, mail_title, price) VALUES ('".$_POST['t_wait']."', '".$_POST['payment']."', '".$_POST['title']."', '".$_POST['price']."')";
+               $SQL[] = "INSERT INTO "._MYSQL_PREFIX."_payments (time, payment, mail_title, price) VALUES ('".$_POST['t_wait']."','".$_POST['payment']."','".$_POST['title']."','".$_POST['price']."')";

                $result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_payments WHERE time='%s' LIMIT 1",
                 array($_POST['t_wait']), __FILE__, __LINE__);
                if (SQL_NUMROWS($result) == 1)
                $result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_payments WHERE time='%s' LIMIT 1",
                 array($_POST['t_wait']), __FILE__, __LINE__);
                if (SQL_NUMROWS($result) == 1)

diff --git a/inc/modules/admin/what-refbanner.php b/inc/modules/admin/what-refbanner.php
index e5765afd7caa420670992d4712bba434d45f07f8..c3dd4ef69d889f8e8380596a29757b6ed91b42ac 100644 (file)
--- a/inc/modules/admin/what-refbanner.php
+++ b/inc/modules/admin/what-refbanner.php
@@ -62,7 +62,7 @@ if (isset($_POST['ok']))
                {
                        // Add banner
                        $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_refbanner (url, alternate, visible)
                {
                        // Add banner
                        $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_refbanner (url, alternate, visible)

-VALUES ('%s', '%s', '%s')",
+VALUES ('%s','%s','%s')",

  array($_POST['url'], $_POST['alternate'], $_POST['visible']), __FILE__, __LINE__);
                }
                 else
  array($_POST['url'], $_POST['alternate'], $_POST['visible']), __FILE__, __LINE__);
                }
                 else

diff --git a/inc/modules/admin/what-send_bonus.php b/inc/modules/admin/what-send_bonus.php
index 0cf3502a62b027d02198e6fc2fec687a4b689b55..a297af0e032e468d49407cfb1ed9b62f972c2fb9 100644 (file)
--- a/inc/modules/admin/what-send_bonus.php
+++ b/inc/modules/admin/what-send_bonus.php
@@ -97,7 +97,7 @@ if (isset($_POST['ok']))
                        if ($_GET['mode'] == "html") $HTML = "Y";
                        $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_bonus
 (subject, text, receivers, points, time, data_type, timestamp, url, cat_id, target_send, mails_sent, html_msg)
                        if ($_GET['mode'] == "html") $HTML = "Y";
                        $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_bonus
 (subject, text, receivers, points, time, data_type, timestamp, url, cat_id, target_send, mails_sent, html_msg)

-VALUES ('%s', '%s', '%s', '%s', '%s', 'NEW', UNIX_TIMESTAMP(), '%s', '%s', '%s', '%s', '%s')",
+VALUES ('%s','%s','%s','%s','%s','NEW', UNIX_TIMESTAMP(),'%s','%s','%s','%s','%s')",

  array(
        $_POST['subject'],
        addslashes($_POST['text']),
  array(
        $_POST['subject'],
        addslashes($_POST['text']),


@@ -115,7 +115,7 @@ VALUES ('%s', '%s', '%s', '%s', '%s', 'NEW', UNIX_TIMESTAMP(), '%s', '%s', '%s',
                {
                        $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_bonus
 (subject, text, receivers, points, time, data_type, timestamp, url, cat_id, target_send, mails_sent)
                {
                        $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_bonus
 (subject, text, receivers, points, time, data_type, timestamp, url, cat_id, target_send, mails_sent)

-VALUES ('%s', '%s', '%s', '%s', '%s', 'NEW', UNIX_TIMESTAMP(), '%s', '%s', '%s', '%s')",
+VALUES ('%s','%s','%s','%s','%s','NEW', UNIX_TIMESTAMP(),'%s','%s','%s','%s')",

  array(
        $_POST['subject'],
        addslashes($_POST['text']),
  array(
        $_POST['subject'],
        addslashes($_POST['text']),

diff --git a/inc/modules/admin/what-theme_import.php b/inc/modules/admin/what-theme_import.php
index 027223f087bbf2c91a1c0676ffb7c814f1b00ef3..d075327bfec9d4ec9a051f00afbc4add61b7ed84 100644 (file)
--- a/inc/modules/admin/what-theme_import.php
+++ b/inc/modules/admin/what-theme_import.php
@@ -55,7 +55,7 @@ if (!empty($_POST['theme'])) {
 
                        // Register it ith the exchange
                        $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_themes (theme_path, theme_active, theme_ver, theme_name)
 
                        // Register it ith the exchange
                        $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_themes (theme_path, theme_active, theme_ver, theme_name)

-VALUES ('%s', 'N', '%s', '%s')",
+VALUES ('%s','N','%s','%s')",

                                array($_POST['theme'], $THEME_VERSION, $THEME_NAME), __FILE__, __LINE__);
 
                        // Destroy cache
                                array($_POST['theme'], $THEME_VERSION, $THEME_NAME), __FILE__, __LINE__);
 
                        // Destroy cache

diff --git a/inc/modules/admin/what-unlock_emails.php b/inc/modules/admin/what-unlock_emails.php
index dd2eac0e65040755304b60f73a236cb7fe661b07..45281dd170fc475e66c3a66997d7192e57728445 100644 (file)
--- a/inc/modules/admin/what-unlock_emails.php
+++ b/inc/modules/admin/what-unlock_emails.php
@@ -64,27 +64,29 @@ if ((SQL_NUMROWS($result_main) > 0) || (isset($_POST['lock']))) {
                                // Secure ID number
                                $id = bigintval($id);
 
                                // Secure ID number
                                $id = bigintval($id);
 

-                               // Unlock selected email
-                               $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_pool SET data_type='NEW' WHERE id=%s AND data_type='ADMIN' LIMIT 1",
-                                array($id), __FILE__, __LINE__);
-
-                               // Update wents fine?
-                               if (SQL_AFFECTEDROWS() == 1) {
-                                       // Order placed in queue...        0         1           2           3             4
-                                       $result = SQL_QUERY_ESC("SELECT po.url, po.subject, po.sender, pay.payment, po.payment_id
+                               // Order placed in queue...
+                               $result = SQL_QUERY_ESC("SELECT po.url, po.subject, po.sender, pay.payment, po.payment_id

 FROM "._MYSQL_PREFIX."_pool AS po
 INNER JOIN "._MYSQL_PREFIX."_payments AS pay
 ON po.payment_id=pay.id
 WHERE po.id=%s
 LIMIT 1",
 FROM "._MYSQL_PREFIX."_pool AS po
 INNER JOIN "._MYSQL_PREFIX."_payments AS pay
 ON po.payment_id=pay.id
 WHERE po.id=%s
 LIMIT 1",

-                                               array($id), __FILE__, __LINE__);
+                                       array($id), __FILE__, __LINE__);

 
 

+                               // Update wents fine?
+                               if (SQL_NUMROWS($result) == 1) {

                                        // Load data
                                        $DATA = SQL_FETCHARRAY($result);
 
                                        // Free result
                                        SQL_FREERESULT($result);
 
                                        // Load data
                                        $DATA = SQL_FETCHARRAY($result);
 
                                        // Free result
                                        SQL_FREERESULT($result);
 

+                                       // Is the surfbar installed?
+                                       if ((EXT_IS_ACTIVE("surfbar")) && ($_CONFIG['surfbar_migrate_order'] == "Y")) {
+                                               // Then "migrate" the URL to the surfbar
+                                               SURFBAR_ADMIN_MIGRATE_URL($DATA['url'], $DATA['sender']);
+                                       } // END - if
+

                                        // Check for bonus extension version >= 0.4.4 for the order bonus
                                        if ((GET_EXT_VERSION("bonus") >= "0.4.4") && ($_CONFIG['bonus_active'] == "Y")) {
                                                // Add points directly
                                        // Check for bonus extension version >= 0.4.4 for the order bonus
                                        if ((GET_EXT_VERSION("bonus") >= "0.4.4") && ($_CONFIG['bonus_active'] == "Y")) {
                                                // Add points directly


@@ -96,10 +98,14 @@ LIMIT 1",
                                        } // END - if
 
                                        // Load email template
                                        } // END - if
 
                                        // Load email template

-                                       $msg_user = LOAD_EMAIL_TEMPLATE("order-accept", "", $DATA['sender']);
+                                       $msg_user = LOAD_EMAIL_TEMPLATE("order-accept", array(), $DATA['sender']);

 
                                        // Send email
                                        SEND_EMAIL($DATA['sender'], MEMBER_ORDER_ACCEPTED, $msg_user);
 
                                        // Send email
                                        SEND_EMAIL($DATA['sender'], MEMBER_ORDER_ACCEPTED, $msg_user);

+
+                                       // Unlock selected email
+                                       $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_pool SET data_type='NEW' WHERE id=%s AND data_type='ADMIN' LIMIT 1",
+                                               array($id), __FILE__, __LINE__);

                                } // END - if
                        } // END - foreach
 
                                } // END - if
                        } // END - foreach
 


@@ -131,7 +137,7 @@ LIMIT 1",
                                SQL_FREERESULT($result);
 
                                // Load email template and send it away
                                SQL_FREERESULT($result);
 
                                // Load email template and send it away

-                               $msg_user = LOAD_EMAIL_TEMPLATE("order-reject", "", $DATA['sender']);
+                               $msg_user = LOAD_EMAIL_TEMPLATE("order-reject", array(), $DATA['sender']);

                                SEND_EMAIL($DATA['sender'], MEMBER_ORDER_REJECTED, $msg_user);
 
                                // If you do not enter an URL to redirect to, your URL will be set!
                                SEND_EMAIL($DATA['sender'], MEMBER_ORDER_REJECTED, $msg_user);
 
                                // If you do not enter an URL to redirect to, your URL will be set!

diff --git a/inc/modules/guest/what-doubler.php b/inc/modules/guest/what-doubler.php
index 869703b1e220f1b610300a803e3d658b6152d0db..fc14a7294f25c89aa669ef61ef15c0b24e9539a2 100644 (file)
--- a/inc/modules/guest/what-doubler.php
+++ b/inc/modules/guest/what-doubler.php
@@ -69,7 +69,7 @@ case "RESET":
 }
 
 // Generate table with already payed out doubles
 }
 
 // Generate table with already payed out doubles

-define('__DOUBLER_PAYOUT_HISTORY', DOUBLER_GENERATE_TABLE("0", 'Y', 'N', "DESC"));
+define('__DOUBLER_PAYOUT_HISTORY', DOUBLER_GENERATE_TABLE("0", "Y", "N", "DESC"));

 
 // Generate table with next-to-run payouts
 define('__DOUBLER_PAYOUT_NEXT', DOUBLER_GENERATE_TABLE());
 
 // Generate table with next-to-run payouts
 define('__DOUBLER_PAYOUT_NEXT', DOUBLER_GENERATE_TABLE());

diff --git a/inc/modules/guest/what-mediadata.php b/inc/modules/guest/what-mediadata.php
index 5ca5596aff23cde57718e98f1e1c92f5d234145e..066aa37bf16bb06b95cbad7883ea4063b51b701b 100644 (file)
--- a/inc/modules/guest/what-mediadata.php
+++ b/inc/modules/guest/what-mediadata.php
@@ -46,9 +46,9 @@ if (!defined('__SECURITY')) {
 // Add description as navigation point
 ADD_DESCR("guest", basename(__FILE__));
 
 // Add description as navigation point
 ADD_DESCR("guest", basename(__FILE__));
 

-define('value', 'value');
-define('lang', 'lang');
-define('rows', 'rows');
+define('value', "value");
+define('lang', "lang");
+define('rows', "rows");

 
 // Get total confirmed user IDs...
 define('user_confirmed'  , round(GET_TOTAL_DATA("CONFIRMED"  , "user_data", "userid", "status", true)));
 
 // Get total confirmed user IDs...
 define('user_confirmed'  , round(GET_TOTAL_DATA("CONFIRMED"  , "user_data", "userid", "status", true)));

diff --git a/inc/modules/guest/what-register.php b/inc/modules/guest/what-register.php
index 7b2fb307859b08df6c4788658e6e549ec68ee8eb..71f2c4443984099982cbea6686b98a58a0aa66e0 100644 (file)
--- a/inc/modules/guest/what-register.php
+++ b/inc/modules/guest/what-register.php
@@ -227,8 +227,8 @@ if ((isset($_POST['ok'])) && (!$FAILED))
        // Create user's account... //
        //////////////////////////////
        //
        // Create user's account... //
        //////////////////////////////
        //

-       $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_data (gender, surname, family, street_nr, %s, zip, city, email, birth_day, birth_month, birth_year, password, max_mails, receive_mails, refid, status, user_hash, REMOTE_ADDR, joined, last_update".$ADD1.")
-VALUES ('%s', '%s', '%s', '%s', '%s', %s, '%s', '%s', %s, %s, %s, '%s', %s, %s, '%s', 'UNCONFIRMED', '%s', '%s', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()".$ADD2.")",
+       $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_data (gender, surname, family, street_nr,%s, zip, city, email, birth_day, birth_month, birth_year, password, max_mails, receive_mails, refid, status, user_hash, REMOTE_ADDR, joined, last_update".$ADD1.")
+VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONFIRMED','%s','%s', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()".$ADD2.")",

        array(
                $countryRow,
                SQL_ESCAPE(substr($_POST['gender'], 0, 1)),
        array(
                $countryRow,
                SQL_ESCAPE(substr($_POST['gender'], 0, 1)),


@@ -267,7 +267,7 @@ VALUES ('%s', '%s', '%s', '%s', '%s', %s, '%s', '%s', %s, %s, %s, '%s', %s, %s,
                // Add only when the line was not found (maybe some more secure?)
                $locked = "points";
                if ($_CONFIG['ref_payout'] > 0) $locked = "locked_points"; // Pay him later. First he has to confirm some mails!
                // Add only when the line was not found (maybe some more secure?)
                $locked = "points";
                if ($_CONFIG['ref_payout'] > 0) $locked = "locked_points"; // Pay him later. First he has to confirm some mails!

-               $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_points (userid, ref_depth, ".$locked.") VALUES(%s, 0, '%s')",
+               $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_points (userid, ref_depth, ".$locked.") VALUES(%s,0,'%s')",

                 array(bigintval($userid), $_CONFIG['points_register']), __FILE__, __LINE__);
 
                // Update mediadata as well
                 array(bigintval($userid), $_CONFIG['points_register']), __FILE__, __LINE__);
 
                // Update mediadata as well

diff --git a/inc/modules/member/what-categories.php b/inc/modules/member/what-categories.php
index 68d3dcbc3929df7a6ed43cf1910ef654f45068a1..fcb03bd042f9461d7ea30bf739933989e3ff9d75 100644 (file)
--- a/inc/modules/member/what-categories.php
+++ b/inc/modules/member/what-categories.php
@@ -78,7 +78,7 @@ if ($cats > 0)
 
                                        if (SQL_NUMROWS($result_user) == 0)
                                        {
 
                                        if (SQL_NUMROWS($result_user) == 0)
                                        {

-                                               $sql = "INSERT INTO "._MYSQL_PREFIX."_user_cats (userid, cat_id) VALUES ('%s', '%s')";
+                                               $sql = "INSERT INTO "._MYSQL_PREFIX."_user_cats (userid, cat_id) VALUES ('%s','%s')";

                                        }
                                         else
                                        {
                                        }
                                         else
                                        {

diff --git a/inc/modules/member/what-doubler.php b/inc/modules/member/what-doubler.php
index 944a74600199b91b0c24a711cc0b19f8dba334f4..b83794661194ff13f20d5ece8565fb79ef341c4b 100644 (file)
--- a/inc/modules/member/what-doubler.php
+++ b/inc/modules/member/what-doubler.php
@@ -91,13 +91,13 @@ case "RESET":
 }
 
 // Generate table with already payed out doubles
 }
 
 // Generate table with already payed out doubles

-define('__DOUBLER_PAYOUT_HISTORY', DOUBLER_GENERATE_TABLE($GLOBALS['userid'], 'Y', 'N', "DESC"));
+define('__DOUBLER_PAYOUT_HISTORY', DOUBLER_GENERATE_TABLE($GLOBALS['userid'], "Y", "N", "DESC"));

 
 // Generate table with next-to-run payouts
 define('__DOUBLER_PAYOUT_NEXT', DOUBLER_GENERATE_TABLE($GLOBALS['userid']));
 
 // Generate table with refferal payouts
 
 // Generate table with next-to-run payouts
 define('__DOUBLER_PAYOUT_NEXT', DOUBLER_GENERATE_TABLE($GLOBALS['userid']));
 
 // Generate table with refferal payouts

-define('__DOUBLER_PAYOUT_REF', DOUBLER_GENERATE_TABLE($GLOBALS['userid'], 'N', 'Y', "DESC"));
+define('__DOUBLER_PAYOUT_REF', DOUBLER_GENERATE_TABLE($GLOBALS['userid'], "N", "Y", "DESC"));

 
 // Generate timemark
 define('__TIMEOUT_MARK', CREATE_FANCY_TIME($_CONFIG['doubler_timeout']));
 
 // Generate timemark
 define('__TIMEOUT_MARK', CREATE_FANCY_TIME($_CONFIG['doubler_timeout']));

diff --git a/inc/modules/member/what-holiday.php b/inc/modules/member/what-holiday.php
index 967def78a6615431e1958d16e8a6ca89d9f7bcab..6ce5f0a02a43628c38dc5f35e7091183769118d9 100644 (file)
--- a/inc/modules/member/what-holiday.php
+++ b/inc/modules/member/what-holiday.php
@@ -104,7 +104,7 @@ if (isset($_POST['ok']))
         else
        {
                // Everything went okay so let's store his request and send mails
         else
        {
                // Everything went okay so let's store his request and send mails

-               $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_holidays (userid, holiday_start, holiday_end, comments) VALUES ('%s', '%s', '%s', '%s')",
+               $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_holidays (userid, holiday_start, holiday_end, comments) VALUES ('%s','%s','%s','%s')",

                 array($GLOBALS['userid'], $START, $END, $_POST['comments']), __FILE__, __LINE__);
 
                // Activate holiday system
                 array($GLOBALS['userid'], $START, $END, $_POST['comments']), __FILE__, __LINE__);
 
                // Activate holiday system


@@ -129,7 +129,7 @@ WHERE userid=%s LIMIT 1",
                SEND_ADMIN_NOTIFICATION(HOLIDAY_ADMIN_SUBJECT, "admin_holiday_request", $_POST['comments'], $GLOBALS['userid']);
 
                // Create task
                SEND_ADMIN_NOTIFICATION(HOLIDAY_ADMIN_SUBJECT, "admin_holiday_request", $_POST['comments'], $GLOBALS['userid']);
 
                // Create task

-               $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_task_system (userid, assigned_admin, status, task_type, subject, text, task_created) VALUES ('%s', '0', 'NEW', 'HOLIDAY_REQUEST', '%s', '%s', UNIX_TIMESTAMP())",
+               $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_task_system (userid, assigned_admin, status, task_type, subject, text, task_created) VALUES ('%s','0','NEW','HOLIDAY_REQUEST','%s','%s', UNIX_TIMESTAMP())",

                 array($GLOBALS['userid'], HOLIDAY_ADMIN_SUBJECT, addslashes($msg)), __FILE__, __LINE__);
 
                // Display message
                 array($GLOBALS['userid'], HOLIDAY_ADMIN_SUBJECT, addslashes($msg)), __FILE__, __LINE__);
 
                // Display message


@@ -171,7 +171,7 @@ WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
 WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
 
                        // Send email to admin
 WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
 
                        // Send email to admin

-                       SEND_ADMIN_NOTIFICATION(HOLIDAY_ADMIN_DEAC_SUBJ, "admin_holiday_deactivated", "", $GLOBALS['userid']);
+                       SEND_ADMIN_NOTIFICATION(HOLIDAY_ADMIN_DEAC_SUBJ, "admin_holiday_deactivated", array(), $GLOBALS['userid']);

 
                        // Display message to user
                        LOAD_TEMPLATE("admin_settings_saved", false, HOLIDAY_MEMBER_DEACTIVATED_NOW);
 
                        // Display message to user
                        LOAD_TEMPLATE("admin_settings_saved", false, HOLIDAY_MEMBER_DEACTIVATED_NOW);

diff --git a/inc/modules/member/what-newsletter.php b/inc/modules/member/what-newsletter.php
index a27073b20cb7ee371a34bd7d5f44030369adb650..e5eee490f929f1bfd74950e351413848d42ebf91 100644 (file)
--- a/inc/modules/member/what-newsletter.php
+++ b/inc/modules/member/what-newsletter.php
@@ -61,18 +61,18 @@ if ((isset($_POST['ok'])) && ($status == "Y") && ($span == "0"))
         array($GLOBALS['userid']), __FILE__, __LINE__);
 
        // Load admin message
         array($GLOBALS['userid']), __FILE__, __LINE__);
 
        // Load admin message

-       $admin_msg = LOAD_EMAIL_TEMPLATE("admin_newsletter_request", "", $GLOBALS['userid']);
+       $admin_msg = LOAD_EMAIL_TEMPLATE("admin_newsletter_request", array(), $GLOBALS['userid']);

 
        // Add task
        $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_task_system (assigned_admin, status, task_type, subject, text, task_created, userid)
 
        // Add task
        $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_task_system (assigned_admin, status, task_type, subject, text, task_created, userid)

-VALUES ('0', 'NEW', 'NL_UNSUBSCRIBE', '".ADMIN_NL_SUBJECT."', '".addslashes($admin_msg)."', UNIX_TIMESTAMP(), '%s')", array($GLOBALS['userid']), __FILE__, __LINE__);
+VALUES ('0','NEW','NL_UNSUBSCRIBE','".ADMIN_NL_SUBJECT."','".addslashes($admin_msg)."', UNIX_TIMESTAMP(),'%s')", array($GLOBALS['userid']), __FILE__, __LINE__);

 
        // Send mail to member
 
        // Send mail to member

-       $msg = LOAD_EMAIL_TEMPLATE("member_newsletter_request", "", $GLOBALS['userid']);
+       $msg = LOAD_EMAIL_TEMPLATE("member_newsletter_request", array(), $GLOBALS['userid']);

        SEND_EMAIL($GLOBALS['userid'], NL_MEMBER_SUBJECT, $msg);
 
        // Send mail to all admins
        SEND_EMAIL($GLOBALS['userid'], NL_MEMBER_SUBJECT, $msg);
 
        // Send mail to all admins

-       SEND_ADMIN_NOTIFICATION(NL_ADMIN_SUBJECT, "admin_newsletter_request", "", $GLOBALS['userid']);
+       SEND_ADMIN_NOTIFICATION(NL_ADMIN_SUBJECT, "admin_newsletter_request", array(), $GLOBALS['userid']);

 
        // Display message
        LOAD_TEMPLATE("admin_settings_saved", false, NL_MEMBER_REQUEST_DONE);
 
        // Display message
        LOAD_TEMPLATE("admin_settings_saved", false, NL_MEMBER_REQUEST_DONE);

diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php
index 1053b26427d0fefd4842e8a0547028097e6e7d84..a85be7e4686e695d87866544fffe6f2ef4a6f76c 100644 (file)
--- a/inc/modules/member/what-order.php
+++ b/inc/modules/member/what-order.php
@@ -304,7 +304,7 @@ WHERE userid=%s AND holiday_start < UNIX_TIMESTAMP() AND holiday_end > UNIX_TIME
                                        {
                                                // HTML extension is active
                                                $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_pool (sender, subject, text, receivers, payment_id, data_type, timestamp, url, cat_id, target_send, zip, html_msg)
                                        {
                                                // HTML extension is active
                                                $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_pool (sender, subject, text, receivers, payment_id, data_type, timestamp, url, cat_id, target_send, zip, html_msg)

- VALUES ('%s', '%s', '%s', '%s', '%s', 'TEMP', '%s', '%s', '%s', '%s', '%s', '%s')",
+ VALUES ('%s','%s','%s','%s','%s','TEMP','%s','%s','%s','%s','%s','%s')",

 array(
        $GLOBALS['userid'],
        addslashes($_POST['subject']),
 array(
        $GLOBALS['userid'],
        addslashes($_POST['subject']),


@@ -323,7 +323,7 @@ array(
                                        {
                                                // No HTML extension is active
                                                $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_pool (sender, subject, text, receivers, payment_id, data_type, timestamp, url, cat_id, target_send, zip)
                                        {
                                                // No HTML extension is active
                                                $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_pool (sender, subject, text, receivers, payment_id, data_type, timestamp, url, cat_id, target_send, zip)

- VALUES ('%s', '%s', '%s', '%s', '%s', 'TEMP', '%s', '%s', '%s', '%s', '%s')",
+ VALUES ('%s','%s','%s','%s','%s','TEMP','%s','%s','%s','%s','%s')",

 array(
        $GLOBALS['userid'],
        addslashes($_POST['subject']),
 array(
        $GLOBALS['userid'],
        addslashes($_POST['subject']),

diff --git a/inc/modules/member/what-payout.php b/inc/modules/member/what-payout.php
index 9b92f19014450021cc4ac512617dc1897b32ae60..b49491e1eb6d6cc333e4b9af526f0d9bfa64986a 100644 (file)
--- a/inc/modules/member/what-payout.php
+++ b/inc/modules/member/what-payout.php
@@ -200,7 +200,7 @@ ORDER BY p.payout_timestamp DESC",
                                {
                                        // Banner/textlink ordered
                                        $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_payouts (userid, payout_total, payout_id, payout_timestamp, status, target_url, link_text, banner_url)
                                {
                                        // Banner/textlink ordered
                                        $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_payouts (userid, payout_total, payout_id, payout_timestamp, status, target_url, link_text, banner_url)

-VALUES (%s, %s, %s, UNIX_TIMESTAMP(), 'NEW', '%s', '%s', '%s')",
+VALUES (%s,%s,%s, UNIX_TIMESTAMP(), 'NEW','%s','%s','%s')",

  array(
        $GLOBALS['userid'],
        bigintval($_POST['payout']),
  array(
        $GLOBALS['userid'],
        bigintval($_POST['payout']),


@@ -211,21 +211,21 @@ VALUES (%s, %s, %s, UNIX_TIMESTAMP(), 'NEW', '%s', '%s', '%s')",
 ), __FILE__, __LINE__);
 
                                        // Load templates
 ), __FILE__, __LINE__);
 
                                        // Load templates

-                                       $msg_mem = LOAD_EMAIL_TEMPLATE("member_payout_request_banner", "", $GLOBALS['userid']);
+                                       $msg_mem = LOAD_EMAIL_TEMPLATE("member_payout_request_banner", array(), $GLOBALS['userid']);

                                        if (GET_EXT_VERSION("admins") >= "0.4.1")
                                        {
                                                $adm_tpl = "admin_payout_request_banner";
                                        }
                                         else
                                        {
                                        if (GET_EXT_VERSION("admins") >= "0.4.1")
                                        {
                                                $adm_tpl = "admin_payout_request_banner";
                                        }
                                         else
                                        {

-                                               $msg_adm = addslashes(LOAD_EMAIL_TEMPLATE("admin_payout_request_banner", "", $GLOBALS['userid']));
+                                               $msg_adm = addslashes(LOAD_EMAIL_TEMPLATE("admin_payout_request_banner", array(), $GLOBALS['userid']));

                                        }
                                }
                                 else
                                {
                                        // e-currency payout requested
                                        $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_payouts (userid, payout_total, target_account, target_bank, payout_id, payout_timestamp, status, password)
                                        }
                                }
                                 else
                                {
                                        // e-currency payout requested
                                        $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_payouts (userid, payout_total, target_account, target_bank, payout_id, payout_timestamp, status, password)

-VALUES (%s, %s, %s, '%s', %s, UNIX_TIMESTAMP(), 'NEW', '%s')",
+VALUES (%s,%s,%s,'%s',%s, UNIX_TIMESTAMP(), 'NEW','%s')",

  array(
        $GLOBALS['userid'],
        bigintval($_POST['payout']),
  array(
        $GLOBALS['userid'],
        bigintval($_POST['payout']),


@@ -236,8 +236,8 @@ VALUES (%s, %s, %s, '%s', %s, UNIX_TIMESTAMP(), 'NEW', '%s')",
 ), __FILE__, __LINE__);
 
                                        // Load templates
 ), __FILE__, __LINE__);
 
                                        // Load templates

-                                       $msg_mem = LOAD_EMAIL_TEMPLATE("member_payout_request", "", $GLOBALS['userid']);
-                                       $msg_adm = addslashes(LOAD_EMAIL_TEMPLATE("admin_payout_request", "", $GLOBALS['userid']));
+                                       $msg_mem = LOAD_EMAIL_TEMPLATE("member_payout_request", array(), $GLOBALS['userid']);
+                                       $msg_adm = addslashes(LOAD_EMAIL_TEMPLATE("admin_payout_request", array(), $GLOBALS['userid']));

                                        $admin_tpl = "";
                                        if (GET_EXT_VERSION("admins") >= "0.4.1")
                                        {
                                        $admin_tpl = "";
                                        if (GET_EXT_VERSION("admins") >= "0.4.1")
                                        {


@@ -247,7 +247,7 @@ VALUES (%s, %s, %s, '%s', %s, UNIX_TIMESTAMP(), 'NEW', '%s')",
 
                                // Generate task
                                $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_task_system (assigned_admin, status, task_type, subject, text, task_created, userid)
 
                                // Generate task
                                $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_task_system (assigned_admin, status, task_type, subject, text, task_created, userid)

-VALUES (0, 'NEW', 'PAYOUT_REQUEST', '[payout:] ".PAYOUT_REQUEST_ADMIN."', '%s', UNIX_TIMESTAMP(), %s)",
+VALUES (0, 'NEW','PAYOUT_REQUEST','[payout:] ".PAYOUT_REQUEST_ADMIN."','%s', UNIX_TIMESTAMP(), %s)",

  array(
        $msg_adm,
        $GLOBALS['userid']
  array(
        $msg_adm,
        $GLOBALS['userid']


@@ -257,7 +257,7 @@ VALUES (0, 'NEW', 'PAYOUT_REQUEST', '[payout:] ".PAYOUT_REQUEST_ADMIN."', '%s',
                                SEND_EMAIL($GLOBALS['userid'], PAYOUT_REQUEST_MEMBER, $msg_mem);
 
                                // To admin(s)
                                SEND_EMAIL($GLOBALS['userid'], PAYOUT_REQUEST_MEMBER, $msg_mem);
 
                                // To admin(s)

-                               SEND_ADMIN_NOTIFICATION(PAYOUT_REQUEST_ADMIN, $admin_tpl, "", $GLOBALS['userid']);
+                               SEND_ADMIN_NOTIFICATION(PAYOUT_REQUEST_ADMIN, $admin_tpl, array(), $GLOBALS['userid']);

 
                                // Load template and output it
                                LOAD_TEMPLATE("admin_settings_saved", false, PAYOUT_REQUEST_SENT);
 
                                // Load template and output it
                                LOAD_TEMPLATE("admin_settings_saved", false, PAYOUT_REQUEST_SENT);

diff --git a/inc/modules/member/what-stats.php b/inc/modules/member/what-stats.php
index 9020f5027e0b47431676c919d5e043a5b2a7ceb6..4816ad8e88947905c9a4b2d8d8c38e08a7a5d598 100644 (file)
--- a/inc/modules/member/what-stats.php
+++ b/inc/modules/member/what-stats.php
@@ -42,6 +42,9 @@ if (!defined('__SECURITY')) {
 // Add description as navigation point
 ADD_DESCR("member", basename(__FILE__));
 
 // Add description as navigation point
 ADD_DESCR("member", basename(__FILE__));
 

+// Init output
+$main_content = array();
+

 // Load waiting/pending orders
 $result = SQL_QUERY_ESC("SELECT id, cat_id, payment_id, subject, url, timestamp, target_send, data_type, zip
 FROM "._MYSQL_PREFIX."_pool
 // Load waiting/pending orders
 $result = SQL_QUERY_ESC("SELECT id, cat_id, payment_id, subject, url, timestamp, target_send, data_type, zip
 FROM "._MYSQL_PREFIX."_pool


@@ -60,15 +63,15 @@ if (SQL_NUMROWS($result) > 0) {
                // Prepare content for output
                $content = array(
                        'sw'    => $SW,
                // Prepare content for output
                $content = array(
                        'sw'    => $SW,

-                       'id'    => $data['id']
+                       'id'    => $data['id'],

                        'cat'   => GET_CATEGORY($data['cat_id']),
                        'pay'   => GET_PAYMENT($data['payment_id']),
                        'subj'  => COMPILE_CODE($data['subject']),
                        'url'   => DEREFERER($data['url']),
                        'cat'   => GET_CATEGORY($data['cat_id']),
                        'pay'   => GET_PAYMENT($data['payment_id']),
                        'subj'  => COMPILE_CODE($data['subject']),
                        'url'   => DEREFERER($data['url']),

-                       'stamp' => MAKE_DATETIME($data['timestamp'], "0"),
+                       'stamp' => MAKE_DATETIME($data['timestamp'], "2"),

                        'recs'  => $data['target_send'],
                        'type'  => TRANSLATE_POOL_TYPE($data['data_type']),
                        'recs'  => $data['target_send'],
                        'type'  => TRANSLATE_POOL_TYPE($data['data_type']),

-                       'zip'   => bigintval($data['zip'])
+                       'zip'   => $data['zip']

                );
 
                // Load template
                );
 
                // Load template


@@ -79,10 +82,10 @@ if (SQL_NUMROWS($result) > 0) {
        } // END - if
 
        // Load main template
        } // END - if
 
        // Load main template

-       LOAD_TEMPLATE("member_pool", false, $OUT);
+       $main_content['pool'] = LOAD_TEMPLATE("member_pool_table", true, $OUT);

 } else {
        // No mails in pool!
 } else {
        // No mails in pool!

-       LOAD_TEMPLATE("admin_settings_saved", false, MEMBER_NO_MAILS_IN_POOL);
+       $main_content['pool'] = LOAD_TEMPLATE("admin_settings_saved", true, MEMBER_NO_MAILS_IN_POOL);

 }
 
 // Free result
 }
 
 // Free result


@@ -107,9 +110,9 @@ if (SQL_NUMROWS($result) > 0) {
                        'pay'   => GET_PAYMENT($data[2]),
                        'subj'  => COMPILE_CODE($data[3]),
                        'url'   => DEREFERER($data[4]),
                        'pay'   => GET_PAYMENT($data[2]),
                        'subj'  => COMPILE_CODE($data[3]),
                        'url'   => DEREFERER($data[4]),

-                       'stamp' => MAKE_DATETIME($data[5], "0"),
+                       'stamp' => MAKE_DATETIME($data[5], "2"),

                        'recs'  => $data[6],
                        'recs'  => $data[6],

-                       'sent'  => MAKE_DATETIME($data[7], "0"),
+                       'sent'  => MAKE_DATETIME($data[7], "2"),

                        'clix'  => $data[8],
                        'perc'  => COMPILE_CODE($data[8] / $data[6] * 100)."%",
                );
                        'clix'  => $data[8],
                        'perc'  => COMPILE_CODE($data[8] / $data[6] * 100)."%",
                );


@@ -119,18 +122,18 @@ if (SQL_NUMROWS($result) > 0) {
                $SW = 3 - $SW;
        }
 
                $SW = 3 - $SW;
        }
 

-       // Remember rows in template
-       define('__STATS_ROWS', $OUT);
-

        // Load main template
        // Load main template

-       LOAD_TEMPLATE("member_stats_table");
+       $main_content['stats'] = LOAD_TEMPLATE("member_stats_table", true, $OUT);

 } else {
        // No mail orders fond
 } else {
        // No mail orders fond

-       LOAD_TEMPLATE("admin_settings_saved", false, MEMBER_NO_MAILS_IN_STATS);
+       $main_content['stats'] = LOAD_TEMPLATE("admin_settings_saved", true, MEMBER_NO_MAILS_IN_STATS);

 }
 
 // Free result
 SQL_FREERESULT($result);
 
 }
 
 // Free result
 SQL_FREERESULT($result);
 

+// Load main template
+LOAD_TEMPLATE("member_stats_pool", false, $main_content);
+

 //
 ?>
 //
 ?>

diff --git a/inc/modules/member/what-support.php b/inc/modules/member/what-support.php
index 2e00bc37a19bfbd9d5d03c2b3c158c6073a14e9d..bfed0020e41288a9da19523dad35e01bbf6766ab 100644 (file)
--- a/inc/modules/member/what-support.php
+++ b/inc/modules/member/what-support.php
@@ -75,7 +75,7 @@ if ((!isset($_POST['ok'])) || (empty($_POST['qsummary'])))
        SEND_EMAIL($GLOBALS['userid'], $subj_m, $msg_m);
 
        // Drop a message in the admin's area
        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())",
+       $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'], addslashes($subj_a), addslashes($_POST['qsummary'].":".$_POST['qdetails'])), __FILE__, __LINE__);
 
        // Form sent
         array($GLOBALS['userid'], addslashes($subj_a), addslashes($_POST['qsummary'].":".$_POST['qdetails'])), __FILE__, __LINE__);
 
        // Form sent

diff --git a/inc/modules/member/what-surfbar_book.php b/inc/modules/member/what-surfbar_book.php
index e2fa03b55c3e3a3c158aa691b93bf2daaa8b1256..ec4d19b37bde38309fb0e2c89106993d3ddde4bd 100644 (file)
--- a/inc/modules/member/what-surfbar_book.php
+++ b/inc/modules/member/what-surfbar_book.php
@@ -52,8 +52,14 @@ if (!SURFBAR_IF_USER_BOOK_MORE_URLS()) {
        // No more URLs allowed to book!
        LOAD_TEMPLATE("admin_settings_saved", false, MEMBER_SURFBAR_NO_MORE_ALLOWED);
 } elseif (isset($_POST['ok'])) {
        // No more URLs allowed to book!
        LOAD_TEMPLATE("admin_settings_saved", false, MEMBER_SURFBAR_NO_MORE_ALLOWED);
 } elseif (isset($_POST['ok'])) {

+       // Is limitation "no" and "limit" is > 0?
+       if (($_POST['limited'] == "N") && ((isset($_POST['limit'])) && ($_POST['limit'] > 0)) || (!isset($_POST['limit']))) {
+               // Set it to unlimited
+               $_POST['limit'] = 0;
+       } // END - if
+

        // Register the new URL
        // Register the new URL

-       $insertId = SURFBAR_MEMBER_ADD_URL($_POST['url']);
+       $insertId = SURFBAR_MEMBER_ADD_URL($_POST['url'], $_POST['limit']);

 
        // Was this fine?
        if ($insertId > 0) {
 
        // Was this fine?
        if ($insertId > 0) {

diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php
index 2901b4c8d985a8618329d4f5b5bc17c2c35aeaf6..8dd49ab5b81a3064672295cf4f234606a11cea90 100644 (file)
--- a/inc/modules/member/what-transfer.php
+++ b/inc/modules/member/what-transfer.php
@@ -112,7 +112,7 @@ case "new": // Start new transfer
                        $nick = true;
                }
                // Re-check receivers and own personal data
                        $nick = true;
                }
                // Re-check receivers and own personal data

-               $result = SQL_QUERY_ESC("SELECT userid, gender, surname, family, email".$ADD." FROM "._MYSQL_PREFIX."_user_data WHERE userid IN ('%s', '%s') AND status='CONFIRMED' ORDER BY userid LIMIT 2",
+               $result = SQL_QUERY_ESC("SELECT userid, gender, surname, family, email".$ADD." FROM "._MYSQL_PREFIX."_user_data WHERE userid IN ('%s','%s') AND status='CONFIRMED' ORDER BY userid LIMIT 2",

                 array($GLOBALS['userid'], bigintval($_POST['to_uid'])), __FILE__, __LINE__);
                $valid_data = (SQL_NUMROWS($result) == 2);
 
                 array($GLOBALS['userid'], bigintval($_POST['to_uid'])), __FILE__, __LINE__);
                $valid_data = (SQL_NUMROWS($result) == 2);
 


@@ -193,10 +193,10 @@ case "new": // Start new transfer
                        define('__TRANS_ID', bigintval(GEN_RANDOM_CODE("10", rand(0, 99999), $GLOBALS['userid'], $_POST['reason'])));
 
                        // Add entries to both tables
                        define('__TRANS_ID', bigintval(GEN_RANDOM_CODE("10", rand(0, 99999), $GLOBALS['userid'], $_POST['reason'])));
 
                        // Add entries to both tables

-                       $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_transfers_in (userid, from_uid, points, reason, time_trans, trans_id) VALUES ('%s', '%s', '%s', '%s', UNIX_TIMESTAMP(), '%s')",
+                       $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_transfers_in (userid, from_uid, points, reason, time_trans, trans_id) VALUES ('%s','%s','%s','%s', UNIX_TIMESTAMP(),'%s')",

                         array(bigintval($_POST['to_uid']), $GLOBALS['userid'], bigintval($_POST['points']), addslashes($_POST['reason']), __TRANS_ID),
                         __FILE__, __LINE__);
                         array(bigintval($_POST['to_uid']), $GLOBALS['userid'], bigintval($_POST['points']), addslashes($_POST['reason']), __TRANS_ID),
                         __FILE__, __LINE__);

-                       $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_transfers_out (userid, to_uid, points, reason, time_trans, trans_id) VALUES ('%s', '%s', '%s', '%s', UNIX_TIMESTAMP(), '%s')",
+                       $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_transfers_out (userid, to_uid, points, reason, time_trans, trans_id) VALUES ('%s','%s','%s','%s', UNIX_TIMESTAMP(),'%s')",

                         array($GLOBALS['userid'], bigintval($_POST['to_uid']), bigintval($_POST['points']), addslashes($_POST['reason']), __TRANS_ID),
                         __FILE__, __LINE__);
 
                         array($GLOBALS['userid'], bigintval($_POST['to_uid']), bigintval($_POST['points']), addslashes($_POST['reason']), __TRANS_ID),
                         __FILE__, __LINE__);
 


@@ -426,7 +426,7 @@ party_uid BIGINT(20) UNSIGNED NOT NULL DEFAULT '0',
 points BIGINT(20) UNSIGNED NOT NULL DEFAULT '0',
 reason VARCHAR(255) NOT NULL DEFAULT '',
 time_trans VARCHAR(10) NOT NULL DEFAULT '0',
 points BIGINT(20) UNSIGNED NOT NULL DEFAULT '0',
 reason VARCHAR(255) NOT NULL DEFAULT '',
 time_trans VARCHAR(10) NOT NULL DEFAULT '0',

-trans_type ENUM('IN', 'OUT') NOT NULL DEFAULT 'IN',
+trans_type ENUM('IN','OUT') NOT NULL DEFAULT 'IN',

 KEY(party_uid)
 ) TYPE=HEAP", __FILE__, __LINE__);
 
 KEY(party_uid)
 ) TYPE=HEAP", __FILE__, __LINE__);
 


@@ -436,7 +436,7 @@ array($GLOBALS['userid'], $_CONFIG['transfer_max']), __FILE__, __LINE__);
        while ($DATA = SQL_FETCHROW($result))
        {
                $DATA[] = "IN";
        while ($DATA = SQL_FETCHROW($result))
        {
                $DATA[] = "IN";

-               $DATA = implode("', '", $DATA);
+               $DATA = implode("','", $DATA);

                $res_temp = SQL_QUERY("INSERT INTO "._MYSQL_PREFIX."_transfers_tmp (trans_id, party_uid, points, reason, time_trans, trans_type) VALUES ('".$DATA."')", __FILE__, __LINE__);
        }
 
                $res_temp = SQL_QUERY("INSERT INTO "._MYSQL_PREFIX."_transfers_tmp (trans_id, party_uid, points, reason, time_trans, trans_type) VALUES ('".$DATA."')", __FILE__, __LINE__);
        }
 


@@ -449,7 +449,7 @@ array($GLOBALS['userid'], $_CONFIG['transfer_max']), __FILE__, __LINE__);
        while ($DATA = SQL_FETCHROW($result))
        {
                $DATA[] = "OUT";
        while ($DATA = SQL_FETCHROW($result))
        {
                $DATA[] = "OUT";

-               $DATA = implode("', '", $DATA);
+               $DATA = implode("','", $DATA);

                $res_temp = SQL_QUERY("INSERT INTO "._MYSQL_PREFIX."_transfers_tmp (trans_id, party_uid, points, reason, time_trans, trans_type) VALUES ('".$DATA."')", __FILE__, __LINE__);
        }
 
                $res_temp = SQL_QUERY("INSERT INTO "._MYSQL_PREFIX."_transfers_tmp (trans_id, party_uid, points, reason, time_trans, trans_type) VALUES ('".$DATA."')", __FILE__, __LINE__);
        }
 

diff --git a/inc/modules/order.php b/inc/modules/order.php
index 110ae78277d5a58fc88274bef3e4fea59fb67c26..d320cbddae7fea9a354d87acc752d1518011de1b 100644 (file)
--- a/inc/modules/order.php
+++ b/inc/modules/order.php
@@ -95,7 +95,8 @@ if (empty($URL)) {
                        'subject'  => $DATA[0],
                        'text'     => $DATA[1],
                        'payment'  => GET_PAYMENT($DATA[3]),
                        'subject'  => $DATA[0],
                        'text'     => $DATA[1],
                        'payment'  => GET_PAYMENT($DATA[3]),

-                       'category' => GET_CATEGORY($DATA[6])
+                       'category' => GET_CATEGORY($DATA[6]),
+                       'url'      => $DATA[5]

                );
 
                // Send an email to the user
                );
 
                // Send an email to the user

diff --git a/inc/modules/sponsor/account.php b/inc/modules/sponsor/account.php
index 25a03a9e38ab95f426aba90f77966e69c96e2e1b..44b1a43e7db87e1320941765a35e196ba9c66408 100644 (file)
--- a/inc/modules/sponsor/account.php
+++ b/inc/modules/sponsor/account.php
@@ -88,7 +88,7 @@ if (SQL_NUMROWS($result) == 1) {
                                }
 
                                // Unsecure data which we don't want here
                                }
 
                                // Unsecure data which we don't want here

-                               $UNSAFE = array('receive_warnings', 'warning_interval');
+                                       $UNSAFE = array('receive_warnings', 'warning_interval');

 
                                // Remove all (maybe spoofed) unsafe data from array
                                foreach ($UNSAFE as $remove) {
 
                                // Remove all (maybe spoofed) unsafe data from array
                                foreach ($UNSAFE as $remove) {

diff --git a/inc/monthly/monthly_newsletter.php b/inc/monthly/monthly_newsletter.php
index 2cfaaa02630208f84e4ed7a148764fdb08141605..3e1ab6618ee18977e1c1563bea03c5117ddab1c8 100644 (file)
--- a/inc/monthly/monthly_newsletter.php
+++ b/inc/monthly/monthly_newsletter.php
@@ -64,7 +64,7 @@ if ($_CONFIG['last_month'] != $curr)
                        SEND_EMAIL($uid, NL_MEMBER_RESET_SUBJECT, $msg);
 
                        // Send email to admin
                        SEND_EMAIL($uid, NL_MEMBER_RESET_SUBJECT, $msg);
 
                        // Send email to admin

-                       SEND_ADMIN_NOTIFICATION(NL_ADMIN_SUBJECT, "admin_newsletter_reset", "", $GLOBALS['userid']);
+                       SEND_ADMIN_NOTIFICATION(NL_ADMIN_SUBJECT, "admin_newsletter_reset", array(), $GLOBALS['userid']);

                }
 
                // Free memory
                }
 
                // Free memory

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 7e6d95f31ae89ab7fe7e6f4acc09be7dac53bc3a..50fcf10742eb1d5cbb23471f06f910aa1e732c3f 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -159,12 +159,12 @@ function CHECK_MODULE($mod) {
                                // to find a loop here... *sigh*
                                $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_mod_reg
 (module, locked, hidden, mem_only, admin_only, has_menu) VALUES
                                // to find a loop here... *sigh*
                                $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_mod_reg
 (module, locked, hidden, mem_only, admin_only, has_menu) VALUES

-('%s', 'Y', 'N', 'N', 'N', 'N')", array($mod_chk), __FILE__, __LINE__);
+('%s','Y','N','N','N','N')", array($mod_chk), __FILE__, __LINE__);

                        } else {
                                // Wrong/missing sql_patches!
                                $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_mod_reg
 (module, locked, hidden, mem_only, admin_only) VALUES
                        } else {
                                // Wrong/missing sql_patches!
                                $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_mod_reg
 (module, locked, hidden, mem_only, admin_only) VALUES

-('%s', 'Y', 'N', 'N', 'N')", array($mod_chk), __FILE__, __LINE__);
+('%s','Y','N','N','N')", array($mod_chk), __FILE__, __LINE__);

                        }
 
                        // Everthing is fine?
                        }
 
                        // Everthing is fine?


@@ -594,7 +594,7 @@ function IS_MEMBER()
        } // END - if
 
        // Fix "deleted" cookies first
        } // END - if
 
        // Fix "deleted" cookies first

-       FIX_DELETED_COOKIES(array('userid', 'u_hash', 'lifetime'));
+       FIX_DELETED_COOKIES(array('userid','u_hash','lifetime'));

 
        // Are cookies set?
        if ((!empty($GLOBALS['userid'])) && (isSessionVariableSet('u_hash')) && (isSessionVariableSet('lifetime')) && (defined('COOKIE_PATH')))
 
        // Are cookies set?
        if ((!empty($GLOBALS['userid'])) && (isSessionVariableSet('u_hash')) && (isSessionVariableSet('lifetime')) && (defined('COOKIE_PATH')))


@@ -1042,7 +1042,7 @@ function REMOVE_RECEIVER(&$ARRAY, $key, $uid, $pool_id, $stats_id="", $bonus=fal
                        if (SQL_NUMROWS($result) == 0)
                        {
                                // No, so we add one!
                        if (SQL_NUMROWS($result) == 0)
                        {
                                // No, so we add one!

-                               $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_links (%s, userid, link_type) VALUES ('%s', '%s', '%s')",
+                               $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_links (%s, userid, link_type) VALUES ('%s','%s','%s')",

                                 array($rowName, $stats_id, bigintval($uid), $type), __FILE__, __LINE__);
                                $ret = "done";
                        }
                                 array($rowName, $stats_id, bigintval($uid), $type), __FILE__, __LINE__);
                                $ret = "done";
                        }


@@ -1244,7 +1244,7 @@ function UPDATE_REF_COUNTER($uid)
        if (SQL_AFFECTEDROWS() == 0)
        {
                // First count!
        if (SQL_AFFECTEDROWS() == 0)
        {
                // First count!

-               $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_refsystem (userid, level, counter) VALUES ('%s', '%s', '1')",
+               $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_refsystem (userid, level, counter) VALUES ('%s','%s','1')",

                 array(bigintval($uid), $REF_LVL), __FILE__, __LINE__);
        }
 
                 array(bigintval($uid), $REF_LVL), __FILE__, __LINE__);
        }
 


@@ -1325,7 +1325,7 @@ WHERE sid='%s' LIMIT 1",
                );
        } else {
                // No entry does exists so we simply add it!
                );
        } else {
                // No entry does exists so we simply add it!

-               SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_online (module, action, what, userid, refid, is_member, is_admin, timestamp, sid, ip) VALUES ('%s', '%s', '%s', %s, %s, '%s', '%s', UNIX_TIMESTAMP(), '%s', '%s')",
+               SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_online (module, action, what, userid, refid, is_member, is_admin, timestamp, sid, ip) VALUES ('%s','%s','%s', %s, %s, '%s','%s', UNIX_TIMESTAMP(), '%s','%s')",

                        array($mod, $act, $wht, $uid, $rid, $MEM, $ADMIN, $SID, getenv('REMOTE_ADDR')), __FILE__, __LINE__
                );
        }
                        array($mod, $act, $wht, $uid, $rid, $MEM, $ADMIN, $SID, getenv('REMOTE_ADDR')), __FILE__, __LINE__
                );
        }


@@ -1553,7 +1553,7 @@ function ADD_JACKPOT($points)
        if (SQL_NUMROWS($result) == 0)
        {
                // Create line
        if (SQL_NUMROWS($result) == 0)
        {
                // Create line

-               $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_jackpot (ok, points) VALUES ('ok', '%s')", array($points), __FILE__, __LINE__);
+               $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_jackpot (ok, points) VALUES ('ok','%s')", array($points), __FILE__, __LINE__);

        }
         else
        {
        }
         else
        {


@@ -1765,7 +1765,7 @@ function CREATE_EXTENSION_UPDATE_TASK ($admin_id, $subject, $notes) {
                array($subject), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 0) {
                // Task not created so it's a brand-new extension which we need to register and create a task for!
                array($subject), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 0) {
                // Task not created so it's a brand-new extension which we need to register and create a task for!

-               $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_task_system (assigned_admin, userid, status, task_type, subject, text, task_created) VALUES ('%s', '0', 'NEW', 'EXTENSION_UPDATE', '%s', '%s', UNIX_TIMESTAMP())",
+               $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_task_system (assigned_admin, userid, status, task_type, subject, text, task_created) VALUES ('%s','0','NEW','EXTENSION_UPDATE','%s','%s', UNIX_TIMESTAMP())",

                        array($admin_id, $subject, $notes), __FILE__, __LINE__);
        } // END - if
 
                        array($admin_id, $subject, $notes), __FILE__, __LINE__);
        } // END - if
 


@@ -1796,7 +1796,7 @@ function CREATE_NEW_EXTENSION_TASK ($admin_id, $subject, $ext) {
 
                // Task not created so it's a brand-new extension which we need to register and create a task for!
                $result_insert = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_task_system (assigned_admin, userid, status, task_type, subject, text, task_created)
 
                // Task not created so it's a brand-new extension which we need to register and create a task for!
                $result_insert = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_task_system (assigned_admin, userid, status, task_type, subject, text, task_created)

-VALUES (%s, 0, 'NEW', 'EXTENSION', '%s', '%s', UNIX_TIMESTAMP())",
+VALUES (%s,0,'NEW','EXTENSION','%s','%s',UNIX_TIMESTAMP())",

                        array(
                                $admin_id,
                                $subject,
                        array(
                                $admin_id,
                                $subject,

diff --git a/inc/pool-update.php b/inc/pool-update.php
index f5d6a9b36fcf1d288a83aa7ceaed3b7afd110d5f..3c6015d66cb524dff7927666fc7c5836b1d13a12 100644 (file)
--- a/inc/pool-update.php
+++ b/inc/pool-update.php
@@ -56,7 +56,7 @@ if ($HTML_EXT) {
 }
 
 // Reset variables
 }
 
 // Reset variables

-$cnt = 0; $cnt2 = 0; $LAST_SENT_ID = 0; $cnt_back = array("0"); $pointsBack = array("0");
+$cnt = 0; $cnt2 = 0; $LAST_SENT_ID = 0; $cnt_back = array("0"); $points_BACK = array("0");

 if (SQL_NUMROWS($result_main) > 0)
 {
        while ($DATA = SQL_FETCHROW($result_main))
 if (SQL_NUMROWS($result_main) > 0)
 {
        while ($DATA = SQL_FETCHROW($result_main))


@@ -117,7 +117,7 @@ if (SQL_NUMROWS($result_main) > 0)
                                        if (SQL_NUMROWS($result_stats) == 0)
                                        {
                                                // No entry was found, so we add him!
                                        if (SQL_NUMROWS($result_stats) == 0)
                                        {
                                                // No entry was found, so we add him!

-                                               $result_stats = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_stats (pool_id , userid, cat_id, payment_id, subject, url , max_rec , timestamp_ordered, timestamp_sstart) VALUES ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' , UNIX_TIMESTAMP())",
+                                               $result_stats = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_stats (pool_id , userid, cat_id, payment_id, subject, url , max_rec , timestamp_ordered, timestamp_sstart) VALUES ('%s','%s','%s','%s','%s','%s','%s','%s' , UNIX_TIMESTAMP())",

                                                 array(bigintval($DATA[0]), bigintval($DATA[1]), bigintval($DATA[9]), bigintval($DATA[5]), $DATA[2], $DATA[7], $DATA[8], bigintval($DATA[6])), __FILE__, __LINE__);
 
                                                // Receive it's ID for the links table
                                                 array(bigintval($DATA[0]), bigintval($DATA[1]), bigintval($DATA[9]), bigintval($DATA[5]), $DATA[2], $DATA[7], $DATA[8], bigintval($DATA[6])), __FILE__, __LINE__);
 
                                                // Receive it's ID for the links table


@@ -273,7 +273,7 @@ if (SQL_NUMROWS($result_main) > 0)
                                        {
                                                if ($uid > 0)
                                                {
                                        {
                                                if ($uid > 0)
                                                {

-                                                       // User does exist so pay the points back
+                                                       // User does not exists, pay points back

                                                        $points = GET_PAY_POINTS($DATA[5]);
                                                        $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_points SET points=points+%s WHERE userid=%s AND ref_depth=0 LIMIT 1",
                                                         array($points, bigintval($DATA[1])), __FILE__, __LINE__);
                                                        $points = GET_PAY_POINTS($DATA[5]);
                                                        $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_points SET points=points+%s WHERE userid=%s AND ref_depth=0 LIMIT 1",
                                                         array($points, bigintval($DATA[1])), __FILE__, __LINE__);


@@ -287,7 +287,7 @@ if (SQL_NUMROWS($result_main) > 0)
                                                        }
 
                                                        // Add points together and remove user
                                                        }
 
                                                        // Add points together and remove user

-                                                       $pointsBack[$DATA[1]] += $points;
+                                                       $points_BACK[$DATA[1]] += $points;

                                                }
                                                $cnt_back[$DATA[1]]++;
                                        }
                                                }
                                                $cnt_back[$DATA[1]]++;
                                        }


@@ -301,8 +301,8 @@ if (SQL_NUMROWS($result_main) > 0)
                        }
                }
        }
                        }
                }
        }

-       if ((sizeof($pointsBack) > 0) && (!empty($pointsBack[0]))) {
-               foreach ($pointsBack as $uid => $PB) {
+       if ((sizeof($points_BACK) > 0) && (!empty($points_BACK[0]))) {
+               foreach ($points_BACK as $uid => $PB) {

                        // Add points only when we have points left to add and a valid user ID
                        if (($PB > 0) && ($uid > 0)) {
                                // Prepare content
                        // Add points only when we have points left to add and a valid user ID
                        if (($PB > 0) && ($uid > 0)) {
                                // Prepare content

diff --git a/install/menu-de.sql b/install/menu-de.sql
index b820b545c3964bc05d91804ed0852de03546431a..118574fb27fd8fc65f821e9e858c7e4f9029e074 100644 (file)
--- a/install/menu-de.sql
+++ b/install/menu-de.sql
@@ -16,10 +16,10 @@ INSERT INTO `mxchange_admin_menu` VALUES (15,'email','email_stats','Email-Statis
 INSERT INTO `mxchange_admin_menu` VALUES (17,'email','edit_emails','Email-Daten ändern',5,'Hier können Sie u.a. die gebuchte URL der Emails umändern, usw.');\r
 INSERT INTO `mxchange_admin_menu` VALUES (18,'email','unlock_emails','Emails freigeben',5,'Geben Sie bei manuellem Versand gebuchte Mails hier frei.');\r
 INSERT INTO `mxchange_admin_menu` VALUES (19,'email','email_details','Email-Details ansehen',5,'Sehen Sie sich jedes Details bereits gebuchter Mails an.');\r
 INSERT INTO `mxchange_admin_menu` VALUES (17,'email','edit_emails','Email-Daten ändern',5,'Hier können Sie u.a. die gebuchte URL der Emails umändern, usw.');\r
 INSERT INTO `mxchange_admin_menu` VALUES (18,'email','unlock_emails','Emails freigeben',5,'Geben Sie bei manuellem Versand gebuchte Mails hier frei.');\r
 INSERT INTO `mxchange_admin_menu` VALUES (19,'email','email_details','Email-Details ansehen',5,'Sehen Sie sich jedes Details bereits gebuchter Mails an.');\r

-INSERT INTO `mxchange_admin_menu` VALUES (20,'user','del_user','User löschen',4,'Löschen Sie hier Benutzer, die gegen die AGBs mehrmals verstossen haben. Bitte seien Sie nett zu Ihren Mitgliedern und löschen Sie nicht gleich.');\r
-INSERT INTO `mxchange_admin_menu` VALUES (21,'user','chk_regs','Anmeldungen prüfen\r\n',4,'Prüfen Sie hier neue Anmeldungen zu Ihrem System. Hier können Sie im Falle einer Fehler-Mail den User gleich wieder löschen!');\r
-INSERT INTO `mxchange_admin_menu` VALUES (22,'user','lock_user','User sperren / entsperren',4,'Sperren Sie User, die zu viele unbestätigte Mails haben oder gegen Ihre AGBs verstossen haben über diesen Menüpunkt.');\r
-INSERT INTO `mxchange_admin_menu` VALUES (23,'user','list_user','User auflisten',4,'Listen Sie alle User oder eingeschränkt nach Suchkritieren Ihre Userdatenbank auf. Sie könen per Klick auf die Usernummer sich Details zum User ansehen.');\r
+INSERT INTO `mxchange_admin_menu` VALUES (20,'user','del_user','Mitglied löschen',4,'Löschen Sie hier Mitglied, die gegen die AGBs mehrmals verstossen haben. Bitte seien Sie nett zu Ihren Mitgliedern und löschen Sie nicht gleich.');\r
+INSERT INTO `mxchange_admin_menu` VALUES (21,'user','chk_regs','Anmeldungen prüfen\r\n',4,'Prüfen Sie hier neue Anmeldungen zu Ihrem System. Hier können Sie im Falle einer Fehler-Mail den Mitglied gleich wieder löschen!');\r
+INSERT INTO `mxchange_admin_menu` VALUES (22,'user','lock_user','Mitglied sperren / entsperren',4,'Sperren Sie Mitglied, die zu viele unbestätigte Mails haben oder gegen Ihre AGBs verstossen haben über diesen Menüpunkt.');\r
+INSERT INTO `mxchange_admin_menu` VALUES (23,'user','list_user','Mitglied auflisten',4,'Listen Sie alle Mitglied oder eingeschränkt nach Suchkritieren Ihre Userdatenbank auf. Sie könen per Klick auf die Usernummer sich Details zum Mitglied ansehen.');\r

 INSERT INTO `mxchange_admin_menu` VALUES (28,'setup','config_secure','Sicherheitseinstellungen',9,'Stellen Sie ein, wie lange das Passwort eines Mitgliedes mindestens sein muss uvm.');\r
 INSERT INTO `mxchange_admin_menu` VALUES (27,'setup','config_email','Versand, Empfang',8,'Hier können Sie die maximal empfangbaren Mails usw. einstellen.');\r
 INSERT INTO `mxchange_admin_menu` VALUES (25,'setup','config_cats','Kategorien einrichten',7,'Ändern oder löschen Sie bereits bestehende Kategorien oder fügen Sie weitere hinzu.');\r
 INSERT INTO `mxchange_admin_menu` VALUES (28,'setup','config_secure','Sicherheitseinstellungen',9,'Stellen Sie ein, wie lange das Passwort eines Mitgliedes mindestens sein muss uvm.');\r
 INSERT INTO `mxchange_admin_menu` VALUES (27,'setup','config_email','Versand, Empfang',8,'Hier können Sie die maximal empfangbaren Mails usw. einstellen.');\r
 INSERT INTO `mxchange_admin_menu` VALUES (25,'setup','config_cats','Kategorien einrichten',7,'Ändern oder löschen Sie bereits bestehende Kategorien oder fügen Sie weitere hinzu.');\r

diff --git a/install/menu-en.sql b/install/menu-en.sql
index b820b545c3964bc05d91804ed0852de03546431a..118574fb27fd8fc65f821e9e858c7e4f9029e074 100644 (file)
--- a/install/menu-en.sql
+++ b/install/menu-en.sql
@@ -16,10 +16,10 @@ INSERT INTO `mxchange_admin_menu` VALUES (15,'email','email_stats','Email-Statis
 INSERT INTO `mxchange_admin_menu` VALUES (17,'email','edit_emails','Email-Daten ändern',5,'Hier können Sie u.a. die gebuchte URL der Emails umändern, usw.');\r
 INSERT INTO `mxchange_admin_menu` VALUES (18,'email','unlock_emails','Emails freigeben',5,'Geben Sie bei manuellem Versand gebuchte Mails hier frei.');\r
 INSERT INTO `mxchange_admin_menu` VALUES (19,'email','email_details','Email-Details ansehen',5,'Sehen Sie sich jedes Details bereits gebuchter Mails an.');\r
 INSERT INTO `mxchange_admin_menu` VALUES (17,'email','edit_emails','Email-Daten ändern',5,'Hier können Sie u.a. die gebuchte URL der Emails umändern, usw.');\r
 INSERT INTO `mxchange_admin_menu` VALUES (18,'email','unlock_emails','Emails freigeben',5,'Geben Sie bei manuellem Versand gebuchte Mails hier frei.');\r
 INSERT INTO `mxchange_admin_menu` VALUES (19,'email','email_details','Email-Details ansehen',5,'Sehen Sie sich jedes Details bereits gebuchter Mails an.');\r

-INSERT INTO `mxchange_admin_menu` VALUES (20,'user','del_user','User löschen',4,'Löschen Sie hier Benutzer, die gegen die AGBs mehrmals verstossen haben. Bitte seien Sie nett zu Ihren Mitgliedern und löschen Sie nicht gleich.');\r
-INSERT INTO `mxchange_admin_menu` VALUES (21,'user','chk_regs','Anmeldungen prüfen\r\n',4,'Prüfen Sie hier neue Anmeldungen zu Ihrem System. Hier können Sie im Falle einer Fehler-Mail den User gleich wieder löschen!');\r
-INSERT INTO `mxchange_admin_menu` VALUES (22,'user','lock_user','User sperren / entsperren',4,'Sperren Sie User, die zu viele unbestätigte Mails haben oder gegen Ihre AGBs verstossen haben über diesen Menüpunkt.');\r
-INSERT INTO `mxchange_admin_menu` VALUES (23,'user','list_user','User auflisten',4,'Listen Sie alle User oder eingeschränkt nach Suchkritieren Ihre Userdatenbank auf. Sie könen per Klick auf die Usernummer sich Details zum User ansehen.');\r
+INSERT INTO `mxchange_admin_menu` VALUES (20,'user','del_user','Mitglied löschen',4,'Löschen Sie hier Mitglied, die gegen die AGBs mehrmals verstossen haben. Bitte seien Sie nett zu Ihren Mitgliedern und löschen Sie nicht gleich.');\r
+INSERT INTO `mxchange_admin_menu` VALUES (21,'user','chk_regs','Anmeldungen prüfen\r\n',4,'Prüfen Sie hier neue Anmeldungen zu Ihrem System. Hier können Sie im Falle einer Fehler-Mail den Mitglied gleich wieder löschen!');\r
+INSERT INTO `mxchange_admin_menu` VALUES (22,'user','lock_user','Mitglied sperren / entsperren',4,'Sperren Sie Mitglied, die zu viele unbestätigte Mails haben oder gegen Ihre AGBs verstossen haben über diesen Menüpunkt.');\r
+INSERT INTO `mxchange_admin_menu` VALUES (23,'user','list_user','Mitglied auflisten',4,'Listen Sie alle Mitglied oder eingeschränkt nach Suchkritieren Ihre Userdatenbank auf. Sie könen per Klick auf die Usernummer sich Details zum Mitglied ansehen.');\r

 INSERT INTO `mxchange_admin_menu` VALUES (28,'setup','config_secure','Sicherheitseinstellungen',9,'Stellen Sie ein, wie lange das Passwort eines Mitgliedes mindestens sein muss uvm.');\r
 INSERT INTO `mxchange_admin_menu` VALUES (27,'setup','config_email','Versand, Empfang',8,'Hier können Sie die maximal empfangbaren Mails usw. einstellen.');\r
 INSERT INTO `mxchange_admin_menu` VALUES (25,'setup','config_cats','Kategorien einrichten',7,'Ändern oder löschen Sie bereits bestehende Kategorien oder fügen Sie weitere hinzu.');\r
 INSERT INTO `mxchange_admin_menu` VALUES (28,'setup','config_secure','Sicherheitseinstellungen',9,'Stellen Sie ein, wie lange das Passwort eines Mitgliedes mindestens sein muss uvm.');\r
 INSERT INTO `mxchange_admin_menu` VALUES (27,'setup','config_email','Versand, Empfang',8,'Hier können Sie die maximal empfangbaren Mails usw. einstellen.');\r
 INSERT INTO `mxchange_admin_menu` VALUES (25,'setup','config_cats','Kategorien einrichten',7,'Ändern oder löschen Sie bereits bestehende Kategorien oder fügen Sie weitere hinzu.');\r

diff --git a/surfbar.php b/surfbar.php
index 93510abffa06ab1e94dddec7f5675b5992cd5684..bcedacfb55a12d4007802a8ae7eb1eff28973c60 100644 (file)
--- a/surfbar.php
+++ b/surfbar.php
@@ -60,6 +60,9 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                LOAD_URL(URL."/modules.php?module=login&msg=".CODE_EXTENSION_PROBLEM."&ext=surfbar");
        }
 
                LOAD_URL(URL."/modules.php?module=login&msg=".CODE_EXTENSION_PROBLEM."&ext=surfbar");
        }
 

+       // Handle tasks on self-maintenance
+       SURFBAR_HANDLE_SELF_MAINTENANCE();
+

        // Is there a check value?
        if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isset($_GET['frame'])) && (in_array($_GET['frame'], array("stop", "stop2", "stats", "textlinks"))))) {
                // Reload-lock is full, surfbar stopped so...
        // Is there a check value?
        if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isset($_GET['frame'])) && (in_array($_GET['frame'], array("stop", "stop2", "stats", "textlinks"))))) {
                // Reload-lock is full, surfbar stopped so...


@@ -130,11 +133,11 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                        // Check if reload is full
                        if (SURFBAR_CHECK_RELOAD_FULL()) {
                                // Then load waiting page
                        // Check if reload is full
                        if (SURFBAR_CHECK_RELOAD_FULL()) {
                                // Then load waiting page

-                               LOAD_URL("surfbar.php?frame=stop");
+                               SURFBAR_RELOAD_TO_STOP_PAGE();

                        } // END - if
                } else {
                        // Reload to stop frame!
                        } // END - if
                } else {
                        // Reload to stop frame!

-                       LOAD_URL("surfbar.php?frame=stop");
+                       SURFBAR_RELOAD_TO_STOP_PAGE();

                }
 
                // All done, so fix notice for footer.php
                }
 
                // All done, so fix notice for footer.php


@@ -170,7 +173,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                                SURFBAR_UPDATE_SALT_STATS();
                        } else {
                                // Load new URL
                                SURFBAR_UPDATE_SALT_STATS();
                        } else {
                                // Load new URL

-                               LOAD_URL("surfbar.php?frame=stop2");
+                               SURFBAR_RELOAD_TO_STOP_PAGE("stop2");

                        }
                } elseif ((isset($_GET['frame'])) && ($_GET['frame'] == "start")) {
                        // Starter frame found so let the footer display
                        }
                } elseif ((isset($_GET['frame'])) && ($_GET['frame'] == "start")) {
                        // Starter frame found so let the footer display

diff --git a/templates/de/emails/admin/admin_surfbar_url_migrate.tpl b/templates/de/emails/admin/admin_surfbar_url_migrate.tpl
new file mode 100644 (file)
index 0000000..83eaa7e
--- /dev/null
+++ b/templates/de/emails/admin/admin_surfbar_url_migrate.tpl
@@ -0,0 +1,24 @@
+{--HELLO_ADMIN--},
+
+es wurde soeben eine URL durch Freischaltung einer Mailbuchung in die Surfbar migriert.
+
+Hier sind alle dazu:
+------------------------------------------
+Gebuchte URL: $content[url]
+------------------------------------------
+Email: $DATA[email]
+------------------------------------------
+Framekiller-Test:
+$content[frametester]
+------------------------------------------
+User-ID: $content[uid]
+------------------------------------------
+Status: $content[status]
+------------------------------------------
+ID in der Surfbar: $content[insert_id]
+------------------------------------------
+
+{--ADMIN_THANX--}
+  {--YOUR--} {!MAIN_TITLE!} {--SCRIPT--}
+
+{!URL!}/admin.php

diff --git a/templates/de/emails/member/member_autopurge_inactive.tpl b/templates/de/emails/member/member_autopurge_inactive.tpl
index e5adfae39dae98203e0ee13a0cda75bc3719a3fd..cb203c0038cbe3870efd9f63d53bc90ca16772c3 100644 (file)
--- a/templates/de/emails/member/member_autopurge_inactive.tpl
+++ b/templates/de/emails/member/member_autopurge_inactive.tpl
@@ -16,4 +16,4 @@ URL: {!URL!}/login.php
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 

-{!URL!} ({!WEBMASTER!})
\ No newline at end of file
+{!URL!}/login.php ({!WEBMASTER!})
\ No newline at end of file

diff --git a/templates/de/emails/member/member_autopurge_points.tpl b/templates/de/emails/member/member_autopurge_points.tpl
index 011456be03b9cd60c6deb6b0f20a3018cb158cb8..bbe7a67ce3c934e1e7735236d3cbe6662d40aadc 100644 (file)
--- a/templates/de/emails/member/member_autopurge_points.tpl
+++ b/templates/de/emails/member/member_autopurge_points.tpl
@@ -9,4 +9,4 @@ Ihre Mitglied-ID lautet: $UID
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 

-{!URL!} ({!WEBMASTER!})
\ No newline at end of file
+{!URL!}/login.php ({!WEBMASTER!})
\ No newline at end of file

diff --git a/templates/de/emails/member/member_beg.tpl b/templates/de/emails/member/member_beg.tpl
index 8bdf73e06933bb03de205b96e590d7cea6453811..d49a7e29fb80622e483a22136ac4caa866a20dca 100644 (file)
--- a/templates/de/emails/member/member_beg.tpl
+++ b/templates/de/emails/member/member_beg.tpl
@@ -11,4 +11,4 @@ Ihre Mitglied-ID lautet: $UID
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 

-{!URL!} ({!WEBMASTER!})
\ No newline at end of file
+{!URL!}/login.php ({!WEBMASTER!})
\ No newline at end of file

diff --git a/templates/de/emails/member/member_birthday.tpl b/templates/de/emails/member/member_birthday.tpl
index 82d419f99b1eb5a6f41a509bcade3eb0feea57e1..e2c59890e8dfc563d15c3b57f499e34ed9b2059b 100644 (file)
--- a/templates/de/emails/member/member_birthday.tpl
+++ b/templates/de/emails/member/member_birthday.tpl
@@ -7,4 +7,4 @@ Diese Mail wurde automatisch versandt.
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 

-{!URL!} ({!WEBMASTER!})
\ No newline at end of file
+{!URL!}/login.php ({!WEBMASTER!})
\ No newline at end of file

diff --git a/templates/de/emails/member/member_birthday_confirm.tpl b/templates/de/emails/member/member_birthday_confirm.tpl
index c6aaef023ceba0e2a29b3f4ef3ee7f333ffb8961..7e9c08894036148434c32a39191c2db6f543eda0 100644 (file)
--- a/templates/de/emails/member/member_birthday_confirm.tpl
+++ b/templates/de/emails/member/member_birthday_confirm.tpl
@@ -13,4 +13,4 @@ Diese Mail wurde automatisch versandt.
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 

-{!URL!} ({!WEBMASTER!})
\ No newline at end of file
+{!URL!}/login.php ({!WEBMASTER!})
\ No newline at end of file

diff --git a/templates/de/emails/member/member_bonus.tpl b/templates/de/emails/member/member_bonus.tpl
index 76af1e22fbc43f6822224b2f3b442cb2a2a0ad63..643c954f47f38f3d4d55ee648446d97f4aa78836 100644 (file)
--- a/templates/de/emails/member/member_bonus.tpl
+++ b/templates/de/emails/member/member_bonus.tpl
@@ -11,4 +11,4 @@ Ihre Mitglied-ID lautet: $UID
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 

-{!URL!} ({!WEBMASTER!})
\ No newline at end of file
+{!URL!}/login.php ({!WEBMASTER!})
\ No newline at end of file

diff --git a/templates/de/emails/member/member_contct.tpl b/templates/de/emails/member/member_contct.tpl
index 06a1d5841cc4bc3452dd26e9670106df3c9407ad..bc6590d30d4580732c860a0da8b6ca2a1363013f 100644 (file)
--- a/templates/de/emails/member/member_contct.tpl
+++ b/templates/de/emails/member/member_contct.tpl
@@ -13,4 +13,4 @@ $content[text]
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 

-{!URL!} ({!WEBMASTER!})
\ No newline at end of file
+{!URL!}/login.php ({!WEBMASTER!})
\ No newline at end of file

diff --git a/templates/de/emails/member/member_del_surfbar_urls.tpl b/templates/de/emails/member/member_del_surfbar_urls.tpl
index 393f2d73614872ad5dd5caa31150fe5ef092555b..b8c762f462ee3844d3bb10e52dbc7449ef46b866 100644 (file)
--- a/templates/de/emails/member/member_del_surfbar_urls.tpl
+++ b/templates/de/emails/member/member_del_surfbar_urls.tpl
@@ -18,4 +18,4 @@ ID in der Surfbar: $content[id]
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 

-{!URL!} ({!WEBMASTER!})
+{!URL!}/login.php ({!WEBMASTER!})

diff --git a/templates/de/emails/member/member_doubler.tpl b/templates/de/emails/member/member_doubler.tpl
index a2b4c3e35d2e6984059522124244a674e80f95cb..4c8f2b969930c7829a2dcde13ef637cffaf6ad7f 100644 (file)
--- a/templates/de/emails/member/member_doubler.tpl
+++ b/templates/de/emails/member/member_doubler.tpl
@@ -11,4 +11,4 @@ Ihre IP-Nummer lautete: $content[ip]
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 

-{!URL!} ({!WEBMASTER!})
\ No newline at end of file
+{!URL!}/login.php ({!WEBMASTER!})
\ No newline at end of file

diff --git a/templates/de/emails/member/member_edit_surfbar_urls.tpl b/templates/de/emails/member/member_edit_surfbar_urls.tpl
index ce9df31e6706cdc3cb0228c5d58dca2a2d395607..537b8b03ddeb7614736ef8c60ddbd1915528a17f 100644 (file)
--- a/templates/de/emails/member/member_edit_surfbar_urls.tpl
+++ b/templates/de/emails/member/member_edit_surfbar_urls.tpl
@@ -18,4 +18,4 @@ ID in der Surfbar: $DATA[id]
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 

-{!URL!} ({!WEBMASTER!})
+{!URL!}/login.php ({!WEBMASTER!})

diff --git a/templates/de/emails/member/member_holiday_activated.tpl b/templates/de/emails/member/member_holiday_activated.tpl
index 81d61dcd80b4297b1e1cfc00ddff54fbd98b9d8c..85c38de6ad9c35544cd35bfbff12acfba82b97aa 100644 (file)
--- a/templates/de/emails/member/member_holiday_activated.tpl
+++ b/templates/de/emails/member/member_holiday_activated.tpl
@@ -26,4 +26,4 @@ Wir wuenschen Ihnen einen schoenen und hoffentlich auch erholsamen Urlaub und wu
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 

-{!URL!} ({!WEBMASTER!})
\ No newline at end of file
+{!URL!}/login.php ({!WEBMASTER!})
\ No newline at end of file

diff --git a/templates/de/emails/member/member_holiday_request.tpl b/templates/de/emails/member/member_holiday_request.tpl
index e5ae30746c4188a6fb32e7b6d2878d94a206b923..9446cc0e8045290dcf553cab287d36c5aad2a046 100644 (file)
--- a/templates/de/emails/member/member_holiday_request.tpl
+++ b/templates/de/emails/member/member_holiday_request.tpl
@@ -25,4 +25,4 @@ Ihr Guthaben ausreichend ist und auch genuegend Mitglieder vorhanden sind.
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 

-{!URL!} ({!WEBMASTER!})
\ No newline at end of file
+{!URL!}/login.php ({!WEBMASTER!})
\ No newline at end of file

diff --git a/templates/de/emails/member/member_lock_confirmed_surfbar_urls.tpl b/templates/de/emails/member/member_lock_confirmed_surfbar_urls.tpl
index 40dd9a74d7df83955e607420f405789683e347ab..9c7b73c4cbb8d8016fdaa452ea32ccaa1fb89dbb 100644 (file)
--- a/templates/de/emails/member/member_lock_confirmed_surfbar_urls.tpl
+++ b/templates/de/emails/member/member_lock_confirmed_surfbar_urls.tpl
@@ -16,4 +16,4 @@ ID in der Surfbar: $content[id]
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 

-{!URL!} ({!WEBMASTER!})
+{!URL!}/login.php ({!WEBMASTER!})

diff --git a/templates/de/emails/member/member_lock_locked_surfbar_urls.tpl b/templates/de/emails/member/member_lock_locked_surfbar_urls.tpl
index b66ef33385c6325dbc103212389a65d6efc9a2a3..6fe2b103262c74a7788668989b708af0f9428b8e 100644 (file)
--- a/templates/de/emails/member/member_lock_locked_surfbar_urls.tpl
+++ b/templates/de/emails/member/member_lock_locked_surfbar_urls.tpl
@@ -18,4 +18,4 @@ ID in der Surfbar: $content[id]
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 

-{!URL!} ({!WEBMASTER!})
+{!URL!}/login.php ({!WEBMASTER!})

diff --git a/templates/de/emails/member/member_mydata_notify.tpl b/templates/de/emails/member/member_mydata_notify.tpl
index cfb34f432adcfc886fe91af137b7b2ac59a8ea5c..dbcb835fa30e449bb0318f50b7da284315136148 100644 (file)
--- a/templates/de/emails/member/member_mydata_notify.tpl
+++ b/templates/de/emails/member/member_mydata_notify.tpl
@@ -1,4 +1,4 @@
-{--HELLO--} $DATA[1] $DATA[2],
+Hallo $DATA[1] $DATA[2],

 
 {--MEMBER_HAVE_CHANGED_DATA--}
 
 
 {--MEMBER_HAVE_CHANGED_DATA--}
 


@@ -28,4 +28,4 @@ $DATA[info]
 {--THANX--}
   {--YOUR--} {!MAIN_TITLE!} {--TEAM--}
 
 {--THANX--}
   {--YOUR--} {!MAIN_TITLE!} {--TEAM--}
 

-{!URL!} ({!WEBMASTER!})
+{!URL!}/login.php ({!WEBMASTER!})

diff --git a/templates/de/emails/member/member_newsletter_done.tpl b/templates/de/emails/member/member_newsletter_done.tpl
index 4bce17d1f4ebaec1568c8d8ab2ee646b0e37c617..a306098f41375c8490d4e1ea09f68b7121bcd974 100644 (file)
--- a/templates/de/emails/member/member_newsletter_done.tpl
+++ b/templates/de/emails/member/member_newsletter_done.tpl
@@ -17,4 +17,4 @@ Sie erhalten dann eine Mitteilung, dass Sie wieder den Newsletter empfangen.
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 

-{!URL!} ({!WEBMASTER!})
\ No newline at end of file
+{!URL!}/login.php ({!WEBMASTER!})
\ No newline at end of file

diff --git a/templates/de/emails/member/member_newsletter_request.tpl b/templates/de/emails/member/member_newsletter_request.tpl
index d6e65097c644c587dac063d9a185c94bc9e581fc..ad773f896fd96654033ad1f62ccc6acf731f616d 100644 (file)
--- a/templates/de/emails/member/member_newsletter_request.tpl
+++ b/templates/de/emails/member/member_newsletter_request.tpl
@@ -23,4 +23,4 @@ Sobald wir den geforderten Betrag auf unserem Konto sehen, werden wir den Newsle
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 

-{!URL!} ({!WEBMASTER!})
\ No newline at end of file
+{!URL!}/login.php ({!WEBMASTER!})
\ No newline at end of file

diff --git a/templates/de/emails/member/member_newsletter_reset.tpl b/templates/de/emails/member/member_newsletter_reset.tpl
index 80b17f6ef4b95d3224219563f31aea1fd14aaf03..f3cf903a9a86e79ee3bb65d4943ec1a660af5a67 100644 (file)
--- a/templates/de/emails/member/member_newsletter_reset.tpl
+++ b/templates/de/emails/member/member_newsletter_reset.tpl
@@ -15,4 +15,4 @@ Sie wurden automatisch wieder zum Newsletter-Empfang freigegeben.
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 

-{!URL!} ({!WEBMASTER!})
\ No newline at end of file
+{!URL!}/login.php ({!WEBMASTER!})
\ No newline at end of file

diff --git a/templates/de/emails/member/member_payout_accepted.tpl b/templates/de/emails/member/member_payout_accepted.tpl
index 4dc2e0e7f68a983683ea35c7f04dca4971b65e97..a2c7e7888172d6d5f247f080f9659e77df5b161f 100644 (file)
--- a/templates/de/emails/member/member_payout_accepted.tpl
+++ b/templates/de/emails/member/member_payout_accepted.tpl
@@ -22,4 +22,4 @@ Ihre Anfrage wurde hiermit angenommen! Wir werden baldmoeglichst den geforderten
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 

-{!URL!} ({!WEBMASTER!})
\ No newline at end of file
+{!URL!}/login.php ({!WEBMASTER!})
\ No newline at end of file

diff --git a/templates/de/emails/member/member_payout_rejected.tpl b/templates/de/emails/member/member_payout_rejected.tpl
index 877ed1d93db8fd48085beff57e90f556adfa93d0..87f12056ae165b1394f5e7f06ebe220f9ae3c0e6 100644 (file)
--- a/templates/de/emails/member/member_payout_rejected.tpl
+++ b/templates/de/emails/member/member_payout_rejected.tpl
@@ -22,4 +22,4 @@ Ihre Anfrage wurde hiermit abgelehnt! Bitte beachten Sie unsere AGBs. Ihre {!POI
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 

-{!URL!} ({!WEBMASTER!})
\ No newline at end of file
+{!URL!}/login.php ({!WEBMASTER!})
\ No newline at end of file

diff --git a/templates/de/emails/member/member_payout_request.tpl b/templates/de/emails/member/member_payout_request.tpl
index 685a71d20fdcb25a960bf03ef487fffa6d34a2a3..daeb5c590d5eb5848109b3d84d051eeced24524d 100644 (file)
--- a/templates/de/emails/member/member_payout_request.tpl
+++ b/templates/de/emails/member/member_payout_request.tpl
@@ -24,4 +24,4 @@ Sobald wir Ihre Anfrage readaktionell geprueft haben und diese auch korrekt ausg
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 

-{!URL!} ({!WEBMASTER!})
\ No newline at end of file
+{!URL!}/login.php ({!WEBMASTER!})
\ No newline at end of file

diff --git a/templates/de/emails/member/member_payout_request_banner.tpl b/templates/de/emails/member/member_payout_request_banner.tpl
index 33eb138b8c71674cf8b0b5a69bcdcade8c3edb43..dc300f55e48ad23495b5b46c1c861dd681196df3 100644 (file)
--- a/templates/de/emails/member/member_payout_request_banner.tpl
+++ b/templates/de/emails/member/member_payout_request_banner.tpl
@@ -26,4 +26,4 @@ Sobald wir Ihre Anfrage readaktionell geprueft haben und diese auch korrekt ausg
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 

-{!URL!} ({!WEBMASTER!})
\ No newline at end of file
+{!URL!}/login.php ({!WEBMASTER!})
\ No newline at end of file

diff --git a/templates/de/emails/member/member_rallye_expired.tpl b/templates/de/emails/member/member_rallye_expired.tpl
index 0b97a4962dcd4cfa0b8761115dac19b3f605f75a..ac92eaf70c0ecdf3f00c66abf44e2fbc61a420b3 100644 (file)
--- a/templates/de/emails/member/member_rallye_expired.tpl
+++ b/templates/de/emails/member/member_rallye_expired.tpl
@@ -31,4 +31,4 @@ Wichtige Hinweise:
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 

-{!URL!} ({!WEBMASTER!})
+{!URL!}/login.php ({!WEBMASTER!})

diff --git a/templates/de/emails/member/member_rallye_expired_bronce.tpl b/templates/de/emails/member/member_rallye_expired_bronce.tpl
index 826f1a26affb18e9e164b6eaef149aa6f2addacc..e75f144bd60660d505dabd7479c4ca447eaa8bba 100644 (file)
--- a/templates/de/emails/member/member_rallye_expired_bronce.tpl
+++ b/templates/de/emails/member/member_rallye_expired_bronce.tpl
@@ -31,4 +31,4 @@ Wichtige Hinweise:
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 

-{!URL!} ({!WEBMASTER!})
+{!URL!}/login.php ({!WEBMASTER!})

diff --git a/templates/de/emails/member/member_rallye_expired_gold.tpl b/templates/de/emails/member/member_rallye_expired_gold.tpl
index 15ec2226972bf545632d73fe33e6a8604c5b58ca..65a7435ef5a263ea88e1ef2442d0eb91543de4f4 100644 (file)
--- a/templates/de/emails/member/member_rallye_expired_gold.tpl
+++ b/templates/de/emails/member/member_rallye_expired_gold.tpl
@@ -31,4 +31,4 @@ Wichtige Hinweise:
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 

-{!URL!} ({!WEBMASTER!})
+{!URL!}/login.php ({!WEBMASTER!})

diff --git a/templates/de/emails/member/member_rallye_expired_silver.tpl b/templates/de/emails/member/member_rallye_expired_silver.tpl
index 324306e6359c1b0fcaba886d00c2011067c9db12..2adec2869b0cf4c7dadef20bd21db88fa753e8f9 100644 (file)
--- a/templates/de/emails/member/member_rallye_expired_silver.tpl
+++ b/templates/de/emails/member/member_rallye_expired_silver.tpl
@@ -31,4 +31,4 @@ Wichtige Hinweise:
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 

-{!URL!} ({!WEBMASTER!})
+{!URL!}/login.php ({!WEBMASTER!})

diff --git a/templates/de/emails/member/member_rallye_notify.tpl b/templates/de/emails/member/member_rallye_notify.tpl
index 32f63e9b9ac5e9f2a2445d35d8d4d0f0c1cf35b1..345b645a7bb746b9da516c8f9a3b74447486eff7 100644 (file)
--- a/templates/de/emails/member/member_rallye_notify.tpl
+++ b/templates/de/emails/member/member_rallye_notify.tpl
@@ -35,4 +35,4 @@ Wichtig:
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 

-{!URL!} ({!WEBMASTER!})
\ No newline at end of file
+{!URL!}/login.php ({!WEBMASTER!})
\ No newline at end of file

diff --git a/templates/de/emails/member/member_stats_bonus.tpl b/templates/de/emails/member/member_stats_bonus.tpl
index e4f85627fa8e1e28601b3bc50be5c3f8d066c32b..533d32614315c840d94d98a8f08d50632a6e8588 100644 (file)
--- a/templates/de/emails/member/member_stats_bonus.tpl
+++ b/templates/de/emails/member/member_stats_bonus.tpl
@@ -19,4 +19,4 @@ Fuer diese Werbebuchung erhalten Sie nur einmal diese Gutschrift!
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 

-{!URL!} ({!WEBMASTER!})
\ No newline at end of file
+{!URL!}/login.php ({!WEBMASTER!})
\ No newline at end of file

diff --git a/templates/de/emails/member/member_support-order.tpl b/templates/de/emails/member/member_support-order.tpl
index f0af71df8fd837ecee76621ddedf01d9df3a5343..d3882afc0edf3fab1dd1057125663e53afa44170 100644 (file)
--- a/templates/de/emails/member/member_support-order.tpl
+++ b/templates/de/emails/member/member_support-order.tpl
@@ -19,4 +19,4 @@ Einer unserer Mitarbeiter wird sich bald bei Ihnen direkt oder per Support-Syste
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 

-{!URL!} ({!WEBMASTER!})
\ No newline at end of file
+{!URL!}/login.php ({!WEBMASTER!})
\ 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 f0af71df8fd837ecee76621ddedf01d9df3a5343..d3882afc0edf3fab1dd1057125663e53afa44170 100644 (file)
--- a/templates/de/emails/member/member_support-ordr.tpl
+++ b/templates/de/emails/member/member_support-ordr.tpl
@@ -19,4 +19,4 @@ Einer unserer Mitarbeiter wird sich bald bei Ihnen direkt oder per Support-Syste
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 

-{!URL!} ({!WEBMASTER!})
\ No newline at end of file
+{!URL!}/login.php ({!WEBMASTER!})
\ No newline at end of file

diff --git a/templates/de/emails/member/member_support-reflink.tpl b/templates/de/emails/member/member_support-reflink.tpl
index 74c14e728c371bbe76a3595672bc31676bb632e6..5ec63d31746a56866ef8a5f9d320dc47af9388ba 100644 (file)
--- a/templates/de/emails/member/member_support-reflink.tpl
+++ b/templates/de/emails/member/member_support-reflink.tpl
@@ -19,4 +19,4 @@ Einer unserer Mitarbeiter wird sich bald bei Ihnen direkt oder per Support-Syste
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 

-{!URL!} ({!WEBMASTER!})
\ No newline at end of file
+{!URL!}/login.php ({!WEBMASTER!})
\ No newline at end of file

diff --git a/templates/de/emails/member/member_support-unconfirmed.tpl b/templates/de/emails/member/member_support-unconfirmed.tpl
index b1be97bbd0fde8b12882e5677585b78222e50ac4..d3b7b11f2cc59b8db3246fdc2e8f551cc55ddc47 100644 (file)
--- a/templates/de/emails/member/member_support-unconfirmed.tpl
+++ b/templates/de/emails/member/member_support-unconfirmed.tpl
@@ -19,4 +19,4 @@ Einer unserer Mitarbeiter wird sich bald bei Ihnen direkt oder per Support-Syste
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 

-{!URL!} ({!WEBMASTER!})
\ No newline at end of file
+{!URL!}/login.php ({!WEBMASTER!})
\ No newline at end of file

diff --git a/templates/de/emails/member/member_surfbar_url_confirmed.tpl b/templates/de/emails/member/member_surfbar_url_confirmed.tpl
index 368912a911ce6e4e29d2d64984ee0270db18cd67..39786a71b517915a7d7dfb4685d9c53568cb7427 100644 (file)
--- a/templates/de/emails/member/member_surfbar_url_confirmed.tpl
+++ b/templates/de/emails/member/member_surfbar_url_confirmed.tpl
@@ -1,4 +1,4 @@
-{--HELLO--} Mitglied,
+Hallo $content[gender] $content[surname] $content[family],

 
 Ihre gebuchte URL wurde soeben in unserer Surfbar freigegeben.
 
 
 Ihre gebuchte URL wurde soeben in unserer Surfbar freigegeben.
 


@@ -16,4 +16,4 @@ ID in der Surfbar: $content[id]
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 

-{!URL!} ({!WEBMASTER!})
+{!URL!}/login.php ({!WEBMASTER!})

diff --git a/templates/de/emails/member/member_surfbar_url_migrate.tpl b/templates/de/emails/member/member_surfbar_url_migrate.tpl
new file mode 100644 (file)
index 0000000..510cb2d
--- /dev/null
+++ b/templates/de/emails/member/member_surfbar_url_migrate.tpl
@@ -0,0 +1,23 @@
+Hallo $content[gender] $content[surname] $content[family],
+
+durch Freischaltung einer Mailbuchung wurde Ihre gebuche URL in die Surfbar migriert.
+
+Hier sind alle Daten:
+------------------------------------------
+Gebuchte URL: $content[url]
+------------------------------------------
+Ihre User-ID: $content[uid]
+------------------------------------------
+Status: $content[status]
+------------------------------------------
+ID in der Surfbar: $content[insert_id]
+------------------------------------------
+
+Die URL ist jetzt noch nicht in der Surfbar freigeschaltet. Möchten Sie diese freischalten, so loggen Sie sich bitte in den Mitgliedsbereich ein und stimmen Sie diesem zu. Wir werden dann Ihre URL in der Surfbar freigeben.
+
+Sollten Sie diesem nicht zustimmen, so brauchen Sie jetzt nichts weiteres unternehmen. Ihre URL wird dann automatisch entfernt.
+
+Mit freundlichem Gruss,
+  Ihr {!MAIN_TITLE!} Team
+
+{!URL!}/login.php ({!WEBMASTER!})

diff --git a/templates/de/emails/member/member_surfbar_url_reg.tpl b/templates/de/emails/member/member_surfbar_url_reg.tpl
index bef971efeb8faee40b661d84b09400c241efa52a..67f6457b488c058165097ea1d836f4fd2da5035c 100644 (file)
--- a/templates/de/emails/member/member_surfbar_url_reg.tpl
+++ b/templates/de/emails/member/member_surfbar_url_reg.tpl
@@ -1,4 +1,4 @@
-{--HELLO--} Mitglied,
+Hallo $content[gender] $content[surname] $content[family],

 
 Sie haben soeben eine URL in der Surfbar gebucht.
 
 
 Sie haben soeben eine URL in der Surfbar gebucht.
 


@@ -16,4 +16,4 @@ ID in der Surfbar: $content[insert_id]
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 

-{!URL!} ({!WEBMASTER!})
+{!URL!}/login.php ({!WEBMASTER!})

diff --git a/templates/de/emails/member/member_surfbar_url_rejected.tpl b/templates/de/emails/member/member_surfbar_url_rejected.tpl
index 8a0c19e0d468786c291dab77445d72aef2d4bc20..c625b9fce9a00b8df6b3437e85324d0793fce2ac 100644 (file)
--- a/templates/de/emails/member/member_surfbar_url_rejected.tpl
+++ b/templates/de/emails/member/member_surfbar_url_rejected.tpl
@@ -1,4 +1,4 @@
-{--HELLO--} Mitglied,
+Hallo $content[gender] $content[surname] $content[family],

 
 Ihre gebuchte URL wurde von uns in unserer Surfbar abgelehnt. Bitte halten Sie sich an unsere AGBs und binden Sie keine Framekiller in Ihre Webseite ein. Diese stören unsere Surfbar.
 
 
 Ihre gebuchte URL wurde von uns in unserer Surfbar abgelehnt. Bitte halten Sie sich an unsere AGBs und binden Sie keine Framekiller in Ihre Webseite ein. Diese stören unsere Surfbar.
 


@@ -16,4 +16,4 @@ ID in der Surfbar: $content[id]
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 

-{!URL!} ({!WEBMASTER!})
+{!URL!}/login.php ({!WEBMASTER!})

diff --git a/templates/de/emails/member/member_surfbar_url_unlock.tpl b/templates/de/emails/member/member_surfbar_url_unlock.tpl
index 19433a2ac123eecfdaf340bc860a01ab8ee1cda6..320dfcd09f56f641c149b4f16e08bfd3e4d988f2 100644 (file)
--- a/templates/de/emails/member/member_surfbar_url_unlock.tpl
+++ b/templates/de/emails/member/member_surfbar_url_unlock.tpl
@@ -1,4 +1,4 @@
-{--HELLO--} Mitglied,
+Hallo $content[gender] $content[surname] $content[family],

 
 Ihre gebuchte URL wurde soeben in unsere Surfbar aufgenommen.
 
 
 Ihre gebuchte URL wurde soeben in unsere Surfbar aufgenommen.
 


@@ -16,4 +16,4 @@ ID in der Surfbar: $content[insert_id]
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 

-{!URL!} ({!WEBMASTER!})
+{!URL!}/login.php ({!WEBMASTER!})

diff --git a/templates/de/emails/member/member_transfer_recipient.tpl b/templates/de/emails/member/member_transfer_recipient.tpl
index 6ca84e2c7994e2f65ab6409aa36af51c7420bde9..ae1b4ef43b453746ac90319ef81f6f70c638d2ca 100644 (file)
--- a/templates/de/emails/member/member_transfer_recipient.tpl
+++ b/templates/de/emails/member/member_transfer_recipient.tpl
@@ -20,4 +20,4 @@ Sie koennen diese Transaktion {!__TRANSFER_EXPIRES!} noch im Mitgliedsbereich un
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 

-{!URL!} ({!WEBMASTER!})
\ No newline at end of file
+{!URL!}/login.php ({!WEBMASTER!})
\ No newline at end of file

diff --git a/templates/de/emails/member/member_transfer_sender.tpl b/templates/de/emails/member/member_transfer_sender.tpl
index defc6db8427a3dcada2653f8a9b73e5fc0fefd3d..4feedeed8b751eaaa9ec2d82cb8adacfc0b9695e 100644 (file)
--- a/templates/de/emails/member/member_transfer_sender.tpl
+++ b/templates/de/emails/member/member_transfer_sender.tpl
@@ -20,4 +20,4 @@ Sie koennen diese Transaktion {!__TRANSFER_EXPIRES!} noch im Mitgliedsbereich un
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 

-{!URL!} ({!WEBMASTER!})
\ No newline at end of file
+{!URL!}/login.php ({!WEBMASTER!})
\ No newline at end of file

diff --git a/templates/de/emails/member/member_wernis_accepted.tpl b/templates/de/emails/member/member_wernis_accepted.tpl
index 4dc2e0e7f68a983683ea35c7f04dca4971b65e97..a2c7e7888172d6d5f247f080f9659e77df5b161f 100644 (file)
--- a/templates/de/emails/member/member_wernis_accepted.tpl
+++ b/templates/de/emails/member/member_wernis_accepted.tpl
@@ -22,4 +22,4 @@ Ihre Anfrage wurde hiermit angenommen! Wir werden baldmoeglichst den geforderten
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 

-{!URL!} ({!WEBMASTER!})
\ No newline at end of file
+{!URL!}/login.php ({!WEBMASTER!})
\ No newline at end of file

diff --git a/templates/de/emails/member/member_wernis_rejected.tpl b/templates/de/emails/member/member_wernis_rejected.tpl
index a0f55e54e8c19bbc6188c80f4a17c9c2424223ff..4bf9320ca7c01279627698fcda9d2a849fd578fe 100644 (file)
--- a/templates/de/emails/member/member_wernis_rejected.tpl
+++ b/templates/de/emails/member/member_wernis_rejected.tpl
@@ -22,4 +22,4 @@ Ihre Anfrage wurde hiermit abgelehnt! Bitte beachten Sie unsere AGBs. Ihre Werni
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 

-{!URL!} ({!WEBMASTER!})
\ No newline at end of file
+{!URL!}/login.php ({!WEBMASTER!})
\ No newline at end of file

diff --git a/templates/de/emails/member/member_wernis_request.tpl b/templates/de/emails/member/member_wernis_request.tpl
index 27427bdc2e08f4aa584680f62c89db802cc4c0e0..38e9bd591ee9e65d7ef67429efb37baa89abf494 100644 (file)
--- a/templates/de/emails/member/member_wernis_request.tpl
+++ b/templates/de/emails/member/member_wernis_request.tpl
@@ -22,4 +22,4 @@ Sie sollten soeben eine Aufbuchung auf Ihrem WDS66-Hauptaccount erhalten haben!
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 

-{!URL!} ({!WEBMASTER!})
\ No newline at end of file
+{!URL!}/login.php ({!WEBMASTER!})
\ No newline at end of file

diff --git a/templates/de/emails/order-accept.tpl b/templates/de/emails/order-accept.tpl
index 580123354356cc409e557c395ca3917debfbdf24..4341394e1f8e4235040b5dc3a686cd10e2c28a7e 100644 (file)
--- a/templates/de/emails/order-accept.tpl
+++ b/templates/de/emails/order-accept.tpl
@@ -1,4 +1,4 @@
-Hallo $content[gender] $content[surname], $content[family],
+Hallo $content[gender] $content[surname] $content[family],

 
 Einer unserer Administratoren hat soeben Ihre Mailbuchung freigegeben. Sie wird von unserem System automatisch versendet! Bitte beachten Sie, dass dies ggf. zeitversetzt zu dieser Mail versendet wird. Hier sind nochmals URL und Betreff Ihrer Mailbuchung:
 
 
 Einer unserer Administratoren hat soeben Ihre Mailbuchung freigegeben. Sie wird von unserem System automatisch versendet! Bitte beachten Sie, dass dies ggf. zeitversetzt zu dieser Mail versendet wird. Hier sind nochmals URL und Betreff Ihrer Mailbuchung:
 

diff --git a/templates/de/emails/order_accept_sb.tpl b/templates/de/emails/order_accept_sb.tpl
deleted file mode 100644 (file)
index bae215b..0000000
--- a/templates/de/emails/order_accept_sb.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-Hallo $content[gender] $content[surname], $content[family],
-
-Einer unserer Administratoren hat soeben Ihre Mailbuchung freigegeben. Sie wird von unserem System automatisch versendet! Bitte beachten Sie, dass dies ggf. zeitversetzt zu dieser Mail versendet wird. Hier sind nochmals URL und Betreff Ihrer Mailbuchung:
-
------------------------------
-Beworbene URL: $DATA[url]
------------------------------
-Betreffzeile: $DATA[subject]
------------------------------
-
-Sie koennen den Versand-Fortschritt im Mitgliedsmenue unter "Unbestaetigte Mails" verfolgen. Sobald die Mail vollstaendig versendet wurde, erhalten Sie eine weitere Mail!
-
-Ihre URL wurde zusätzlich unter der Id-Nummer $content für die Surfbar freigegeben.
-
-Vielen Dank.
-
-Mit freundlichem Gruss,
-  Ihr {!MAIN_TITLE!} Team
-
-{!URL!} ({!WEBMASTER!})

diff --git a/templates/de/html/admin/admin_add_points.tpl b/templates/de/html/admin/admin_add_points.tpl
index 7a41031a961cf2a7d93c95eddf9e107f81f4f5e4..20b0682cc1c8c124b1078020579e4c296f9a0899 100644 (file)
--- a/templates/de/html/admin/admin_add_points.tpl
+++ b/templates/de/html/admin/admin_add_points.tpl
@@ -37,13 +37,14 @@
                <TD height="5" colspan="3" class="seperator">&nbsp;</TD>
        </TR>
        <TR>
                <TD height="5" colspan="3" class="seperator">&nbsp;</TD>
        </TR>
        <TR>

-               <TD colspan="3" align="center"><INPUT type="reset"
-                       class="admin_reset" value="{--CLEAR_FORM--}">&nbsp;*&nbsp;<INPUT
-                       type="submit" class="admin_submit" name="ok"
-                       value="{--ADMIN_ADD_POINTS--}"></TD>
+               <TD height="5" colspan="3" class="seperator bottom2">&nbsp;</TD>

        </TR>
        <TR>
        </TR>
        <TR>

-               <TD height="10" colspan="3" class="seperator">&nbsp;</TD>
+               <TD colspan="3" align="center" class="admin_footer"><INPUT type="reset"
+                       class="admin_reset" value="{--CLEAR_FORM--}">&nbsp;*&nbsp;<INPUT
+                       type="submit" class="admin_submit" name="ok"
+                       value="{--ADMIN_ADD_POINTS--}">
+               </TD>

        </TR>
 </TABLE>
 </FORM>
        </TR>
 </TABLE>
 </FORM>

diff --git a/templates/de/html/admin/admin_add_points_all.tpl b/templates/de/html/admin/admin_add_points_all.tpl
index de3032f2870a47cb06809daa50ed818c0cfdd0a3..47cb68c5d04a431be38dd80ef37bfee4d3db8aaa 100644 (file)
--- a/templates/de/html/admin/admin_add_points_all.tpl
+++ b/templates/de/html/admin/admin_add_points_all.tpl
@@ -34,13 +34,13 @@
                <TD height="5" colspan="3" class="seperator">&nbsp;</TD>
        </TR>
        <TR>
                <TD height="5" colspan="3" class="seperator">&nbsp;</TD>
        </TR>
        <TR>

-               <TD colspan="3" align="center"><INPUT type="reset"
+               <TD height="5" colspan="3" class="seperator bottom2">&nbsp;</TD>
+       </TR>
+       <TR>
+               <TD colspan="3" align="center" class="admin_footer"><INPUT type="reset"

                        class="admin_reset" value="{--CLEAR_FORM--}">&nbsp;*&nbsp;<INPUT
                        type="submit" class="admin_submit" name="ok"
                        value="{--ADMIN_ADD_POINTS--}"></TD>
        </TR>
                        class="admin_reset" value="{--CLEAR_FORM--}">&nbsp;*&nbsp;<INPUT
                        type="submit" class="admin_submit" name="ok"
                        value="{--ADMIN_ADD_POINTS--}"></TD>
        </TR>

-       <TR>
-               <TD height="10" colspan="3" class="seperator">&nbsp;</TD>
-       </TR>

 </TABLE>
 </FORM>
 </TABLE>
 </FORM>

diff --git a/templates/de/html/admin/admin_config_surfbar.tpl b/templates/de/html/admin/admin_config_surfbar.tpl
index 8af5f8ea85126bcd5e428387395e3428fccbaabf..ced6bea0d588d8a9f6af3bdacbe789937c3eea04 100644 (file)
--- a/templates/de/html/admin/admin_config_surfbar.tpl
+++ b/templates/de/html/admin/admin_config_surfbar.tpl
@@ -1,5 +1,5 @@
 <FORM action="{!URL!}/modules.php?module=admin&amp;what=config_surfbar" method="POST">
 <FORM action="{!URL!}/modules.php?module=admin&amp;what=config_surfbar" method="POST">

-<TABLE border="0" cellspacing="0" cellpadding="0" width="400" class="admin_table dashed" align="center">
+<TABLE border="0" cellspacing="0" cellpadding="0" width="500" class="admin_table dashed" align="center">

        <TR>
                <TD colspan="2" align="center" class="admin_title bottom2" height="30">
                        <STRONG>{--ADMIN_CONFIG_SURFBAR_TITLE--}</STRONG>
        <TR>
                <TD colspan="2" align="center" class="admin_title bottom2" height="30">
                        <STRONG>{--ADMIN_CONFIG_SURFBAR_TITLE--}</STRONG>


@@ -7,10 +7,10 @@
        </TR>
        <TR><TD height="3" colspan="2" class="seperator">&nbsp;</TD></TR>
        <TR>
        </TR>
        <TR><TD height="3" colspan="2" class="seperator">&nbsp;</TD></TR>
        <TR>

-               <TD width="75%" height="30" align="right" style="padding-right:5px">
+               <TD width="70%" height="30" align="right" style="padding-right:5px">

                        {--ADMIN_CONFIG_SURFBAR_STATIC_REWARD--}
                </TD>
                        {--ADMIN_CONFIG_SURFBAR_STATIC_REWARD--}
                </TD>

-               <TD width="25%">
+               <TD width="30%">

                        <INPUT type="text" name="surfbar_static_reward" size="6" maxlength="20" value="$content[surfbar_static_reward]" /> {!POINTS!}
                </TD>
        </TR>
                        <INPUT type="text" name="surfbar_static_reward" size="6" maxlength="20" value="$content[surfbar_static_reward]" /> {!POINTS!}
                </TD>
        </TR>


@@ -95,12 +95,13 @@
                        <INPUT type="text" name="surfbar_purge_migrated" size="6" maxlength="20" value="$content[surfbar_purge_migrated]" />
                </TD>
        </TR>
                        <INPUT type="text" name="surfbar_purge_migrated" size="6" maxlength="20" value="$content[surfbar_purge_migrated]" />
                </TD>
        </TR>

-       <TR><TD height="8" colspan="2" class="seperator bottom2">&nbsp;</TD></TR>
+       <TR><TD height="3" colspan="2" class="seperator bottom2">&nbsp;</TD></TR>

        <TR>
                <TD align="center" colspan="2" class="admin_footer bottom2">
        <TR>
                <TD align="center" colspan="2" class="admin_footer bottom2">

-                       {--ADMIN_CONFIG_SURFBAR_PAYMENT_MODEL--}
+                       <strong>{--ADMIN_CONFIG_SURFBAR_PAYMENT_MODEL--}</strong>

                </TD>
        </TR>
                </TD>
        </TR>

+       <TR><TD height="3" colspan="2" class="seperator">&nbsp;</TD></TR>

        <TR>
                <TD height="30" align="right" style="padding-right:5px">
                        {--ADMIN_CONFIG_SURFBAR_PAYMENT_MODEL_STATIC--}
        <TR>
                <TD height="30" align="right" style="padding-right:5px">
                        {--ADMIN_CONFIG_SURFBAR_PAYMENT_MODEL_STATIC--}


@@ -118,19 +119,89 @@
                </TD>
        </TR>
        <TR><TD height="3" colspan="2" class="seperator bottom2">&nbsp;</TD></TR>
                </TD>
        </TR>
        <TR><TD height="3" colspan="2" class="seperator bottom2">&nbsp;</TD></TR>

+       <TR>
+               <TD align="center" colspan="2" class="admin_footer bottom2">
+                       {--ADMIN_CONFIG_SURFBAR_PAUSE_MODE--}
+               </TD>
+       </TR>
+       <TR><TD height="3" colspan="2" class="seperator">&nbsp;</TD></TR>
+       <TR>
+               <TD height="30" align="right" style="padding-right:5px">
+                       {--ADMIN_CONFIG_SURFBAR_PAUSE_MODE_INTERNAL--}
+               </TD>
+               <TD>
+                       <INPUT type="radio" name="surfbar_pause_mode" value="INTERNAL"{!__CONFIG_SURFBAR_PAUSE_MODE_INTERNAL!} />
+               </TD>
+       </TR>
+       <TR>
+               <TD height="30" align="right" style="padding-right:5px">
+                       {--ADMIN_CONFIG_SURFBAR_PAUSE_MODE_EXTERNAL--}
+               </TD>
+               <TD>
+                       <INPUT type="radio" name="surfbar_pause_mode" value="EXTERNAL"{!__CONFIG_SURFBAR_PAUSE_MODE_EXTERNAL!} />
+               </TD>
+       </TR>
+       <TR><TD height="3" colspan="2" class="seperator">&nbsp;</TD></TR>
+       <TR>
+               <TD height="30" align="right" style="padding-right:5px">
+                       {--ADMIN_CONFIG_SURFBAR_PAUSE_URL--}
+               </TD>
+               <TD>
+                       <INPUT type="text" name="surfbar_pause_url" size="15" maxlength="255" value="$content[surfbar_pause_url]" />
+               </TD>
+       </TR>
+       <TR><TD height="3" colspan="2" class="seperator">&nbsp;</TD></TR>
+       <TR><TD height="3" colspan="2" class="seperator bottom2">&nbsp;</TD></TR>

        <TR>
                <TD height="30" align="center" colspan="2" class="admin_footer bottom2">
                        {--ADMIN_CONFIG_SURFBAR_AUTOSTART--}
                </TD>
        </TR>
        <TR>
                <TD height="30" align="center" colspan="2" class="admin_footer bottom2">
                        {--ADMIN_CONFIG_SURFBAR_AUTOSTART--}
                </TD>
        </TR>

-       <TR><TD height="8" colspan="2" class="seperator">&nbsp;</TD></TR>
+       <TR><TD height="3" colspan="2" class="seperator">&nbsp;</TD></TR>

        <TR>
                <TD align="center" colspan="2">
                        <INPUT type="radio" name="surfbar_autostart" value="Y"{!__CONFIG_SURFBAR_AUTOSTART_Y!} />&nbsp;{--YES--}
                        <INPUT type="radio" name="surfbar_autostart" value="N"{!__CONFIG_SURFBAR_AUTOSTART_N!} />&nbsp;{--NO--}
                </TD>
        </TR>
        <TR>
                <TD align="center" colspan="2">
                        <INPUT type="radio" name="surfbar_autostart" value="Y"{!__CONFIG_SURFBAR_AUTOSTART_Y!} />&nbsp;{--YES--}
                        <INPUT type="radio" name="surfbar_autostart" value="N"{!__CONFIG_SURFBAR_AUTOSTART_N!} />&nbsp;{--NO--}
                </TD>
        </TR>

-       <TR><TD height="8" colspan="2" class="seperator bottom2">&nbsp;</TD></TR>
+       <TR><TD height="3" colspan="2" class="seperator">&nbsp;</TD></TR>
+       <TR><TD height="3" colspan="2" class="seperator bottom2">&nbsp;</TD></TR>
+       <TR>
+               <TD height="30" align="center" colspan="2" class="admin_footer bottom2">
+                       {--ADMIN_CONFIG_SURFBAR_NOTIFY_LIMITS--}
+               </TD>
+       </TR>
+       <TR><TD height="3" colspan="2" class="seperator">&nbsp;</TD></TR>
+       <TR>
+               <TD align="center" colspan="2">
+                       <INPUT type="radio" name="surfbar_notify_limits" value="Y"{!__CONFIG_SURFBAR_NOTIFY_LIMITS_Y!} />&nbsp;{--YES--}
+                       <INPUT type="radio" name="surfbar_notify_limits" value="N"{!__CONFIG_SURFBAR_NOTIFY_LIMITS_N!} />&nbsp;{--NO--}
+               </TD>
+       </TR>
+       <TR><TD height="3" colspan="2" class="seperator bottom2">&nbsp;</TD></TR>
+       <TR><TD height="3" colspan="2" class="seperator">&nbsp;</TD></TR>
+       <TR>
+               <TD height="30" align="right" style="padding-right:5px">
+                       {--ADMIN_CONFIG_SURFBAR_WARN_LOW_POINTS--}
+               </TD>
+               <TD>
+                       <INPUT type="text" name="surfbar_warn_low_points" size="5" maxlength="20" value="$content[surfbar_warn_low_points]" /> {!POINTS!}
+               </TD>
+       </TR>
+       <TR><TD height="3" colspan="2" class="seperator bottom2">&nbsp;</TD></TR>
+       <TR>
+               <TD height="30" align="center" colspan="2" class="admin_footer bottom2">
+                       {--ADMIN_CONFIG_SURFBAR_MIGRATE_ORDER--}
+               </TD>
+       </TR>
+       <TR><TD height="3" colspan="2" class="seperator">&nbsp;</TD></TR>
+       <TR>
+               <TD align="center" colspan="2">
+                       <INPUT type="radio" name="surfbar_migrate_order" value="Y"{!__CONFIG_SURFBAR_MIGRATE_ORDER_Y!} />&nbsp;{--YES--}
+                       <INPUT type="radio" name="surfbar_migrate_order" value="N"{!__CONFIG_SURFBAR_MIGRATE_ORDER_N!} />&nbsp;{--NO--}
+               </TD>
+       </TR>
+       <TR><TD height="3" colspan="2" class="seperator bottom2">&nbsp;</TD></TR>

        <TR>
                <TD colspan="2" class="admin_footer">
                        <INPUT type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />&nbsp;*
        <TR>
                <TD colspan="2" class="admin_footer">
                        <INPUT type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />&nbsp;*

diff --git a/templates/de/html/admin/admin_member_selection_box.tpl b/templates/de/html/admin/admin_member_selection_box.tpl
index d0bec7a6f360cc715bf7026a61e906f351ebfc14..ff854290158a1f2bc00358895bfc7b39eb96dc24 100644 (file)
--- a/templates/de/html/admin/admin_member_selection_box.tpl
+++ b/templates/de/html/admin/admin_member_selection_box.tpl
@@ -1,26 +1,34 @@
 <FORM action="{!URL!}/modules.php" method="GET">
 <FORM action="{!URL!}/modules.php" method="GET">

-<TABLE border="0" cellspacing="0" cellpadding="0" width="500"
-       align="center" class="admin_table dashed">
+<TABLE border="0" cellspacing="0" cellpadding="0" width="500" align="center" class="admin_table dashed">

        <TR>
        <TR>

-               <TD height="10" class="seperator">&nbsp;</TD>
+               <TD class="admin_title bottom2" height="25">
+                       <strong>{--ADMIN_SELECTION_BOX_TITLE--}</strong>
+               </TD>

        </TR>
        <TR>
        </TR>
        <TR>

-               <TD align="center"><INPUT type="hidden" name="module"
-                       value="admin"> <INPUT type="hidden" name="what"
-                       value="$content"> {--ADMIN_SELECT_USERID--}: <SELECT
-                       name="u_id" size="1" class="admin_select">
-                       {!_MEMBER_SELECTION!}
-               </SELECT></TD>
+               <TD height="7" class="seperator">&nbsp;</TD>

        </TR>
        <TR>
        </TR>
        <TR>

-               <TD height="5" class="seperator">&nbsp;</TD>
+               <TD align="center">
+                       <INPUT type="hidden" name="module" value="admin" />
+                       <INPUT type="hidden" name="what" value="$content" />
+                       {--ADMIN_SELECT_USER--}:
+                       <SELECT name="u_id" size="1" class="admin_select">
+                               {!_MEMBER_SELECTION!}
+                       </SELECT>
+               </TD>

        </TR>
        <TR>
        </TR>
        <TR>

-               <TD align="center"><INPUT type="submit" class="admin_submit"
-                       value="{--ADMIN_SELECT_USER--}"></TD>
+               <TD height="3" class="seperator">&nbsp;</TD>

        </TR>
        <TR>
        </TR>
        <TR>

-               <TD height="10" class="seperator">&nbsp;</TD>
+               <TD height="5" class="seperator bottom2">&nbsp;</TD>
+       </TR>
+       <TR>
+               <TD align="center" class="admin_footer">
+                       <INPUT type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />
+                       <INPUT type="submit" class="admin_submit" value="{--ADMIN_DO_ACTION--}" />
+               </TD>

        </TR>
 </TABLE>
 </FORM>
        </TR>
 </TABLE>
 </FORM>

diff --git a/templates/de/html/admin/admin_sub_points.tpl b/templates/de/html/admin/admin_sub_points.tpl
index fc631bc9cc9912dfd1f93f8f00390061e710b131..e6ade6363674bbccf512488c31e08b8f1dbd1dce 100644 (file)
--- a/templates/de/html/admin/admin_sub_points.tpl
+++ b/templates/de/html/admin/admin_sub_points.tpl
@@ -33,16 +33,16 @@
                        cols="20"></TEXTAREA></TD>
        </TR>
        <TR>
                        cols="20"></TEXTAREA></TD>
        </TR>
        <TR>

-               <TD height="5" colspan="3" class="seperator">&nbsp;</TD>
+               <TD height="3" colspan="3" class="seperator">&nbsp;</TD>
+       </TR>
+       <TR>
+               <TD height="5" colspan="3" class="seperator bottom2">&nbsp;</TD>

        </TR>
        <TR>
        </TR>
        <TR>

-               <TD colspan="3" align="center"><INPUT type="reset"
+               <TD colspan="3" align="center" class="admin_footer"><INPUT type="reset"

                        class="admin_reset" value="{--CLEAR_FORM--}">&nbsp;*&nbsp;<INPUT
                        type="submit" class="admin_submit" name="ok"
                        value="{--ADMIN_SUB_POINTS--}"></TD>
        </TR>
                        class="admin_reset" value="{--CLEAR_FORM--}">&nbsp;*&nbsp;<INPUT
                        type="submit" class="admin_submit" name="ok"
                        value="{--ADMIN_SUB_POINTS--}"></TD>
        </TR>

-       <TR>
-               <TD height="10" colspan="3" class="seperator">&nbsp;</TD>
-       </TR>

 </TABLE>
 </FORM>
 </TABLE>
 </FORM>

diff --git a/templates/de/html/admin/admin_sub_points_all.tpl b/templates/de/html/admin/admin_sub_points_all.tpl
index aca6d845aee71ee8b262c15b8d3a448661cb7449..ee6964e4bd3e6c98f67cffbf5223da2f814da4e5 100644 (file)
--- a/templates/de/html/admin/admin_sub_points_all.tpl
+++ b/templates/de/html/admin/admin_sub_points_all.tpl
@@ -31,16 +31,16 @@
                        cols="20"></TEXTAREA></TD>
        </TR>
        <TR>
                        cols="20"></TEXTAREA></TD>
        </TR>
        <TR>

-               <TD height="5" colspan="3" class="seperator">&nbsp;</TD>
+               <TD height="3" colspan="3" class="seperator">&nbsp;</TD>
+       </TR>
+       <TR>
+               <TD height="5" colspan="3" class="seperator bottom2">&nbsp;</TD>

        </TR>
        <TR>
        </TR>
        <TR>

-               <TD colspan="3" align="center"><INPUT type="reset"
+               <TD colspan="3" align="center" class="admin_footer"><INPUT type="reset"

                        class="admin_reset" value="{--CLEAR_FORM--}">&nbsp;*&nbsp;<INPUT
                        type="submit" class="admin_submit" name="ok"
                        value="{--ADMIN_SUB_POINTS--}"></TD>
        </TR>
                        class="admin_reset" value="{--CLEAR_FORM--}">&nbsp;*&nbsp;<INPUT
                        type="submit" class="admin_submit" name="ok"
                        value="{--ADMIN_SUB_POINTS--}"></TD>
        </TR>

-       <TR>
-               <TD height="10" colspan="3" class="seperator">&nbsp;</TD>
-       </TR>

 </TABLE>
 </FORM>
 </TABLE>
 </FORM>

diff --git a/templates/de/html/member/member_order_send.tpl b/templates/de/html/member/member_order_send.tpl
index b869a7c7eb9b1dbb56e0083f2186726cb5c90748..7da55b59d5b4a11cf415b0d96b23e4dc21bc6304 100644 (file)
--- a/templates/de/html/member/member_order_send.tpl
+++ b/templates/de/html/member/member_order_send.tpl
@@ -1,4 +1,33 @@
-<FORM action="{!URL!}/modules.php?module=order&amp;order=$content"
-       method="POST" target="_parent"><INPUT type="submit"
-       class="member_submit" name="ok" value="{--MEMBER_DO_ORDER--}">
-</FORM>
\ No newline at end of file
+<form id="form" action="{!URL!}/modules.php?module=order&amp;order=$content" method="POST" target="_parent" onsubmit="return Submit()">
+{--MEMBER_ORDER_PLEASE_WAIT_1--}<span id="counter" style="font-weight:bold">10</span>{--MEMBER_ORDER_PLEASE_WAIT_2--}<br />
+<input type="submit" class="member_submit" id="ok" name="ok" value="{--MEMBER_DO_ORDER--}" />
+<script language="JavaScript" type="text/javascript">
+<!--
+var counter = document.getElementById('counter');
+var form    = document.getElementById('form');
+var ok      = document.getElementById('ok');
+
+function Submit() {
+       if (counter.innerHTML > 0) {
+               alert('{--MEMBER_ORDER_PLEASE_WAIT_TESTER--}');
+               return false;
+       } else {
+               form.submit();
+       }
+}
+
+function Counter() {
+       if (counter.innerHTML == 1) {
+               ok.value='{--MEMBER_DO_ORDER--}';
+               window.clearInterval(interval);
+       }
+
+       counter.innerHTML--;
+}
+
+ok.value='{--MEMBER_ORDER_TEST_STARTED--}';
+var interval = window.setInterval("Counter()", 1000);
+
+//-->
+</script>
+</form>

diff --git a/templates/de/html/member/member_pool_row.tpl b/templates/de/html/member/member_pool_row.tpl
new file mode 100644 (file)
index 0000000..4c90d52
--- /dev/null
+++ b/templates/de/html/member/member_pool_row.tpl
@@ -0,0 +1,42 @@
+<TR>
+       <TD class="switch_mem$content[sw] top2 right" width="30%" align="center">
+               {--EMAIL_ID--}:<br />
+               <STRONG>$content[id]</STRONG>
+       </TD>
+       <TD class="switch_mem$content[sw] top2 right2" width="40%" align="center">
+               {--EMAIL_SUBJECT--}:<br />
+               <STRONG>$content[subj]</STRONG>
+       </TD>
+       <TD class="switch_mem$content[sw] top2" width="30%" align="center">
+               {--EMAIL_TIMESTAMP--}:<br />
+               <STRONG>$content[stamp]</STRONG>
+       </TD>
+</TR>
+<TR>
+       <TD align="center" class="switch_mem$content[sw] top right">
+               {--EMAIL_PAYMENT--}:<br />
+               <STRONG>$content[pay]</STRONG>
+       </TD>
+       <TD align="center" class="switch_mem$content[sw] top right">
+               {--EMAIL_CATEGORY--}:<br />
+               <STRONG>$content[cat]</STRONG>
+       </TD>
+       <TD align="center" class="switch_mem$content[sw] top">
+               {--EMAIL_URL--}:<br />
+               <STRONG><A href="$content[url]" target="_blank">{--MEMBER_TEST_URL--}</A></STRONG>
+       </TD>
+</TR>
+<TR>
+       <TD align="center" class="switch_mem$content[sw] top right">
+               {--EMAIL_RECEIVERS--}:<br />
+               <STRONG>$content[recs]</STRONG>
+       </TD>
+       <TD align="center" class="switch_mem$content[sw] top right">
+               {--EMAIL_TYPE--}:<br />
+               <STRONG>$content[type]</STRONG>
+       </TD>
+       <TD align="center" class="switch_mem$content[sw] top">
+               {--EMAIL_ZIP--}:<br />
+               <STRONG>$content[zip]</STRONG>
+       </TD>
+</TR>

diff --git a/templates/de/html/member/member_pool_table.tpl b/templates/de/html/member/member_pool_table.tpl
new file mode 100644 (file)
index 0000000..e0c2777
--- /dev/null
+++ b/templates/de/html/member/member_pool_table.tpl
@@ -0,0 +1,8 @@
+<TABLE border="0" cellspacing="0" cellpadding="0" align="center" class="member_table dashed">
+<TR>
+       <TD colspan="3" align="center" height="25" class="member_header">
+               <STRONG class="member_done">{--MEMBER_POOL_CONTENT--}</STRONG>
+       </TD>
+</TR>
+$content
+</TABLE>

diff --git a/templates/de/html/member/member_stats_pool.tpl b/templates/de/html/member/member_stats_pool.tpl
new file mode 100644 (file)
index 0000000..d6befca
--- /dev/null
+++ b/templates/de/html/member/member_stats_pool.tpl
@@ -0,0 +1,3 @@
+$content[pool]
+<br />
+$content[stats]

diff --git a/templates/de/html/member/member_stats_row.tpl b/templates/de/html/member/member_stats_row.tpl
index 3f6ea7ecd85aeffc96f9add87bdb9e560b07a75d..adb81f0fb7ba057b09a1ad25ad24128c54994d13 100644 (file)
--- a/templates/de/html/member/member_stats_row.tpl
+++ b/templates/de/html/member/member_stats_row.tpl
@@ -1,36 +1,44 @@
 <TR>
 <TR>

-       <TD class="switch_mem$content[sw] top2 right" width="46%" colspan="2"
-               align="center">{--EMAIL_SUBJECT--}:<br />
-       <STRONG>$content[subj]</STRONG></TD>
+       <TD class="switch_mem$content[sw] top2 right" width="46%" colspan="2" align="center">
+               {--EMAIL_SUBJECT--}:<br />
+               <STRONG>$content[subj]</STRONG>
+       </TD>

        <TD class="switch_mem$content[sw] top2" width="54%" align="center">
        <TD class="switch_mem$content[sw] top2" width="54%" align="center">

-       {--EMAIL_TIMESTAMP--}:<br />
-       <STRONG>$content[stamp]</STRONG></TD>
+               {--EMAIL_TIMESTAMP--}:<br />
+               <STRONG>$content[stamp]</STRONG>
+       </TD>

 </TR>
 <TR>
        <TD colspan="2" align="center" class="switch_mem$content[sw] top right">
 </TR>
 <TR>
        <TD colspan="2" align="center" class="switch_mem$content[sw] top right">

-       {--EMAIL_PAYMENT--}:<br />
-       <STRONG>$content[pay]</STRONG></TD>
+               {--EMAIL_PAYMENT--}:<br />
+               <STRONG>$content[pay]</STRONG>
+       </TD>

        <TD align="center" class="switch_mem$content[sw] top">
        <TD align="center" class="switch_mem$content[sw] top">

-       {--EMAIL_CATEGORY--}:<br />
-       <STRONG>$content[cat]</STRONG></TD>
+               {--EMAIL_CATEGORY--}:<br />
+               <STRONG>$content[cat]</STRONG>
+       </TD>

 </TR>
 <TR>
        <TD colspan="2" align="center" class="switch_mem$content[sw] top right">
 </TR>
 <TR>
        <TD colspan="2" align="center" class="switch_mem$content[sw] top right">

-       {--EMAIL_URL--}:<br />
-       <STRONG><A href="$content[url]" target="_blank">{--MEMBER_TEST_URL--}</A></STRONG>
+               {--EMAIL_URL--}:<br />
+               <STRONG><A href="$content[url]" target="_blank">{--MEMBER_TEST_URL--}</A></STRONG>

        </TD>
        <TD align="center" class="switch_mem$content[sw] top">
        </TD>
        <TD align="center" class="switch_mem$content[sw] top">

-       {--EMAIL_END_SEND--}:<br />
-       <STRONG>$content[sent]</STRONG></TD>
+               {--EMAIL_END_SEND--}:<br />
+               <STRONG>$content[sent]</STRONG>
+       </TD>

 </TR>
 <TR>
 </TR>
 <TR>

-       <TD align="center" class="switch_mem$content[sw] top right" width="23%">
-       {--EMAIL_RECEIVERS--}:<br />
-       <STRONG>$content[recs]</STRONG></TD>
-       <TD align="center" class="switch_mem$content[sw] top right" width="23%">
-       {--EMAIL_CONFIRMED--}:<br />
-       <STRONG>$content[clix]</STRONG></TD>
+       <TD align="center" class="switch_mem$content[sw] top right" width="30%">
+               {--EMAIL_RECEIVERS--}:<br />
+               <STRONG>$content[recs]</STRONG>
+       </TD>
+       <TD align="center" class="switch_mem$content[sw] top right" width="16%">
+               {--EMAIL_CONFIRMED--}:<br />
+               <STRONG>$content[clix]</STRONG>
+       </TD>

        <TD align="center" class="switch_mem$content[sw] top">
        <TD align="center" class="switch_mem$content[sw] top">

-       {--EMAIL_PERCENT--}:<br />
-       <STRONG>$content[perc]</STRONG></TD>
+               {--EMAIL_PERCENT--}:<br />
+               <STRONG>$content[perc]</STRONG>
+       </TD>

 </TR>
 </TR>

diff --git a/templates/de/html/member/member_stats_table.tpl b/templates/de/html/member/member_stats_table.tpl
index 2b2f078dec5f0bfa0b68f6f39a8f269b27409866..029b355132bde3d873c2e5c5e1704f4013fc72d1 100644 (file)
--- a/templates/de/html/member/member_stats_table.tpl
+++ b/templates/de/html/member/member_stats_table.tpl
@@ -1,8 +1,8 @@
-<TABLE border="0" cellspacing="0" cellpadding="0" align="center" class="member_misc dashed">
+<TABLE border="0" cellspacing="0" cellpadding="0" align="center" class="member_table dashed">

 <TR>
        <TD colspan="3" align="center" height="25" class="member_header">
 <TR>
        <TD colspan="3" align="center" height="25" class="member_header">

-               <STRONG class="member_done">{--MEMBER_POOL_CONTENT--}</STRONG>
+               <STRONG class="member_done">{--MEMBER_STATS_CONTENT--}</STRONG>

        </TD>
 </TR>
        </TD>
 </TR>

-{!__STATS_ROWS!}
+$content

 </TABLE>
 </TABLE>

diff --git a/templates/de/html/member/member_surfbar_book_dynamic.tpl b/templates/de/html/member/member_surfbar_book_dynamic.tpl
index 3ad33dad596f06703f797918d3a05f6e0935aee6..91960585da90fb0601ce3edcec708a984cb47b70 100644 (file)
--- a/templates/de/html/member/member_surfbar_book_dynamic.tpl
+++ b/templates/de/html/member/member_surfbar_book_dynamic.tpl
@@ -1,11 +1,21 @@
-<form action="{!URL!}/modules.php?module=login&amp;what=surfbar_book" method="post">
+<form id="book" action="{!URL!}/modules.php?module=login&amp;what=surfbar_book" method="post" onsubmit="return SubmitForm()" onreset="return ResetForm()">

 <div class="member_table dashed" style="width:600px;margin-top:10px">
        <div class="member_title2 bottom2" style="padding-top:5px;padding-bottom:5px">
                <strong>URL in Surfbar buchen - Dynamisch:</strong>
        </div>
 
 <div class="member_table dashed" style="width:600px;margin-top:10px">
        <div class="member_title2 bottom2" style="padding-top:5px;padding-bottom:5px">
                <strong>URL in Surfbar buchen - Dynamisch:</strong>
        </div>
 

+       <div class="member_input bottom2" style="padding-top:5px;padding-bottom:5px">
+               URL eingeben: <input class="member_normal" type="text" name="url" size="20" maxlength="255" value="http://" />
+       </div>
+

        <div class="member_input" style="padding-top:5px;padding-bottom:5px">
        <div class="member_input" style="padding-top:5px;padding-bottom:5px">

-               URL eingeben: <input type="text" name="url" size="20" maxlength="255" value="http://" />
+               Soll die Anzahl Aufrufe begrenzt werden?<br />
+               <input type="radio" id="limited_no" onfocus="return FocusLimitedNo()" name="limited" value="N" checked="checked" /> {--NO--}
+               <input type="radio" id="limited_yes" onfocus="return FocusLimitedYes()" name="limited" value="Y" /> {--YES--}
+       </div>
+
+       <div class="member_input bottom2" style="padding-top:5px;padding-bottom:5px">
+               Aufrufe begrenzen auf: <input class="member_normal" type="text" id="limit" name="limit" size="7" maxlength="20" value="-" />

        </div>
 
        <div class="member_input" style="padding-top:5px;padding-bottom:5px">
        </div>
 
        <div class="member_input" style="padding-top:5px;padding-bottom:5px">


@@ -23,11 +33,55 @@
                <input type="submit" class="member_submit" name="ok" value="{--MEMBER_SURFBAR_ADD_URL--}" />
        </div>
 </div>
                <input type="submit" class="member_submit" name="ok" value="{--MEMBER_SURFBAR_ADD_URL--}" />
        </div>
 </div>

+
+<script language="JavaScript" type="text/javascript">
+<!--
+var limit = document.getElementById('limit');
+var span = document.getElementById('span_limit');
+var old_limit = 0;
+
+function FocusLimitedNo () {
+       old_limit = limit.value;
+       limit.disabled = true;
+       limit.setAttribute('class', 'disabled');
+       limit.style.textAlign = 'center';
+       limit.value = '-';
+}
+
+function FocusLimitedYes () {
+       limit.disabled = false;
+       limit.setAttribute('class', 'member_normal');
+       limit.style.textAlign = 'left';
+       if (old_limit > 0) {
+               limit.value = old_limit;
+       } else {
+               limit.value = '';
+       }
+       limit.focus();
+}
+
+function SubmitForm () {
+       if (limit.value == '-') {
+               limit.value = 0;
+       }
+       return true;
+}
+
+function ResetForm () {
+       FocusLimitedNo();
+       old_limit = 0;
+       return true;
+}
+
+FocusLimitedNo();
+
+//-->
+</script>

 </form>
 
 </form>
 

-<div align="center" class="member_note" style="padding:5px">
+<span align="center" class="member_note" style="padding:5px">

        Die maximalen Kosten bzw. Einnahmen pro Surfbaraufruf  richten sich nach
        verschiedenen Faktoren. Schauen Sie unter <a
         href="{!URL!}/modules.php?module=login&amp;what=surfbar_start">Surfbar starten</a>
        nach, wenn Sie genaueres dazu wissen m&ouml;chten.
        Die maximalen Kosten bzw. Einnahmen pro Surfbaraufruf  richten sich nach
        verschiedenen Faktoren. Schauen Sie unter <a
         href="{!URL!}/modules.php?module=login&amp;what=surfbar_start">Surfbar starten</a>
        nach, wenn Sie genaueres dazu wissen m&ouml;chten.

-</div>
+</span>

diff --git a/templates/de/html/member/member_surfbar_book_static.tp b/templates/de/html/member/member_surfbar_book_static.tp
new file mode 100644 (file)
index 0000000..1f8cb13
--- /dev/null
+++ b/templates/de/html/member/member_surfbar_book_static.tp
@@ -0,0 +1,63 @@
+<form action="{!URL!}/modules.php?module=login&amp;what=surfbar_book" method="post">
+<div class="member_table dashed" style="width:600px;margin-top:10px">
+       <div class="member_title2 bottom2" style="padding-top:5px;padding-bottom:5px">
+               <strong>URL in Surfbar buchen - Dynamisch:</strong>
+       </div>
+
+       <div class="member_input bottom2" style="padding-top:5px;padding-bottom:5px">
+               URL eingeben: <input class="member_normal" type="text" name="url" size="20" maxlength="255" value="http://" />
+       </div>
+
+       <div class="member_input" style="padding-top:5px;padding-bottom:5px">
+               Soll die Anzahl Aufrufe begrenzt werden?<br />
+               <input type="radio" id="limited_no" onfocus="return FocusLimitedNo()" name="limited" value="N" checked="checked" /> {--NO--}
+               <input type="radio" id="limited_yes" onfocus="return FocusLimitedYes()" name="limited" value="Y" /> {--YES--}
+       </div>
+
+       <div class="member_input bottom2"" style="padding-top:5px;padding-bottom:5px">
+               URL eingeben: <input class="member_normal" type="text" id="limit" name="limit" size="5" maxlength="20" value="0" />
+       </div>
+
+       <div class="member_input" style="padding-top:5px;padding-bottom:5px">
+               Jeder Seiten-Aufruf durch andere Mitglieder kostet Ihnen mindestens
+               <strong>$content[costs] {!POINTS!}</strong>. Surfen Sie mit der Surfbar
+               erhalten Sie mindestens <strong>$content[reward] {!POINTS!}</strong> auf
+               Ihr Konto gutgeschrieben.<br />
+               <br />
+               Sie haben bereits <strong>$content[curr_order]</strong> von maximal
+               <strong>$content[max_order]</strong> erlaubten URLs gebucht.
+       </div>
+
+       <div class="member_title2 top2" style="padding-top:5px;padding-bottom:5px">
+               <input type="reset" class="member_reset" value="{--CLEAR_FORM--}" />&nbsp;*
+               <input type="submit" class="member_submit" name="ok" value="{--MEMBER_SURFBAR_ADD_URL--}" />
+       </div>
+</div>
+<script language="JavaScript" type="text/javascript">
+<!--
+var limit = document.getElementById('limit');
+function FocusLimitedNo () {
+       limit.disabled = true;
+       limit.setAttribute('class', 'disabled');
+       limit.value = '0';
+}
+
+function FocusLimitedYes () {
+       limit.disabled = false;
+       limit.setAttribute('class', 'member_normal');
+       limit.value = '';
+       limit.focus();
+}
+
+FocusLimitedNo();
+
+//-->
+</script>
+</form>
+
+<div align="center" class="member_note" style="padding:5px">
+       Die maximalen Kosten bzw. Einnahmen pro Surfbaraufruf  richten sich nach
+       verschiedenen Faktoren. Schauen Sie unter <a
+        href="{!URL!}/modules.php?module=login&amp;what=surfbar_start">Surfbar starten</a>
+       nach, wenn Sie genaueres dazu wissen m&ouml;chten.
+</div>

diff --git a/templates/de/html/member/member_surfbar_book_static.tpl b/templates/de/html/member/member_surfbar_book_static.tpl
index 76227339952f04f408bc2706ca86b36e51568144..314eb85049b7a6049e91480bf241affa7d3f7751 100644 (file)
--- a/templates/de/html/member/member_surfbar_book_static.tpl
+++ b/templates/de/html/member/member_surfbar_book_static.tpl
@@ -1,13 +1,23 @@
-<form action="{!URL!}/modules.php?module=login&amp;what=surfbar_book" method="post">
+<form id="book" action="{!URL!}/modules.php?module=login&amp;what=surfbar_book" method="post" onsubmit="return SubmitForm()" onreset="return ResetForm()">

 <div class="member_table dashed" style="width:600px;margin-top:10px">
        <div class="member_title2 bottom2" style="padding-top:5px;padding-bottom:5px">
                <strong>URL in Surfbar buchen - Statisch:</strong>
        </div>
 
 <div class="member_table dashed" style="width:600px;margin-top:10px">
        <div class="member_title2 bottom2" style="padding-top:5px;padding-bottom:5px">
                <strong>URL in Surfbar buchen - Statisch:</strong>
        </div>
 

-       <div class="member_input" style="padding-top:5px;padding-bottom:5px">
+       <div class="member_input bottom2" style="padding-top:5px;padding-bottom:5px">

                URL eingeben: <input type="text" name="url" size="20" maxlength="255" value="http://" />
        </div>
 
                URL eingeben: <input type="text" name="url" size="20" maxlength="255" value="http://" />
        </div>
 

+       <div class="member_input" style="padding-top:5px;padding-bottom:5px">
+               Soll die Anzahl Aufrufe begrenzt werden?<br />
+               <input type="radio" id="limited_no" onfocus="return FocusLimitedNo()" name="limited" value="N" checked="checked" /> {--NO--}
+               <input type="radio" id="limited_yes" onfocus="return FocusLimitedYes()" name="limited" value="Y" /> {--YES--}
+       </div>
+
+       <div class="member_input bottom2" style="padding-top:5px;padding-bottom:5px">
+               Aufrufe begrenzen auf: <input class="member_normal" type="text" id="limit" name="limit" size="7" maxlength="20" value="-" />
+       </div>
+

        <div class="member_input" style="padding-top:5px;padding-bottom:5px">
                Jeder Seiten-Aufruf durch andere Mitglieder kostet Ihnen <span
                 class="surfbar_points">$content[costs] {!POINTS!}</span>. Surfen Sie mit
        <div class="member_input" style="padding-top:5px;padding-bottom:5px">
                Jeder Seiten-Aufruf durch andere Mitglieder kostet Ihnen <span
                 class="surfbar_points">$content[costs] {!POINTS!}</span>. Surfen Sie mit


@@ -23,4 +33,48 @@
                <input type="submit" class="member_submit" name="ok" value="{--MEMBER_SURFBAR_ADD_URL--}" />
        </div>
 </div>
                <input type="submit" class="member_submit" name="ok" value="{--MEMBER_SURFBAR_ADD_URL--}" />
        </div>
 </div>

+
+<script language="JavaScript" type="text/javascript">
+<!--
+var limit = document.getElementById('limit');
+var span = document.getElementById('span_limit');
+var old_limit = 0;
+
+function FocusLimitedNo () {
+       old_limit = limit.value;
+       limit.disabled = true;
+       limit.setAttribute('class', 'disabled');
+       limit.style.textAlign = 'center';
+       limit.value = '-';
+}
+
+function FocusLimitedYes () {
+       limit.disabled = false;
+       limit.setAttribute('class', 'member_normal');
+       limit.style.textAlign = 'left';
+       if (old_limit > 0) {
+               limit.value = old_limit;
+       } else {
+               limit.value = '';
+       }
+       limit.focus();
+}
+
+function SubmitForm () {
+       if (limit.value == '-') {
+               limit.value = 0;
+       }
+       return true;
+}
+
+function ResetForm () {
+       FocusLimitedNo();
+       old_limit = 0;
+       return true;
+}
+
+FocusLimitedNo();
+
+//-->
+</script>

 </form>
 </form>

diff --git a/theme/business/css/general.css b/theme/business/css/general.css
index 70e891a97eda5adac1e23f87556cc52dccc5096c..cc728ec570f1102c29d7d5775b5c1274366e8a4f 100644 (file)
--- a/theme/business/css/general.css
+++ b/theme/business/css/general.css
@@ -576,7 +576,7 @@ DIV.admin_note {
 
 .disabled {
        border-style            : groove;
 
 .disabled {
        border-style            : groove;

-       background-color        : #660000;
+       background-color        : #AAAAAA;

        color                           : #FFFFFF;
 }
 
        color                           : #FFFFFF;
 }
 

diff --git a/theme/default/css/general.css b/theme/default/css/general.css
index 3ac6cfecb47da619acc512da0ccecd8dde6e50e0..8e146794e75c0bc9d6b9b75b9500e67ad6ebba73 100644 (file)
--- a/theme/default/css/general.css
+++ b/theme/default/css/general.css
@@ -606,7 +606,7 @@ DIV.admin_note {
 
 .disabled {
        border-style            : groove;
 
 .disabled {
        border-style            : groove;

-       background-color        : #660000;
+       background-color        : #AAAAAA;

        color                           : #FF9900;
 }
 
        color                           : #FF9900;
 }
 

diff --git a/theme/desert/css/general.css b/theme/desert/css/general.css
index 23f0dbc4af1f1789a04b4538e83adcb907c5b181..df64581418917f8d683b3f72472ceaeccb41f6f2 100644 (file)
--- a/theme/desert/css/general.css
+++ b/theme/desert/css/general.css
@@ -567,9 +567,9 @@ DIV.admin_note {
 }
 
 .disabled {
 }
 
 .disabled {

-       border-style: groove;
-       background-color: #660000;
-       color: #FFFFCC;
+       border-style            : groove;
+       background-color        : #AAAAAA;
+       color                           : #FFFFCC;

 }
 
 .mini_select {
 }
 
 .mini_select {