Referal system refactured (and some parts fixed), wrapper function introduced:

- Referal points system refactured: All point accounts can now be handled (admin
  menu is not yet finished) through the table 'points_data', including
  notification by email.
- Introduced new "translation" wrapper generateYesNoOptionList() to simplify
  many configuration menus
- Some internal TODOs closed (e.g. handling of registration welcome points)
- TODOs.txt updated

diff --git a/.gitattributes b/.gitattributes
index 96bf5151f0bfb3706fa42647d37f9b883ad9b82b..1b137e06b072288cf31e75706bea68dc9642c3b4 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1117,6 +1117,7 @@ templates/de/html/admin/admin_delete_admins_acls_row.tpl svneol=native#text/plai
 templates/de/html/admin/admin_delete_admins_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_cats.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_cats_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_admins_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_cats.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_cats_row.tpl svneol=native#text/plain

+templates/de/html/admin/admin_delete_country_row.tpl svneol=native#text/plain

 templates/de/html/admin/admin_delete_email_bonus.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_email_max_rec.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_email_max_rec_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_email_bonus.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_email_max_rec.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_email_max_rec_row.tpl svneol=native#text/plain


@@ -1155,6 +1156,7 @@ templates/de/html/admin/admin_edit_bank_packages_row.tpl svneol=native#text/plai
 templates/de/html/admin/admin_edit_bonus_email.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_cats.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_cats_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_bonus_email.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_cats.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_cats_row.tpl svneol=native#text/plain

+templates/de/html/admin/admin_edit_country_row.tpl svneol=native#text/plain

 templates/de/html/admin/admin_edit_email.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_email_max_rec.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_email_max_rec_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_email.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_email_max_rec.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_email_max_rec_row.tpl svneol=native#text/plain

diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt
index 561837e4b30e483e752b35142f455a770823d732..abac6c9d44a4a374911f1d56d64705700c23df0e 100644 (file)
--- a/DOCS/TODOs.txt
+++ b/DOCS/TODOs.txt
@@ -35,7 +35,7 @@
 ./inc/extensions/ext-network.php:93:           // @TODO network_type_handle is an internal name and needs documentation
 ./inc/extensions/ext-newsletter.php:218:               // @TODO Move these into configuration
 ./inc/extensions/ext-order.php:358:            // @TODO This should be moved out to inc/daily/
 ./inc/extensions/ext-network.php:93:           // @TODO network_type_handle is an internal name and needs documentation
 ./inc/extensions/ext-newsletter.php:218:               // @TODO Move these into configuration
 ./inc/extensions/ext-order.php:358:            // @TODO This should be moved out to inc/daily/

-./inc/extensions/ext-rallye.php:331:           // @TODO Move this code into a hook
+./inc/extensions/ext-rallye.php:341:           // @TODO Move this code into a hook

 ./inc/extensions/ext-rallye.php:94:            // @TODO Fix config_rallye_prices to list_rallye_prices
 ./inc/extensions/ext-yoomedia.php:121:         // @TODO Can this be moved into a database table?
 ./inc/extensions/ext-yoomedia.php:54:// @TODO Only deprecated when 'ext-network' is ready! setExtensionDeprecated('Y');
 ./inc/extensions/ext-rallye.php:94:            // @TODO Fix config_rallye_prices to list_rallye_prices
 ./inc/extensions/ext-yoomedia.php:121:         // @TODO Can this be moved into a database table?
 ./inc/extensions/ext-yoomedia.php:54:// @TODO Only deprecated when 'ext-network' is ready! setExtensionDeprecated('Y');


@@ -54,8 +54,8 @@
 ./inc/functions.php:2200:      // @TODO Rename column data_type to e.g. mail_status
 ./inc/gen_sql_patches.php:95:// @TODO Rewrite this to a filter
 ./inc/install-functions.php:57:        // @TODO DEACTIVATED: changeDataInLocalConfigurationFile('OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestParameter('omode'), 0);
 ./inc/functions.php:2200:      // @TODO Rename column data_type to e.g. mail_status
 ./inc/gen_sql_patches.php:95:// @TODO Rewrite this to a filter
 ./inc/install-functions.php:57:        // @TODO DEACTIVATED: changeDataInLocalConfigurationFile('OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestParameter('omode'), 0);

-./inc/language/de.php:1066:    // @TODO Rewrite these two constants
-./inc/language/de.php:1082:    // @TODO Rewrite these three constants
+./inc/language/de.php:1063:    // @TODO Rewrite these two constants
+./inc/language/de.php:1079:    // @TODO Rewrite these three constants

 ./inc/language/de.php:758:// @TODO Are these constants longer used?
 ./inc/language-functions.php:255:      // @TODO These are all valid languages, again hard-coded
 ./inc/language-functions.php:44:// @TODO Rewrite all language constants to this function.
 ./inc/language/de.php:758:// @TODO Are these constants longer used?
 ./inc/language-functions.php:255:      // @TODO These are all valid languages, again hard-coded
 ./inc/language-functions.php:44:// @TODO Rewrite all language constants to this function.


@@ -73,7 +73,6 @@
 ./inc/libs/rallye_functions.php:854:// @TODO Please document this function
 ./inc/libs/rallye_functions.php:910:           // Load count @TODO Can't we rewrite this to our API?
 ./inc/libs/register_functions.php:290: // @TODO Rewrite these all to a single filter
 ./inc/libs/rallye_functions.php:854:// @TODO Please document this function
 ./inc/libs/rallye_functions.php:910:           // Load count @TODO Can't we rewrite this to our API?
 ./inc/libs/register_functions.php:290: // @TODO Rewrite these all to a single filter

-./inc/libs/register_functions.php:363: // @TODO Wether the registration bonus should only be added to user directly or through referal system should be configurable

 ./inc/libs/sponsor_functions.php:159:                                  // @TODO Rewrite this to API function
 ./inc/libs/sponsor_functions.php:430:                  // @TODO Rewrite this to API function
 ./inc/libs/surfbar_functions.php:1621:         // @TODO This can be somehow rewritten
 ./inc/libs/sponsor_functions.php:159:                                  // @TODO Rewrite this to API function
 ./inc/libs/sponsor_functions.php:430:                  // @TODO Rewrite this to API function
 ./inc/libs/surfbar_functions.php:1621:         // @TODO This can be somehow rewritten


@@ -171,12 +170,12 @@
 ./inc/modules/member/what-unconfirmed.php:209:                         // @TODO This 'userid' cannot be saved because of encapsulated EL code
 ./inc/modules/order.php:74:            // @TODO Unused: 2,4
 ./inc/monthly/monthly_bonus.php:64:    // @TODO Rewrite this to a filter
 ./inc/modules/member/what-unconfirmed.php:209:                         // @TODO This 'userid' cannot be saved because of encapsulated EL code
 ./inc/modules/order.php:74:            // @TODO Unused: 2,4
 ./inc/monthly/monthly_bonus.php:64:    // @TODO Rewrite this to a filter

-./inc/mysql-manager.php:1258:  // @TODO Rewrite this to a filter
-./inc/mysql-manager.php:1520:                  // @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
-./inc/mysql-manager.php:1608:          // @TODO Rewrite these lines to a filter
-./inc/mysql-manager.php:1632:  // @TODO Rewrite this to a filter
-./inc/mysql-manager.php:1998:                  // @TODO Rewrite this to a filter
-./inc/mysql-manager.php:2042:// @TODO Fix inconsistency between last_module and getWhat()
+./inc/mysql-manager.php:1267:  // @TODO Rewrite this to a filter
+./inc/mysql-manager.php:1529:                  // @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
+./inc/mysql-manager.php:1617:          // @TODO Rewrite these lines to a filter
+./inc/mysql-manager.php:1641:  // @TODO Rewrite this to a filter
+./inc/mysql-manager.php:2007:                  // @TODO Rewrite this to a filter
+./inc/mysql-manager.php:2051:// @TODO Fix inconsistency between last_module and getWhat()

 ./inc/mysql-manager.php:371:   // @TODO Try to rewrite this to one or more functions
 ./inc/mysql-manager.php:44:// @TODO Can we cache this?
 ./inc/purge/purge-inact.php:55:        // @TODO Rewrite these if() blocks to a filter
 ./inc/mysql-manager.php:371:   // @TODO Try to rewrite this to one or more functions
 ./inc/mysql-manager.php:44:// @TODO Can we cache this?
 ./inc/purge/purge-inact.php:55:        // @TODO Rewrite these if() blocks to a filter


@@ -310,6 +309,8 @@
 ./templates/de/html/admin/admin_list_cats_404.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_list_chk_reg_row.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_list_chk_reg.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_list_cats_404.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_list_chk_reg_row.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_list_chk_reg.tpl:1:<!-- @DEPRECATED //-->

+./templates/de/html/admin/admin_list_country_del_row.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_list_country_edit_row.tpl:1:<!-- @DEPRECATED //-->

 ./templates/de/html/admin/admin_reset_pass_done.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_send_reset_link.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/member/member_surfbar_book_dynamic.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_reset_pass_done.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_send_reset_link.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/member/member_surfbar_book_dynamic.tpl:1:<!-- @DEPRECATED //-->

diff --git a/birthday_confirm.php b/birthday_confirm.php
index 24f71259c4b978e0badad49c0326e73286c5a25c..2923ceb2c9aaafe9e1f63f0e9cdb6039c0c0835f 100644 (file)
--- a/birthday_confirm.php
+++ b/birthday_confirm.php
@@ -91,7 +91,7 @@ if (SQL_NUMROWS($result) == 1) {
        if ($data['status'] == 'CONFIRMED') {
                // Add points to account
                initReferalSystem();
        if ($data['status'] == 'CONFIRMED') {
                // Add points to account
                initReferalSystem();

-               addPointsThroughReferalSystem('birthday_confirm', $userid, $data['points'], false, 0, strtolower(getConfig('birthday_mode')));
+               addPointsThroughReferalSystem('birthday_confirm', $userid, $data['points']);

 
                // Remove entry from table
                SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_birthday` WHERE `userid`=%s AND `chk_value`='%s' LIMIT 1",
 
                // Remove entry from table
                SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_birthday` WHERE `userid`=%s AND `chk_value`='%s' LIMIT 1",

diff --git a/doubler.php b/doubler.php
index 306e8f01ab44cd8ab0877a1482eb9db9b513387f..a7f83cfeb2d256584fe926214ffca49c118a3765 100644 (file)
--- a/doubler.php
+++ b/doubler.php
@@ -172,7 +172,9 @@ if (isFormSent()) {
 } // END - if (isFormSet())
 
 // Shall I check for points immediately?
 } // END - if (isFormSet())
 
 // Shall I check for points immediately?

-if (getConfig('doubler_send_mode') == 'DIRECT') loadInclude('inc/mails/doubler_mails.php');
+if (getConfig('doubler_send_mode') == 'DIRECT') {
+       loadInclude('inc/mails/doubler_mails.php');
+} // END - if

 
 // Output header
 loadIncludeOnce('inc/header.php');
 
 // Output header
 loadIncludeOnce('inc/header.php');

diff --git a/inc/classes/resolver.class.php b/inc/classes/resolver.class.php
index 317114d27b6a6215520c705bfa78ba2d50935ecd..57afe95342d8d9be749d9a8c65d5847161205bc2 100644 (file)
--- a/inc/classes/resolver.class.php
+++ b/inc/classes/resolver.class.php
@@ -92,7 +92,7 @@ class HostnameResolver {
                                // Seems to be an IP! Now check deeper...
                                if (($matches[0] == $ip) && ($matches[1] >= 0) && ($matches[1] <= 255) && ($matches[2] >= 0) && ($matches[2] <= 255) && ($matches[3] >= 0) && ($matches[3] <= 255) && ($matches[4] > 0) && ($matches[4] < 255)) {
                                        // We also cache IP addresses
                                // Seems to be an IP! Now check deeper...
                                if (($matches[0] == $ip) && ($matches[1] >= 0) && ($matches[1] <= 255) && ($matches[2] >= 0) && ($matches[2] <= 255) && ($matches[3] >= 0) && ($matches[3] <= 255) && ($matches[4] > 0) && ($matches[4] < 255)) {
                                        // We also cache IP addresses

-                                       SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_dns_cache` (`ip`, `hostname`, `added`) VALUES('%s', '%s', NOW())",
+                                       SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_dns_cache` (`ip`, `hostname`, `added`) VALUES ('%s', '%s', NOW())",

                                                array($ip, $hostname), __METHOD__, __LINE__);
 
                                        // Set return value to $ip
                                                array($ip, $hostname), __METHOD__, __LINE__);
 
                                        // Set return value to $ip


@@ -106,7 +106,7 @@ class HostnameResolver {
                                //* DEBUG: */ logDebugMessage(__METHOD__, __LINE__, sprintf("Cannot lookup: %s", $hostname));
                        } else {
                                // Put entry in DB
                                //* DEBUG: */ logDebugMessage(__METHOD__, __LINE__, sprintf("Cannot lookup: %s", $hostname));
                        } else {
                                // Put entry in DB

-                               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_dns_cache` (`ip`, `hostname`, `added`) VALUES('%s', '%s', NOW())",
+                               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_dns_cache` (`ip`, `hostname`, `added`) VALUES ('%s', '%s', NOW())",

                                        array($ip, $hostname), __METHOD__, __LINE__);
 
                                // Set return value to $ip
                                        array($ip, $hostname), __METHOD__, __LINE__);
 
                                // Set return value to $ip

diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index 68cdd067ad5fd0c6f8a8f11e871b22585b76dcc7..2d25cdea884311a5e9502aeec0868c1380437160 100644 (file)
--- a/inc/db/lib-mysql3.php
+++ b/inc/db/lib-mysql3.php
@@ -339,7 +339,7 @@ function SQL_RESULT_FROM_ARRAY ($table, $columns, $idRow, $id, $F, $L) {
        } // END  - if
 
        // Prepare the SQL statement
        } // END  - if
 
        // Prepare the SQL statement

-       $sql = "SELECT `".implode("`,`", $columns)."` FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`='%s' LIMIT 1";
+       $sql = "SELECT `".implode("`, `", $columns)."` FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`='%s' LIMIT 1";

 
        // Return the result
        return SQL_QUERY_ESC($sql,
 
        // Return the result
        return SQL_QUERY_ESC($sql,


@@ -434,12 +434,13 @@ function SQL_ALTER_TABLE ($sql, $F, $L, $enableCodes = true) {
                        $keyName = ',';
                        while (strpos($keyName, ',') !== false) {
                                // Use last
                        $keyName = ',';
                        while (strpos($keyName, ',') !== false) {
                                // Use last

+                               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'keyName=' . $keyName . 'begin=' . $begin . ' - BEFORE');

                                $keyName = str_replace('`', '', $tableArray[count($tableArray) - $begin]);
                                $keyName = str_replace('`', '', $tableArray[count($tableArray) - $begin]);

-                               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $keyName . '----------------' . $begin);
+                               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'keyName=' . $keyName . 'begin=' . $begin . ' - BETWEEN');

 
                                // Remove brackes
                                $keyName = str_replace('(', '', str_replace(')', '', $keyName));
 
                                // Remove brackes
                                $keyName = str_replace('(', '', str_replace(')', '', $keyName));

-                               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $keyName . '----------------' . $begin);
+                               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'keyName=' . $keyName . 'begin=' . $begin . ' - AFTER');

 
                                // Continue
                                $begin++;
 
                                // Continue
                                $begin++;


@@ -448,13 +449,13 @@ function SQL_ALTER_TABLE ($sql, $F, $L, $enableCodes = true) {
 
                // Shall we run it?
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ', tableArray[3]=' . $tableArray[3] . ',keyName=' . $keyName);
 
                // Shall we run it?
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ', tableArray[3]=' . $tableArray[3] . ',keyName=' . $keyName);

-               if ((!isSqlTableIndexAdded($tableName, $tableArray[3], $keyName)) && ($tableArray[3] == 'ADD')) {
+               if (($tableArray[3] == 'ADD') && (!isSqlTableIndexFound($tableName, $keyName))) {

                        // Send it to the SQL_QUERY() function to add it
                        // Send it to the SQL_QUERY() function to add it

-                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $sql);
+                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sql=' . $sql . ' - ADDING!');

                        $result = SQL_QUERY($sql, $F, $L, $enableCodes);
                        $result = SQL_QUERY($sql, $F, $L, $enableCodes);

-               } elseif ((isSqlTableIndexAdded($tableName, $tableArray[3], $keyName)) && ($tableArray[3] == 'DROP')) {
+               } elseif (($tableArray[3] == 'DROP') && (isSqlTableIndexFound($tableName, $keyName))) {

                        // Send it to the SQL_QUERY() function to drop it
                        // Send it to the SQL_QUERY() function to drop it

-                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $sql);
+                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sql=' . $sql . ' - DROPPING!');

                        $result = SQL_QUERY($sql, $F, $L, $enableCodes);
                } else {
                        // Not executed
                        $result = SQL_QUERY($sql, $F, $L, $enableCodes);
                } else {
                        // Not executed


@@ -559,6 +560,7 @@ function SQL_EPOCHE_TO_TIMESTAMP ($timestamp) {
 
 // Check if there is a SQL table created
 function isSqlTableCreated ($tableName) {
 
 // Check if there is a SQL table created
 function isSqlTableCreated ($tableName) {

+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ' - ENTERED!');

        // Do we have cache?
        if (!isset($GLOBALS[__FUNCTION__][$tableName])) {
                // Check if the table is there
        // Do we have cache?
        if (!isset($GLOBALS[__FUNCTION__][$tableName])) {
                // Check if the table is there


@@ -571,11 +573,13 @@ function isSqlTableCreated ($tableName) {
        } // END - if
 
        // Return cache
        } // END - if
 
        // Return cache

+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ',result=' . intval($GLOBALS[__FUNCTION__][$tableName]) . ' - EXIT!');

        return $GLOBALS[__FUNCTION__][$tableName];
 }
 
 // Is a table column there?
 function isSqlTableColumnFound ($tableName, $columnName) {
        return $GLOBALS[__FUNCTION__][$tableName];
 }
 
 // Is a table column there?
 function isSqlTableColumnFound ($tableName, $columnName) {

+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ',columnName=' . $columName . ' - ENTERED!');

        // Do we have cache?
        if (!isset($GLOBALS[__FUNCTION__][$tableName][$columnName])) {
                // And column name as well
        // Do we have cache?
        if (!isset($GLOBALS[__FUNCTION__][$tableName][$columnName])) {
                // And column name as well


@@ -594,49 +598,37 @@ function isSqlTableColumnFound ($tableName, $columnName) {
        } // END - if
 
        // Return cache
        } // END - if
 
        // Return cache

+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ',columnName=' . $columName . ',result=' . intval($GLOBALS[__FUNCTION__][$tableName][$columnName]) . ' - EXIT!');

        return $GLOBALS[__FUNCTION__][$tableName][$columnName];
 }
 
        return $GLOBALS[__FUNCTION__][$tableName][$columnName];
 }
 

-// Checks depending on the mode if the table is there
-function isSqlTableIndexAdded ($tableName, $mode, $keyName) {
+// Checks depending on the mode if the index is there
+function isSqlTableIndexFound ($tableName, $keyName) {
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ',columnName=' . $keyName . ' - ENTERED!');

        // Do we have cache?
        // Do we have cache?

-       if (!isset($GLOBALS[__FUNCTION__][$tableName][$mode])) {
+       if (!isset($GLOBALS[__FUNCTION__][$tableName][$keyName])) {

                // Show indexes
                $result = SQL_QUERY_ESC("SHOW INDEX FROM `%s`", array($tableName), __FUNCTION__, __LINE__);
 
                // Show indexes
                $result = SQL_QUERY_ESC("SHOW INDEX FROM `%s`", array($tableName), __FUNCTION__, __LINE__);
 

-               // Non-skipping is default for ADD
-               $GLOBALS[__FUNCTION__][$tableName][$mode] = false;
-
-               // But should we DROP?
-               if ($mode == 'DROP') {
-                       // Then skip if nothing found
-                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Going to drop key ' . $keyName);
-                       $GLOBALS[__FUNCTION__][$tableName][$mode] = true;
-               } // END - if
+               // The column is not found by default
+               $GLOBALS[__FUNCTION__][$tableName][$keyName] = false;

 
                // Walk through all
                while ($content = SQL_FETCHARRAY($result)) {
 
                // Walk through all
                while ($content = SQL_FETCHARRAY($result)) {

-                       // Is it found?
-                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'columnName='.$keyName.',content=<pre>' . print_r($content, true) . '</pre>');
-                       if (($content['Key_name'] == $keyName) && ($mode == 'ADD')) {
-                               // Skip this query!
-                               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ADD: Skiped: tableName=' . $tableName . ',mode=' . $mode . ',keyName=' . $keyName);
-                               $GLOBALS[__FUNCTION__][$tableName][$mode] = true;
-                               break;
-                       } elseif (($content['Key_name'] == $keyName) && ($mode == 'DROP')) {
-                               // Don't skip this!
-                               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'DROP: Not skiped: tableName=' . $tableName . ',mode=' . $mode . ',keyName=' . $keyName);
-                               $GLOBALS[__FUNCTION__][$tableName][$mode] = false;
-                               break;
-                       }
+                       // Add all entries for better caching behavior
+                       $GLOBALS[__FUNCTION__][$tableName][$content['Key_name']] = true;

                } // END - while
 
                // Free result
                SQL_FREERESULT($result);
                } // END - while
 
                // Free result
                SQL_FREERESULT($result);

+       } else {
+               // Cache used
+               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ',columnName=' . $keyName . ',result=' . intval($GLOBALS[__FUNCTION__][$tableName][$keyName]) . ' - CACHE!');

        } // END - if
 
        // Return cache
        } // END - if
 
        // Return cache

-       return $GLOBALS[__FUNCTION__][$tableName][$mode];
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ',columnName=' . $keyName . ',result=' . intval($GLOBALS[__FUNCTION__][$tableName][$keyName]) . ' - EXIT!');
+       return $GLOBALS[__FUNCTION__][$tableName][$keyName];

 }
 
 // [EOF]
 }
 
 // [EOF]

diff --git a/inc/extensions-functions.php b/inc/extensions-functions.php
index be86049739fb3fd18c45a26a2f10c68891dbb260..9768022912c8504bd2c735378ce5ce958eb9dbf3 100644 (file)
--- a/inc/extensions-functions.php
+++ b/inc/extensions-functions.php
@@ -359,7 +359,7 @@ function registerExtension ($ext_name, $taskId, $dry_run = false, $ignoreUpdates
                                if (isExtensionInstalledAndNewer('sql_patches', '0.0.6')) {
                                        // New way, with CSS
                                        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . getCurrentExtensionName() . ',always_active=' . getThisExtensionAlwaysActive() . ', ext_ver=' . getCurrentExtensionVersion() . 'ext_css=' . getExtensionHasCss());
                                if (isExtensionInstalledAndNewer('sql_patches', '0.0.6')) {
                                        // New way, with CSS
                                        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . getCurrentExtensionName() . ',always_active=' . getThisExtensionAlwaysActive() . ', ext_ver=' . getCurrentExtensionVersion() . 'ext_css=' . getExtensionHasCss());

-                                       SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_extensions` (`ext_name`, `ext_active`, `ext_version`,`ext_has_css`) VALUES ('%s','%s','%s','%s')",
+                                       SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_extensions` (`ext_name`, `ext_active`, `ext_version`, `ext_has_css`) VALUES ('%s','%s','%s','%s')",

                                                array(
                                                        getCurrentExtensionName(),
                                                        getThisExtensionAlwaysActive(),
                                                array(
                                                        getCurrentExtensionName(),
                                                        getThisExtensionAlwaysActive(),


@@ -1792,7 +1792,7 @@ function addAdminMenuSql ($action, $what, $title, $descr, $sort) {
                // Is what null?
                if (is_null($what)) {
                        // Add main menu
                // Is what null?
                if (is_null($what)) {
                        // Add main menu

-                       $sql = sprintf("INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES('%s',NULL,'%s','%s',%s)",
+                       $sql = sprintf("INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES ('%s',NULL,'%s','%s',%s)",

                                $action,
                                $title,
                                $descr,
                                $action,
                                $title,
                                $descr,


@@ -1800,7 +1800,7 @@ function addAdminMenuSql ($action, $what, $title, $descr, $sort) {
                        );
                } else {
                        // Add sub menu
                        );
                } else {
                        // Add sub menu

-                       $sql = sprintf("INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES('%s','%s','%s','%s',%s)",
+                       $sql = sprintf("INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES ('%s','%s','%s','%s',%s)",

                                $action,
                                $what,
                                $title,
                                $action,
                                $what,
                                $title,


@@ -1824,14 +1824,14 @@ function addGuestMenuSql ($action, $what, $title, $sort) {
                // Is what null?
                if (is_null($what)) {
                        // Add main menu
                // Is what null?
                if (is_null($what)) {
                        // Add main menu

-                       $sql = sprintf("INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES('%s',NULL,'%s','N','Y',%s)",
+                       $sql = sprintf("INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`, `what`, `title`, `visible`, `locked`, `sort`) VALUES ('%s',NULL,'%s','N','Y',%s)",

                                $action,
                                $title,
                                bigintval($sort)
                        );
                } else {
                        // Add sub menu
                                $action,
                                $title,
                                bigintval($sort)
                        );
                } else {
                        // Add sub menu

-                       $sql = sprintf("INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES('%s','%s','%s','N','Y',%s)",
+                       $sql = sprintf("INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`, `what`, `title`, `visible`, `locked`, `sort`) VALUES ('%s','%s','%s','N','Y',%s)",

                                $action,
                                $what,
                                $title,
                                $action,
                                $what,
                                $title,


@@ -1854,14 +1854,14 @@ function addMemberMenuSql ($action, $what, $title, $sort) {
                // Is what null?
                if (is_null($what)) {
                        // Add main menu
                // Is what null?
                if (is_null($what)) {
                        // Add main menu

-                       $sql = sprintf("INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES('%s',NULL,'%s','N','Y',%s)",
+                       $sql = sprintf("INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`, `what`, `title`, `visible`, `locked`, `sort`) VALUES ('%s',NULL,'%s','N','Y',%s)",

                                $action,
                                $title,
                                bigintval($sort)
                        );
                } else {
                        // Add sub menu
                                $action,
                                $title,
                                bigintval($sort)
                        );
                } else {
                        // Add sub menu

-                       $sql = sprintf("INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES('%s','%s','%s','N','Y',%s)",
+                       $sql = sprintf("INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`, `what`, `title`, `visible`, `locked`, `sort`) VALUES ('%s','%s','%s','N','Y',%s)",

                                $action,
                                $what,
                                $title,
                                $action,
                                $what,
                                $title,


@@ -1884,7 +1884,7 @@ function addSponsorMenuSql ($action, $what, $title, $active, $sort) {
                // Is what null?
                if (is_null($what)) {
                        // Add main menu
                // Is what null?
                if (is_null($what)) {
                        // Add main menu

-                       $sql = sprintf("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_menu` (`action`,`what`,`title`,`active`,`sort`) VALUES('%s',NULL,'%s','%s',%s)",
+                       $sql = sprintf("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_menu` (`action`, `what`, `title`, `active`, `sort`) VALUES ('%s',NULL,'%s','%s',%s)",

                                $action,
                                $title,
                                $active,
                                $action,
                                $title,
                                $active,


@@ -1892,7 +1892,7 @@ function addSponsorMenuSql ($action, $what, $title, $active, $sort) {
                        );
                } else {
                        // Add sub menu
                        );
                } else {
                        // Add sub menu

-                       $sql = sprintf("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_menu` (`action`,`what`,`title`,`active`,`sort`) VALUES('%s','%s','%s','%s',%s)",
+                       $sql = sprintf("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_menu` (`action`, `what`, `title`, `active`, `sort`) VALUES ('%s','%s','%s','%s',%s)",

                                $action,
                                $what,
                                $title,
                                $action,
                                $what,
                                $title,

diff --git a/inc/extensions/ext-admins.php b/inc/extensions/ext-admins.php
index fa2482a170f39cfd7b82c9e552b7cf62e4aa0ba5..c70d07f972535244dbc9fbabf5b30bcc1221e6e5 100644 (file)
--- a/inc/extensions/ext-admins.php
+++ b/inc/extensions/ext-admins.php
@@ -130,7 +130,7 @@ KEY (`admin_id`)",
 PRIMARY KEY (`id`),
 INDEX (`admin_id`)",
                                        'Mail template -> admin connection table');
 PRIMARY KEY (`id`),
 INDEX (`admin_id`)",
                                        'Mail template -> admin connection table');

-                               addExtensionSql("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)");
+                               addExtensionSql("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!)
                                setExtensionUpdateNotes("Kontrollieren Sie, welche Mails welcher Admin oder alle (admin_id=0) bekommen soll oder im UserLog (admin_id=-1) verzeichnet werden soll. Standardmässig wird weiter an alle versendet.");
 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Kontrollieren Sie, welche Mails welcher Admin oder alle (admin_id=0) bekommen soll oder im UserLog (admin_id=-1) verzeichnet werden soll. Standardmässig wird weiter an alle versendet.");

diff --git a/inc/extensions/ext-autopurge.php b/inc/extensions/ext-autopurge.php
index c963ddeb13b0bf5bebdb9d8871b9782fc5991f00..517afd2a52ba98308c98cd60d90334b71b59bd9b 100644 (file)
--- a/inc/extensions/ext-autopurge.php
+++ b/inc/extensions/ext-autopurge.php
@@ -41,10 +41,10 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Version number
 } // END - if
 
 // Version number

-setThisExtensionVersion('0.4.0');
+setThisExtensionVersion('0.4.1');

 
 // Version history array (add more with , '0.0.1' and so on)
 
 // Version history array (add more with , '0.0.1' and so on)

-setExtensionVersionHistory(array('0.0.0', '0.1.0', '0.1.1', '0.1.2', '0.1.3', '0.1.4', '0.1.5', '0.1.6', '0.1.7', '0.1.8', '0.1.9', '0.2.0', '0.2.1', '0.2.2', '0.2.3', '0.2.4', '0.2.5', '0.2.6', '0.2.7', '0.2.8', '0.2.9', '0.3.0', '0.3.1', '0.3.2', '0.3.3', '0.3.4', '0.3.5', '0.3.6', '0.3.7', '0.3.8', '0.3.9', '0.4.0'));
+setExtensionVersionHistory(array('0.0.0', '0.1.0', '0.1.1', '0.1.2', '0.1.3', '0.1.4', '0.1.5', '0.1.6', '0.1.7', '0.1.8', '0.1.9', '0.2.0', '0.2.1', '0.2.2', '0.2.3', '0.2.4', '0.2.5', '0.2.6', '0.2.7', '0.2.8', '0.2.9', '0.3.0', '0.3.1', '0.3.2', '0.3.3', '0.3.4', '0.3.5', '0.3.6', '0.3.7', '0.3.8', '0.3.9', '0.4.0', '0.4.1'));

 
 // Keep this extension always active!
 setExtensionAlwaysActive('Y');
 
 // Keep this extension always active!
 setExtensionAlwaysActive('Y');


@@ -252,6 +252,16 @@ switch (getExtensionMode()) {
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Template-Problem beseitigt. Dies verhinderte das Abspeichern der Einstellungen.");
                                break;
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Template-Problem beseitigt. Dies verhinderte das Abspeichern der Einstellungen.");
                                break;

+
+                       case '0.4.1': // SQL queries for v0.4.1
+                               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_points_data` (`subject`, `column_name`, `locked_mode`, `payment_method`) VALUES ('autopurge_add','points','LOCKED','DIRECT')");
+
+                               // This depends on ext-sql_patches
+                               addExtensionDependency('sql_patches');
+
+                               // Update notes
+                               setExtensionUpdateNotes("R&uuml;ckschriften bei Auto-L&ouml;schungen werden nun &uuml;ber die Tabelle <strong>{OPEN_CONFIG}_MYSQL_PREFIX{CLOSE_CONFIG}_points_data</strong> verwaltet.");
+                               break;

                } // END - switch
                break;
 
                } // END - switch
                break;
 

diff --git a/inc/extensions/ext-beg.php b/inc/extensions/ext-beg.php
index 183f82a66fba8424fcf83a6d6e372792f0a26da6..0210a7794374709ae34df58faf1656c3070d4cf9 100644 (file)
--- a/inc/extensions/ext-beg.php
+++ b/inc/extensions/ext-beg.php
@@ -41,10 +41,10 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Version number
 } // END - if
 
 // Version number

-setThisExtensionVersion('0.2.9');
+setThisExtensionVersion('0.3.0');

 
 // Version history array (add more with , '0.0.1' and so on)
 
 // Version history array (add more with , '0.0.1' and so on)

-setExtensionVersionHistory(array('0.0.0', '0.0.1', '0.0.2', '0.0.3', '0.0.4', '0.0.5', '0.0.6', '0.0.7', '0.0.8', '0.0.9', '0.1.0', '0.1.1', '0.1.2', '0.1.3', '0.1.4', '0.1.5', '0.1.6', '0.1.7', '0.1.8', '0.1.9', '0.2.0', '0.2.1', '0.2.2', '0.2.3', '0.2.4', '0.2.5', '0.2.6', '0.2.7', '0.2.8', '0.2.9'));
+setExtensionVersionHistory(array('0.0.0', '0.0.1', '0.0.2', '0.0.3', '0.0.4', '0.0.5', '0.0.6', '0.0.7', '0.0.8', '0.0.9', '0.1.0', '0.1.1', '0.1.2', '0.1.3', '0.1.4', '0.1.5', '0.1.6', '0.1.7', '0.1.8', '0.1.9', '0.2.0', '0.2.1', '0.2.2', '0.2.3', '0.2.4', '0.2.5', '0.2.6', '0.2.7', '0.2.8', '0.2.9', '0.3.0'));

 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running
 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running


@@ -153,7 +153,6 @@ INDEX (`userid`)",
 
                        case '0.1.2':
                                // SQL queries for v0.1.2
 
                        case '0.1.2':
                                // SQL queries for v0.1.2

-                               addConfigAddSql('beg_mode', "ENUM('DIRECT','REF') NOT NULL DEFAULT 'REF'");

                                addConfigAddSql('beg_ranks', 'TINYINT(3) UNSIGNED NOT NULL DEFAULT 10');
                                addConfigAddSql('beg_active', "ENUM('Y','N') NOT NULL DEFAULT 'N'");
                                addConfigAddSql('beg_rallye', "ENUM('Y','N') NOT NULL DEFAULT 'N'");
                                addConfigAddSql('beg_ranks', 'TINYINT(3) UNSIGNED NOT NULL DEFAULT 10');
                                addConfigAddSql('beg_active', "ENUM('Y','N') NOT NULL DEFAULT 'N'");
                                addConfigAddSql('beg_rallye', "ENUM('Y','N') NOT NULL DEFAULT 'N'");


@@ -294,6 +293,18 @@ INDEX (`userid`)",
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Loggen der Referal-URLs hinzugefügt.");
                                break;
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Loggen der Referal-URLs hinzugefügt.");
                                break;

+
+                       case '0.3.0': // SQL queries for v0.3.0
+                               addConfigDropSql('beg_mode');
+                               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_points_data` (`subject`, `column_name`, `locked_mode`, `payment_method`) VALUES ('beg','points','LOCKED','DIRECT')");
+                               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_points_data` (`subject`, `column_name`, `locked_mode`, `payment_method`) VALUES ('monthly_beg','points','LOCKED','DIRECT')");
+
+                               // This depends on ext-sql_patches
+                               addExtensionDependency('sql_patches');
+
+                               // Update notes
+                               setExtensionUpdateNotes("Monatliche Bettelrallye und die erbettelten {?POINTS?} werden nun &uuml;ber die Tabelle <strong>{OPEN_CONFIG}_MYSQL_PREFIX{CLOSE_CONFIG}_points_data</strong> verwaltet.");
+                               break;

                } // END - switch
                break;
 
                } // END - switch
                break;
 

diff --git a/inc/extensions/ext-birthday.php b/inc/extensions/ext-birthday.php
index 6d408decc21809a9295d3b6ef3972ade4c35da75..223b85d70f229c38ced9f7ca40fbf2b678f38910 100644 (file)
--- a/inc/extensions/ext-birthday.php
+++ b/inc/extensions/ext-birthday.php
@@ -160,7 +160,6 @@ KEY (`userid`)",
                                break;
 
                        case '0.3.6': // SQL queries for v0.3.6
                                break;
 
                        case '0.3.6': // SQL queries for v0.3.6

-                               addConfigAddSql('birthday_mode', "ENUM('DIRECT','REF') NOT NULL DEFAULT 'DIRECT'");

                                addConfigAddSql('birthday_active', "ENUM('Y','N') NOT NULL DEFAULT 'N'");
 
                                // Update notes (these will be set as task text!)
                                addConfigAddSql('birthday_active', "ENUM('Y','N') NOT NULL DEFAULT 'N'");
 
                                // Update notes (these will be set as task text!)


@@ -186,6 +185,13 @@ CHANGE `birth_year` `birth_year` SMALLINT(4) UNSIGNED ZEROFILL NOT NULL DEFAULT
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Datenbankspalten umgestellt auf SMALLINT() UNSIGNED ZEROFILL.");
                                break;
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Datenbankspalten umgestellt auf SMALLINT() UNSIGNED ZEROFILL.");
                                break;

+
+                       case '0.4.0': // SQL queries for v0.4.0
+                               addConfigDropSql('birthday_mode');
+
+                               // Update notes (these will be set as task text!)
+                               setExtensionUpdateNotes("Dies brauchen wir nicht mehr.");
+                               break;

                } // END - if
                break;
 
                } // END - if
                break;
 

diff --git a/inc/extensions/ext-bonus.php b/inc/extensions/ext-bonus.php
index 28dd83f7df9c820552aa59e1d93349fb96a7e438..b8b987bb2e6b67b0e40812081f8c4b0b2c31674a 100644 (file)
--- a/inc/extensions/ext-bonus.php
+++ b/inc/extensions/ext-bonus.php
@@ -41,10 +41,10 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Version of this extension
 } // END - if
 
 // Version of this extension

-setThisExtensionVersion('0.9.5');
+setThisExtensionVersion('0.9.6');

 
 // Version history array (add more with , '0.0.1' and so on)
 
 // Version history array (add more with , '0.0.1' and so on)

-setExtensionVersionHistory(array('0.0.0', '0.1.6', '0.2.0', '0.2.1', '0.2.2', '0.2.3', '0.2.4', '0.2.5', '0.2.6', '0.2.7', '0.2.8', '0.2.9', '0.3.0', '0.3.1', '0.3.2', '0.3.3', '0.3.4', '0.3.5', '0.3.6', '0.3.7', '0.3.8', '0.3.9', '0.4.0', '0.4.1', '0.4.2', '0.4.3', '0.4.4', '0.4.5', '0.4.6', '0.4.7', '0.4.8', '0.4.9', '0.5.0', '0.5.1', '0.5.2', '0.5.3', '0.5.4', '0.5.5', '0.5.6', '0.5.7', '0.5.8', '0.5.9', '0.6.0', '0.6.1', '0.6.2', '0.6.3', '0.6.4', '0.6.5', '0.6.6', '0.6.7', '0.6.8', '0.6.9', '0.7.0', '0.7.1', '0.7.2', '0.7.3', '0.7.4', '0.7.5', '0.7.6', '0.7.7', '0.7.8', '0.7.9', '0.8.0', '0.8.1', '0.8.2', '0.8.3', '0.8.4', '0.8.5', '0.8.6', '0.8.7', '0.8.8', '0.8.9', '0.9.0', '0.9.1', '0.9.2', '0.9.3', '0.9.4', '0.9.5'));
+setExtensionVersionHistory(array('0.0.0', '0.1.6', '0.2.0', '0.2.1', '0.2.2', '0.2.3', '0.2.4', '0.2.5', '0.2.6', '0.2.7', '0.2.8', '0.2.9', '0.3.0', '0.3.1', '0.3.2', '0.3.3', '0.3.4', '0.3.5', '0.3.6', '0.3.7', '0.3.8', '0.3.9', '0.4.0', '0.4.1', '0.4.2', '0.4.3', '0.4.4', '0.4.5', '0.4.6', '0.4.7', '0.4.8', '0.4.9', '0.5.0', '0.5.1', '0.5.2', '0.5.3', '0.5.4', '0.5.5', '0.5.6', '0.5.7', '0.5.8', '0.5.9', '0.6.0', '0.6.1', '0.6.2', '0.6.3', '0.6.4', '0.6.5', '0.6.6', '0.6.7', '0.6.8', '0.6.9', '0.7.0', '0.7.1', '0.7.2', '0.7.3', '0.7.4', '0.7.5', '0.7.6', '0.7.7', '0.7.8', '0.7.9', '0.8.0', '0.8.1', '0.8.2', '0.8.3', '0.8.4', '0.8.5', '0.8.6', '0.8.7', '0.8.8', '0.8.9', '0.9.0', '0.9.1', '0.9.2', '0.9.3', '0.9.4', '0.9.5', '0.9.6'));

 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running
 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running


@@ -608,6 +608,16 @@ ORDER BY
                                // Update notes
                                setExtensionUpdateNotes("Filter zum Generieren von Admin-Links für Bonus-Mails hinzugefügt.");
                                break;
                                // Update notes
                                setExtensionUpdateNotes("Filter zum Generieren von Admin-Links für Bonus-Mails hinzugefügt.");
                                break;

+
+                       case '0.9.6': // SQL queries for v0.9.6
+                               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_points_data` (`subject`, `column_name`, `locked_mode`, `payment_method`) VALUES ('monthly_bonus','points','LOCKED','DIRECT')");
+
+                               // This depends on ext-sql_patches
+                               addExtensionDependency('sql_patches');
+
+                               // Update notes
+                               setExtensionUpdateNotes("Monatlicher Bonus wird nun &uuml;ber die Tabelle <strong>{OPEN_CONFIG}_MYSQL_PREFIX{CLOSE_CONFIG}_points_data</strong> verwaltet.");
+                               break;

                } // END - switch
                break;
 
                } // END - switch
                break;
 

diff --git a/inc/extensions/ext-coupon.php b/inc/extensions/ext-coupon.php
index a84c4b20ebe8884d5050df3388d07058456e387d..7b532b083011331531ba128adda8a6bcb4de9a03 100644 (file)
--- a/inc/extensions/ext-coupon.php
+++ b/inc/extensions/ext-coupon.php
@@ -77,7 +77,7 @@ PRIMARY KEY (`id`)",
 `coupon_code` VARCHAR(30) NULL DEFAULT NULL,
 `cashed_on` TIMESTAMP NULL DEFAULT NULL,
 PRIMARY KEY (`id`),
 `coupon_code` VARCHAR(30) NULL DEFAULT NULL,
 `cashed_on` TIMESTAMP NULL DEFAULT NULL,
 PRIMARY KEY (`id`),

-UNIQUE KEY `coupon_user` (`coupon_id`,`userid`),
+UNIQUE KEY `coupon_user` (`coupon_id`, `userid`),

 UNIQUE KEY (`coupon_code`)",
                        'Coupon->user connection');
 
 UNIQUE KEY (`coupon_code`)",
                        'Coupon->user connection');
 


@@ -138,7 +138,15 @@ UNIQUE KEY (`coupon_code`)",
                                addExtensionDependency('order');
 
                                // Insert data in new table
                                addExtensionDependency('order');
 
                                // Insert data in new table

-                               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_points_data` (`ext_name`,`column_name`,`locked_mode`,`payment_method`) VALUES('coupon','order_points','LOCKED','DIRECT')");
+                               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_points_data` (`subject`, `column_name`, `locked_mode`, `payment_method`) VALUES ('coupon_cashed','order_points','LOCKED','DIRECT')");
+
+                               // Update notes (these will be set as task text!)
+                               setExtensionUpdateNotes('');
+                               break;
+
+                       case '0.0.1': // SQL queries for v0.0.1
+                               // Update data in points_data table
+                               addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_points_data` SET `subject`='coupon_cashed' WHERE `subject`='coupon' LIMIT 1");

 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes('');
 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes('');

diff --git a/inc/extensions/ext-debug.php b/inc/extensions/ext-debug.php
index a4c4d1ac36ac170336559b176f11b6c44436fe5d..121ca72587e3fda349e167422b97491e11fa403f 100644 (file)
--- a/inc/extensions/ext-debug.php
+++ b/inc/extensions/ext-debug.php
@@ -100,7 +100,7 @@ UNIQUE (`url`)",
                        'Debug clients');
 
                // Add this exchange as first client
                        'Debug clients');
 
                // Add this exchange as first client

-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_debug_client` (`url`,`title`,`webmaster`,`status`) VALUES ('{?URL?}','{?MAIN_TITLE?}','{?WEBMASTER?}','ACTIVE')");
+               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_debug_client` (`url`, `title`, `webmaster`, `status`) VALUES ('{?URL?}','{?MAIN_TITLE?}','{?WEBMASTER?}','ACTIVE')");

 
                // Table for debug log <-> client connection
                addDropTableSql('debug_client_log');
 
                // Table for debug log <-> client connection
                addDropTableSql('debug_client_log');


@@ -110,7 +110,7 @@ UNIQUE (`url`)",
 `log_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 PRIMARY KEY (`id`),
 UNIQUE (`log_id`),
 `log_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 PRIMARY KEY (`id`),
 UNIQUE (`log_id`),

-INDEX `client_log` (`client_id`,`log_id`)",
+INDEX `client_log` (`client_id`, `log_id`)",

                        'Debug client <-> log connection');
 
                // Guest menus
                        'Debug client <-> log connection');
 
                // Guest menus

diff --git a/inc/extensions/ext-doubler.php b/inc/extensions/ext-doubler.php
index e411c5432179c9213cca06d236638b9b26826335..da45567cbb93c2fffe6079e67dc60f730afefd84 100644 (file)
--- a/inc/extensions/ext-doubler.php
+++ b/inc/extensions/ext-doubler.php
@@ -41,10 +41,10 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Version number
 } // END - if
 
 // Version number

-setThisExtensionVersion('0.1.7');
+setThisExtensionVersion('0.1.8');

 
 // Version history array (add more with , '0.0.1' and so on)
 
 // Version history array (add more with , '0.0.1' and so on)

-setExtensionVersionHistory(array('0.0.0', '0.0.1', '0.0.2', '0.0.3', '0.0.4', '0.0.5', '0.0.6', '0.0.7', '0.0.8', '0.0.9', '0.1.0', '0.1.1', '0.1.2', '0.1.3', '0.1.4', '0.1.5', '0.1.6', '0.1.7'));
+setExtensionVersionHistory(array('0.0.0', '0.0.1', '0.0.2', '0.0.3', '0.0.4', '0.0.5', '0.0.6', '0.0.7', '0.0.8', '0.0.9', '0.1.0', '0.1.1', '0.1.2', '0.1.3', '0.1.4', '0.1.5', '0.1.6', '0.1.7', '0.1.8'));

 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running
 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running


@@ -164,79 +164,90 @@ INDEX (`userid`)",
                                setExtensionUpdateNotes("{?POINTS?}-Guthaben des Verdopplers kann optional nicht mit einbezogen werden.");
                                break;
 
                                setExtensionUpdateNotes("{?POINTS?}-Guthaben des Verdopplers kann optional nicht mit einbezogen werden.");
                                break;
 

-                               case '0.0.5': // SQL queries for v0.0.5
-                                       // Update notes (these will be set as task text!)
-                                       setExtensionUpdateNotes("Counter-Stand und noch zum Verdoppeln übrige {?POINTS?} in Templates eingebunden. Auflistung in Admin-Bereich komplettiert.");
-                                       break;
-
-                               case '0.0.6': // SQL queries for v0.0.6
-                                       addConfigAddSql('doubler_max_sent', 'TINYINT(3) UNSIGNED NOT NULL DEFAULT 1');
-                                       addConfigAddSql('doubler_group_sent', 'TINYINT(3) UNSIGNED NOT NULL DEFAULT 1');
-                                       addConfigAddSql('doubler_sent_all', "ENUM('Y','N') NOT NULL DEFAULT 'Y'");
-
-                                       // Update notes (these will be set as task text!)
-                                       setExtensionUpdateNotes("Geb&uuml;hrenabzug wird beim Einzahlen abgezogen (wurde von Auszahlung abgezogen) und maximal bei Auszahlung zu kontrollierende Accounts einstellbar.<br />Template <u>admin_config_doubler_pro.tpl</u> ist &uuml;berfl&uuml;ssig geworden. Bitte l&ouml;schen Sie dies!");
-                                       break;
-
-                               case '0.0.7': // SQL queries for v0.0.7
-                                       // Update notes (these will be set as task text!)
-                                       setExtensionUpdateNotes("W&ouml;rter <strong>{?mt_word?}</strong>, <strong>{?mt_word2?}</strong> und <strong>{?mt_word3?}</strong> sind austauschbar.<br /><br />Minus-Guthaben des Verdoppler-Accounts repariert und Mitgliedsmail erweitert mit Transaktionsummer und IP-Nummer.");
-                                       break;
-
-                               case '0.0.8': // SQL queries for v0.0.8
-                                       // Update notes (these will be set as task text!)
-                                       setExtensionUpdateNotes("Bitte verschieben Sie die doubler-Templates (Ordner: {?PATH?}/templates/".getLanguage()."/html/) in den neuen Order doubler!");
-                                       break;
-
-                               case '0.0.9': // SQL queries for v0.0.9
-                                       // Update notes (these will be set as task text!)
-                                       setExtensionUpdateNotes("Abspeichern von Einstellungen repariert.");
-                                       break;
-
-                               case '0.1.0': // SQL queries for v0.2.1
-                                       // Update notes (these will be set as task text!)
-                                       setExtensionUpdateNotes("Vorbereitung auf die neue Mediendaten v0.0.4.");
-                                       break;
-
-                               case '0.1.1': // SQL queries for v0.1.1
-                                       // Update notes (these will be set as task text!)
-                                       setExtensionUpdateNotes("Zwei SQL-Fehler in <strong>inc/doubler_send.php</strong> beseitigt.");
-                                       break;
-
-                               case '0.1.2': // SQL queries for v0.1.2
-                                       // Update notes (these will be set as task text!)
-                                       setExtensionUpdateNotes("Sicherheitsupdate f&uuml;r die Include-Befehle.");
-                                       break;
-
-                               case '0.1.3': // SQL queries for v0.1.3
-                                       // Update notes (these will be set as task text!)
-                                       setExtensionUpdateNotes("De-/Aktivieren des mit dieser Erweiterung verkn&uuml;pften Modules eingebunden.");
-                                       break;
-
-                               case '0.1.4': // SQL queries for v0.1.4
-                                       addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `action`='extras', `sort`=4 WHERE `what`='doubler' LIMIT 1");
-
-                                       // Update notes (these will be set as task text!)
-                                       setExtensionUpdateNotes("Mitgliedsmen&uuml; komplett umgebaut.");
-                                       break;
-
-                               case '0.1.5': // SQL queries for v0.1.5
-                                       // Update notes (these will be set as task text!)
-                                       setExtensionUpdateNotes("Hash-Erstellung von <strong>md5()</strong> auf bessere Funktion <strong>generateHash()</strong> umgestellt.");
-                                       break;
-
-                               case '0.1.6': // SQL queries for v0.1.6
-                                       // Update notes (these will be set as task text!)
-                                       setExtensionUpdateNotes("Fehlerhinweis bei deaktivierter Erweiterung verbessert.");
-                                       break;
-
-                               case '0.1.7': // SQL queries for v0.1.7
-                                       addExtensionSql('UPDATE `{?_MYSQL_PREFIX?}_config` SET `doubler_charge`=`doubler_charge`*100 WHERE `config`=0 LIMIT 1');
-                                       addExtensionSql('UPDATE `{?_MYSQL_PREFIX?}_config` SET `doubler_ref`=`doubler_ref`*100 WHERE `config`=0 LIMIT 1');
-
-                                       // Update notes (these will be set as task text!)
-                                       setExtensionUpdateNotes("Fehlerhinweis bei deaktivierter Erweiterung verbessert.");
-                                       break;
+                       case '0.0.5': // SQL queries for v0.0.5
+                               // Update notes (these will be set as task text!)
+                               setExtensionUpdateNotes("Counter-Stand und noch zum Verdoppeln &uuml;brige {?POINTS?} in Templates eingebunden. Auflistung in Admin-Bereich komplettiert.");
+                               break;
+
+                       case '0.0.6': // SQL queries for v0.0.6
+                               addConfigAddSql('doubler_max_sent', 'TINYINT(3) UNSIGNED NOT NULL DEFAULT 1');
+                               addConfigAddSql('doubler_group_sent', 'TINYINT(3) UNSIGNED NOT NULL DEFAULT 1');
+                               addConfigAddSql('doubler_sent_all', "ENUM('Y','N') NOT NULL DEFAULT 'Y'");
+
+                               // Update notes (these will be set as task text!)
+                               setExtensionUpdateNotes("Geb&uuml;hrenabzug wird beim Einzahlen abgezogen (wurde von Auszahlung abgezogen) und maximal bei Auszahlung zu kontrollierende Accounts einstellbar.<br />Template <u>admin_config_doubler_pro.tpl</u> ist &uuml;berfl&uuml;ssig geworden. Bitte l&ouml;schen Sie dies!");
+                               break;
+
+                       case '0.0.7': // SQL queries for v0.0.7
+                               // Update notes (these will be set as task text!)
+                               setExtensionUpdateNotes("W&ouml;rter <strong>{?mt_word?}</strong>, <strong>{?mt_word2?}</strong> und <strong>{?mt_word3?}</strong> sind austauschbar.<br /><br />Minus-Guthaben des Verdoppler-Accounts repariert und Mitgliedsmail erweitert mit Transaktionsummer und IP-Nummer.");
+                               break;
+
+                       case '0.0.8': // SQL queries for v0.0.8
+                               // Update notes (these will be set as task text!)
+                               setExtensionUpdateNotes("Bitte verschieben Sie die doubler-Templates (Ordner: {?PATH?}/templates/".getLanguage()."/html/) in den neuen Order doubler!");
+                               break;
+
+                       case '0.0.9': // SQL queries for v0.0.9
+                               // Update notes (these will be set as task text!)
+                               setExtensionUpdateNotes("Abspeichern von Einstellungen repariert.");
+                               break;
+
+                       case '0.1.0': // SQL queries for v0.2.1
+                               // Update notes (these will be set as task text!)
+                               setExtensionUpdateNotes("Vorbereitung auf die neue Mediendaten v0.0.4.");
+                               break;
+
+                       case '0.1.1': // SQL queries for v0.1.1
+                               // Update notes (these will be set as task text!)
+                               setExtensionUpdateNotes("Zwei SQL-Fehler in <strong>inc/doubler_send.php</strong> beseitigt.");
+                               break;
+
+                       case '0.1.2': // SQL queries for v0.1.2
+                               // Update notes (these will be set as task text!)
+                               setExtensionUpdateNotes("Sicherheitsupdate f&uuml;r die Include-Befehle.");
+                               break;
+
+                       case '0.1.3': // SQL queries for v0.1.3
+                               // Update notes (these will be set as task text!)
+                               setExtensionUpdateNotes("De-/Aktivieren des mit dieser Erweiterung verkn&uuml;pften Modules eingebunden.");
+                               break;
+
+                       case '0.1.4': // SQL queries for v0.1.4
+                               addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `action`='extras', `sort`=4 WHERE `what`='doubler' LIMIT 1");
+
+                               // Update notes (these will be set as task text!)
+                               setExtensionUpdateNotes("Mitgliedsmen&uuml; komplett umgebaut.");
+                               break;
+
+                       case '0.1.5': // SQL queries for v0.1.5
+                               // Update notes (these will be set as task text!)
+                               setExtensionUpdateNotes("Hash-Erstellung von <strong>md5()</strong> auf bessere Funktion <strong>generateHash()</strong> umgestellt.");
+                               break;
+
+                       case '0.1.6': // SQL queries for v0.1.6
+                               // Update notes (these will be set as task text!)
+                               setExtensionUpdateNotes("Fehlerhinweis bei deaktivierter Erweiterung verbessert.");
+                               break;
+
+                       case '0.1.7': // SQL queries for v0.1.7
+                               addExtensionSql('UPDATE `{?_MYSQL_PREFIX?}_config` SET `doubler_charge`=`doubler_charge`*100 WHERE `config`=0 LIMIT 1');
+                               addExtensionSql('UPDATE `{?_MYSQL_PREFIX?}_config` SET `doubler_ref`=`doubler_ref`*100 WHERE `config`=0 LIMIT 1');
+
+                               // Update notes (these will be set as task text!)
+                               setExtensionUpdateNotes("Fehlerhinweis bei deaktivierter Erweiterung verbessert.");
+                               break;
+
+                       case '0.1.8': // SQL queries for v0.1.8
+                               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_points_data` (`subject`, `column_name`, `locked_mode`, `payment_method`) VALUES ('doubler_direct','points','LOCKED','DIRECT')");
+                               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_points_data` (`subject`, `column_name`, `locked_mode`, `payment_method`) VALUES ('doubler_reset','points','LOCKED','DIRECT')");
+
+                               // This depends on ext-sql_patches
+                               addExtensionDependency('sql_patches');
+
+                               // Update notes
+                               setExtensionUpdateNotes("Doppler-Gutschriften werden nun &uuml;ber die Tabelle <strong>{OPEN_CONFIG}_MYSQL_PREFIX{CLOSE_CONFIG}_points_data</strong> verwaltet.");
+                               break;

                } // END - switch
                break;
 
                } // END - switch
                break;
 

diff --git a/inc/extensions/ext-grade.php b/inc/extensions/ext-grade.php
index 21fc8de95d8cb5d051bd18d47806ca0aadc9af71..c09535931cf18fdb2bc6155b307e82017abeacf5 100644 (file)
--- a/inc/extensions/ext-grade.php
+++ b/inc/extensions/ext-grade.php
@@ -83,7 +83,7 @@ UNIQUE KEY (`grade_cash_name`)",
 `grade_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `grade_cash_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 PRIMARY KEY (`id`),
 `grade_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `grade_cash_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 PRIMARY KEY (`id`),

-UNIQUE KEY `grade_cash` (`grade_id`,`grade_cash_id`),
+UNIQUE KEY `grade_cash` (`grade_id`, `grade_cash_id`),

 INDEX (`grade_cash_id`)",
                        'Grade<->cash data connection');
 
 INDEX (`grade_cash_id`)",
                        'Grade<->cash data connection');
 


@@ -95,7 +95,7 @@ INDEX (`grade_cash_id`)",
 `grade_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `grade_expired` TIMESTAMP NOT NULL DEFAULT '0000-00-00 00:00:00',
 PRIMARY KEY (`id`),
 `grade_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `grade_expired` TIMESTAMP NOT NULL DEFAULT '0000-00-00 00:00:00',
 PRIMARY KEY (`id`),

-UNIQUE KEY (`userid`,`grade_id`),
+UNIQUE KEY (`userid`, `grade_id`),

 INDEX (`grade_id`)",
                        'Grade<->user connection');
 
 INDEX (`grade_id`)",
                        'Grade<->user connection');
 

diff --git a/inc/extensions/ext-iso3166.php b/inc/extensions/ext-iso3166.php
index 28aa12dd97e52d9b1d3e1a2eb189d6b11cb85250..4dbab08b303598a9acf34fb4f72e7621197e21b2 100644 (file)
--- a/inc/extensions/ext-iso3166.php
+++ b/inc/extensions/ext-iso3166.php
@@ -73,7 +73,7 @@ switch (getExtensionMode()) {
                switch (getCurrentExtensionVersion()) {
                        case '0.0.1': // SQL queries for v0.0.2
                                addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_countries` ADD `provider` ENUM('user','ext-iso3166') NOT NULL DEFAULT 'user'");
                switch (getCurrentExtensionVersion()) {
                        case '0.0.1': // SQL queries for v0.0.2
                                addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_countries` ADD `provider` ENUM('user','ext-iso3166') NOT NULL DEFAULT 'user'");

-                               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_countries` (`code`,`descr`,`provider`)
+                               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_countries` (`code`, `descr`, `provider`)

 VALUES ('AD', 'Andorra', 'ext-iso3166'),
 ('AE', 'Vereinigte Arabische Emirate', 'ext-iso3166'),
 ('AF', 'Afghanistan', 'ext-iso3166'),
 VALUES ('AD', 'Andorra', 'ext-iso3166'),
 ('AE', 'Vereinigte Arabische Emirate', 'ext-iso3166'),
 ('AF', 'Afghanistan', 'ext-iso3166'),

diff --git a/inc/extensions/ext-mailid.php b/inc/extensions/ext-mailid.php
index f1c09b1f3d66c707f9b5dae8ce4780aa91bbdc6f..e83b2905defa063942a425183bb7c0f95d795f51 100644 (file)
--- a/inc/extensions/ext-mailid.php
+++ b/inc/extensions/ext-mailid.php
@@ -41,10 +41,10 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Version number
 } // END - if
 
 // Version number

-setThisExtensionVersion('0.3.3');
+setThisExtensionVersion('0.3.4');

 
 // Version history array (add more with , '0.0.1' and so on)
 
 // Version history array (add more with , '0.0.1' and so on)

-setExtensionVersionHistory(array('0.0.0', '0.0.1', '0.0.2', '0.0.3', '0.0.4', '0.0.5', '0.0.6', '0.0.7', '0.0.8', '0.0.9', '0.1.0', '0.1.1', '0.1.2', '0.1.3', '0.1.4', '0.1.5', '0.1.6', '0.1.7', '0.1.8', '0.1.9', '0.2.0', '0.2.1', '0.2.2', '0.2.3', '0.2.4', '0.2.5', '0.2.6', '0.2.7', '0.2.8', '0.2.9', '0.3.0', '0.3.1', '0.3.2', '0.3.3'));
+setExtensionVersionHistory(array('0.0.0', '0.0.1', '0.0.2', '0.0.3', '0.0.4', '0.0.5', '0.0.6', '0.0.7', '0.0.8', '0.0.9', '0.1.0', '0.1.1', '0.1.2', '0.1.3', '0.1.4', '0.1.5', '0.1.6', '0.1.7', '0.1.8', '0.1.9', '0.2.0', '0.2.1', '0.2.2', '0.2.3', '0.2.4', '0.2.5', '0.2.6', '0.2.7', '0.2.8', '0.2.9', '0.3.0', '0.3.1', '0.3.2', '0.3.3', '0.3.4'));

 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running
 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running


@@ -228,7 +228,15 @@ switch (getExtensionMode()) {
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Variablen-Handling scripteweitgeändert.");
                                break;
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Variablen-Handling scripteweitgeändert.");
                                break;

-               }
+
+                       case '0.3.4': // SQL queries for v0.3.4
+                               // This update depends on latest sql_patches version
+                               addExtensionDependency('sql_patches');
+
+                               // Insert data in points_data
+                               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_points_data` (`subject`, `column_name`, `locked_mode`, `payment_method`) VALUES ('mailid_payback','points','LOCKED','DIRECT')");
+                               break;
+               } // END - switch

                break;
 
        case 'modify': // When the extension got modified
                break;
 
        case 'modify': // When the extension got modified


@@ -243,7 +251,7 @@ switch (getExtensionMode()) {
        default: // Unknown extension mode
                logDebugMessage(__FILE__, __LINE__, sprintf("Unknown extension mode %s in extension %s detected.", getExtensionMode(), getCurrentExtensionName()));
                break;
        default: // Unknown extension mode
                logDebugMessage(__FILE__, __LINE__, sprintf("Unknown extension mode %s in extension %s detected.", getExtensionMode(), getCurrentExtensionName()));
                break;

-}
+} // END - switch

 
 // [EOF]
 ?>
 
 // [EOF]
 ?>

diff --git a/inc/extensions/ext-network.php b/inc/extensions/ext-network.php
index 2284ecbfe5f4dda371d15fb449d1bc338675bfe0..d65ad5faf1df3989c877b37ef8238a5d13b52ee2 100644 (file)
--- a/inc/extensions/ext-network.php
+++ b/inc/extensions/ext-network.php
@@ -100,7 +100,7 @@ UNIQUE (`network_short_name`)",
 `network_type_click_url` VARCHAR(255) NOT NULL DEFAULT '',
 `network_type_banner_url` VARCHAR(255) NULL DEFAULT NULL,
 PRIMARY KEY (`network_type_id`),
 `network_type_click_url` VARCHAR(255) NOT NULL DEFAULT '',
 `network_type_banner_url` VARCHAR(255) NULL DEFAULT NULL,
 PRIMARY KEY (`network_type_id`),

-UNIQUE `provider_type` (`network_id`,`network_type_handle`)",
+UNIQUE `provider_type` (`network_id`, `network_type_handle`)",

                        'Types provideable by networks');
 
                // HTTP parameters (names) for URLs
                        'Types provideable by networks');
 
                // HTTP parameters (names) for URLs


@@ -113,8 +113,8 @@ UNIQUE `provider_type` (`network_id`,`network_type_handle`)",
 `request_param_value` VARCHAR(20) NOT NULL DEFAULT 'invalid',
 `request_param_default` VARCHAR(255) NULL DEFAULT NULL,
 PRIMARY KEY (`network_param_id`),
 `request_param_value` VARCHAR(20) NOT NULL DEFAULT 'invalid',
 `request_param_default` VARCHAR(255) NULL DEFAULT NULL,
 PRIMARY KEY (`network_param_id`),

-UNIQUE `provider_type_key` (`network_id`,`network_type_id`,`request_param_key`),
-UNIQUE `provider_type_value` (`network_id`,`network_type_id`,`request_param_value`),",
+UNIQUE `provider_type_key` (`network_id`, `network_type_id`, `request_param_key`),
+UNIQUE `provider_type_value` (`network_id`, `network_type_id`, `request_param_value`),",

                        'Request parameters for GET/POST request');
 
                // Error status codes
                        'Request parameters for GET/POST request');
 
                // Error status codes


@@ -125,7 +125,7 @@ UNIQUE `provider_type_value` (`network_id`,`network_type_id`,`request_param_valu
 `network_type_code_value` VARCHAR(50) NOT NULL DEFAULT '',
 `network_type_code_type` VARCHAR(100) NOT NULL DEFAULT 'INVALID_TYPE',
 PRIMARY KEY (`network_type_code_id`),
 `network_type_code_value` VARCHAR(50) NOT NULL DEFAULT '',
 `network_type_code_type` VARCHAR(100) NOT NULL DEFAULT 'INVALID_TYPE',
 PRIMARY KEY (`network_type_code_id`),

-UNIQUE `code_type` (`network_type_code_value`,`network_type_id`),
+UNIQUE `code_type` (`network_type_code_value`, `network_type_id`),

 INDEX (`network_type_id`)",
                        'Error codes for all types');
 
 INDEX (`network_type_id`)",
                        'Error codes for all types');
 


@@ -156,7 +156,7 @@ UNIQUE (`network_translation_name`)",
 `network_api_index` SMALLINT(5) UNSIGNED NOT NULL DEFAULT 0,
 `sort` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 PRIMARY KEY (`network_api_id`),
 `network_api_index` SMALLINT(5) UNSIGNED NOT NULL DEFAULT 0,
 `sort` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 PRIMARY KEY (`network_api_id`),

-UNIQUE `provider_type_key` (`network_id`,`network_type_id`,`network_api_index`),
+UNIQUE `provider_type_key` (`network_id`, `network_type_id`, `network_api_index`),

 INDEX (`sort`)",
                        'Translation of API responses, generic data, DO NOT ALTER!');
 
 INDEX (`sort`)",
                        'Translation of API responses, generic data, DO NOT ALTER!');
 


@@ -170,8 +170,8 @@ INDEX (`sort`)",
 `network_query_amount` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `network_active` ENUM('Y','N') NOT NULL DEFAULT 'Y',
 PRIMARY KEY (`network_id`),
 `network_query_amount` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `network_active` ENUM('Y','N') NOT NULL DEFAULT 'Y',
 PRIMARY KEY (`network_id`),

-UNIQUE `network_affiliate` (`network_id`,`network_affiliate_id`),
-UNIQUE `affiliate_site` (`network_affiliate_id`,`network_site_id`)",
+UNIQUE `network_affiliate` (`network_id`, `network_affiliate_id`),
+UNIQUE `affiliate_site` (`network_affiliate_id`, `network_site_id`)",

                        'Configuration data from the webmaster (you!)');
 
                // Configuration data for e.g. reload-time
                        'Configuration data from the webmaster (you!)');
 
                // Configuration data for e.g. reload-time


@@ -186,7 +186,7 @@ UNIQUE `affiliate_site` (`network_affiliate_id`,`network_site_id`)",
 `min_payment` FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000,
 `allow_erotic` VARCHAR(10) NOT NULL DEFAULT '',
 PRIMARY KEY (`network_data_id`),
 `min_payment` FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000,
 `allow_erotic` VARCHAR(10) NOT NULL DEFAULT '',
 PRIMARY KEY (`network_data_id`),

-UNIQUE `provider_type` (`network_id`,`network_type_id`)",
+UNIQUE `provider_type` (`network_id`, `network_type_id`)",

                        'Configuration data for every type (e.g. reload-time)');
 
                // Cache for queried APIs. Re-check depends on config
                        'Configuration data for every type (e.g. reload-time)');
 
                // Cache for queried APIs. Re-check depends on config


@@ -200,7 +200,7 @@ UNIQUE `provider_type` (`network_id`,`network_type_id`)",
 `network_cache_data` MEDIUMBLOB,
 `network_cache_timestamp` TIMESTAMP NULL DEFAULT NULL,
 PRIMARY KEY (`network_cache_id`),
 `network_cache_data` MEDIUMBLOB,
 `network_cache_timestamp` TIMESTAMP NULL DEFAULT NULL,
 PRIMARY KEY (`network_cache_id`),

-UNIQUE `provider_type` (`network_id`,`network_type_id`)",
+UNIQUE `provider_type` (`network_id`, `network_type_id`)",

                        'Cache for all queried APIs');
 
                // Reload locks for several types
                        'Cache for all queried APIs');
 
                // Reload locks for several types


@@ -212,7 +212,7 @@ UNIQUE `provider_type` (`network_id`,`network_type_id`)",
 `network_reload_lock` SMALLINT(5) UNSIGNED NOT NULL DEFAULT 0,
 `network_inserted` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 PRIMARY KEY (`network_reload_id`),
 `network_reload_lock` SMALLINT(5) UNSIGNED NOT NULL DEFAULT 0,
 `network_inserted` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 PRIMARY KEY (`network_reload_id`),

-UNIQUE `provider_type` (`network_id`,`network_type_id`)",
+UNIQUE `provider_type` (`network_id`, `network_type_id`)",

                        'Reload locks');
 
                // Insert API response array translations, these will be used for calling the right filter function
                        'Reload locks');
 
                // Insert API response array translations, these will be used for calling the right filter function


@@ -270,7 +270,7 @@ UNIQUE `provider_type` (`network_id`,`network_type_id`)",
 ('REQUEST_PARAMETER_INCOMPLETE')");
 
                // Sponsor networks
 ('REQUEST_PARAMETER_INCOMPLETE')");
 
                // Sponsor networks

-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_data` (`network_short_name`, `network_title`, `network_reflink`, `network_data_seperator`, `network_row_seperator`, `network_request_type`, `network_charset`,`network_require_id_card`) VALUES
+               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_data` (`network_short_name`, `network_title`, `network_reflink`, `network_data_seperator`, `network_row_seperator`, `network_request_type`, `network_charset`, `network_require_id_card`) VALUES

 ('a3h', 'A3H', 'http://www.a3h.de?ref=1447', '|', '|', 'GET', 'WINDOWS-1252','N'),
 ('abiszed','AbisZED-Netz','http://abiszed-netz.de/index.php?ref=557', '|', '|', 'GET', 'WINDOWS-1252','Y'),
 ('admagnet', 'AD-Magnet', 'http://www.ad-magnet.de/index.php?ref=495', '|', '|', 'GET', 'ISO-8859-1','N'),
 ('a3h', 'A3H', 'http://www.a3h.de?ref=1447', '|', '|', 'GET', 'WINDOWS-1252','N'),
 ('abiszed','AbisZED-Netz','http://abiszed-netz.de/index.php?ref=557', '|', '|', 'GET', 'WINDOWS-1252','Y'),
 ('admagnet', 'AD-Magnet', 'http://www.ad-magnet.de/index.php?ref=495', '|', '|', 'GET', 'ISO-8859-1','N'),


@@ -303,7 +303,7 @@ UNIQUE `provider_type` (`network_id`,`network_type_id`)",
 ('adconvention', 'AdConvention', 'http://www.adconvention.de?ref=233', '|', '|', 'GET', 'WINDOWS-1252','N')");
 
                // Network type handlers - A3H
 ('adconvention', 'AdConvention', 'http://www.adconvention.de?ref=233', '|', '|', 'GET', 'WINDOWS-1252','N')");
 
                // Network type handlers - A3H

-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_types` (`network_type_id`, `network_id`,`network_type_handle`,`network_type_api_url`,`network_type_click_url`,`network_type_banner_url`) VALUES
+               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_types` (`network_type_id`, `network_id`, `network_type_handle`, `network_type_api_url`, `network_type_click_url`, `network_type_banner_url`) VALUES

 (1, 1, 'banner', 'http://www.a3h.de/interface/out_banner.php', 'http://www.a3h.de/bannerklf.php?id=%CID%', 'http://www.a3h.de/banner.php?id=%CID%'),
 (2, 1, 'textlink', 'http://www.a3h.de/interface/out_textlink.php', 'http://www.a3h.de/textlinkklick.php?id=%CID%', NULL),
 (3, 1, 'surfbar', 'http://www.a3h.de/interface/out_sbanner.php', 'http://www.a3h.de/bannerklf.php?id=%CID%', 'http://www.a3h.de/banner.php?id=%CID%'),
 (1, 1, 'banner', 'http://www.a3h.de/interface/out_banner.php', 'http://www.a3h.de/bannerklf.php?id=%CID%', 'http://www.a3h.de/banner.php?id=%CID%'),
 (2, 1, 'textlink', 'http://www.a3h.de/interface/out_textlink.php', 'http://www.a3h.de/textlinkklick.php?id=%CID%', NULL),
 (3, 1, 'surfbar', 'http://www.a3h.de/interface/out_sbanner.php', 'http://www.a3h.de/bannerklf.php?id=%CID%', 'http://www.a3h.de/banner.php?id=%CID%'),

diff --git a/inc/extensions/ext-newsletter.php b/inc/extensions/ext-newsletter.php
index 3a81974a5a72106ffe224b7726c3d8d79a69d385..f3ee17bd03b19e4b48a44ed79a2d8b1311aa358e 100644 (file)
--- a/inc/extensions/ext-newsletter.php
+++ b/inc/extensions/ext-newsletter.php
@@ -179,7 +179,7 @@ INDEX `newsletter_id` (`nl_id`)",
 `nl_order_placed` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 `nl_order_accepted` ENUM('Y','N') NOT NULL DEFAULT 'N',
 PRIMARY KEY (`nl_order_id`),
 `nl_order_placed` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 `nl_order_accepted` ENUM('Y','N') NOT NULL DEFAULT 'N',
 PRIMARY KEY (`nl_order_id`),

-UNIQUE KEY `sponsor_nl_topic` (`nl_sponsor_id`,`nl_id`,`nl_topic_id`),
+UNIQUE KEY `sponsor_nl_topic` (`nl_sponsor_id`, `nl_id`, `nl_topic_id`),

 INDEX `topic` (`nl_topic_id`)",
                                        'Newsletter orders');
 
 INDEX `topic` (`nl_topic_id`)",
                                        'Newsletter orders');
 

diff --git a/inc/extensions/ext-rallye.php b/inc/extensions/ext-rallye.php
index 6bdaf75503c913f0e7e6f2515745b1b29acbade4..812197fd9e13aa2dee599335e2accc16e38ea4ca 100644 (file)
--- a/inc/extensions/ext-rallye.php
+++ b/inc/extensions/ext-rallye.php
@@ -41,10 +41,10 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Version number
 } // END - if
 
 // Version number

-setThisExtensionVersion('0.3.5');
+setThisExtensionVersion('0.3.6');

 
 // Version history array (add more with , '0.0.1' and so on)
 
 // Version history array (add more with , '0.0.1' and so on)

-setExtensionVersionHistory(array('0.0.0', '0.0.1', '0.0.2', '0.0.3', '0.0.4', '0.0.5', '0.0.6', '0.0.7', '0.0.8', '0.0.9', '0.1.0', '0.1.1', '0.1.2', '0.1.3', '0.1.4', '0.1.5', '0.1.6', '0.1.7', '0.1.8', '0.1.9', '0.2.0', '0.2.1', '0.2.2', '0.2.3', '0.2.4', '0.2.5', '0.2.6', '0.2.7', '0.2.8', '0.2.9', '0.3.0', '0.3.1', '0.3.2', '0.3.3', '0.3.4', '0.3.5'));
+setExtensionVersionHistory(array('0.0.0', '0.0.1', '0.0.2', '0.0.3', '0.0.4', '0.0.5', '0.0.6', '0.0.7', '0.0.8', '0.0.9', '0.1.0', '0.1.1', '0.1.2', '0.1.3', '0.1.4', '0.1.5', '0.1.6', '0.1.7', '0.1.8', '0.1.9', '0.2.0', '0.2.1', '0.2.2', '0.2.3', '0.2.4', '0.2.5', '0.2.6', '0.2.7', '0.2.8', '0.2.9', '0.3.0', '0.3.1', '0.3.2', '0.3.3', '0.3.4', '0.3.5', '0.3.6'));

 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running
 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running


@@ -317,6 +317,16 @@ Zudem sollten Sie mindestens folgende Templates (in <strong>templates/".getLangu
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Filter hinzugef&uuml;gt und ist von <strong>sql_patches</strong> abh&auml;ngig.");
                                break;
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Filter hinzugef&uuml;gt und ist von <strong>sql_patches</strong> abh&auml;ngig.");
                                break;

+
+                       case '0.3.6': // SQL queries for v0.3.6
+                               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_points_data` (`subject`, `column_name`, `locked_mode`, `payment_method`) VALUES ('rallye_winner','points','LOCKED','DIRECT')");
+
+                               // This depends on ext-sql_patches
+                               addExtensionDependency('sql_patches');
+
+                               // Update notes
+                               setExtensionUpdateNotes("Gewinn aus der Referal-Rallye wird nun &uuml;ber die Tabelle <strong>{OPEN_CONFIG}_MYSQL_PREFIX{CLOSE_CONFIG}_points_data</strong> verwaltet.");
+                               break;

                } // END - switch
                break;
 
                } // END - switch
                break;
 

diff --git a/inc/extensions/ext-refback.php b/inc/extensions/ext-refback.php
index 1720650b014a28862073250c701ada23d5b69955..1c65b0cd5cd04c3ba953420b7fa62eb18ce3b316 100644 (file)
--- a/inc/extensions/ext-refback.php
+++ b/inc/extensions/ext-refback.php
@@ -41,10 +41,10 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Version number
 } // END - if
 
 // Version number

-setThisExtensionVersion('0.0.2');
+setThisExtensionVersion('0.0.3');

 
 // Version history array (add more with , '0.0.1' and so on)
 
 // Version history array (add more with , '0.0.1' and so on)

-setExtensionVersionHistory(array('0.0.0','0.0.1', '0.0.2'));
+setExtensionVersionHistory(array('0.0.0','0.0.1', '0.0.2', '0.0.3'));

 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running
 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running


@@ -58,7 +58,7 @@ switch (getExtensionMode()) {
 `refback` float(4,1) NOT NULL DEFAULT 0.0,
 `points` FLOAT(20,5) DEFAULT 0.00000 NOT NULL,
 PRIMARY KEY (`id`),
 `refback` float(4,1) NOT NULL DEFAULT 0.0,
 `points` FLOAT(20,5) DEFAULT 0.00000 NOT NULL,
 PRIMARY KEY (`id`),

-UNIQUE `user_refid` (`userid`,`level`,`refid`),
+UNIQUE `user_refid` (`userid`, `level`, `refid`),

 INDEX (`level`),
 INDEX (`refid`)",
                        'User Referals With Refback');
 INDEX (`level`),
 INDEX (`refid`)",
                        'User Referals With Refback');


@@ -108,6 +108,16 @@ INDEX (`refid`)",
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Updates von ext-user hier her verschoben.");
                                break;
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Updates von ext-user hier her verschoben.");
                                break;

+
+                       case '0.0.3': // SQL queries for v0.0.3
+                               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_points_data` (`subject`, `column_name`, `locked_mode`, `payment_method`) VALUES ('refback','points','LOCKED','DIRECT')");
+
+                               // This depends on ext-sql_patches
+                               addExtensionDependency('sql_patches');
+
+                               // Update notes
+                               setExtensionUpdateNotes("Refback-Gutschriften werden nun &uuml;ber die Tabelle <strong>{OPEN_CONFIG}_MYSQL_PREFIX{CLOSE_CONFIG}_points_data</strong> verwaltet.");
+                               break;

                } // END - switch
                break;
 
                } // END - switch
                break;
 

diff --git a/inc/extensions/ext-register.php b/inc/extensions/ext-register.php
index 26b080afc728cbcd36058b9d8a49ada825445316..473c5195d0b677f99f49d6364a7b2b9adad69f1b 100644 (file)
--- a/inc/extensions/ext-register.php
+++ b/inc/extensions/ext-register.php
@@ -41,10 +41,10 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Version number
 } // END - if
 
 // Version number

-setThisExtensionVersion('0.5.5');
+setThisExtensionVersion('0.5.6');

 
 // Version history array (add more with , '0.0.1' and so on)
 
 // Version history array (add more with , '0.0.1' and so on)

-setExtensionVersionHistory(array('0.0.0', '0.1.0', '0.1.1', '0.1.2', '0.1.3', '0.1.4', '0.1.5', '0.1.6', '0.1.7', '0.1.8', '0.1.9', '0.2.0', '0.2.1', '0.2.2', '0.2.3', '0.2.4', '0.2.5', '0.2.6', '0.2.7', '0.2.8', '0.2.9', '0.3.0', '0.3.1', '0.3.2', '0.3.3', '0.3.4', '0.3.5', '0.3.6', '0.3.7', '0.3.8', '0.3.9', '0.4.0', '0.4.1', '0.4.2', '0.4.3', '0.4.4', '0.4.5', '0.4.6', '0.4.7', '0.4.8', '0.4.9', '0.5.0', '0.5.1', '0.5.2', '0.5.3', '0.5.4', '0.5.5'));
+setExtensionVersionHistory(array('0.0.0', '0.1.0', '0.1.1', '0.1.2', '0.1.3', '0.1.4', '0.1.5', '0.1.6', '0.1.7', '0.1.8', '0.1.9', '0.2.0', '0.2.1', '0.2.2', '0.2.3', '0.2.4', '0.2.5', '0.2.6', '0.2.7', '0.2.8', '0.2.9', '0.3.0', '0.3.1', '0.3.2', '0.3.3', '0.3.4', '0.3.5', '0.3.6', '0.3.7', '0.3.8', '0.3.9', '0.4.0', '0.4.1', '0.4.2', '0.4.3', '0.4.4', '0.4.5', '0.4.6', '0.4.7', '0.4.8', '0.4.9', '0.5.0', '0.5.1', '0.5.2', '0.5.3', '0.5.4', '0.5.5', '0.5.6'));

 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running
 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running


@@ -343,6 +343,16 @@ PRIMARY KEY (`id`)",
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Weiteren Men&uuml;punkt aus <strong>menu-{?DEFAULT_LANG?} heraus geholt.");
                                break;
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Weiteren Men&uuml;punkt aus <strong>menu-{?DEFAULT_LANG?} heraus geholt.");
                                break;

+
+                       case '0.5.6': // SQL queries for v0.5.6
+                               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_points_data` (`subject`, `column_name`, `locked_mode`, `payment_method`) VALUES ('register_welcome','points','LOCKED','DIRECT')");
+
+                               // This depends on ext-sql_patches
+                               addExtensionDependency('sql_patches');
+
+                               // Update notes
+                               setExtensionUpdateNotes("Anmeldewillkommensgutschrift wird nun &uuml;ber die Tabelle <strong>{OPEN_CONFIG}_MYSQL_PREFIX{CLOSE_CONFIG}_points_data</strong> verwaltet.");
+                               break;

                } // END - switch
                break;
 
                } // END - switch
                break;
 

diff --git a/inc/extensions/ext-sponsor.php b/inc/extensions/ext-sponsor.php
index 915d96807f0bad52ccc09961a2224ee4d9e63e89..ca5943df12063a786cdbbe335bc12e77521a3b74 100644 (file)
--- a/inc/extensions/ext-sponsor.php
+++ b/inc/extensions/ext-sponsor.php
@@ -155,7 +155,7 @@ INDEX (`ext_name`)",
 `active` ENUM('Y','N') NOT NULL DEFAULT 'N',
 `sort` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 PRIMARY KEY (`id`)
 `active` ENUM('Y','N') NOT NULL DEFAULT 'N',
 `sort` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 PRIMARY KEY (`id`)

-UNIQUE KEY `action_what` (`action`,`what`),
+UNIQUE KEY `action_what` (`action`, `what`),

 UNIQUE KEY (`what`),
 INDEX (`action`)",
                        'Sponsor menu');
 UNIQUE KEY (`what`),
 INDEX (`action`)",
                        'Sponsor menu');


@@ -303,10 +303,10 @@ INDEX (`sponsor_id`)",
                //
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_registry` (`ext_name`, `is_active`, `admin_id`, `stamp_added`) VALUES ('sponsor','N',".getCurrentAdminId().",NOW())");
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_action_convert` (`ext_name`, `conv_rate`, `conv_name`) VALUES ('sponsor','10','Mails')");
                //
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_registry` (`ext_name`, `is_active`, `admin_id`, `stamp_added`) VALUES ('sponsor','N',".getCurrentAdminId().",NOW())");
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_action_convert` (`ext_name`, `conv_rate`, `conv_name`) VALUES ('sponsor','10','Mails')");

-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_paytypes` (`pay_name`,`pay_min_count`,`pay_rate`,`pay_currency`) VALUES ('Standard-Paket', 5, 1000.00000, '€')");
-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_paytypes` (`pay_name`,`pay_min_count`,`pay_rate`,`pay_currency`) VALUES ('Spar-Paket', 1, 200.00000, '€')");
-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_paytypes` (`pay_name`,`pay_min_count`,`pay_rate`,`pay_currency`) VALUES ('Power-Paket', 10, 2000.00000, '€')");
-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_paytypes` (`pay_name`,`pay_min_count`,`pay_rate`,`pay_currency`) VALUES ('Sponsor-Paket', 20, 4000.00000, '€')");
+               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_paytypes` (`pay_name`, `pay_min_count`, `pay_rate`, `pay_currency`) VALUES ('Standard-Paket', 5, 1000.00000, '€')");
+               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_paytypes` (`pay_name`, `pay_min_count`, `pay_rate`, `pay_currency`) VALUES ('Spar-Paket', 1, 200.00000, '€')");
+               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_paytypes` (`pay_name`, `pay_min_count`, `pay_rate`, `pay_currency`) VALUES ('Power-Paket', 10, 2000.00000, '€')");
+               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_paytypes` (`pay_name`, `pay_min_count`, `pay_rate`, `pay_currency`) VALUES ('Sponsor-Paket', 20, 4000.00000, '€')");

                //
                // Admin menu
                //
                //
                // Admin menu
                //

diff --git a/inc/extensions/ext-sql_patches.php b/inc/extensions/ext-sql_patches.php
index 5adb509dfaf73d88f2dd21bf2c95144ea0779a89..fcd19bfb748cd7209ab76b7898df827b5e5ca284 100644 (file)
--- a/inc/extensions/ext-sql_patches.php
+++ b/inc/extensions/ext-sql_patches.php
@@ -41,10 +41,10 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Version number
 } // END - if
 
 // Version number

-setThisExtensionVersion('0.8.1');
+setThisExtensionVersion('0.8.2');

 
 // Version history array (add more with , '0.0.1' and so on)
 
 // Version history array (add more with , '0.0.1' and so on)

-setExtensionVersionHistory(array('0.0.0', '0.0.1', '0.0.2', '0.0.3', '0.0.4', '0.0.5', '0.0.6', '0.0.7', '0.0.8', '0.0.9', '0.1.0', '0.1.1', '0.1.2', '0.1.3', '0.1.4', '0.1.5', '0.1.6', '0.1.7', '0.1.8', '0.1.9', '0.2.0', '0.2.1', '0.2.2', '0.2.3', '0.2.4', '0.2.5', '0.2.6', '0.2.7', '0.2.8', '0.2.9', '0.3.0', '0.3.1', '0.3.2', '0.3.3', '0.3.4', '0.3.5', '0.3.6', '0.3.7', '0.3.8', '0.3.9', '0.4.0', '0.4.1', '0.4.2', '0.4.3', '0.4.4', '0.4.5', '0.4.6', '0.4.7', '0.4.8', '0.4.9', '0.5.0', '0.5.1', '0.5.2', '0.5.3', '0.5.4', '0.5.5', '0.5.6', '0.5.7', '0.5.8', '0.5.9', '0.6.0', '0.6.1', '0.6.2', '0.6.3', '0.6.4', '0.6.4', '0.6.5', '0.6.6', '0.6.7', '0.6.8', '0.6.9', '0.7.0', '0.7.1', '0.7.2', '0.7.3', '0.7.4', '0.7.5', '0.7.6', '0.7.7', '0.7.8', '0.7.9', '0.8.0', '0.8.1'));
+setExtensionVersionHistory(array('0.0.0', '0.0.1', '0.0.2', '0.0.3', '0.0.4', '0.0.5', '0.0.6', '0.0.7', '0.0.8', '0.0.9', '0.1.0', '0.1.1', '0.1.2', '0.1.3', '0.1.4', '0.1.5', '0.1.6', '0.1.7', '0.1.8', '0.1.9', '0.2.0', '0.2.1', '0.2.2', '0.2.3', '0.2.4', '0.2.5', '0.2.6', '0.2.7', '0.2.8', '0.2.9', '0.3.0', '0.3.1', '0.3.2', '0.3.3', '0.3.4', '0.3.5', '0.3.6', '0.3.7', '0.3.8', '0.3.9', '0.4.0', '0.4.1', '0.4.2', '0.4.3', '0.4.4', '0.4.5', '0.4.6', '0.4.7', '0.4.8', '0.4.9', '0.5.0', '0.5.1', '0.5.2', '0.5.3', '0.5.4', '0.5.5', '0.5.6', '0.5.7', '0.5.8', '0.5.9', '0.6.0', '0.6.1', '0.6.2', '0.6.3', '0.6.4', '0.6.4', '0.6.5', '0.6.6', '0.6.7', '0.6.8', '0.6.9', '0.7.0', '0.7.1', '0.7.2', '0.7.3', '0.7.4', '0.7.5', '0.7.6', '0.7.7', '0.7.8', '0.7.9', '0.8.0', '0.8.1', '0.8.2'));

 
 // Keep this extension always active!
 setExtensionAlwaysActive('Y');
 
 // Keep this extension always active!
 setExtensionAlwaysActive('Y');


@@ -178,8 +178,6 @@ IN (
                                break;
 
                        case '0.1.0': // SQL queries for v0.1.0
                                break;
 
                        case '0.1.0': // SQL queries for v0.1.0

-                               addConfigAddSql('reg_points_mode', "ENUM('ref','direct') NOT NULL DEFAULT 'ref'");
-

                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Soll der einmalige Ref-Bonus über das Referal-System (also alle oberen Refs bekommen auch etwas davon ab) oder direkt dem Werber aufgebucht werden?");
                                break;
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Soll der einmalige Ref-Bonus über das Referal-System (also alle oberen Refs bekommen auch etwas davon ab) oder direkt dem Werber aufgebucht werden?");
                                break;


@@ -557,7 +555,7 @@ INDEX (`admin_id`)",
                        case '0.5.0': // SQL queries for v0.5.0
                                addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_refsystem` DROP INDEX `level`');
                                addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_refsystem` DROP INDEX `userid`');
                        case '0.5.0': // SQL queries for v0.5.0
                                addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_refsystem` DROP INDEX `level`');
                                addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_refsystem` DROP INDEX `userid`');

-                               addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_refsystem` ADD UNIQUE `userid_level` (`userid`,`level`)');
+                               addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_refsystem` ADD UNIQUE `userid_level` (`userid`, `level`)');

 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Referal-System unterstützt nun detailierte Referal-Übersicht und vieles mehr.");
 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Referal-System unterstützt nun detailierte Referal-Übersicht und vieles mehr.");


@@ -797,8 +795,6 @@ INDEX (`ip`)",
                                break;
 
                        case '0.7.8': // SQL queries for v0.7.8
                                break;
 
                        case '0.7.8': // SQL queries for v0.7.8

-                               addConfigChangeSql('reg_points_mode', 'reg_points_mode', "ENUM('REF','DIRECT') NOT NULL DEFAULT 'REFERAL'");
-

                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Konfigurationseintr&auml;ge mit Spaltentyp <strong>ENUM</strong> werden nun immer komplett gross geschrieben.");
                                break;
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Konfigurationseintr&auml;ge mit Spaltentyp <strong>ENUM</strong> werden nun immer komplett gross geschrieben.");
                                break;


@@ -811,16 +807,16 @@ INDEX (`ip`)",
                                break;
 
                        case '0.8.0': // SQL queries for v0.8.0
                                break;
 
                        case '0.8.0': // SQL queries for v0.8.0

-                               // Points account data
-                               addDropTableSql('points_data');
+                               // Points account data (this table should not be dropped or else you may have to re-install a lot extensions)

                                addCreateTableSql('points_data', "
 `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
                                addCreateTableSql('points_data', "
 `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,

-`ext_name` VARCHAR(255) NOT NULL DEFAULT '',
+`subject` VARCHAR(255) NOT NULL DEFAULT '',

 `column_name` VARCHAR(255) NOT NULL DEFAULT 'points',
 `locked_mode` ENUM('LOCKED','UNLOCKED') NOT NULL DEFAULT 'LOCKED',
 `column_name` VARCHAR(255) NOT NULL DEFAULT 'points',
 `locked_mode` ENUM('LOCKED','UNLOCKED') NOT NULL DEFAULT 'LOCKED',

-`payment_method` ENUM('DIRECT','REF') NOT NULL DEFAULT 'REF',
+`payment_method` ENUM('DIRECT','REFERAL') NOT NULL DEFAULT 'REFERAL',
+`notify_recipient` ENUM('Y','N') NOT NULL DEFAULT 'N',

 PRIMARY KEY(`id`),
 PRIMARY KEY(`id`),

-INDEX (`ext_name`)",
+INDEX (`subject`)",

                                        'Points account data');
 
                                // Admin menu
                                        'Points account data');
 
                                // Admin menu


@@ -837,6 +833,20 @@ INDEX (`ext_name`)",
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Level 0 ist nun auch NULL.");
                                break;
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Level 0 ist nun auch NULL.");
                                break;

+
+                       case '0.8.2': // SQL queries for v0.8.2
+                               addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_points_data` DROP INDEX `ext_name`");
+                               addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_points_data` CHANGE `ext_name` `subject` VARCHAR(255) NOT NULL DEFAULT ''");
+                               addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_points_data` CHANGE `payment_method` `payment_method` ENUM('DIRECT','REFERAL') NOT NULL DEFAULT 'REFERAL'");
+                               addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_points_data` ADD INDEX `subject` (`subject`)");
+                               addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_points_data` ADD `notify_recipient` ENUM('Y','N') NOT NULL DEFAULT 'N'");
+                               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_points_data` (`subject`, `column_name`, `locked_mode`, `payment_method`) VALUES ('pool_payback','points','LOCKED','DIRECT')");
+                               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_points_data` (`subject`, `column_name`, `locked_mode`, `payment_method`) VALUES ('mail_deleted','points','LOCKED','DIRECT')");
+                               addConfigDropSql('reg_points_mode');
+
+                               // Update notes (these will be set as task text!)
+                               setExtensionUpdateNotes("Es sollte der Gutschriftenbetreff und nicht der Erweiterungsname gepeichert werden, zudem brauchen wir einen Konfigurationseintrag nicht mehr.");
+                               break;

                } // END - switch
                break;
 
                } // END - switch
                break;
 

diff --git a/inc/extensions/ext-surfbar.php b/inc/extensions/ext-surfbar.php
index f3e8a896b83b3967ba336c144c318bb7bade3e20..e0f0156358447396a880fa032c00510119f73d8b 100644 (file)
--- a/inc/extensions/ext-surfbar.php
+++ b/inc/extensions/ext-surfbar.php
@@ -68,8 +68,8 @@ switch (getExtensionMode()) {
 `url_reject_reason` VARCHAR(255) NOT NULL DEFAULT '',
 `url_fixed_reload` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 PRIMARY KEY (`url_id`),
 `url_reject_reason` VARCHAR(255) NOT NULL DEFAULT '',
 `url_fixed_reload` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 PRIMARY KEY (`url_id`),

-UNIQUE KEY `userid_url` (`url_userid`,`url`),
-INDEX `status_userid` (`url_status`,`url_userid`)",
+UNIQUE KEY `userid_url` (`url_userid`, `url`),
+INDEX `status_userid` (`url_status`, `url_userid`)",

                        'Surfbar URLs');
 
                // Reload locks
                        'Surfbar URLs');
 
                // Reload locks


@@ -80,7 +80,7 @@ INDEX `status_userid` (`url_status`,`url_userid`)",
 `locks_url_id` BIGINT(20) UNSIGNED  NOT NULL DEFAULT 0,
 `locks_last_surfed` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 PRIMARY KEY (`locks_id`),
 `locks_url_id` BIGINT(20) UNSIGNED  NOT NULL DEFAULT 0,
 `locks_last_surfed` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 PRIMARY KEY (`locks_id`),

-UNIQUE KEY `userid_url` (`locks_userid`,`locks_url_id`),
+UNIQUE KEY `userid_url` (`locks_userid`, `locks_url_id`),

 INDEX (`locks_url_id`)",
                        'Surfbar reload locks');
 
 INDEX (`locks_url_id`)",
                        'Surfbar reload locks');
 


@@ -92,7 +92,7 @@ INDEX (`locks_url_id`)",
 `salts_url_id` BIGINT(20) UNSIGNED  NOT NULL DEFAULT 0,
 `salts_last_salt` VARCHAR(255) NOT NULL DEFAULT '',
 PRIMARY KEY (`salts_id`),
 `salts_url_id` BIGINT(20) UNSIGNED  NOT NULL DEFAULT 0,
 `salts_last_salt` VARCHAR(255) NOT NULL DEFAULT '',
 PRIMARY KEY (`salts_id`),

-UNIQUE KEY `salts_userid_url` (`salts_userid`,`salts_url_id`),
+UNIQUE KEY `salts_userid_url` (`salts_userid`, `salts_url_id`),

 INDEX (`salts_url_id`)",
                        'Surfbar last used salts');
 
 INDEX (`salts_url_id`)",
                        'Surfbar last used salts');
 


@@ -105,7 +105,7 @@ INDEX (`salts_url_id`)",
 `stats_count` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `stats_last_surfed` TIMESTAMP ON UPDATE CURRENT_TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 PRIMARY KEY (`stats_id`),
 `stats_count` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `stats_last_surfed` TIMESTAMP ON UPDATE CURRENT_TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 PRIMARY KEY (`stats_id`),

-UNIQUE KEY `userid_url` (`stats_userid`,`stats_url_id`),
+UNIQUE KEY `userid_url` (`stats_userid`, `stats_url_id`),

 INDEX (`stats_url_id`)",
                        'Surfbar Statistics');
 
 INDEX (`stats_url_id`)",
                        'Surfbar Statistics');
 


@@ -117,33 +117,33 @@ INDEX (`stats_url_id`)",
 `actions_action` ENUM('EDIT','DELETE','PAUSE','UNPAUSE','FRAMETEST','RETREAT','RESUBMIT','BOOKNOW') NULL DEFAULT NULL,
 `actions_new_status` ENUM('PENDING','ACTIVE','LOCKED','STOPPED','REJECTED','DELETED','MIGRATED','DEPLETED') NULL DEFAULT NULL,
 PRIMARY KEY (`actions_id`),
 `actions_action` ENUM('EDIT','DELETE','PAUSE','UNPAUSE','FRAMETEST','RETREAT','RESUBMIT','BOOKNOW') NULL DEFAULT NULL,
 `actions_new_status` ENUM('PENDING','ACTIVE','LOCKED','STOPPED','REJECTED','DELETED','MIGRATED','DEPLETED') NULL DEFAULT NULL,
 PRIMARY KEY (`actions_id`),

-UNIQUE KEY `status_action` (`actions_status`,`actions_action`)",
+UNIQUE KEY `status_action` (`actions_status`, `actions_action`)",

                        'Surfbar Member Actions');
 
                // Member actions
                        'Surfbar Member Actions');
 
                // Member actions

-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_actions` (`actions_status`,`actions_action`,`actions_new_status`) VALUES ('PENDING','RETREAT','DELETED')");
-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_actions` (`actions_status`,`actions_action`,`actions_new_status`) VALUES ('PENDING','FRAMETEST',NULL)");
-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_actions` (`actions_status`,`actions_action`,`actions_new_status`) VALUES ('PENDING','EDIT',NULL)");
-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_actions` (`actions_status`,`actions_action`,`actions_new_status`) VALUES ('ACTIVE','EDIT','PENDING')");
-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_actions` (`actions_status`,`actions_action`,`actions_new_status`) VALUES ('ACTIVE','DELETE','DELETED')");
-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_actions` (`actions_status`,`actions_action`,`actions_new_status`) VALUES ('ACTIVE','PAUSE','STOPPED')");
-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_actions` (`actions_status`,`actions_action`,`actions_new_status`) VALUES ('ACTIVE','FRAMETEST',NULL)");
-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_actions` (`actions_status`,`actions_action`,`actions_new_status`) VALUES ('LOCKED','DELETE','DELETED')");
-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_actions` (`actions_status`,`actions_action`,`actions_new_status`) VALUES ('LOCKED','FRAMETEST',NULL)");
-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_actions` (`actions_status`,`actions_action`,`actions_new_status`) VALUES ('LOCKED','RESUBMIT','PENDING')");
-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_actions` (`actions_status`,`actions_action`,`actions_new_status`) VALUES ('STOPPED','EDIT','PENDING')");
-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_actions` (`actions_status`,`actions_action`,`actions_new_status`) VALUES ('STOPPED','DELETE','DELETED')");
-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_actions` (`actions_status`,`actions_action`,`actions_new_status`) VALUES ('STOPPED','UNPAUSE','PENDING')");
-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_actions` (`actions_status`,`actions_action`,`actions_new_status`) VALUES ('DEPLETED','EDIT','PENDING')");
-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_actions` (`actions_status`,`actions_action`,`actions_new_status`) VALUES ('DEPLETED','DELETE','DELETED')");
-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_actions` (`actions_status`,`actions_action`,`actions_new_status`) VALUES ('REJECTED','EDIT','PENDING')");
-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_actions` (`actions_status`,`actions_action`,`actions_new_status`) VALUES ('REJECTED','DELETE','DELETED')");
-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_actions` (`actions_status`,`actions_action`,`actions_new_status`) VALUES ('REJECTED','FRAMETEST',NULL)");
-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_actions` (`actions_status`,`actions_action`,`actions_new_status`) VALUES ('REJECTED','RESUBMIT','PENDING')");
-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_actions` (`actions_status`,`actions_action`,`actions_new_status`) VALUES ('MIGRATED','EDIT','MIGRATED')");
-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_actions` (`actions_status`,`actions_action`,`actions_new_status`) VALUES ('MIGRATED','DELETE','DELETED')");
-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_actions` (`actions_status`,`actions_action`,`actions_new_status`) VALUES ('MIGRATED','FRAMETEST',NULL)");
-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_actions` (`actions_status`,`actions_action`,`actions_new_status`) VALUES ('MIGRATED','BOOKNOW','PENDING')");
+               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_actions` (`actions_status`, `actions_action`, `actions_new_status`) VALUES ('PENDING','RETREAT','DELETED')");
+               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_actions` (`actions_status`, `actions_action`, `actions_new_status`) VALUES ('PENDING','FRAMETEST',NULL)");
+               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_actions` (`actions_status`, `actions_action`, `actions_new_status`) VALUES ('PENDING','EDIT',NULL)");
+               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_actions` (`actions_status`, `actions_action`, `actions_new_status`) VALUES ('ACTIVE','EDIT','PENDING')");
+               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_actions` (`actions_status`, `actions_action`, `actions_new_status`) VALUES ('ACTIVE','DELETE','DELETED')");
+               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_actions` (`actions_status`, `actions_action`, `actions_new_status`) VALUES ('ACTIVE','PAUSE','STOPPED')");
+               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_actions` (`actions_status`, `actions_action`, `actions_new_status`) VALUES ('ACTIVE','FRAMETEST',NULL)");
+               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_actions` (`actions_status`, `actions_action`, `actions_new_status`) VALUES ('LOCKED','DELETE','DELETED')");
+               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_actions` (`actions_status`, `actions_action`, `actions_new_status`) VALUES ('LOCKED','FRAMETEST',NULL)");
+               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_actions` (`actions_status`, `actions_action`, `actions_new_status`) VALUES ('LOCKED','RESUBMIT','PENDING')");
+               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_actions` (`actions_status`, `actions_action`, `actions_new_status`) VALUES ('STOPPED','EDIT','PENDING')");
+               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_actions` (`actions_status`, `actions_action`, `actions_new_status`) VALUES ('STOPPED','DELETE','DELETED')");
+               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_actions` (`actions_status`, `actions_action`, `actions_new_status`) VALUES ('STOPPED','UNPAUSE','PENDING')");
+               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_actions` (`actions_status`, `actions_action`, `actions_new_status`) VALUES ('DEPLETED','EDIT','PENDING')");
+               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_actions` (`actions_status`, `actions_action`, `actions_new_status`) VALUES ('DEPLETED','DELETE','DELETED')");
+               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_actions` (`actions_status`, `actions_action`, `actions_new_status`) VALUES ('REJECTED','EDIT','PENDING')");
+               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_actions` (`actions_status`, `actions_action`, `actions_new_status`) VALUES ('REJECTED','DELETE','DELETED')");
+               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_actions` (`actions_status`, `actions_action`, `actions_new_status`) VALUES ('REJECTED','FRAMETEST',NULL)");
+               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_actions` (`actions_status`, `actions_action`, `actions_new_status`) VALUES ('REJECTED','RESUBMIT','PENDING')");
+               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_actions` (`actions_status`, `actions_action`, `actions_new_status`) VALUES ('MIGRATED','EDIT','MIGRATED')");
+               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_actions` (`actions_status`, `actions_action`, `actions_new_status`) VALUES ('MIGRATED','DELETE','DELETED')");
+               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_actions` (`actions_status`, `actions_action`, `actions_new_status`) VALUES ('MIGRATED','FRAMETEST',NULL)");
+               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_actions` (`actions_status`, `actions_action`, `actions_new_status`) VALUES ('MIGRATED','BOOKNOW','PENDING')");

 
                // Config entries
                addConfigAddSql('surfbar_payment_model', "ENUM('STATIC','DYNAMIC') NOT NULL DEFAULT 'STATIC'");
 
                // Config entries
                addConfigAddSql('surfbar_payment_model', "ENUM('STATIC','DYNAMIC') NOT NULL DEFAULT 'STATIC'");


@@ -196,6 +196,12 @@ UNIQUE KEY `status_action` (`actions_status`,`actions_action`)",
                // Register module
                addModuleSql('surfbar', 'Y', 'Y', 'N', 'N');
 
                // Register module
                addModuleSql('surfbar', 'Y', 'Y', 'N', 'N');
 

+               // Insert data for points accounts
+               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_points_data` (`subject`, `column_name`, `locked_mode`, `payment_method`) VALUES ('monthly_bonus','points','LOCKED','DIRECT')");
+
+               // This extension depends on ext-sql_patches
+               addExtensionDependency('sql_patches');
+

                // Register filters
                registerFilter('post_change_surfbar_url_status', 'SURFBAR_CHANGE_URL_STATUS', false, true, isExtensionDryRun());
                registerFilter('pre_change_surfbar_url_status', 'SURFBAR_CHANGE_URL_VALIDATE_DATA', false, true, isExtensionDryRun());
                // Register filters
                registerFilter('post_change_surfbar_url_status', 'SURFBAR_CHANGE_URL_STATUS', false, true, isExtensionDryRun());
                registerFilter('pre_change_surfbar_url_status', 'SURFBAR_CHANGE_URL_VALIDATE_DATA', false, true, isExtensionDryRun());

diff --git a/inc/extensions/ext-transfer.php b/inc/extensions/ext-transfer.php
index ebd9ba3152e6bf558d618bd7da9ad43e22bae073..200775833acbfb4a28b79cc5764888a5eccff1af 100644 (file)
--- a/inc/extensions/ext-transfer.php
+++ b/inc/extensions/ext-transfer.php
@@ -41,10 +41,10 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Version number
 } // END - if
 
 // Version number

-setThisExtensionVersion('0.2.9');
+setThisExtensionVersion('0.3.0');

 
 // Version history array (add more with , '0.0.1' and so on)
 
 // Version history array (add more with , '0.0.1' and so on)

-setExtensionVersionHistory(array('0.0.0', '0.0.1', '0.0.2', '0.0.3', '0.0.4', '0.0.5', '0.0.6', '0.0.7', '0.0.8', '0.0.9', '0.1.0', '0.1.1', '0.1.2', '0.1.3', '0.1.4', '0.1.5', '0.1.6', '0.1.7', '0.1.8', '0.1.9', '0.2.0', '0.2.1', '0.2.2', '0.2.3', '0.2.4', '0.2.5', '0.2.6', '0.2.7', '0.2.8', '0.2.9'));
+setExtensionVersionHistory(array('0.0.0', '0.0.1', '0.0.2', '0.0.3', '0.0.4', '0.0.5', '0.0.6', '0.0.7', '0.0.8', '0.0.9', '0.1.0', '0.1.1', '0.1.2', '0.1.3', '0.1.4', '0.1.5', '0.1.6', '0.1.7', '0.1.8', '0.1.9', '0.2.0', '0.2.1', '0.2.2', '0.2.3', '0.2.4', '0.2.5', '0.2.6', '0.2.7', '0.2.8', '0.2.9', '0.3.0'));

 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running
 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running


@@ -269,7 +269,17 @@ KEY (`to_userid`)",
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Fehlerhinweis bei deaktivierter Erweiterung verbessert.");
                                break;
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Fehlerhinweis bei deaktivierter Erweiterung verbessert.");
                                break;

-               }
+
+                       case '0.3.0': // SQL queries for v0.3.0
+                               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_points_data` (`subject`, `column_name`, `locked_mode`, `payment_method`) VALUES ('transfer','points','LOCKED','DIRECT')");
+
+                               // This depends on ext-sql_patches
+                               addExtensionDependency('sql_patches');
+
+                               // Update notes
+                               setExtensionUpdateNotes("&Uuml;nerweisungen anderer Mitglieder werden nun &uuml;ber die Tabelle <strong>{OPEN_CONFIG}_MYSQL_PREFIX{CLOSE_CONFIG}_points_data</strong> verwaltet.");
+                               break;
+               } // END - switch

                break;
 
        case 'modify': // When the extension got modified
                break;
 
        case 'modify': // When the extension got modified


@@ -288,7 +298,7 @@ KEY (`to_userid`)",
        default: // Unknown extension mode
                logDebugMessage(__FILE__, __LINE__, sprintf("Unknown extension mode %s in extension %s detected.", getExtensionMode(), getCurrentExtensionName()));
                break;
        default: // Unknown extension mode
                logDebugMessage(__FILE__, __LINE__, sprintf("Unknown extension mode %s in extension %s detected.", getExtensionMode(), getCurrentExtensionName()));
                break;

-}
+} // END - switch

 
 // [EOF]
 ?>
 
 // [EOF]
 ?>

diff --git a/inc/extensions/ext-user.php b/inc/extensions/ext-user.php
index 195d0dd1aa1516c185c7689276b0b7a3786736f2..76cebee280107558983a0aae3644a9de559f4113 100644 (file)
--- a/inc/extensions/ext-user.php
+++ b/inc/extensions/ext-user.php
@@ -99,7 +99,7 @@ INDEX (`cat_id`)",
 PRIMARY KEY (`userid`),
 UNIQUE (`user_hash`),
 INDEX (`refid`),
 PRIMARY KEY (`userid`),
 UNIQUE (`user_hash`),
 INDEX (`refid`),

-INDEX `status_mails` (`status`,`max_mails`)",
+INDEX `status_mails` (`status`, `max_mails`)",

                        'Main user data');
 
                addDropTableSql('user_points');
                        'Main user data');
 
                addDropTableSql('user_points');

diff --git a/inc/extensions/ext-wernis.php b/inc/extensions/ext-wernis.php
index 3f6a9240ac9cd6ccae3f87cef770f7e7b51b8093..0418aa952c058b0f2ee5d431c83b3c88e4a86efc 100644 (file)
--- a/inc/extensions/ext-wernis.php
+++ b/inc/extensions/ext-wernis.php
@@ -41,10 +41,10 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Version of this extension
 } // END - if
 
 // Version of this extension

-setThisExtensionVersion('0.0.3');
+setThisExtensionVersion('0.0.4');

 
 // Version history array (add more with , '0.0.1' and so on)
 
 // Version history array (add more with , '0.0.1' and so on)

-setExtensionVersionHistory(array('0.0.0', '0.0.1', '0.0.2', '0.0.3'));
+setExtensionVersionHistory(array('0.0.0', '0.0.1', '0.0.2', '0.0.3', '0.0.4'));

 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running
 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running


@@ -134,6 +134,16 @@ INDEX (`userid`)",
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("WDS66-Username muss nun eintragen werden (API-Anpassung).");
                                break;
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("WDS66-Username muss nun eintragen werden (API-Anpassung).");
                                break;

+
+                       case '0.0.4': // SQL queries for v0.0.4
+                               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_points_data` (`subject`, `column_name`, `locked_mode`, `payment_method`) VALUES ('wernis_withdraw','order_points','LOCKED','DIRECT')");
+
+                               // This depends on ext-sql_patches
+                               addExtensionDependency('sql_patches');
+
+                               // Update notes
+                               setExtensionUpdateNotes("&Uuml;berweisungen vom Portal werden nun &uuml;ber die Tabelle <strong>{OPEN_CONFIG}_MYSQL_PREFIX{CLOSE_CONFIG}_points_data</strong> verwaltet.");
+                               break;

                } // END - switch
                break;
 
                } // END - switch
                break;
 

diff --git a/inc/extensions/ext-yoomedia.php b/inc/extensions/ext-yoomedia.php
index 7e52a3bb008f94115f4ce0342f49f4c0d50deb2b..a1ae4ba2e25636a1f9b09f0b2a4c8bafdbed1e6b 100644 (file)
--- a/inc/extensions/ext-yoomedia.php
+++ b/inc/extensions/ext-yoomedia.php
@@ -80,7 +80,7 @@ switch (getExtensionMode()) {
 `y_reload` SMALLINT(6) UNSIGNED NOT NULL DEFAULT 0,
 `inserted` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 PRIMARY KEY (`id`),
 `y_reload` SMALLINT(6) UNSIGNED NOT NULL DEFAULT 0,
 `inserted` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 PRIMARY KEY (`id`),

-UNIQUE `y_type` (`type`,`y_id`)",
+UNIQUE `y_type` (`type`, `y_id`)",

                        'Reload lock reminder for Yoo!Media campaigns');
                break;
 
                        'Reload lock reminder for Yoo!Media campaigns');
                break;
 

diff --git a/inc/filter-functions.php b/inc/filter-functions.php
index cadab03f460a91d83ff08ca17db5daa1d7ff0be7..d4d890b7c59a3c94bfb07143e1ff74354fc2c32c 100644 (file)
--- a/inc/filter-functions.php
+++ b/inc/filter-functions.php
@@ -64,7 +64,7 @@ function initFilterSystem () {
 
                // Load all filters
                $result = SQL_QUERY('SELECT
 
                // Load all filters
                $result = SQL_QUERY('SELECT

-       `filter_name`,`filter_function`,`filter_active`' . $add . '
+       `filter_name`, `filter_function`, `filter_active`' . $add . '

 FROM
        `{?_MYSQL_PREFIX?}_filters`
 ORDER BY
 FROM
        `{?_MYSQL_PREFIX?}_filters`
 ORDER BY

diff --git a/inc/filter/coupon_filter.php b/inc/filter/coupon_filter.php
index 4aa7b8e82f195ad21b8fd8fd2abe4eefc3f3ccea..9a25fb0100c73f531ece318b88a2a360389b5d2c 100644 (file)
--- a/inc/filter/coupon_filter.php
+++ b/inc/filter/coupon_filter.php
@@ -42,9 +42,10 @@ if (!defined('__SECURITY')) {
 
 // Filter to change column name for the right "points account"
 function FILTER_COUPON_CHANGE_POINTS_COLUMN_NAME ($filterData) {
 
 // Filter to change column name for the right "points account"
 function FILTER_COUPON_CHANGE_POINTS_COLUMN_NAME ($filterData) {

-       // Get the column name from extension's name and 'locked'

        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');

-       $filterData['column'] = getPointsColumnNameFromExtensionNameLocked('coupon', $filterData['locked']);
+       // Get the column name from extension's name and 'locked'
+       die('<pre>'.print_r($filterData,true).'</pre>');
+       $filterData['column'] = getPointsColumnNameFromSubjectLocked($filterData['subject'], $filterData['locked']);

 
        // Return data
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!');
 
        // Return data
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!');

diff --git a/inc/filter/order_filter.php b/inc/filter/order_filter.php
index 1e508f73a5d5be5a310cea426d18825d44bb28d1..dd80fcdc355d33a1217c8a0f2e528ac5b94029e0 100644 (file)
--- a/inc/filter/order_filter.php
+++ b/inc/filter/order_filter.php
@@ -42,8 +42,8 @@ if (!defined('__SECURITY')) {
 
 // Filter for returning given user's order points
 function FILTER_ORDER_POINTS ($filterData) {
 
 // Filter for returning given user's order points
 function FILTER_ORDER_POINTS ($filterData) {

-       // Is ext-user installed and active?

        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');

+       // Is ext-user installed and active?

        if (isExtensionActive('user')) {
                // Get the points and add them to the existing
                $filterData['points'] += countSumTotalData($filterData['userid'], 'user_points', 'order_points');
        if (isExtensionActive('user')) {
                // Get the points and add them to the existing
                $filterData['points'] += countSumTotalData($filterData['userid'], 'user_points', 'order_points');

diff --git a/inc/filters.php b/inc/filters.php
index 5a52b5e742e56957376780c0611d11f7872b7a0b..775b140a7ba158373ccd98daa20d68430f161ed9 100644 (file)
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -70,7 +70,7 @@ function FILTER_FLUSH_FILTERS () {
        $removed = '0';
 
        // Prepare SQL queries
        $removed = '0';
 
        // Prepare SQL queries

-       $insertSQL = 'INSERT INTO `{?_MYSQL_PREFIX?}_filters` (`filter_name`,`filter_function`,`filter_active`) VALUES';
+       $insertSQL = 'INSERT INTO `{?_MYSQL_PREFIX?}_filters` (`filter_name`, `filter_function`, `filter_active`) VALUES';

        $removeSQL = 'DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_filters` WHERE';
 
        // Write all filters to database
        $removeSQL = 'DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_filters` WHERE';
 
        // Write all filters to database

diff --git a/inc/fix_user_points.php b/inc/fix_user_points.php
index addaae100c6c3931adc406130d6ca87d8f714e15..0d8dd917c26ec03b21f8b2252113f7f365fb0d0c 100644 (file)
--- a/inc/fix_user_points.php
+++ b/inc/fix_user_points.php
@@ -74,7 +74,7 @@ if (!SQL_HASZERONUMS($result)) {
                                // Nothing has been updated?
                                if (SQL_HASZEROAFFECTED()) {
                                        // Then insert it
                                // Nothing has been updated?
                                if (SQL_HASZEROAFFECTED()) {
                                        // Then insert it

-                                       SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_points` (`userid`,`ref_depth`,`%s`) VALUES(%s,NULL,%s)",
+                                       SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_points` (`userid`, `ref_depth`, `%s`) VALUES (%s,NULL,%s)",

                                                array(
                                                        $column,
                                                        $row['userid'],
                                                array(
                                                        $column,
                                                        $row['userid'],

diff --git a/inc/functions.php b/inc/functions.php
index c85d6fde9ab3ecafe1d007323eb746dac57a7dd4..08fa13dc1783c29bcdaf8fe0502ea790e97c86d1 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -2410,6 +2410,24 @@ function translateTaskType ($taskType) {
        return $message;
 }
 
        return $message;
 }
 

+// Translates points subject to human-readable
+function translatePointsSubject ($subject) {
+       // Construct message id
+       $messageId = 'POINTS_SUBJECT_' . strtoupper($subject) . '';
+
+       // Is the message id there?
+       if (isMessageIdValid($messageId)) {
+               // Then construct message
+               $message = '{--' . $messageId . '--}';
+       } else {
+               // Else it is an unknown task type
+               $message = '{%message,POINTS_SUBJECT_UNKNOWN=' . $subject . '%}';
+       } // END - if
+
+       // Return message
+       return $message;
+}
+

 // "Translates" 'true' to true and 'false' to false
 function convertStringToBoolean ($str) {
        // Trim it lower-case for validation
 // "Translates" 'true' to true and 'false' to false
 function convertStringToBoolean ($str) {
        // Trim it lower-case for validation

diff --git a/inc/gen_refback.php b/inc/gen_refback.php
index cd20c0f730b69cf921fb33be4b9390c0f215d8cb..9f137f0bfd6cfd330a9c9102851226a65c6b2c55 100644 (file)
--- a/inc/gen_refback.php
+++ b/inc/gen_refback.php
@@ -53,7 +53,7 @@ if (!SQL_HASZERONUMS($result)) {
        SQL_QUERY('UPDATE `{?_MYSQL_PREFIX?}_refsystem` SET `level`=`level`+1', __FILE__, __LINE__);
 
        // Add it again
        SQL_QUERY('UPDATE `{?_MYSQL_PREFIX?}_refsystem` SET `level`=`level`+1', __FILE__, __LINE__);
 
        // Add it again

-       SQL_ALTER_TABLE('ALTER TABLE `{?_MYSQL_PREFIX?}_refsystem` ADD UNIQUE `userid_level` ( `userid`,`level` )', __FILE__, __LINE__);
+       SQL_ALTER_TABLE('ALTER TABLE `{?_MYSQL_PREFIX?}_refsystem` ADD UNIQUE `userid_level` ( `userid`, `level` )', __FILE__, __LINE__);

 
        // Rebuild cache
        rebuildCache('refsystem', 'refsystem');
 
        // Rebuild cache
        rebuildCache('refsystem', 'refsystem');

diff --git a/inc/language/beg_de.php b/inc/language/beg_de.php
index 700eecaa99bc336fe5e6c50b9bb01903629c6d8a..fb225999672554ab66453aae9d98418f25f36ca3 100644 (file)
--- a/inc/language/beg_de.php
+++ b/inc/language/beg_de.php
@@ -74,7 +74,6 @@ addMessages(array(
        'GUEST_BEG_HAVE_FUN' => "Heute noch anmelden und Spass haben.",
        'ADMIN_CONFIG_BEG_POINTS_MAX' => "Maximale erbettelbare {?POINTS?} bei Klick auf Bettellink",
        'ADMIN_CONFIG_BEG_USERID' => "Mitglied-Account zum Abbuchen der erbettelten {?POINTS?}",
        'GUEST_BEG_HAVE_FUN' => "Heute noch anmelden und Spass haben.",
        'ADMIN_CONFIG_BEG_POINTS_MAX' => "Maximale erbettelbare {?POINTS?} bei Klick auf Bettellink",
        'ADMIN_CONFIG_BEG_USERID' => "Mitglied-Account zum Abbuchen der erbettelten {?POINTS?}",

-       'ADMIN_CONFIG_SELECT_BEG_MODE' => "Vergütungsmodus der erbettelten {?POINTS?}",

        'BEG_SORRY_YOURE_LOGGED_IN_1' => "Oh, schade! Sie haben vermutlich auf Ihren eigenen Bettel-Link mit der Mitglieder-Id ",
        'BEG_SORRY_YOURE_LOGGED_IN_2' => " geklickt. Sie haben somit auch keine ",
        'BEG_SORRY_YOURE_LOGGED_IN_3' => " {?POINTS?} erhalten.",
        'BEG_SORRY_YOURE_LOGGED_IN_1' => "Oh, schade! Sie haben vermutlich auf Ihren eigenen Bettel-Link mit der Mitglieder-Id ",
        'BEG_SORRY_YOURE_LOGGED_IN_2' => " geklickt. Sie haben somit auch keine ",
        'BEG_SORRY_YOURE_LOGGED_IN_3' => " {?POINTS?} erhalten.",

diff --git a/inc/language/birthday_de.php b/inc/language/birthday_de.php
index 64b81b985184bea4878bb0cf25e5d9f1939c177c..db2aea6953205ee18da30736a3cbb93b05a63da4 100644 (file)
--- a/inc/language/birthday_de.php
+++ b/inc/language/birthday_de.php
@@ -48,7 +48,6 @@ addMessages(array(
        'ADMIN_CONFIG_BIRTHDAY_POINTS_NOTE' => "Wert <strong>0</strong> deaktiviert die Extragutschrift.",
        'MEMBER_BIRTHDAY_CANNOT_STATUS' => "Kann keine {?POINTS?} gutschreiben! Status Ihres Accounts: <span class=\"data\">{%%pipe,translateUserStatus=%s%%}</span>",
        'MEMBER_BIRTHDAY_CANNOT_LOAD_DATA' => "Entweder haben Sie bereits Ihr Geburtsgeschenk erhalten oder Sie haben heute keinen Geburtstag.",
        'ADMIN_CONFIG_BIRTHDAY_POINTS_NOTE' => "Wert <strong>0</strong> deaktiviert die Extragutschrift.",
        'MEMBER_BIRTHDAY_CANNOT_STATUS' => "Kann keine {?POINTS?} gutschreiben! Status Ihres Accounts: <span class=\"data\">{%%pipe,translateUserStatus=%s%%}</span>",
        'MEMBER_BIRTHDAY_CANNOT_LOAD_DATA' => "Entweder haben Sie bereits Ihr Geburtsgeschenk erhalten oder Sie haben heute keinen Geburtstag.",

-       'ADMIN_CONFIG_SELECT_BIRTHDAY_MODE' => "Verg&uuml;tungsmodus der {?POINTS?}",

        'ADMIN_CONFIG_BIRTHDAY_ONLY_ACTIVE' => "Nur aktive Mitglieder erhalten die Geburtstagsgutschrift?<br /><div class=\"notice\">(Nur in Verbindung mit der Erweiterung <strong>autopurge</strong>!)</div>",
 ));
 
        'ADMIN_CONFIG_BIRTHDAY_ONLY_ACTIVE' => "Nur aktive Mitglieder erhalten die Geburtstagsgutschrift?<br /><div class=\"notice\">(Nur in Verbindung mit der Erweiterung <strong>autopurge</strong>!)</div>",
 ));
 

diff --git a/inc/language/de.php b/inc/language/de.php
index 81b0e2e829fe801dfd9ee262ba1657f4402e1cf0..3944de41ffe9fad1089409005bc484b1861e7890 100644 (file)
--- a/inc/language/de.php
+++ b/inc/language/de.php
@@ -764,9 +764,6 @@ addMessages(array(
        'ADMIN_UNCONFIRMED_STATS_MISSING' => "Es fehlen Daten in der Mitglieder-Statistik zur Mail-Id <span class=\"data\">%s</span> .",
        'ADMIN_UNCONFIRMED_INVALID_LINK' => "Ung&uuml;tigen Link aufgerufen oder Mail ist nicht mehr vorhanden.",
        'ADMIN_UNCONFIRMED_NO_LINK_LEFT' => "Diese Mailbuchung wurde komplett best&auml;tigt.",
        'ADMIN_UNCONFIRMED_STATS_MISSING' => "Es fehlen Daten in der Mitglieder-Statistik zur Mail-Id <span class=\"data\">%s</span> .",
        'ADMIN_UNCONFIRMED_INVALID_LINK' => "Ung&uuml;tigen Link aufgerufen oder Mail ist nicht mehr vorhanden.",
        'ADMIN_UNCONFIRMED_NO_LINK_LEFT' => "Diese Mailbuchung wurde komplett best&auml;tigt.",

-       'ADMIN_CONFIG_REFMODE' => "Soll die einmalige Referal-Gutschrift dem Werber alleine oder auch seinem Werber (usw.) gutgeschrieben werden?",
-       'ADMIN_CONFIG_REFMODE_REF' => "Werber und seinen Werbern gutschreiben.",
-       'ADMIN_CONFIG_REFMODE_DIRECT' => "Nur dem direkten Werber gutschreiben.",

        'ADMIN_HEADER_LOCK_ACCOUNT' => "Mitgliedsaccount <span class=\"data\">%s</span> sperren",
        'ADMIN_HEADER_UNLOCK_ACCOUNT' => "Mitgliedsaccount <span class=\"data\">%s</span> freigeben",
        'ADMIN_HEADER_DELETE_ACCOUNT' => "Mitgliedsaccount <span class=\"data\">%s</span> l&ouml;schen",
        'ADMIN_HEADER_LOCK_ACCOUNT' => "Mitgliedsaccount <span class=\"data\">%s</span> sperren",
        'ADMIN_HEADER_UNLOCK_ACCOUNT' => "Mitgliedsaccount <span class=\"data\">%s</span> freigeben",
        'ADMIN_HEADER_DELETE_ACCOUNT' => "Mitgliedsaccount <span class=\"data\">%s</span> l&ouml;schen",

diff --git a/inc/language/other_de.php b/inc/language/other_de.php
index b598172354d88f9958806d5f590aea2afb444ab8..d0fc4a8266305d899be1688631c837cf4e1ec4c0 100644 (file)
--- a/inc/language/other_de.php
+++ b/inc/language/other_de.php
@@ -66,13 +66,11 @@ addMessages(array(
        'ADMIN_CONFIG_SELECT_CSS_OUTPUT_MODE_DIRECT' => "Per <link>-Tag ausgeben (Debug!)",
        'ADMIN_CONFIG_SELECT_CSS_OUTPUT_MODE_FILE' => "Per css.php ausgeben",
        'ADMIN_CONFIG_SELECT_CSS_OUTPUT_MODE_INLINE' => "In <style>-Tag ausgeben",
        'ADMIN_CONFIG_SELECT_CSS_OUTPUT_MODE_DIRECT' => "Per <link>-Tag ausgeben (Debug!)",
        'ADMIN_CONFIG_SELECT_CSS_OUTPUT_MODE_FILE' => "Per css.php ausgeben",
        'ADMIN_CONFIG_SELECT_CSS_OUTPUT_MODE_INLINE' => "In <style>-Tag ausgeben",

-       'ADMIN_CONFIG_GUEST_MENU' => "Gastmenü ein-/ausblenden",
-       'ADMIN_CONFIG_MEMBER_MENU' => "Mitgliedsmenü ein-/ausblenden",
-       'ADMIN_CONFIG_YOURE_HERE' => "Navigation "Sie sind hier" ein-/ausblenden",
-       'ADMIN_IS_SHOWN' => "Einblenden",
-       'ADMIN_IS_NOT_SHOWN' => "Ausblenden",
-       'ADMIN_CONFIG_MT_WORD' => "Art Ihres Tausches (1. Fall)",
-       'ADMIN_CONFIG_MT_WORD2' => "Art Ihres Tausches (2. Fall)",
+       'ADMIN_CONFIG_GUEST_MENU' => "Gastmenü einblenden?",
+       'ADMIN_CONFIG_MEMBER_MENU' => "Mitgliedsmenü einblenden?",
+       'ADMIN_CONFIG_YOURE_HERE' => "Navigation "Sie sind hier" einblenden?",
+       'ADMIN_CONFIG_MT_WORD' => "Art Ihres Tausches (1. Fall, Singular)",
+       'ADMIN_CONFIG_MT_WORD2' => "Art Ihres Tausches (2. Fall, Singular)",

        'ADMIN_CONFIG_MT_WORD3' => "Art Ihres Tausches (1. Fall, Plural)",
        'ADMIN_CONFIG_REJECT_URL' => "Standard-URL bei Ablehnung der Mailbuchung",
        'ADMIN_CONFIG_SHOW_TIMINGS' => "Skript-Statistiken im Seitenfuss einblenden (nützlich zum Debuggen)",
        'ADMIN_CONFIG_MT_WORD3' => "Art Ihres Tausches (1. Fall, Plural)",
        'ADMIN_CONFIG_REJECT_URL' => "Standard-URL bei Ablehnung der Mailbuchung",
        'ADMIN_CONFIG_SHOW_TIMINGS' => "Skript-Statistiken im Seitenfuss einblenden (nützlich zum Debuggen)",

diff --git a/inc/language/surfbar_de.php b/inc/language/surfbar_de.php
index ee670c7e64c740385667532ab9b5936a9bf3db36..735f79f6cd867a6efca47b12379918ae46836d58 100644 (file)
--- a/inc/language/surfbar_de.php
+++ b/inc/language/surfbar_de.php
@@ -71,9 +71,7 @@ addMessages(array(
        'ADMIN_CONFIG_SURFBAR_NOTIFICATION_MODE' => "Benachrichtigungen sofort oder beim täglichen Reset aussenden? ("Sofort" kann zu Verzögerungen und/oder Belastung des Servers führen.",
        'ADMIN_CONFIG_SURFBAR_NOTIFICATION_MODE_INSTANT' => "Sofort aussenden",
        'ADMIN_CONFIG_SURFBAR_NOTIFICATION_MODE_RESET' => "Beim täglichen Reset",
        'ADMIN_CONFIG_SURFBAR_NOTIFICATION_MODE' => "Benachrichtigungen sofort oder beim täglichen Reset aussenden? ("Sofort" kann zu Verzögerungen und/oder Belastung des Servers führen.",
        'ADMIN_CONFIG_SURFBAR_NOTIFICATION_MODE_INSTANT' => "Sofort aussenden",
        'ADMIN_CONFIG_SURFBAR_NOTIFICATION_MODE_RESET' => "Beim täglichen Reset",

-       'ADMIN_CONFIG_SURFBAR_GUEST_LOGIN_FORM' => "Soll bei Aufruf der Surfbar durch einen Gast ein Loginformular angezeigt oder zur Startseite weitergeleitet werden?",
-       'ADMIN_CONFIG_SURFBAR_GUEST_LOGIN_FORM_Y' => "Loginformular angzeigen.",
-       'ADMIN_CONFIG_SURFBAR_GUEST_LOGIN_FORM_N' => "Zur Startseite weiterleiten.",
+       'ADMIN_CONFIG_SURFBAR_GUEST_LOGIN_FORM' => "Soll bei Aufruf der Surfbar durch einen Gast ein Loginformular angezeigt oder zur Startseite weitergeleitet werden? Ja=Loginformular anzeigen; Nein=Zur Startseite weiterleiten.",

 
        // Admin non-config titles
        'ADMIN_SURFBAR_STATS_TITLE' => "Mitglieder-Statistik der Surfbar",
 
        // Admin non-config titles
        'ADMIN_SURFBAR_STATS_TITLE' => "Mitglieder-Statistik der Surfbar",

diff --git a/inc/libs/autopurge_functions.php b/inc/libs/autopurge_functions.php
index 270c7a9f90fb98be1589434d8cf62122ebb80539..72d4e0ae7eced026d68a3a4d617fef26720d5e55 100644 (file)
--- a/inc/libs/autopurge_functions.php
+++ b/inc/libs/autopurge_functions.php
@@ -49,7 +49,7 @@ function addPointsAutoPurge ($userid, $points) {
        } // END - if
 
        // Add points over the ref system directly now
        } // END - if
 
        // Add points over the ref system directly now

-       addPointsDirectly('autopurge_add', $userid, $points);
+       addPointsThroughReferalSystem('autopurge_add', $userid, $points);

 
        // Send out mail to user
        $message = loadEmailTemplate('member_autopurge_points', array('points' => $points), $userid);
 
        // Send out mail to user
        $message = loadEmailTemplate('member_autopurge_points', array('points' => $points), $userid);

diff --git a/inc/libs/beg_functions.php b/inc/libs/beg_functions.php
index 8035ccf27d1ed1f8bad22d111137e4f13bc5eb88..12941204e087ab21392c7207b88dd38cd7305bd6 100644 (file)
--- a/inc/libs/beg_functions.php
+++ b/inc/libs/beg_functions.php
@@ -53,7 +53,7 @@ function addPointsBeg ($userid, $points) {
        } else {
                // Add points to account
                initReferalSystem();
        } else {
                // Add points to account
                initReferalSystem();

-               $added = addPointsThroughReferalSystem('beg', $userid, $points, false, 0, getBegMode());
+               $added = addPointsThroughReferalSystem('beg', $userid, $points);

        }
 
        // Subtract begged points from member account if the admin has selected one
        }
 
        // Subtract begged points from member account if the admin has selected one


@@ -214,18 +214,6 @@ function getBegPayMode () {
        return $GLOBALS[__FUNCTION__];
 }
 
        return $GLOBALS[__FUNCTION__];
 }
 

-// "Getter" for beg_mode
-function getBegMode () {
-       // Do we have cache?
-       if (!isset($GLOBALS[__FUNCTION__])) {
-               // Determine it
-               $GLOBALS[__FUNCTION__] = getConfig('beg_mode');
-       } // END - if
-
-       // Return cache
-       return $GLOBALS[__FUNCTION__];
-}
-

 // "Getter" for beg_include_own
 function getBegIncludeOwn () {
        // Do we have cache?
 // "Getter" for beg_include_own
 function getBegIncludeOwn () {
        // Do we have cache?

diff --git a/inc/libs/booking_functions.php b/inc/libs/booking_functions.php
index 02ac68ede6f52ab5ca04f47092ab0edd5e2b67a6..ece61e39c9a14729303d691995014168b1fdb39b 100644 (file)
--- a/inc/libs/booking_functions.php
+++ b/inc/libs/booking_functions.php
@@ -49,7 +49,7 @@ function addBookingRecord ($subject, $userid, $points, $mode) {
        } // END - if
 
        // Add record entry here
        } // END - if
 
        // Add record entry here

-       SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_booking` (`userid`,`subject`,`mode`,`points`) VALUES(%s,'%s','%s',%s)",
+       SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_booking` (`userid`, `subject`, `mode`, `points`) VALUES (%s,'%s','%s',%s)",

                array(
                        bigintval($userid),
                        $subject,
                array(
                        bigintval($userid),
                        $subject,

diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php
index 3895fd794997ae74fcd2a91ea82a693d2325c532..db096e9b0d7645e59dd872252f387c01316b9898 100644 (file)
--- a/inc/libs/network_functions.php
+++ b/inc/libs/network_functions.php
@@ -656,18 +656,7 @@ function generateNetworkActiveOptions ($default = '') {
        // Do we have cache?
        if (!isset($GLOBALS[__FUNCTION__][$default])) {
                // Generate the list
        // Do we have cache?
        if (!isset($GLOBALS[__FUNCTION__][$default])) {
                // Generate the list

-               $GLOBALS[__FUNCTION__][$default] = generateOptionList(
-                       '/ARRAY/',
-                       array(
-                               'Y',
-                               'N'
-                       ),
-                       array(
-                               '{--YES--}',
-                               '{--NO--}'
-                       ),
-                       $default
-               );
+               $GLOBALS[__FUNCTION__][$default] = generateYesNoOptionList($default);

        } // END - if
 
        // Return cache
        } // END - if
 
        // Return cache


@@ -763,7 +752,7 @@ function doAdminNetworkProcessAddNetwork () {
        SQL_QUERY('INSERT INTO
        `{?_MYSQL_PREFIX?}_network_data`
 (
        SQL_QUERY('INSERT INTO
        `{?_MYSQL_PREFIX?}_network_data`
 (

-       `' . implode('`,`', array_keys(postRequestArray())) . "`
+       `' . implode('`, `', array_keys(postRequestArray())) . "`

 ) VALUES (
        '" . implode("','", array_values(postRequestArray())) . "'
 )", __FUNCTION__, __LINE__);
 ) VALUES (
        '" . implode("','", array_values(postRequestArray())) . "'
 )", __FUNCTION__, __LINE__);


@@ -1039,7 +1028,7 @@ function doAdminNetworkProcessAddNetworkType () {
        SQL_QUERY('INSERT INTO
        `{?_MYSQL_PREFIX?}_network_types`
 (
        SQL_QUERY('INSERT INTO
        `{?_MYSQL_PREFIX?}_network_types`
 (

-       `' . implode('`,`', array_keys(postRequestArray())) . "`
+       `' . implode('`, `', array_keys(postRequestArray())) . "`

 ) VALUES (
        '" . implode("','", array_values(postRequestArray())) . "'
 )", __FUNCTION__, __LINE__);
 ) VALUES (
        '" . implode("','", array_values(postRequestArray())) . "'
 )", __FUNCTION__, __LINE__);


@@ -1237,7 +1226,7 @@ function doAdminNetworkProcessAddNetworkParam () {
        SQL_QUERY('INSERT INTO
        `{?_MYSQL_PREFIX?}_network_request_params`
 (
        SQL_QUERY('INSERT INTO
        `{?_MYSQL_PREFIX?}_network_request_params`
 (

-       `' . implode('`,`', array_keys(postRequestArray())) . "`
+       `' . implode('`, `', array_keys(postRequestArray())) . "`

 ) VALUES (
        '" . implode("','", array_values(postRequestArray())) . "'
 )", __FUNCTION__, __LINE__);
 ) VALUES (
        '" . implode("','", array_values(postRequestArray())) . "'
 )", __FUNCTION__, __LINE__);


@@ -1283,7 +1272,7 @@ function doAdminNetworkProcessAddNetworkApiTranslation () {
        SQL_QUERY('INSERT INTO
        `{?_MYSQL_PREFIX?}_network_api_translation`
 (
        SQL_QUERY('INSERT INTO
        `{?_MYSQL_PREFIX?}_network_api_translation`
 (

-       `' . implode('`,`', array_keys(postRequestArray())) . "`
+       `' . implode('`, `', array_keys(postRequestArray())) . "`

 ) VALUES (
        '" . implode("','", array_values(postRequestArray())) . "'
 )", __FUNCTION__, __LINE__);
 ) VALUES (
        '" . implode("','", array_values(postRequestArray())) . "'
 )", __FUNCTION__, __LINE__);

diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php
index 4f86bd6cfd40e9554e0824af65907736b45e02cb..c301b593e0761d68cf37d554d1f9362675dfe158 100644 (file)
--- a/inc/libs/rallye_functions.php
+++ b/inc/libs/rallye_functions.php
@@ -498,18 +498,18 @@ function markReferalRallyesAsExpired ($result) {
                        // Determine winner level
                        if ($DATA['level'] == 1) {
                                // The winner!
                        // Determine winner level
                        if ($DATA['level'] == 1) {
                                // The winner!

-                               $winnerLevel = '_gold';
+                               $winnerLevel = 'gold';

                        } elseif ($DATA['level'] == 2) {
                                // The vice winner!
                        } elseif ($DATA['level'] == 2) {
                                // The vice winner!

-                               $winnerLevel = '_silver';
+                               $winnerLevel = 'silver';

                        } elseif ($DATA['level'] == 3) {
                                // The bronce winner
                        } elseif ($DATA['level'] == 3) {
                                // The bronce winner

-                               $winnerLevel = '_bronce';
+                               $winnerLevel = 'bronce';

                        }
 
                        if ($DATA['points'] > 0) {
                                // Add points directly to user's account
                        }
 
                        if ($DATA['points'] > 0) {
                                // Add points directly to user's account

-                               addPointsDirectly('rallye_winner' . $winnerLevel, $userid, $DATA['points']);
+                               addPointsThroughReferalSystem('rallye_winner:' . $winnerLevel, $userid, $DATA['points']);

                        } // END - if
 
                        if ($notify == 'Y') {
                        } // END - if
 
                        if ($notify == 'Y') {

diff --git a/inc/libs/refback_functions.php b/inc/libs/refback_functions.php
index c66cdcf6801591b83cd898ed5aa363f45617eae7..5856a6aeda5c43442c5d012c2843a212bfb1c00a 100644 (file)
--- a/inc/libs/refback_functions.php
+++ b/inc/libs/refback_functions.php
@@ -92,7 +92,7 @@ function addRefbackPoints ($userid, $ref, $points, $ref_points) {
 
                                // Add points again, but only directly
                                /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'refback=' . $refback . ',userid=' . $userid . ',ref=' . $ref . ',refid=' . $refid . ' - UPDATE! (' . SQL_AFFECTEDROWS() . ')');
 
                                // Add points again, but only directly
                                /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'refback=' . $refback . ',userid=' . $userid . ',ref=' . $ref . ',refid=' . $refid . ' - UPDATE! (' . SQL_AFFECTEDROWS() . ')');

-                               addPointsDirectly(sprintf("refback:%s", $refid), $userid, $refback);
+                               addPointsThroughReferalSystem(sprintf("refback:%s", $refid), $userid, $refback);

 
                                // Reduce points if refid is found
                                if ($refid == $ref) {
 
                                // Reduce points if refid is found
                                if ($refid == $ref) {


@@ -246,7 +246,7 @@ function updateRefbackTable ($userid) {
                                if (SQL_HASZERONUMS($result)) {
                                        // Insert this level
                                        /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',level=' . $GLOBALS['refback_level'] . ',ref=' . $GLOBALS['refback_refid'][$GLOBALS['refback_level']] . ' - ADD!');
                                if (SQL_HASZERONUMS($result)) {
                                        // Insert this level
                                        /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',level=' . $GLOBALS['refback_level'] . ',ref=' . $GLOBALS['refback_refid'][$GLOBALS['refback_level']] . ' - ADD!');

-                                       SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_refs` (`userid`,`level`,`refid`) VALUES (%s,%s,%s)",
+                                       SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_refs` (`userid`, `level`, `refid`) VALUES (%s,%s,%s)",

                                                array(
                                                        bigintval($userid),
                                                        $GLOBALS['refback_level'],
                                                array(
                                                        bigintval($userid),
                                                        $GLOBALS['refback_level'],


@@ -275,7 +275,7 @@ function updateRefbackTable ($userid) {
                                        /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',level=' . ($GLOBALS['refback_level'] - $minus) . ',minus=' . $minus . ',ref=' . $GLOBALS['refback_refid'][$GLOBALS['refback_level']] . ',numRows=' . SQL_NUMROWS($result) . ' - BACK!');
                                        if (SQL_HASZERONUMS($result)) {
                                                // Insert this level
                                        /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',level=' . ($GLOBALS['refback_level'] - $minus) . ',minus=' . $minus . ',ref=' . $GLOBALS['refback_refid'][$GLOBALS['refback_level']] . ',numRows=' . SQL_NUMROWS($result) . ' - BACK!');
                                        if (SQL_HASZERONUMS($result)) {
                                                // Insert this level

-                                               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_refs` (`userid`,`level`,`refid`) VALUES (%s,%s,%s)",
+                                               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_refs` (`userid`, `level`, `refid`) VALUES (%s,%s,%s)",

                                                        array(
                                                                bigintval($userid),
                                                                ($GLOBALS['refback_level'] - $minus),
                                                        array(
                                                                bigintval($userid),
                                                                ($GLOBALS['refback_level'] - $minus),

diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php
index 0b2f58f63ada678355e1bc0fee6f818d5d5c4d3f..c302d4742c3d668d84fd08f962fb8399aaba4991 100644 (file)
--- a/inc/libs/register_functions.php
+++ b/inc/libs/register_functions.php
@@ -320,7 +320,7 @@ function doRegistration () {
        // Create user's account...
        SQL_QUERY_ESC("INSERT INTO
        `{?_MYSQL_PREFIX?}_user_data`
        // Create user's account...
        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`,`ref_payout`".$GLOBALS['register_sql_columns'].")
+(`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`, `ref_payout`".$GLOBALS['register_sql_columns'].")

        VALUES
 ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONFIRMED','%s','%s', UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), {?ref_payout?}".$GLOBALS['register_sql_data'].")",
        array(
        VALUES
 ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONFIRMED','%s','%s', UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), {?ref_payout?}".$GLOBALS['register_sql_data'].")",
        array(


@@ -360,8 +360,7 @@ function doRegistration () {
        updateReferalCounter($userid);
 
        // Write his welcome-points
        updateReferalCounter($userid);
 
        // Write his welcome-points

-       // @TODO Wether the registration bonus should only be added to user directly or through referal system should be configurable
-       addPointsDirectly('register_welcome', $userid, getPointsRegister());
+       addPointsThroughReferalSystem('register_welcome', $userid, getPointsRegister());

 
        // Write catgories
        if ((is_array(postRequestParameter('cat'))) && (count(postRequestParameter('cat')))) {
 
        // Write catgories
        if ((is_array(postRequestParameter('cat'))) && (count(postRequestParameter('cat')))) {

diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php
index 2e5c248c663302a89c905eac9606262123b8b3f3..9072b7439a78115016f526edd7548d2fc5d677aa 100644 (file)
--- a/inc/libs/surfbar_functions.php
+++ b/inc/libs/surfbar_functions.php
@@ -656,7 +656,7 @@ function SURFBAR_INSERT_URL_BY_ARRAY ($urlData) {
        if (empty($userid)) $userid = '0';
 
        // Just run the insert query for now
        if (empty($userid)) $userid = '0';
 
        // Just run the insert query for now

-       SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_urls` (`url_userid`,`url`,`url_status`,`url_views_max`,`url_views_allowed`,`url_fixed_reload`) VALUES (%s,'%s','%s',%s,%s,%s)",
+       SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_urls` (`url_userid`, `url`, `url_status`, `url_views_max`, `url_views_allowed`, `url_fixed_reload`) VALUES (%s,'%s','%s',%s,%s,%s)",

                array(
                        $userid,
                        $urlData['url'],
                array(
                        $userid,
                        $urlData['url'],


@@ -1093,7 +1093,7 @@ function SURFBAR_PAY_POINTS () {
        initReferalSystem();
 
        // Book it to the user
        initReferalSystem();
 
        // Book it to the user

-       addPointsThroughReferalSystem(sprintf("surfbar_%s", getSurfbarPaymentModel()), getMemberId(), SURFBAR_GET_REWARD());
+       addPointsThroughReferalSystem(sprintf("surfbar:%s", getSurfbarPaymentModel()), getMemberId(), SURFBAR_GET_REWARD());

        /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid='.SURFBAR_GET_USERID().',costs='.SURFBAR_GET_COSTS() . ' - EXIT!');
 }
 
        /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid='.SURFBAR_GET_USERID().',costs='.SURFBAR_GET_COSTS() . ' - EXIT!');
 }
 

diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index 09dc679ba2d9201bb24deaa50931e1839af08001..827ee9c2c6c6218ae71f8479e59016be4eeb36c8 100644 (file)
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -544,7 +544,7 @@ function insertUserStatsRecord ($userid, $statsType, $statsData) {
        // Does it exist?
        if ((!getEpocheTimeFromUserStats($statsType, $statsData, $userid)) && (!is_array($statsData))) {
                // Then insert it!
        // Does it exist?
        if ((!getEpocheTimeFromUserStats($statsType, $statsData, $userid)) && (!is_array($statsData))) {
                // Then insert it!

-               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_stats_data` (`userid`,`stats_type`,`stats_data`) VALUES (%s,'%s','%s')",
+               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_stats_data` (`userid`, `stats_type`, `stats_data`) VALUES (%s,'%s','%s')",

                        array(
                                bigintval($userid),
                                $statsType,
                        array(
                                bigintval($userid),
                                $statsType,


@@ -622,7 +622,7 @@ LIMIT 1",
 
                                        // Add one-time referal bonus over referal system or directly
                                        initReferalSystem();
 
                                        // Add one-time referal bonus over referal system or directly
                                        initReferalSystem();

-                                       addPointsThroughReferalSystem('referal_bonus', $refid, getPointsRef(), true, bigintval($userid), getConfig('reg_points_mode'));
+                                       addPointsThroughReferalSystem('referal_bonus', $refid, getPointsRef(), bigintval($userid));

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

diff --git a/inc/libs/wernis_functions.php b/inc/libs/wernis_functions.php
index fb8c57c709f56e9ef5491d9d2257b67b430a1cce..e4d421f554a00cef2c598b874aecf723aa19ebf8 100644 (file)
--- a/inc/libs/wernis_functions.php
+++ b/inc/libs/wernis_functions.php
@@ -341,7 +341,7 @@ function translateWernisTransferStatus ($status) {
 // Log the transfer
 function WERNIS_LOG_TRANSFER ($wdsId, $amount, $type = 'FAILED', $message = '', $status = '') {
        // Register this wernis movement
 // Log the transfer
 function WERNIS_LOG_TRANSFER ($wdsId, $amount, $type = 'FAILED', $message = '', $status = '') {
        // Register this wernis movement

-       SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_wernis` (`userid`,`wernis_account`,`wernis_amount`,`wernis_timestamp`,`wernis_type`,`wernis_api_message`,`wernis_api_status`) VALUES (%s, %s, %s, UNIX_TIMESTAMP(), '%s', '%s', '%s')",
+       SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_wernis` (`userid`, `wernis_account`, `wernis_amount`, `wernis_timestamp`, `wernis_type`, `wernis_api_message`, `wernis_api_status`) VALUES (%s, %s, %s, UNIX_TIMESTAMP(), '%s', '%s', '%s')",

                array(
                        getMemberId(),
                        bigintval($wdsId),
                array(
                        getMemberId(),
                        bigintval($wdsId),

diff --git a/inc/libs/yoomedia_functions.php b/inc/libs/yoomedia_functions.php
index e3e1a739a223b19b6a7c5746887f3c0b9ffa719d..ff7b85a9b81310d10230f8be74aa23761998d25b 100644 (file)
--- a/inc/libs/yoomedia_functions.php
+++ b/inc/libs/yoomedia_functions.php
@@ -265,7 +265,7 @@ function YOOMEDIA_EXCLUDE_MAIL ($data, $mode) {
                $mode = YOOMEDIA_CONVERT_MODE($mode);
 
                // Add the entry
                $mode = YOOMEDIA_CONVERT_MODE($mode);
 
                // Add the entry

-               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_yoomedia_reload` (`type`,`y_id`,`y_reload`,`inserted`) VALUES ('%s',%s,%s,'0000-00-00 00:00')",
+               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_yoomedia_reload` (`type`, `y_id`, `y_reload`, `inserted`) VALUES ('%s',%s,%s,'0000-00-00 00:00')",

                        array(
                                $mode,
                                bigintval($data['id']),
                        array(
                                $mode,
                                bigintval($data['id']),


@@ -360,7 +360,7 @@ function YOOMEDIA_RELOAD_LOCK ($data, $mode) {
                $mode = YOOMEDIA_CONVERT_MODE($mode);
 
                // Add the entry
                $mode = YOOMEDIA_CONVERT_MODE($mode);
 
                // Add the entry

-               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_yoomedia_reload` (`type`,`y_id`,`y_reload`) VALUES ('%s',%s,%s)",
+               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_yoomedia_reload` (`type`, `y_id`, `y_reload`) VALUES ('%s',%s,%s)",

                        array($mode, bigintval($data['id']), bigintval($data['reload'])), __FUNCTION__, __LINE__);
        } // END - if
 }
                        array($mode, bigintval($data['id']), bigintval($data['reload'])), __FUNCTION__, __LINE__);
        } // END - if
 }

diff --git a/inc/mails/doubler_mails.php b/inc/mails/doubler_mails.php
index 038086d56697f6ac33a21452650890435336e7bd..7fa1ae34a1a4aecc22c955ab843c85e8796b22d7 100644 (file)
--- a/inc/mails/doubler_mails.php
+++ b/inc/mails/doubler_mails.php
@@ -142,7 +142,7 @@ if (((!SQL_HASZERONUMS($result_total)) && (getConfig('doubler_sent_all') == 'Y')
                        // Exclude webmaster from doubling...
                        if ($content['userid'] != getConfig('doubler_userid')) {
                                // Add points
                        // Exclude webmaster from doubling...
                        if ($content['userid'] != getConfig('doubler_userid')) {
                                // Add points

-                               addPointsDirectly(sprintf("doubler_%s", strtolower(getConfig('doubler_send_mode'))), $content['userid'], $content['points']);
+                               addPointsThroughReferalSystem(sprintf("doubler_%s", strtolower(getConfig('doubler_send_mode'))), $content['userid'], $content['points']);

                        } // END - if
 
                        // Set entry as "payed"
                        } // END - if
 
                        // Set entry as "payed"

diff --git a/inc/module-functions.php b/inc/module-functions.php
index ad6cc2a906f6ccc5b9b9b894e1702413e514de61..a0841a6a6015408d5697f5575c8d7807b13e6c95 100644 (file)
--- a/inc/module-functions.php
+++ b/inc/module-functions.php
@@ -396,7 +396,7 @@ function addModuleSql ($module, $locked, $hidden, $adminOnly, $memOnly) {
        // Is the module already registered?
        if (!isModuleRegistered($module)) {
                // Add it
        // Is the module already registered?
        if (!isModuleRegistered($module)) {
                // Add it

-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_mod_reg` (`module`,`locked`,`hidden`,`admin_only`,`mem_only`) VALUES('" . $module . "','" . $locked . "','" . $hidden . "','" . $adminOnly . "','" . $memOnly . "')");
+               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_mod_reg` (`module`, `locked`, `hidden`, `admin_only`, `mem_only`) VALUES ('" . $module . "','" . $locked . "','" . $hidden . "','" . $adminOnly . "','" . $memOnly . "')");

        } else {
                // Already registered
                logDebugMessage(__FUNCTION__, __LINE__, sprintf("Already registered: module=%s,locked=%s,hidden=%s,admin=%s,mem=%s",
        } else {
                // Already registered
                logDebugMessage(__FUNCTION__, __LINE__, sprintf("Already registered: module=%s,locked=%s,hidden=%s,admin=%s,mem=%s",

diff --git a/inc/modules/admin/what-add_rallye.php b/inc/modules/admin/what-add_rallye.php
index ace68d7486c53df9e5ac4378cd25809bff0c6712..d3cae625a030993a019e82949bcff2f29cf58eb2 100644 (file)
--- a/inc/modules/admin/what-add_rallye.php
+++ b/inc/modules/admin/what-add_rallye.php
@@ -87,11 +87,6 @@ VALUES (%s,'%s','%s','%s',%s,%s,'%s','%s','%s')",
        }
 } // END - if
 
        }
 } // END - if
 

-// Prepare some constants for the template
-$content['auto_add_options'] = generateOptionList('/ARRAY/', array('Y','N'), array('{--YES--}', '{--NO--}' ));
-$content['active_options']   = generateOptionList('/ARRAY/', array('N','Y'), array('{--NO--}' , '{--YES--}'));
-$content['notify_options']   = generateOptionList('/ARRAY/', array('Y','N'), array('{--YES--}', '{--NO--}' ));
-

 // Starting day
 $content['start_sec']   = addSelectionBox('sec'  , 0                   , 'start');
 $content['start_min']   = addSelectionBox('min'  , 0                   , 'start');
 // Starting day
 $content['start_sec']   = addSelectionBox('sec'  , 0                   , 'start');
 $content['start_min']   = addSelectionBox('min'  , 0                   , 'start');


@@ -111,9 +106,6 @@ $content['end_day']   = addSelectionBox('day'  , getDay($endingStamp)  , 'end');
 $content['end_month'] = addSelectionBox('month', getMonth($endingStamp), 'end');
 $content['end_year']  = addSelectionBox('year' , getYear($endingStamp) , 'end');
 
 $content['end_month'] = addSelectionBox('month', getMonth($endingStamp), 'end');
 $content['end_year']  = addSelectionBox('year' , getYear($endingStamp) , 'end');
 

-// Transfer (maybe found) templates into constant for the template
-$content['templates_selection'] = addReferalRallyeTemplateSelection();
-

 // Load template
 loadTemplate('admin_add_rallye', false, $content);
 
 // Load template
 loadTemplate('admin_add_rallye', false, $content);
 

diff --git a/inc/modules/admin/what-admin_add.php b/inc/modules/admin/what-admin_add.php
index 812d82357d8055cc20bdedf0c4962be9076a7c0c..aef693aec467b1748c17293b97f0df07a6955179 100644 (file)
--- a/inc/modules/admin/what-admin_add.php
+++ b/inc/modules/admin/what-admin_add.php
@@ -163,7 +163,7 @@ if (!isFormSent()) {
        // Insert new menu entry
        if (isPostRequestParameterSet('menu')) {
                // Add sub menu
        // Insert new menu entry
        if (isPostRequestParameterSet('menu')) {
                // Add sub menu

-               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('%s','%s','%s','%s','%s')",
+               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES ('%s','%s','%s','%s','%s')",

                        array(
                                postRequestParameter('menu'),
                                postRequestParameter('name'),
                        array(
                                postRequestParameter('menu'),
                                postRequestParameter('name'),

diff --git a/inc/modules/admin/what-config_autopurge.php b/inc/modules/admin/what-config_autopurge.php
index 61f640ec9ffb438e3c99211701af65aa3a57604b..40c43c5fdf23a47e930e5ca2504d84d6e2aea8fd 100644 (file)
--- a/inc/modules/admin/what-config_autopurge.php
+++ b/inc/modules/admin/what-config_autopurge.php
@@ -69,13 +69,6 @@ if (isFormSent()) {
        // Mail confirmation links
        $content['auto_purge'] = createConfigurationTimeSelections('auto_purge', 'MWD');
 
        // Mail confirmation links
        $content['auto_purge'] = createConfigurationTimeSelections('auto_purge', 'MWD');
 

-       // Prepare more Y/N selections
-       foreach (array('auto_purge_active') as $entry) {
-               $content[$entry . '_y'] = '';
-               $content[$entry . '_n'] = '';
-               $content[$entry . '_' . strtolower(getConfig('auto_purge_active'))] = ' checked="checked"';
-       } // END - foreach
-

        // Output template
        loadTemplate('admin_config_autopurge', false, $content);
 }
        // Output template
        loadTemplate('admin_config_autopurge', false, $content);
 }

diff --git a/inc/modules/admin/what-config_beg.php b/inc/modules/admin/what-config_beg.php
index a01277b134e896728234a9f0d02fec3402886331..786d5c43852a2797943417491e59779ccc81687f 100644 (file)
--- a/inc/modules/admin/what-config_beg.php
+++ b/inc/modules/admin/what-config_beg.php
@@ -76,14 +76,6 @@ if (isFormSent()) {
        // Set default faker-mode
        $content['pay_mode_' . strtolower(getBegPayMode())] = ' selected="selected"';
 
        // Set default faker-mode
        $content['pay_mode_' . strtolower(getBegPayMode())] = ' selected="selected"';
 

-       // Init beg_mode elements
-       foreach (array('DIRECT', 'REF') as $entry) {
-               $content['beg_mode_' . strtolower($entry)] = '';
-       } // END - foreach
-
-       // Set default mode
-       $content['beg_mode_' . strtolower(getBegMode())] = ' checked="checked"';
-

        // Member selection box
        $content['beg_userid'] = addMemberSelectionBox(getBegUserid(), false, true, true, 'beg_userid');
 
        // Member selection box
        $content['beg_userid'] = addMemberSelectionBox(getBegUserid(), false, true, true, 'beg_userid');
 

diff --git a/inc/modules/admin/what-config_birthday.php b/inc/modules/admin/what-config_birthday.php
index cac121f34ca9c2178db4b31b3bba2aa2f3878d6c..83c2c54b49181c2632c8208f760154ad4d2f2773 100644 (file)
--- a/inc/modules/admin/what-config_birthday.php
+++ b/inc/modules/admin/what-config_birthday.php
@@ -48,13 +48,13 @@ if (isFormSent()) {
        adminSaveSettingsFromPostData();
 } else {
        // Init all other template entries
        adminSaveSettingsFromPostData();
 } else {
        // Init all other template entries

-       foreach (array('active_y','active_n','mode_direct','mode_ref') as $entry) {
+       foreach (array('active_y','active_n') as $entry) {

                $content[$entry] = '';
        } // END - foreach
 
        // Set current selections
                $content[$entry] = '';
        } // END - foreach
 
        // Set current selections

-       foreach (array('active','mode') as $entry) {
-               $content[$entry . '_' . strtolower(getConfig('birthday_' . $entry))] = ' checked="checked"';
+       foreach (array('active') as $entry) {
+               $content['birthday_' . $entry . '_' . strtolower(getConfig('birthday_' . $entry))] = ' checked="checked"';

        } // END - foreach
 
        // Display form
        } // END - foreach
 
        // Display form

diff --git a/inc/modules/admin/what-config_imprint.php b/inc/modules/admin/what-config_imprint.php
index 795fdb1ac1b8ccaabd37d7152ba845057dc11b0a..752442fbf5c57a9a8ee84391cd0f38263877b975 100644 (file)
--- a/inc/modules/admin/what-config_imprint.php
+++ b/inc/modules/admin/what-config_imprint.php
@@ -48,7 +48,7 @@ if (isFormSent()) {
        // Handle form ...
 } else {
        // Query for all imprint data rows
        // Handle form ...
 } else {
        // Query for all imprint data rows

-       $result = SQL_QUERY('SELECT `imprint_key`,`imprint_value` FROM `{?_MYSQL_PREFIX?}_imprint_data` ORDER BY `imprint_id` ASC', __FILE__, __LINE__);
+       $result = SQL_QUERY('SELECT `imprint_key`, `imprint_value` FROM `{?_MYSQL_PREFIX?}_imprint_data` ORDER BY `imprint_id` ASC', __FILE__, __LINE__);

 
        // Do we have entries?
        if (!SQL_HASZERONUMS($result)) {
 
        // Do we have entries?
        if (!SQL_HASZERONUMS($result)) {

diff --git a/inc/modules/admin/what-config_menu.php b/inc/modules/admin/what-config_menu.php
index 5cc6861570239ab3a93d32b913d13cf47b9933b1..321e03a2d9efa8f4ade804053ec06d5c59f57b30 100644 (file)
--- a/inc/modules/admin/what-config_menu.php
+++ b/inc/modules/admin/what-config_menu.php
@@ -47,15 +47,8 @@ if (isFormSent()) {
        // Save settings
        adminSaveSettingsFromPostData();
 } else {
        // Save settings
        adminSaveSettingsFromPostData();
 } else {

-       // Set all entries
-       foreach (array('guest_menu_advert_enabled','member_menu_advert_enabled') as $entry) {
-               $content[$entry . '_y'] = '';
-               $content[$entry . '_n'] = '';
-               $content[$entry . '_' . strtolower(getConfig($entry))] = ' checked="checked"';
-       } // END - if
-

        // Load form template
        // Load form template

-       loadTemplate('admin_config_menu', false, $content);
+       loadTemplate('admin_config_menu');

 }
 
 // [EOF]
 }
 
 // [EOF]

diff --git a/inc/modules/admin/what-config_points.php b/inc/modules/admin/what-config_points.php
index 2f0808e26f4f501c451e3b03d2a8e6d9a9fb5205..d458da5004ac4e6ee44b4394c5e3f5c47a60addf 100644 (file)
--- a/inc/modules/admin/what-config_points.php
+++ b/inc/modules/admin/what-config_points.php
@@ -116,8 +116,8 @@ if (isFormSent()) {
                case 'settings':
                        $REF = bigintval(postRequestParameter('ref_payout'));
                        updateConfiguration(
                case 'settings':
                        $REF = bigintval(postRequestParameter('ref_payout'));
                        updateConfiguration(

-                               array('allow_direct_pay', 'reg_points_mode', 'ref_payout'),
-                               array(postRequestParameter('allow_direct_pay'), postRequestParameter('reg_points_mode'), $REF)
+                               array('allow_direct_pay', 'ref_payout'),
+                               array(postRequestParameter('allow_direct_pay'), $REF)

                        );
                        if ((getConfig('ref_payout') == '0') && (postRequestParameter('ref_payout') > 0)) {
                                // Update account's ref_payout for "must-confirm"
                        );
                        if ((getConfig('ref_payout') == '0') && (postRequestParameter('ref_payout') > 0)) {
                                // Update account's ref_payout for "must-confirm"


@@ -172,12 +172,6 @@ WHERE
                $content[$entry . '_' . strtolower(getConfig($entry))] = ' checked="checked"';
        } // END - foreach
 
                $content[$entry . '_' . strtolower(getConfig($entry))] = ' checked="checked"';
        } // END - foreach
 

-       // One-time referal bonus add-mode
-       foreach (array('reg_points_mode_ref','reg_points_mode_direct') as $entry) {
-               $content[$entry] = '';
-       } // END - foreach
-       $content['reg_points_mode_' . strtolower(getConfig('reg_points_mode'))] = ' checked="checked"';
-

        // Load template
        loadTemplate('admin_config_point_settings', false, $content);
 } elseif (getRequestParameter('sub') == 'ref') {
        // Load template
        loadTemplate('admin_config_point_settings', false, $content);
 } elseif (getRequestParameter('sub') == 'ref') {

diff --git a/inc/modules/admin/what-config_surfbar.php b/inc/modules/admin/what-config_surfbar.php
index 23ed02aab07052a07daf0580d1b9ccdaeb6d0508..1af1c774833ff8d06fcd9dfd455a271ad2172b8d 100644 (file)
--- a/inc/modules/admin/what-config_surfbar.php
+++ b/inc/modules/admin/what-config_surfbar.php
@@ -62,13 +62,6 @@ if (isFormSent()) {
                'surfbar_low_interval'    => createConfigurationTimeSelections('surfbar_low_interval'  , 'WDh', 'left'),
        );
 
                'surfbar_low_interval'    => createConfigurationTimeSelections('surfbar_low_interval'  , 'WDh', 'left'),
        );
 

-       // Prepare further Y/N config entries
-       foreach (array('surfbar_autostart','surfbar_notify_limits','surfbar_notify_admin_unlock','surfbar_migrate_order','surfbar_guest_login_form') as $entry) {
-               $content[$entry . '_y'] = '';
-               $content[$entry . '_n'] = '';
-               $content[$entry . '_' . strtolower(getConfig($entry))] = ' checked="checked"';
-       } // END - foreach
-

        // Even some more...
        foreach (array('surfbar_payment_model_static','surfbar_payment_model_dynamic','surfbar_pause_mode_internal','surfbar_pause_mode_external','surfbar_notification_mode_instant','surfbar_notification_mode_reset') as $entry) {
                $content[$entry] = '';
        // Even some more...
        foreach (array('surfbar_payment_model_static','surfbar_payment_model_dynamic','surfbar_pause_mode_internal','surfbar_pause_mode_external','surfbar_notification_mode_instant','surfbar_notification_mode_reset') as $entry) {
                $content[$entry] = '';

diff --git a/inc/modules/admin/what-del_email.php b/inc/modules/admin/what-del_email.php
index f23808f9f2811ba7b660983a0d9f79da25b7d67f..2727c7173e7b01fe04dbd987c5e0ecdad63386cf 100644 (file)
--- a/inc/modules/admin/what-del_email.php
+++ b/inc/modules/admin/what-del_email.php
@@ -109,8 +109,7 @@ LIMIT 1",
                                } // END - if
 
                                // Pay back points
                                } // END - if
 
                                // Pay back points

-                               //* DEBUG: */ debugOutput('PAYBACK:'.$content['sender']);
-                               addPointsDirectly('mail_deleted', $content['sender'], $totalPoints);
+                               addPointsThroughReferalSystem('mail_deleted', $content['sender'], $totalPoints);

 
                                // Output message
                                if (getConfig('repay_deleted_mails') == 'REPAY') {
 
                                // Output message
                                if (getConfig('repay_deleted_mails') == 'REPAY') {

diff --git a/inc/modules/admin/what-guest_add.php b/inc/modules/admin/what-guest_add.php
index 33da7e1b788c57ea6af3d1028f3e09ef5441f56b..20d458f0d6fc6c8cc256d766bd592a0c1121b013 100644 (file)
--- a/inc/modules/admin/what-guest_add.php
+++ b/inc/modules/admin/what-guest_add.php
@@ -181,7 +181,7 @@ ORDER BY `sort` ASC",
 } elseif (!isDemoModeActive()) {
        // Insert new menu entry
        if (isPostRequestParameterSet('menu')) {
 } elseif (!isDemoModeActive()) {
        // Insert new menu entry
        if (isPostRequestParameterSet('menu')) {

-               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('%s','%s','%s','%s','%s','%s')",
+               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`) VALUES ('%s','%s','%s','%s','%s','%s')",

                        array(
                                postRequestParameter('menu'),
                                postRequestParameter('name'),
                        array(
                                postRequestParameter('menu'),
                                postRequestParameter('name'),

diff --git a/inc/modules/admin/what-guestedit.php b/inc/modules/admin/what-guestedit.php
index d7543eaa8ae5c95fc4b371dd07074bdef2194c0a..4587458acb697c599dcb9b80e7828d1e7c9d2f96 100644 (file)
--- a/inc/modules/admin/what-guestedit.php
+++ b/inc/modules/admin/what-guestedit.php
@@ -184,10 +184,10 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
        // By default list menus
        if (empty($subMenu)) {
                // List only main menus
        // By default list menus
        if (empty($subMenu)) {
                // List only main menus

-               $result = SQL_QUERY("SELECT `id`,`action`,`what`,`title`,`sort` FROM `{?_MYSQL_PREFIX?}_guest_menu` WHERE (`what`='' OR `what` IS NULL) ORDER BY `sort` ASC", __FILE__, __LINE__);
+               $result = SQL_QUERY("SELECT `id`, `action`, `what`, `title`, `sort` FROM `{?_MYSQL_PREFIX?}_guest_menu` WHERE (`what`='' OR `what` IS NULL) ORDER BY `sort` ASC", __FILE__, __LINE__);

        } else {
                // List sub menus
        } else {
                // List sub menus

-               $result = SQL_QUERY_ESC("SELECT `id`,`action`,`what`,`title`,`sort` FROM `{?_MYSQL_PREFIX?}_guest_menu` WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort` ASC",
+               $result = SQL_QUERY_ESC("SELECT `id`, `action`, `what`, `title`, `sort` FROM `{?_MYSQL_PREFIX?}_guest_menu` WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort` ASC",

                        array($subMenu), __FILE__, __LINE__);
        }
 
                        array($subMenu), __FILE__, __LINE__);
        }
 

diff --git a/inc/modules/admin/what-list_country.php b/inc/modules/admin/what-list_country.php
index 05397487ce4e89ebc0816498585e9a02d7349ae6..40418c251c8ff6b3e7c201657fcfc8e9d71317ce 100644 (file)
--- a/inc/modules/admin/what-list_country.php
+++ b/inc/modules/admin/what-list_country.php
@@ -82,7 +82,7 @@ if ((isFormSent('add')) && (isPostRequestParameterSet('code')) && (isPostRequest
        if (count(postRequestParameter('id')) > 0) {
                if (isFormSent('edit')) {
                        // Edit template
        if (count(postRequestParameter('id')) > 0) {
                if (isFormSent('edit')) {
                        // Edit template

-                       $row    = 'admin_list_country_edit_row';
+                       $row    = 'admin_edit_country_row';

                        $post   = 'modify';
                        $class  = 'form_submit';
                        $submit = '{--ADMIN_COUNTRY_EDIT_NOW--}';
                        $post   = 'modify';
                        $class  = 'form_submit';
                        $submit = '{--ADMIN_COUNTRY_EDIT_NOW--}';


@@ -90,7 +90,7 @@ if ((isFormSent('add')) && (isPostRequestParameterSet('code')) && (isPostRequest
                        $reset  = '<input type="reset" class="form_reset" value="{--UNDO_SELECTIONS--}" /> ';
                } else {
                        // Delete template
                        $reset  = '<input type="reset" class="form_reset" value="{--UNDO_SELECTIONS--}" /> ';
                } else {
                        // Delete template

-                       $row    = 'admin_list_country_del_row';
+                       $row    = 'admin_delete_country_row';

                        $post   = 'remove';
                        $class  = 'form_delete';
                        $submit = '{--ADMIN_COUNTRY_DELETE_NOW--}';
                        $post   = 'remove';
                        $class  = 'form_delete';
                        $submit = '{--ADMIN_COUNTRY_DELETE_NOW--}';


@@ -108,13 +108,8 @@ if ((isFormSent('add')) && (isPostRequestParameterSet('code')) && (isPostRequest
                                // Load data
                                $content = SQL_FETCHARRAY($result);
 
                                // Load data
                                $content = SQL_FETCHARRAY($result);
 

-                               if ($post == 'modify') {
-                                       // Generate default selection in edit-mode
-                                       $content['is_active'] = generateOptionList('/ARRAY/', array('Y', 'N'), array('{--YES--}', '{--NO--}'), $isActive);
-                               } else {
-                                       // Only display status when in delete-mode
-                                       $content['is_active'] = '{%pipe,translateYesNo=' . $isActive . '%}';
-                               }
+                               // Add $isActive
+                               $content['is_active'] = $isActive;

 
                                // Insert row template and switch color
                                $OUT .= loadTemplate($row, true, $content);
 
                                // Insert row template and switch color
                                $OUT .= loadTemplate($row, true, $content);

diff --git a/inc/modules/admin/what-mem_add.php b/inc/modules/admin/what-mem_add.php
index d77a7b1cf885a1defd38da9337607d88f42dc636..5c87bf8f84ae94a1164bc2b6cfb6dea13431183d 100644 (file)
--- a/inc/modules/admin/what-mem_add.php
+++ b/inc/modules/admin/what-mem_add.php
@@ -170,7 +170,7 @@ if (!isFormSent()) {
 } elseif (!isDemoModeActive()) {
        // Insert new menu entry
        if (isPostRequestParameterSet('menu')) {
 } elseif (!isDemoModeActive()) {
        // Insert new menu entry
        if (isPostRequestParameterSet('menu')) {

-               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('%s','%s','%s','%s','%s','%s')",
+               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`, `what`, `title`, `visible`, `locked`, `sort`) VALUES ('%s','%s','%s','%s','%s','%s')",

                        array(
                                postRequestParameter('menu'),
                                postRequestParameter('name'),
                        array(
                                postRequestParameter('menu'),
                                postRequestParameter('name'),


@@ -180,7 +180,7 @@ if (!isFormSent()) {
                                bigintval(postRequestParameter('sort')),
                        ), __FILE__, __LINE__);
        } else {
                                bigintval(postRequestParameter('sort')),
                        ), __FILE__, __LINE__);
        } else {

-               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`title`,`visible`,`locked`,`sort`) VALUES ('%s','%s','%s','%s','%s')",
+               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`, `title`, `visible`, `locked`, `sort`) VALUES ('%s','%s','%s','%s','%s')",

                        array(
                                postRequestParameter('name'),
                                postRequestParameter('title'),
                        array(
                                postRequestParameter('name'),
                                postRequestParameter('title'),

diff --git a/inc/modules/admin/what-send_coupon.php b/inc/modules/admin/what-send_coupon.php
index 84309479f8c63f8d0573fcdd9cde9562c6d0a055..2d359b36618272f7ed3b5c0cf2de7c33720a4c47 100644 (file)
--- a/inc/modules/admin/what-send_coupon.php
+++ b/inc/modules/admin/what-send_coupon.php
@@ -63,7 +63,7 @@ if (isFormSent()) {
                        $expirationTime = time() + createEpocheTimeFromSelections('coupon_default_time', postRequestArray());
 
                        // Insert coupon data
                        $expirationTime = time() + createEpocheTimeFromSelections('coupon_default_time', postRequestArray());
 
                        // Insert coupon data

-                       SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_coupon_data` (`coupon_expired`, `total_created`, `points`, `coupon_description`) VALUES('{%%pipe,SQL_EPOCHE_TO_TIMESTAMP=%s%%}', %s,%s,'%s')",
+                       SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_coupon_data` (`coupon_expired`, `total_created`, `points`, `coupon_description`) VALUES ('{%%pipe,SQL_EPOCHE_TO_TIMESTAMP=%s%%}', %s,%s,'%s')",

                                array(
                                        $expirationTime,
                                        SQL_NUMROWS($result),
                                array(
                                        $expirationTime,
                                        SQL_NUMROWS($result),


@@ -95,7 +95,7 @@ if (isFormSent()) {
                                } // END - while
 
                                // The above loop should always set $couponCode, so we can now insert it
                                } // END - while
 
                                // The above loop should always set $couponCode, so we can now insert it

-                               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_coupons` (`coupon_id`, `userid`, `coupon_code`) VALUES(%s,%s,'%s')",
+                               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_coupons` (`coupon_id`, `userid`, `coupon_code`) VALUES (%s,%s,'%s')",

                                        array($couponId, $userid, $couponCode), __FILE__, __LINE__);
 
                                // Fill array with all required data
                                        array($couponId, $userid, $couponCode), __FILE__, __LINE__);
 
                                // Fill array with all required data

diff --git a/inc/modules/admin/what-theme_import.php b/inc/modules/admin/what-theme_import.php
index c3665f9881913dd9487e66fb3db205dca33b5389..c2a407f2bb99ea39ef790cb72fa1229f1bdbda5c 100644 (file)
--- a/inc/modules/admin/what-theme_import.php
+++ b/inc/modules/admin/what-theme_import.php
@@ -59,7 +59,7 @@ if (isPostRequestParameterSet('theme')) {
                        loadInclude($inc);
 
                        // Register it ith the exchange
                        loadInclude($inc);
 
                        // Register it ith the exchange

-                       SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_themes` (`theme_path`,`theme_active`,`theme_ver`,`theme_name`)
+                       SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_themes` (`theme_path`, `theme_active`, `theme_ver`, `theme_name`)

 VALUES ('%s','N','%s','%s')",
                                array(
                                        postRequestParameter('theme'),
 VALUES ('%s','N','%s','%s')",
                                array(
                                        postRequestParameter('theme'),

diff --git a/inc/modules/admin/what-unlock_emails.php b/inc/modules/admin/what-unlock_emails.php
index de4eead956cbecc561c3bb5f6bfbc5eca3df6c7e..8a135b2d30e6bca10b563bc1c339955c83e5aeeb 100644 (file)
--- a/inc/modules/admin/what-unlock_emails.php
+++ b/inc/modules/admin/what-unlock_emails.php
@@ -179,7 +179,7 @@ LIMIT 1",
                                array($url), __FILE__, __LINE__);
                        if (SQL_HASZERONUMS($result)) {
                                // Did not find a record so we can add it... :)
                                array($url), __FILE__, __LINE__);
                        if (SQL_HASZERONUMS($result)) {
                                // Did not find a record so we can add it... :)

-                               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_url_blacklist` (`url`,`pool_id`) VALUES ('%s',%s)",
+                               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_url_blacklist` (`url`, `pool_id`) VALUES ('%s',%s)",

                                        array($url, $id), __FILE__, __LINE__);
                        } // END - if
 
                                        array($url, $id), __FILE__, __LINE__);
                        } // END - if
 

diff --git a/inc/modules/member/what-cash_coupon.php b/inc/modules/member/what-cash_coupon.php
index 3e538b9aa21049411afda73987580e8fcad47e58..7c9a24241f70e230ead3059a5bc239b7ef87932f 100644 (file)
--- a/inc/modules/member/what-cash_coupon.php
+++ b/inc/modules/member/what-cash_coupon.php
@@ -119,7 +119,7 @@ LIMIT 1",
                        } // END - if
 
                        // Now we just need to book that points on the user's account
                        } // END - if
 
                        // Now we just need to book that points on the user's account

-                       addPointsThroughReferalSystem('coupon_cashed', getMemberId(), $content['points'], false, 0, getPaymentMethodFromExtensionName('coupon'));
+                       addPointsThroughReferalSystem('coupon_cashed', getMemberId(), $content['points']);

 
                        // Subtract points from member account if the admin has selected one
                        if (isValidUserId(getConfig('coupon_userid'))) {
 
                        // Subtract points from member account if the admin has selected one
                        if (isValidUserId(getConfig('coupon_userid'))) {

diff --git a/inc/modules/member/what-primera.php b/inc/modules/member/what-primera.php
index 684bd1e2c39efdde01642193e73707f3b9205cf8..929169226f3c0b86a857db705d505330cc9296e5 100644 (file)
--- a/inc/modules/member/what-primera.php
+++ b/inc/modules/member/what-primera.php
@@ -71,7 +71,7 @@ if (!isGetRequestParameterSet('mode')) {
                setGetRequestParameter('mode', 'list');
 
                // And load all rows!
                setGetRequestParameter('mode', 'list');
 
                // And load all rows!

-               $result = SQL_QUERY_ESC("SELECT `id`,`primera_account`,`primera_amount`,`primera_timestamp`,`primera_type` FROM `{?_MYSQL_PREFIX?}_user_primera` WHERE `userid`=%s ORDER BY `primera_timestamp` DESC",
+               $result = SQL_QUERY_ESC("SELECT `id`, `primera_account`, `primera_amount`, `primera_timestamp`, `primera_type` FROM `{?_MYSQL_PREFIX?}_user_primera` WHERE `userid`=%s ORDER BY `primera_timestamp` DESC",

                        array(getMemberId()), __FILE__, __LINE__);
 
                // Load all rows
                        array(getMemberId()), __FILE__, __LINE__);
 
                // Load all rows

diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php
index 6376feb75388e665b03bb30eaee2697fd3fb0b22..d00378024974bb185b481537860532d9696478e8 100644 (file)
--- a/inc/modules/member/what-transfer.php
+++ b/inc/modules/member/what-transfer.php
@@ -144,12 +144,24 @@ switch ($mode) {
 
                                // Add entries to both tables
                                SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_transfers_in` (`userid`, `from_userid`, `points`, `reason`, `time_trans`, `trans_id`) VALUES (%s,%s,%s,'%s', UNIX_TIMESTAMP(),%s)",
 
                                // Add entries to both tables
                                SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_transfers_in` (`userid`, `from_userid`, `points`, `reason`, `time_trans`, `trans_id`) VALUES (%s,%s,%s,'%s', UNIX_TIMESTAMP(),%s)",

-                                       array(bigintval(postRequestParameter('to_userid')), getMemberId(), bigintval(postRequestParameter('points')), postRequestParameter('reason'), $content['trans_id']), __FILE__, __LINE__);
+                                       array(
+                                               bigintval(postRequestParameter('to_userid')),
+                                               getMemberId(),
+                                               bigintval(postRequestParameter('points')),
+                                               postRequestParameter('reason'),
+                                               $content['trans_id']
+                                       ), __FILE__, __LINE__);

                                SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_transfers_out` (`userid`, `to_userid`, `points`, `reason`, `time_trans`, `trans_id`) VALUES (%s,%s,%s,'%s', UNIX_TIMESTAMP(),%s)",
                                SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_transfers_out` (`userid`, `to_userid`, `points`, `reason`, `time_trans`, `trans_id`) VALUES (%s,%s,%s,'%s', UNIX_TIMESTAMP(),%s)",

-                                       array(getMemberId(), bigintval(postRequestParameter('to_userid')), bigintval(postRequestParameter('points')), postRequestParameter('reason'), $content['trans_id']), __FILE__, __LINE__);
+                                       array(
+                                               getMemberId(),
+                                               bigintval(postRequestParameter('to_userid')),
+                                               bigintval(postRequestParameter('points')),
+                                               postRequestParameter('reason'),
+                                               $content['trans_id']
+                                       ), __FILE__, __LINE__);

 
                                // Add points to account *directly* ...
 
                                // Add points to account *directly* ...

-                               addPointsDirectly('transfer', bigintval(postRequestParameter('to_userid')), bigintval(postRequestParameter('points')));
+                               addPointsThroughReferalSystem('transfer', bigintval(postRequestParameter('to_userid')), bigintval(postRequestParameter('points')));

 
                                // ... and add it to current user's used points
                                subtractPoints('transfer', getMemberId(), postRequestParameter('points'));
 
                                // ... and add it to current user's used points
                                subtractPoints('transfer', getMemberId(), postRequestParameter('points'));

diff --git a/inc/modules/member/what-wernis.php b/inc/modules/member/what-wernis.php
index 9ea20c21125464fe732be47a2708c9b3c04e0d61..e00af871a2ee8333868e4aca17c1bae0ce3a523b 100644 (file)
--- a/inc/modules/member/what-wernis.php
+++ b/inc/modules/member/what-wernis.php
@@ -175,7 +175,7 @@ if ((isFormSent()) && (isGetRequestParameterSet('mode'))) {
                                        $success = WERNIS_EXECUTE_WITHDRAW(postRequestParameter('wernis_userid'), md5(postRequestParameter('wds66_password')), postRequestParameter('amount'));
                                        if ($success === true) {
                                                // Add it to this amount
                                        $success = WERNIS_EXECUTE_WITHDRAW(postRequestParameter('wernis_userid'), md5(postRequestParameter('wds66_password')), postRequestParameter('amount'));
                                        if ($success === true) {
                                                // Add it to this amount

-                                               addPointsDirectly('wernis_withdraw', getMemberId(), bigintval(postRequestParameter('amount')));
+                                               addPointsThroughReferalSystem('wernis_withdraw', getMemberId(), bigintval(postRequestParameter('amount')));

 
                                                // Update the user data as well..
                                                SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `wernis_userid`=%s WHERE `userid`=%s LIMIT 1",
 
                                                // Update the user data as well..
                                                SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `wernis_userid`=%s WHERE `userid`=%s LIMIT 1",

diff --git a/inc/monthly/monthly_beg.php b/inc/monthly/monthly_beg.php
index 56a93a07860904f87f75e3cc98446efa602d0d46..5372ce06be98fb5841bca64d1c0bd6728d64937a 100644 (file)
--- a/inc/monthly/monthly_beg.php
+++ b/inc/monthly/monthly_beg.php
@@ -83,7 +83,7 @@ LIMIT {?beg_ranks?}", __FILE__, __LINE__);
                // Load our winners...
                while ($content = SQL_FETCHARRAY($result_main)) {
                        // Add points to user's account directly
                // Load our winners...
                while ($content = SQL_FETCHARRAY($result_main)) {
                        // Add points to user's account directly

-                       addPointsDirectly('monthly_beg', $content['userid'], $content['beg_points']);
+                       addPointsThroughReferalSystem('monthly_beg', $content['userid'], $content['beg_points']);

 
                        // Load email template and email it away
                        $message = loadEmailTemplate('member_beg', $content, bigintval($content['userid']));
 
                        // Load email template and email it away
                        $message = loadEmailTemplate('member_beg', $content, bigintval($content['userid']));

diff --git a/inc/monthly/monthly_bonus.php b/inc/monthly/monthly_bonus.php
index 037b2a949c7f0a5f65f2b467d4648f7fe9f88086..ff5981a30adfb9d5940d9be85f6ceac7d7055541 100644 (file)
--- a/inc/monthly/monthly_bonus.php
+++ b/inc/monthly/monthly_bonus.php
@@ -91,7 +91,7 @@ LIMIT {?bonus_ranks?}', __FILE__, __LINE__);
                        // Make sure zero points are not mailed
                        if ($content['points'] > 0) {
                                // Add points to user's account directly
                        // Make sure zero points are not mailed
                        if ($content['points'] > 0) {
                                // Add points to user's account directly

-                               addPointsDirectly('monthly_bonus', $content['userid'], $content['points']);
+                               addPointsThroughReferalSystem('monthly_bonus', $content['userid'], $content['points']);

 
                                // Load email template and email it away
                                $message = loadEmailTemplate('member_bonus', $content, bigintval($content['userid']));
 
                                // Load email template and email it away
                                $message = loadEmailTemplate('member_bonus', $content, bigintval($content['userid']));

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 177da67eb57a0f78f35cc46720a4d8c639d89caf..9ffbb0297cb7c67fdbc5d356251cdc2ab18c7919 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -1035,31 +1035,39 @@ function initReferalSystem () {
  *
  * Dynamic referal and points system, can also send mails!
  *
  *
  * Dynamic referal and points system, can also send mails!
  *

- * subject     = Subject line, write in lower-case letters and underscore is allowed
- * userid      = Referal id wich should receive...
- * points      = ... xxx points
- * sendNotify  = shall I send the referal an email or not?
- * refid       = inc/modules/guest/what-confirm.php need this
- * locked      = Shall I pay it to normal (false) or locked (true) points ammount?
- * add_mode    = Add points only to $userid or also refs? (WARNING! Changing 'REFERAL' to 'DIRECT'
- *               for default value will cause no referal will get points ever!!!)
+ * subject       = Subject line, write in lower-case letters and underscore is allowed
+ * userid        = Referal id wich should receive...
+ * points        = ... xxx points
+ * refid         = inc/modules/guest/what-confirm.php need this
+ * locked        = Shall I pay it to normal (false) or locked (true) points ammount?
+ * paymentMethod = Deprecated parameter, the payment method

  */
  */

-function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify = false, $refid = '0', $addMode = 'REFERAL') {
-       /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'subject=' . $subject . ',userid=' . $userid . ',points=' . $points . ',sendNotify=' . intval($sendNotify) . ',refid=' . $refid . ',addMode=' . $addMode . ' - ENTERED!');
+function addPointsThroughReferalSystem ($subject, $userid, $points, $refid = '0', $paymentMethod = 'INVALID') {
+       /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'subject=' . $subject . ',userid=' . $userid . ',points=' . $points . ',sendNotify=' . intval($sendNotify) . ',refid=' . $refid . ',paymentMethod=' . $paymentMethod . ' - ENTERED!');

        // By default nothing has been added
        $added = false;
 
        // Convert mode to upper-case
        // By default nothing has been added
        $added = false;
 
        // Convert mode to upper-case

-       $addMode = strtoupper($addMode);
+       $paymentMethod = strtoupper($paymentMethod);
+
+       // Is it not invalid?
+       if ($paymentMethod != 'INVALID') {
+               // We are not using this anymore
+               debug_report_bug(__FUNCTION__, __LINE__, 'subject=' . $subject . ',paymentMethod=' . $paymentMethod . ' - deprecated parameter used.');
+       } // END - if
+
+       // Determine payment method and notification
+       $paymentMethod = getPaymentMethodFromSubject($subject);
+       $sendNotify    = isPaymentRecipientNotificationEnabled($subject);

 
        // When $userid = '0' add points to jackpot
 
        // When $userid = '0' add points to jackpot

-       if (($userid == '0') && ($addMode == 'DIRECT') && (isExtensionActive('jackpot'))) {
+       if (($userid == '0') && ($paymentMethod == 'DIRECT') && (isExtensionActive('jackpot'))) {

                // Add points to jackpot only in DIRECT mode
                return addPointsToJackpot($points);
        } // END - if
 
        // Check user account
                // Add points to jackpot only in DIRECT mode
                return addPointsToJackpot($points);
        } // END - if
 
        // Check user account

-       /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid='.$userid.',points='.$points);
+       /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',points=' . $points);

        if (fetchUserData($userid)) {
                // Determine wether the user has some mails to click before he/she gets the points
                $locked = ifUserPointsLocked($userid);
        if (fetchUserData($userid)) {
                // Determine wether the user has some mails to click before he/she gets the points
                $locked = ifUserPointsLocked($userid);


@@ -1072,7 +1080,7 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify
 
                // Get percents
                $per = getReferalLevelPercents($GLOBALS['ref_level']);
 
                // Get percents
                $per = getReferalLevelPercents($GLOBALS['ref_level']);

-               /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid='.$userid.',points='.$points.',depth='.$GLOBALS['ref_level'].',per='.$per.',mode='.$addMode);
+               /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid='.$userid.',points='.$points.',depth='.$GLOBALS['ref_level'].',per='.$per.',mode='.$paymentMethod);

 
                // Some percents found?
                if ($per > 0) {
 
                // Some percents found?
                if ($per > 0) {


@@ -1081,7 +1089,7 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify
                        /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid='.$userid.',points='.$points.',per='.$per.',depth='.$GLOBALS['ref_level'].',ref_points='.$ref_points);
 
                        // Pay refback here if level > 0 and in ref-mode
                        /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid='.$userid.',points='.$points.',per='.$per.',depth='.$GLOBALS['ref_level'].',ref_points='.$ref_points);
 
                        // Pay refback here if level > 0 and in ref-mode

-                       if ((isExtensionActive('refback')) && ($GLOBALS['ref_level'] > 0) && ($per < 100) && ($addMode == 'REFERAL') && (isset($GLOBALS['cache_array']['add_userid'][$userid]))) {
+                       if ((isExtensionActive('refback')) && ($GLOBALS['ref_level'] > 0) && ($per < 100) && ($paymentMethod == 'REFERAL') && (isset($GLOBALS['cache_array']['add_userid'][$userid]))) {

                                /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid='.$userid.',data='.$GLOBALS['cache_array']['add_userid'][$userid].',ref_points='.$ref_points.',depth='.$GLOBALS['ref_level'].' - BEFORE!');
                                $ref_points = addRefbackPoints($GLOBALS['cache_array']['add_userid'][$userid], $userid, $points, $ref_points);
                                /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid='.$userid.',data='.$GLOBALS['cache_array']['add_userid'][$userid].',ref_points='.$ref_points.',depth='.$GLOBALS['ref_level'].' - AFTER!');
                                /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid='.$userid.',data='.$GLOBALS['cache_array']['add_userid'][$userid].',ref_points='.$ref_points.',depth='.$GLOBALS['ref_level'].' - BEFORE!');
                                $ref_points = addRefbackPoints($GLOBALS['cache_array']['add_userid'][$userid], $userid, $points, $ref_points);
                                /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid='.$userid.',data='.$GLOBALS['cache_array']['add_userid'][$userid].',ref_points='.$ref_points.',depth='.$GLOBALS['ref_level'].' - AFTER!');


@@ -1108,7 +1116,7 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify
                                                bigintval($GLOBALS['ref_level'])
                                        ), __FUNCTION__, __LINE__);
                        }
                                                bigintval($GLOBALS['ref_level'])
                                        ), __FUNCTION__, __LINE__);
                        }

-                       /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'pointsColumn='.$pointsColumn.',ref_points='.$ref_points.',userid='.$userid.',depth='.$GLOBALS['ref_level'].',mode='.$addMode.' - UPDATE! ('.SQL_AFFECTEDROWS().')');
+                       /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'pointsColumn='.$pointsColumn.',ref_points='.$ref_points.',userid='.$userid.',depth='.$GLOBALS['ref_level'].',mode='.$paymentMethod.' - UPDATE! ('.SQL_AFFECTEDROWS().')');

 
                        // No entry updated?
                        if (SQL_HASZEROAFFECTED()) {
 
                        // No entry updated?
                        if (SQL_HASZEROAFFECTED()) {


@@ -1120,7 +1128,7 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify
                                                makeZeroToNull($GLOBALS['ref_level']),
                                                $ref_points
                                        ), __FUNCTION__, __LINE__);
                                                makeZeroToNull($GLOBALS['ref_level']),
                                                $ref_points
                                        ), __FUNCTION__, __LINE__);

-                               /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'data='.$pointsColumn.',ref_points='.$ref_points.',userid='.$userid.',depth='.$GLOBALS['ref_level'].',mode='.$addMode.' - INSERTED! ('.SQL_AFFECTEDROWS().')');
+                               /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'data='.$pointsColumn.',ref_points='.$ref_points.',userid='.$userid.',depth='.$GLOBALS['ref_level'].',mode='.$paymentMethod.' - INSERTED! ('.SQL_AFFECTEDROWS().')');

                        } // END - if
 
                        // Check affected rows
                        } // END - if
 
                        // Check affected rows


@@ -1138,7 +1146,7 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify
                                'refid'      => $refid,
                                'locked'     => $locked,
                                'mode'       => 'add',
                                'refid'      => $refid,
                                'locked'     => $locked,
                                'mode'       => 'add',

-                               'add_mode'   => $addMode,
+                               'add_mode'   => $paymentMethod,

                                'added'      => $added
                        );
 
                                'added'      => $added
                        );
 


@@ -1163,11 +1171,12 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify
 
                                // Send email
                                sendEmail($userid, '{--THANX_REFERAL_ONE_SUBJECT--}', $message);
 
                                // Send email
                                sendEmail($userid, '{--THANX_REFERAL_ONE_SUBJECT--}', $message);

-                       } elseif (($sendNotify === true) && (!isValidUserId(getUserData('refid'))) && ($locked === false) && ($addMode == 'DIRECT')) {
+                       } elseif (($sendNotify === true) && (!isValidUserId(getUserData('refid'))) && ($locked === false) && ($paymentMethod == 'DIRECT')) {

                                // Prepare content
                                $content = array(
                                // Prepare content
                                $content = array(

-                                       'reason' => '{--REASON_DIRECT_PAYMENT--}',
-                                       'points' => $ref_points
+                                       'reason'  => '{--REASON_DIRECT_PAYMENT--}',
+                                       'subject' => $subject,
+                                       'points'  => $ref_points

                                );
 
                                // Load message
                                );
 
                                // Load message


@@ -1186,15 +1195,15 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify
                        /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, ' Referal level increased, ref_level=' . $GLOBALS['ref_level']);
 
                        // Maybe there's another ref?
                        /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, ' Referal level increased, ref_level=' . $GLOBALS['ref_level']);
 
                        // Maybe there's another ref?

-                       if ((isValidUserId(getUserData('refid'))) && ($points > 0) && (getUserData('refid') != $userid) && ($addMode == 'REFERAL')) {
+                       if ((isValidUserId(getUserData('refid'))) && ($points > 0) && (getUserData('refid') != $userid) && ($paymentMethod == 'REFERAL')) {

                                // Then let's credit him here...
                                /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',refid=' . getUserData('refid') . ',points=' . $points . ',ref_points=' . $ref_points . ' - ADVANCE!');
                                // Then let's credit him here...
                                /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',refid=' . getUserData('refid') . ',points=' . $points . ',ref_points=' . $ref_points . ' - ADVANCE!');

-                               $added = ($added && addPointsThroughReferalSystem(sprintf("%s_ref:%s", $subject, $GLOBALS['ref_level']), getUserData('refid'), $points, $sendNotify, getUserData('refid')));
+                               $added = ($added && addPointsThroughReferalSystem(sprintf("%s_ref:%s", $subject, $GLOBALS['ref_level']), getUserData('refid'), $points, getUserData('refid')));

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

-       /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'subject=' . $subject . ',userid=' . $userid . ',points=' . $points . ',sendNotify=' . intval($sendNotify) . ',refid=' . $refid . ',addMode=' . $addMode . ' - EXIT!');
+       /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'subject=' . $subject . ',userid=' . $userid . ',points=' . $points . ',sendNotify=' . intval($sendNotify) . ',refid=' . $refid . ',paymentMethod=' . $paymentMethod . ' - EXIT!');

        return $added;
 }
 
        return $added;
 }
 


@@ -2051,51 +2060,57 @@ function updateLastActivity($userid) {
 }
 
 // Get points data for given extension's name
 }
 
 // Get points data for given extension's name

-function getPointsDataArrayFromExtensionName ($ext_name) {
+function getPointsDataArrayFromSubject ($subject) {
+       // Extension sql_patches must be up-to-date
+       if (isExtensionInstalledAndOlder('sql_patches', '0.8.2')) {
+               // Please update ext-sql_patches
+               debug_report_bug(__FUNCTION__, __LINE__, 'sql_patches is out-dated. Please update to at least 0.8.2 to continue. subject=' . $subject);
+       } // END - if
+
+       // Remove any double-dot from it
+       $subjectArray = explode(':', $subject);
+       $subject = $subjectArray[0];
+       unset($subjectArray);
+

        // If we have cache, shortcut it here
        // If we have cache, shortcut it here

-       if (isset($GLOBALS['cache_array']['points_data'][$ext_name])) {
+       if (isset($GLOBALS['cache_array']['points_data'][$subject])) {

                // Return it
                // Return it

-               return $GLOBALS['cache_array']['points_data'][$ext_name];
+               return $GLOBALS['cache_array']['points_data'][$subject];

        } // END - if
 
        // Now checkout the entry in database table
        } // END - if
 
        // Now checkout the entry in database table

-       $result = SQL_QUERY_ESC("SELECT `id`, `ext_name`, `column_name`, `locked_mode`, `payment_method` FROM `{?_MYSQL_PREFIX?}_points_data` WHERE `ext_name`='%s' LIMIT 1",
-               array($ext_name), __FUNCTION__, __LINE__);
+       $result = SQL_QUERY_ESC("SELECT `id`, `subject`, `column_name`, `locked_mode`, `payment_method`, `notify_recipient` FROM `{?_MYSQL_PREFIX?}_points_data` WHERE `subject`='%s' LIMIT 1",
+               array($subject), __FUNCTION__, __LINE__);

 
        // Do we have an entry?
        if (SQL_NUMROWS($result) == 1) {
                // Then load it
                $pointsData = SQL_FETCHARRAY($result);
 
 
        // Do we have an entry?
        if (SQL_NUMROWS($result) == 1) {
                // Then load it
                $pointsData = SQL_FETCHARRAY($result);
 

-               // Add all remaining entries
+               // Add all entries to our cache array

                foreach ($pointsData as $key=>$value) {
                foreach ($pointsData as $key=>$value) {

-                       $GLOBALS['cache_array']['points_data'][$ext_name][$key] = $value;
+                       $GLOBALS['cache_array']['points_data'][$subject][$key] = $value;

                } // END - foreach
        } else {
                } // END - foreach
        } else {

-               /*
-                * Having no entry is not bad but it means that all points will go to
-                * the general account which the user can let payout.
-                */
-               logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ' - No entry found, switching to general points account.');
+               // Register this automatically
+               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_points_data` (`subject`, `column_name`, `locked_mode`, `payment_method`, `notify_recipient`) VALUES ('%s','points','LOCKED','REFERAL','N')",
+                       array($subject), __FUNCTION__, __LINE__);
+
+               // Re-request it
+               return getPointsDataArrayFromSubject($subject);

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

-       return $GLOBALS['cache_array']['points_data'][$ext_name];
+       return $GLOBALS['cache_array']['points_data'][$subject];

 }
 
 }
 

-// Determines the right points column name for given extension and 'locked'
-function getPointsColumnNameFromExtensionNameLocked ($ext_name, $isLocked) {
-       // Extension sql_patches must be up-to-date
-       if (isExtensionInstalledAndOlder('sql_patches', '0.8.0')) {
-               // Please update ext-sql_patches
-               debug_report_bug(__FUNCTION__, __LINE__, 'sql_patches is out-dated. Please update to at least 0.8.0 to continue. ext_name=' . $ext_name . ',isLocked=' . intval($isLocked));
-       } // END - if
-
+// Determines the right points column name for given subject and 'locked'
+function getPointsColumnNameFromSubjectLocked ($subject, $isLocked) {

        // Get the points_data entry
        // Get the points_data entry

-       $pointsData = getPointsDataArrayFromExtensionName($ext_name);
+       $pointsData = getPointsDataArrayFromSubject($subject);

 
        // Regular points by default
        $columnName = $pointsData['column_name'];
 
        // Regular points by default
        $columnName = $pointsData['column_name'];


@@ -2111,15 +2126,9 @@ function getPointsColumnNameFromExtensionNameLocked ($ext_name, $isLocked) {
 }
 
 // Determines the payment method for given extension and 'locked'
 }
 
 // Determines the payment method for given extension and 'locked'

-function getPaymentMethodFromExtensionName ($ext_name) {
-       // Extension sql_patches must be up-to-date
-       if (isExtensionInstalledAndOlder('sql_patches', '0.8.0')) {
-               // Please update ext-sql_patches
-               debug_report_bug(__FUNCTION__, __LINE__, 'sql_patches is out-dated. Please update to at least 0.8.0 to continue. ext_name=' . $ext_name . ',isLocked=' . intval($isLocked));
-       } // END - if
-
+function getPaymentMethodFromSubject ($subject) {

        // Get the points_data entry
        // Get the points_data entry

-       $pointsData = getPointsDataArrayFromExtensionName($ext_name);
+       $pointsData = getPointsDataArrayFromSubject($subject);

 
        // Regular points by default
        $paymentMethod = $pointsData['payment_method'];
 
        // Regular points by default
        $paymentMethod = $pointsData['payment_method'];


@@ -2128,5 +2137,17 @@ function getPaymentMethodFromExtensionName ($ext_name) {
        return $paymentMethod;
 }
 
        return $paymentMethod;
 }
 

+// Checks wether notification of points recipient is enabled
+function isPaymentRecipientNotificationEnabled ($subject) {
+       // Get the points_data entry
+       $pointsData = getPointsDataArrayFromSubject($subject);
+
+       // Is it enabled?
+       $isEnabled = ($pointsData['notify_recipient'] == 'Y');
+
+       // Return the result
+       return $isEnabled;
+}
+

 // [EOF]
 ?>
 // [EOF]
 ?>

diff --git a/inc/pool/pool-user.php b/inc/pool/pool-user.php
index 906ceb9d1df315230b52fea2d464ca35e590b346..1ddd1a99593eaffbb26c0ff7ee083e96bfe38424 100644 (file)
--- a/inc/pool/pool-user.php
+++ b/inc/pool/pool-user.php
@@ -255,7 +255,7 @@ if (!SQL_HASZERONUMS($result_main)) {
                                                if (isValidUserId($userid)) {
                                                        // User does not exists, pay points back
                                                        $points = getPaymentPoints($DATA['payment_id']);
                                                if (isValidUserId($userid)) {
                                                        // User does not exists, pay points back
                                                        $points = getPaymentPoints($DATA['payment_id']);

-                                                       addPointsDirectly('pool_payback', $DATA['sender_userid'], $points);
+                                                       addPointsThroughReferalSystem('pool_payback', $DATA['sender_userid'], $points);

 
                                                        // Add points together and remove user
                                                        $pointsBack[$DATA['sender_userid']] += $points;
 
                                                        // Add points together and remove user
                                                        $pointsBack[$DATA['sender_userid']] += $points;

diff --git a/inc/stats-functions.php b/inc/stats-functions.php
index 5b6e48c0be55b11d01848f3fa668e69fa5b2586b..130e9ae2b3c919426fe7ee7219f3f00fd528ec98 100644 (file)
--- a/inc/stats-functions.php
+++ b/inc/stats-functions.php
@@ -159,7 +159,7 @@ function writeStatsTable () {
                array(generateDateTime(time(), '6')), __FUNCTION__, __LINE__);
 
        // Begin the SQL command
                array(generateDateTime(time(), '6')), __FUNCTION__, __LINE__);
 
        // Begin the SQL command

-       $sql = sprintf("REPLACE INTO `{?_MYSQL_PREFIX?}_stats_%s` (`stats_entry`,`stats_value`) VALUES ",
+       $sql = sprintf("REPLACE INTO `{?_MYSQL_PREFIX?}_stats_%s` (`stats_entry`, `stats_value`) VALUES ",

                generateDateTime(time(), '6'));
 
        // Add all entries to the final query
                generateDateTime(time(), '6'));
 
        // Add all entries to the final query

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index 16b10bcb27e074add2f15b8a3968cf2ff49694f4..4384212523182b1da67ba855a6244deea58cda4c 100644 (file)
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -741,7 +741,16 @@ function isBlockModeEnabled () {
        return $GLOBALS['block_mode'];
 }
 
        return $GLOBALS['block_mode'];
 }
 

-// Wrapper function for addPointsThroughReferalSystem()
+/**
+ * Wrapper function for addPointsThroughReferalSystem(), you should generally
+ * avoid this function and use addPointsThroughReferalSystem() directly and add
+ * your special payment method entry to points_data instead.
+ *
+ * @param      $subject        A string-encoded subject for this add
+ * @param      $userid         The recipient (member) for given points
+ * @param      $points         Points to be added to member's account
+ * @return     $added          Wether the points has been added to the user's account
+ */

 function addPointsDirectly ($subject, $userid, $points) {
        // Reset level here
        initReferalSystem();
 function addPointsDirectly ($subject, $userid, $points) {
        // Reset level here
        initReferalSystem();


@@ -2557,6 +2566,12 @@ function parseFloat ($floatString){
     return floatval($floatString);
 }
 
     return floatval($floatString);
 }
 

+// Generates a YES/NO option list from given default
+function generateYesNoOptionList ($default = '') {
+       // Generate it
+       return generateOptionList('/ARRAY/', array('Y', 'N'), array('{--YES--}', '{--NO--}'), $default);
+}
+

 //-----------------------------------------------------------------------------
 //                        Configuration wrapper
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //                        Configuration wrapper
 //-----------------------------------------------------------------------------

diff --git a/install/menu-de.sql b/install/menu-de.sql
index d257a91e33cb9786cd4fc4a4e8f54fdf3f12a3d2..6e4a3bac3ec46b8061d4cd400a443bc706249fac 100644 (file)
--- a/install/menu-de.sql
+++ b/install/menu-de.sql
@@ -1,84 +1,84 @@
-INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('login',NULL,'Willkommen','Eingangsseite zum Admin-Bereich',0);
-INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('email',NULL,'Email-Management','Gebuchte Mails umleiten, Details zu den Buchungen anzeigen, Emails freigeben, registrierte Email-Adress auf Verfügbarkeit testen (Mass-Mailing!), Newsletter versenden, Email-Adressen sperren (Email-Backlist), gebuchte URLs sperren (URL-Blacklist)',4);
-INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('email','email_stats','Email-Statistiken','Schauen Sie sich detailierte Statistiken zu den bereits versanden Mails an.',5);
-INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('email','edit_emails','Email-Daten ändern','Hier können Sie u.a. die gebuchte URL der Emails umändern, usw.',5);
-INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('email','unlock_emails','Emails freigeben','Geben Sie bei manuellem Versand gebuchte Mails hier frei.',5);
-INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('email','email_details','Email-Details ansehen','Sehen Sie sich jedes Details bereits gebuchter Mails an.',5);
-INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup',NULL,'Einstellungen','Interessen ändern, News schreiben, allgmeine Einstellungen (Auto-Versand usw.). Auto-Lock Funktion einrichten, manueller Lock des Versandes einrichten, Teile der Homepage sperren (wegen Wartungsarbeiten)',5);
-INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_email','Versand, Empfang','Hier können Sie die maximal empfangbaren Mails usw. einstellen.',8);
-INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_cats','Kategorien einrichten','Ändern oder löschen Sie bereits bestehende Kategorien oder fügen Sie weitere hinzu.',7);
-INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','refbanner','Referal-Banner','Fügen Sie neue Banner hinzu, die dann die Mitglieder verlinken können, um neue Mitglieder zu werben. Oder editieren / löschen Sie bestehende. Hier sehen Sie auch die Anzahl der Klicks auf den jeweiligen Banner!',12);
-INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','payments','{OPEN_CONFIG}POINTS{CLOSE_CONFIG}-Vergütungen','Fügen Sie neue {OPEN_CONFIG}POINTS{CLOSE_CONFIG}-Vergütungen hinzu oder ändern / löschen Sie bestende.',11);
-INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('misc',NULL,'Verschiedenes','Verschiedene Einstellungen / Info-Seiten, die sonst nirgenswo reinpassten...',6);
-INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('stats',NULL,'Statistiken','Sonstige Statistiken, die nirgenswo reinpassen',7);
-INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('logout',NULL,'Ausloggen','Ausloggen aus dem Admin-Bereich. Dadurch wird Ihre Session gelöscht und Sie müssen sich erneut anmelden.',999);
+INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES ('login',NULL,'Willkommen','Eingangsseite zum Admin-Bereich',0);
+INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES ('email',NULL,'Email-Management','Gebuchte Mails umleiten, Details zu den Buchungen anzeigen, Emails freigeben, registrierte Email-Adress auf Verfügbarkeit testen (Mass-Mailing!), Newsletter versenden, Email-Adressen sperren (Email-Backlist), gebuchte URLs sperren (URL-Blacklist)',4);
+INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES ('email','email_stats','Email-Statistiken','Schauen Sie sich detailierte Statistiken zu den bereits versanden Mails an.',5);
+INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES ('email','edit_emails','Email-Daten ändern','Hier können Sie u.a. die gebuchte URL der Emails umändern, usw.',5);
+INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES ('email','unlock_emails','Emails freigeben','Geben Sie bei manuellem Versand gebuchte Mails hier frei.',5);
+INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES ('email','email_details','Email-Details ansehen','Sehen Sie sich jedes Details bereits gebuchter Mails an.',5);
+INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES ('setup',NULL,'Einstellungen','Interessen ändern, News schreiben, allgmeine Einstellungen (Auto-Versand usw.). Auto-Lock Funktion einrichten, manueller Lock des Versandes einrichten, Teile der Homepage sperren (wegen Wartungsarbeiten)',5);
+INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES ('setup','config_email','Versand, Empfang','Hier können Sie die maximal empfangbaren Mails usw. einstellen.',8);
+INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES ('setup','config_cats','Kategorien einrichten','Ändern oder löschen Sie bereits bestehende Kategorien oder fügen Sie weitere hinzu.',7);
+INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES ('setup','refbanner','Referal-Banner','Fügen Sie neue Banner hinzu, die dann die Mitglieder verlinken können, um neue Mitglieder zu werben. Oder editieren / löschen Sie bestehende. Hier sehen Sie auch die Anzahl der Klicks auf den jeweiligen Banner!',12);
+INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES ('setup','payments','{OPEN_CONFIG}POINTS{CLOSE_CONFIG}-Vergütungen','Fügen Sie neue {OPEN_CONFIG}POINTS{CLOSE_CONFIG}-Vergütungen hinzu oder ändern / löschen Sie bestende.',11);
+INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES ('misc',NULL,'Verschiedenes','Verschiedene Einstellungen / Info-Seiten, die sonst nirgenswo reinpassten...',6);
+INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES ('stats',NULL,'Statistiken','Sonstige Statistiken, die nirgenswo reinpassen',7);
+INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES ('logout',NULL,'Ausloggen','Ausloggen aus dem Admin-Bereich. Dadurch wird Ihre Session gelöscht und Sie müssen sich erneut anmelden.',999);

 
 

-INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`,`visible`,`sort`) VALUES ('Mix / Alles Senden --> keine Erotik!','Y',0);
-INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`,`visible`,`sort`) VALUES ('Mix / Alles Senden --> ohne PopUps, keine Erotik','Y',1);
-INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`,`visible`,`sort`) VALUES ('Traffic, Reflinks, Kostenloses, KEIN MLM!','Y',2);
-INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`,`visible`,`sort`) VALUES ('Geldverdienen, Beruf, Arbeit, KEIN MLM!','Y',3);
-INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`,`visible`,`sort`) VALUES ('Download, PC- Software, HP-Design','Y',4);
-INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`,`visible`,`sort`) VALUES ('Investment, Banken, Börse, Versicherungen, KEIN MLM','Y',5);
-INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`,`visible`,`sort`) VALUES ('Politik, Wissenschaft','Y',6);
-INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`,`visible`,`sort`) VALUES ('Handy, SMS, ISDN, DSL,','Y',7);
-INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`,`visible`,`sort`) VALUES ('Elektronik, Technik, Server, PC-Hardware, Hosting','Y',8);
-INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`,`visible`,`sort`) VALUES ('Auto, Motorrad','Y',9);
-INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`,`visible`,`sort`) VALUES ('Reise,Touristik','Y',10);
-INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`,`visible`,`sort`) VALUES ('Kunst, Kultur, Bildung','Y',11);
-INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`,`visible`,`sort`) VALUES ('Gesundheit, Fitness, Sport, KEIN MLM!','Y',12);
-INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`,`visible`,`sort`) VALUES ('Lifestyle, Mode, Kosmetik, KEIN MLM!','Y',13);
-INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`,`visible`,`sort`) VALUES ('Auktionen, Shopping, Verkauf, KEIN MLM!','Y',14);
-INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`,`visible`,`sort`) VALUES ('Medien, Musik, Film, TV, Video & DVD','Y',15);
-INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`,`visible`,`sort`) VALUES ('Singles, Flirten, Partnerschaft','Y',16);
-INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`,`visible`,`sort`) VALUES ('Gewinnspiele, Wetten, Lotto, KEIN MLM!','Y',17);
-INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`,`visible`,`sort`) VALUES ('Haus, Garten, Freizeit, Hobbys','Y',18);
-INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`,`visible`,`sort`) VALUES ('Erotik --> Keine Hardcore !','Y',19);
-INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`,`visible`,`sort`) VALUES ('Multi Level Marketing (alle Arten)','Y',20);
-INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`,`visible`,`sort`) VALUES ('Wernis-Seiten','Y',21);
-INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`,`visible`,`sort`) VALUES ('Primera-Seiten','Y',22);
+INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`, `visible`, `sort`) VALUES ('Mix / Alles Senden --> keine Erotik!','Y',0);
+INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`, `visible`, `sort`) VALUES ('Mix / Alles Senden --> ohne PopUps, keine Erotik','Y',1);
+INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`, `visible`, `sort`) VALUES ('Traffic, Reflinks, Kostenloses, KEIN MLM!','Y',2);
+INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`, `visible`, `sort`) VALUES ('Geldverdienen, Beruf, Arbeit, KEIN MLM!','Y',3);
+INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`, `visible`, `sort`) VALUES ('Download, PC- Software, HP-Design','Y',4);
+INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`, `visible`, `sort`) VALUES ('Investment, Banken, Börse, Versicherungen, KEIN MLM','Y',5);
+INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`, `visible`, `sort`) VALUES ('Politik, Wissenschaft','Y',6);
+INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`, `visible`, `sort`) VALUES ('Handy, SMS, ISDN, DSL,','Y',7);
+INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`, `visible`, `sort`) VALUES ('Elektronik, Technik, Server, PC-Hardware, Hosting','Y',8);
+INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`, `visible`, `sort`) VALUES ('Auto, Motorrad','Y',9);
+INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`, `visible`, `sort`) VALUES ('Reise,Touristik','Y',10);
+INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`, `visible`, `sort`) VALUES ('Kunst, Kultur, Bildung','Y',11);
+INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`, `visible`, `sort`) VALUES ('Gesundheit, Fitness, Sport, KEIN MLM!','Y',12);
+INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`, `visible`, `sort`) VALUES ('Lifestyle, Mode, Kosmetik, KEIN MLM!','Y',13);
+INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`, `visible`, `sort`) VALUES ('Auktionen, Shopping, Verkauf, KEIN MLM!','Y',14);
+INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`, `visible`, `sort`) VALUES ('Medien, Musik, Film, TV, Video & DVD','Y',15);
+INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`, `visible`, `sort`) VALUES ('Singles, Flirten, Partnerschaft','Y',16);
+INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`, `visible`, `sort`) VALUES ('Gewinnspiele, Wetten, Lotto, KEIN MLM!','Y',17);
+INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`, `visible`, `sort`) VALUES ('Haus, Garten, Freizeit, Hobbys','Y',18);
+INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`, `visible`, `sort`) VALUES ('Erotik --> Keine Hardcore !','Y',19);
+INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`, `visible`, `sort`) VALUES ('Multi Level Marketing (alle Arten)','Y',20);
+INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`, `visible`, `sort`) VALUES ('Wernis-Seiten','Y',21);
+INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`, `visible`, `sort`) VALUES ('Primera-Seiten','Y',22);

 
 

-INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main',NULL,'Hauptmenü',0,'Y','N');
-INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','welcome','Willkommen',1,'Y','N');
-INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','impressum','Impressum',5,'Y','N');
-INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','agb','AGBs',4,'Y','N');
-INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','infos','Infos',2,'Y','N');
-INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('members','confirm','Bestätigungslink',3,'Y','N');
-INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('members',NULL,'Mitglieder',1,'Y','N');
-INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('members','login','Einloggen',3,'Y','N');
+INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`) VALUES ('main',NULL,'Hauptmenü',0,'Y','N');
+INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`) VALUES ('main','welcome','Willkommen',1,'Y','N');
+INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`) VALUES ('main','impressum','Impressum',5,'Y','N');
+INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`) VALUES ('main','agb','AGBs',4,'Y','N');
+INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`) VALUES ('main','infos','Infos',2,'Y','N');
+INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`) VALUES ('members','confirm','Bestätigungslink',3,'Y','N');
+INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`) VALUES ('members',NULL,'Mitglieder',1,'Y','N');
+INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`) VALUES ('members','login','Einloggen',3,'Y','N');

 
 

-INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`,`comment`) VALUES (0,'Urlaub');
-INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`,`comment`) VALUES (5,'');
-INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`,`comment`) VALUES (10,'');
-INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`,`comment`) VALUES (15,'');
-INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`,`comment`) VALUES (20,'');
-INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`,`comment`) VALUES (25,'');
-INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`,`comment`) VALUES (30,'');
-INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`,`comment`) VALUES (35,'');
-INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`,`comment`) VALUES (40,'');
-INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`,`comment`) VALUES (45,'');
-INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`,`comment`) VALUES (50,'Bonus möglich!');
-INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`,`comment`) VALUES (90,'Bonus möglich!');
+INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`, `comment`) VALUES (0,'Urlaub');
+INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`, `comment`) VALUES (5,'');
+INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`, `comment`) VALUES (10,'');
+INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`, `comment`) VALUES (15,'');
+INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`, `comment`) VALUES (20,'');
+INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`, `comment`) VALUES (25,'');
+INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`, `comment`) VALUES (30,'');
+INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`, `comment`) VALUES (35,'');
+INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`, `comment`) VALUES (40,'');
+INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`, `comment`) VALUES (45,'');
+INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`, `comment`) VALUES (50,'Bonus möglich!');
+INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`, `comment`) VALUES (90,'Bonus möglich!');

 
 

-INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main',NULL,'Mitgliedsmenü',0,'Y','N');
-INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','welcome','Willkommen!',1,'Y','N');
-INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','points','{OPEN_CONFIG}POINTS{CLOSE_CONFIG}-Guthaben',4,'Y','N');
-INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','categories','Kategorien auswählen',3,'Y','N');
-INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','reflinks','Referal-Links',6,'Y','N');
-INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','unconfirmed','Unbestätigte Emails',5,'Y','N');
-INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','stats','Statistiken',9, 'Y','N');
-INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('logout',NULL,'Ausloggen',999,'Y','N');
-INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('logout','logout','Ausloggen',999,'Y','N');
-INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('logout','guest','Zum Gastmenü',1000,'Y','N');
+INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`) VALUES ('main',NULL,'Mitgliedsmenü',0,'Y','N');
+INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`) VALUES ('main','welcome','Willkommen!',1,'Y','N');
+INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`) VALUES ('main','points','{OPEN_CONFIG}POINTS{CLOSE_CONFIG}-Guthaben',4,'Y','N');
+INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`) VALUES ('main','categories','Kategorien auswählen',3,'Y','N');
+INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`) VALUES ('main','reflinks','Referal-Links',6,'Y','N');
+INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`) VALUES ('main','unconfirmed','Unbestätigte Emails',5,'Y','N');
+INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`) VALUES ('main','stats','Statistiken',9, 'Y','N');
+INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`) VALUES ('logout',NULL,'Ausloggen',999,'Y','N');
+INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`) VALUES ('logout','logout','Ausloggen',999,'Y','N');
+INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`) VALUES ('logout','guest','Zum Gastmenü',1000,'Y','N');

 
 

-INSERT INTO `{?_MYSQL_PREFIX?}_payments` (`time`,`payment`,`mail_title`,`price`) VALUES (10,1.000,'Klick-Mail 10 Sek.',2.000);
-INSERT INTO `{?_MYSQL_PREFIX?}_payments` (`time`,`payment`,`mail_title`,`price`) VALUES (20,5.000,'Klick-Mail 20 Sek.',10.000);
-INSERT INTO `{?_MYSQL_PREFIX?}_payments` (`time`,`payment`,`mail_title`,`price`) VALUES (30,25.000,'Klick-Mail 30 Sek.',30.000);
-INSERT INTO `{?_MYSQL_PREFIX?}_payments` (`time`,`payment`,`mail_title`,`price`) VALUES (40,35.000,'Klick-Mail 40 Sek.',40.000);
-INSERT INTO `{?_MYSQL_PREFIX?}_payments` (`time`,`payment`,`mail_title`,`price`) VALUES (50,45.000,'Klick-Mail 50 Sek.',50.000);
+INSERT INTO `{?_MYSQL_PREFIX?}_payments` (`time`, `payment`, `mail_title`, `price`) VALUES (10,1.000,'Klick-Mail 10 Sek.',2.000);
+INSERT INTO `{?_MYSQL_PREFIX?}_payments` (`time`, `payment`, `mail_title`, `price`) VALUES (20,5.000,'Klick-Mail 20 Sek.',10.000);
+INSERT INTO `{?_MYSQL_PREFIX?}_payments` (`time`, `payment`, `mail_title`, `price`) VALUES (30,25.000,'Klick-Mail 30 Sek.',30.000);
+INSERT INTO `{?_MYSQL_PREFIX?}_payments` (`time`, `payment`, `mail_title`, `price`) VALUES (40,35.000,'Klick-Mail 40 Sek.',40.000);
+INSERT INTO `{?_MYSQL_PREFIX?}_payments` (`time`, `payment`, `mail_title`, `price`) VALUES (50,45.000,'Klick-Mail 50 Sek.',50.000);

 
 

-INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('email','del_email','E-Mail l&ouml;schen','L&ouml;schen Sie hierr&uuml;ber E-Mails (sowohl Bonus- als auch Normal-Mails) aus Ihrem {?mt_word?}-System. <strong>Nur bei Normal-Mails:</strong> {OPEN_CONFIG}POINTS{CLOSE_CONFIG} aus den unbest&auml;tigten Mails werden dem Werber wieder verg&uuml;tet.','7');
-INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('misc','extensions','Erweiterungen','Erweiterungen installieren, updaten, sperren, l&ouml;schen usw.','8');
+INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES ('email','del_email','E-Mail l&ouml;schen','L&ouml;schen Sie hierr&uuml;ber E-Mails (sowohl Bonus- als auch Normal-Mails) aus Ihrem {?mt_word?}-System. <strong>Nur bei Normal-Mails:</strong> {OPEN_CONFIG}POINTS{CLOSE_CONFIG} aus den unbest&auml;tigten Mails werden dem Werber wieder verg&uuml;tet.','7');
+INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES ('misc','extensions','Erweiterungen','Erweiterungen installieren, updaten, sperren, l&ouml;schen usw.','8');

 
 

-INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','stats','Statistiken','7','Y','N');
-INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('admin',NULL,'Administrative Links','3','N','N');
-INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('admin','admin','Zum Admin-Bereich','4','N','N');
+INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`) VALUES ('main','stats','Statistiken','7','Y','N');
+INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`) VALUES ('admin',NULL,'Administrative Links','3','N','N');
+INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`) VALUES ('admin','admin','Zum Admin-Bereich','4','N','N');

diff --git a/install/menu-en.sql b/install/menu-en.sql
index a08a1739b7970f584608248f3b8bcfd35b7d0e46..702285728ecc398ccc4a94e03d3a0783b374a19e 100644 (file)
--- a/install/menu-en.sql
+++ b/install/menu-en.sql
@@ -1,84 +1,84 @@
-INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('login',NULL,'Willkommen','Eingangsseite zum Admin-Bereich',0);
-INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('email',NULL,'Email-Management','Gebuchte Mails umleiten, Details zu den Buchungen anzeigen, Emails freigeben, registrierte Email-Adress auf Verfügbarkeit testen (Mass-Mailing!), Newsletter versenden, Email-Adressen sperren (Email-Backlist), gebuchte URLs sperren (URL-Blacklist)',4);
-INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('email','email_stats','Email-Statistiken','Schauen Sie sich detailierte Statistiken zu den bereits versanden Mails an.',5);
-INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('email','edit_emails','Email-Daten ändern','Hier können Sie u.a. die gebuchte URL der Emails umändern, usw.',5);
-INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('email','unlock_emails','Emails freigeben','Geben Sie bei manuellem Versand gebuchte Mails hier frei.',5);
-INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('email','email_details','Email-Details ansehen','Sehen Sie sich jedes Details bereits gebuchter Mails an.',5);
-INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup',NULL,'Einstellungen','Interessen ändern, News schreiben, allgmeine Einstellungen (Auto-Versand usw.). Auto-Lock Funktion einrichten, manueller Lock des Versandes einrichten, Teile der Homepage sperren (wegen Wartungsarbeiten)',5);
-INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_email','Versand, Empfang','Hier können Sie die maximal empfangbaren Mails usw. einstellen.',8);
-INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_cats','Kategorien einrichten','Ändern oder löschen Sie bereits bestehende Kategorien oder fügen Sie weitere hinzu.',7);
-INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','refbanner','Referal-Banner','Fügen Sie neue Banner hinzu, die dann die Mitglieder verlinken können, um neue Mitglieder zu werben. Oder editieren / löschen Sie bestehende. Hier sehen Sie auch die Anzahl der Klicks auf den jeweiligen Banner!',12);
-INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','payments','{OPEN_CONFIG}POINTS{CLOSE_CONFIG}-Vergütungen','Fügen Sie neue {OPEN_CONFIG}POINTS{CLOSE_CONFIG}-Vergütungen hinzu oder ändern / löschen Sie bestende.',11);
-INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('misc',NULL,'Verschiedenes','Verschiedene Einstellungen / Info-Seiten, die sonst nirgenswo reinpassten...',6);
-INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('stats',NULL,'Statistiken','Sonstige Statistiken, die nirgenswo reinpassen',7);
-INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('logout',NULL,'Ausloggen','Ausloggen aus dem Admin-Bereich. Dadurch wird Ihre Session gelöscht und Sie müssen sich erneut anmelden.',999);
+INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES ('login',NULL,'Willkommen','Eingangsseite zum Admin-Bereich',0);
+INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES ('email',NULL,'Email-Management','Gebuchte Mails umleiten, Details zu den Buchungen anzeigen, Emails freigeben, registrierte Email-Adress auf Verfügbarkeit testen (Mass-Mailing!), Newsletter versenden, Email-Adressen sperren (Email-Backlist), gebuchte URLs sperren (URL-Blacklist)',4);
+INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES ('email','email_stats','Email-Statistiken','Schauen Sie sich detailierte Statistiken zu den bereits versanden Mails an.',5);
+INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES ('email','edit_emails','Email-Daten ändern','Hier können Sie u.a. die gebuchte URL der Emails umändern, usw.',5);
+INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES ('email','unlock_emails','Emails freigeben','Geben Sie bei manuellem Versand gebuchte Mails hier frei.',5);
+INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES ('email','email_details','Email-Details ansehen','Sehen Sie sich jedes Details bereits gebuchter Mails an.',5);
+INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES ('setup',NULL,'Einstellungen','Interessen ändern, News schreiben, allgmeine Einstellungen (Auto-Versand usw.). Auto-Lock Funktion einrichten, manueller Lock des Versandes einrichten, Teile der Homepage sperren (wegen Wartungsarbeiten)',5);
+INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES ('setup','config_email','Versand, Empfang','Hier können Sie die maximal empfangbaren Mails usw. einstellen.',8);
+INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES ('setup','config_cats','Kategorien einrichten','Ändern oder löschen Sie bereits bestehende Kategorien oder fügen Sie weitere hinzu.',7);
+INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES ('setup','refbanner','Referal-Banner','Fügen Sie neue Banner hinzu, die dann die Mitglieder verlinken können, um neue Mitglieder zu werben. Oder editieren / löschen Sie bestehende. Hier sehen Sie auch die Anzahl der Klicks auf den jeweiligen Banner!',12);
+INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES ('setup','payments','{OPEN_CONFIG}POINTS{CLOSE_CONFIG}-Vergütungen','Fügen Sie neue {OPEN_CONFIG}POINTS{CLOSE_CONFIG}-Vergütungen hinzu oder ändern / löschen Sie bestende.',11);
+INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES ('misc',NULL,'Verschiedenes','Verschiedene Einstellungen / Info-Seiten, die sonst nirgenswo reinpassten...',6);
+INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES ('stats',NULL,'Statistiken','Sonstige Statistiken, die nirgenswo reinpassen',7);
+INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES ('logout',NULL,'Ausloggen','Ausloggen aus dem Admin-Bereich. Dadurch wird Ihre Session gelöscht und Sie müssen sich erneut anmelden.',999);

 
 

-INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`,`visible`,`sort`) VALUES ('Mix / Alles Senden --> keine Erotik!','Y',0);
-INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`,`visible`,`sort`) VALUES ('Mix / Alles Senden --> ohne PopUps, keine Erotik','Y',1);
-INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`,`visible`,`sort`) VALUES ('Traffic, Reflinks, Kostenloses, KEIN MLM!','Y',2);
-INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`,`visible`,`sort`) VALUES ('Geldverdienen, Beruf, Arbeit, KEIN MLM!','Y',3);
-INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`,`visible`,`sort`) VALUES ('Download, PC- Software, HP-Design','Y',4);
-INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`,`visible`,`sort`) VALUES ('Investment, Banken, Börse, Versicherungen, KEIN MLM','Y',5);
-INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`,`visible`,`sort`) VALUES ('Politik, Wissenschaft','Y',6);
-INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`,`visible`,`sort`) VALUES ('Handy, SMS, ISDN, DSL,','Y',7);
-INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`,`visible`,`sort`) VALUES ('Elektronik, Technik, Server, PC-Hardware, Hosting','Y',8);
-INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`,`visible`,`sort`) VALUES ('Auto, Motorrad','Y',9);
-INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`,`visible`,`sort`) VALUES ('Reise,Touristik','Y',10);
-INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`,`visible`,`sort`) VALUES ('Kunst, Kultur, Bildung','Y',11);
-INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`,`visible`,`sort`) VALUES ('Gesundheit, Fitness, Sport, KEIN MLM!','Y',12);
-INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`,`visible`,`sort`) VALUES ('Lifestyle, Mode, Kosmetik, KEIN MLM!','Y',13);
-INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`,`visible`,`sort`) VALUES ('Auktionen, Shopping, Verkauf, KEIN MLM!','Y',14);
-INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`,`visible`,`sort`) VALUES ('Medien, Musik, Film, TV, Video & DVD','Y',15);
-INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`,`visible`,`sort`) VALUES ('Singles, Flirten, Partnerschaft','Y',16);
-INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`,`visible`,`sort`) VALUES ('Gewinnspiele, Wetten, Lotto, KEIN MLM!','Y',17);
-INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`,`visible`,`sort`) VALUES ('Haus, Garten, Freizeit, Hobbys','Y',18);
-INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`,`visible`,`sort`) VALUES ('Erotik --> Keine Hardcore !','Y',19);
-INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`,`visible`,`sort`) VALUES ('Multi Level Marketing (alle Arten)','Y',20);
-INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`,`visible`,`sort`) VALUES ('Wernis-Seiten','Y',21);
-INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`,`visible`,`sort`) VALUES ('Primera-Seiten','Y',22);
+INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`, `visible`, `sort`) VALUES ('Mix / Alles Senden --> keine Erotik!','Y',0);
+INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`, `visible`, `sort`) VALUES ('Mix / Alles Senden --> ohne PopUps, keine Erotik','Y',1);
+INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`, `visible`, `sort`) VALUES ('Traffic, Reflinks, Kostenloses, KEIN MLM!','Y',2);
+INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`, `visible`, `sort`) VALUES ('Geldverdienen, Beruf, Arbeit, KEIN MLM!','Y',3);
+INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`, `visible`, `sort`) VALUES ('Download, PC- Software, HP-Design','Y',4);
+INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`, `visible`, `sort`) VALUES ('Investment, Banken, Börse, Versicherungen, KEIN MLM','Y',5);
+INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`, `visible`, `sort`) VALUES ('Politik, Wissenschaft','Y',6);
+INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`, `visible`, `sort`) VALUES ('Handy, SMS, ISDN, DSL,','Y',7);
+INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`, `visible`, `sort`) VALUES ('Elektronik, Technik, Server, PC-Hardware, Hosting','Y',8);
+INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`, `visible`, `sort`) VALUES ('Auto, Motorrad','Y',9);
+INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`, `visible`, `sort`) VALUES ('Reise,Touristik','Y',10);
+INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`, `visible`, `sort`) VALUES ('Kunst, Kultur, Bildung','Y',11);
+INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`, `visible`, `sort`) VALUES ('Gesundheit, Fitness, Sport, KEIN MLM!','Y',12);
+INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`, `visible`, `sort`) VALUES ('Lifestyle, Mode, Kosmetik, KEIN MLM!','Y',13);
+INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`, `visible`, `sort`) VALUES ('Auktionen, Shopping, Verkauf, KEIN MLM!','Y',14);
+INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`, `visible`, `sort`) VALUES ('Medien, Musik, Film, TV, Video & DVD','Y',15);
+INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`, `visible`, `sort`) VALUES ('Singles, Flirten, Partnerschaft','Y',16);
+INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`, `visible`, `sort`) VALUES ('Gewinnspiele, Wetten, Lotto, KEIN MLM!','Y',17);
+INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`, `visible`, `sort`) VALUES ('Haus, Garten, Freizeit, Hobbys','Y',18);
+INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`, `visible`, `sort`) VALUES ('Erotik --> Keine Hardcore !','Y',19);
+INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`, `visible`, `sort`) VALUES ('Multi Level Marketing (alle Arten)','Y',20);
+INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`, `visible`, `sort`) VALUES ('Wernis-Seiten','Y',21);
+INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`, `visible`, `sort`) VALUES ('Primera-Seiten','Y',22);

 
 

-INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main',NULL,'Hauptmenü',0,'Y','N');
-INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','welcome','Willkommen',1,'Y','N');
-INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','impressum','Impressum',5,'Y','N');
-INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','agb','AGBs',4,'Y','N');
-INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','infos','Infos',2,'Y','N');
-INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('members',NULL,'Mitglieder',1,'Y','N');
-INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('members','confirm','Bestätigungslink',3,'Y','N');
-INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('members','login','Einloggen',3,'Y','N');
+INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`) VALUES ('main',NULL,'Hauptmenü',0,'Y','N');
+INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`) VALUES ('main','welcome','Willkommen',1,'Y','N');
+INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`) VALUES ('main','impressum','Impressum',5,'Y','N');
+INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`) VALUES ('main','agb','AGBs',4,'Y','N');
+INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`) VALUES ('main','infos','Infos',2,'Y','N');
+INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`) VALUES ('members',NULL,'Mitglieder',1,'Y','N');
+INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`) VALUES ('members','confirm','Bestätigungslink',3,'Y','N');
+INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`) VALUES ('members','login','Einloggen',3,'Y','N');

 
 

-INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`,`comment`) VALUES (0,'Urlaub');
-INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`,`comment`) VALUES (5,'');
-INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`,`comment`) VALUES (10,'');
-INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`,`comment`) VALUES (15,'');
-INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`,`comment`) VALUES (20,'');
-INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`,`comment`) VALUES (25,'');
-INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`,`comment`) VALUES (30,'');
-INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`,`comment`) VALUES (35,'');
-INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`,`comment`) VALUES (40,'');
-INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`,`comment`) VALUES (45,'');
-INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`,`comment`) VALUES (50,'Bonus möglich!');
-INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`,`comment`) VALUES (90,'Bonus möglich!');
+INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`, `comment`) VALUES (0,'Urlaub');
+INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`, `comment`) VALUES (5,'');
+INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`, `comment`) VALUES (10,'');
+INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`, `comment`) VALUES (15,'');
+INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`, `comment`) VALUES (20,'');
+INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`, `comment`) VALUES (25,'');
+INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`, `comment`) VALUES (30,'');
+INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`, `comment`) VALUES (35,'');
+INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`, `comment`) VALUES (40,'');
+INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`, `comment`) VALUES (45,'');
+INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`, `comment`) VALUES (50,'Bonus möglich!');
+INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`, `comment`) VALUES (90,'Bonus möglich!');

 
 

-INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main',NULL,'Mitgliedsmenü',0,'Y','N');
-INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','welcome','Willkommen!',1,'Y','N');
-INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','points','{OPEN_CONFIG}POINTS{CLOSE_CONFIG}-Guthaben',4,'Y','N');
-INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','categories','Kategorien auswählen',3,'Y','N');
-INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','reflinks','Referal-Links',6,'Y','N');
-INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','unconfirmed','Unbestätigte Emails',5,'Y','N');
-INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','stats','Statistiken',9,'Y','N');
-INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('logout',NULL,'Ausloggen',999,'Y','N');
-INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('logout','logout','Ausloggen',999,'Y','N');
-INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('logout','guest','Zum Gastmenü',1000,'Y','N');
+INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`) VALUES ('main',NULL,'Mitgliedsmenü',0,'Y','N');
+INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`) VALUES ('main','welcome','Willkommen!',1,'Y','N');
+INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`) VALUES ('main','points','{OPEN_CONFIG}POINTS{CLOSE_CONFIG}-Guthaben',4,'Y','N');
+INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`) VALUES ('main','categories','Kategorien auswählen',3,'Y','N');
+INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`) VALUES ('main','reflinks','Referal-Links',6,'Y','N');
+INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`) VALUES ('main','unconfirmed','Unbestätigte Emails',5,'Y','N');
+INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`) VALUES ('main','stats','Statistiken',9,'Y','N');
+INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`) VALUES ('logout',NULL,'Ausloggen',999,'Y','N');
+INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`) VALUES ('logout','logout','Ausloggen',999,'Y','N');
+INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`) VALUES ('logout','guest','Zum Gastmenü',1000,'Y','N');

 
 

-INSERT INTO `{?_MYSQL_PREFIX?}_payments` (`time`,`payment`,`mail_title`,`price`) VALUES (10,1.000,'Klick-Mail 10 Sek.',2.000);
-INSERT INTO `{?_MYSQL_PREFIX?}_payments` (`time`,`payment`,`mail_title`,`price`) VALUES (20,5.000,'Klick-Mail 20 Sek.',10.000);
-INSERT INTO `{?_MYSQL_PREFIX?}_payments` (`time`,`payment`,`mail_title`,`price`) VALUES (30,25.000,'Klick-Mail 30 Sek.',30.000);
-INSERT INTO `{?_MYSQL_PREFIX?}_payments` (`time`,`payment`,`mail_title`,`price`) VALUES (40,35.000,'Klick-Mail 40 Sek.',40.000);
-INSERT INTO `{?_MYSQL_PREFIX?}_payments` (`time`,`payment`,`mail_title`,`price`) VALUES (50,45.000,'Klick-Mail 50 Sek.',50.000);
+INSERT INTO `{?_MYSQL_PREFIX?}_payments` (`time`, `payment`, `mail_title`, `price`) VALUES (10,1.000,'Klick-Mail 10 Sek.',2.000);
+INSERT INTO `{?_MYSQL_PREFIX?}_payments` (`time`, `payment`, `mail_title`, `price`) VALUES (20,5.000,'Klick-Mail 20 Sek.',10.000);
+INSERT INTO `{?_MYSQL_PREFIX?}_payments` (`time`, `payment`, `mail_title`, `price`) VALUES (30,25.000,'Klick-Mail 30 Sek.',30.000);
+INSERT INTO `{?_MYSQL_PREFIX?}_payments` (`time`, `payment`, `mail_title`, `price`) VALUES (40,35.000,'Klick-Mail 40 Sek.',40.000);
+INSERT INTO `{?_MYSQL_PREFIX?}_payments` (`time`, `payment`, `mail_title`, `price`) VALUES (50,45.000,'Klick-Mail 50 Sek.',50.000);

 
 

-INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('email','del_email','E-Mail l&ouml;schen','L&ouml;schen Sie hierr&uuml;ber E-Mails (sowohl Bonus- als auch Normal-Mails) aus Ihrem {?mt_word?}-System. <strong>Nur bei Normal-Mails:</strong> {OPEN_CONFIG}POINTS{CLOSE_CONFIG} aus den unbest&auml;tigten Mails werden dem Werber wieder verg&uuml;tet.','7');
-INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('misc','extensions','Erweiterungen','Erweiterungen installieren, updaten, sperren, l&ouml;schen usw.','8');
+INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES ('email','del_email','E-Mail l&ouml;schen','L&ouml;schen Sie hierr&uuml;ber E-Mails (sowohl Bonus- als auch Normal-Mails) aus Ihrem {?mt_word?}-System. <strong>Nur bei Normal-Mails:</strong> {OPEN_CONFIG}POINTS{CLOSE_CONFIG} aus den unbest&auml;tigten Mails werden dem Werber wieder verg&uuml;tet.','7');
+INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES ('misc','extensions','Erweiterungen','Erweiterungen installieren, updaten, sperren, l&ouml;schen usw.','8');

 
 

-INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','stats','Statistiken','7','Y','N');
-INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('admin',NULL,'Administrative Links','3','N','N');
-INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('admin','admin','Zum Admin-Bereich','4','N','N');
+INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`) VALUES ('main','stats','Statistiken','7','Y','N');
+INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`) VALUES ('admin',NULL,'Administrative Links','3','N','N');
+INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`) VALUES ('admin','admin','Zum Admin-Bereich','4','N','N');

diff --git a/install/tables.sql b/install/tables.sql
index ac64e2ff2b5e2c0eb243288cb473d94ee1cc1522..401e47f7f5c4ccaeb7825c67e969aeb81620ad6c 100644 (file)
--- a/install/tables.sql
+++ b/install/tables.sql
@@ -205,20 +205,20 @@ CREATE TABLE `{?_MYSQL_PREFIX?}_jackpot` (
 
 INSERT INTO `{?_MYSQL_PREFIX?}_config` (`config`) VALUES (0);
 
 
 INSERT INTO `{?_MYSQL_PREFIX?}_config` (`config`) VALUES (0);
 

-INSERT INTO `{?_MYSQL_PREFIX?}_mod_reg` (`module`,`locked`,`hidden`,`admin_only`,`title`,`mem_only`) VALUES ('admin','N','N','Y','','N');
-INSERT INTO `{?_MYSQL_PREFIX?}_mod_reg` (`module`,`locked`,`hidden`,`admin_only`,`title`,`mem_only`) VALUES ('chk_login','N','Y','N','','N');
-INSERT INTO `{?_MYSQL_PREFIX?}_mod_reg` (`module`,`locked`,`hidden`,`admin_only`,`title`,`mem_only`) VALUES ('confirm','N','Y','N','','N');
-INSERT INTO `{?_MYSQL_PREFIX?}_mod_reg` (`module`,`locked`,`hidden`,`admin_only`,`title`,`mem_only`) VALUES ('css','N','Y','N','','N');
-INSERT INTO `{?_MYSQL_PREFIX?}_mod_reg` (`module`,`locked`,`hidden`,`admin_only`,`title`,`mem_only`) VALUES ('frametester','N','Y','N','','N');
-INSERT INTO `{?_MYSQL_PREFIX?}_mod_reg` (`module`,`locked`,`hidden`,`admin_only`,`title`,`mem_only`) VALUES ('index','N','N','N','','N');
-INSERT INTO `{?_MYSQL_PREFIX?}_mod_reg` (`module`,`locked`,`hidden`,`admin_only`,`title`,`mem_only`) VALUES ('js','N','Y','N','','N');
-INSERT INTO `{?_MYSQL_PREFIX?}_mod_reg` (`module`,`locked`,`hidden`,`admin_only`,`title`,`mem_only`) VALUES ('loader','N','Y','N','','N');
-INSERT INTO `{?_MYSQL_PREFIX?}_mod_reg` (`module`,`locked`,`hidden`,`admin_only`,`title`,`mem_only`) VALUES ('login','N','N','N','','Y');
-INSERT INTO `{?_MYSQL_PREFIX?}_mod_reg` (`module`,`locked`,`hidden`,`admin_only`,`title`,`mem_only`) VALUES ('ref','N','Y','N','','N');
-
-INSERT INTO `{?_MYSQL_PREFIX?}_refdepths` (`level`,`percents`) VALUES (0,100);
-INSERT INTO `{?_MYSQL_PREFIX?}_refdepths` (`level`,`percents`) VALUES (1,30);
-INSERT INTO `{?_MYSQL_PREFIX?}_refdepths` (`level`,`percents`) VALUES (2,15);
-INSERT INTO `{?_MYSQL_PREFIX?}_refdepths` (`level`,`percents`) VALUES (3,10);
-INSERT INTO `{?_MYSQL_PREFIX?}_refdepths` (`level`,`percents`) VALUES (4,8);
-INSERT INTO `{?_MYSQL_PREFIX?}_refdepths` (`level`,`percents`) VALUES (5,5);
+INSERT INTO `{?_MYSQL_PREFIX?}_mod_reg` (`module`, `locked`, `hidden`, `admin_only`, `title`, `mem_only`) VALUES ('admin','N','N','Y','','N');
+INSERT INTO `{?_MYSQL_PREFIX?}_mod_reg` (`module`, `locked`, `hidden`, `admin_only`, `title`, `mem_only`) VALUES ('chk_login','N','Y','N','','N');
+INSERT INTO `{?_MYSQL_PREFIX?}_mod_reg` (`module`, `locked`, `hidden`, `admin_only`, `title`, `mem_only`) VALUES ('confirm','N','Y','N','','N');
+INSERT INTO `{?_MYSQL_PREFIX?}_mod_reg` (`module`, `locked`, `hidden`, `admin_only`, `title`, `mem_only`) VALUES ('css','N','Y','N','','N');
+INSERT INTO `{?_MYSQL_PREFIX?}_mod_reg` (`module`, `locked`, `hidden`, `admin_only`, `title`, `mem_only`) VALUES ('frametester','N','Y','N','','N');
+INSERT INTO `{?_MYSQL_PREFIX?}_mod_reg` (`module`, `locked`, `hidden`, `admin_only`, `title`, `mem_only`) VALUES ('index','N','N','N','','N');
+INSERT INTO `{?_MYSQL_PREFIX?}_mod_reg` (`module`, `locked`, `hidden`, `admin_only`, `title`, `mem_only`) VALUES ('js','N','Y','N','','N');
+INSERT INTO `{?_MYSQL_PREFIX?}_mod_reg` (`module`, `locked`, `hidden`, `admin_only`, `title`, `mem_only`) VALUES ('loader','N','Y','N','','N');
+INSERT INTO `{?_MYSQL_PREFIX?}_mod_reg` (`module`, `locked`, `hidden`, `admin_only`, `title`, `mem_only`) VALUES ('login','N','N','N','','Y');
+INSERT INTO `{?_MYSQL_PREFIX?}_mod_reg` (`module`, `locked`, `hidden`, `admin_only`, `title`, `mem_only`) VALUES ('ref','N','Y','N','','N');
+
+INSERT INTO `{?_MYSQL_PREFIX?}_refdepths` (`level`, `percents`) VALUES (0,100);
+INSERT INTO `{?_MYSQL_PREFIX?}_refdepths` (`level`, `percents`) VALUES (1,30);
+INSERT INTO `{?_MYSQL_PREFIX?}_refdepths` (`level`, `percents`) VALUES (2,15);
+INSERT INTO `{?_MYSQL_PREFIX?}_refdepths` (`level`, `percents`) VALUES (3,10);
+INSERT INTO `{?_MYSQL_PREFIX?}_refdepths` (`level`, `percents`) VALUES (4,8);
+INSERT INTO `{?_MYSQL_PREFIX?}_refdepths` (`level`, `percents`) VALUES (5,5);

diff --git a/mailid_top.php b/mailid_top.php
index 68aff4de92948c583697f3f60ea894872cdd6b20..3afc87b5110f60766ebba0b72382a96cb98321db 100644 (file)
--- a/mailid_top.php
+++ b/mailid_top.php
@@ -296,7 +296,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
                                                                                loadTemplate($template, false, $content);
                                                                        } elseif (isValidUserId($sender)) {
                                                                                // Wrong image code! So add points to sender's account
                                                                                loadTemplate($template, false, $content);
                                                                        } elseif (isValidUserId($sender)) {
                                                                                // Wrong image code! So add points to sender's account

-                                                                               addPointsDirectly('mailid_payback', $sender, $payment);
+                                                                               addPointsThroughReferalSystem('mailid_payback', $sender, $payment);

 
                                                                                // Load template
                                                                                loadTemplate('mailid_points_failed', false, $content);
 
                                                                                // Load template
                                                                                loadTemplate('mailid_points_failed', false, $content);

diff --git a/templates/de/emails/member/member_add_points.tpl b/templates/de/emails/member/member_add_points.tpl
index af5f3717499e45cefba31e72fc2b3e3e5b3876cc..e7257d2e62e50719d68f64b364d1c734da5113f4 100644 (file)
--- a/templates/de/emails/member/member_add_points.tpl
+++ b/templates/de/emails/member/member_add_points.tpl
@@ -6,6 +6,9 @@ Grund dazu war folgender:
 ------------------------------
 $content[reason]
 ------------------------------
 ------------------------------
 $content[reason]
 ------------------------------

+Genauere Spezifizierung (Betreff):
+{%pipe,translatePointsSubject=$content[subject]%}
+------------------------------

 
 Mit freundlichen Grüßen,
   Ihr {?MAIN_TITLE?} Team
 
 Mit freundlichen Grüßen,
   Ihr {?MAIN_TITLE?} Team

diff --git a/templates/de/html/admin/admin_add_rallye.tpl b/templates/de/html/admin/admin_add_rallye.tpl
index dffbd357277fa112f2de36f6140e69c5bd38d9e0..d52b093899fef8df464805dc3daf01e8c989aa29 100644 (file)
--- a/templates/de/html/admin/admin_add_rallye.tpl
+++ b/templates/de/html/admin/admin_add_rallye.tpl
@@ -20,7 +20,9 @@
        </tr>
        <tr>
                <td align="right">{--RALLYE_TEMPLATE--}:</td>
        </tr>
        <tr>
                <td align="right">{--RALLYE_TEMPLATE--}:</td>

-               <td align="center">$content[templates_selection]</td>
+               <td align="center">
+                       {%pipe,addReferalRallyeTemplateSelection%}
+               </td>

        </tr>
        <tr>
                <td width="200" align="right" valign="top">{--RALLYE_START_DAY--}:</td>
        </tr>
        <tr>
                <td width="200" align="right" valign="top">{--RALLYE_START_DAY--}:</td>


@@ -40,7 +42,7 @@
                <td align="right">{--RALLYE_IS_ACTIVE--}:</td>
                <td align="center">
                        <select name="active" size="1" class="form_select">
                <td align="right">{--RALLYE_IS_ACTIVE--}:</td>
                <td align="center">
                        <select name="active" size="1" class="form_select">

-                               $content[active_options]
+                               {%pipe,generateYesNoOptionList%}

                        </select>
                </td>
        </tr>
                        </select>
                </td>
        </tr>


@@ -48,7 +50,7 @@
                <td align="right">{--RALLYE_AUTO_ADD_USER--}:</td>
                <td align="center">
                        <select name="auto_add" size="1" class="form_select">
                <td align="right">{--RALLYE_AUTO_ADD_USER--}:</td>
                <td align="center">
                        <select name="auto_add" size="1" class="form_select">

-                               $content[auto_add_options]
+                               {%pipe,generateYesNoOptionList%}

                        </select>
                </td>
        </tr>
                        </select>
                </td>
        </tr>


@@ -56,7 +58,7 @@
                <td align="right">{--RALLYE_SEND_NOTIFY--}:</td>
                <td align="center">
                        <select name="notify" size="1" class="form_select">
                <td align="right">{--RALLYE_SEND_NOTIFY--}:</td>
                <td align="center">
                        <select name="notify" size="1" class="form_select">

-                               $content[notify_options]
+                               {%pipe,generateYesNoOptionList%}

                        </select>
                </td>
        </tr>
                        </select>
                </td>
        </tr>

diff --git a/templates/de/html/admin/admin_config_autopurge.tpl b/templates/de/html/admin/admin_config_autopurge.tpl
index 9d907baace19bf824c66d55fbc4056298e8a5a3e..e36092421c4ee8939b0b18b3003a4fa2d0155c35 100644 (file)
--- a/templates/de/html/admin/admin_config_autopurge.tpl
+++ b/templates/de/html/admin/admin_config_autopurge.tpl
@@ -59,8 +59,9 @@
                        {--ADMIN_CONFIG_AUTOPURGE_ACTIVE--}:
                </td>
                <td>
                        {--ADMIN_CONFIG_AUTOPURGE_ACTIVE--}:
                </td>
                <td>

-                       <input type="radio" class="form_field" name="auto_purge_active" value="Y"$content[auto_purge_active_y] /> {--YES--}<br />
-                       <input type="radio" class="form_field" name="auto_purge_active" value="N"$content[auto_purge_active_n] /> {--NO--}
+                       <select name="autopurge_active" class="form_select" size="1">
+                               {%config,generateYesNoOptionList=autopurge_active%}
+                       </select>

                </td>
        </tr>
        <tr>
                </td>
        </tr>
        <tr>

diff --git a/templates/de/html/admin/admin_config_beg.tpl b/templates/de/html/admin/admin_config_beg.tpl
index 079682e87bcb72e81e592f9814ce0f1b4a15019b..914b4665ffef89608ea4180a70d0244b76df8829 100644 (file)
--- a/templates/de/html/admin/admin_config_beg.tpl
+++ b/templates/de/html/admin/admin_config_beg.tpl
@@ -52,21 +52,6 @@
                        $content[beg_userid]
                </td>
        </tr>
                        $content[beg_userid]
                </td>
        </tr>

-       <tr>
-               <td colspan="2" align="center" class="table_header bottom">
-                       <strong>{--ADMIN_CONFIG_SELECT_BEG_MODE--}:</strong>
-               </td>
-       </tr>
-       <tr>
-               <td class="bottom" align="right" height="20">
-                       <input type="radio" class="form_field" name="beg_mode" value="DIRECT"$content[beg_mode_direct] />
-                       {--ADMIN_CONFIG_PAYMENT_MODE_DIRECT--}
-               </td>
-               <td class="bottom" align="center">
-                       <input type="radio" class="form_field" name="beg_mode" value="REF"$content[beg_mode_ref] />
-                       {--ADMIN_CONFIG_PAYMENT_MODE_REF--}
-               </td>
-       </tr>

        <tr>
                <td colspan="2" align="center" class="table_header bottom">
                        <strong>{--ADMIN_CONFIG_BEG_RALLYE_TITLE--}</strong>
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
                        <strong>{--ADMIN_CONFIG_BEG_RALLYE_TITLE--}</strong>

diff --git a/templates/de/html/admin/admin_config_birthday.tpl b/templates/de/html/admin/admin_config_birthday.tpl
index 05142791a2f09b01ba4af58b1174aca319cfb3d7..669221ea14e50c344f2d28609a549bb1c78d7d02 100644 (file)
--- a/templates/de/html/admin/admin_config_birthday.tpl
+++ b/templates/de/html/admin/admin_config_birthday.tpl
@@ -19,23 +19,8 @@
        <tr>
                <td class="bottom" align="right">{--ADMIN_CONFIG_BIRTHDAY_ONLY_ACTIVE--}</td>
                <td class="bottom" align="center">
        <tr>
                <td class="bottom" align="right">{--ADMIN_CONFIG_BIRTHDAY_ONLY_ACTIVE--}</td>
                <td class="bottom" align="center">

-                       <input type="radio" class="form_field" name="birthday_active" value="Y"$content[active_y] /> {--YES--}<br />
-                       <input type="radio" class="form_field" name="birthday_active" value="N"$content[active_n] /> {--NO--}
-               </td>
-       </tr>
-       <tr>
-               <td colspan="2" align="center" class="table_header bottom">
-                       <strong>{--ADMIN_CONFIG_SELECT_BIRTHDAY_MODE--}:</strong>
-               </td>
-       </tr>
-       <tr>
-               <td class="bottom" align="right">
-                       <input type="radio" class="form_field" name="birthday_mode" value="DIRECT"$content[mode_direct] />
-                       {--ADMIN_CONFIG_PAYMENT_MODE_DIRECT--}
-               </td>
-               <td class="bottom" align="center">
-                       <input type="radio" class="form_field" name="birthday_mode" value="REF"$content[mode_ref] />
-                       {--ADMIN_CONFIG_PAYMENT_MODE_REF--}
+                       <input type="radio" class="form_field" name="birthday_active" value="Y"$content[birthday_active_y] /> {--YES--}<br />
+                       <input type="radio" class="form_field" name="birthday_active" value="N"$content[birthday_active_n] /> {--NO--}

                </td>
        </tr>
        <tr>
                </td>
        </tr>
        <tr>

diff --git a/templates/de/html/admin/admin_config_menu.tpl b/templates/de/html/admin/admin_config_menu.tpl
index 29cba169735beeb0dc777894d2c31146f52df4bf..a0d82e0bcdaaf9049e8b121a129befc536221da5 100644 (file)
--- a/templates/de/html/admin/admin_config_menu.tpl
+++ b/templates/de/html/admin/admin_config_menu.tpl
@@ -11,8 +11,9 @@
                        {--ADMIN_CONFIG_GUEST_MENU_ADVERT_ENABLED--}
                </td>
                <td width="20%">
                        {--ADMIN_CONFIG_GUEST_MENU_ADVERT_ENABLED--}
                </td>
                <td width="20%">

-                       <input type="radio" class="form_field" name="guest_menu_advert_enabled" value="Y"$content[guest_menu_advert_enabled_y] /> {--YES--}<br />
-                       <input type="radio" class="form_field" name="guest_menu_advert_enabled" value="N"$content[guest_menu_advert_enabled_n] /> {--NO--}
+                       <select name="guest_menu_advert_enabled" class="form_select" size="1">
+                               {%config,generateYesNoOptionList=guest_menu_advert_enabled%}
+                       </select>

                </td>
        </tr>
        <tr>
                </td>
        </tr>
        <tr>


@@ -20,8 +21,9 @@
                        {--ADMIN_CONFIG_MEMBER_MENU_ADVERT_ENABLED--}
                </td>
                <td class="bottom" width="20%">
                        {--ADMIN_CONFIG_MEMBER_MENU_ADVERT_ENABLED--}
                </td>
                <td class="bottom" width="20%">

-                       <input type="radio" class="form_field" name="member_menu_advert_enabled" value="Y"$content[member_menu_advert_enabled_y] /> {--YES--}<br />
-                       <input type="radio" class="form_field" name="member_menu_advert_enabled" value="N"$content[member_menu_advert_enabled_n] /> {--NO--}
+                       <select name="member_menu_advert_enabled" class="form_select" size="1">
+                               {%config,generateYesNoOptionList=member_menu_advert_enabled%}
+                       </select>

                </td>
        </tr>
        <tr>
                </td>
        </tr>
        <tr>

diff --git a/templates/de/html/admin/admin_config_other.tpl b/templates/de/html/admin/admin_config_other.tpl
index abff03671039f505560928e7f4f43f66093d7f69..b1c9ff77381a79e7882923e32daec396e84ece4e 100644 (file)
--- a/templates/de/html/admin/admin_config_other.tpl
+++ b/templates/de/html/admin/admin_config_other.tpl
@@ -113,8 +113,9 @@
                        {--ADMIN_CONFIG_GUEST_MENU--}:
                </td>
                <td>
                        {--ADMIN_CONFIG_GUEST_MENU--}:
                </td>
                <td>

-                       <input type="radio" class="form_field" name="guest_menu" value="Y"$content[guest_menu_y] /> {--ADMIN_IS_SHOWN--}<br />
-                       <input type="radio" class="form_field" name="guest_menu" value="N"$content[guest_menu_n] /> {--ADMIN_IS_NOT_SHOWN--}
+                       <select name="guest_menu" class="form_select" size="1">
+                               {%config,generateYesNoOptionList=guest_menu%}
+                       </select>

                </td>
        </tr>
 
                </td>
        </tr>
 


@@ -123,8 +124,9 @@
                        {--ADMIN_CONFIG_MEMBER_MENU--}:
                </td>
                <td>
                        {--ADMIN_CONFIG_MEMBER_MENU--}:
                </td>
                <td>

-                       <input type="radio" class="form_field" name="member_menu" value="Y"$content[member_menu_y] /> {--ADMIN_IS_SHOWN--}<br />
-                       <input type="radio" class="form_field" name="member_menu" value="N"$content[member_menu_n] /> {--ADMIN_IS_NOT_SHOWN--}
+                       <select name="member_menu" class="form_select" size="1">
+                               {%config,generateYesNoOptionList=member_menu%}
+                       </select>

                </td>
        </tr>
 
                </td>
        </tr>
 


@@ -133,8 +135,9 @@
                        {--ADMIN_CONFIG_YOURE_HERE--}:
                </td>
                <td>
                        {--ADMIN_CONFIG_YOURE_HERE--}:
                </td>
                <td>

-                       <input type="radio" class="form_field" name="youre_here" value="Y"$content[youre_here_y] /> {--ADMIN_IS_SHOWN--}<br />
-                       <input type="radio" class="form_field" name="youre_here" value="N"$content[youre_here_n] /> {--ADMIN_IS_NOT_SHOWN--}
+                       <select name="youre_here" class="form_select" size="1">
+                               {%config,generateYesNoOptionList=youre_here%}
+                       </select>

                </td>
        </tr>
 
                </td>
        </tr>
 


@@ -143,8 +146,9 @@
                        {--ADMIN_CONFIG_SHOW_TIMINGS--}:
                </td>
                <td>
                        {--ADMIN_CONFIG_SHOW_TIMINGS--}:
                </td>
                <td>

-                       <input type="radio" class="form_field" name="show_timings" value="Y"$content[show_timings_y] /> {--YES--}<br />
-                       <input type="radio" class="form_field" name="show_timings" value="N"$content[show_timings_n] /> {--NO--}
+                       <select name="show_timings" class="form_select" size="1">
+                               {%config,generateYesNoOptionList=show_timings%}
+                       </select>

                </td>
        </tr>
 
                </td>
        </tr>
 


@@ -153,8 +157,9 @@
                        {--ADMIN_CONFIG_SHOW_POINTS_UNCONFIRMED--}:
                </td>
                <td>
                        {--ADMIN_CONFIG_SHOW_POINTS_UNCONFIRMED--}:
                </td>
                <td>

-                       <input type="radio" class="form_field" name="show_points_unconfirmed" value="Y"$content[show_points_unconfirmed_y] /> {--YES--}<br />
-                       <input type="radio" class="form_field" name="show_points_unconfirmed" value="N"$content[show_points_unconfirmed_n] /> {--NO--}
+                       <select name="show_points_unconfirmed" class="form_select" size="1">
+                               {%config,generateYesNoOptionList=show_points_unconfirmed%}
+                       </select>

                </td>
        </tr>
 
                </td>
        </tr>
 


@@ -188,8 +193,9 @@
                        {--ADMIN_CONFIG_ZIPCODE_ACTIVE--}:
                </td>
                <td align="center">
                        {--ADMIN_CONFIG_ZIPCODE_ACTIVE--}:
                </td>
                <td align="center">

-                       <input type="radio" class="form_field" name="order_multi_page" value="Y"$content[order_multi_page_y] /> {--YES--}<br />
-                       <input type="radio" class="form_field" name="order_multi_page" value="N"$content[order_multi_page_n] /> {--NO--}
+                       <select name="order_multi_page" class="form_select" size="1">
+                               {%config,generateYesNoOptionList=order_multi_page%}
+                       </select>

                </td>
        </tr>
 
                </td>
        </tr>
 


@@ -198,8 +204,9 @@
                        {--ADMIN_CONFIG_AUTOSEND_ACTIVE--}:
                </td>
                <td class="bottom" align="center">
                        {--ADMIN_CONFIG_AUTOSEND_ACTIVE--}:
                </td>
                <td class="bottom" align="center">

-                       <input type="radio" class="form_field" name="autosend_active" value="Y"$content[autosend_active_y] /> {--YES--}<br />
-                       <input type="radio" class="form_field" name="autosend_active" value="N"$content[autosend_active_n] /> {--NO--}
+                       <select name="autosend_active" class="form_select" size="1">
+                               {%config,generateYesNoOptionList=autosend_active%}
+                       </select>

                </td>
        </tr>
 
                </td>
        </tr>
 


@@ -214,8 +221,9 @@
                        {--ADMIN_CONFIG_SEND_UPDATE--}:
                </td>
                <td align="center">
                        {--ADMIN_CONFIG_SEND_UPDATE--}:
                </td>
                <td align="center">

-                       <input type="radio" class="form_field" name="send_prof_update" value="Y"$content[send_prof_update_y] /> {--YES--}<br />
-                       <input type="radio" class="form_field" name="send_prof_update" value="N"$content[send_prof_update_n] /> {--NO--}
+                       <select name="send_prof_update" class="form_select" size="1">
+                               {%config,generateYesNoOptionList=send_prof_update%}
+                       </select>

                </td>
        </tr>
 
                </td>
        </tr>
 


@@ -224,8 +232,9 @@
                        {--ADMIN_CONFIG_NOTIFY_ADMIN--}:
                </td>
                <td class="bottom" align="center">
                        {--ADMIN_CONFIG_NOTIFY_ADMIN--}:
                </td>
                <td class="bottom" align="center">

-                       <input type="radio" class="form_field" name="admin_notify" value="Y"$content[admin_notify_y] /> {--YES--}<br />
-                       <input type="radio" class="form_field" name="admin_notify" value="N"$content[admin_notify_n] /> {--NO--}
+                       <select name="admin_notify" class="form_select" size="1">
+                               {%config,generateYesNoOptionList=admin_notify%}
+                       </select>

                </td>
        </tr>
 
                </td>
        </tr>
 


@@ -277,8 +286,9 @@
                        {--ADMIN_CONFIG_DISPLAY_DEBUG_SQLS--}
                </td>
                <td class="bottom" align="center">
                        {--ADMIN_CONFIG_DISPLAY_DEBUG_SQLS--}
                </td>
                <td class="bottom" align="center">

-                       <input type="radio" class="form_field" name="display_debug_sqls" value="Y"$content[display_debug_sqls_y] /> {--YES--}<br />
-                       <input type="radio" class="form_field" name="display_debug_sqls" value="N"$content[display_debug_sqls_n] /> {--NO--}
+                       <select name="display_debug_sqls" class="form_select" size="1">
+                               {%config,generateYesNoOptionList=display_debug_sqls%}
+                       </select>

                </td>
        </tr>
 
                </td>
        </tr>
 


@@ -293,8 +303,9 @@
                        {--ADMIN_CONFIG_STATS_ENABLED--}
                </td>
                <td class="bottom" align="center">
                        {--ADMIN_CONFIG_STATS_ENABLED--}
                </td>
                <td class="bottom" align="center">

-                       <input type="radio" class="form_field" name="stats_enabled" value="Y"$content[stats_enabled_y] /> {--YES--}<br />
-                       <input type="radio" class="form_field" name="stats_enabled" value="N"$content[stats_enabled_n] /> {--NO--}
+                       <select name="stats_enabled" class="form_select" size="1">
+                               {%config,generateYesNoOptionList=stats_enabled%}
+                       </select>

                </td>
        </tr>
 
                </td>
        </tr>
 

diff --git a/templates/de/html/admin/admin_config_point_settings.tpl b/templates/de/html/admin/admin_config_point_settings.tpl
index f74fad7371603fba6486b0e22fd0c8d29aa41f54..ddfb9b29094d6cb873de8559094074da8f54ccc7 100644 (file)
--- a/templates/de/html/admin/admin_config_point_settings.tpl
+++ b/templates/de/html/admin/admin_config_point_settings.tpl
@@ -18,16 +18,6 @@
                        <input type="radio" class="form_field" name="allow_direct_pay" value="N"$content[allow_direct_pay_n] />
                </td>
        </tr>
                        <input type="radio" class="form_field" name="allow_direct_pay" value="N"$content[allow_direct_pay_n] />
                </td>
        </tr>

-       <tr>
-               <td class="bottom" align="right">{--ADMIN_CONFIG_REFMODE--}</td>
-               <td class="bottom" align="right" style="padding-right: 10px">
-                       {--ADMIN_CONFIG_REFMODE_REF--}
-                       <input type="radio" class="form_field" name="reg_points_mode" value="ref"$content[reg_points_mode_ref] />
-                       <hr noshade width="220">
-                       {--ADMIN_CONFIG_REFMODE_DIRECT--}
-                       <input type="radio" class="form_field" name="reg_points_mode" value="direct"$content[reg_points_mode_direct] />
-               </td>
-       </tr>

        <tr>
                <td class="bottom" align="right">{--ADMIN_CONFIG_REFERAL_PAYOUT--}</td>
                <td class="bottom" align="center">
        <tr>
                <td class="bottom" align="right">{--ADMIN_CONFIG_REFERAL_PAYOUT--}</td>
                <td class="bottom" align="center">

diff --git a/templates/de/html/admin/admin_config_surfbar.tpl b/templates/de/html/admin/admin_config_surfbar.tpl
index 719fed224521bc71fce86e9e4fae7635649482ce..56b617651d5db62005fbcb7a78e2630b8214dfed 100644 (file)
--- a/templates/de/html/admin/admin_config_surfbar.tpl
+++ b/templates/de/html/admin/admin_config_surfbar.tpl
@@ -143,8 +143,9 @@
                        {--ADMIN_CONFIG_SURFBAR_AUTOSTART--}
                </td>
                <td class="bottom" align="center">
                        {--ADMIN_CONFIG_SURFBAR_AUTOSTART--}
                </td>
                <td class="bottom" align="center">

-                       <input type="radio" class="form_field" name="surfbar_autostart" value="Y"$content[surfbar_autostart_y] /> {--YES--}<br />
-                       <input type="radio" class="form_field" name="surfbar_autostart" value="N"$content[surfbar_autostart_n] /> {--NO--}
+                       <select name="surfbar_autostart" class="form_select" size="1">
+                               {%config,generateYesNoOptionList=surfbar_autostart%}
+                       </select>

                </td>
        </tr>
        <tr>
                </td>
        </tr>
        <tr>


@@ -152,8 +153,9 @@
                        {--ADMIN_CONFIG_SURFBAR_NOTIFY_LIMITS--}
                </td>
                <td class="bottom" align="center">
                        {--ADMIN_CONFIG_SURFBAR_NOTIFY_LIMITS--}
                </td>
                <td class="bottom" align="center">

-                       <input type="radio" class="form_field" name="surfbar_notify_limits" value="Y"$content[surfbar_notify_limits_y] /> {--YES--}<br />
-                       <input type="radio" class="form_field" name="surfbar_notify_limits" value="N"$content[surfbar_notify_limits_n] /> {--NO--}
+                       <select name="surfbar_notify_limits" class="form_select" size="1">
+                               {%config,generateYesNoOptionList=surfbar_notify_limits%}
+                       </select>

                </td>
        </tr>
        <tr>
                </td>
        </tr>
        <tr>


@@ -161,8 +163,9 @@
                        {--ADMIN_CONFIG_SURFBAR_NOTIFY_ADMIN_UNLOCK--}
                </td>
                <td class="bottom" align="center">
                        {--ADMIN_CONFIG_SURFBAR_NOTIFY_ADMIN_UNLOCK--}
                </td>
                <td class="bottom" align="center">

-                       <input type="radio" class="form_field" name="surfbar_notify_admin_unlock" value="Y"$content[surfbar_notify_admin_unlock_y] /> {--YES--}<br />
-                       <input type="radio" class="form_field" name="surfbar_notify_admin_unlock" value="N"$content[surfbar_notify_admin_unlock_n] /> {--NO--}
+                       <select name="surfbar_notify_admin_unlock" class="form_select" size="1">
+                               {%config,generateYesNoOptionList=surfbar_notify_admin_unlock%}
+                       </select>

                </td>
        </tr>
        <tr>
                </td>
        </tr>
        <tr>


@@ -198,8 +201,9 @@
                        {--ADMIN_CONFIG_SURFBAR_MIGRATE_ORDER--}
                </td>
                <td class="bottom" align="center">
                        {--ADMIN_CONFIG_SURFBAR_MIGRATE_ORDER--}
                </td>
                <td class="bottom" align="center">

-                       <input type="radio" class="form_field" name="surfbar_migrate_order" value="Y"$content[surfbar_migrate_order_y] /> {--YES--}<br />
-                       <input type="radio" class="form_field" name="surfbar_migrate_order" value="N"$content[surfbar_migrate_order_n] /> {--NO--}
+                       <select name="surfbar_migrate_order" class="form_select" size="1">
+                               {%config,generateYesNoOptionList=surfbar_migrate_order%}
+                       </select>

                </td>
        </tr>
        <tr>
                </td>
        </tr>
        <tr>


@@ -207,8 +211,9 @@
                        {--ADMIN_CONFIG_SURFBAR_GUEST_LOGIN_FORM--}
                </td>
                <td class="bottom" align="left" style="padding-left: 5px">
                        {--ADMIN_CONFIG_SURFBAR_GUEST_LOGIN_FORM--}
                </td>
                <td class="bottom" align="left" style="padding-left: 5px">

-                       <input type="radio" class="form_field" name="surfbar_guest_login_form" value="Y"$content[surfbar_guest_login_form_y] /> {--ADMIN_CONFIG_SURFBAR_GUEST_LOGIN_FORM_Y--}<br />
-                       <input type="radio" class="form_field" name="surfbar_guest_login_form" value="N"$content[surfbar_guest_login_form_n] /> {--ADMIN_CONFIG_SURFBAR_GUEST_LOGIN_FORM_N--}
+                       <select name="surfbar_guest_login_form" class="form_select" size="1">
+                               {%config,generateYesNoOptionList=surfbar_guest_login_form%}
+                       </select>

                </td>
        </tr>
        <tr>
                </td>
        </tr>
        <tr>

diff --git a/templates/de/html/admin/admin_delete_country_row.tpl b/templates/de/html/admin/admin_delete_country_row.tpl
new file mode 100644 (file)
index 0000000..e1fb9e6
--- /dev/null
+++ b/templates/de/html/admin/admin_delete_country_row.tpl
@@ -0,0 +1,14 @@
+<tr>
+       <td align="center" class="{%template,ColorSwitch%} bottom right"><strong>$content[id]</strong>
+               <input type="hidden" name="id[$content[id]]" value="1" />
+       </td>
+       <td align="center" class="{%template,ColorSwitch%} bottom right">
+               $content[code]
+       </td>
+       <td align="center" class="{%template,ColorSwitch%} bottom right">
+               $content[descr]
+       </td>
+       <td align="center" class="{%template,ColorSwitch%} bottom">
+               {%pipe,translateYesNo=$content[is_active]%}
+       </td>
+</tr>

diff --git a/templates/de/html/admin/admin_edit_country_row.tpl b/templates/de/html/admin/admin_edit_country_row.tpl
new file mode 100644 (file)
index 0000000..42f7eac
--- /dev/null
+++ b/templates/de/html/admin/admin_edit_country_row.tpl
@@ -0,0 +1,16 @@
+<tr>
+       <td align="center" class="{%template,ColorSwitch%} bottom right"><strong>$content[id]</strong>
+               <input type="hidden" name="id[$content[id]]" value="1" />
+       </td>
+       <td align="center" class="{%template,ColorSwitch%} bottom right">
+               <input type="text" class="form_field" name="code[$content[id]]" size="2" maxelength="2" value="$content[code]" />
+       </td>
+       <td align="center" class="{%template,ColorSwitch%} bottom right">
+               <input type="text" class="form_field" name="descr[$content[id]]" size="20" maxelength="255" value="$content[descr]" />
+       </td>
+       <td align="center" class="{%template,ColorSwitch%} bottom">
+               <select name="is_active[$content[id]]" class="form_select" size="1">
+                       {%pipe,generateYesNoOptionList=$content[is_active]%}
+               </select>
+       </td>
+</tr>

diff --git a/templates/de/html/admin/admin_list_country_del_row.tpl b/templates/de/html/admin/admin_list_country_del_row.tpl
index 99f3f6154763284df3e0aec7dc88f8b17bf4e120..11f5d85d80b1ca4d16cf4c19e14af24e5ec2a60f 100644 (file)
--- a/templates/de/html/admin/admin_list_country_del_row.tpl
+++ b/templates/de/html/admin/admin_list_country_del_row.tpl
@@ -1,14 +1 @@
-<tr>
-       <td align="center" class="{%template,ColorSwitch%} bottom right"><strong>$content[id]</strong>
-               <input type="hidden" name="id[$content[id]]" value="1" />
-       </td>
-       <td align="center" class="{%template,ColorSwitch%} bottom right">
-               $content[code]
-       </td>
-       <td align="center" class="{%template,ColorSwitch%} bottom right">
-               $content[descr]
-       </td>
-       <td align="center" class="{%template,ColorSwitch%} bottom">
-               $content[is_active]
-       </td>
-</tr>
+<!-- @DEPRECATED //-->

diff --git a/templates/de/html/admin/admin_list_country_edit_row.tpl b/templates/de/html/admin/admin_list_country_edit_row.tpl
index 607fb30d966fe0bc677feb92bdfebfa076fd691e..11f5d85d80b1ca4d16cf4c19e14af24e5ec2a60f 100644 (file)
--- a/templates/de/html/admin/admin_list_country_edit_row.tpl
+++ b/templates/de/html/admin/admin_list_country_edit_row.tpl
@@ -1,16 +1 @@
-<tr>
-       <td align="center" class="{%template,ColorSwitch%} bottom right"><strong>$content[id]</strong>
-               <input type="hidden" name="id[$content[id]]" value="1" />
-       </td>
-       <td align="center" class="{%template,ColorSwitch%} bottom right">
-               <input type="text" class="form_field" name="code[$content[id]]" size="2" maxelength="2" value="$content[code]" />
-       </td>
-       <td align="center" class="{%template,ColorSwitch%} bottom right">
-               <input type="text" class="form_field" name="descr[$content[id]]" size="20" maxelength="255" value="$content[descr]" />
-       </td>
-       <td align="center" class="{%template,ColorSwitch%} bottom">
-               <select name="is_active[$content[id]]" class="form_select" size="1">
-                       $content[is_active]
-               </select>
-       </td>
-</tr>
+<!-- @DEPRECATED //-->