From: Roland Häder Date: Thu, 28 Jul 2011 04:07:10 +0000 (+0000) Subject: A lot has been rewritten, ext-teams added, ext-forced continued: X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=commitdiff_plain;h=0f3a135204757cc8750262871c8e62c42300acb4 A lot has been rewritten, ext-teams added, ext-forced continued: - Adding of (admin only) forced-ads basicly finished - Listing of forced-ads in admin area basicly finished - Extension ext-teams introduced (stub only) - Many rewrites/refacturings (I cannot recall them all!) here and there, including more usage of EL code and filters - TODOs.txt updated --- diff --git a/.gitattributes b/.gitattributes index 8a32f57ca3..e161a0089b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -188,6 +188,7 @@ inc/extensions/ext-sql_patches.php svneol=native#text/plain inc/extensions/ext-support.php svneol=native#text/plain inc/extensions/ext-surfbar.php svneol=native#text/plain inc/extensions/ext-task.php svneol=native#text/plain +inc/extensions/ext-teams.php svneol=native#text/plain inc/extensions/ext-terms.php svneol=native#text/plain inc/extensions/ext-theme.php svneol=native#text/plain inc/extensions/ext-timezone.php svneol=native#text/plain @@ -210,6 +211,7 @@ inc/filter/bonus_filter.php svneol=native#text/plain inc/filter/booking_filter.php svneol=native#text/plain inc/filter/cache_filter.php svneol=native#text/plain inc/filter/coupon_filter.php svneol=native#text/plain +inc/filter/forced_filter.php svneol=native#text/plain inc/filter/mediadata_filter.php svneol=native#text/plain inc/filter/online_filter.php svneol=native#text/plain inc/filter/order_filter.php svneol=native#text/plain @@ -272,6 +274,7 @@ inc/language/de.php svneol=native#text/plain inc/language/debug_de.php svneol=native#text/plain inc/language/doubler_de.php svneol=native#text/plain inc/language/en.php svneol=native#text/plain +inc/language/forced_de.php svneol=native#text/plain inc/language/funcoins_de.php svneol=native#text/plain inc/language/holiday_de.php svneol=native#text/plain inc/language/html_mail_de.php svneol=native#text/plain @@ -328,6 +331,7 @@ inc/libs/coupon_functions.php svneol=native#text/plain inc/libs/debug_functions.php svneol=native#text/plain inc/libs/doubler_functions.php svneol=native#text/plain inc/libs/events_functions.php svneol=native#text/plain +inc/libs/forced_functions.php svneol=native#text/plain inc/libs/funcoins_functions.php svneol=native#text/plain inc/libs/holiday_functions.php svneol=native#text/plain inc/libs/html_mail_functions.php svneol=native#text/plain @@ -522,6 +526,7 @@ inc/modules/admin/what-list_country.php svneol=native#text/plain inc/modules/admin/what-list_coupon.php svneol=native#text/plain inc/modules/admin/what-list_doubler.php svneol=native#text/plain inc/modules/admin/what-list_email_max_rec.php svneol=native#text/plain +inc/modules/admin/what-list_forced_ads.php svneol=native#text/plain inc/modules/admin/what-list_holiday.php svneol=native#text/plain inc/modules/admin/what-list_links.php svneol=native#text/plain inc/modules/admin/what-list_network_api_translation.php svneol=native#text/plain @@ -1011,6 +1016,7 @@ templates/de/html/admin/admin_add_admins_acl.tpl svneol=native#text/plain templates/de/html/admin/admin_add_bank_package.tpl svneol=native#text/plain templates/de/html/admin/admin_add_cat.tpl svneol=native#text/plain templates/de/html/admin/admin_add_country.tpl svneol=native#text/plain +templates/de/html/admin/admin_add_forced_ad.tpl svneol=native#text/plain templates/de/html/admin/admin_add_guest_menu.tpl svneol=native#text/plain templates/de/html/admin/admin_add_max.tpl svneol=native#text/plain templates/de/html/admin/admin_add_member_menu.tpl svneol=native#text/plain @@ -1265,8 +1271,12 @@ templates/de/html/admin/admin_list_email_max_rec.tpl svneol=native#text/plain templates/de/html/admin/admin_list_email_max_rec_row.tpl svneol=native#text/plain templates/de/html/admin/admin_list_emails.tpl svneol=native#text/plain templates/de/html/admin/admin_list_emails_row.tpl svneol=native#text/plain +templates/de/html/admin/admin_list_forced_ads.tpl svneol=native#text/plain +templates/de/html/admin/admin_list_forced_ads_row.tpl svneol=native#text/plain templates/de/html/admin/admin_list_holiday.tpl svneol=native#text/plain templates/de/html/admin/admin_list_holiday_row.tpl svneol=native#text/plain +templates/de/html/admin/admin_list_home.tpl svneol=native#text/plain +templates/de/html/admin/admin_list_home_row.tpl svneol=native#text/plain templates/de/html/admin/admin_list_imprint.tpl svneol=native#text/plain templates/de/html/admin/admin_list_imprint_row.tpl svneol=native#text/plain templates/de/html/admin/admin_list_imprint_row_none.tpl svneol=native#text/plain @@ -1275,6 +1285,10 @@ templates/de/html/admin/admin_list_links_problem.tpl svneol=native#text/plain templates/de/html/admin/admin_list_links_row.tpl svneol=native#text/plain templates/de/html/admin/admin_list_mods.tpl svneol=native#text/plain templates/de/html/admin/admin_list_mods_row.tpl svneol=native#text/plain +templates/de/html/admin/admin_list_mods_stats.tpl svneol=native#text/plain +templates/de/html/admin/admin_list_mods_stats2.tpl svneol=native#text/plain +templates/de/html/admin/admin_list_mods_stats2_row.tpl svneol=native#text/plain +templates/de/html/admin/admin_list_mods_stats_row.tpl svneol=native#text/plain templates/de/html/admin/admin_list_network_api_translation.tpl svneol=native#text/plain templates/de/html/admin/admin_list_network_api_translation_row.tpl svneol=native#text/plain templates/de/html/admin/admin_list_network_config.tpl svneol=native#text/plain @@ -1451,6 +1465,8 @@ templates/de/html/beg/.htaccess svneol=native#text/plain templates/de/html/beg/beg_banner.tpl svneol=native#text/plain templates/de/html/beg/beg_done.tpl svneol=native#text/plain templates/de/html/beg/beg_failed.tpl svneol=native#text/plain +templates/de/html/beg/beg_footer_banner.tpl svneol=native#text/plain +templates/de/html/beg/beg_header_banner.tpl svneol=native#text/plain templates/de/html/beg/beg_link.tpl svneol=native#text/plain templates/de/html/beg/beg_login.tpl svneol=native#text/plain templates/de/html/beg/beg_pay_mode_both.tpl svneol=native#text/plain @@ -1534,6 +1550,7 @@ templates/de/html/ext/ext_sql_patches.tpl svneol=native#text/plain templates/de/html/ext/ext_support.tpl svneol=native#text/plain templates/de/html/ext/ext_surfbar.tpl svneol=native#text/plain templates/de/html/ext/ext_task.tpl svneol=native#text/plain +templates/de/html/ext/ext_teams.tpl svneol=native#text/plain templates/de/html/ext/ext_terms.tpl svneol=native#text/plain templates/de/html/ext/ext_theme.tpl svneol=native#text/plain templates/de/html/ext/ext_timezone.tpl svneol=native#text/plain @@ -1838,6 +1855,8 @@ templates/de/html/removeip_level.tpl svneol=native#text/plain templates/de/html/runtime_fatal_row.tpl svneol=native#text/plain templates/de/html/runtime_fatal_table.tpl svneol=native#text/plain templates/de/html/select/.htaccess svneol=native#text/plain +templates/de/html/select/select_forced_ads_type_box.tpl svneol=native#text/plain +templates/de/html/select/select_forced_ads_type_option.tpl svneol=native#text/plain templates/de/html/select/select_network_box.tpl svneol=native#text/plain templates/de/html/select/select_network_option.tpl svneol=native#text/plain templates/de/html/select/select_network_type_box.tpl svneol=native#text/plain diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt index bec09bfb35..9bc31bcda9 100644 --- a/DOCS/TODOs.txt +++ b/DOCS/TODOs.txt @@ -1,7 +1,7 @@ ### WARNING: THIS FILE IS AUTO-GENERATED BY ./DOCS/todo-builder.sh (uid=/user=quix0r) ### ### DO NOT EDIT THIS FILE. ### ./autoreg.php:58:// @TODO Add processing of request here -./beg.php:168: // @TODO Opps, what is missing here??? +./beg.php:175: // @TODO Opps, what is missing here??? ./inc/cache/config-local.php:124:// @TODO Rewrite the following three constants, somehow... ./inc/classes/cachesystem.class.php:504: // @TODO Add support for more types which break in last else-block ./inc/config-functions.php:136: // @TODO Make this all better... :-/ @@ -49,13 +49,13 @@ ./inc/functions.php:1310: // @TODO Are these convertions still required? ./inc/functions.php:1330:// @TODO Rewrite this function to use readFromFile() and writeToFile() ./inc/functions.php:156:// @TODO Rewrite this to an extension 'smtp' -./inc/functions.php:1939: // @TODO Find a way to cache this -./inc/functions.php:2040: // @TODO This is still very static, rewrite it somehow -./inc/functions.php:2232: // @TODO Rename column data_type to e.g. mail_status +./inc/functions.php:1940: // @TODO Find a way to cache this +./inc/functions.php:2041: // @TODO This is still very static, rewrite it somehow +./inc/functions.php:2233: // @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:1067: // @TODO Rewrite these two constants -./inc/language/de.php:1083: // @TODO Rewrite these three constants +./inc/language/de.php:1072: // @TODO Rewrite these two constants +./inc/language/de.php:1088: // @TODO Rewrite these three constants ./inc/language/de.php:757:// @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. @@ -76,7 +76,7 @@ ./inc/libs/register_functions.php:290: // @TODO Rewrite these all to a single filter ./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:1623: // @TODO This can be somehow rewritten +./inc/libs/surfbar_functions.php:1624: // @TODO This can be somehow rewritten ./inc/libs/surfbar_functions.php:731:// @TODO Can't we use our new expression language instead of this ugly code? ./inc/libs/task_functions.php:247: // @TODO These can be rewritten to filter ./inc/libs/task_functions.php:51:// @TODO Move all extension-dependent queries into filters @@ -90,7 +90,7 @@ ./inc/mails/doubler_mails.php:53:// @TODO Can this be rewritten to a filter? ./inc/module-functions.php:267: // @TODO Nothing helped??? ./inc/module-functions.php:308: // @TODO Rewrite this to a filter -./inc/modules/admin/admin-inc.php:1236: // @TODO If we can rewrite the EL sub-system to support more than one parameter, this call_user_func_array() can be avoided +./inc/modules/admin/admin-inc.php:1373: // @TODO If we can rewrite the EL sub-system to support more than one parameter, this call_user_func_array() can be avoided ./inc/modules/admin/admin-inc.php:171: // @TODO This and the next getCurrentAdminId() call might be moved into the templates? ./inc/modules/admin/admin-inc.php:242: // @TODO This can be rewritten into a filter ./inc/modules/admin/admin-inc.php:274: // @TODO Rewrite this to $content = SQL_FETCHARRAY() @@ -126,7 +126,7 @@ ./inc/modules/admin/what-list_admins_acls.php:108: // @TODO Rewrite this to a filter ./inc/modules/admin/what-list_admins_acls.php:136: // @TODO Rewrite this to filter 'run_sqls' ./inc/modules/admin/what-list_autopurge.php:47:// @TODO Rewrite those lines to filter -./inc/modules/admin/what-list_bonus.php:133: // @TODO Can't this be moved into our expression language? +./inc/modules/admin/what-list_bonus.php:139: // @TODO Can't this be moved into our expression language? ./inc/modules/admin/what-list_cats.php:54: // @TODO No longer needed? define('__CATEGORIES_BASE' , '= {?beg_timeout?} OR ((UNIX_TIMESTAMP() - `timeout`) >= {?beg_userid_timeout?} AND `userid`=%s)) AND (`remote_ip`='%s' OR `sid`='%s') LIMIT 1", - array(getUserData('userid'), detectRemoteAddr(), session_id()), __FILE__, __LINE__); + array( + getUserData('userid'), + detectRemoteAddr(), + session_id() + ), __FILE__, __LINE__); // Entry not found, points set and not logged in? - if (((SQL_HASZERONUMS($result)) || (isAdmin())) && ($points > 0) && (!isMember()) && (getBegPayMode() == 'NONE')) { + //* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'SQL_HASZERONUMS()=' . intval(SQL_HASZERONUMS($result)) . ',isAdmin()=' . intval(isAdmin()) . ',points=' . $points . ',isMember()=' . intval(isMember()) . ',getBegPayMode()=' . getBegPayMode()); + if ((SQL_HASZERONUMS($result)) && ($points > 0) && (getBegPayMode() == 'NONE') && ((!isMember()) || (isAdmin()))) { + // Default is result from isAdmin(), mostly false + $pay = isAdmin(); + // Admin is testing? if (!isAdmin()) { /* @@ -113,7 +122,7 @@ if (isGetRequestParameterSet('userid')) { * but only when there is no admin begging. * Admins shall be able to test it! */ - SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_beg_ips` (`userid`, `remote_ip`, `sid`, `timeout`) VALUES ('%s','%s','%s', UNIX_TIMESTAMP())", + SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_beg_ips` (`userid`,`remote_ip`,`sid`,`timeout`) VALUES ('%s','%s','%s', UNIX_TIMESTAMP())", array( getUserData('userid'), detectRemoteAddr(), @@ -121,13 +130,11 @@ if (isGetRequestParameterSet('userid')) { ), __FILE__, __LINE__); // Was is successfull? - $pay (!SQL_HASZEROAFFECTED()); - } else { - // Is admin! - $pay = true; - } + $pay = (!SQL_HASZEROAFFECTED()); + } // END - if // Pay points? + //* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'pay=' . intval($pay)); if ($pay === true) { // Add points to user or begging rallye account if (addPointsBeg(getUserData('userid'), $points)) { @@ -196,7 +203,7 @@ if (isGetRequestParameterSet('userid')) { } // Reload to index module if an error happens - if (!empty($errorCode)) { + if (!is_null($errorCode)) { redirectToUrl('modules.php?module=index&code=' . $errorCode . '&ext=beg'); } // END - if } else { diff --git a/doubler.php b/doubler.php index a7f83cfeb2..e62f1583c3 100644 --- a/doubler.php +++ b/doubler.php @@ -99,7 +99,7 @@ if (isFormSent()) { if (($points - getConfig('doubler_left') - postRequestParameter('points') * getConfig('doubler_charge') / 100) >= 0) { // Enough points are left so let's continue with the doubling process // Create doubling "account" with *DOUBLED* points - SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_doubler` (`userid`, `refid`, `points`, `remote_ip`, `timemark`, `completed`, `is_ref`) VALUES (%s,%s,%s,'%s', UNIX_TIMESTAMP(), 'N','N')", + SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_doubler` (`userid`,`refid`,`points`,`remote_ip`,`timemark`,`completed`,`is_ref`) VALUES (%s,%s,%s,'%s', UNIX_TIMESTAMP(), 'N','N')", array( getUserData('userid'), makeZeroToNull(determineReferalId()), @@ -107,7 +107,7 @@ if (isFormSent()) { detectRemoteAddr() ), __FILE__, __LINE__); - // Subtract entered points + // Subtract entered points and ignore return status subtractPoints('doubler', getUserData('userid'), postRequestParameter('points')); // Add points to "total payed" including charge @@ -118,7 +118,7 @@ if (isFormSent()) { // Add second line for the referal but only when userid != refid if ((isValidUserId(determineReferalId())) && (determineReferalId() != getUserData('userid'))) { // Okay add a refid line and apply refid percents - SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_doubler` (`userid`, `refid`, `points`, `remote_ip`, `timemark`, `completed`, `is_ref`) VALUES (%s,0,%s,'%s',UNIX_TIMESTAMP(),'N','Y')", + SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_doubler` (`userid`,`refid`,`points`,`remote_ip`,`timemark`,`completed`,`is_ref`) VALUES (%s,0,%s,'%s',UNIX_TIMESTAMP(),'N','Y')", array( makeZeroToNull(determineReferalId()), (postRequestParameter('points') * 2 * getConfig('doubler_ref') / 100), diff --git a/inc/callback-functions.php b/inc/callback-functions.php index aad0498b59..0d7456a698 100644 --- a/inc/callback-functions.php +++ b/inc/callback-functions.php @@ -75,37 +75,6 @@ function doXmlCallbackFunction ($resource, $attributes) { $GLOBALS['__XML_ARGUMENTS'][__FUNCTION__] = array(); } -// Handles the XML node 'post-data-identify-index' -function doXmlPostDataIdentifyIndex ($resource, $attributes) { - // There are three attributes, by default - if (count($attributes) != 3) { - // Not the right count - debug_report_bug(__FUNCTION__, __LINE__, 'Expected 3 attributes, got ' . count($attributes)); - } elseif (!isset($attributes['NAME'])) { - // 'NAME' not found - debug_report_bug(__FUNCTION__, __LINE__, 'Required attribute NAME not found.'); - } elseif (!isset($attributes['TYPE'])) { - // 'TYPE' not found - debug_report_bug(__FUNCTION__, __LINE__, 'Required attribute TYPE not found.'); - } elseif (!isInvalidXmlType($attributes['TYPE'])) { - // No valid type - debug_report_bug(__FUNCTION__, __LINE__, 'TYPE is not valid, got: ' . $attributes['TYPE']); - } elseif (!isset($attributes['VALUE'])) { - // 'VALUE' not found - debug_report_bug(__FUNCTION__, __LINE__, 'Required attribute VALUE not found.'); - } elseif (!isXmlValueValid($attributes['TYPE'], $attributes['VALUE'])) { - // Not valid/verifyable - debug_report_bug(__FUNCTION__, __LINE__, 'Attribute VALUE does not validate. TYPE=' . $attributes['TYPE'] . ',VALUE=' . $attributes['VALUE']); - } elseif (!isset($GLOBALS['__XML_ARGUMENTS']['doXmlCallbackFunction'])) { - // doXmlCallbackFunction is missing - debug_report_bug(__FUNCTION__, __LINE__, 'Required XML node callback-function not included around this node. Please fix your XML.'); - } - - // Add the POST data index for 'id' - addXmlValueToCallbackAttributes('id_index', $attributes); - //$GLOBALS['__XML_ARGUMENTS']['doXmlCallbackFunction']['id_index'] = $attributes['VALUE']; -} - // Handles the XML node 'database-table' function doXmlDatabaseTable ($resource, $attributes) { // There are three attributes, by default @@ -953,17 +922,37 @@ function isXmlTypeInt ($value) { return (bigintval($value) == $value); } +// Check for callback type +function isXmlTypeCallback ($value) { + // Trim value + $value = trim($value); + + // This value is always a string + return (function_exists($value)); +} + //----------------------------------------------------------------------------- // Private XML functions //----------------------------------------------------------------------------- // Adds given attribut to element function addXmlValueToCallbackAttributes ($element, $attributes, $extraKey = '', $key = '') { + //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'element=' . $element . ',extraKey=' . $extraKey . ',key=' . $key . ' - ENTERED!'); + // Is it boolean type? + if (($attributes['TYPE'] == 'bool') && (isset($attributes['VALUE']))) { + // Then convert VALUE + //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'TYPE=' . $attributes['TYPE'] . ',element=' . $element . ' - CONVERTING!'); + $attributes['VALUE'] = convertStringToBoolean($attributes['VALUE']); + } elseif ($attributes['TYPE'] == 'callback') { + // It is a simple call-back type + //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'TYPE=' . $attributes['TYPE'] . ',element=' . $element . ' - CALLING!'); + $attributes['VALUE'] = call_user_func($attributes['VALUE']); + } + // What do we need to add? - /* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'element=' . $element . ',extraKey=' . $extraKey . ',key=' . $key . ' - ENTERED!'); if ($attributes['TYPE'] == 'array') { // Another nested array - /* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'TYPE=ARRAY, element=' . $element); + //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'TYPE=' . $attributes['TYPE'] . ',element=' . $element); $GLOBALS['__XML_ARGUMENTS']['doXmlCallbackFunction'][$element][$attributes['VALUE'] . '_list'] = array(); } elseif (!empty($extraKey)) { // Is it bool? @@ -973,18 +962,18 @@ function addXmlValueToCallbackAttributes ($element, $attributes, $extraKey = '', } // END - if // Sub-array (one level only) - /* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'element=' . $element . ',extraKey=' . $extraKey . ',TYPE=' . $attributes['TYPE'] . ' - ANALYSING...'); + //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'element=' . $element . ',extraKey=' . $extraKey . ',TYPE=' . $attributes['TYPE'] . ' - ANALYSING...'); if (trim($attributes['NAME']) == '') { // Numerical index - /* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'element=' . $element . ',extraKey=' . $extraKey . ',TYPE=' . $attributes['TYPE'] . ',VALUE[' . gettype($attributes['VALUE']) . ']=' . $attributes['VALUE'] . ' - NUMERICAL!'); + //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'element=' . $element . ',extraKey=' . $extraKey . ',TYPE=' . $attributes['TYPE'] . ',VALUE[' . gettype($attributes['VALUE']) . ']=' . $attributes['VALUE'] . ' - NUMERICAL!'); $GLOBALS['__XML_ARGUMENTS']['doXmlCallbackFunction'][$element][$extraKey][] = $attributes['VALUE']; } elseif (!empty($key)) { // Use from $key - /* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'element=' . $element . ',extraKey=' . $extraKey . ',TYPE=' . $attributes['TYPE'] . ',VALUE[' . gettype($attributes['VALUE']) . ']=' . $attributes['VALUE'] . ' - KEY! (key=' . $attributes[$key] . ')'); + //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'element=' . $element . ',extraKey=' . $extraKey . ',TYPE=' . $attributes['TYPE'] . ',VALUE[' . gettype($attributes['VALUE']) . ']=' . $attributes['VALUE'] . ' - KEY! (key=' . $attributes[$key] . ')'); $GLOBALS['__XML_ARGUMENTS']['doXmlCallbackFunction'][$element][$extraKey][$attributes[$key]] = $attributes['VALUE']; } else { // Use from NAME - /* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'element=' . $element . ',extraKey=' . $extraKey . ',TYPE=' . $attributes['TYPE'] . ',VALUE[' . gettype($attributes['VALUE']) . ']=' . $attributes['VALUE'] . ' - NAME! (NAME=' . $attributes['NAME'] . ')'); + //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'element=' . $element . ',extraKey=' . $extraKey . ',TYPE=' . $attributes['TYPE'] . ',VALUE[' . gettype($attributes['VALUE']) . ']=' . $attributes['VALUE'] . ' - NAME! (NAME=' . $attributes['NAME'] . ')'); $GLOBALS['__XML_ARGUMENTS']['doXmlCallbackFunction'][$element][$extraKey][$attributes['NAME']] = $attributes['VALUE']; } } elseif ((isset($attributes['FUNCTION'])) && (isset($attributes['ALIAS']))) { @@ -1001,7 +990,7 @@ function addXmlValueToCallbackAttributes ($element, $attributes, $extraKey = '', ); // Add the entry - /* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'element=' . $element . ',extraKey=' . $extraKey . ',TYPE=' . $attributes['TYPE'] . ',ALIAS[' . gettype($attributes['ALIAS']) . ']=' . $attributes['ALIAS'] . ',FUNCTION[' . gettype($attributes['FUNCTION']) . ']=' . $attributes['FUNCTION'] . ' - FUNCTION! (VALUE=' . $attributes['VALUE'] . ')'); + //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'element=' . $element . ',extraKey=' . $extraKey . ',TYPE=' . $attributes['TYPE'] . ',ALIAS[' . gettype($attributes['ALIAS']) . ']=' . $attributes['ALIAS'] . ',FUNCTION[' . gettype($attributes['FUNCTION']) . ']=' . $attributes['FUNCTION'] . ' - FUNCTION! (VALUE=' . $attributes['VALUE'] . ')'); $GLOBALS['__XML_ARGUMENTS']['doXmlCallbackFunction'][$element][] = $array; } elseif ((isset($attributes['CONDITION'])) && (isset($attributes['LOOK-FOR']))) { // CONDITION/LOOK-FOR detected @@ -1013,33 +1002,33 @@ function addXmlValueToCallbackAttributes ($element, $attributes, $extraKey = '', 'look_for' => trim($attributes['LOOK-FOR']) ); - /* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'element=' . $element . ',extraKey=' . $extraKey . ',TYPE=' . $attributes['TYPE'] . ',CONDITION[' . gettype($attributes['CONDITION']) . ']=' . $attributes['CONDITION'] . ',LOOK-FOR[' . gettype($attributes['LOOK-FOR']) . ']=' . $attributes['LOOK-FOR'] . ' - CONDITION! (VALUE=' . $attributes['VALUE'] . ')'); + //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'element=' . $element . ',extraKey=' . $extraKey . ',TYPE=' . $attributes['TYPE'] . ',CONDITION[' . gettype($attributes['CONDITION']) . ']=' . $attributes['CONDITION'] . ',LOOK-FOR[' . gettype($attributes['LOOK-FOR']) . ']=' . $attributes['LOOK-FOR'] . ' - CONDITION! (VALUE=' . $attributes['VALUE'] . ')'); $GLOBALS['__XML_ARGUMENTS']['doXmlCallbackFunction'][$element][] = $array; } elseif (isset($attributes['CALLBACK'])) { // CALLBACK/VALUE detected - /* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'element=' . $element . ',extraKey=' . $extraKey . ',TYPE=' . $attributes['TYPE'] . ',CALLBACK[' . gettype($attributes['CALLBACK']) . ']=' . $attributes['CALLBACK'] . ' - CALLBACK! (VALUE=' . $attributes['VALUE'] . ')'); + //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'element=' . $element . ',extraKey=' . $extraKey . ',TYPE=' . $attributes['TYPE'] . ',CALLBACK[' . gettype($attributes['CALLBACK']) . ']=' . $attributes['CALLBACK'] . ' - CALLBACK! (VALUE=' . $attributes['VALUE'] . ')'); $GLOBALS['__XML_ARGUMENTS']['doXmlCallbackFunction'][$element][$attributes['VALUE']] = $attributes['CALLBACK']; } elseif (isset($attributes['ORDER'])) { // ORDER/TABLE detected - /* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'element=' . $element . ',extraKey=' . $extraKey . ',TYPE=' . $attributes['TYPE'] . ',ORDER[' . gettype($attributes['ORDER']) . ']=' . $attributes['ORDER'] . ' - ORDER! (VALUE=' . $attributes['VALUE'] . ')'); + //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'element=' . $element . ',extraKey=' . $extraKey . ',TYPE=' . $attributes['TYPE'] . ',ORDER[' . gettype($attributes['ORDER']) . ']=' . $attributes['ORDER'] . ' - ORDER! (VALUE=' . $attributes['VALUE'] . ')'); $GLOBALS['__XML_ARGUMENTS']['doXmlCallbackFunction'][$element][$attributes['ORDER']][$attributes['TABLE']] = $attributes['VALUE']; } elseif (isset($attributes['COLUMN'])) { // COLUMN/VALUE detected - /* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'element=' . $element . ',VALUE[' . gettype($attributes['VALUE']) . ']=' . $attributes['VALUE'] . ',COLUMN[' . gettype($attributes['COLUMN']) . ']=' . $attributes['COLUMN'] . ' - COLUMN!'); + //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'element=' . $element . ',VALUE[' . gettype($attributes['VALUE']) . ']=' . $attributes['VALUE'] . ',COLUMN[' . gettype($attributes['COLUMN']) . ']=' . $attributes['COLUMN'] . ' - COLUMN!'); $GLOBALS['__XML_ARGUMENTS']['doXmlCallbackFunction'][$element][$attributes['COLUMN']][] = $attributes['VALUE']; } elseif ((!isset($attributes['NAME'])) || (trim($attributes['NAME']) == '')) { // Numerical index - /* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'element=' . $element . ',VALUE[' . gettype($attributes['VALUE']) . ']=' . $attributes['VALUE'] . ' - NUMERICAL!'); + //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'element=' . $element . ',VALUE[' . gettype($attributes['VALUE']) . ']=' . $attributes['VALUE'] . ' - NUMERICAL!'); $GLOBALS['__XML_ARGUMENTS']['doXmlCallbackFunction'][$element][] = $attributes['VALUE']; } elseif (isset($GLOBALS['__XML_ARGUMENTS']['doXmlCallbackFunction'][$element][$attributes['NAME']])) { // Already created debug_report_bug(__FUNCTION__, __LINE__, 'NAME=' . $attributes['NAME'] . ' already addded to ' . $element . ' attributes=
' . print_r($attributes, true) . '
'); } else { // Use from NAME - /* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'element=' . $element . ',NAME=' . $attributes['NAME'] . ',VALUE[' . gettype($attributes['VALUE']) . ']=' . $attributes['VALUE'] . ' - NAME!'); + //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'element=' . $element . ',NAME=' . $attributes['NAME'] . ',VALUE[' . gettype($attributes['VALUE']) . ']=' . $attributes['VALUE'] . ' - NAME!'); $GLOBALS['__XML_ARGUMENTS']['doXmlCallbackFunction'][$element][$attributes['NAME']] = $attributes['VALUE']; } - /* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'element=' . $element . ',extraKey=' . $extraKey . ',key=' . $key . ' - EXIT!'); + //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'element=' . $element . ',extraKey=' . $extraKey . ',key=' . $key . ' - EXIT!'); } //----------------------------------------------------------------------------- @@ -1047,7 +1036,7 @@ function addXmlValueToCallbackAttributes ($element, $attributes, $extraKey = '', //----------------------------------------------------------------------------- // Execute function for doXmlCallbackFunction() -function doXmlCallbackFunctionExecute ($function, $args) { +function doXmlCallbackFunctionExecute ($callbackFunction, $args) { // Is 'id_index' set and form sent? if ((isset($args['id_index'])) && (isFormSent())) { // Prepare 'id_index' @@ -1055,8 +1044,8 @@ function doXmlCallbackFunctionExecute ($function, $args) { } // END - if // Just call it - //* DEBUG: */ die('
'.print_r($args, true).'
'); - call_user_func_array($function, $args); + //* DEBUG: */ die('callbackFunction=' . $callbackFunction . ',args=
'.print_r($args, true).'
'); + call_user_func_array($callbackFunction, $args); } // [EOF] diff --git a/inc/classes/cachesystem.class.php b/inc/classes/cachesystem.class.php index acf69a5410..7d722b121e 100644 --- a/inc/classes/cachesystem.class.php +++ b/inc/classes/cachesystem.class.php @@ -520,7 +520,7 @@ class CacheSystem { $line = '$this->' . $prefix . "['" . $this->name . "']['" . $key . "']" . $extender . " = '" . escapeQuotes($value) . "';"; } elseif (is_null($value)) { // Null - $line = '$this->' . $prefix . "['" . $this->name . "']['" . $key . "']" . $extender . ' = null;'; + $line = '$this->' . $prefix . "['" . $this->name . "']['" . $key . "']" . $extender . ' = NULL;'; } elseif (is_bool($value)) { // Boolean value if ($value === true) { diff --git a/inc/classes/resolver.class.php b/inc/classes/resolver.class.php index 57afe95342..190111b946 100644 --- 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 - 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 @@ -106,7 +106,7 @@ class HostnameResolver { //* 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 diff --git a/inc/daily/daily_100_bonus.php b/inc/daily/daily_100_bonus.php index 868dce98e0..2b8e783868 100644 --- a/inc/daily/daily_100_bonus.php +++ b/inc/daily/daily_100_bonus.php @@ -51,7 +51,7 @@ if (!defined('__SECURITY')) { // Check for 100% klickrate mails $result_bonus = SQL_QUERY("SELECT - `id`, `userid`, `subject`, `timestamp_ordered`, `clicks`, `url` + `id`,`userid`,`subject`,`timestamp_ordered`,`clicks`,`url` FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE diff --git a/inc/daily/daily_birthday.php b/inc/daily/daily_birthday.php index 25ba924b18..e9c4d83c86 100644 --- a/inc/daily/daily_birthday.php +++ b/inc/daily/daily_birthday.php @@ -65,7 +65,7 @@ if ((getConfig('birthday_active') == 'Y') && (isExtensionActive('autopurge')) & // Only confirmed members shall receive birthday mails... $result_birthday = SQL_QUERY_ESC("SELECT - `userid`, `email`, `birth_year` + `userid`,`email`,`birth_year` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE @@ -99,7 +99,7 @@ if (!SQL_HASZERONUMS($result_birthday)) { } // END - for // Insert row into database - SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_birthday` (`userid`, `points`, `chk_value`) VALUES (%s,{?birthday_points?},'%s' )", + SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_birthday` (`userid`,`points`,`chk_value`) VALUES (%s,{?birthday_points?},'%s' )", array( bigintval($content['userid']), $content['check'] diff --git a/inc/daily/daily_holiday.php b/inc/daily/daily_holiday.php index 7fe78a87c5..a8ae1c744a 100644 --- a/inc/daily/daily_holiday.php +++ b/inc/daily/daily_holiday.php @@ -51,7 +51,7 @@ if (!defined('__SECURITY')) { // Check for holidays we need to enable and send email to user $result_main = SQL_QUERY("SELECT - `userid`, `holiday_activated` + `userid`,`holiday_activated` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE @@ -71,7 +71,7 @@ if (!SQL_HASZERONUMS($result_main)) { while ($content = SQL_FETCHARRAY($result_main)) { // Check if his holiday can be activated $result_holiday = SQL_QUERY_ESC("SELECT - `holiday_start`, `holiday_end` + `holiday_start`,`holiday_end` FROM `{?_MYSQL_PREFIX?}_user_holidays` WHERE diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php index 2d25cdea88..5d346e48ff 100644 --- 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 - $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, @@ -474,7 +474,7 @@ function SQL_ALTER_TABLE ($sql, $F, $L, $enableCodes = true) { // Getter for SQL link function SQL_GET_LINK () { // Init link - $link = null; + $link = NULL; // Is it in the globals? if (isset($GLOBALS['sql_link'])) { diff --git a/inc/extensions-functions.php b/inc/extensions-functions.php index 40be9d52b4..229277c0a3 100644 --- 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()); - 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(), @@ -369,7 +369,7 @@ function registerExtension ($ext_name, $taskId, $dry_run = false, $ignoreUpdates } else { // Old way, no CSS //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . getCurrentExtensionName() . ',always_active=' . getThisExtensionAlwaysActive() . ', ext_ver=' . getCurrentExtensionVersion()); - SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_extensions` (`ext_name`, `ext_active`, `ext_version`) VALUES ('%s','%s','%s')", + SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_extensions` (`ext_name`,`ext_active`,`ext_version`) VALUES ('%s','%s','%s')", array( getCurrentExtensionName(), getThisExtensionAlwaysActive(), @@ -1793,7 +1793,7 @@ function addAdminMenuSql ($action, $what, $title, $descr, $sort) { // 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, @@ -1801,7 +1801,7 @@ function addAdminMenuSql ($action, $what, $title, $descr, $sort) { ); } 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, @@ -1825,14 +1825,14 @@ function addGuestMenuSql ($action, $what, $title, $sort) { // 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 - $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, @@ -1855,14 +1855,14 @@ function addMemberMenuSql ($action, $what, $title, $sort) { // 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 - $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, @@ -1885,7 +1885,7 @@ function addSponsorMenuSql ($action, $what, $title, $active, $sort) { // 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, @@ -1893,7 +1893,7 @@ function addSponsorMenuSql ($action, $what, $title, $active, $sort) { ); } 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, diff --git a/inc/extensions/ext-admins.php b/inc/extensions/ext-admins.php index 441307bbb5..271ea351b6 100644 --- a/inc/extensions/ext-admins.php +++ b/inc/extensions/ext-admins.php @@ -130,7 +130,7 @@ INDEX (`admin_id`)", 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."); diff --git a/inc/extensions/ext-autopurge.php b/inc/extensions/ext-autopurge.php index 517afd2a52..6528263acf 100644 --- a/inc/extensions/ext-autopurge.php +++ b/inc/extensions/ext-autopurge.php @@ -254,7 +254,7 @@ switch (getExtensionMode()) { 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')"); + 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'); diff --git a/inc/extensions/ext-bank.php b/inc/extensions/ext-bank.php index 2a146ade0b..eaaa1a8b76 100644 --- a/inc/extensions/ext-bank.php +++ b/inc/extensions/ext-bank.php @@ -74,7 +74,7 @@ switch (getExtensionMode()) { `overdraft_credit` FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000, PRIMARY KEY (`id`), UNIQUE (`pin`), -INDEX `userid_type` (`userid`, `account_type`), +INDEX `userid_type` (`userid`,`account_type`), INDEX (`account_created`), INDEX (`account_locked`), INDEX (`last_tan_stamp`)", @@ -90,8 +90,8 @@ INDEX (`last_tan_stamp`)", `day_available` CHAR(4) NOT NULL DEFAULT '0000', `transfer_purpose` TINYTEXT, PRIMARY KEY (`id`), -INDEX (`to_account_id`, `from_account_id`), -INDEX (`day_bookkeeping`, `day_available`)", +INDEX (`to_account_id`,`from_account_id`), +INDEX (`day_bookkeeping`,`day_available`)", 'Bank user->user transfers'); addDropTableSql('bank_packages'); @@ -127,7 +127,7 @@ PRIMARY KEY (`id`)", `tan` VARCHAR(50) NOT NULL DEFAULT '', `used` ENUM('Y','N') NOT NULL DEFAULT 'N', PRIMARY KEY (`id`), -UNIQUE (`account_id`, `tan`)", +UNIQUE (`account_id`,`tan`)", 'Bank TAN lists per user'); // Admin menu queries diff --git a/inc/extensions/ext-beg.php b/inc/extensions/ext-beg.php index 78d462322a..56e8c9fdbe 100644 --- a/inc/extensions/ext-beg.php +++ b/inc/extensions/ext-beg.php @@ -41,10 +41,10 @@ if (!defined('__SECURITY')) { } // END - if // Version number -setThisExtensionVersion('0.3.1'); +setThisExtensionVersion('0.3.2'); // 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')); +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')); switch (getExtensionMode()) { case 'register': // Do stuff when installation is running @@ -79,6 +79,9 @@ INDEX (`userid`)", addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `what` IN ('config_beg','list_beg','list_beg_referal_urls')"); addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_guest_menu` WHERE `what`='beg'"); addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE `what` IN ('beg','beg2')"); + + // Unregister module + addExtensionSql("DELETE LOW_PRIRITY FROM `{?_MYSQL_PREFIX?}_mod_reg` WHERE `module`='beg' LIMIT 1"); break; case 'activate': // Do stuff when admin activates this extension @@ -86,6 +89,7 @@ INDEX (`userid`)", addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='Y', `locked`='N' WHERE `what`='beg' LIMIT 1"); addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y', `locked`='N' WHERE `what` IN ('beg','beg2') LIMIT 2"); addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `locked`='N', `hidden`='N', `admin_only`='N', `mem_only`='N' WHERE `module`='beg' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `locked`='N', `hidden`='N', `admin_only`='N', `mem_only`='N' WHERE `module`='beg' LIMIT 1"); break; case 'deactivate': // Do stuff when admin deactivates this extension @@ -93,6 +97,7 @@ INDEX (`userid`)", addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='N', `locked`='Y' WHERE `what`='beg' LIMIT 1"); addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='N', `locked`='Y' WHERE `what` IN('beg','beg2') LIMIT 2"); addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `locked`='Y' WHERE `module`='beg' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `locked`='Y' WHERE `module`='beg' LIMIT 1"); break; case 'update': // Update an extension @@ -297,8 +302,8 @@ INDEX (`userid`)", 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')"); + 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'); @@ -316,6 +321,17 @@ INDEX (`userid`)", // Update notes setExtensionUpdateNotes("Bettel-Rallye re-hinzugefügt."); break; + + case '0.3.2': // SQL queries for v0.3.2 + // Add module entry + addModuleSql('beg', 'Y', 'Y', 'N', 'N'); + + // Set module title + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `title`='Betteln bei {OPEN_CONFIG}MAIN_TITLE{CLOSE_CONFIG}' WHERE `module`='beg' AND `title`='' LIMIT 1"); + + // Update notes + setExtensionUpdateNotes("Modul registriert und bei leerem Titel mit einem Standarttitel versehen."); + break; } // END - switch break; diff --git a/inc/extensions/ext-bitcoins.php b/inc/extensions/ext-bitcoins.php index ea53903d1e..ae379b2fbf 100644 --- a/inc/extensions/ext-bitcoins.php +++ b/inc/extensions/ext-bitcoins.php @@ -59,6 +59,7 @@ switch (getExtensionMode()) { case 'remove': // Do stuff when removing extension // SQL commands to run + //addExtensionSql("DELETE LOW_PRIRITY FROM `{?_MYSQL_PREFIX?}_mod_reg` WHERE `module`='foo' LIMIT 1"); break; case 'activate': // Do stuff when admin activates this extension diff --git a/inc/extensions/ext-bonus.php b/inc/extensions/ext-bonus.php index e215afd7b0..375853e1b2 100644 --- 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 -setThisExtensionVersion('0.9.6'); +setThisExtensionVersion('0.9.7'); // 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', '0.9.6')); +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', '0.9.7')); switch (getExtensionMode()) { case 'register': // Do stuff when installation is running @@ -91,6 +91,7 @@ INDEX (`cat_id`)", // Unregister filter unregisterFilter(__FUNCTION__, __LINE__, 'member_login_check', 'ADD_LOGIN_BONUS', true, isExtensionDryRun()); unregisterFilter(__FUNCTION__, __LINE__, 'generate_admin_mail_links', 'GENERATE_BONUS_MAIL_LINKS', true, isExtensionDryRun()); + unregisterFilter(__FUNCTION__, __LINE__, 'add_bonus_points_user_columns', 'ADD_BONUS_POINTS_USER_COLUMNS', true, isExtensionDryRun()); break; case 'activate': // Do stuff when admin activates this extension @@ -609,7 +610,7 @@ ORDER BY 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')"); + 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'); @@ -617,6 +618,20 @@ ORDER BY // Update notes setExtensionUpdateNotes("Monatlicher Bonus wird nun über die Tabelle {OPEN_CONFIG}_MYSQL_PREFIX{CLOSE_CONFIG}_points_data verwaltet."); break; + + case '0.9.7': // SQL queries for v0.9.7 + addConfigChangeSql('bonus_order_yn', 'include_bonus_order', "ENUM('Y','N') NOT NULL DEFAULT 'N'"); + addConfigChangeSql('bonus_ref_yn' , 'include_bonus_ref' , "ENUM('Y','N') NOT NULL DEFAULT 'N'"); + addConfigChangeSql('bonus_stats_yn', 'include_bonus_stats', "ENUM('Y','N') NOT NULL DEFAULT 'N'"); + addConfigChangeSql('bonus_login_yn', 'include_bonus_login', "ENUM('Y','N') NOT NULL DEFAULT 'N'"); + addConfigChangeSql('bonus_click_yn', 'include_bonus_click', "ENUM('Y','N') NOT NULL DEFAULT 'Y'"); + + // Register filter + registerFilter('add_bonus_points_user_columns', 'ADD_BONUS_POINTS_USER_COLUMNS', false, true, isExtensionDryRun()); + + // Update notes (these will be set as task text!) + setExtensionUpdateNotes("Konfigurationseinträge umbenannt."); + break; } // END - switch break; diff --git a/inc/extensions/ext-cache.php b/inc/extensions/ext-cache.php index b77955a9f6..2636d50e19 100644 --- a/inc/extensions/ext-cache.php +++ b/inc/extensions/ext-cache.php @@ -6,7 +6,7 @@ * -------------------------------------------------------------------- * * File : ext-cache.php * * -------------------------------------------------------------------- * - * Short description : Caching system for SQL tables on hard disc * + * Short description : Caching system for SQL tables on hard drive * * -------------------------------------------------------------------- * * Kurzbeschreibung : Caching-System zum Auslagern von SQL-Tabellen * * auf der Festplatte des Servers * diff --git a/inc/extensions/ext-coupon.php b/inc/extensions/ext-coupon.php index 0e0b934bd4..fb4450575a 100644 --- 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`), -UNIQUE `coupon_user` (`coupon_id`, `userid`), +UNIQUE `coupon_user` (`coupon_id`,`userid`), UNIQUE (`coupon_code`)", 'Coupon->user connection'); @@ -138,7 +138,7 @@ UNIQUE (`coupon_code`)", addExtensionDependency('order'); // Insert data in new table - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_points_data` (`subject`, `column_name`, `locked_mode`, `payment_method`) VALUES ('coupon_cashed','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(''); diff --git a/inc/extensions/ext-debug.php b/inc/extensions/ext-debug.php index 121ca72587..a4c4d1ac36 100644 --- 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 - 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'); @@ -110,7 +110,7 @@ UNIQUE (`url`)", `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 diff --git a/inc/extensions/ext-doubler.php b/inc/extensions/ext-doubler.php index da45567cbb..3c7410914b 100644 --- a/inc/extensions/ext-doubler.php +++ b/inc/extensions/ext-doubler.php @@ -239,8 +239,8 @@ INDEX (`userid`)", 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')"); + 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'); diff --git a/inc/extensions/ext-forced.php b/inc/extensions/ext-forced.php index dea5bb9fab..0694e013d0 100644 --- a/inc/extensions/ext-forced.php +++ b/inc/extensions/ext-forced.php @@ -51,9 +51,6 @@ enableExtensionProductive(false); switch (getExtensionMode()) { case 'register': // Do stuff when installation is running - // This depends on 'sponsor' now - addExtensionDependency('sponsor'); - // All required tables for this extension: // - Ads addDropTableSql('forced_ads'); @@ -65,11 +62,15 @@ switch (getExtensionMode()) { `forced_ads_height` SMALLINT(3) UNSIGNED NULL DEFAULT NULL, `forced_ads_alt_text` VARCHAR(255) NULL DEFAULT NULL, `forced_ads_framebreaker` ENUM('Y','N') NOT NULL DEFAULT 'Y', +`forced_ads_type` VARCHAR(255) NOT NULL DEFAULT 'INVALID', `forced_ads_views_counter` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, `forced_ads_clicks_counter` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, `forced_ads_reload_lock` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, `forced_ads_min_stay` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, -PRIMARY KEY ( `forced_ads_id` )", +`forced_ads_added` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, +`forced_ads_last_locked` TIMESTAMP NULL DEFAULT NULL, +`forced_ads_lock_reason` TINYTEXT, +PRIMARY KEY (`forced_ads_id`)", 'Forced Ads Data'); // - Campaigns @@ -96,19 +97,19 @@ INDEX (`forced_costs_id`)", `forced_campaign_id` BIGINT(20) UNSIGNED NULL DEFAULT NULL, `forced_ads_id` BIGINT(20) UNSIGNED NULL DEFAULT NULL, PRIMARY KEY (`forced_campaign_ads_id`), -UNIQUE `ads_campaign` ( `forced_campaign_id`, `forced_ads_id` )", +UNIQUE `ads_campaign`(`forced_campaign_id`,`forced_ads_id`)", 'Forced Campaigns<->Ads'); - // - Campaigns <-> User + // - Campaigns <-> "User" (could be a member, sponsor, admin or "API") addDropTableSql('forced_campaigns_user'); addCreateTableSql('forced_campaigns_user', " `forced_id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT, `forced_campaign_id` BIGINT(20) UNSIGNED NULL DEFAULT NULL, `forced_user_id` BIGINT(20) UNSIGNED NULL DEFAULT NULL, -`forced_user_type` ENUM('MEMBER','SPONSOR','ADMIN','API') NULL DEFAULT NULL, -PRIMARY KEY ( `forced_id` ), -UNIQUE `forced_campaign_user` ( `forced_campaign_id`, `forced_user_id`, `forced_user_type` ), -INDEX ( `forced_user_id` )", +`forced_user_type` ENUM('MEMBER','SPONSOR','ADMIN','API') NOT NULL DEFAULT 'ADMIN', +PRIMARY KEY (`forced_id`), +UNIQUE `forced_campaign_user` (`forced_campaign_id`,`forced_user_id`,`forced_user_type`), +INDEX (`forced_user_id`)", 'Forced Campaigns<->User'); // - Campaign costs @@ -118,7 +119,7 @@ INDEX ( `forced_user_id` )", `forced_costs_price_click` FLOAT(20,5) UNSIGNED NULL DEFAULT NULL, `forced_costs_payment_click` FLOAT(20,5) UNSIGNED NULL DEFAULT NULL, `forced_costs_visibility` ENUM('MEMBER','SPONSOR','ALL','NONE') NOT NULL DEFAULT 'NONE', -PRIMARY KEY ( `forced_costs_id` )", +PRIMARY KEY (`forced_costs_id`)", 'Forced Campaign Costs'); // - Campaign Statistics @@ -134,22 +135,27 @@ PRIMARY KEY ( `forced_costs_id` )", `forced_stats_ua` VARCHAR(255) NULL DEFAULT NULL, `forced_stats_is_proxy` ENUM('Y','N') NOT NULL DEFAULT 'N', `forced_stats_session_id` VARCHAR(100) NULL DEFAULT NULL, -PRIMARY KEY ( `forced_stats_id` ), -INDEX ( `forced_stats_campaign_id` ), -INDEX ( `forced_stats_user_id` )", +PRIMARY KEY (`forced_stats_id`), +INDEX (`forced_stats_campaign_id`), +INDEX (`forced_stats_user_id`)", 'Forced Campaign Statistics'); // Menu system // - Administrator - addAdminMenuSql('forced',NULL,'Forced-Ads','Verwalten Sie hier bequem alle laufenden Forced-Banner und -Textlinks und deren Kampgnen. Sie können hier auch neue Werbmittel (Ads) hinzufügen oder laufende Forced-Kampagnen bei z.B. Regelverstössen sperren oder löschen. Auch das naträgliche Editieren von Ads und Kampagnen ist jederzeit möglich. Kampagnen dienen der einfacheren Verwaltung und der Trennung von dem Werbemittel selbst dienen. Sie brauchen also z.B. einen Forced-Banner nur einmal einfügen und können dann bei Bedarf weitere Kampagnen starten.',5); - addAdminMenuSql('forced','list_forced_ads','Werbemittel verwalten','Listet alle eingetragenen Werbmittel (Ads) auf. Sie können hier diese nachträglich editieren falls Sie mal eine falsche URL eingegeben haben oder den Text ändern wollen. Löschen Sie hier auch Forced-Banner, die nicht mehr gültig sind (z.B. abgelaufen sind). Sollten doch mit dem Werbmittel verknüpfte Kampagnen vorhanden sein, erhalten Sie einen Warnhinweis. Neue Werbmittel können Sie hier ebenfalls hinzufügen. Denken Sie aber daran, dass ohne Kampagne dieses nicht angezeigt wird. Achten Sie hier auch die Reload-Sperre.',1); - addAdminMenuSql('forced','list_forced_campaigns','Kampagnen verwalten','Listet alle Kampagnen auf und zeigt deren Status an. Jederzeit können Sie Kampagnen stoppen, falls Sie dies wünschen oder ein Regelverstoss vorliegt. Haben Sie ein Werbemittel hinzugefügt, so fügen Sie bitte unbedingt eine Kampagne hinzu, da es sonst nicht angezeigt wird.',2); - addAdminMenuSql('forced','list_forced_costs','Kosten verwalten','Legen Sie die Preise pro Klick zum Buchen Forced-Werbemittel fest und wie viele {OPEN_CONFIG}POINTS{CLOSE_CONFIG} Ihre Mitglieder erhalten sollen. Generell sollten Sie bei Mitgliederbuchungen höhere Kosten pro Klick als was Ihre Mitglieder pro Klick erhalten einstellen, da so die {OPEN_CONFIG}POINTS{CLOSE_CONFIG} abgebaut werden (Sie können an Accountaufladungen z.B. verdienen).',3); - addAdminMenuSql('forced','stats_forced','Statistiken','Zeigt Gesamtstatistiken und zu den einzelnen Kampagnen und Werbmitteln an. Die hier angezeigte Statistik kann jedoch nicht manuell gelöscht werden (bitte auch nicht selber tun) da sie auch gleichzeitigt als Reload-Sperre dient.',4); + addAdminMenuSql('forced', NULL, 'Forced-Ads', 'Verwalten Sie hier bequem alle laufenden Forced-Banner und -Textlinks und deren Kampgnen. Sie können hier auch neue Werbmittel (Ads) hinzufügen oder laufende Forced-Kampagnen bei z.B. Regelverstössen sperren oder löschen. Auch das naträgliche Editieren von Ads und Kampagnen ist jederzeit möglich. Kampagnen dienen der einfacheren Verwaltung und der Trennung von dem Werbemittel selbst dienen. Sie brauchen also z.B. einen Forced-Banner nur einmal einfügen und können dann bei Bedarf weitere Kampagnen starten.', 5); + addAdminMenuSql('forced', 'list_forced_ads', 'Werbemittel verwalten', 'Listet alle eingetragenen Werbmittel (Ads) auf und fügt neue hinzu. Sie können hier diese nachträglich editieren falls Sie mal eine falsche URL eingegeben haben oder den Text ändern wollen. Löschen Sie hier auch Forced-Banner, die nicht mehr gültig sind (z.B. abgelaufen sind). Sollten doch mit dem Werbmittel verknüpfte Kampagnen vorhanden sein, erhalten Sie einen Warnhinweis. Neue Werbmittel können Sie hier ebenfalls hinzufügen. Denken Sie aber daran, dass ohne Kampagne dieses nicht angezeigt wird. Achten Sie hier auch die Reload-Sperre.', 2); + addAdminMenuSql('forced', 'list_forced_campaigns', 'Kampagnen verwalten', 'Listet alle Kampagnen auf und zeigt deren Status an. Jederzeit können Sie Kampagnen stoppen, falls Sie dies wünschen oder ein Regelverstoss vorliegt. Haben Sie ein Werbemittel hinzugefügt, so fügen Sie bitte unbedingt eine Kampagne hinzu, da es sonst nicht angezeigt wird.', 3); + addAdminMenuSql('forced', 'list_forced_costs', 'Kosten verwalten', 'Legen Sie die Preise pro Klick zum Buchen Forced-Werbemittel fest und wie viele {OPEN_CONFIG}POINTS{CLOSE_CONFIG} Ihre Mitglieder erhalten sollen. Generell sollten Sie bei Mitgliederbuchungen höhere Kosten pro Klick als was Ihre Mitglieder pro Klick erhalten einstellen, da so die {OPEN_CONFIG}POINTS{CLOSE_CONFIG} abgebaut werden (Sie können an Accountaufladungen z.B. verdienen).', 4); + addAdminMenuSql('forced', 'stats_forced', 'Statistiken', 'Zeigt Gesamtstatistiken und zu den einzelnen Kampagnen und Werbmitteln an. Die hier angezeigte Statistik kann jedoch nicht manuell gelöscht werden (bitte auch nicht selber tun) da sie auch gleichzeitigt als Reload-Sperre dient.', 5); // - Members addMemberMenuSql('earn', 'forced_banner', 'Forced-Banner', 2); addMemberMenuSql('earn', 'forced_textlink', 'Forced-Textlinks', 3); + addMemberMenuSql('extras','book_forced_banner','Forced-Banner buchen', 3); + addMemberMenuSql('extras','book_forced_textlink','Forced-Textlink buchen', 4); + + // Register filter for default forced ad types + registerFilter('add_forced_ads_types', 'FORCED_AD_TYPE_DEFAULTS', false, true, isExtensionDryRun()); break; case 'remove': // Do stuff when removing extension @@ -164,6 +170,9 @@ INDEX ( `forced_stats_user_id` )", // Menu systems addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `action`='forced' LIMIT 5"); addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE `what` IN ('forced_banner','forced_textlink') LIMIT 2"); + + // Remove filter + unregisterFilter(__FUNCTION__, __LINE__, 'add_forced_ads_types', 'FORCED_AD_TYPE_DEFAULTS', true, isExtensionDryRun()); break; case 'activate': // Do stuff when admin activates this extension diff --git a/inc/extensions/ext-funcoins.php b/inc/extensions/ext-funcoins.php index 14c54e5636..d3e8e1e7e2 100644 --- a/inc/extensions/ext-funcoins.php +++ b/inc/extensions/ext-funcoins.php @@ -88,7 +88,7 @@ INDEX (`userid`)", addConfigAddSql('funcoins_withdraw_fee_fix', 'BIGINT(20) UNSIGNED NOT NULL DEFAULT 0'); // Points data - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_points_data` (`subject`, `column_name`, `locked_mode`, `payment_method`) VALUES ('funcoins_withdraw','order_points','LOCKED','DIRECT')"); + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_points_data` (`subject`,`column_name`,`locked_mode`,`payment_method`) VALUES ('funcoins_withdraw','order_points','LOCKED','DIRECT')"); // User data addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_user_data` ADD `funcoins_userid` BIGINT(20) NULL DEFAULT NULL"); diff --git a/inc/extensions/ext-grade.php b/inc/extensions/ext-grade.php index 5302dc70e6..abd36e7c82 100644 --- a/inc/extensions/ext-grade.php +++ b/inc/extensions/ext-grade.php @@ -83,7 +83,7 @@ UNIQUE (`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`), -UNIQUE `grade_cash` (`grade_id`, `grade_cash_id`), +UNIQUE `grade_cash` (`grade_id`,`grade_cash_id`), 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`), -UNIQUE (`userid`, `grade_id`), +UNIQUE (`userid`,`grade_id`), INDEX (`grade_id`)", 'Grade<->user connection'); diff --git a/inc/extensions/ext-holiday.php b/inc/extensions/ext-holiday.php index 765fd276d7..6f595ce84a 100644 --- a/inc/extensions/ext-holiday.php +++ b/inc/extensions/ext-holiday.php @@ -82,7 +82,7 @@ INDEX (`userid`)", addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE `what`='holiday' LIMIT 1"); addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `action`='holiday' LIMIT 4"); addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_max_receive` WHERE `value`=0 LIMIT 1"); - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`, `comment`) VALUES (0,'Urlaub')"); + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`,`comment`) VALUES (0,'Urlaub')"); break; case 'activate': // Do stuff when admin activates this extension @@ -187,9 +187,9 @@ INDEX (`userid`)", break; case '0.1.8': // SQL queries for v0.1.8 - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu_las` (`la_id`, `la_action`, `la_what`) VALUES ('member', '', 'list_holiday')"); - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu_las` (`la_id`, `la_action`, `la_what`) VALUES ('member', '', 'del_holiday')"); - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu_las` (`la_id`, `la_action`, `la_what`) VALUES ('config', '', 'config_holiday')"); + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu_las` (`la_id`,`la_action`,`la_what`) VALUES ('member', '', 'list_holiday')"); + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu_las` (`la_id`,`la_action`,`la_what`) VALUES ('member', '', 'del_holiday')"); + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu_las` (`la_id`,`la_action`,`la_what`) VALUES ('config', '', 'config_holiday')"); // Depends on ext-sql_patches (or you have to execute these both SQL statements by phpMyAdmin addExtensionDependency('sql_patches'); diff --git a/inc/extensions/ext-iso3166.php b/inc/extensions/ext-iso3166.php index 4dbab08b30..28aa12dd97 100644 --- 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'"); - 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'), diff --git a/inc/extensions/ext-mailid.php b/inc/extensions/ext-mailid.php index e83b2905de..09e5910825 100644 --- a/inc/extensions/ext-mailid.php +++ b/inc/extensions/ext-mailid.php @@ -234,7 +234,7 @@ switch (getExtensionMode()) { 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')"); + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_points_data` (`subject`,`column_name`,`locked_mode`,`payment_method`) VALUES ('mailid_payback','points','LOCKED','DIRECT')"); break; } // END - switch break; diff --git a/inc/extensions/ext-network.php b/inc/extensions/ext-network.php index fa9f57f4ed..ec17c1f586 100644 --- 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`), -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 @@ -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`), -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 @@ -125,7 +125,7 @@ UNIQUE `provider_type_value` (`network_id`, `network_type_id`, `request_param_va `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'); @@ -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`), -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!'); @@ -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`), -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 @@ -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`), -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 @@ -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`), -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 @@ -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`), -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 @@ -270,7 +270,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", ('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'), @@ -290,7 +290,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", ('megad', 'Mega-Ad', 'http://www.mega-ad.de/?ref=303', '|', '|', 'GET', 'WINDOWS-1252','N'), ('power-promo', 'Power-Promo', 'http://www.power-promo.de?ref=1231', '|', '|', 'GET', 'WINDOWS-1252','N'), ('secash', 'SeCash', 'http://www.secash.de?ref=758', '|', '|', 'GET', 'WINDOWS-1252','N'), -('swizerland', 'The-Swizerland-Ad-Network', 'http://www.the-switzerland-ad-network.ch?ref=3', '|', '|', 'GET', 'WINDOWS-1252','N'), +('weltpromotion', 'Welt-Promotion', 'http://www.weltpromotion.de?ref=3', '|', '|', 'GET', 'WINDOWS-1252','N'), ('ultrapromo', 'UltraPROMO', 'http://www.ultrapromo.eu?ref=485', '|', '|', 'GET', 'WINDOWS-1252','N'), ('werbepartnercc', 'Der Werbepartner.cc', 'http://www.werbepartner.cc/sponsor/?ref=696', '|', '|', 'GET', 'WINDOWS-1252','N'), ('yoomedia', 'Yoo!Media Solutions', 'http://www.yoomedia.de?ref=1715', '|', '|', 'GET', 'WINDOWS-1252','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 - 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%'), @@ -317,7 +317,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (11, 1, 'htmlmail', 'http://www.a3h.de/interface/out_paidmail.php', 'http://www.a3h.de/emailf.php?id=%CID%', NULL)"); // Network type handlers - AbisZED-Netz - 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 (187, 2, 'banner_click', 'http://www.abiszed-netz.de/interface/out_banner.php', 'http://www.abiszed-netz.de/bannerklf.php?id=%CID%', 'http://www.abiszed-netz.de/banner.php?id=%CID%'), (188, 2, 'banner_view', 'http://www.abiszed-netz.de/interface/out_banner.php', 'http://www.abiszed-netz.de/bannerklf.php?id=%CID%', 'http://www.abiszed-netz.de/banner.php?id=%CID%'), (189, 2, 'textlink_click', 'http://www.abiszed-netz.de/interface/out_textlink.php', 'http://www.abiszed-netz.de/textlinkklick.php?id=%CID%', NULL), @@ -337,12 +337,12 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", // Network type handlers - Ad-Magnet // Network type handlers - AdCocktail - 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 (13, 4, 'forcedbanner', 'http://www.adcocktail.com/sc/kas/kas_fk.php', 'http://fk.adcocktail.com/fk_k.php?uid=%UID%&wid=%CID%&wsid=%SID%', 'http://fk.adcocktail.com/fk_v.php?uid=%UID%&wid=%CID%&wsid=%SID%'), (12, 4, 'textmail', 'http://www.adcocktail.com/sc/kas/kas_pm.php', 'http://pm.adcocktail.com/pm.php?uid=%UID%&wid=%CID%&wsid=%SID%', NULL)"); // Network type handlers - AdConvention - 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 (295, 30, 'banner_click', 'http://www.adconvention.de/interface/', 'http://www.adconvention.de/codes/klickbanner.php?id=%UID%&bid=%CID%&aid=%SID%', 'http://www.adconvention.de/codes/viewbanner.php?id=%UID%&bid=%CID%&aid=%SID%'), (294, 30, 'banner_view', 'http://www.adconvention.de/interface/', 'http://www.adconvention.de/codes/bannerklick.php?id=%UID%&bid=%CID%&aid=%CID%', 'http://www.adconvention.de/codes/bannerview.php?id=%UID%&bid=%CID%&aid=%SID%'), (297, 30, 'button_view', 'http://www.adconvention.de/interface/', 'http://www.adconvention.de/codes/buttonklick.php?id=%UID%&bid=%CID%&aid=%SID%', 'http://www.adconvention.de/codes/buttonview.php?id=%UID%&bid=%CID%&aid=%SID%'), @@ -355,7 +355,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (299, 30, 'traffic', 'http://www.adconvention.de/interface/', 'http://www.adconvention.de/codes/traffic.php?id=%UID%&bid=%CID%&aid=%SID%', NULL)"); // Network type handlers - AdPaid - 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 (177, 5, 'banner', 'http://www.adpaid.de/interface/out_banner.php', 'http://www.adpaid.de/bannerklf.php?id=%CID%', 'http://www.adpaid.de/banner.php?id=%CID%'), (178, 5, 'textlink', 'http://www.adpaid.de/interface/out_textlink.php', 'http://www.adpaid.de/textlinkklick.php?id=%CID%', NULL), (179, 5, 'surfbar', 'http://www.adpaid.de/interface/out_sbanner.php', 'http://www.adpaid.de/bannerklf.php?id=%CID%', 'http://www.adpaid.de/banner.php?id=%CID%'), @@ -368,14 +368,14 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (186, 5, 'sale', 'http://www.adpaid.de/interface/out_sale.php', 'http://www.adpaid.de/sale.php?id=%CID%', NULL)"); // Network type handlers - Ads4 - 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 (14, 6, 'forcedbanner', 'http://www.ads4.de/interface/interface.php', 'http://www.ads4.de/forced_click.php?fb_id=%CID%&sid=%SID%', 'http://www.ads4.de/forced_view.php?fb_id=%CID%&sid=%SID%'), (16, 6, 'htmlmail', 'http://www.ads4.de/interface/interface.php', 'http://www.ads4.de/paidmail_click.php?pm=%CID%&%sid=%SID%', NULL), (15, 6, 'textmail', 'http://www.ads4.de/interface/interface.php', 'http://www.ads4.de/paidmail_click.php?pm=%CID%&%sid=%SID%', NULL), (119, 6, 'traffic', 'http://www.ads4.de/interface/interface.php', 'http://www.ads4.de/traffic_click.php?tr_id=%CID%&sid=%SID%', '')"); // Network type handlers - Ads4Webbis - 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 (20, 7, 'banner_click', 'http://www.ads4webbis.de/interface/api_2.php', 'http://www.ads4webbis.de/codes/klickbanner.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%tid%', 'http://www.ads4webbis.de/codes/viewbanner.php?id=%UID%&bid=%CID%&aid=%SID%'), (19, 7, 'banner_view', 'http://www.ads4webbis.de/interface/api_2.php', 'http://www.ads4webbis.de/codes/bannerklick.php?id=%UID%&bid=%CID%&aid=%SID%', 'http://www.ads4webbis.de/codes/bannerview.php?id=%UID%&bid=%CID%&aid=%SID%'), (22, 7, 'button_view', 'http://www.ads4webbis.de/interface/api_2.php', 'http://www.ads4webbis.de/codes/buttonklick.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%tid%', 'http://www.ads4webbis.de/codes/buttonview.php?id=%UID%&bid=%CID%&aid=%SID%'), @@ -388,7 +388,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (120, 7, 'traffic', 'http://www.ads4webbis.de/interface/api_2.php', 'http://www.ads4webbis.de/codes/traffic.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%tid%', NULL)"); // Network type handlers - Ads4World - 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 (29, 8, 'banner_click', 'http://www.ads4world.de/interface/', 'http://www.ads4world.de/codes/klickbanner.php?id=%UID%&bid=%CID%&aid=%SID%', 'http://www.ads4world.de/codes/viewbanner.php?id=%UID%&bid=%CID%&aid=%SID%'), (28, 8, 'banner_view', 'http://www.ads4world.de/interface/', 'http://www.ads4world.de/codes/bannerklick.php?id=%UID%&bid=%CID%&aid=%SID%', 'http://www.ads4world.de/codes/bannerview.php?id=%UID%&bid=%CID%&aid=%SID%'), (31, 8, 'button_view', 'http://www.ads4world.de/interface/', 'http://www.ads4world.de/codes/buttonklick.php?id=%UID%&bid=%CID%&aid=%SID%', 'http://www.ads4world.de/codes/buttonview.php?id=%UID%&bid=%CID%&aid=%SID%'), @@ -403,7 +403,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", // Network type handlers - Affiliblatt // Network type handlers - AllAds4You - 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 (167, 10, 'forcedbanner', 'http://www.allads4you.de/interface/', 'http://www.allads4you.de/codes/forcedbannerklick.php?id=%UID%&bid=%CID%&aid=%SID%', 'http://www.allads4you.de/codes/forcedbannerview.php?id=%UID%&bid=%CID%&aid=%SID%'), (168, 10, 'forcedtextlink', 'http://www.allads4you.de/interface/', 'http://www.allads4you.de/codes/forcedtextlinkklick.php?id=%UID%&bid=%CID%&aid=%SID%', NULL), (169, 10, 'banner_view', 'http://www.allads4you.de/interface/', 'http://www.allads4you.de/codes/bannerklick.php?id=%UID%&bid=%CID%&aid=%SID%', 'http://www.allads4you.de/codes/bannerview.php?id=%UID%&bid=%CID%&aid=%SID%'), @@ -416,7 +416,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (176, 10, 'textmail', 'http://www.allads4you.de/interface/', 'http://www.allads4you.de/codes/paidmail.php?id=%UID%&bid=%CID%&aid=%SID%', NULL)"); // Network type handlers - Alster-Marketing - 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 (35, 11, 'banner_click', 'http://if.alstermarketing.de/interface/out_banner.php', 'http://www.alstermarketing.de/bannerklf.php?id=%CID%', 'http://www.alstermarketing.de/banner.php?id=%CID%'), (45, 11, 'banner_view', 'http://if.alstermarketing.de/interface/out_banner.php', 'http://www.alstermarketing.de/bannerklf.php?id=%CID%', 'http://www.alstermarketing.de/banner.php?id=%CID%'), (38, 11, 'forcedbanner', 'http://if.alstermarketing.de/interface/out_fbanner.php', 'http://www.alstermarketing.de/bannerklf.php?id=%CID%', 'http://www.alstermarketing.de/banner.php?id=%CID%'), @@ -434,7 +434,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (39, 11, 'textmail', 'http://if.alstermarketing.de/interface/out_paidmail.php', 'http://www.alstermarketing.de/emailf.php?id=%CID%', NULL)"); // Network type handlers - BonusSponsor - 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 (50, 12, 'banner_click', 'http://www.bonussponsor.de/interface/out_banner.php', 'http://www.bonussponsor.de/bannerklf.php?id=%CID%', 'http://www.bonussponsor.de/banner.php?id=%CID%'), (51, 12, 'banner_view', 'http://www.bonussponsor.de/interface/out_banner.php', 'http://www.bonussponsor.de/bannerklf.php?id=%CID%', 'http://www.bonussponsor.de/banner.php?id=%CID%'), (54, 12, 'forcedbanner', 'http://www.bonussponsor.de/interface/out_fbanner.php', 'http://www.bonussponsor.de/bannerklf.php?id=%CID%', 'http://www.bonussponsor.de/banner.php?id=%CID%'), @@ -450,7 +450,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (55, 12, 'textmail', 'http://www.bonussponsor.de/interface/out_paidmail.php', 'http://www.bonussponsor.de/emailf.php?id=%CID%', NULL)"); // Network type handlers - City-Ads - 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 (215, 24, 'banner_click', 'http://www.city-ads.de/interface/api_2.php', 'http://www.city-ads.de/codes/klickbanner.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%TID%', 'http://www.city-ads.de/codes/viewbanner.php?id=%UID%&bid=%CID%&aid=%SID%'), (214, 24, 'banner_view', 'http://www.city-ads.de/interface/api_2.php', 'http://www.city-ads.de/codes/bannerklick.php?id=%UID%&bid=%CID%&aid=%SID%', 'http://www.city-ads.de/codes/bannerview.php?id=%UID%&bid=%CID%&aid=%SID%'), (217, 24, 'button_view', 'http://www.city-ads.de/interface/api_2.php', 'http://www.city-ads.de/codes/buttonklick.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%TID%', 'http://www.city-ads.de/codes/buttonview.php?id=%UID%&bid=%CID%&aid=%SID%'), @@ -463,7 +463,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (219, 24, 'traffic', 'http://www.city-ads.de/interface/api_2.php', 'http://www.city-ads.de/codes/traffic.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%TID%', NULL)"); // Network type handlers - doubleads - 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 (232, 26, 'banner_click', 'http://www.doubleads.de/interface/out_banner.php', 'http://www.doubleads.de/bannerklf.php?id=%CID%', 'http://www.doubleads.de/banner.php?id=%CID%'), (233, 26, 'banner_view', 'http://www.doubleads.de/interface/out_banner.php', 'http://www.doubleads.de/bannerklf.php?id=%CID%', 'http://www.doubleads.de/banner.php?id=%CID%'), (234, 26, 'textlink_click', 'http://www.doubleads.de/interface/out_textlink.php', 'http://www.doubleads.de/textlinkklick.php?id=%CID%', NULL), @@ -481,7 +481,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (246, 26, 'sale', 'http://www.doubleads.de/interface/out_sale.php', 'http://www.doubleads.de/sale.php?id=%CID%', NULL)"); // Network type handlers - FuCoExSponsor.net - 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 (273, 29, 'banner_click', 'http://fucoexsponsor.net/int/get.php', 'http://fucoexsponsor.net/kamp/ziel.php?uid=%UID%&bid=%BID%&sid=%SID%', 'http://fucoexsponsor.net/kamp/b_view.php?uid=%UID%&bid=%BID%&sid=%SID%'), (274, 29, 'banner_view', 'http://fucoexsponsor.net/int/get.php', 'http://fucoexsponsor.net/kamp/ziel.php?uid=%UID%&bid=%BID%&sid=%SID%', 'http://fucoexsponsor.net/kamp/b_view.php?uid=%UID%&bid=%BID%&sid=%SID%'), (275, 29, 'button_click', 'http://fucoexsponsor.net/int/get.php', 'http://fucoexsponsor.net/kamp/ziel.php?uid=%UID%&bid=%BID%&sid=%SID%', 'http://fucoexsponsor.net/kamp/b_view.php?uid=%UID%&bid=%BID%&sid=%SID%'), @@ -501,12 +501,12 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (289, 29, 'traffic', 'http://fucoexsponsor.net/int/get.php', 'http://fucoexsponsor.net/kamp/ziel.php?uid=%UID%&bid=%BID%&sid=%SID%', NULL)"); // Network type handlers - Fusion-Ads - 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 (290, 13, 'forcedbanner', 'http://www.fusion-ads.de/data/get.php', 'http://www.fusion-ads.de/data/werbung.php?uid=%UID%&kid=%CID%&sid=%SID%&art=32&step=1', 'http://www.fusion-ads.de/data/werbung.php?uid=%UID%&kid=%CID%&sid=%SID%&art=32'), (291, 13, 'textmail', 'http://www.fusion-ads.de/data/get.php', 'ttp://www.fusion-ads.de/data/werbung.php?uid=%UID%&kid=%CID%&sid=%SID%&art=33', NULL)"); // Network type handlers - GigaPromo - 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 (102, 14, 'banner_view', 'http://www.gigapromo.de/interface/output_viewbanner.php', 'http://www.gigapromo.de/view/klickbanner.php?id=%UID%&bid=%CID%&aid=%SID%', 'http://www.gigapromo.de/view/viewbanner.php?id=%UID%&bid=%CID%&aid=%SID%'), (104, 14, 'forcedbanner', 'http://www.gigapromo.de/interface/output_forcedbanner.php', 'http://www.gigapromo.de/view/forcedclickbanner.php?id=%UID%&bid=%CID%&aid=%SID%', 'http://www.gigapromo.de/view/forcedviewbanner.php?id=%UID%&bid=%CID%&aid=%SID%'), (105, 14, 'forcedtextlink', 'http://www.gigapromo.de/interface/output_forcedtextlink.php', 'http://www.gigapromo.de/view/forcedclicktextlink.php?id=%UID%&bid=%CID%&aid=%SID%', NULL), @@ -517,7 +517,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (122, 14, 'traffic', 'http://www.gigapromo.de/interface/output_traffic.php', 'http://www.gigapromo.de/view/traffic.php?id=%UID%&bid=%CID%&aid=%SID%', NULL)"); // Network type handlers - Gold-Sponsor - 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 (225, 25, 'banner_click', 'http://www.gold-sponsor.de/interface/', 'http://www.gold-sponsor.de/codes/klickbanner.php?id=%UID%&bid=%CID%&aid=%SID%', 'http://www.gold-sponsor.de/codes/viewbanner.php?id=%UID%&bid=%CID%&aid=%SID%'), (224, 25, 'banner_view', 'http://www.gold-sponsor.de/interface/', 'http://www.gold-sponsor.de/codes/bannerklick.php?id=%UID%&bid=%CID%&aid=%SID%', 'http://www.gold-sponsor.de/codes/bannerview.php?id=%UID%&bid=%CID%&aid=%SID%'), (227, 25, 'button_view', 'http://www.gold-sponsor.de/interface/', 'http://www.gold-sponsor.de/codes/buttonklick.php?id=%UID%&bid=%CID%&aid=%SID%', 'http://www.gold-sponsor.de/codes/buttonview.php?id=%UID%&bid=%CID%&aid=%SID%'), @@ -530,7 +530,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (229, 25, 'traffic', 'http://www.gold-sponsor.de/interface/', 'http://www.gold-sponsor.de/codes/traffic.php?id=%UID%&bid=%CID%&aid=%SID%', NULL)"); // Network type handlers - homeADS - 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 (260, 28, 'banner_click', 'http://www.homeads.de/interface/out_banner.php', 'http://www.homeads.de/bannerklf.php?id=%CID%', 'http://www.homeads.de/banner.php?id=%CID%'), (261, 28, 'banner_view', 'http://www.homeads.de/interface/out_banner.php', 'http://www.homeads.de/bannerklf.php?id=%CID%', 'http://www.homeads.de/banner.php?id=%CID%'), (264, 28, 'forcedbanner', 'http://www.homeads.de/interface/out_fbanner.php', 'http://www.homeads.de/bannerklf.php?id=%CID%', 'http://www.homeads.de/banner.php?id=%CID%'), @@ -546,7 +546,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (265, 28, 'textmail', 'http://www.homeads.de/interface/out_paidmail.php', 'http://www.homeads.de/emailf.php?id=%CID%', NULL)"); // Network type handlers - HPSponsor - 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 (135, 15, 'banner_click', 'http://hpsponsor.at/interface/api_2.php', 'http://hpsponsor.at/codes/klickbanner.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%TID%', 'http://hpsponsor.at/codes/viewbanner.php?id=%UID%&bid=%CID%&aid=%SID%'), (136, 15, 'banner_view', 'http://hpsponsor.at/interface/api_2.php', 'http://hpsponsor.at/codes/bannerklick.php?id=%UID%&bid=%CID%&aid=%SID%', 'http://hpsponsor.at/codes/bannerview.php?id=%UID%&bid=%CID%&aid=%SID%'), (137, 15, 'button_view', 'http://hpsponsor.at/interface/api_2.php', 'http://hpsponsor.at/codes/buttonklick.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%TID%', 'http://hpsponsor.at/codes/buttonview.php?id=%UID%&bid=%CID%&aid=%SID%'), @@ -559,7 +559,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (144, 15, 'traffic', 'http://hpsponsor.at/interface/api_2.php', 'http://hpsponsor.at/codes/traffic.php?id=%UID%&bid=%CID%&aid=%CID%&trackid=%TID%', NULL)"); // Network type handlers - Make-Euros - 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 (63, 16, 'banner_click', 'http://www.make-euros.de/interface/out_banner.php', 'http://www.make-euros.de/bannerklf.php?id=%CID%', 'http://www.make-euros.de/banner.php?id=%CID%'), (64, 16, 'banner_view', 'http://www.make-euros.de/interface/out_banner.php', 'http://www.make-euros.de/bannerklf.php?id=%CID%', 'http://www.make-euros.de/banner.php?id=%CID%'), (68, 16, 'forcedbanner', 'http://www.make-euros.de/interface/out_fbanner.php', 'http://www.make-euros.de/bannerklf.php?id=%CID%', 'http://www.make-euros.de/banner.php?id=%CID%'), @@ -577,7 +577,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (70, 16, 'textmail', 'http://www.make-euros.de/interface/out_paidmail.php', 'http://www.make-euros.de/emailf.php?id=%CID%', NULL)"); // Network type handlers - Mega-Ad - 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 (112, 17, 'banner_click', 'http://www.mega-ad.de/interface/', 'http://www.mega-ad.de/codes/klickbanner.php?id=%UID%&bid=%CID%&aid=%SID%', 'http://www.mega-ad.de/codes/view.php?id=%UID%&bid=%CID%&aid=%SID%'), (111, 17, 'banner_view', 'http://www.mega-ad.de/interface/', 'http://www.mega-ad.de/codes/bannerklick.php?id=%UID%&bid=%CID%&aid=%SID%', 'http://www.mega-ad.de/codes/bannerview.php?id=%UID%&bid=%CID%&aid=%SID%'), (114, 17, 'button_view', 'http://www.mega-ad.de/interface/', 'http://www.mega-ad.de/codes/buttonklick.php?id=%UID%&bid=%CID%&aid=%SID%', 'http://www.mega-ad.de/codes/buttonview.php?id=%UID%&bid=%CID%&aid=%SID%'), @@ -590,7 +590,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (123, 17, 'traffic', 'http://www.mega-ad.de/interface/', 'http://www.mega-ad.de/codes/traffic.php?id=%UID%&bid=%CID%&aid=%SID%', NULL)"); // Network type handlers - Power-Promo - 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 (78, 18, 'banner_click', 'http://www.power-promo.de/interface/out_banner.php', 'http://www.power-promo.de/bannerklf.php?id=%CID%', 'http://www.power-promo.de/banner.php?id=%CID%'), (79, 18, 'banner_view', 'http://www.power-promo.de/interface/out_banner.php', 'http://www.power-promo.de/bannerklf.php?id=%CID%', 'http://www.power-promo.de/banner.php?id=%CID%'), (84, 18, 'forcedbanner', 'http://www.power-promo.de/interface/out_fbanner.php', 'http://www.power-promo.de/bannerklf.php?id=%CID%', 'http://www.power-promo.de/banner.php?id=%CID%'), @@ -608,7 +608,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (85, 18, 'textmail', 'http://www.power-promo.de/interface/out_paidmail.php', 'http://www.power-promo.de/emailf.php?id=%CID%', NULL)"); // Network type handlers - SeCash - 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 (93, 19, 'forcedbanner', 'http://www.secash.de/interface/api_2.php', 'http://www.secash.de/codes/forcedbannerklick.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%tid%', 'http://www.secash.de/codes/forcedbannerview.php?id=%UID%&bid=%CID%&aid=%SID%'), (94, 19, 'forcedtextlink', 'http://www.secash.de/interface/api_2.php', 'http://www.secash.de/codes/forcedtextlinkklick.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%tid%', NULL), (95, 19, 'banner_view', 'http://www.secash.de/interface/api_2.php', 'http://www.secash.de/codes/bannerklick.php?id=%UID%&bid=%CID%&aid=%SID%', 'http://www.secash.de/codes/bannerview.php?id=%UID%&bid=%CID%&aid=%SID%'), @@ -621,20 +621,20 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (124, 19, 'traffic', 'http://www.secash.de/interface/api_2.php', 'http://www.secash.de/codes/traffic.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%tid%', NULL)"); // Network type handlers - Swizerland - 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 -(205, 20, 'banner_click', 'http://www.the-switzerland-ad-network.ch/interface/api_2.php', 'http://www.the-switzerland-ad-network.ch/codes/klickbanner.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%TID%', 'http://www.the-switzerland-ad-network.ch/codes/viewbanner.php?id=%UID%&bid=%CID%&aid=%SID%'), -(204, 20, 'banner_view', 'http://www.the-switzerland-ad-network.ch/interface/api_2.php', 'http://www.the-switzerland-ad-network.ch/codes/bannerklick.php?id=%UID%&bid=%CID%&aid=%SID%', 'http://www.the-switzerland-ad-network.ch/codes/bannerview.php?id=%UID%&bid=%CID%&aid=%SID%'), -(207, 20, 'button_view', 'http://www.the-switzerland-ad-network.ch/interface/api_2.php', 'http://www.the-switzerland-ad-network.ch/codes/klickbanner.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%TID%', 'http://www.the-switzerland-ad-network.ch/codes/buttonview.php?id=%UID%&bid=%CID%&aid=%SID%'), -(202, 20, 'forcedbanner', 'http://www.the-switzerland-ad-network.ch/interface/api_2.php', 'http://www.the-switzerland-ad-network.ch/codes/forcedbannerklick.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%TID%', 'http://www.the-switzerland-ad-network.ch/codes/forcedbannerview.php?id=%UID%&bid=%CID%&aid=%SID%'), -(203, 20, 'forcedtextlink', 'http://www.the-switzerland-ad-network.ch/interface/api_2.php', 'http://www.the-switzerland-ad-network.ch/codes/forcedtextlinkklick.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%TID%', NULL), -(210, 20, 'popup', 'http://www.the-switzerland-ad-network.ch/interface/api_2.php', 'http://www.the-switzerland-ad-network.ch/codes/popup.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%TID%', NULL), -(206, 20, 'skybanner_view', 'http://www.the-switzerland-ad-network.ch/interface/api_2.php', 'http://www.the-switzerland-ad-network.ch/codes/skybannerklick.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%TID%', 'http://www.the-switzerland-ad-network.ch/codes/skybannerview.php?id=%UID%&bid=%CID%&aid=%SID%'), -(208, 20, 'textlink_view', 'http://www.the-switzerland-ad-network.ch/interface/api_2.php', 'http://www.the-switzerland-ad-network.ch/codes/textlinkview.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%TID%', NULL), -(211, 20, 'textmail', 'http://www.the-switzerland-ad-network.ch/interface/api_2.php', 'http://www.the-switzerland-ad-network.ch/codes/paidmail.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%TID%', NULL), -(209, 20, 'traffic', 'http://www.the-switzerland-ad-network.ch/interface/api_2.php', 'http://www.the-switzerland-ad-network.ch/codes/traffic.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%TID%', NULL)"); + 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 +(205, 20, 'banner_click', 'http://www.weltpromotion.de/interface/api_2.php', 'http://www.weltpromotion.de/codes/klickbanner.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%TID%', 'http://www.weltpromotion.de/codes/viewbanner.php?id=%UID%&bid=%CID%&aid=%SID%'), +(204, 20, 'banner_view', 'http://www.weltpromotion.de/interface/api_2.php', 'http://www.weltpromotion.de/codes/bannerklick.php?id=%UID%&bid=%CID%&aid=%SID%', 'http://www.weltpromotion.de/codes/bannerview.php?id=%UID%&bid=%CID%&aid=%SID%'), +(207, 20, 'button_view', 'http://www.weltpromotion.de/interface/api_2.php', 'http://www.weltpromotion.de/codes/klickbanner.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%TID%', 'http://www.weltpromotion.de/codes/buttonview.php?id=%UID%&bid=%CID%&aid=%SID%'), +(202, 20, 'forcedbanner', 'http://www.weltpromotion.de/interface/api_2.php', 'http://www.weltpromotion.de/codes/forcedbannerklick.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%TID%', 'http://www.weltpromotion.de/codes/forcedbannerview.php?id=%UID%&bid=%CID%&aid=%SID%'), +(203, 20, 'forcedtextlink', 'http://www.weltpromotion.de/interface/api_2.php', 'http://www.weltpromotion.de/codes/forcedtextlinkklick.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%TID%', NULL), +(210, 20, 'popup', 'http://www.weltpromotion.de/interface/api_2.php', 'http://www.weltpromotion.de/codes/popup.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%TID%', NULL), +(206, 20, 'skybanner_view', 'http://www.weltpromotion.de/interface/api_2.php', 'http://www.weltpromotion.de/codes/skybannerklick.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%TID%', 'http://www.weltpromotion.de/codes/skybannerview.php?id=%UID%&bid=%CID%&aid=%SID%'), +(208, 20, 'textlink_view', 'http://www.weltpromotion.de/interface/api_2.php', 'http://www.weltpromotion.de/codes/textlinkview.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%TID%', NULL), +(211, 20, 'textmail', 'http://www.weltpromotion.de/interface/api_2.php', 'http://www.weltpromotion.de/codes/paidmail.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%TID%', NULL), +(209, 20, 'traffic', 'http://www.weltpromotion.de/interface/api_2.php', 'http://www.weltpromotion.de/codes/traffic.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%TID%', NULL)"); // Network type handlers - UltraPROMO - 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 (125, 21, 'banner_click', 'http://www.ultrapromo.eu/interface/', 'http://www.ultrapromo.eu/codes/klickbanner.php?id=%UID%&bid=%CID%&aid=%SID%', 'http://www.ultrapromo.eu/codes/viewbanner.php?id=%UID%&bid=%CID%&aid=%SID%'), (126, 21, 'banner_view', 'http://www.ultrapromo.eu/interface/', 'http://www.ultrapromo.eu/codes/bannerklick.php?id=%UID%&bid=%CID%&aid=%SID%', 'http://www.ultrapromo.eu/codes/bannerview.php?id=%UID%&bid=%CID%&aid=%SID%'), (127, 21, 'button_view', 'http://www.ultrapromo.eu/interface/', 'http://www.ultrapromo.eu/codes/buttonklick.php?id=%UID%&bid=%CID%&aid=%SID%', 'http://www.ultrapromo.eu/codes/buttonview.php?id=%UID%&bid=%CID%&aid=%SID%'), @@ -647,7 +647,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (134, 21, 'traffic', 'http://www.ultrapromo.eu/interface/', 'http://www.ultrapromo.eu/codes/traffic.php?id=%UID%&bid=%CID%&aid=%SID%', NULL)"); // Network type handlers - VIPads.de - 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 (247, 27, 'banner_click', 'http://vipads.de/int/get.php', 'http://vipads.de/kamp/ziel.php?uid=%UID%&bid=%BID%&sid=%SID%', 'http://vipads.de/kamp/b_view.php?uid=%UID%&bid=%BID%&sid=%SID%'), (248, 27, 'banner_view', 'http://vipads.de/int/get.php', 'http://vipads.de/kamp/ziel.php?uid=%UID%&bid=%BID%&sid=%SID%', 'http://vipads.de/kamp/b_view.php?uid=%UID%&bid=%BID%&sid=%SID%'), (249, 27, 'button_click', 'http://vipads.de/int/get.php', 'http://vipads.de/kamp/ziel.php?uid=%UID%&bid=%BID%&sid=%SID%', 'http://vipads.de/kamp/b_view.php?uid=%UID%&bid=%BID%&sid=%SID%'), @@ -663,7 +663,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (259, 27, 'traffic', 'http://vipads.de/int/get.php', 'http://vipads.de/kamp/ziel.php?uid=%UID%&bid=%BID%&sid=%SID%', NULL)"); // Network type handlers - Der Werbepartner.cc - 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 (145, 22, 'textlink_click', 'http://www.werbepartner.cc/sponsor/data/get.php', 'http://www.werbepartner.cc/sponsor/data/werbung.php', NULL), (146, 22, 'forcedbanner', 'http://www.werbepartner.cc/sponsor/data/get.php', 'http://www.werbepartner.cc/sponsor/data/werbung.php', 'http://www.werbepartner.cc/sponsor/data/werbung.php'), (147, 22, 'textmail', 'http://www.werbepartner.cc/sponsor/data/get.php', 'http://www.werbepartner.cc/sponsor/data/werbung.php', NULL), @@ -677,7 +677,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (155, 22, 'traffic', 'http://www.werbepartner.cc/sponsor/data/get.php', 'http://www.werbepartner.cc/sponsor/data/get.php', NULL)"); // Network type handlers - Yoo!Media - 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 (156, 23, 'banner_click', 'http://www.yoomedia.de/interface_2.0/out_banner.php', 'http://www.yoomedia.de/code/z-bannerklf.php?id=%CID%&sid=%SID%', 'http://www.yoomedia.de/code/z-banner.php?id=%CID%&sid=%SID%&bid=%BID%'), (157, 23, 'textlink_click', 'http://www.yoomedia.de/interface_2.0/out_textlink.php', 'http://www.yoomedia.de/code/t-textlink.php?id=%CID%&sid=%SID%', NULL), (158, 23, 'surfbar_click', 'http://www.yoomedia.de/interface_2.0/out_sbanner.php', 'http://www.yoomedia.de/code/s-bannerklf.php?id=%CID%&sid=%SID%', 'http://www.yoomedia.de/code/s-banner.php?id=%CID%&sid=%SID%&bid=%BID%'), @@ -691,7 +691,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (166, 23, 'lead', 'http://www.yoomedia.de/interface_2.0/out_lead.php', 'http://www.yoomedia.de/code/lead.php?id=%CID%&sid=%SID%', NULL)"); // Request parameters per type handler - A3H - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`, `network_type_id`, `request_param_key`, `request_param_value`, `request_param_default`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`,`network_type_id`,`request_param_key`,`request_param_value`,`request_param_default`) VALUES (1, 1, 'id', 'id', NULL), (1, 1, 'minimum_stay', 'ma', NULL), (1, 1, 'password', 'pw', NULL), @@ -772,7 +772,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (1, 11, 'type', 'typ', 'html')"); // Request parameters per type handler - AbisZED-Netz - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`, `network_type_id`, `request_param_key`, `request_param_value`, `request_param_default`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`,`network_type_id`,`request_param_key`,`request_param_value`,`request_param_default`) VALUES (2, 187, 'id', 'id', NULL), (2, 187, 'password', 'pw', NULL), (2, 187, 'reload', 'reload', NULL), @@ -887,7 +887,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", // Request parameters per type handler - AdCocktail // Request parameters per type handler - AdConvention - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`, `network_type_id`, `request_param_key`, `request_param_value`, `request_param_default`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`,`network_type_id`,`request_param_key`,`request_param_value`,`request_param_default`) VALUES (30, 292, 'extra', 'typ', 'forcedbanner'), (30, 292, 'id', 'id', NULL), (30, 292, 'minimum_stay', 'ma', NULL), @@ -960,7 +960,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (30, 301, 'reward', 'verguetung', NULL)"); // Request parameters per type handler - AdPaid - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`, `network_type_id`, `request_param_key`, `request_param_value`, `request_param_default`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`,`network_type_id`,`request_param_key`,`request_param_value`,`request_param_default`) VALUES (5, 177, 'id', 'id', NULL), (5, 177, 'password', 'pw', NULL), (5, 177, 'reload', 'reload', NULL), @@ -1033,7 +1033,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (5, 186, 'sid', 'sid', NULL)"); // Request parameters per type handler - Ads4 - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`, `network_type_id`, `request_param_key`, `request_param_value`, `request_param_default`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`,`network_type_id`,`request_param_key`,`request_param_value`,`request_param_default`) VALUES (6, 14, 'currency', 'waehrung', NULL), (6, 14, 'extra', 'mediatype', 'forced_banner'), (6, 14, 'id', 'id', NULL), @@ -1068,7 +1068,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (6, 119, 'reward', 'verg', NULL)"); // Request parameters per type handler - Ads4Webbis - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`, `network_type_id`, `request_param_key`, `request_param_value`, `request_param_default`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`,`network_type_id`,`request_param_key`,`request_param_value`,`request_param_default`) VALUES (7, 17, 'extra', 'typ', 'forcedbanner'), (7, 17, 'id', 'id', NULL), (7, 17, 'password', 'pw', NULL), @@ -1133,7 +1133,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (7, 120, 'reward', 'verguetung', NULL)"); // Request parameters per type handler - Ads4World - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`, `network_type_id`, `request_param_key`, `request_param_value`, `request_param_default`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`,`network_type_id`,`request_param_key`,`request_param_value`,`request_param_default`) VALUES (8, 26, 'extra', 'typ', 'forcedbanner'), (8, 26, 'id', 'id', NULL), (8, 26, 'password', 'pw', NULL), @@ -1200,7 +1200,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", // Request parameters per type handler - Affiliblatt // Request parameters per type handler - AllAds4You - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`, `network_type_id`, `request_param_key`, `request_param_value`, `request_param_default`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`,`network_type_id`,`request_param_key`,`request_param_value`,`request_param_default`) VALUES (10, 167, 'extra', 'typ', 'forcedbanner'), (10, 167, 'id', 'id', NULL), (10, 167, 'password', 'pw', NULL), @@ -1273,7 +1273,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (10, 176, 'sid', 'sid', NULL)"); // Request parameters per type handler - Alster-Marketing - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`, `network_type_id`, `request_param_key`, `request_param_value`, `request_param_default`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`,`network_type_id`,`request_param_key`,`request_param_value`,`request_param_default`) VALUES (11, 35, 'id', 'id', NULL), (11, 35, 'password', 'pw', NULL), (11, 35, 'reload', 'reload', NULL), @@ -1384,7 +1384,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (11, 49, 'type', 'typ', 'view')"); // Request parameters per type handler - BonusSponsor - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`, `network_type_id`, `request_param_key`, `request_param_value`, `request_param_default`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`,`network_type_id`,`request_param_key`,`request_param_value`,`request_param_default`) VALUES (12, 50, 'id', 'id', NULL), (12, 50, 'password', 'pw', NULL), (12, 50, 'reload', 'reload', NULL), @@ -1479,7 +1479,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (12, 62, 'sid', 'sid', NULL)"); // Request parameters per type handler - City-Ads - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`, `network_type_id`, `request_param_key`, `request_param_value`, `request_param_default`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`,`network_type_id`,`request_param_key`,`request_param_value`,`request_param_default`) VALUES (24, 212, 'extra', 'typ', 'forcedbanner'), (24, 212, 'id', 'id', NULL), (24, 212, 'password', 'pw', NULL), @@ -1552,7 +1552,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (24, 221, 'minimum_stay', 'ma', NULL)"); // Request parameters per type handler - doubleads - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`, `network_type_id`, `request_param_key`, `request_param_value`, `request_param_default`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`,`network_type_id`,`request_param_key`,`request_param_value`,`request_param_default`) VALUES (26, 232, 'id', 'id', NULL), (26, 232, 'password', 'pw', NULL), (26, 232, 'reload', 'reload', NULL), @@ -1663,7 +1663,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (26, 246, 'sid', 'sid', NULL)"); // Request parameters per type handler - FuCoExSponsor.net - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`, `network_type_id`, `request_param_key`, `request_param_value`, `request_param_default`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`,`network_type_id`,`request_param_key`,`request_param_value`,`request_param_default`) VALUES (29, 273, 'extra', 'art', 'bannerklick'), (29, 273, 'id', 'uid', NULL), (29, 273, 'password', 'pw', NULL), @@ -1791,7 +1791,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (29, 289, 'sid', 'sid', NULL)"); // Request parameters per type handler - Fusion-Ads - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`, `network_type_id`, `request_param_key`, `request_param_value`, `request_param_default`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`,`network_type_id`,`request_param_key`,`request_param_value`,`request_param_default`) VALUES (13, 290, 'extra', 'art', 'Forcedbanner'), (13, 290, 'id', 'uid', NULL), (13, 290, 'password', 'pw', NULL), @@ -1808,7 +1808,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (13, 291, 'sid', 'sid', NULL)"); // Request parameters per type handler - GigapPromo - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`, `network_type_id`, `request_param_key`, `request_param_value`, `request_param_default`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`,`network_type_id`,`request_param_key`,`request_param_value`,`request_param_default`) VALUES (14, 102, 'id', 'id', NULL), (14, 102, 'password', 'pw', NULL), (14, 102, 'reload', 'reload', NULL), @@ -1859,7 +1859,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (14, 108, 'sid', 'aid', NULL)"); // Request parameters per type handler - Gold-Sponsor - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`, `network_type_id`, `request_param_key`, `request_param_value`, `request_param_default`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`,`network_type_id`,`request_param_key`,`request_param_value`,`request_param_default`) VALUES (25, 222, 'extra', 'typ', 'forcedbanner'), (25, 222, 'id', 'id', NULL), (25, 222, 'minimum_stay', 'ma', NULL), @@ -1932,7 +1932,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (25, 231, 'reward', 'verguetung', NULL)"); // Request parameters per type handler - homeADS - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`, `network_type_id`, `request_param_key`, `request_param_value`, `request_param_default`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`,`network_type_id`,`request_param_key`,`request_param_value`,`request_param_default`) VALUES (28, 260, 'id', 'id', NULL), (28, 260, 'password', 'pw', NULL), (28, 260, 'reload', 'reload', NULL), @@ -2027,7 +2027,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (28, 272, 'sid', 'sid', NULL)"); // Request parameters per type handler - HPSponsor - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`, `network_type_id`, `request_param_key`, `request_param_value`, `request_param_default`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`,`network_type_id`,`request_param_key`,`request_param_value`,`request_param_default`) VALUES (15, 135, 'extra', 'typ', 'forcedbanner'), (15, 135, 'id', 'id', NULL), (15, 135, 'password', 'pw', NULL), @@ -2092,7 +2092,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (15, 144, 'reward', 'verguetung', NULL)"); // Request parameters per type handler - Make-Euros - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`, `network_type_id`, `request_param_key`, `request_param_value`, `request_param_default`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`,`network_type_id`,`request_param_key`,`request_param_value`,`request_param_default`) VALUES (16, 63, 'id', 'id', NULL), (16, 63, 'password', 'pw', NULL), (16, 63, 'reload', 'reload', NULL), @@ -2203,7 +2203,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (16, 77, 'sid', 'sid', NULL)"); // Request parameters per type handler - Mega-Ad - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`, `network_type_id`, `request_param_key`, `request_param_value`, `request_param_default`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`,`network_type_id`,`request_param_key`,`request_param_value`,`request_param_default`) VALUES (17, 109, 'extra', 'typ', 'forcedbanner'), (17, 109, 'id', 'id', NULL), (17, 109, 'password', 'pw', NULL), @@ -2266,7 +2266,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (17, 123, 'reward', 'verguetung', NULL)"); // Request parameters per type handler - Power-Promo - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`, `network_type_id`, `request_param_key`, `request_param_value`, `request_param_default`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`,`network_type_id`,`request_param_key`,`request_param_value`,`request_param_default`) VALUES (18, 78, 'id', 'id', NULL), (18, 78, 'password', 'pw', NULL), (18, 78, 'reload', 'reload', NULL), @@ -2377,7 +2377,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (18, 92, 'sid', 'sid', NULL)"); // Request parameters per type handler - SeCash - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`, `network_type_id`, `request_param_key`, `request_param_value`, `request_param_default`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`,`network_type_id`,`request_param_key`,`request_param_value`,`request_param_default`) VALUES (19, 93, 'extra', 'typ', 'forcedbanner'), (19, 93, 'id', 'id', NULL), (19, 93, 'password', 'pw', NULL), @@ -2442,7 +2442,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (19, 124, 'reward', 'verguetung', NULL)"); // Request parameters per type handler - Swizerland - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`, `network_type_id`, `request_param_key`, `request_param_value`, `request_param_default`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`,`network_type_id`,`request_param_key`,`request_param_value`,`request_param_default`) VALUES (20, 202, 'extra', 'typ', 'forcedbanner'), (20, 202, 'id', 'id', NULL), (20, 202, 'password', 'pw', NULL), @@ -2507,7 +2507,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (20, 211, 'reward', 'verguetung', NULL)"); // Request parameters per type handler - UltraPROMO - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`, `network_type_id`, `request_param_key`, `request_param_value`, `request_param_default`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`,`network_type_id`,`request_param_key`,`request_param_value`,`request_param_default`) VALUES (21, 125, 'extra', 'typ', 'bannerklick'), (21, 125, 'id', 'id', NULL), (21, 125, 'password', 'pw', NULL), @@ -2572,7 +2572,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (21, 134, 'reward', 'verguetung', NULL)"); // Request parameters per type handler - VIPads.de - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`, `network_type_id`, `request_param_key`, `request_param_value`, `request_param_default`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`,`network_type_id`,`request_param_key`,`request_param_value`,`request_param_default`) VALUES (27, 247, 'extra', 'art', 'bannerklick'), (27, 247, 'id', 'uid', NULL), (27, 247, 'password', 'pw', NULL), @@ -2671,7 +2671,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (27, 259, 'sid', 'sid', NULL)"); // Request parameters per type handler - Der Werbepartner.cc - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`, `network_type_id`, `request_param_key`, `request_param_value`, `request_param_default`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`,`network_type_id`,`request_param_key`,`request_param_value`,`request_param_default`) VALUES (22, 145, 'extra', 'art', 'Textlinkklick'), (22, 145, 'id', 'uid', NULL), (22, 145, 'password', 'pw', NULL), @@ -2751,7 +2751,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (22, 155, 'sid', 'sid', NULL)"); // Request parameters per type handler - Yoo!Media - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`, `network_type_id`, `request_param_key`, `request_param_value`, `request_param_default`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`,`network_type_id`,`request_param_key`,`request_param_value`,`request_param_default`) VALUES (23, 156, 'erotic', 'erotik', NULL), (23, 156, 'id', 'id', NULL), (23, 156, 'password', 'pw', NULL), @@ -2838,7 +2838,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (23, 166, 'sid', 'sid', NULL)"); // API array elements - A3H - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`, `network_type_id`, `network_api_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`,`network_type_id`,`network_api_index`,`sort`) VALUES (1, 1, 7, 1), (1, 1, 2, 2), (1, 1, 3, 3), @@ -2915,7 +2915,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (1, 10, 25, 10)"); // API array elements - AbisZED-Netz - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`, `network_type_id`, `network_api_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`,`network_type_id`,`network_api_index`,`sort`) VALUES (2, 187, 7, 1), (2, 187, 2, 2), (2, 187, 3, 3), @@ -3029,7 +3029,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", // API array elements - ADCocktail // API array elements - AdConvention - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`, `network_type_id`, `network_api_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`,`network_type_id`,`network_api_index`,`sort`) VALUES (30, 292, 1, 1), (30, 292, 2, 2), (30, 292, 4, 3), @@ -3088,7 +3088,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (30, 301, 9, 7)"); // API array elements - AdPaid - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`, `network_type_id`, `network_api_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`,`network_type_id`,`network_api_index`,`sort`) VALUES (5, 177, 7, 1), (5, 177, 2, 2), (5, 177, 3, 3), @@ -3147,7 +3147,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (5, 185, 9, 9)"); // API array elements - Ads4.de - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`, `network_type_id`, `network_api_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`,`network_type_id`,`network_api_index`,`sort`) VALUES (6, 14, 7, 1), (6, 14, 2, 2), (6, 14, 6, 3), @@ -3174,7 +3174,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (6, 119, 10, 6)"); // API array elements - Ads4Webbis - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`, `network_type_id`, `network_api_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`,`network_type_id`,`network_api_index`,`sort`) VALUES (7, 17, 1, 1), (7, 17, 2, 2), (7, 17, 4, 3), @@ -3257,7 +3257,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (7, 120, 27, 8)"); // API array elements - Ads4World - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`, `network_type_id`, `network_api_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`,`network_type_id`,`network_api_index`,`sort`) VALUES (8, 26, 1, 1), (8, 26, 2, 2), (8, 26, 4, 3), @@ -3315,7 +3315,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", // API array elements - Affiliblatt // API array elements - AllAds4You - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`, `network_type_id`, `network_api_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`,`network_type_id`,`network_api_index`,`sort`) VALUES (10, 167, 1, 1), (10, 167, 2, 2), (10, 167, 4, 3), @@ -3371,7 +3371,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (10, 176, 9, 7)"); // API array elements - Alster-Marketing - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`, `network_type_id`, `network_api_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`,`network_type_id`,`network_api_index`,`sort`) VALUES (11, 35, 7, 1), (11, 35, 2, 2), (11, 35, 3, 3), @@ -3481,7 +3481,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (11, 49, 6, 5)"); // API array elements - BonusSponsor - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`, `network_type_id`, `network_api_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`,`network_type_id`,`network_api_index`,`sort`) VALUES (12, 50, 7, 1), (12, 50, 2, 2), (12, 50, 3, 3), @@ -3539,7 +3539,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (12, 62, 9, 19)"); // API array elements - City-Ads - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`, `network_type_id`, `network_api_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`,`network_type_id`,`network_api_index`,`sort`) VALUES (24, 212, 1, 1), (24, 212, 2, 2), (24, 212, 4, 3), @@ -3622,7 +3622,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (24, 221, 27, 8)"); // API array elements - doubleads - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`, `network_type_id`, `network_api_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`,`network_type_id`,`network_api_index`,`sort`) VALUES (26, 232, 1, 1), (26, 232, 2, 2), (26, 232, 3, 3), @@ -3732,7 +3732,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (26, 246, 25, 10)"); // API array elements - FuCoExSponsor.net - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`, `network_type_id`, `network_api_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`,`network_type_id`,`network_api_index`,`sort`) VALUES (29, 273, 7, 1), (29, 273, 2, 2), (29, 273, 5, 3), @@ -3833,7 +3833,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (29, 289, 10, 6)"); // API array elements - Fusion-Ads - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`, `network_type_id`, `network_api_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`,`network_type_id`,`network_api_index`,`sort`) VALUES (13, 290, 1, 1), (13, 290, 2, 2), (13, 290, 6, 3), @@ -3852,7 +3852,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (13, 291, 10, 8)"); // API array elements - GigaPromo - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`, `network_type_id`, `network_api_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`,`network_type_id`,`network_api_index`,`sort`) VALUES (14, 102, 7, 1), (14, 102, 2, 2), (14, 102, 4, 3), @@ -3902,7 +3902,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (14, 122, 6, 5)"); // API array elements - Gold-Sponsor - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`, `network_type_id`, `network_api_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`,`network_type_id`,`network_api_index`,`sort`) VALUES (25, 222, 1, 1), (25, 222, 2, 2), (25, 222, 4, 3), @@ -3958,7 +3958,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (25, 231, 9, 7)"); // API array elements - homeADS - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`, `network_type_id`, `network_api_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`,`network_type_id`,`network_api_index`,`sort`) VALUES (28, 260, 1, 1), (28, 260, 2, 2), (28, 260, 3, 3), @@ -4054,7 +4054,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (28, 272, 5, 10)"); // API array elements - HPSponsor - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`, `network_type_id`, `network_api_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`,`network_type_id`,`network_api_index`,`sort`) VALUES (15, 135, 1, 1), (15, 135, 2, 2), (15, 135, 4, 3), @@ -4137,7 +4137,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (15, 144, 27, 8)"); // API array elements - Make-Euros.de - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`, `network_type_id`, `network_api_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`,`network_type_id`,`network_api_index`,`sort`) VALUES (16, 63, 7, 1), (16, 63, 2, 2), (16, 63, 3, 3), @@ -4235,7 +4235,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (16, 76, 9, 9)"); // API array elements - Mega-Ad - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`, `network_type_id`, `network_api_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`,`network_type_id`,`network_api_index`,`sort`) VALUES (17, 109, 1, 1), (17, 109, 2, 2), (17, 109, 4, 3), @@ -4291,7 +4291,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (17, 123, 6, 5)"); // API array elements - Power-Promo - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`, `network_type_id`, `network_api_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`,`network_type_id`,`network_api_index`,`sort`) VALUES (18, 78, 7, 1), (18, 78, 2, 2), (18, 78, 3, 3), @@ -4401,7 +4401,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (18, 92, 25, 10)"); // API array elements - SeCash - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`, `network_type_id`, `network_api_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`,`network_type_id`,`network_api_index`,`sort`) VALUES (19, 93, 1, 1), (19, 93, 2, 2), (19, 93, 4, 3), @@ -4457,7 +4457,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (19, 124, 6, 5)"); // API array elements - The Swizerland Ad Network - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`, `network_type_id`, `network_api_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`,`network_type_id`,`network_api_index`,`sort`) VALUES (20, 200, 6, 5), (20, 202, 1, 1), (20, 202, 2, 2), @@ -4540,7 +4540,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (20, 211, 27, 8)"); // API array elements - UltraPOMO - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`, `network_type_id`, `network_api_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`,`network_type_id`,`network_api_index`,`sort`) VALUES (21, 125, 1, 1), (21, 125, 2, 2), (21, 125, 4, 3), @@ -4596,7 +4596,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (21, 134, 6, 5)"); // API array elements - VIPads - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`, `network_type_id`, `network_api_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`,`network_type_id`,`network_api_index`,`sort`) VALUES (27, 247, 7, 1), (27, 247, 2, 2), (27, 247, 5, 3), @@ -4674,7 +4674,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (27, 259, 10, 6)"); // API array elements - Der Werbepartner.cc - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`, `network_type_id`, `network_api_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`,`network_type_id`,`network_api_index`,`sort`) VALUES (22, 145, 1, 1), (22, 145, 2, 2), (22, 145, 6, 3), @@ -4754,7 +4754,7 @@ UNIQUE `provider_type` (`network_id`, `network_type_id`)", (22, 155, 10, 7)"); // API array elements - Yoo!Media - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`, `network_type_id`, `network_api_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`,`network_type_id`,`network_api_index`,`sort`) VALUES (23, 156, 1, 1), (23, 156, 2, 2), (23, 156, 3, 3), diff --git a/inc/extensions/ext-newsletter.php b/inc/extensions/ext-newsletter.php index a6211df683..b2b84b52e1 100644 --- 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`), -UNIQUE `sponsor_nl_topic` (`nl_sponsor_id`, `nl_id`, `nl_topic_id`), +UNIQUE `sponsor_nl_topic` (`nl_sponsor_id`,`nl_id`,`nl_topic_id`), INDEX `topic` (`nl_topic_id`)", 'Newsletter orders'); diff --git a/inc/extensions/ext-online.php b/inc/extensions/ext-online.php index c1494a11a8..068e6ed419 100644 --- a/inc/extensions/ext-online.php +++ b/inc/extensions/ext-online.php @@ -65,7 +65,7 @@ switch (getExtensionMode()) { PRIMARY KEY (`id`), INDEX (`userid`), INDEX (`refid`), -INDEX `admin_member` (`is_admin`, `is_member`)", +INDEX `admin_member` (`is_admin`,`is_member`)", 'Who-is-where data'); addAdminMenuSql('misc','usr_online','Online-Statistik','Eine Liste von derzeit "Online" Usern. Doppelte Einträge könnte auf mangelnden Cookie-Support des Browsers oder auf einen Spider hindeuten.', 1); break; diff --git a/inc/extensions/ext-rallye.php b/inc/extensions/ext-rallye.php index 54842a0d8d..87d4aea7be 100644 --- a/inc/extensions/ext-rallye.php +++ b/inc/extensions/ext-rallye.php @@ -319,7 +319,7 @@ Zudem sollten Sie mindestens folgende Templates (in templates/".getLangu 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')"); + 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'); @@ -346,14 +346,14 @@ Zudem sollten Sie mindestens folgende Templates (in templates/".getLangu // Add more data on higher versions $ADD1 = ''; $ADD2 = ''; $OR = ''; if (isExtensionInstalledAndNewer('rallye', '0.2.0')) { - $ADD1 = ", `min_users`, `min_prices`"; + $ADD1 = ", `min_users`,`min_prices`"; $ADD2 = ", d.`min_users`, d.`min_prices`"; $OR = " OR (d.`min_users` <= " . $total . " AND d.`min_users` > 0)"; } // END - if // Check for new started but not notified rallyes $result = SQL_QUERY("SELECT SQL_SMALL_RESULT - `id`, `title`, `start_time`, `end_time`, `send_notify`" . $ADD1 . " + `id`,`title`,`start_time`,`end_time`,`send_notify`" . $ADD1 . " FROM `{?_MYSQL_PREFIX?}_rallye_data` WHERE diff --git a/inc/extensions/ext-refback.php b/inc/extensions/ext-refback.php index 8a46e266b7..4797cf2721 100644 --- a/inc/extensions/ext-refback.php +++ b/inc/extensions/ext-refback.php @@ -90,7 +90,7 @@ switch (getExtensionMode()) { 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')"); + 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'); diff --git a/inc/extensions/ext-register.php b/inc/extensions/ext-register.php index 5dbc85aaa2..6a42dd8157 100644 --- a/inc/extensions/ext-register.php +++ b/inc/extensions/ext-register.php @@ -84,12 +84,12 @@ PRIMARY KEY (`id`)", 'Data which fields the user must fill out'); // Add all entries as required (DO NOT DELETE THEM FROM DATABASE!) - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_must_register` (`field_name`, `field_required`) VALUES ('surname','Y')"); - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_must_register` (`field_name`, `field_required`) VALUES ('family','Y')"); - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_must_register` (`field_name`, `field_required`) VALUES ('street_nr','Y')"); - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_must_register` (`field_name`, `field_required`) VALUES ('cntry','Y')"); - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_must_register` (`field_name`, `field_required`) VALUES ('zip','Y')"); - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_must_register` (`field_name`, `field_required`) VALUES ('city','Y')"); + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_must_register` (`field_name`,`field_required`) VALUES ('surname','Y')"); + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_must_register` (`field_name`,`field_required`) VALUES ('family','Y')"); + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_must_register` (`field_name`,`field_required`) VALUES ('street_nr','Y')"); + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_must_register` (`field_name`,`field_required`) VALUES ('cntry','Y')"); + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_must_register` (`field_name`,`field_required`) VALUES ('zip','Y')"); + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_must_register` (`field_name`,`field_required`) VALUES ('city','Y')"); // Add admin menu addAdminMenuSql('setup','config_register','Pflichtfelder','Stellen Sie hier die Pflichtfelder sowohl im Anmeldeformular, als auch im Mitgliedsbereich unter Profildaten ändern ein.', 12); @@ -321,10 +321,10 @@ PRIMARY KEY (`id`)", registerFilter('register_must_fillout', 'REGISTER_MUST_FILLOUT', false, true, isExtensionDryRun()); // Run these SQLs - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_must_register` (`field_name`, `field_required`) VALUES ('gender','Y')"); - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_must_register` (`field_name`, `field_required`) VALUES ('email','Y')"); - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_must_register` (`field_name`, `field_required`) VALUES ('birthday','Y')"); - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_must_register` (`field_name`, `field_required`) VALUES ('marker','Y')"); + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_must_register` (`field_name`,`field_required`) VALUES ('gender','Y')"); + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_must_register` (`field_name`,`field_required`) VALUES ('email','Y')"); + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_must_register` (`field_name`,`field_required`) VALUES ('birthday','Y')"); + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_must_register` (`field_name`,`field_required`) VALUES ('marker','Y')"); // Update notes (these will be set as task text!) setExtensionUpdateNotes("Filter register_must_fillout hinzugefügt, weitere Felder in {?_MYSQL_PREFIX?}_must_register eingefügt."); @@ -345,7 +345,7 @@ PRIMARY KEY (`id`)", 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')"); + 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'); diff --git a/inc/extensions/ext-sponsor.php b/inc/extensions/ext-sponsor.php index 9508e428af..f10ab2ca23 100644 --- 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`), -UNIQUE `action_what` (`action`, `what`), +UNIQUE `action_what` (`action`,`what`), UNIQUE (`what`), INDEX (`action`)", 'Sponsor menu'); @@ -267,46 +267,46 @@ INDEX (`sponsor_id`)", // // Default allowed data to display // - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`, `display`) VALUES ('id','N')"); - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`, `display`) VALUES ('company','Y')"); - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`, `display`) VALUES ('position','N')"); - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`, `display`) VALUES ('tax_ident','N')"); - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`, `display`) VALUES ('gender','N')"); - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`, `display`) VALUES ('surname','N')"); - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`, `display`) VALUES ('family','N')"); - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`, `display`) VALUES ('street_nr1','Y')"); - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`, `display`) VALUES ('street_nr2','Y')"); - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`, `display`) VALUES ('zip','Y')"); - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`, `display`) VALUES ('city','Y')"); - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`, `display`) VALUES ('country','Y')"); - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`, `display`) VALUES ('phone','Y')"); - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`, `display`) VALUES ('fax','Y')"); - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`, `display`) VALUES ('email','Y')"); - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`, `display`) VALUES ('url','N')"); - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`, `display`) VALUES ('password','N')"); - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`, `display`) VALUES ('remote_addr','N')"); - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`, `display`) VALUES ('sponsor_created','N')"); - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`, `display`) VALUES ('last_online','N')"); - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`, `display`) VALUES ('last_change','N')"); - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`, `display`) VALUES ('status','N')"); - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`, `display`) VALUES ('receive_warnings','N')"); - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`, `display`) VALUES ('warning_interval','N')"); - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`, `display`) VALUES ('points_amount','N')"); - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`, `display`) VALUES ('points_used','N')"); - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`, `display`) VALUES ('refid','N')"); - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`, `display`) VALUES ('ref_count','N')"); - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`, `display`) VALUES ('hash','N')"); - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`, `display`) VALUES ('last_payment','N')"); - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`, `display`) VALUES ('last_currency','N')"); + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`,`display`) VALUES ('id','N')"); + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`,`display`) VALUES ('company','Y')"); + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`,`display`) VALUES ('position','N')"); + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`,`display`) VALUES ('tax_ident','N')"); + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`,`display`) VALUES ('gender','N')"); + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`,`display`) VALUES ('surname','N')"); + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`,`display`) VALUES ('family','N')"); + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`,`display`) VALUES ('street_nr1','Y')"); + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`,`display`) VALUES ('street_nr2','Y')"); + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`,`display`) VALUES ('zip','Y')"); + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`,`display`) VALUES ('city','Y')"); + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`,`display`) VALUES ('country','Y')"); + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`,`display`) VALUES ('phone','Y')"); + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`,`display`) VALUES ('fax','Y')"); + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`,`display`) VALUES ('email','Y')"); + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`,`display`) VALUES ('url','N')"); + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`,`display`) VALUES ('password','N')"); + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`,`display`) VALUES ('remote_addr','N')"); + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`,`display`) VALUES ('sponsor_created','N')"); + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`,`display`) VALUES ('last_online','N')"); + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`,`display`) VALUES ('last_change','N')"); + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`,`display`) VALUES ('status','N')"); + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`,`display`) VALUES ('receive_warnings','N')"); + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`,`display`) VALUES ('warning_interval','N')"); + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`,`display`) VALUES ('points_amount','N')"); + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`,`display`) VALUES ('points_used','N')"); + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`,`display`) VALUES ('refid','N')"); + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`,`display`) VALUES ('ref_count','N')"); + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`,`display`) VALUES ('hash','N')"); + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`,`display`) VALUES ('last_payment','N')"); + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`,`display`) VALUES ('last_currency','N')"); // // Add default entries // - 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_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, '€')"); // // Admin menu // @@ -402,6 +402,7 @@ INDEX (`sponsor_id`)", addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `action`='sponsor' OR `what` IN('repr_sponsor','sponsor_medit','sponsor_madd')"); addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_guest_menu` WHERE `action`='sponsor'"); addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE `what` IN('sponsor_list','sponsor_reg')"); + addExtensionSql("DELETE LOW_PRIRITY FROM `{?_MYSQL_PREFIX?}_mod_reg` WHERE `module` IN ('sponsor','sponsor_confirm','sponsor_ref') LIMIT 3"); break; case 'activate': // Do stuff when admin activates this extension diff --git a/inc/extensions/ext-sql_patches.php b/inc/extensions/ext-sql_patches.php index 756e873e5b..9cc919db5d 100644 --- 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 -setThisExtensionVersion('0.8.2'); +setThisExtensionVersion('0.8.3'); // 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', '0.8.2')); +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', '0.8.3')); // Keep this extension always active! setExtensionAlwaysActive('Y'); @@ -552,7 +552,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`'); - 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."); @@ -834,13 +834,20 @@ INDEX (`subject`)", 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')"); + 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; + + case '0.8.3': // SQL queries for v0.8.3 + addConfigAddSql('display_home_in_index', "ENUM('Y','N') NOT NULL DEFAULT 'N'"); + + // Update notes (these will be set as task text!) + setExtensionUpdateNotes("Es kann nun die "Home"-Seite in index.php angezeigt werden, anstelle der Weiterleitung."); + break; } // END - switch break; diff --git a/inc/extensions/ext-surfbar.php b/inc/extensions/ext-surfbar.php index 199fcef0cd..1a40e0ea4e 100644 --- a/inc/extensions/ext-surfbar.php +++ b/inc/extensions/ext-surfbar.php @@ -6,9 +6,9 @@ * -------------------------------------------------------------------- * * File : ext-surfbar.php * * -------------------------------------------------------------------- * - * Short description : A surfbar for your members * + * Short description : A visitor add-on for your members * * -------------------------------------------------------------------- * - * Kurzbeschreibung : Eine Surfbar fuer Ihre Mitglieder * + * Kurzbeschreibung : Ein Besuchertausch fuer Ihre Mitglieder * * -------------------------------------------------------------------- * * $Revision:: $ * * $Date:: $ * @@ -68,9 +68,9 @@ switch (getExtensionMode()) { `url_reject_reason` VARCHAR(255) NOT NULL DEFAULT '', `url_fixed_reload` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, PRIMARY KEY (`url_id`), -UNIQUE `userid_url` (`url_userid`, `url`), -INDEX `status_userid` (`url_status`, `url_userid`)", - 'Surfbar URLs'); +UNIQUE `userid_url` (`url_userid`,`url`), +INDEX `status_userid` (`url_status`,`url_userid`)", + 'Visitor add-on URLs'); // Reload locks addDropTableSql('surfbar_locks'); @@ -80,11 +80,11 @@ 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`), -UNIQUE `userid_url` (`locks_userid`, `locks_url_id`), +UNIQUE `userid_url` (`locks_userid`,`locks_url_id`), INDEX (`locks_url_id`)", - 'Surfbar reload locks'); + 'Vistor-addon reload locks'); - // Surfbar salts + // Visitor add-on salts addDropTableSql('surfbar_salts'); addCreateTableSql('surfbar_salts', " `salts_id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT, @@ -92,9 +92,9 @@ 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`), -UNIQUE `salts_userid_url` (`salts_userid`, `salts_url_id`), +UNIQUE `salts_userid_url` (`salts_userid`,`salts_url_id`), INDEX (`salts_url_id`)", - 'Surfbar last used salts'); + 'Visitor add-on last used salts'); // Statistics addDropTableSql('surfbar_stats'); @@ -105,9 +105,9 @@ 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`), -UNIQUE `userid_url` (`stats_userid`, `stats_url_id`), +UNIQUE `userid_url` (`stats_userid`,`stats_url_id`), INDEX (`stats_url_id`)", - 'Surfbar Statistics'); + 'Visitor add-on Statistics'); // Member actions pending on status addDropTableSql('surfbar_actions'); @@ -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`), -UNIQUE `status_action` (`actions_status`, `actions_action`)", - 'Surfbar Member Actions'); +UNIQUE `status_action` (`actions_status`,`actions_action`)", + 'Visitor add-on 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'"); @@ -178,18 +178,18 @@ UNIQUE `status_action` (`actions_status`, `actions_action`)", addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_user_data` ADD `surfbar_low_notified` TIMESTAMP NOT NULL DEFAULT '0000-00-00 00:00:00'"); // Member menus - addMemberMenuSql('surfbar', NULL, 'Surfbar', 4); - addMemberMenuSql('surfbar', 'start_surfbar', 'Surfbar starten', 1); + addMemberMenuSql('surfbar', NULL, 'Besuchertausch', 4); + addMemberMenuSql('surfbar', 'start_surfbar', 'Besuchertausch starten', 1); addMemberMenuSql('surfbar', 'book_surfbar', 'Seite buchen', 2); addMemberMenuSql('surfbar', 'list_surfbar', 'Seiten-Management', 3); addMemberMenuSql('surfbar', 'stats_surfbar', 'Seiten-Statistik', 4); // Admin menus - addAdminMenuSql('surfbar', NULL, 'Surfbar', 'URLs in der Surfbar verwalten, Einstellungen ändern und vieles mehr.', 7); - addAdminMenuSql('surfbar', 'add_surfbar_url', 'URL hinzufügen', 'Fügen Sie URLs z.B. von Werbenetzwerken hinzu, oder Ihre eigenen Projekte. Vorsicht! Ihnen muss es auch gestattet sein, URLs aus dem Werbenetzwerk in die Surfbar einzufügen.', 1); - addAdminMenuSql('surfbar', 'list_surfbar_urls', 'URLs verwalten', 'Verwalten Sie hier alle in der Surfbar befindlichen URLs mit nur wenigen Klicks.', 2); - addAdminMenuSql('surfbar', 'unlock_surfbar_urls', 'Wartende URLs freigeben', 'Geben Sie hier nur direkt in der Surfbar gebuchte URLs frei.', 3); - addAdminMenuSql('surfbar', 'config_surfbar', 'Einstellungen', 'Einstellungen an der Surfbar ändern, wie Festvergütung, prozentuale Ref-Vergütung und vieles mehr.', 4); + addAdminMenuSql('surfbar', NULL, 'Besuchertausch', 'URLs im Besuchertausch verwalten, Einstellungen ändern und vieles mehr.', 7); + addAdminMenuSql('surfbar', 'add_surfbar_url', 'URL hinzufügen', 'Fügen Sie URLs z.B. von Werbenetzwerken hinzu, oder Ihre eigenen Projekte. Vorsicht! Ihnen muss es auch gestattet sein, URLs aus dem Werbenetzwerk im Besuchertausch einzufügen.', 1); + addAdminMenuSql('surfbar', 'list_surfbar_urls', 'URLs verwalten', 'Verwalten Sie hier alle im Besuchertausch befindlichen URLs mit nur wenigen Klicks.', 2); + addAdminMenuSql('surfbar', 'unlock_surfbar_urls', 'Wartende URLs freigeben', 'Geben Sie hier für den Besuchertausch gebuchte URLs frei.', 3); + addAdminMenuSql('surfbar', 'config_surfbar', 'Einstellungen', 'Einstellungen am Besuchertausch ändern, wie Festvergütung, prozentuale Ref-Vergütung und vieles mehr.', 4); addAdminMenuSql('surfbar', 'surfbar_stats', 'Statistiken', 'Detailierte Statistiken zu einer ausgewählten URL anzeigen.', 5); addAdminMenuSql('surfbar', 'list_surfbar_actions', 'Mitgliederaktionen', 'Listet alle Mitgliederaktionen auf.', 6); @@ -197,7 +197,7 @@ UNIQUE `status_action` (`actions_status`, `actions_action`)", 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')"); + 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'); diff --git a/inc/extensions/ext-teams.php b/inc/extensions/ext-teams.php new file mode 100644 index 0000000000..d7c9a892b4 --- /dev/null +++ b/inc/extensions/ext-teams.php @@ -0,0 +1,101 @@ + diff --git a/inc/extensions/ext-transfer.php b/inc/extensions/ext-transfer.php index 875901f0b6..b395c513bf 100644 --- a/inc/extensions/ext-transfer.php +++ b/inc/extensions/ext-transfer.php @@ -227,9 +227,9 @@ INDEX (`to_userid`)", break; case '0.2.3': // SQL queries for v0.2.3 - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu_las` (`la_id`, `la_action`, `la_what`) VALUES ('member', '', 'list_transfer')"); - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu_las` (`la_id`, `la_action`, `la_what`) VALUES ('member', '', 'del_transfer')"); - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu_las` (`la_id`, `la_action`, `la_what`) VALUES ('config', '', 'config_transfer')"); + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu_las` (`la_id`,`la_action`,`la_what`) VALUES ('member', '', 'list_transfer')"); + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu_las` (`la_id`,`la_action`,`la_what`) VALUES ('member', '', 'del_transfer')"); + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu_las` (`la_id`,`la_action`,`la_what`) VALUES ('config', '', 'config_transfer')"); // Depends on ext-sql_patches (or you have to execute these both SQL statements by phpMyAdmin addExtensionDependency('sql_patches'); @@ -271,7 +271,7 @@ INDEX (`to_userid`)", 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')"); + 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'); diff --git a/inc/extensions/ext-user.php b/inc/extensions/ext-user.php index 02fb15ab4f..e6e06e413d 100644 --- 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`), -INDEX `status_mails` (`status`, `max_mails`)", +INDEX `status_mails` (`status`,`max_mails`)", 'Main user data'); addDropTableSql('user_points'); @@ -372,7 +372,7 @@ INDEX (`userid`)", case '0.3.6': // SQL queries for v0.3.6 addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_user_cats` DROP INDEX `userid`'); - addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_user_cats` ADD UNIQUE `userid_catid` ( `userid` , `cat_id` )'); + addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_user_cats` ADD UNIQUE `userid_catid` (`userid` , `cat_id`)'); // Update notes (these will be set as task text!) setExtensionUpdateNotes("Der Sperrgrund wird nun mit abgespeichert und beim Löschen des Users mit ausgesendet."); @@ -464,7 +464,7 @@ INDEX (`userid`)", `level` smallINT(6) UNSIGNED NOT NULL DEFAULT 0, `refid` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, PRIMARY KEY (`id`), -UNIQUE `user_refid` (`userid`, `level`, `refid`), +UNIQUE `user_refid` (`userid`,`level`,`refid`), INDEX (`level`), INDEX (`refid`)", 'User referals'); diff --git a/inc/extensions/ext-wernis.php b/inc/extensions/ext-wernis.php index c0cde98b9a..96605d0c80 100644 --- a/inc/extensions/ext-wernis.php +++ b/inc/extensions/ext-wernis.php @@ -136,7 +136,7 @@ INDEX (`userid`)", 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')"); + 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'); diff --git a/inc/extensions/ext-yacy.php b/inc/extensions/ext-yacy.php index ce13dffc94..1a2edd785f 100644 --- a/inc/extensions/ext-yacy.php +++ b/inc/extensions/ext-yacy.php @@ -59,6 +59,7 @@ switch (getExtensionMode()) { case 'remove': // Do stuff when removing extension // SQL commands to run + //addExtensionSql("DELETE LOW_PRIRITY FROM `{?_MYSQL_PREFIX?}_mod_reg` WHERE `module`='foo' LIMIT 1"); break; case 'activate': // Do stuff when admin activates this extension diff --git a/inc/extensions/ext-yoomedia.php b/inc/extensions/ext-yoomedia.php index a1ae4ba2e2..7e52a3bb00 100644 --- 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`), -UNIQUE `y_type` (`type`, `y_id`)", +UNIQUE `y_type` (`type`,`y_id`)", 'Reload lock reminder for Yoo!Media campaigns'); break; diff --git a/inc/filter-functions.php b/inc/filter-functions.php index be4d7d1fd5..bbcdb3711e 100644 --- a/inc/filter-functions.php +++ b/inc/filter-functions.php @@ -64,7 +64,7 @@ function initFilterSystem () { // 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 @@ -126,6 +126,7 @@ ORDER BY // 'You are here' navigation - post filter registerFilter('post_youhere_line', 'CALL_HANDLER_LOGIN_FAILTURES'); + registerFilter('post_youhere_line', 'HANDLE_HOME_IN_INDEX_SETTING'); // Filters for pre-extension-registration registerFilter('pre_extension_installed', 'RUN_SQLS'); @@ -259,7 +260,7 @@ function unregisterFilter ($F, $L, $filterName, $filterFunction, $force = false, } // "Runs" the given filters, filterData is optional and can be any type of data -function runFilterChain ($filterName, $filterData = null) { +function runFilterChain ($filterName, $filterData = NULL) { //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'filterName=' . $filterName . ',filterData[]=' . gettype($filterData) . ' - ENTERED!'); // Is that filter chain there? diff --git a/inc/filter/admins_filter.php b/inc/filter/admins_filter.php index d38acb9af7..2a46f82d61 100644 --- a/inc/filter/admins_filter.php +++ b/inc/filter/admins_filter.php @@ -47,7 +47,7 @@ function FILTER_ADD_EXTRA_SQL_DATA ($add = '') { if (isExtensionInstalledAndNewer('admins', '0.3.0')) $add .= ', `default_acl` AS def_acl'; if (isExtensionInstalledAndNewer('admins', '0.6.7')) $add .= ', `la_mode`'; if (isExtensionInstalledAndNewer('admins', '0.7.2')) $add .= ', `login_failures`, UNIX_TIMESTAMP(`last_failure`) AS last_failure'; - if (isExtensionInstalledAndNewer('admins', '0.7.3')) $add .= ', `expert_settings`, `expert_warning`'; + if (isExtensionInstalledAndNewer('admins', '0.7.3')) $add .= ', `expert_settings`,`expert_warning`'; // Return it //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!'); @@ -64,7 +64,7 @@ function FILTER_RESET_ADMINS_LOGIN_FAILURES ($filterData) { // Prepare update data $postData['login'][getCurrentAdminId()] = $filterData['login']; $postData['login_failures'][getCurrentAdminId()] = '0'; - $postData['last_failure'][getCurrentAdminId()] = null; + $postData['last_failure'][getCurrentAdminId()] = NULL; // Change it in the admin adminsChangeAdminAccount($postData); diff --git a/inc/filter/bonus_filter.php b/inc/filter/bonus_filter.php index 33c1290338..4520937f45 100644 --- a/inc/filter/bonus_filter.php +++ b/inc/filter/bonus_filter.php @@ -51,7 +51,7 @@ function FILTER_ADD_LOGIN_BONUS ($filterData) { // Bonus is not given by default ;-) $bonus = false; - if ((isExtensionInstalledAndNewer('sql_patches', '0.2.8')) && (isBonusRallyeActive()) && (getConfig('bonus_login_yn') == 'Y')) { + if ((isExtensionInstalledAndNewer('sql_patches', '0.2.8')) && (isBonusRallyeActive()) && (getConfig('include_bonus_login') == 'Y')) { // Update last login if far enougth away // @TODO This query isn't right, it will only update if the user was for a longer time away! SQL_QUERY_ESC('UPDATE @@ -98,5 +98,24 @@ function FILTER_GENERATE_BONUS_MAIL_LINKS ($filterData) { return $filterData; } +// Filter for adding bonus columns with a plus (+) sign +function FILTER_ADD_BONUS_POINTS_USER_COLUMNS ($add = '') { + // Skip out-dated extension, because this causes an error + if (isExtensionInstalledAndOlder('bonus', '0.9.7')) { + // Skip this silently + return $add; + } // END - if + + // Add more columns only when the corresponding configuration is enabled, too + if (getConfig('include_bonus_click') == 'Y') $add .= ' + `turbo_bonus`'; + if (getConfig('include_bonus_login') == 'Y') $add .= ' + `login_bonus`'; + if (getConfig('include_bonus_order') == 'Y') $add .= ' + `bonus_order`'; + if (getConfig('include_bonus_stats') == 'Y') $add .= ' + `bonus_stats`'; + if (getConfig('include_bonus_ref') == 'Y') $add .= ' + `bonus_ref`'; + + // Return $add + return $add; +} + // [EOF] ?> diff --git a/inc/filter/forced_filter.php b/inc/filter/forced_filter.php new file mode 100644 index 0000000000..4076911375 --- /dev/null +++ b/inc/filter/forced_filter.php @@ -0,0 +1,65 @@ + 'BANNER', + ); + + // Forced-Textlinks + $data[] = array( + 'type' => 'TEXTLINK', + ); + + // Forced-Popups + $data[] = array( + 'type' => 'POPUP', + ); + + // Return data + return $data; +} + +// [EOF] +?> diff --git a/inc/filter/online_filter.php b/inc/filter/online_filter.php index 9c4855ab18..710e76d921 100644 --- a/inc/filter/online_filter.php +++ b/inc/filter/online_filter.php @@ -102,7 +102,7 @@ LIMIT 1", ), __FUNCTION__, __LINE__); } else { // No entry does exists so we simply add it! - SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_online` (`module`, `action`, `what`, `userid`, `refid`, `is_member`, `is_admin`, `timestamp`, `sid`, `ip`) VALUES ('%s','%s','%s', %s, %s, '%s','%s', UNIX_TIMESTAMP(), '%s','%s')", + SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_online` (`module`,`action`,`what`,`userid`,`refid`,`is_member`,`is_admin`,`timestamp`,`sid`,`ip`) VALUES ('%s','%s','%s', %s, %s, '%s','%s', UNIX_TIMESTAMP(), '%s','%s')", array( getModule(), $action, diff --git a/inc/filter/register_filter.php b/inc/filter/register_filter.php index 61af1b755e..7bd56bc650 100644 --- a/inc/filter/register_filter.php +++ b/inc/filter/register_filter.php @@ -44,7 +44,7 @@ if (!defined('__SECURITY')) { function FILTER_REGISTER_MUST_FILLOUT ($content) { // Get all fields for output //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!'); - $result = SQL_QUERY('SELECT `field_name`, `field_required` FROM `{?_MYSQL_PREFIX?}_must_register` ORDER BY `id` ASC', + $result = SQL_QUERY('SELECT `field_name`,`field_required` FROM `{?_MYSQL_PREFIX?}_must_register` ORDER BY `id` ASC', __FUNCTION__, __LINE__); // Walk through all entries diff --git a/inc/filters.php b/inc/filters.php index 34574e46a5..2b241f52d6 100644 --- a/inc/filters.php +++ b/inc/filters.php @@ -70,7 +70,7 @@ function FILTER_FLUSH_FILTERS () { $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 @@ -487,7 +487,7 @@ function FILTER_COMPILE_EXPRESSION_CODE ($code) { $callback = ''; $extraFunction = ''; $extraFunction2 = ''; - $value = null; + $value = NULL; // Extract command and call-back $cmdArray = explode(',', $cmd); @@ -842,9 +842,11 @@ function FILTER_INIT_RANDOM_NUMBER () { // Update module counter function FILTER_COUNT_MODULE () { + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'getModule()=' . getModule() . ' - ENTERED!'); // Do count all other modules but not accesses on CSS file css.php! SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `clicks`=`clicks`+1 WHERE `module`='%s' LIMIT 1", array(getModule()), __FUNCTION__, __LINE__); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'getModule()=' . getModule() . ',SQL_AFFECTEDROWS()=' . SQL_AFFECTEDROWS() . ' - EXIT!'); } // Handles fatal errors @@ -861,10 +863,7 @@ function FILTER_HANDLE_FATAL_ERRORS () { // Load config here loadIncludeOnce('inc/load_config.php'); - // Set unset variable - if (empty($check)) $check = ''; - - // Default is none + // Default content is none $content = ''; // Installation phase or regular mode? @@ -905,9 +904,9 @@ function FILTER_HANDLE_FATAL_ERRORS () { // Message to regular users (non-admin) $CORR = '{--FATAL_REPORT_ERRORS--}'; - // PHP warnings fixed - if ($check == 'done') { - if (isAdmin()) $CORR = '{--FATAL_CORRECT_ERRORS--}'; + // Maybe the admin wants to take a look? + if (isAdmin()) { + $CORR = '{--FATAL_CORRECT_ERRORS--}'; } // END - if // Remember all in array @@ -1128,5 +1127,20 @@ function FILTER_ACTIVATE_EXCHANGE () { } // END - if } +// Filter to handle configuration +function FILTER_HANDLE_HOME_IN_INDEX_SETTING ($data) { + // Is ext-sql_patches up-to-date? + if ((isExtensionInstalledAndNewer('sql_patches', '0.8.3')) && (isDisplayHomeInIndexEnabled())) { + // Is 'search' as same as 'index_home'? + if ($data['search'] == getIndexHome()) { + // Then set 'content' to link to index.php + $data['content'] = $data['prefix'] . '' . getTitleFromMenu($data['access_level'], $data['search'], $data['type'], $data['add']) . ''; + } // END - if + } // END - if + + // Return data + return $data; +} + // [EOF] ?> diff --git a/inc/fix_filters.php b/inc/fix_filters.php index 36be53b5a8..9209cbfaeb 100644 --- a/inc/fix_filters.php +++ b/inc/fix_filters.php @@ -42,7 +42,7 @@ if (!defined('__SECURITY')) { // Get all filters $result = SQL_QUERY('SELECT - `filter_name`, `filter_function` + `filter_name`,`filter_function` FROM `{?_MYSQL_PREFIX?}_filters` ORDER BY diff --git a/inc/fix_menu.php b/inc/fix_menu.php index 2f35edd2a1..8c11938614 100644 --- a/inc/fix_menu.php +++ b/inc/fix_menu.php @@ -43,7 +43,7 @@ if (!defined('__SECURITY')) { // Get all menus foreach (array('guest','member','admin') as $menu) { // Query it - $result = SQL_QUERY_ESC("SELECT `action`, `what` FROM `{?_MYSQL_PREFIX?}_%s_menu` ORDER BY `action` ASC, `what` ASC", + $result = SQL_QUERY_ESC("SELECT `action`,`what` FROM `{?_MYSQL_PREFIX?}_%s_menu` ORDER BY `action` ASC, `what` ASC", array($menu), __FILE__, __LINE__); // Init array diff --git a/inc/fix_refsystem.php b/inc/fix_refsystem.php index 8608d51d73..122d216ee4 100644 --- a/inc/fix_refsystem.php +++ b/inc/fix_refsystem.php @@ -40,17 +40,17 @@ if (!defined('__SECURITY')) { die(); } // END - if -// Sanity-check: Do we have ref level 0? -$result = SQL_QUERY('SELECT `id` FROM `{?_MYSQL_PREFIX?}_refsystem` WHERE `level`=0 OR `level` IS NULL', __FILE__, __LINE__); +// Sanity-check: Do we have ref level 0? If so, this must be fixed to NULL and `level` must be increased by one +$result = SQL_QUERY('SELECT `id` FROM `{?_MYSQL_PREFIX?}_refsystem` WHERE `level`=0', __FILE__, __LINE__); if (!SQL_HASZERONUMS($result)) { // Remove index temporaly SQL_ALTER_TABLE('ALTER TABLE `{?_MYSQL_PREFIX?}_refsystem` DROP INDEX `userid_level`', __FILE__, __LINE__); - // Upgrade refsystem, ref-level 0 is silly here + // Upgrade refsystem 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'); diff --git a/inc/fix_user_points.php b/inc/fix_user_points.php index 0d8dd917c2..d17e02515b 100644 --- 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 - 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'], diff --git a/inc/functions.php b/inc/functions.php index 610067aa8b..e65600e13e 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -594,26 +594,26 @@ function redirectToUrl ($url, $allowSpider = true) { * * ************************************************************************/ function array_pk_sort (&$array, $a_sort, $primary_key = '0', $order = -1, $nums = false) { - $dummy = $array; + $temporaryArray = $array; while ($primary_key < count($a_sort)) { - foreach ($dummy[$a_sort[$primary_key]] as $key => $value) { - foreach ($dummy[$a_sort[$primary_key]] as $key2 => $value2) { + foreach ($temporaryArray[$a_sort[$primary_key]] as $key => $value) { + foreach ($temporaryArray[$a_sort[$primary_key]] as $key2 => $value2) { $match = false; if ($nums === false) { // Sort byte-by-byte (also numbers will be interpreted as chars! E.g.: "9" > "10") - if (($key != $key2) && (strcmp(strtolower($dummy[$a_sort[$primary_key]][$key]), strtolower($dummy[$a_sort[$primary_key]][$key2])) == $order)) $match = true; + if (($key != $key2) && (strcmp(strtolower($temporaryArray[$a_sort[$primary_key]][$key]), strtolower($temporaryArray[$a_sort[$primary_key]][$key2])) == $order)) $match = true; } elseif ($key != $key2) { // Sort numbers (E.g.: 9 < 10) - if (($dummy[$a_sort[$primary_key]][$key] < $dummy[$a_sort[$primary_key]][$key2]) && ($order == -1)) $match = true; - if (($dummy[$a_sort[$primary_key]][$key] > $dummy[$a_sort[$primary_key]][$key2]) && ($order == 1)) $match = true; + if (($temporaryArray[$a_sort[$primary_key]][$key] < $temporaryArray[$a_sort[$primary_key]][$key2]) && ($order == -1)) $match = true; + if (($temporaryArray[$a_sort[$primary_key]][$key] > $temporaryArray[$a_sort[$primary_key]][$key2]) && ($order == 1)) $match = true; } if ($match) { // We have found two different values, so let's sort whole array - foreach ($dummy as $sort_key => $sort_val) { - $t = $dummy[$sort_key][$key]; - $dummy[$sort_key][$key] = $dummy[$sort_key][$key2]; - $dummy[$sort_key][$key2] = $t; + foreach ($temporaryArray as $sort_key => $sort_val) { + $t = $temporaryArray[$sort_key][$key]; + $temporaryArray[$sort_key][$key] = $temporaryArray[$sort_key][$key2]; + $temporaryArray[$sort_key][$key2] = $t; unset($t); } // END - foreach } // END - if @@ -625,7 +625,7 @@ function array_pk_sort (&$array, $a_sort, $primary_key = '0', $order = -1, $nums } // END - while // Write back sorted array - $array = $dummy; + $array = $temporaryArray; } @@ -1453,6 +1453,7 @@ function handleExtraValues ($filterFunction, $value, $extraValue) { // Call the multi-parameter call-back $ret = call_user_func_array($filterFunction, $args); + die('filterFunction='.$filterFunction.',args=
'.print_r($args,true).',ret=
'.print_r($ret,true).'
');
 			} else {
 				// One parameter call
 				$ret = call_user_func($filterFunction, $value);
@@ -2251,7 +2252,7 @@ function generateAdminMailLinks ($mailType, $mailId) {
 	// Is the mail type supported?
 	if (!empty($table)) {
 		// Query for the mail
-		$result = SQL_QUERY_ESC("SELECT `id`, `%s` AS `mail_status` FROM `{?_MYSQL_PREFIX?}_%s` WHERE `id`=%s LIMIT 1",
+		$result = SQL_QUERY_ESC("SELECT `id`,`%s` AS `mail_status` FROM `{?_MYSQL_PREFIX?}_%s` WHERE `id`=%s LIMIT 1",
 			array(
 				$statusColumn,
 				$table,
diff --git a/inc/language/beg_de.php b/inc/language/beg_de.php
index 748598e431..f182631dcd 100644
--- a/inc/language/beg_de.php
+++ b/inc/language/beg_de.php
@@ -118,7 +118,7 @@ addMessages(array(
 	'BEG_LINK_HERE' => "Betteln Sie am Besten gleich los! Hier ist der Link dazu.",
 	'ADMIN_CONFIG_BEG_RANKS' => "Anzahl Gewinner der Bettel-Rallye",
 	'BEG_MONTHLY_RALLYE' => "GEWONNEN: Monatliche Bettel-Rallye",
-	'BEG_RALLYE_NO_ONE_JOINED' => "Niemand nimmt an der Bettel-Rallye dran teil, oder sie ist administrativ deaktiviert worden.",
+	'BEG_RALLYE_NO_ONE_JOINED' => "Niemand nimmt an der Bettel-Rallye dran teil, oder sie ist administrativ deaktiviert worden Fangen Sie doch an, betteln Sie doch etwas . . .",
 	'ADMIN_BEG_RALLYE_DEACTIVATED' => "Bettel-Rallye nicht aktiviert.",
 	'ADMIN_CONFIG_BEG_RALLYE_NOTIFICATIONS_TITLE' => "Benachrichtungen per Mail zur Bettel-Rallye",
 	'ADMIN_CONFIG_BEG_RALLYE_ENABLE_NOTIFY' => "Benachtigen, wenn Bettel-Rallye aktiviert wurde?",
diff --git a/inc/language/de.php b/inc/language/de.php
index fd28a58d09..17f6a4b657 100644
--- a/inc/language/de.php
+++ b/inc/language/de.php
@@ -773,12 +773,17 @@ addMessages(array(
 	'ADMIN_CONFIG_HOME_SETTINGS_TITLE' => "Einstellungen an Eingangsseite",
 	'ADMIN_CONFIG_HOME_SETTINGS' => "Einstellungen an der Eingangsseite",
 	'ADMIN_CONFIG_HOME_MAIN_TITLE' => "Einstellungen an der Home-Seite",
-	'ADMIN_CONFIG_INDEX_DELAY' => "Verzögerung bevor weitergeleitet wird",
+	'ADMIN_CONFIG_INDEX_DELAY' => "Verzögerung bevor weitergeleitet wird:",
+	'ADMIN_CONFIG_INDEX_DISPLAY_HOME_IN_INDEX' => "Soll die ausgewählte Home-Seite {?index_home?} in index.php gezeigt werden, anstelle des Templates index.tpl?",
 	'ADMIN_INDEX_MANUAL_FORWARD' => "Klicken leitet weiter (kein JavaScript)",
 	'ADMIN_INDEX_NO_DELAY' => "Sofort weiterleiten (302 Server-Redirect)",
 	'ADMIN_CONTINUE_TO_CONFIG' => "Weiter zu den Einstellungen",
 	'ADMIN_CONFIG_INDEX_COOKIE' => "Wie lange soll der Besucher die Eingangsseite nicht mehr sehen?",
+	'ADMIN_CONFIG_ENTRY_MISSING' => "Konnte den Konfigurationseintrag %s nicht finden. Muss eventuell ein Erweitertungsupdate noch ausgeführt oder eine fehlende Erweiterung installiert werden?",
+	'ADMIN_ENTRY_ADDED' => "Der Eintrag wurde der Datenbank hinzugefügt.",
+	'ADMIN_ENTRY_NOT_ADDED' => "Der Eintrag wurde der Datenbank NICHT hinzugefügt.",
 	'BONUS_EXTENSION_UPGRADE' => "Bitte aktualisieren Sie Ihre Bonus-Erweiterung auf Version v0.2.2 oder neuer.",
+	'WHAT_IS_OVERVIEW' => "Willkommen",
 	'_ON' => "an",
 	'MEMBER_CLICK_STATISTICS' => "Mail-Statistik",
 	'ADMIN_CONFIG_SELECT_DEFAULT_REFID' => "Standard Referal-Id bei Anmeldung über keinen Ref-Link",
@@ -1161,6 +1166,7 @@ addMessages(array(
 	'ADMIN_ACTION_DELETE_SUBMIT' => "Löschen",
 	'ADMIN_ACTION_REMOVE_SUBMIT' => "Einträge löschen",
 	'ADMIN_ACTION_EDIT_SELECT_SUBMIT' => "Ausgewählten Eintrag bearbeiten",
+	'ADMIN_ACTION_LOCK_SUBMIT' => "Ent-/sperren",
 
 	// Admin 'pool' mail actions
 	'ADMIN_EDIT_POOL_MAIL_LINK' => "Klick-Mail bearbeiten",
diff --git a/inc/language/forced_de.php b/inc/language/forced_de.php
new file mode 100644
index 0000000000..ffda5a0447
--- /dev/null
+++ b/inc/language/forced_de.php
@@ -0,0 +1,74 @@
+ "Es wurden keine Forced-Werbemittel gefunden.",
+	'ADMIN_ADD_FORCED_AD_TITLE' => "Hinzufügen eines Forced-Werbemittels:",
+	'ADMIN_ADD_FORCED_ADD_SUBMIT' => "Forced-Werbemittel hinzufügen",
+	'ADMIN_ENTER_FORCED_AD_CLICK_URL' => "Klick-URL des Forced-Werbemittels eingeben:",
+	'ADMIN_SELECT_FORCED_AD_TYPE' => "Forced-Werbemittelart auswählen:",
+	'ADMIN_SELECT_FORCED_HAS_FRAMEBREAKER' => "Hat das Forced-Werbemittel einen Framekiller?",
+	'ADMIN_ADD_FORCED_AD_POPUP_BANNER_ONLY' => "Nur für die Forced-Werbemittelarten Forced-PopUp oder -Banner eingeben:",
+	'ADMIN_ENTER_FORCED_AD_RELOAD_LOCK' => "Reloadsperre für Forced-Werbemittel einstellen:",
+	'ADMIN_ENTER_FORCED_AD_MINIMUM_STAY' => "Mindestauffenthalt für Forced-Werbemittel einstellen:",
+	'ADMIN_ENTER_FORCED_AD_URL' => "URL des Forced-Banners eingeben:",
+	'ADMIN_ADD_FORCED_AD_ADDITIONAL_DATA' => "Weitere Angaben für Forced-Banner:",
+	'ADMIN_ENTER_FORCED_ALTERNATE_TEXT' => "Alternativen Text/Titel des Forced-Werbemittels eingeben:",
+	'ADMIN_ENTER_FORCED_AD_WIDTH' => "Breite (in Pixel) des Forced-Werbemittels eingeben:",
+	'ADMIN_ENTER_FORCED_AD_HEIGHT' => "Höhe (in Pixel) des Forced-Werbemittels eingeben:",
+	'ADMIN_FORCED_AD_TYPE_UNKNOWN' => "Unbekanntes Forced-Werbemittel %s erkannt.",
+	'ADMIN_FORCED_AD_TYPE_BANNER' => "Forced-Banner",
+	'ADMIN_FORCED_AD_TYPE_TEXTLINK' => "Forced-Textlink",
+	'ADMIN_FORCED_AD_TYPE_POPUP' => "Forced-PopUp",
+	'ADMIN_LIST_FORCED_ADS_TITLE' => "Auflisten aller Forced-Werbemittel",
+	'ADMIN_FORCED_ADS_TYPE' => "Forced-Werbemittel",
+	'ADMIN_FORCED_ADS_VIEWS_COUNTER' => "Anzahl Forced-Views",
+	'ADMIN_FORCED_ADS_CLICKS_COUNTER' => "Anzahl Forced-Klicks",
+	'ADMIN_FORCED_ADS_HAS_FRAMEBREAKER' => "Framekiller?",
+	'ADMIN_FORCED_ADS_ADDED' => "Hinzugefügt?",
+	'ADMIN_FORCED_ADS_LAST_LOCKED' => "Zuletzt gesperrt",
+	'ADMIN_FORCED_ADS_LOCK_REASON' => "Sperrgrund",
+));
+
+// [EOF]
+?>
diff --git a/inc/libs/admins_functions.php b/inc/libs/admins_functions.php
index e81d6a1389..2b7c2de652 100644
--- a/inc/libs/admins_functions.php
+++ b/inc/libs/admins_functions.php
@@ -337,7 +337,7 @@ function adminsEditAdminAccount ($postData) {
 		$id = bigintval($id);
 
 		// Get the admin's data
-		$result = SQL_QUERY_ESC("SELECT `login`, `email`, `default_acl` AS mode, `la_mode` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1",
+		$result = SQL_QUERY_ESC("SELECT `login`,`email`,`default_acl` AS mode, `la_mode` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1",
 			array($id), __FUNCTION__, __LINE__);
 		if ((SQL_NUMROWS($result) == 1) && ($selected == 1)) {
 			// Entry found
@@ -377,7 +377,7 @@ function adminsDeleteAdminAccount ($postData) {
 			$id = bigintval($id);
 
 			// Get the admin's data
-			$result = SQL_QUERY_ESC("SELECT `login`, `email`, `default_acl` AS `mode`, `la_mode` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1",
+			$result = SQL_QUERY_ESC("SELECT `login`,`email`,`default_acl` AS `mode`,`la_mode` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1",
 				array($id), __FUNCTION__, __LINE__);
 
 			// Do we have an entry?
@@ -433,7 +433,7 @@ function adminsRemoveAdminAccount ($postData) {
 // List all admin accounts
 function adminsListAdminAccounts() {
 	// Select all admin accounts
-	$result = SQL_QUERY('SELECT `id`, `login`, `email`, `default_acl` AS mode, `la_mode` FROM `{?_MYSQL_PREFIX?}_admins` ORDER BY `login` ASC', __FUNCTION__, __LINE__);
+	$result = SQL_QUERY('SELECT `id`,`login`,`email`,`default_acl` AS mode, `la_mode` FROM `{?_MYSQL_PREFIX?}_admins` ORDER BY `login` ASC', __FUNCTION__, __LINE__);
 	$OUT = '';
 	while ($content = SQL_FETCHARRAY($result)) {
 		// Compile some variables
@@ -467,7 +467,7 @@ function sendAdminsEmails ($subj, $template, $content, $userid) {
 	// No entries found?
 	if (SQL_HASZERONUMS($result)) {
 		// Create new entry (to all admins)
-		SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_admins_mails` (`admin_id`, `mail_template`) VALUES (0, '%s')",
+		SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_admins_mails` (`admin_id`,`mail_template`) VALUES (0, '%s')",
 			array($template), __FUNCTION__, __LINE__);
 	} else {
 		// Load admin ids...
diff --git a/inc/libs/beg_functions.php b/inc/libs/beg_functions.php
index 12941204e0..144d9efedd 100644
--- a/inc/libs/beg_functions.php
+++ b/inc/libs/beg_functions.php
@@ -50,6 +50,9 @@ function addPointsBeg ($userid, $points) {
 		// Add points to rallye account
 		SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `beg_points`=`beg_points`+%s WHERE `userid`=%s LIMIT 1",
 			array($points, $userid), __FUNCTION__, __LINE__);
+
+		// We need to set $add here, two
+		$added = (!SQL_HASZEROAFFECTED());
 	} else {
 		// Add points to account
 		initReferalSystem();
@@ -57,9 +60,9 @@ function addPointsBeg ($userid, $points) {
 	}
 
 	// Subtract begged points from member account if the admin has selected one
-	if (isValidUserId(getBegUserid())) {
+	if (($added === true) && (isValidUserId(getBegUserid()))) {
 		// Subtract from this account
-		subtractPoints('beg_payout', getBegUserid(), $points);
+		$added = ($added && subtractPoints('beg_payout', getBegUserid(), $points));
 	} // END - if
 
 	// Return result
diff --git a/inc/libs/bonus_functions.php b/inc/libs/bonus_functions.php
index 6418d1e543..ef8b7144c7 100644
--- a/inc/libs/bonus_functions.php
+++ b/inc/libs/bonus_functions.php
@@ -100,7 +100,7 @@ function addTurboBonus ($mid, $userid, $type) {
 		), __FUNCTION__, __LINE__);
 
 	// Rember this whole data for displaying ranking list
-	SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_bonus_turbo` (`userid`, `mail_id`, `bonus_id`, `level`, `points`, `timemark`) VALUES (%s, %s, %s, %s, %s, UNIX_TIMESTAMP())",
+	SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_bonus_turbo` (`userid`,`mail_id`,`bonus_id`,`level`,`points`,`timemark`) VALUES (%s, %s, %s, %s, %s, UNIX_TIMESTAMP())",
 		array(
 			bigintval($userid),
 			bigintval($mail),
@@ -126,7 +126,7 @@ function addBonusRanks ($data, $type, $userid) {
 	$ranks = count(explode(';', getConfig('turbo_rates'))) + 1;
 
 	// Load current user's data
-	$result = SQL_QUERY_ESC("SELECT `level`, `points`, `timemark` FROM `{?_MYSQL_PREFIX?}_bonus_turbo` WHERE `%s`=%s AND `userid`=%s LIMIT 1",
+	$result = SQL_QUERY_ESC("SELECT `level`,`points`,`timemark` FROM `{?_MYSQL_PREFIX?}_bonus_turbo` WHERE `%s`=%s AND `userid`=%s LIMIT 1",
 		array(
 			$type,
 			$data,
@@ -156,7 +156,7 @@ function addBonusRanks ($data, $type, $userid) {
 		for ($rank = 1; $rank <= SQL_NUMROWS($result); $rank++) {
 			// Load data
 			$result_users = SQL_QUERY_ESC("SELECT
-	`userid`, `points`
+	`userid`,`points`
 FROM
 	`{?_MYSQL_PREFIX?}_bonus_turbo`
 WHERE
@@ -206,7 +206,12 @@ LIMIT 1",
 //
 function handleBonusPoints ($mode) {
 	// Shall we add bonus points?
-	if (!isBonusRallyeActive()) return;
+	if (!isBonusRallyeActive()) {
+		return;
+	} // END - if
+
+	// Default is not working
+	$return = false;
 
 	// Switch to jackpot-mode when no UID is supplied but userid-mode is selected
 	if ((getBonusMode() == 'UID') && (getBonusUserid() == '0') && (isExtensionActive('jackpot'))) {
@@ -232,10 +237,10 @@ function handleBonusPoints ($mode) {
 			break;
 
 		case 'JACKPOT': // ... jackpot
-			if ((isExtensionActive('jackpot')) && (subtractPointsFromJackpot($points) == -1) && (isValidUserId(getBonusUserid()))) {
+			if ((isExtensionActive('jackpot')) && (subtractPointsFromJackpot($points) === false) && (isValidUserId(getBonusUserid()))) {
 				if ($total >= $points) {
 					// Subtract points from userid's account
-					subtractPointsFromJackpot('bonus_payout_jackpot', getBonusUserid(), $points);
+					$return = subtractPointsFromJackpot('bonus_payout_jackpot', getBonusUserid(), $points);
 				} // END - if
 			} // END - if
 			break;
@@ -243,10 +248,10 @@ function handleBonusPoints ($mode) {
 		case 'UID': // ... userid's account
 			if ($total >= $points) {
 				// Subtract points from userid's account
-				subtractPoints('bonus_payout_userid', getBonusUserid(), $points);
+				$return = subtractPoints('bonus_payout_userid', getBonusUserid(), $points);
 			} elseif (isExtensionActive('jackpot')) {
 				// Try to subtract from jackpot
-				$dummy = subtractPointsFromJackpot($points);
+				$return = subtractPointsFromJackpot($points);
 			}
 			break;
 
@@ -254,6 +259,9 @@ function handleBonusPoints ($mode) {
 			debug_report_bug(__FUNCTION__, __LINE__, 'Invalid bonus-mode ' . getBonusMode() . ' detected.');
 			break;
 	} // END - switch
+
+	// Return status
+	return $return;
 }
 
 // Purges expired fast-click bonus entries
diff --git a/inc/libs/booking_functions.php b/inc/libs/booking_functions.php
index ece61e39c9..3de8f54540 100644
--- 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
-	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,
diff --git a/inc/libs/country_functions.php b/inc/libs/country_functions.php
index a001eef465..1b7980bae2 100644
--- a/inc/libs/country_functions.php
+++ b/inc/libs/country_functions.php
@@ -46,7 +46,7 @@ function generateCountryInfo ($id) {
 	$ret = '{--COUNTRY_CODE_404--}';
 
 	// Load code and description
-	$result = SQL_QUERY_ESC("SELECT `code`, `descr` FROM `{?_MYSQL_PREFIX?}_countries` WHERE `id`=%s LIMIT 1",
+	$result = SQL_QUERY_ESC("SELECT `code`,`descr` FROM `{?_MYSQL_PREFIX?}_countries` WHERE `id`=%s LIMIT 1",
 		array(bigintval($id)), __FUNCTION__, __LINE__);
 
 	// Is there an entry?
diff --git a/inc/libs/doubler_functions.php b/inc/libs/doubler_functions.php
index f5f7a23353..ecec2572b3 100644
--- a/inc/libs/doubler_functions.php
+++ b/inc/libs/doubler_functions.php
@@ -68,7 +68,7 @@ function generateDoublerTable ($userid = NULL, $done = 'N', $ref = 'N', $sort =
 
 	// List entries
 	$result = SQL_QUERY_ESC("SELECT
-	`userid`, `refid`, `points`, `timemark`
+	`userid`,`refid`,`points`,`timemark`
 FROM
 	`{?_MYSQL_PREFIX?}_doubler`
 WHERE
diff --git a/inc/libs/forced_functions.php b/inc/libs/forced_functions.php
new file mode 100644
index 0000000000..331f17e9cc
--- /dev/null
+++ b/inc/libs/forced_functions.php
@@ -0,0 +1,163 @@
+ 0) {
+		// Please don't add any attributes to foo-list nodes
+		debug_report_bug(__FUNCTION__, __LINE__, 'Expected 0 attributes because this is a foo-list node, got ' . count($attributes));
+	} elseif (!isset($GLOBALS['__XML_ARGUMENTS']['doXmlCallbackFunction']['extra_list']['forced_ads_reload_lock_list'])) {
+		// This list should be created already
+		debug_report_bug(__FUNCTION__, __LINE__, 'forced_ads_reload_lock_list should be already created.');
+	}
+}
+
+// Handles the XML node 'extra-parameter-forced-ads-reload-lock-list-entry'
+function doXmlExtraParameterForcedAdsReloadLockListEntry ($resource, $attributes) {
+	// There are three attributes, by default
+	if (count($attributes) != 3) {
+		// Not the right count
+		debug_report_bug(__FUNCTION__, __LINE__, 'Expected 3 attributes, got ' . count($attributes));
+	} elseif (!isset($attributes['NAME'])) {
+		// 'NAME' not found
+		debug_report_bug(__FUNCTION__, __LINE__, 'Required attribute NAME not found.');
+	} elseif (!isset($attributes['TYPE'])) {
+		// 'TYPE' not found
+		debug_report_bug(__FUNCTION__, __LINE__, 'Required attribute TYPE not found.');
+	} elseif (!isInvalidXmlType($attributes['TYPE'])) {
+		// No valid type
+		debug_report_bug(__FUNCTION__, __LINE__, 'TYPE is not valid, got: ' . $attributes['TYPE']);
+	} elseif (!isset($attributes['VALUE'])) {
+		// 'VALUE' not found
+		debug_report_bug(__FUNCTION__, __LINE__, 'Required attribute VALUE not found.');
+	} elseif (!isXmlValueValid($attributes['TYPE'], $attributes['VALUE'])) {
+		// Not valid/verifyable
+		debug_report_bug(__FUNCTION__, __LINE__, 'Attribute VALUE does not validate. TYPE=' . $attributes['TYPE'] . ',VALUE=' . $attributes['VALUE']);
+	} elseif (!isset($GLOBALS['__XML_ARGUMENTS']['doXmlCallbackFunction']['extra_list']['forced_ads_reload_lock_list'])) {
+		// doXmlCallbackFunction is missing
+		debug_report_bug(__FUNCTION__, __LINE__, 'Required XML node callback-function/extra-parameter-list/forced-ads-reload-lock-list not included around this node. Please fix your XML.');
+	}
+
+	// Add the entry to the list
+	addXmlValueToCallbackAttributes('extra_list', $attributes, 'forced_ads_reload_lock_list');
+}
+
+// Handles the XML node 'extra-parameter-forced-ads-min-stay-list'
+function doXmlExtraParameterForcedAdsMinStayList ($resource, $attributes) {
+	// There should be no attributes
+	if (count($attributes) > 0) {
+		// Please don't add any attributes to foo-list nodes
+		debug_report_bug(__FUNCTION__, __LINE__, 'Expected 0 attributes because this is a foo-list node, got ' . count($attributes));
+	} elseif (!isset($GLOBALS['__XML_ARGUMENTS']['doXmlCallbackFunction']['extra_list']['forced_ads_min_stay_list'])) {
+		// This list should be created already
+		debug_report_bug(__FUNCTION__, __LINE__, 'forced_ads_min_stay_list should be already created.');
+	}
+}
+
+// Handles the XML node 'extra-parameter-forced-ads-min-stay-list-entry'
+function doXmlExtraParameterForcedAdsMinStayListEntry ($resource, $attributes) {
+	// There are three attributes, by default
+	if (count($attributes) != 3) {
+		// Not the right count
+		debug_report_bug(__FUNCTION__, __LINE__, 'Expected 3 attributes, got ' . count($attributes));
+	} elseif (!isset($attributes['NAME'])) {
+		// 'NAME' not found
+		debug_report_bug(__FUNCTION__, __LINE__, 'Required attribute NAME not found.');
+	} elseif (!isset($attributes['TYPE'])) {
+		// 'TYPE' not found
+		debug_report_bug(__FUNCTION__, __LINE__, 'Required attribute TYPE not found.');
+	} elseif (!isInvalidXmlType($attributes['TYPE'])) {
+		// No valid type
+		debug_report_bug(__FUNCTION__, __LINE__, 'TYPE is not valid, got: ' . $attributes['TYPE']);
+	} elseif (!isset($attributes['VALUE'])) {
+		// 'VALUE' not found
+		debug_report_bug(__FUNCTION__, __LINE__, 'Required attribute VALUE not found.');
+	} elseif (!isXmlValueValid($attributes['TYPE'], $attributes['VALUE'])) {
+		// Not valid/verifyable
+		debug_report_bug(__FUNCTION__, __LINE__, 'Attribute VALUE does not validate. TYPE=' . $attributes['TYPE'] . ',VALUE=' . $attributes['VALUE']);
+	} elseif (!isset($GLOBALS['__XML_ARGUMENTS']['doXmlCallbackFunction']['extra_list']['forced_ads_min_stay_list'])) {
+		// doXmlCallbackFunction is missing
+		debug_report_bug(__FUNCTION__, __LINE__, 'Required XML node callback-function/extra-parameter-list/forced-ads-min-stay-list not included around this node. Please fix your XML.');
+	}
+
+	// Add the entry to the list
+	addXmlValueToCallbackAttributes('extra_list', $attributes, 'forced_ads_min_stay_list');
+}
+
+// [EOF]
+?>
diff --git a/inc/libs/holiday_functions.php b/inc/libs/holiday_functions.php
index 1cbe389b2e..9586b675ef 100644
--- a/inc/libs/holiday_functions.php
+++ b/inc/libs/holiday_functions.php
@@ -44,7 +44,7 @@ if (!defined('__SECURITY')) {
 function stopHolidays () {
 	// Let's find some expired holiday requests...
 	$result_stop = SQL_QUERY("SELECT
-	`userid`, `holiday_start`, `holiday_end`, `comments`
+	`userid`,`holiday_start`,`holiday_end`,`comments`
 FROM
 	`{?_MYSQL_PREFIX?}_user_holidays`
 WHERE
diff --git a/inc/libs/jackpot_functions.php b/inc/libs/jackpot_functions.php
index 6bf2816c4c..fbe450bc27 100644
--- a/inc/libs/jackpot_functions.php
+++ b/inc/libs/jackpot_functions.php
@@ -52,7 +52,7 @@ function getJackpotPoints () {
 	// Do we have an entry?
 	if (SQL_HASZERONUMS($result)) {
 		// No, so create line
-		SQL_QUERY("INSERT INTO `{?_MYSQL_PREFIX?}_jackpot` (`ok`, `points`) VALUES ('ok','0.00000')", __FUNCTION__, __LINE__);
+		SQL_QUERY("INSERT INTO `{?_MYSQL_PREFIX?}_jackpot` (`ok`,`points`) VALUES ('ok','0.00000')", __FUNCTION__, __LINE__);
 	} else {
 		// Read the line
 		$data = SQL_FETCHARRAY($result);
@@ -78,7 +78,7 @@ function addPointsToJackpot ($points) {
 // Subtracts points from the jackpot
 function subtractPointsFromJackpot ($points) {
 	// First failed
-	$ret = -1;
+	$ret = false;
 
 	// Get jackpot points for dummy
 	$jackpot = getJackpotPoints();
@@ -88,7 +88,7 @@ function subtractPointsFromJackpot ($points) {
 		// Update points when there are enougth points in jackpot
 		SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_jackpot` SET `points`=`points`-%s WHERE `ok`='ok' LIMIT 1",
 			array($points), __FUNCTION__, __LINE__);
-		$ret = $jackpot - $points;
+		$ret = (!SQL_HASZEROAFFECTED());
 	} // END - if
 
 	// Free memory
diff --git a/inc/libs/mediadata_functions.php b/inc/libs/mediadata_functions.php
index 546d44a18c..e125f48426 100644
--- a/inc/libs/mediadata_functions.php
+++ b/inc/libs/mediadata_functions.php
@@ -61,7 +61,7 @@ LIMIT 1", array($key), __FUNCTION__, __LINE__);
 			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',SQL_NUMROWS()=' . SQL_NUMROWS($result_media));
 			if (SQL_NUMROWS($result_media) == 0) {
 				// Not found so we create it (mode will be ignored here!)
-				SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_mediadata` (`media_key`, `media_value`) VALUES ('%s', '%s')",
+				SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_mediadata` (`media_key`,`media_value`) VALUES ('%s', '%s')",
 					array($key, $value), __FUNCTION__, __LINE__);
 			} else {
 				// Update entry
diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php
index db096e9b0d..7dac613834 100644
--- a/inc/libs/network_functions.php
+++ b/inc/libs/network_functions.php
@@ -173,7 +173,7 @@ function getNetworkDataById ($id, $column = '') {
 
 		// Query for the network data
 		$result = SQL_QUERY_ESC("SELECT
-	`network_id`, `network_short_name`, `network_title`, `network_reflink`, `network_data_seperator`, `network_row_seperator`, `network_request_type`, `network_charset`
+	`network_id`,`network_short_name`,`network_title`,`network_reflink`,`network_data_seperator`,`network_row_seperator`,`network_request_type`,`network_charset`
 FROM
 	`{?_MYSQL_PREFIX?}_network_data`
 WHERE
@@ -265,7 +265,7 @@ function getNetworkTypeDataById ($id) {
 
 	// Query for the network data
 	$result = SQL_QUERY_ESC("SELECT
-	`network_type_id`, `network_id`, `network_type_handle`, `network_type_api_url`, `network_type_click_url`, `network_type_banner_url`
+	`network_type_id`,`network_id`,`network_type_handle`,`network_type_api_url`,`network_type_click_url`,`network_type_banner_url`
 FROM
 	`{?_MYSQL_PREFIX?}_network_types`
 WHERE
@@ -299,7 +299,7 @@ function getNetworkRequestParamsDataById ($id) {
 
 	// Query for the network data
 	$result = SQL_QUERY_ESC("SELECT
-	`network_param_id`, `network_id`, `network_type_id`, `request_param_key`, `request_param_value`, `request_param_default`
+	`network_param_id`,`network_id`,`network_type_id`,`request_param_key`,`request_param_value`,`request_param_default`
 FROM
 	`{?_MYSQL_PREFIX?}_network_request_params`
 WHERE
@@ -373,7 +373,7 @@ function generateAdminNetworkList () {
 
 	// Query for all networks
 	$result = SQL_QUERY('SELECT
-	`network_id`, `network_short_name`, `network_title`
+	`network_id`,`network_short_name`,`network_title`
 FROM
 	`{?_MYSQL_PREFIX?}_network_data`
 ORDER BY
@@ -412,7 +412,7 @@ function generateAdminNetworkTypeList ($networkId) {
 
 	// Query all types of this network
 	$result = SQL_QUERY_ESC("SELECT
-	`network_type_id`, `network_type_handle`
+	`network_type_id`,`network_type_handle`
 FROM
 	`{?_MYSQL_PREFIX?}_network_types`
 WHERE
@@ -497,7 +497,9 @@ ORDER BY
 // Generator (somewhat getter) for network type options
 function generateNetworkTypeOptions ($id) {
 	// Is this an array, then we just came back from edit/delete actions
-	if (is_array($id)) $id = '';
+	if (is_array($id)) {
+		$id = '';
+	} // END - if
 
 	// Is this cached?
 	if (!isset($GLOBALS[__FUNCTION__][$id])) {
@@ -696,7 +698,7 @@ function translateNetworkApiIndex ($index) {
 
 		// Get all entries
 		$result = SQL_QUERY('SELECT
-	`network_api_id`, `network_api_index`, `network_translation_name`
+	`network_api_id`,`network_api_index`,`network_translation_name`
 FROM
 	`{?_MYSQL_PREFIX?}_network_api_translation`
 INNER JOIN
@@ -752,7 +754,7 @@ function doAdminNetworkProcessAddNetwork () {
 	SQL_QUERY('INSERT INTO
 	`{?_MYSQL_PREFIX?}_network_data`
 (
-	`' . implode('`, `', array_keys(postRequestArray())) . "`
+	`' . implode('`,`', array_keys(postRequestArray())) . "`
 ) VALUES (
 	'" . implode("','", array_values(postRequestArray())) . "'
 )", __FUNCTION__, __LINE__);
@@ -1028,7 +1030,7 @@ function doAdminNetworkProcessAddNetworkType () {
 	SQL_QUERY('INSERT INTO
 	`{?_MYSQL_PREFIX?}_network_types`
 (
-	`' . implode('`, `', array_keys(postRequestArray())) . "`
+	`' . implode('`,`', array_keys(postRequestArray())) . "`
 ) VALUES (
 	'" . implode("','", array_values(postRequestArray())) . "'
 )", __FUNCTION__, __LINE__);
@@ -1071,7 +1073,7 @@ function doAdminNetworkProcessChangeNetworkType () {
 					// Fix empty network_type_banner_url to NULL
 					if (($key == 'network_type_banner_url') && (trim($entry[$id]) == '')) {
 						// Set it to NULL
-						$entry[$id] = null;
+						$entry[$id] = NULL;
 					} // END - if
 
 					// Add this entry
@@ -1122,7 +1124,7 @@ function doAdminNetworkProcessChangeNetworkParam () {
 					// Fix empty request_param_default to NULL
 					if (($key == 'request_param_default') && (trim($entry[$id]) == '')) {
 						// Set it to NULL
-						$entry[$id] = null;
+						$entry[$id] = NULL;
 					} // END - if
 
 					// Add this entry
@@ -1226,7 +1228,7 @@ function doAdminNetworkProcessAddNetworkParam () {
 	SQL_QUERY('INSERT INTO
 	`{?_MYSQL_PREFIX?}_network_request_params`
 (
-	`' . implode('`, `', array_keys(postRequestArray())) . "`
+	`' . implode('`,`', array_keys(postRequestArray())) . "`
 ) VALUES (
 	'" . implode("','", array_values(postRequestArray())) . "'
 )", __FUNCTION__, __LINE__);
@@ -1272,7 +1274,7 @@ function doAdminNetworkProcessAddNetworkApiTranslation () {
 	SQL_QUERY('INSERT INTO
 	`{?_MYSQL_PREFIX?}_network_api_translation`
 (
-	`' . implode('`, `', array_keys(postRequestArray())) . "`
+	`' . implode('`,`', array_keys(postRequestArray())) . "`
 ) VALUES (
 	'" . implode("','", array_values(postRequestArray())) . "'
 )", __FUNCTION__, __LINE__);
diff --git a/inc/libs/payout_functions.php b/inc/libs/payout_functions.php
index 21d8914430..088ab9cf36 100644
--- a/inc/libs/payout_functions.php
+++ b/inc/libs/payout_functions.php
@@ -46,7 +46,7 @@ function outputPayoutList ($points) {
 	if ($points > 0) {
 		// Pay this out!
 		$result = SQL_QUERY_ESC("SELECT
-	`id`, `type`, `rate`, `min_points`
+	`id`,`type`,`rate`,`min_points`
 FROM
 	`{?_MYSQL_PREFIX?}_payout_types`
 WHERE
diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php
index c7df107ad4..faf162d600 100644
--- a/inc/libs/rallye_functions.php
+++ b/inc/libs/rallye_functions.php
@@ -135,7 +135,7 @@ WHERE
 			// Add info line
 			SQL_QUERY_ESC("INSERT INTO
 	`{?_MYSQL_PREFIX?}_rallye_users`
-(`rallye_id`, `userid`, `refs`, `curr_points`)
+(`rallye_id`,`userid`,`refs`,`curr_points`)
 	VALUES
 (%s, %s, %s, %s)",
 				array(
@@ -182,7 +182,7 @@ function addReferalRallyePrices ($rallye, $mode = 'email') {
 
 	// Load prices
 	$result_prices = SQL_QUERY_ESC("SELECT
-	`price_level`, `points`, `info`
+	`price_level`,`points`,`info`
 FROM
 	`{?_MYSQL_PREFIX?}_rallye_prices`
 WHERE
@@ -351,12 +351,12 @@ function addUserToReferalRallye ($userid, $content = array()) {
 
 	// Updated extension?
 	if (isExtensionInstalledAndNewer('rallye', '0.2.0')) {
-		$add .= ', `min_users`, `min_prices`';
+		$add .= ', `min_users`,`min_prices`';
 	} // END - if
 
 	// Check for an auto-add rallye
 	$result = SQL_QUERY("SELECT
-	`id`, `title`, `start_time`, `end_time`, `send_notify`".$add."
+	`id`,`title`,`start_time`,`end_time`,`send_notify`".$add."
 FROM
 	`{?_MYSQL_PREFIX?}_rallye_data`
 WHERE
@@ -420,7 +420,7 @@ LIMIT 1",
 			// Add userid and his ref count to table
 			SQL_QUERY_ESC("INSERT INTO
 	`{?_MYSQL_PREFIX?}_rallye_users`
-(`rallye_id`, `userid`, `refs`)
+(`rallye_id`,`userid`,`refs`)
 	VALUES
 (%s,%s,0)",
 				array(
@@ -564,7 +564,7 @@ function getReferalRallyeUserDataFromArray ($userIds) {
 
 	// Load users
 	$result = SQL_QUERY_ESC("SELECT
-	`userid`, `gender`, `surname`, `family`, `email`
+	`userid`,`gender`,`surname`,`family`,`email`
 FROM
 	`{?_MYSQL_PREFIX?}_user_data`
 WHERE
@@ -603,7 +603,7 @@ function getArrayFromReferalRallyePrices ($rallye) {
 
 	// Load prices
 	$result = SQL_QUERY_ESC("SELECT
-	`price_level`, `points`, `info`
+	`price_level`,`points`,`info`
 FROM
 	`{?_MYSQL_PREFIX?}_rallye_prices`
 WHERE
@@ -639,7 +639,7 @@ function getArrayFromReferalRallyeUsers ($rallye) {
 	);
 
 	// Load users                          userid    old   points earned
-	$result_user = SQL_QUERY_ESC("SELECT `userid`, `refs`, `curr_points` FROM `{?_MYSQL_PREFIX?}_rallye_users` WHERE `rallye_id`=%s ORDER BY `userid` ASC",
+	$result_user = SQL_QUERY_ESC("SELECT `userid`,`refs`,`curr_points` FROM `{?_MYSQL_PREFIX?}_rallye_users` WHERE `rallye_id`=%s ORDER BY `userid` ASC",
 		array(bigintval($rallye)), __FUNCTION__, __LINE__);
 	while ($content = SQL_FETCHARRAY($result_user)) {
 		// Load current ref count
@@ -769,7 +769,7 @@ function purgeExpiredReferalRallyes () {
 	// Check for expired rallyes
 	$EXPIRE = 3; // @TODO The hard-coded value...
 	$result_rallye = SQL_QUERY_ESC("SELECT
-	`id`, `title`, `start_time`, `end_time`
+	`id`,`title`,`start_time`,`end_time`
 FROM
 	`{?_MYSQL_PREFIX?}_rallye_data`
 WHERE
diff --git a/inc/libs/refback_functions.php b/inc/libs/refback_functions.php
index 5938bd79bf..f2f210b2c2 100644
--- a/inc/libs/refback_functions.php
+++ b/inc/libs/refback_functions.php
@@ -50,7 +50,7 @@ function addRefbackPoints ($userid, $ref, $points, $ref_points) {
 	$return = $ref_points;
 
 	// Get all ref levels
-	$result_refs = SQL_QUERY('SELECT `level`, `percents` FROM `{?_MYSQL_PREFIX?}_refdepths` WHERE `level` > 0 ORDER BY `level` ASC',
+	$result_refs = SQL_QUERY('SELECT `level`,`percents` FROM `{?_MYSQL_PREFIX?}_refdepths` WHERE `level` > 0 ORDER BY `level` ASC',
 		__FUNCTION__, __LINE__);
 
 	// "Walk" through all level
@@ -274,7 +274,7 @@ function getArrayFromUserRefbackData ($id) {
 	$id = bigintval($id);
 
 	// Get entry from database
-	$result = SQL_QUERY_ESC("SELECT `id`, `userid`, `refid`, `refback_percents`, `level`, `refback_points` FROM `{?_MYSQL_PREFIX?}_user_refs` WHERE `id`=%s AND `userid`=%s LIMIT 1",
+	$result = SQL_QUERY_ESC("SELECT `id`,`userid`,`refid`,`refback_percents`,`level`,`refback_points` FROM `{?_MYSQL_PREFIX?}_user_refs` WHERE `id`=%s AND `userid`=%s LIMIT 1",
 		array($id, getMemberId()), __FUNCTION__, __LINE__);
 
 	// Is there an entry?
@@ -313,10 +313,10 @@ function updateMemberRefbackPercents ($id, $percents, $note) {
 	}
 
 	// Get ref entry
-	$dummy = getArrayFromUserRefbackData($id);
+	$content = getArrayFromUserRefbackData($id);
 
 	// Is this valid?
-	if (count($dummy) == 0) {
+	if (count($content) == 0) {
 		// id does not belong to user!
 		$status['message'] = 'MEMBER_REFBACK_ERROR_ID_MISMATCH';
 		return $status;
@@ -341,17 +341,17 @@ function updateMemberRefbackPercents ($id, $percents, $note) {
 	} // END - if
 
 	// Prepare email content
-	$dummy['refback_percents'] = $percents;
-	$dummy['refback_note']     = $note;
+	$content['refback_percents'] = $percents;
+	$content['refback_note']     = $note;
 
 	// Load member email template
-	$mail = loadEmailTemplate('member_refback', $dummy, $dummy['refid']);
+	$mail = loadEmailTemplate('member_refback', $content, $content['refid']);
 
 	// Send email to user
-	sendEmail($dummy['refid'], '{--MEMBER_REFBACK_SUBJECT--}', $mail);
+	sendEmail($content['refid'], '{--MEMBER_REFBACK_SUBJECT--}', $mail);
 
 	// Send admin notification
-	sendAdminNotification('{--ADMIN_REFBACK_SUBJECT--}', 'admin_refback', $dummy, $dummy['refid']);
+	sendAdminNotification('{--ADMIN_REFBACK_SUBJECT--}', 'admin_refback', $content, $content['refid']);
 
 	// All fine!
 	$status['ok'] = true;
diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php
index dc557b742c..719f594bac 100644
--- a/inc/libs/register_functions.php
+++ b/inc/libs/register_functions.php
@@ -82,7 +82,7 @@ function registerGenerateCategoryTable ($mode, $return=false) {
 	if (isAdmin()) $AND = '';
 
 	// Look for categories
-	$result = SQL_QUERY('SELECT `id`, `cat`, `visible` FROM `{?_MYSQL_PREFIX?}_cats` ' . $AND . ' ORDER BY `sort` ASC',
+	$result = SQL_QUERY('SELECT `id`,`cat`,`visible` FROM `{?_MYSQL_PREFIX?}_cats` ' . $AND . ' ORDER BY `sort` ASC',
 		__FUNCTION__, __LINE__);
 
 	if (!SQL_HASZERONUMS($result)) {
@@ -300,13 +300,13 @@ function doRegistration () {
 	//
 	// First comes first: begging rallye
 	if ((isExtensionInstalledAndNewer('beg', '0.2.7')) && (!isBegNewMemberNotifyEnabled())) {
-		$GLOBALS['register_sql_columns'] .= ', `beg_rallye_enable_notify`, `beg_rallye_disable_notify`';
+		$GLOBALS['register_sql_columns'] .= ', `beg_rallye_enable_notify`,`beg_rallye_disable_notify`';
 		$GLOBALS['register_sql_data']    .= ', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()';
 	} // END - if
 
 	// Second: active rallye
 	if ((isExtensionActive('bonus')) && (!isBonusNewMemberNotifyEnabled())) {
-		$GLOBALS['register_sql_columns'] .= ', `bonus_rallye_enable_notify`, `bonus_rallye_disable_notify`';
+		$GLOBALS['register_sql_columns'] .= ', `bonus_rallye_enable_notify`,`bonus_rallye_disable_notify`';
 		$GLOBALS['register_sql_data']    .= ', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()';
 	} // END - if
 
@@ -320,7 +320,7 @@ function doRegistration () {
 	// 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(
@@ -374,7 +374,7 @@ function doRegistration () {
 		foreach (postRequestParameter('cat') as $categoryId => $joined) {
 			if ($joined == 'Y') {
 				// Insert category entry
-				SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_cats` (`userid`, `cat_id`) VALUES (%s, %s)",
+				SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_cats` (`userid`,`cat_id`) VALUES (%s, %s)",
 					array(
 						$userid,
 						bigintval($categoryId)
diff --git a/inc/libs/sponsor_functions.php b/inc/libs/sponsor_functions.php
index 035c56b875..eb9aad248e 100644
--- a/inc/libs/sponsor_functions.php
+++ b/inc/libs/sponsor_functions.php
@@ -41,7 +41,7 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 //
-function handleSponsorRequest ($postData, $update=false, $messageArray=array(), $RET_STATUS=false) {
+function handleSponsorRequest ($postData, $update=false, $messageArray = array(), $RET_STATUS=false) {
 	// Init a lot variables
 	$SAVE = true;
 	$UPDATE = false;
@@ -170,7 +170,7 @@ function handleSponsorRequest ($postData, $update=false, $messageArray=array(),
 				unset($DATA['values'][$key]);
 
 				// Implode all data into strings
-				$keyArray   = implode('`, `'  , $DATA['keys']);
+				$keyArray   = implode('`,`'  , $DATA['keys']);
 				$valueArray = str_repeat("%s', '", count($DATA['values']) - 1);
 
 				// Generate string
@@ -269,7 +269,7 @@ function addSponsorMenu ($current) {
 
 	// Load main menu entries
 	$result_main = SQL_QUERY("SELECT
-	`action` AS `main_action`, `title` AS `main_title`
+	`action` AS `main_action`,`title` AS `main_title`
 FROM
 	`{?_MYSQL_PREFIX?}_sponsor_menu`
 WHERE
@@ -282,7 +282,7 @@ ORDER BY
 		while ($content = SQL_FETCHARRAY($result_main)) {
 			// Load sub menus
 			$result_sub = SQL_QUERY_ESC("SELECT
-	`what` AS `sub_what`, `title` AS `sub_title`
+	`what` AS `sub_what`,`title` AS `sub_title`
 FROM
 	`{?_MYSQL_PREFIX?}_sponsor_menu`
 WHERE
@@ -565,7 +565,7 @@ function doProcessSponsorFormRequest ($messageArray = array()) {
 	switch ($status) {
 		case 'added': // Sponsor successfully added with account status = UNCONFIRMED!
 			// Check for his id number
-			$result = SQL_QUERY_ESC("SELECT `id`, `hash` FROM `{?_MYSQL_PREFIX?}_sponsor_data` WHERE `email`='%s' LIMIT 1",
+			$result = SQL_QUERY_ESC("SELECT `id`,`hash` FROM `{?_MYSQL_PREFIX?}_sponsor_data` WHERE `email`='%s' LIMIT 1",
 				array(postRequestParameter('email')), __FUNCTION__, __LINE__);
 			if (SQL_NUMROWS($result) == 1) {
 				// id found so let's load it for the confirmation email
@@ -696,7 +696,7 @@ function fetchSponsorData ($sponsor_id, $column = 'id') {
 		if (isset($GLOBALS['sponsor_data'][getCurrentSponsorId()]['last_failure'])) {
 			// Backup the raw one and zero it
 			$GLOBALS['sponsor_data'][getCurrentSponsorId()]['last_failure_raw'] = $GLOBALS['sponsor_data'][getCurrentSponsorId()]['last_failure'];
-			$GLOBALS['sponsor_data'][getCurrentSponsorId()]['last_failure'] = null;
+			$GLOBALS['sponsor_data'][getCurrentSponsorId()]['last_failure'] = NULL;
 
 			// Is it not zero?
 			if (!is_null($GLOBALS['sponsor_data'][getCurrentSponsorId()]['last_failure_raw'])) {
diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php
index 9a8edbbb8d..d28a0ab1ba 100644
--- a/inc/libs/surfbar_functions.php
+++ b/inc/libs/surfbar_functions.php
@@ -654,11 +654,11 @@ function SURFBAR_INSERT_URL_BY_ARRAY ($urlData) {
 
 	// Is the id set?
 	if (empty($userid)) {
-		$userid = NULL;
+		$userid = 'NULL';
 	} // END - if
 
 	// 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'],
@@ -998,16 +998,16 @@ function SURFBAR_GET_TOTAL_USER_URLS ($userid = NULL, $status = '', $exclude = '
 	// Is the status set?
 	if (is_array($status)) {
 		// Only URLs with these status
-		$add = sprintf(" AND `url_status` IN('%s')", implode("','", $status));
+		$add = sprintf(" WHERE `url_status` IN('%s')", implode("','", $status));
 	} elseif (!empty($status)) {
 		// Only URLs with this status
-		$add = sprintf(" AND `url_status`='%s'", $status);
+		$add = sprintf(" WHERE `url_status`='%s'", $status);
 	} elseif (is_array($exclude)) {
 		// Exclude URLs with these status
-		$add = sprintf(" AND `url_status` NOT IN('%s')", implode("','", $exclude));
+		$add = sprintf(" WHERE `url_status` NOT IN('%s')", implode("','", $exclude));
 	} elseif (!empty($exclude)) {
 		// Exclude URLs with this status
-		$add = sprintf(" AND `url_status` != '%s'", $exclude);
+		$add = sprintf(" WHERE `url_status` != '%s'", $exclude);
 	}
 
 	// Get amount from database
@@ -1065,7 +1065,7 @@ function SURFBAR_LOCKDOWN_ID ($urlId) {
 	// Do we have no record?
 	if ($countLock == 0) {
 		// Just add it to the database
-		SQL_QUERY_ESC('INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_locks` (`locks_userid`, `locks_url_id`) VALUES (%s, %s)',
+		SQL_QUERY_ESC('INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_locks` (`locks_userid`,`locks_url_id`) VALUES (%s, %s)',
 			array(
 				getMemberId(),
 				bigintval($urlId)
@@ -1087,6 +1087,7 @@ function SURFBAR_PAY_POINTS () {
 	// Remove it from the URL owner
 	/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid='.SURFBAR_GET_USERID().',costs='.SURFBAR_GET_COSTS() . ' - ENTERED!');
 	if (isValidUserId(SURFBAR_GET_USERID())) {
+		// Subtract points and ignore return status
 		subtractPoints(sprintf("surfbar_%s", getSurfbarPaymentModel()), SURFBAR_GET_USERID(), SURFBAR_GET_COSTS());
 	} // END - if
 
@@ -1094,7 +1095,7 @@ function SURFBAR_PAY_POINTS () {
 	// Init referal system here
 	initReferalSystem();
 
-	// Book it to the user
+	// Book it to the user and ignore return status
 	addPointsThroughReferalSystem(sprintf("surfbar:%s", getSurfbarPaymentModel()), getMemberId(), SURFBAR_GET_REWARD());
 	/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid='.SURFBAR_GET_USERID().',costs='.SURFBAR_GET_COSTS() . ' - EXIT!');
 }
@@ -1127,7 +1128,7 @@ function SURFBAR_UPDATE_INSERT_STATS_RECORD () {
 	// Was that update okay?
 	if (SQL_HASZEROAFFECTED()) {
 		// No, then insert entry
-		SQL_QUERY_ESC('INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_stats` (`stats_userid`, `stats_url_id`, `stats_count`) VALUES (%s,%s,1)',
+		SQL_QUERY_ESC('INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_stats` (`stats_userid`,`stats_url_id`,`stats_count`) VALUES (%s,%s,1)',
 			array(
 				getMemberId(),
 				SURFBAR_GET_ID()
@@ -1172,7 +1173,7 @@ function SURFBAR_UPDATE_SALT_STATS () {
 	// Was that okay?
 	if (SQL_HASZEROAFFECTED()) {
 		// Insert missing entry!
-		SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_salts` (`salts_url_id`, `salts_userid`, `salts_last_salt`) VALUES (%s, %s, '%s')",
+		SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_salts` (`salts_url_id`,`salts_userid`,`salts_last_salt`) VALUES (%s, %s, '%s')",
 			array(
 				SURFBAR_GET_ID(),
 				getMemberId(),
@@ -1340,7 +1341,7 @@ function SURFBAR_DETERMINE_WAIT_TIME () {
 }
 
 // Changes the status of an URL from given to other
-function SURFBAR_CHANGE_STATUS ($urlId, $prevStatus, $newStatus, $data=array()) {
+function SURFBAR_CHANGE_STATUS ($urlId, $prevStatus, $newStatus, $data = array()) {
 	/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'urlId=' . $urlId . ',prevStatus=' . $prevStatus . ',newStatus=' . $newStatus . ' - ENTERED!');
 	// Make new status always lower-case
 	$newStatus = strtolower($newStatus);
@@ -1882,7 +1883,7 @@ function SURFBAR_GET_DATA ($element) {
 	/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'element=' . $element . ' - ENTERED!');
 
 	// Default is null
-	$data = null;
+	$data = NULL;
 
 	// Is the entry there?
 	if (isset($GLOBALS['surfbar_cache'][$element])) {
diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php
index aed64ba5b1..3d90337c23 100644
--- a/inc/libs/task_functions.php
+++ b/inc/libs/task_functions.php
@@ -326,20 +326,14 @@ ORDER BY
 
 	// Both extensions must be there
 	if ((isExtensionInstalledAndNewer('bonus', '0.2.3')) && (isExtensionActive('user'))) {
-		// Active rallye
-		if (isExtensionInstalledAndNewer('bonus', '0.6.9')) {
-			// Add more bonus points here
-			$USE = '(0';
-			if (getConfig('bonus_click_yn') == 'Y') $USE .= ' + `turbo_bonus`';
-			if (getConfig('bonus_login_yn') == 'Y') $USE .= ' + `login_bonus`';
-			if (getConfig('bonus_order_yn') == 'Y') $USE .= ' + `bonus_order`';
-			if (getConfig('bonus_stats_yn') == 'Y') $USE .= ' + `bonus_stats`';
-			if (getConfig('bonus_ref_yn')   == 'Y') $USE .= ' + `bonus_ref`';
-			$USE .= ')';
-		} else {
-			// Old version ???
-			$USE = 'turbo_bonus';
-		}
+		// Get more columns
+		$add = runFilterChain('add_bonus_points_user_columns', '');
+
+		// Active rallye, so add more point columns, if not empty
+		$USE = '`turbo_bonus`';
+		if (!empty($add)) {
+			$USE = '(0' . $add . ')';
+		} // END - if
 
 		// Init variable
 		$lastOnline = '';
diff --git a/inc/libs/theme_functions.php b/inc/libs/theme_functions.php
index 58d1fec2c2..3fc35343e4 100644
--- a/inc/libs/theme_functions.php
+++ b/inc/libs/theme_functions.php
@@ -65,7 +65,7 @@ function generateThemeSelectionBox () {
 
 	// Select all themes we want
 	$result = SQL_QUERY('SELECT
-	`theme_path`, `theme_name`
+	`theme_path`,`theme_name`
 FROM
 	`{?_MYSQL_PREFIX?}_themes`
 ' . $add . '
diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index 601ca42eb0..029ab472ff 100644
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -527,7 +527,7 @@ function insertUserStatsRecord ($userid, $statsType, $statsData) {
 	// 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,
@@ -551,7 +551,7 @@ function doConfirmUserAccount ($hash) {
 	$userid = NULL;
 
 	// Search for an unconfirmed or confirmed account
-	$result = SQL_QUERY_ESC("SELECT `userid`, `refid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `user_hash`='%s' AND (`status`='UNCONFIRMED' OR `status`='CONFIRMED') LIMIT 1",
+	$result = SQL_QUERY_ESC("SELECT `userid`,`refid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `user_hash`='%s' AND (`status`='UNCONFIRMED' OR `status`='CONFIRMED') LIMIT 1",
 		array($hash), __FILE__, __LINE__);
 	if (SQL_NUMROWS($result) == 1) {
 		// Ok, he want's to confirm now so we load some data
@@ -745,7 +745,7 @@ function doExpressionUser ($data) {
 }
 
 // Template call-back function for list_user admin function
-function doTemplateAdminListUserTitle ($template, $dummy = false) {
+function doTemplateAdminListUserTitle ($template, $clear = false) {
 	// Init title with "all accounts"
 	$code = '{--ADMIN_LIST_ALL_ACCOUNTS--}';
 
diff --git a/inc/libs/wernis_functions.php b/inc/libs/wernis_functions.php
index e427eb5f21..f3f18392ac 100644
--- a/inc/libs/wernis_functions.php
+++ b/inc/libs/wernis_functions.php
@@ -335,7 +335,7 @@ function translateWernisTransferStatus ($status) {
 // 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),
diff --git a/inc/libs/yoomedia_functions.php b/inc/libs/yoomedia_functions.php
index ff7b85a9b8..e3e1a739a2 100644
--- 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
-		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']),
@@ -360,7 +360,7 @@ function YOOMEDIA_RELOAD_LOCK ($data, $mode) {
 		$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
 }
diff --git a/inc/load_cache.php b/inc/load_cache.php
index a0ac127500..4a32d84258 100644
--- a/inc/load_cache.php
+++ b/inc/load_cache.php
@@ -41,7 +41,7 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Init cache instance and array
-$GLOBALS['cache_instance'] = null;
+$GLOBALS['cache_instance'] = NULL;
 
 // Init cache first
 initCacheInstance();
diff --git a/inc/loader/load-admins.php b/inc/loader/load-admins.php
index 190347f9a3..448c283e1c 100644
--- a/inc/loader/load-admins.php
+++ b/inc/loader/load-admins.php
@@ -90,14 +90,14 @@ if (($GLOBALS['cache_instance']->loadCacheFile('admin')) && ($GLOBALS['cache_ins
 
 	// Query the database about this
 	$result = SQL_QUERY('SELECT
-	`id` AS admin_id, `login`, `password`, `email`' . $add . '
+	`id` AS admin_id, `login`,`password`,`email`' . $add . '
 FROM
 	`{?_MYSQL_PREFIX?}_admins`
 ORDER BY
 	`login` ASC', __FILE__, __LINE__);
-	while ($dummy = SQL_FETCHARRAY($result)) {
+	while ($row = SQL_FETCHARRAY($result)) {
 		// Save row
-		$GLOBALS['cache_instance']->addRow($dummy);
+		$GLOBALS['cache_instance']->addRow($row);
 	} // END - while
 
 	// Free memory
diff --git a/inc/loader/load-extension.php b/inc/loader/load-extension.php
index 3922ef4d2d..5d6b0cbe7d 100644
--- a/inc/loader/load-extension.php
+++ b/inc/loader/load-extension.php
@@ -143,7 +143,7 @@ if (($GLOBALS['cache_instance']->loadCacheFile('extension')) && ($GLOBALS['cache
 	} // END - if 
 
 	// Load all modules and their data
-	$result = SQL_QUERY('SELECT `id` AS `ext_id`, `ext_name`, `ext_active`, `ext_version`' . $add . ' FROM `{?_MYSQL_PREFIX?}_extensions` ORDER BY `ext_name` ASC', __FILE__, __LINE__);
+	$result = SQL_QUERY('SELECT `id` AS `ext_id`,`ext_name`,`ext_active`,`ext_version`' . $add . ' FROM `{?_MYSQL_PREFIX?}_extensions` ORDER BY `ext_name` ASC', __FILE__, __LINE__);
 	while ($content = SQL_FETCHARRAY($result)) {
 		// Load extension
 		loadExtension($content['ext_name'], 'test');
diff --git a/inc/loader/load-imprint.php b/inc/loader/load-imprint.php
index 80de83f533..a58b9e88ac 100644
--- a/inc/loader/load-imprint.php
+++ b/inc/loader/load-imprint.php
@@ -59,9 +59,9 @@ if (($GLOBALS['cache_instance']->loadCacheFile('imprint')) && ($GLOBALS['cache_i
 
 	// Query the database about this
 	$result = SQL_QUERY('SELECT * FROM `{?_MYSQL_PREFIX?}_imprint_data` ORDER BY `imprint_id` ASC', __FILE__, __LINE__);
-	while ($dummy = SQL_FETCHARRAY($result)) {
+	while ($row = SQL_FETCHARRAY($result)) {
 		// Save row
-		$GLOBALS['cache_instance']->addRow($dummy);
+		$GLOBALS['cache_instance']->addRow($row);
 	} // END - while
 
 	// Free memory
diff --git a/inc/loader/load-modules.php b/inc/loader/load-modules.php
index a0831eae22..fa68904629 100644
--- a/inc/loader/load-modules.php
+++ b/inc/loader/load-modules.php
@@ -92,7 +92,7 @@ if (($GLOBALS['cache_instance']->loadCacheFile('modules')) && ($GLOBALS['cache_i
 	if (isExtensionInstalledAndNewer('sql_patches', '0.3.6')) {
 		// Load has_menu
 		$result = SQL_QUERY('SELECT
-	`id`, `module`, `title`, `locked`, `hidden`, `admin_only`, `title`, `mem_only`, `has_menu`
+	`id`,`module`,`title`,`locked`,`hidden`,`admin_only`,`title`,`mem_only`,`has_menu`
 FROM
 	`{?_MYSQL_PREFIX?}_mod_reg`
 ORDER BY
@@ -100,7 +100,7 @@ ORDER BY
 	} else {
 		// Don't load has_menu
 		$result = SQL_QUERY('SELECT
-	`id`, `module`, `title`, `locked`, `hidden`, `admin_only`, `title`, `mem_only`
+	`id`,`module`,`title`,`locked`,`hidden`,`admin_only`,`title`,`mem_only`
 FROM
 	`{?_MYSQL_PREFIX?}_mod_reg`
 ORDER BY
diff --git a/inc/loader/load-refdepths.php b/inc/loader/load-refdepths.php
index e1a05818aa..aa8b75c0e2 100644
--- a/inc/loader/load-refdepths.php
+++ b/inc/loader/load-refdepths.php
@@ -52,7 +52,7 @@ if (($GLOBALS['cache_instance']->loadCacheFile('refdepths')) && ($GLOBALS['cache
 	$GLOBALS['cache_instance']->init();
 
 	// Load all modules and their data
-	$result = SQL_QUERY('SELECT `id`, `level`, `percents` FROM `{?_MYSQL_PREFIX?}_refdepths` ORDER BY `level` ASC', __FILE__, __LINE__);
+	$result = SQL_QUERY('SELECT `id`,`level`,`percents` FROM `{?_MYSQL_PREFIX?}_refdepths` ORDER BY `level` ASC', __FILE__, __LINE__);
 	while ($content = SQL_FETCHARRAY($result)) {
 		// Add row to cache file
 		$GLOBALS['cache_instance']->addRow($content);
diff --git a/inc/loader/load-refsystem.php b/inc/loader/load-refsystem.php
index 0cef9084bd..1d3625053d 100644
--- a/inc/loader/load-refsystem.php
+++ b/inc/loader/load-refsystem.php
@@ -52,7 +52,7 @@ if (($GLOBALS['cache_instance']->loadCacheFile('refsystem')) && ($GLOBALS['cache
 	$GLOBALS['cache_instance']->init();
 
 	// Load all modules and their data
-	$result = SQL_QUERY('SELECT `id`, `userid`, `level`, `counter` FROM `{?_MYSQL_PREFIX?}_refsystem` ORDER BY `userid` ASC, `level` ASC', __FILE__, __LINE__);
+	$result = SQL_QUERY('SELECT `id`,`userid`,`level`,`counter` FROM `{?_MYSQL_PREFIX?}_refsystem` ORDER BY `userid` ASC, `level` ASC', __FILE__, __LINE__);
 	while ($content = SQL_FETCHARRAY($result)) {
 		// Add row to cache file
 		$GLOBALS['cache_instance']->addRow($content);
diff --git a/inc/loader/load-themes.php b/inc/loader/load-themes.php
index d41705652a..8f06873a0f 100644
--- a/inc/loader/load-themes.php
+++ b/inc/loader/load-themes.php
@@ -76,9 +76,9 @@ if (($GLOBALS['cache_instance']->loadCacheFile('themes')) && ($GLOBALS['cache_in
 
 	// Load all themes and their data
 	if (isExtensionInstalledAndNewer('theme', '0.0.7')) {
-		$result = SQL_QUERY('SELECT `id`, `theme_path`, `theme_active`, `theme_ver`, `theme_name` FROM `{?_MYSQL_PREFIX?}_themes` ORDER BY `id` ASC', __FILE__, __LINE__);
+		$result = SQL_QUERY('SELECT `id`,`theme_path`,`theme_active`,`theme_ver`,`theme_name` FROM `{?_MYSQL_PREFIX?}_themes` ORDER BY `id` ASC', __FILE__, __LINE__);
 	} else {
-		$result = SQL_QUERY('SELECT `id`, `theme_path`, `theme_active`, `theme_ver` FROM `{?_MYSQL_PREFIX?}_themes` ORDER BY `id` ASC', __FILE__, __LINE__);
+		$result = SQL_QUERY('SELECT `id`,`theme_path`,`theme_active`,`theme_ver` FROM `{?_MYSQL_PREFIX?}_themes` ORDER BY `id` ASC', __FILE__, __LINE__);
 	}
 	while ($content = SQL_FETCHARRAY($result)) {
 		// Add row to cache file
diff --git a/inc/mails/beg_mails.php b/inc/mails/beg_mails.php
index cc1d3db2f5..9cc3453a72 100644
--- a/inc/mails/beg_mails.php
+++ b/inc/mails/beg_mails.php
@@ -50,7 +50,7 @@ $mark = mktime(0, 0, 0, getLastMonth(), getDay(), getYear());
 $sql = ''; $mode = '';
 
 // Shall I sent activation or deactivation mail?
-$sql = "SELECT `userid`, `email` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE (`beg_rallye_enable_notify` ";
+$sql = "SELECT `userid`,`email` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE (`beg_rallye_enable_notify` ";
 switch (getBegRallye()) {
 	case 'Y': // Begging rallye is activated
 		if (isBegRallyeEnableNotifyEnabled()) {
diff --git a/inc/mails/bonus_mails.php b/inc/mails/bonus_mails.php
index 9927f8c33f..adc43c69b6 100644
--- a/inc/mails/bonus_mails.php
+++ b/inc/mails/bonus_mails.php
@@ -50,7 +50,7 @@ $mark = mktime(0, 0, 0, getLastMonth(), getDay(), getYear());
 $sql = ''; $mode = '';
 
 // Shall I sent activation or deactivation mail?
-$sql = "SELECT `userid`, `email` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE (`bonus_rallye_enable_notify` ";
+$sql = "SELECT `userid`,`email` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE (`bonus_rallye_enable_notify` ";
 switch (getConfig('bonus_active')) {
 	case 'Y': // Active rallye is activated
 		if (getConfig('bonus_enable_notify') == 'Y') {
diff --git a/inc/mails/doubler_mails.php b/inc/mails/doubler_mails.php
index 81069f6f7c..b7ac0e243e 100644
--- a/inc/mails/doubler_mails.php
+++ b/inc/mails/doubler_mails.php
@@ -155,20 +155,14 @@ if (((!SQL_HASZERONUMS($result_total)) && (getConfig('doubler_sent_all') == 'Y')
 			// Check for jackpot inclusion in doubling process
 			if (($jackpotPoints > 0) && ($jackpotPoints >= $content['points']) && (getConfig('doubler_jackpot') == 'Y')) {
 				// Subtract points from jackpot
-				subtractPointsFromJackpot($content['points']);
+				$okay = subtractPointsFromJackpot($content['points']);
 				$jackpotPoints -= $content['points'];
-
-				// Okay, done!
-				$okay = true;
 			} // END - if
 
 			// Exclude also webmaster's id in taking points from webmaster's account
 			if (($userPoints > 0) && ($userPoints >= $content['points']) && ($okay === false) && (getConfig('doubler_userid') > 0) && ($content['userid'] != getConfig('doubler_userid'))) {
-				// Add points to used points
-				subtractPoints('doubler_payout', getConfig('doubler_userid'), $content['points']);
-
-				// Okay, done!
-				$okay = true;
+				// Subtract points
+				$okay = subtractPoints('doubler_payout', getConfig('doubler_userid'), $content['points']);
 			} // END - if
 
 			// Update doubler's account only when others are not updated
diff --git a/inc/module-functions.php b/inc/module-functions.php
index a0841a6a60..cc75df10fb 100644
--- a/inc/module-functions.php
+++ b/inc/module-functions.php
@@ -84,8 +84,8 @@ function getModuleTitle ($module) {
 			// No name found
 			$data['title'] = '{%message,UNKNOWN_MODULE_DETECTED_TITLE=' . $module . '%}';
 			if ((is_resource($result)) && (SQL_HASZERONUMS($result))) {
-				// Add module to database
-				$dummy = checkModulePermissions($module);
+				// Add module to database and ignore return value
+				checkModulePermissions($module);
 			} // END - if
 		}
 	} // END - if
@@ -139,7 +139,7 @@ function isModuleRegistered ($module) {
 	} elseif (!isExtensionActive('cache')) {
 		// Check for module in database
 		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using database.');
-		$result = SQL_QUERY_ESC("SELECT `locked`, `hidden`, `admin_only`, `mem_only` FROM `{?_MYSQL_PREFIX?}_mod_reg` WHERE `module`='%s' LIMIT 1",
+		$result = SQL_QUERY_ESC("SELECT `locked`,`hidden`,`admin_only`,`mem_only` FROM `{?_MYSQL_PREFIX?}_mod_reg` WHERE `module`='%s' LIMIT 1",
 			array($module), __FUNCTION__, __LINE__);
 		if (SQL_NUMROWS($result) == 1) {
 			// Read data
@@ -286,13 +286,13 @@ function checkModulePermissions ($module = '') {
 				 * hour to find a loop here... *sigh*
 				 */
 				SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_mod_reg`
-(`module`, `locked`, `hidden`, `mem_only`, `admin_only`, `has_menu`)
+(`module`,`locked`,`hidden`,`mem_only`,`admin_only`,`has_menu`)
 VALUES
 ('%s','Y','N','N','N','N')", array($module_chk), __FUNCTION__, __LINE__);
 			} else {
 				// Wrong/missing sql_patches!
 				SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_mod_reg`
-(`module`, `locked`, `hidden`, `mem_only`, `admin_only`)
+(`module`,`locked`,`hidden`,`mem_only`,`admin_only`)
 VALUES
 ('%s','Y','N','N','N')", array($module_chk), __FUNCTION__, __LINE__);
 			}
@@ -396,7 +396,7 @@ function addModuleSql ($module, $locked, $hidden, $adminOnly, $memOnly) {
 	// 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",
@@ -409,5 +409,111 @@ function addModuleSql ($module, $locked, $hidden, $adminOnly, $memOnly) {
 	}
 }
 
+// Load the currently set module
+function loadModule () {
+	// By default all modules are invalid
+	$isModuleValid = false;
+
+	// Init module state as 'failed' (always failed first)
+	$moduleState = 'failed';
+
+	// Construct module name
+	$GLOBALS['module_inc'] =  sprintf("inc/modules/%s.php", getModule());
+
+	// Check module permission (again)
+	$moduleState = checkModulePermissions();
+
+	// Which permission/error state do we have?
+	switch ($moduleState) {
+		case 'cache_miss': // The cache is gone
+		case 'admin_only': // Admin-only access
+		case 'mem_only': // Member-only access
+		case 'done': // All fine!
+			// Does the module exists on local file system?
+			if ((isIncludeReadable($GLOBALS['module_inc'])) && (!ifFatalErrorsDetected())) {
+				// Module is valid, active and located on the local disk...
+				$isModuleValid = true;
+			} elseif (!ifFatalErrorsDetected()) {
+				// Set HTTP status
+				setHttpStatus('404');
+
+				// Module not found
+				addFatalMessage(__FUNCTION__, __LINE__, '{--MODULE_REGISTRY_404--}');
+
+				// Set module to error module (non-existent!)
+				setModule('error');
+			}
+			break;
+
+		case '404':
+			// Set HTTP status
+			setHttpStatus('404');
+
+			// Add fatal message
+			addFatalMessage(__FUNCTION__, __LINE__, '{--MODULE_REGISTRY_404--}');
+			break;
+
+		case 'locked':
+			// Set HTTP status
+			setHttpStatus('403 FORBIDDEN');
+
+			if (!isIncludeReadable($GLOBALS['module_inc'])) {
+				// Set HTTP status again
+				setHttpStatus('404 NOT FOUND');
+
+				// Module does addionally not exists
+				addFatalMessage(__FUNCTION__, __LINE__, '{--MODULE_REGISTRY_404--}');
+			} // END - if
+
+			// Add fatal message
+			addFatalMessage(__FUNCTION__, __LINE__, '{--MODULE_REGISTRY_IS_LOCKED--}');
+			break;
+
+		default:
+			// Unknown module status
+			logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unknown status %s return from module check. Module=%s", $moduleState, getModule()));
+			addFatalMessage(__FUNCTION__, __LINE__, '{%message,UNKNOWN_MODULE_STATUS=' . $moduleState . '%}');
+			break;
+	} // END - switch
+
+	// Return status
+	return $isModuleValid;
+}
+
+// Include module
+function doIncludeModule () {
+	// Set content type
+	setContentType('text/html');
+
+	// The header file
+	loadIncludeOnce('inc/header.php');
+
+	// Modules are by default not valid!
+	$isModuleValid = false;
+
+	// By default NULL is used
+	$GLOBALS['module_inc'] = NULL;
+
+	// Is the maintenance mode active or goes all well?
+	if ((isExtensionActive('maintenance')) && (isMaintenanceEnabled()) && (!isAdmin()) && (getModule() != 'admin')) {
+		// Maintain mode is active and you are no admin
+		addFatalMessage(__FUNCTION__, __LINE__, '{--MAILER_DOWN_FOR_MAINTENANCE--}');
+	} elseif ((SQL_IS_LINK_UP()) && (!ifFatalErrorsDetected())) {
+		// Do the small "load module" call
+		$isModuleValid = loadModule();
+	} elseif (!ifFatalErrorsDetected()) {
+		// SQL problems detected
+		addFatalMessage(__FUNCTION__, __LINE__, '{--MYSQL_ERRORS--}');
+	}
+
+	if (($isModuleValid === true) && (!is_null($GLOBALS['module_inc']))) {
+		// Everything is okay so we can load the module
+		loadIncludeOnce($GLOBALS['module_inc']);
+	} // END - if
+
+	// Add the footer (this will call shutdown())
+	loadIncludeOnce('inc/footer.php');
+}
+
 // [EOF]
 ?>
diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index 1f5d396740..f07b057a78 100644
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -52,7 +52,7 @@ function addAdminAccount ($adminLogin, $passHash, $adminEmail) {
 	// Is the entry there?
 	if (SQL_HASZERONUMS($result)) {
 		// Ok, let's create the admin login
-		SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_admins` (`login`, `password`, `email`) VALUES ('%s', '%s', '%s')",
+		SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_admins` (`login`,`password`,`email`) VALUES ('%s', '%s', '%s')",
 			array(
 				$adminLogin,
 				$passHash,
@@ -74,7 +74,7 @@ function addAdminAccount ($adminLogin, $passHash, $adminEmail) {
 function ifAdminLoginDataIsValid ($adminLogin, $adminPassword) {
 	// First of all, no admin login is found, so the admin hash is null
 	$ret = '404';
-	$adminHash = null;
+	$adminHash = NULL;
 
 	// Get admin id from login
 	$adminId = getAdminId($adminLogin);
@@ -235,7 +235,7 @@ LIMIT 1",
 
 // Checks wether current admin is allowed to access given action/what combination
 // (only one is allowed to be null!)
-function isAdminAllowedAccessMenu ($action, $what = null) {
+function isAdminAllowedAccessMenu ($action, $what = NULL) {
 	// Do we have cache?
 	if (!isset($GLOBALS[__FUNCTION__][$action][$what])) {
 		// ACL is always 'allow' when no ext-admins is installed
@@ -259,7 +259,7 @@ function addAdminMenu ($action, $what, $return = false) {
 
 	// Build main menu
 	$result_main = SQL_QUERY("SELECT
-	`action`, `title`, `descr`
+	`action`,`title`,`descr`
 FROM
 	`{?_MYSQL_PREFIX?}_admin_menu`
 WHERE
@@ -316,7 +316,7 @@ ORDER BY
 
 				// Check for menu entries
 				$result_what = SQL_QUERY_ESC("SELECT
-	`what`, `title`, `descr`
+	`what`,`title`,`descr`
 FROM
 	`{?_MYSQL_PREFIX?}_admin_menu`
 WHERE
@@ -403,7 +403,7 @@ ORDER BY
 // Create member selection box
 function addMemberSelectionBox ($def = 0, $add_all = false, $return = false, $none = false, $field = 'userid') {
 	// Output selection form with all confirmed user accounts listed
-	$result = SQL_QUERY("SELECT `userid`, `surname`, `family` FROM `{?_MYSQL_PREFIX?}_user_data` ORDER BY `userid` ASC", __FUNCTION__, __LINE__);
+	$result = SQL_QUERY("SELECT `userid`,`surname`,`family` FROM `{?_MYSQL_PREFIX?}_user_data` ORDER BY `userid` ASC", __FUNCTION__, __LINE__);
 
 	// Default output
 	$OUT = '';
@@ -441,7 +441,7 @@ function adminMenuSelectionBox_DEPRECATED ($mode, $default = '', $defid = '') {
 	$what = "`what` != '' AND `what` IS NOT NULL";
 	if ($mode == 'action') $what = "(`what`='' OR `what` IS NULL) AND `action` != 'login'";
 
-	$result = SQL_QUERY_ESC("SELECT `%s` AS `menu`, `title` FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE ".$what." ORDER BY `sort` ASC",
+	$result = SQL_QUERY_ESC("SELECT `%s` AS `menu`,`title` FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE ".$what." ORDER BY `sort` ASC",
 		array($mode), __FUNCTION__, __LINE__);
 	if (!SQL_HASZERONUMS($result)) {
 		// Load menu as selection
@@ -553,7 +553,7 @@ function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement
 		} // END - foreach
 
 		// Add both in one line
-		$keys = implode('`, `', $keys);
+		$keys = implode('`,`', $keys);
 		$values = implode(', ', $values);
 
 		// Generate SQL string
@@ -751,7 +751,16 @@ function adminChangeActivationStatus ($IDs, $table, $row, $idRow = 'id') {
 }
 
 // Send mails for del/edit/lock build modes
-function sendAdminBuildMails ($mode, $table, $content, $id, $subjectPart = '', $userIdColumn = 'userid') {
+function sendAdminBuildMails ($mode, $tableName, $content, $id, $subjectPart = '', $userIdColumn = array('userid')) {
+	// $tableName must be an array
+	if ((!is_array($tableName)) || (count($tableName) != 1)) {
+		// $tableName is no array
+		debug_report_bug(__FUNCTION__, __LINE__, 'tableName[]=' . gettype($tableName) . '!=array');
+	} elseif ((!is_array($userIdColumn)) || (count($userIdColumn) != 1)) {
+		// $tableName is no array
+		debug_report_bug(__FUNCTION__, __LINE__, 'userIdColumn[]=' . gettype($userIdColumn) . '!=array');
+	} // END - if
+
 	// Default subject is the subject part
 	$subject = $subjectPart;
 
@@ -762,49 +771,54 @@ function sendAdminBuildMails ($mode, $table, $content, $id, $subjectPart = '', $
 	} // END - if
 
 	// Is the raw userid set?
-	if (postRequestParameter($userIdColumn, $id) > 0) {
+	if (postRequestParameter($userIdColumn[0], $id) > 0) {
 		// Load email template
 		if (!empty($subjectPart)) {
-			$mail = loadEmailTemplate('member_' . $mode . '_' . strtolower($subjectPart) . '_' . $table, $content);
+			$mail = loadEmailTemplate('member_' . $mode . '_' . strtolower($subjectPart) . '_' . $tableName[0], $content);
 		} else {
-			$mail = loadEmailTemplate('member_' . $mode . '_' . $table, $content);
+			$mail = loadEmailTemplate('member_' . $mode . '_' . $tableName[0], $content);
 		}
 
 		// Send email out
-		sendEmail(postRequestParameter($userIdColumn, $id), strtoupper('{--MEMBER_' . $subject . '_' . $table . '_SUBJECT--}'), $mail);
+		sendEmail(postRequestParameter($userIdColumn[0], $id), strtoupper('{--MEMBER_' . $subject . '_' . $tableName[0] . '_SUBJECT--}'), $mail);
 	} // END - if
 
 	// Generate subject
-	$subject = strtoupper('{--ADMIN_' . $subject . '_' . $table . '_SUBJECT--}');
+	$subject = strtoupper('{--ADMIN_' . $subject . '_' . $tableName[0] . '_SUBJECT--}');
 
 	// Send admin notification out
 	if (!empty($subjectPart)) {
-		sendAdminNotification($subject, 'admin_' . $mode . '_' . strtolower($subjectPart) . '_' . $table, $content, postRequestParameter($userIdColumn, $id));
+		sendAdminNotification($subject, 'admin_' . $mode . '_' . strtolower($subjectPart) . '_' . $tableName[0], $content, postRequestParameter($userIdColumn[0], $id));
 	} else {
-		sendAdminNotification($subject, 'admin_' . $mode . '_' . $table, $content, postRequestParameter($userIdColumn, $id));
+		sendAdminNotification($subject, 'admin_' . $mode . '_' . $tableName[0], $content, postRequestParameter($userIdColumn[0], $id));
 	}
 }
 
 // Build a special template list
-function adminListBuilder ($listType, $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $userid = 'userid') {
-	// $table and $idColumn must bove be arrays!
-	if (!is_array($table)) {
-		// $table is no array
-		debug_report_bug(__FUNCTION__, __LINE__, 'table[]=' . gettype($table) . '!=array');
+function adminListBuilder ($listType, $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUserId = array('userid')) {
+	// $tableName and $idColumn must bove be arrays!
+	if ((!is_array($tableName)) || (count($tableName) != 1)) {
+		// $tableName is no array
+		debug_report_bug(__FUNCTION__, __LINE__, 'tableName[]=' . gettype($tableName) . '!=array');
 	} elseif (!is_array($idColumn)) {
 		// $idColumn is no array
 		debug_report_bug(__FUNCTION__, __LINE__, 'idColumn[]=' . gettype($idColumn) . '!=array');
+	} elseif ((!is_array($userIdColumn)) || (count($userIdColumn) != 1)) {
+		// $tableName is no array
+		debug_report_bug(__FUNCTION__, __LINE__, 'userIdColumn[]=' . gettype($userIdColumn) . '!=array');
 	}
 
+	// Init row output
 	$OUT = '';
 
 	// "Walk" through all entries
-	foreach ($IDs as $id => $selected) {
+	//* DEBUG: */ debug_report_bug(__FUNCTION__, __LINE__, 'listType=
'.print_r($listType,true).'
,tableName
'.print_r($tableName,true).'
,columns=
'.print_r($columns,true).'
,filterFunctions=
'.print_r($filterFunctions,true).'
,extraValues=
'.print_r($extraValues,true).'
,idColumn=
'.print_r($idColumn,true).'
,userIdColumn=
'.print_r($userIdColumn,true).'
,rawUserId=
'.print_r($rawUserId,true).'
');
+	foreach (postRequestParameter($idColumn[0]) as $id => $selected) {
 		// Secure id number
 		$id = bigintval($id);
 
 		// Get result from a given column array and table name
-		$result = SQL_RESULT_FROM_ARRAY($table[0], $columns, $idColumn[0], $id, __FUNCTION__, __LINE__);
+		$result = SQL_RESULT_FROM_ARRAY($tableName[0], $columns, $idColumn[0], $id, __FUNCTION__, __LINE__);
 
 		// Is there one entry?
 		if (SQL_NUMROWS($result) == 1) {
@@ -817,15 +831,17 @@ function adminListBuilder ($listType, $IDs, $table, $columns, $filterFunctions,
 				$idx = array_search($key, $columns, true);
 
 				// Do we have a userid?
-				if ($key == $userIdColumn) {
+				//* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',userIdColumn=' . $userIdColumn[0]);
+				if ($key == $userIdColumn[0]) {
 					// Add it again as raw id
-					$content[$userIdColumn] = bigintval($value);
-					$content[$userIdColumn . '_raw'] = $content[$userIdColumn];
+					//* DEBUG: */ debug_report_bug(__FUNCTION__, __LINE__, 'key=' . $key . ',userIdColumn=' . $userIdColumn[0]);
+					$content[$userIdColumn[0]] = bigintval($value);
+					$content[$userIdColumn[0] . '_raw'] = $content[$userIdColumn[0]];
 				} // END - if
 
 				// If the key matches the idColumn variable, we need to temporary remember it
-				//* DEBUG: */ debugOutput('key=' . $key . ',idColumn=' . $idColumn . ',value=' . $value);
-				if ($key == $idColumn) {
+				//* DEBUG: */ debugOutput('key=' . $key . ',idColumn=' . $idColumn[0] . ',value=' . $value);
+				if ($key == $idColumn[0]) {
 					// Found, so remember it
 					$GLOBALS['admin_list_builder_id_value'] = $value;
 				} // END - if
@@ -842,7 +858,7 @@ function adminListBuilder ($listType, $IDs, $table, $columns, $filterFunctions,
 			// Then list it
 			$OUT .= loadTemplate(sprintf("admin_%s_%s_row",
 				$listType,
-				$table[0]
+				$tableName[0]
 				), true, $content
 			);
 		} // END - if
@@ -854,23 +870,39 @@ function adminListBuilder ($listType, $IDs, $table, $columns, $filterFunctions,
 	// Load master template
 	loadTemplate(sprintf("admin_%s_%s",
 		$listType,
-		$table[0]
+		$tableName[0]
 		), false, $OUT
 	);
 }
 
 // Change status of "build" list
-function adminBuilderStatusHandler ($mode, $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $statusArray, $userid = 'userid') {
+function adminBuilderStatusHandler ($mode, $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $statusArray, $rawUserId = array('userid')) {
+	// $tableName must be an array
+	if ((!is_array($tableName)) || (count($tableName) != 1)) {
+		// No tableName specified
+		debug_report_bug(__FUNCTION__, __LINE__, 'tableName is not given. Please fix your XML,tableName[]=' . gettype($tableName) . '!=array');
+	} elseif (!is_array($idColumn)) {
+		// $idColumn is no array
+		debug_report_bug(__FUNCTION__, __LINE__, 'idColumn[]=' . gettype($idColumn) . '!=array');
+	} elseif ((!is_array($userIdColumn)) || (count($userIdColumn) != 1)) {
+		// $tableName is no array
+		debug_report_bug(__FUNCTION__, __LINE__, 'userIdColumn[]=' . gettype($userIdColumn) . '!=array');
+	} // END - if
+
 	// All valid entries? (We hope so here!)
-	if ((is_array($IDs)) && (count($IDs) > 0) && (count($columns) == count($filterFunctions)) && (count($columns) == count($extraValues)) && (count($statusArray) > 0)) {
+	if ((count($columns) == count($filterFunctions)) && (count($columns) == count($extraValues)) && (count($statusArray) > 0)) {
 		// "Walk" through all entries
-		foreach ($IDs as $id => $sel) {
+		foreach (postRequestParameter($idColumn[0]) as $id => $sel) {
 			// Construct SQL query
-			$sql = sprintf("UPDATE `{?_MYSQL_PREFIX?}_%s` SET", SQL_ESCAPE($table));
+			$sql = sprintf("UPDATE `{?_MYSQL_PREFIX?}_%s` SET", SQL_ESCAPE($tableName[0]));
 
 			// Load data of entry
 			$result = SQL_QUERY_ESC("SELECT * FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`=%s LIMIT 1",
-				array($table, $idColumn, $id), __FUNCTION__, __LINE__);
+				array(
+					$tableName[0],
+					$idColumn[0],
+					$id
+				), __FUNCTION__, __LINE__);
 
 			// Fetch the data
 			$content = SQL_FETCHARRAY($result);
@@ -907,7 +939,7 @@ function adminBuilderStatusHandler ($mode, $IDs, $table, $columns, $filterFuncti
 				logDebugMessage(__FUNCTION__, __LINE__, 'Found entry: ' . $key);
 
 				// Skip id, raw userid and 'do_$mode'
-				if (!in_array($key, array($idColumn, $userid, ('do_' . $mode)))) {
+				if (!in_array($key, array($idColumn[0], $rawUserId[0], ('do_' . $mode)))) {
 					// Are there brackets () at the end?
 					if (substr($entries[$id], -2, 2) == '()') {
 						// Direct SQL command found
@@ -927,7 +959,7 @@ function adminBuilderStatusHandler ($mode, $IDs, $table, $columns, $filterFuncti
 
 			// Finish SQL statement
 			$sql = substr($sql, 0, -1) . sprintf(" WHERE `%s`=%s AND `%s`='%s' LIMIT 1",
-				$idColumn,
+				$idColumn[0],
 				bigintval($id),
 				$statusColumn,
 				$oldStatus
@@ -943,30 +975,45 @@ function adminBuilderStatusHandler ($mode, $IDs, $table, $columns, $filterFuncti
 			} // END - if
 
 			// Send "build mails" out
-			sendAdminBuildMails($mode, $table, $content, $id, $statusInfo[$content[$column]], $userIdColumn);
+			sendAdminBuildMails($mode, $tableName, $content, $id, $statusInfo[$content[$column]], $userIdColumn);
 		} // END - foreach
 	} // END - if
 }
 
 // Delete rows by given id numbers
-function adminDeleteEntriesConfirm ($IDs, $table, $columns = array(), $filterFunctions = array(), $extraValues = array(), $deleteNow = false, $idColumn = 'id', $userIdColumn = 'userid', $userid = 'userid') {
+function adminDeleteEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $deleteNow = array(false), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid')) {
+	// $tableName must be an array
+	if ((!is_array($tableName)) || (count($tableName) != 1)) {
+		// No tableName specified
+		debug_report_bug(__FUNCTION__, __LINE__, 'tableName is not given. Please fix your XML,tableName[]=' . gettype($tableName) . '!=array');
+	} elseif (!is_array($idColumn)) {
+		// $idColumn is no array
+		debug_report_bug(__FUNCTION__, __LINE__, 'idColumn[]=' . gettype($idColumn) . '!=array');
+	} elseif (!is_array($userIdColumn)) {
+		// $userIdColumn is no array
+		debug_report_bug(__FUNCTION__, __LINE__, 'userIdColumn[]=' . gettype($userIdColumn) . '!=array');
+	} elseif (!is_array($deleteNow)) {
+		// $deleteNow is no array
+		debug_report_bug(__FUNCTION__, __LINE__, 'deleteNow[]=' . gettype($deleteNow) . '!=array');
+	} // END - if
+
 	// All valid entries? (We hope so here!)
-	if ((is_array($IDs)) && (count($IDs) > 0) && (count($columns) == count($filterFunctions)) && (count($columns) == count($extraValues))) {
+	if ((count($columns) == count($filterFunctions)) && (count($columns) == count($extraValues))) {
 		// Shall we delete here or list for deletion?
-		if ($deleteNow === true) {
+		if ($deleteNow[0] === true) {
 			// The base SQL command:
 			$sql = "DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s` IN (%s)";
 
 			// Delete them all
 			$idList = '';
-			foreach ($IDs as $id => $sel) {
+			foreach (postRequestParameter($idColumn[0]) as $id => $sel) {
 				// Is there a userid?
-				if (isPostRequestParameterSet($userid, $id)) {
+				if (isPostRequestParameterSet($rawUserId[0], $id)) {
 					// Load all data from that id
 					$result = SQL_QUERY_ESC("SELECT * FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`=%s LIMIT 1",
 						array(
-							$table,
-							$idColumn,
+							$tableName[0],
+							$idColumn[0],
 							$id
 						), __FUNCTION__, __LINE__);
 
@@ -977,7 +1024,7 @@ function adminDeleteEntriesConfirm ($IDs, $table, $columns = array(), $filterFun
 					SQL_FREERESULT($result);
 
 					// Send "build mails" out
-					sendAdminBuildMails('delete', $table, $content, $id, '', $userIdColumn);
+					sendAdminBuildMails('delete', $tableName, $content, $id, '', $userIdColumn);
 				} // END - if
 
 				// Add id number
@@ -985,48 +1032,64 @@ function adminDeleteEntriesConfirm ($IDs, $table, $columns = array(), $filterFun
 			} // END - foreach
 
 			// Run the query
-			SQL_QUERY_ESC($sql, array($table, $idColumn, substr($idList, 0, -1)), __FUNCTION__, __LINE__);
+			SQL_QUERY_ESC($sql, array($tableName[0], $idColumn[0], substr($idList, 0, -1)), __FUNCTION__, __LINE__);
 
 			// Was this fine?
-			if (SQL_AFFECTEDROWS() == count($IDs)) {
+			if (SQL_AFFECTEDROWS() == count(postRequestParameter($idColumn[0]))) {
 				// All deleted
 				displayMessage('{--ADMIN_ALL_ENTRIES_REMOVED--}');
 			} else {
 				// Some are still there :(
-				displayMessage(sprintf(getMessage('ADMIN_SOME_ENTRIES_NOT_DELETED'), SQL_AFFECTEDROWS(), count($IDs)));
+				displayMessage(sprintf(getMessage('ADMIN_SOME_ENTRIES_NOT_DELETED'), SQL_AFFECTEDROWS(), count(postRequestParameter($idColumn[0]))));
 			}
 		} else {
 			// List for deletion confirmation
-			adminListBuilder('delete', $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
+			adminListBuilder('delete', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
 		}
 	} // END - if
 }
 
 // Edit rows by given id numbers
-function adminEditEntriesConfirm ($IDs, $table, $columns = array(), $filterFunctions = array(), $extraValues = array(), $editNow = false, $idColumn = 'id', $userIdColumn = 'userid', $userid = 'userid') {
+function adminEditEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $editNow = array(false), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid')) {
+	// $tableName must be an array
+	if ((!is_array($tableName)) || (count($tableName) != 1)) {
+		// No tableName specified
+		debug_report_bug(__FUNCTION__, __LINE__, 'tableName is not given. Please fix your XML,tableName[]=' . gettype($tableName) . '!=array');
+	} elseif (!is_array($idColumn)) {
+		// $idColumn is no array
+		debug_report_bug(__FUNCTION__, __LINE__, 'idColumn[]=' . gettype($idColumn) . '!=array');
+	} elseif (!is_array($userIdColumn)) {
+		// $userIdColumn is no array
+		debug_report_bug(__FUNCTION__, __LINE__, 'userIdColumn[]=' . gettype($userIdColumn) . '!=array');
+	} elseif (!is_array($editNow)) {
+		// $editNow is no array
+		debug_report_bug(__FUNCTION__, __LINE__, 'editNow[]=' . gettype($editNow) . '!=array');
+	} // END - if
+
 	// All valid entries? (We hope so here!)
-	if ((is_array($IDs)) && (count($IDs) > 0) && (count($columns) == count($filterFunctions)) && (count($columns) == count($extraValues))) {
+	//* DEBUG: */ debug_report_bug(__FUNCTION__, __LINE__, 'idColumn=
'.print_r($idColumn,true).'
,tableName
'.print_r($tableName,true).'
,columns=
'.print_r($columns,true).'
,filterFunctions=
'.print_r($filterFunctions,true).'
,extraValues=
'.print_r($extraValues,true).'
,editNow=
'.print_r($editNow,true).'
,userIdColumn=
'.print_r($userIdColumn,true).'
,rawUserId=
'.print_r($rawUserId,true).'
');
+	if ((count($columns) == count($filterFunctions)) && (count($columns) == count($extraValues))) {
 		// Shall we change here or list for editing?
-		if ($editNow === true) {
+		if ($editNow[0] === true) {
 			// Change them all
 			$affected = '0';
-			foreach ($IDs as $id => $sel) {
+			foreach (postRequestParameter($idColumn[0]) as $id => $sel) {
 				// Prepare content array (new values)
 				$content = array();
 
 				// Prepare SQL for this row
 				$sql = sprintf("UPDATE `{?_MYSQL_PREFIX?}_%s` SET",
-					SQL_ESCAPE($table)
+					SQL_ESCAPE($tableName[0])
 				);
 				foreach (postRequestArray() as $key => $entries) {
 					// Skip raw userid which is always invalid
-					if ($key == $userid) {
+					if ($key == $rawUserId[0]) {
 						// Continue with next field
 						continue;
 					} // END - if
 
 					// Is entries an array?
-					if (($key != $idColumn) && (is_array($entries)) && (isset($entries[$id]))) {
+					if (($key != $idColumn[0]) && (is_array($entries)) && (isset($entries[$id]))) {
 						// Add this entry to content
 						$content[$key] = $entries[$id];
 
@@ -1041,7 +1104,7 @@ function adminEditEntriesConfirm ($IDs, $table, $columns = array(), $filterFunct
 							SQL_ESCAPE($key),
 							SQL_ESCAPE($entries[$id])
 						);
-					} elseif (($key != $idColumn) && (!is_array($entries))) {
+					} elseif (($key != $idColumn[0]) && (!is_array($entries))) {
 						// Add normal entries as well!
 						$content[$key] =  $entries;
 					}
@@ -1054,7 +1117,7 @@ function adminEditEntriesConfirm ($IDs, $table, $columns = array(), $filterFunct
 				} // END - foreach
 
 				// Finish SQL command
-				$sql = substr($sql, 0, -1) . " WHERE `" . $idColumn . "`=" . bigintval($id) . " LIMIT 1";
+				$sql = substr($sql, 0, -1) . " WHERE `" . $idColumn[0] . "`=" . bigintval($id) . " LIMIT 1";
 
 				// Run this query
 				SQL_QUERY($sql, __FUNCTION__, __LINE__);
@@ -1064,7 +1127,11 @@ function adminEditEntriesConfirm ($IDs, $table, $columns = array(), $filterFunct
 
 				// Load all data from that id
 				$result = SQL_QUERY_ESC("SELECT * FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`=%s LIMIT 1",
-					array($table, $idColumn, $id), __FUNCTION__, __LINE__);
+					array(
+						$tableName[0],
+						$idColumn[0],
+						$id
+					), __FUNCTION__, __LINE__);
 
 				// Fetch the data and merge it into $content
 				$content = merge_array($content, SQL_FETCHARRAY($result));
@@ -1073,66 +1140,136 @@ function adminEditEntriesConfirm ($IDs, $table, $columns = array(), $filterFunct
 				SQL_FREERESULT($result);
 
 				// Send "build mails" out
-				sendAdminBuildMails('edit', $table, $content, $id, '', $userIdColumn);
+				sendAdminBuildMails('edit', $tableName, $content, $id, '', $userIdColumn);
 			} // END - foreach
 
 			// Was this fine?
-			if ($affected == count($IDs)) {
+			if ($affected == count(postRequestParameter($idColumn[0]))) {
 				// All deleted
 				displayMessage('{--ADMIN_ALL_ENTRIES_EDITED--}');
 			} else {
 				// Some are still there :(
-				displayMessage(sprintf(getMessage('ADMIN_SOME_ENTRIES_NOT_EDITED'), $affected, count($IDs)));
+				displayMessage(sprintf(getMessage('ADMIN_SOME_ENTRIES_NOT_EDITED'), $affected, count(postRequestParameter($idColumn[0]))));
 			}
 		} else {
 			// List for editing
-			adminListBuilder('edit', $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
+			adminListBuilder('edit', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
 		}
 	} else {
 		// Maybe some invalid parameters
-		debug_report_bug(__FUNCTION__, __LINE__, 'IDs[]=' . gettype($IDs) . ',table=' . $table . ',columns[]=' . gettype($columns) . ',filterFunctions[]=' . gettype($filterFunctions) . ',extraValues[]=' . gettype($extraValues) . ',idColumn=' . $idColumn . ',userIdColumn=' . $userIdColumn . ' - INVALID!');
+		debug_report_bug(__FUNCTION__, __LINE__, 'tableName=' . $tableName[0] . ',columns[]=' . gettype($columns) . ',filterFunctions[]=' . gettype($filterFunctions) . ',extraValues[]=' . gettype($extraValues) . ',idColumn=' . $idColumn[0] . ',userIdColumn=' . $userIdColumn[0] . ' - INVALID!');
 	}
 }
 
 // Un-/lock rows by given id numbers
-function adminLockEntriesConfirm ($IDs, $table, $columns=array(), $filterFunctions=array(), $extraValues=array(), $statusArray=array(), $lockNow=false, $idColumn='id', $userIdColumn='userid') {
+function adminLockEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $statusArray = array(), $lockNow = array(false), $idColumn = array('id'), $userIdColumn = array('userid')) {
+	// $tableName must be an array
+	if ((!is_array($tableName)) || (count($tableName) != 1)) {
+		// No tableName specified
+		debug_report_bug(__FUNCTION__, __LINE__, 'tableName is not given. Please fix your XML,tableName[]=' . gettype($tableName) . '!=array');
+	} elseif (!is_array($idColumn)) {
+		// $idColumn is no array
+		debug_report_bug(__FUNCTION__, __LINE__, 'idColumn[]=' . gettype($idColumn) . '!=array');
+	} elseif (!is_array($lockNow)) {
+		// $lockNow is no array
+		debug_report_bug(__FUNCTION__, __LINE__, 'lockNow[]=' . gettype($lockNow) . '!=array');
+	} // END - if
+
 	// All valid entries? (We hope so here!)
-	if ((is_array($IDs)) && (count($IDs) > 0) && (count($columns) == count($filterFunctions)) && (count($columns) == count($extraValues)) && (($lockNow === false) || (count($statusArray) == 1))) {
+	if ((count($columns) == count($filterFunctions)) && (count($columns) == count($extraValues)) && (($lockNow[0] === false) || (count($statusArray) == 1))) {
 		// Shall we un-/lock here or list for locking?
-		if ($lockNow === true) {
+		if ($lockNow[0] === true) {
 			// Un-/lock entries
-			adminBuilderStatusHandler('lock', $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $statusArray);
+			adminBuilderStatusHandler('lock', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $statusArray);
 		} else {
 			// List for editing
-			adminListBuilder('lock', $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
+			adminListBuilder('lock', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
 		}
 	} // END - if
 }
 
 // Undelete rows by given id numbers
-function adminUndeleteEntriesConfirm ($IDs, $table, $columns=array(), $filterFunctions=array(), $extraValues=array(), $statusArray=array(), $undeleteNow=false, $idColumn='id', $userIdColumn='userid') {
+function adminUndeleteEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $statusArray = array(), $undeleteNow = array(false), $idColumn = array('id'), $userIdColumn = array('userid')) {
+	// $tableName must be an array
+	if ((!is_array($tableName)) || (count($tableName) != 1)) {
+		// No tableName specified
+		debug_report_bug(__FUNCTION__, __LINE__, 'tableName is not given. Please fix your XML,tableName[]=' . gettype($tableName) . '!=array');
+	} elseif (!is_array($idColumn)) {
+		// $idColumn is no array
+		debug_report_bug(__FUNCTION__, __LINE__, 'idColumn[]=' . gettype($idColumn) . '!=array');
+	} elseif (!is_array($undeleteNow)) {
+		// $undeleteNow is no array
+		debug_report_bug(__FUNCTION__, __LINE__, 'undeleteNow[]=' . gettype($undeleteNow) . '!=array');
+	} // END - if
+
 	// All valid entries? (We hope so here!)
-	if ((is_array($IDs)) && (count($IDs) > 0) && (count($columns) == count($filterFunctions)) && (count($columns) == count($extraValues)) && (($undeleteNow === false) || (count($statusArray) == 1))) {
+	if ((count($columns) == count($filterFunctions)) && (count($columns) == count($extraValues)) && (($undeleteNow[0] === false) || (count($statusArray) == 1))) {
 		// Shall we un-/lock here or list for locking?
-		if ($undeleteNow === true) {
+		if ($undeleteNow[0] === true) {
 			// Undelete entries
-			adminBuilderStatusHandler('undelete', $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $statusArray);
+			adminBuilderStatusHandler('undelete', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $statusArray);
 		} else {
 			// List for editing
-			adminListBuilder('undelete', $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
+			adminListBuilder('undelete', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
 		}
 	} // END - if
 }
 
+// Adds a given entry to the database
+function adminAddEntries ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array()) {
+	//* DEBUG: */ die('columns=
'.print_r($columns,true).'
,filterFunctions=
'.print_r($filterFunctions,true).'
,extraValues=
'.print_r($extraValues,true).'
,POST=
'.print_r($_POST,true).'
');
+	// Verify that tableName and columns are not empty
+	if ((!is_array($tableName)) || (count($tableName) != 1)) {
+		// No tableName specified
+		debug_report_bug(__FUNCTION__, __LINE__, 'tableName is not given. Please fix your XML,tableName[]=' . gettype($tableName) . '!=array');
+	} elseif (count($columns) == 0) {
+		// No columns specified
+		debug_report_bug(__FUNCTION__, __LINE__, 'columns is not given. Please fix your XML.');
+	}
+
+	// Init columns and value elements
+	$sqlColumns = array();
+	$sqlValues  = array();
+
+	// Add columns and values
+	foreach ($columns as $key=>$columnName) {
+		// Copy entry to final arrays
+		$sqlColumns[$key] = $columnName;
+		$sqlValues[$key]  = postRequestParameter($columnName);
+		//* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key='.$key.',columnName='.$columnName.',filterFunctions='.$filterFunctions[$key].',extraValues='.intval(isset($extraValues[$key])).',extraValuesName='.intval(isset($extraValues[$columnName . '_list'])).'
');
+
+		// Send data through the filter function if found
+		if ((isset($filterFunctions[$key])) && (isset($extraValues[$key . '_list']))) {
+			// Filter function set!
+			$sqlValues[$key] = call_user_func_array($filterFunctions[$key], merge_array(array($columnName), $extraValues[$key . '_list']));
+		} // END - if
+	} // END - foreach
+
+	// Build the SQL query
+	$SQL = 'INSERT INTO `{?_MYSQL_PREFIX?}_' . $tableName[0] . '` (`' . implode('`, `', $sqlColumns) . "`) VALUES('" . implode("','", $sqlValues) . "')";
+
+	// Run the SQL query
+	SQL_QUERY($SQL, __FUNCTION__, __LINE__);
+
+	// Entry has been added?
+	if (!SQL_HASZEROAFFECTED()) {
+		// Display success message
+		displayMessage('{--ADMIN_ENTRY_ADDED--}');
+	} else {
+		// Display failed message
+		displayMessage('{--ADMIN_ENTRY_NOT_ADDED--}');
+	}
+}
+
 // List all given rows (callback function from XML)
 function adminListEntries ($tableTemplate, $rowTemplate, $noEntryMessageId, $tableName, $columns, $whereColumns, $orderByColumns, $callbackColumns, $extraParameters = array()) {
 	// Verify that tableName and columns are not empty
-	if (count($tableName) != 1) {
+	if ((!is_array($tableName)) || (count($tableName) != 1)) {
 		// No tableName specified
-		debug_report_bug(__FUNCTION__, __LINE__, 'tableName is not given. Please fix your XML. tableTemplate=' . $tableTemplate . ',rowTemplate=' . $rowTemplate);
+		debug_report_bug(__FUNCTION__, __LINE__, 'tableName is not given. Please fix your XML,tableName[]=' . gettype($tableName) . '!=array,tableTemplate=' . $tableTemplate . ',rowTemplate=' . $rowTemplate);
 	} elseif (count($columns) == 0) {
 		// No columns specified
-		debug_report_bug(__FUNCTION__, __LINE__, 'columns is not given. Please fix your XML. tableTemplate=' . $tableTemplate . ',rowTemplate=' . $rowTemplate . ',tableName[0]=' . $tableName[0]);
+		debug_report_bug(__FUNCTION__, __LINE__, 'columns is not given. Please fix your XML,tableTemplate=' . $tableTemplate . ',rowTemplate=' . $rowTemplate . ',tableName[0]=' . $tableName[0]);
 	}
 
 	// This is the minimum query, so at least columns and tableName must have entries
@@ -1245,7 +1382,7 @@ function doAdminListEntries ($SQL, $tableTemplate, $noEntryMessageId, $rowTempla
 		loadTemplate(trim($tableTemplate[0]), false, $OUT);
 	} else {
 		// No URLs in surfbar
-		displayMessage('{--' .$noEntryMessageId . '--}');
+		displayMessage('{--' .$noEntryMessageId[0] . '--}');
 	}
 
 	// Free result
@@ -1273,7 +1410,7 @@ function sendAdminPasswordResetLink ($email) {
 	$OUT = '';
 
 	// Look up administator login
-	$result = SQL_QUERY_ESC("SELECT `id`, `login`, `password` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `email`='%s' LIMIT 1",
+	$result = SQL_QUERY_ESC("SELECT `id`,`login`,`password` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `email`='%s' LIMIT 1",
 		array($email), __FUNCTION__, __LINE__);
 
 	// Is there an account?
@@ -1311,7 +1448,7 @@ function adminResetValidateHashLogin ($hash, $login) {
 	$valid = false;
 
 	// Then try to find that user
-	$result = SQL_QUERY_ESC("SELECT `id`, `password`, `email` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `login`='%s' LIMIT 1",
+	$result = SQL_QUERY_ESC("SELECT `id`,`password`,`email` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `login`='%s' LIMIT 1",
 		array($login), __FUNCTION__, __LINE__);
 
 	// Is an account here?
diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php
index 2ba0d8721b..ed8f411107 100644
--- a/inc/modules/admin/overview-inc.php
+++ b/inc/modules/admin/overview-inc.php
@@ -102,7 +102,7 @@ function outputStandardOverview (&$result_tasks) {
 
 	// At last - but not least - check for own and new unassigned tasks...
 	$result_tasks = SQL_QUERY_ESC("SELECT
-	`id`, `assigned_admin`, `userid`, `task_type`, `subject`, `text`, `task_created`
+	`id`,`assigned_admin`,`userid`,`task_type`,`subject`,`text`,`task_created`
 FROM
 	`{?_MYSQL_PREFIX?}_task_system`
 WHERE
@@ -133,7 +133,7 @@ function outputSeletectedTasks ($postData, $result_tasks) {
 		$OUT = '';
 		foreach ($postData['sel'] as $taskId => $sel) {
 			$result_task = SQL_QUERY_ESC("SELECT
-	`id`, `userid`, `task_type`, `subject`, `text`, `task_created`, `status`, `assigned_admin`
+	`id`,`userid`,`task_type`,`subject`,`text`,`task_created`,`status`,`assigned_admin`
 FROM
 	`{?_MYSQL_PREFIX?}_task_system`
 WHERE
@@ -412,7 +412,7 @@ LIMIT 1",
 			}
 
 			// Update query
-			$result_tasks = SQL_QUERY_ESC("SELECT `id`, `assigned_admin`, `userid`, `task_type`, `subject`, `text`, `task_created` FROM `{?_MYSQL_PREFIX?}_task_system` WHERE `assigned_admin`=%s OR ((`assigned_admin`=0 OR `assigned_admin` IS NULL) AND `status`='NEW') ORDER BY `task_created` DESC",
+			$result_tasks = SQL_QUERY_ESC("SELECT `id`,`assigned_admin`,`userid`,`task_type`,`subject`,`text`,`task_created` FROM `{?_MYSQL_PREFIX?}_task_system` WHERE `assigned_admin`=%s OR ((`assigned_admin`=0 OR `assigned_admin` IS NULL) AND `status`='NEW') ORDER BY `task_created` DESC",
 				array(getCurrentAdminId()), __FILE__, __LINE__);
 		} // END - if
 
diff --git a/inc/modules/admin/what-add_rallye.php b/inc/modules/admin/what-add_rallye.php
index d3cae625a0..aafcac4b0d 100644
--- a/inc/modules/admin/what-add_rallye.php
+++ b/inc/modules/admin/what-add_rallye.php
@@ -49,12 +49,12 @@ if (isFormSent()) {
 	$END   = mktime(postRequestParameter('end_hour')  , postRequestParameter('end_min')  , postRequestParameter('end_sec')  , postRequestParameter('end_month')  , postRequestParameter('end_day')  , postRequestParameter('end_year')  );
 
 	// Is there already a rallye running?
-	$result = SQL_QUERY_ESC("SELECT `id`, `admin_id` FROM `{?_MYSQL_PREFIX?}_rallye_data` WHERE (`start_time` <= %s AND `end_time` >= %s) OR (`start_time` >= %s AND `start_time` <= %s) LIMIT 1",
+	$result = SQL_QUERY_ESC("SELECT `id`,`admin_id` FROM `{?_MYSQL_PREFIX?}_rallye_data` WHERE (`start_time` <= %s AND `end_time` >= %s) OR (`start_time` >= %s AND `start_time` <= %s) LIMIT 1",
 		array($START, $START, $START, $END), __FILE__, __LINE__);
 
 	if (SQL_HASZERONUMS($result)) {
 		// Ok, start and end time did not overlap
-		SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_rallye_data` (`admin_id`, `title`, `descr`, template, `start_time`, `end_time`, `auto_add_new_user`, `is_active`, `send_notify`)
+		SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_rallye_data` (`admin_id`,`title`,`descr`, template, `start_time`,`end_time`,`auto_add_new_user`,`is_active`,`send_notify`)
 VALUES (%s,'%s','%s','%s',%s,%s,'%s','%s','%s')",
 			array(
 				getCurrentAdminId(),
diff --git a/inc/modules/admin/what-admin_add.php b/inc/modules/admin/what-admin_add.php
index aef693aec4..8363be5858 100644
--- a/inc/modules/admin/what-admin_add.php
+++ b/inc/modules/admin/what-admin_add.php
@@ -53,7 +53,7 @@ if (!isFormSent()) {
 	$menus = array(); $titles = array(); $below = array();
 
 	// Get all available main menus
-	$result = SQL_QUERY("SELECT `action`, `title`, `sort` FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE (`what`='' OR `what` IS NULL) ORDER BY `sort` ASC", __FILE__, __LINE__);
+	$result = SQL_QUERY("SELECT `action`,`title`,`sort` FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE (`what`='' OR `what` IS NULL) ORDER BY `sort` ASC", __FILE__, __LINE__);
 	if (!SQL_HASZERONUMS($result)) {
 		// Read menu structure
 		// @TODO Cant this be rewritten?
@@ -91,7 +91,7 @@ if (!isFormSent()) {
 
 		// Load sub menus :)
 		foreach ($menus as $key_main => $value_main) {
-			$result = SQL_QUERY_ESC("SELECT `what`, `title`, `sort` FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort` ASC",
+			$result = SQL_QUERY_ESC("SELECT `what`,`title`,`sort` FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort` ASC",
 				array($value_main), __FILE__, __LINE__);
 			if (!SQL_HASZERONUMS($result)) {
 				// Init arrays
@@ -125,13 +125,13 @@ if (!isFormSent()) {
 					} else {
 						$prev = $value;
 					}
-				}
+				} // END - foreach
 				$menus[$value_main] = $dmy;
 				$titles[$value_main] = $dmy2;
 				$below[$value_main] = $dmy3;
-			}
-		}
-	}
+			} // END - if
+		} // END - foreach
+	} // END - if
 
 	$OUT = '    
+	if (isConfigEntrySet($configEntry)) {
+		// Configuration entry is found
+		$OUT = '';
+	} // END - if
+
+	// Return it
+	return $OUT;
+}
+
+// Helper function to create a selection box for YES/NO form fields
+function doTemplateYesNoSelectionBox ($template, $clear, $formField) {
+	// Generate the HTML code
+	$OUT = '';
+
+	// Return it
+	return $OUT;
+}
+
+// Helper function to create a selection box for YES/NO form fields, by NO is default
+function doTemplateNoYesSelectionBox ($template, $clear, $formField) {
+	// Generate the HTML code
+	$OUT = '';
 
 	// Return it
diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index 01a4fe9c34..cf55c4e282 100644
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -571,7 +571,7 @@ function isNicknameUsed ($userid) {
 // Getter for 'what' value
 function getWhat () {
 	// Default is null
-	$what = null;
+	$what = NULL;
 
 	// Is the value set?
 	if (isWhatSet(true)) {
@@ -615,7 +615,7 @@ function isWhatSet ($strict =  false) {
 // Getter for 'action' value
 function getAction ($strict = true) {
 	// Default is null
-	$action = null;
+	$action = NULL;
 
 	// Is the value set?
 	if (isActionSet(($strict) && (isHtmlOutputMode()))) {
@@ -650,7 +650,7 @@ function isActionSet ($strict =  false) {
 // Getter for 'module' value
 function getModule ($strict = true) {
 	// Default is null
-	$module = null;
+	$module = NULL;
 
 	// Is the value set?
 	if (isModuleSet($strict)) {
@@ -688,7 +688,7 @@ function getScriptOutputMode () {
 	// Do we have cache?
 	if (!isset($GLOBALS[__FUNCTION__])) {
 		// Default is null
-		$output_mode = null;
+		$output_mode = NULL;
 
 		// Is the value set?
 		if (isOutputModeSet(true)) {
@@ -962,7 +962,7 @@ function getUserData ($column) {
 	} // END - if
 
 	// Default is empty
-	$data = null;
+	$data = NULL;
 
 	if (isset($GLOBALS['user_data'][getCurrentUserId()][$column])) {
 		// Return the value
@@ -1297,7 +1297,7 @@ function getDateTimeFromRepository () {
 }
 
 // Getter for current year (default)
-function getYear ($timestamp = null) {
+function getYear ($timestamp = NULL) {
 	// Is it cached?
 	if (!isset($GLOBALS[__FUNCTION__][$timestamp])) {
 		// null is time()
@@ -1314,7 +1314,7 @@ function getYear ($timestamp = null) {
 }
 
 // Getter for current month (default)
-function getMonth ($timestamp = null) {
+function getMonth ($timestamp = NULL) {
 	// Is it cached?
 	if (!isset($GLOBALS[__FUNCTION__][$timestamp])) {
 		// If null is set, use time()
@@ -1332,7 +1332,7 @@ function getMonth ($timestamp = null) {
 }
 
 // Getter for current hour (default)
-function getHour ($timestamp = null) {
+function getHour ($timestamp = NULL) {
 	// Is it cached?
 	if (!isset($GLOBALS[__FUNCTION__][$timestamp])) {
 		// null is time()
@@ -1349,7 +1349,7 @@ function getHour ($timestamp = null) {
 }
 
 // Getter for current day (default)
-function getDay ($timestamp = null) {
+function getDay ($timestamp = NULL) {
 	// Is it cached?
 	if (!isset($GLOBALS[__FUNCTION__][$timestamp])) {
 		// null is time()
@@ -1366,7 +1366,7 @@ function getDay ($timestamp = null) {
 }
 
 // Getter for current week (default)
-function getWeek ($timestamp = null) {
+function getWeek ($timestamp = NULL) {
 	// Is it cached?
 	if (!isset($GLOBALS[__FUNCTION__][$timestamp])) {
 		// null is time()
@@ -1381,7 +1381,7 @@ function getWeek ($timestamp = null) {
 }
 
 // Getter for current short_hour (default)
-function getShortHour ($timestamp = null) {
+function getShortHour ($timestamp = NULL) {
 	// Is it cached?
 	if (!isset($GLOBALS[__FUNCTION__][$timestamp])) {
 		// null is time()
@@ -1396,7 +1396,7 @@ function getShortHour ($timestamp = null) {
 }
 
 // Getter for current long_hour (default)
-function getLongHour ($timestamp = null) {
+function getLongHour ($timestamp = NULL) {
 	// Is it cached?
 	if (!isset($GLOBALS[__FUNCTION__][$timestamp])) {
 		// null is time()
@@ -1411,7 +1411,7 @@ function getLongHour ($timestamp = null) {
 }
 
 // Getter for current second (default)
-function getSecond ($timestamp = null) {
+function getSecond ($timestamp = NULL) {
 	// Is it cached?
 	if (!isset($GLOBALS[__FUNCTION__][$timestamp])) {
 		// null is time()
@@ -1426,7 +1426,7 @@ function getSecond ($timestamp = null) {
 }
 
 // Getter for current minute (default)
-function getMinute ($timestamp = null) {
+function getMinute ($timestamp = NULL) {
 	// Is it cached?
 	if (!isset($GLOBALS[__FUNCTION__][$timestamp])) {
 		// null is time()
@@ -2376,6 +2376,54 @@ function getUrlTlock () {
 	return $GLOBALS[__FUNCTION__];
 }
 
+// Getter for 'check_double_email'
+function getCheckDoubleEmail () {
+	// Is the cache entry set?
+	if (!isset($GLOBALS[__FUNCTION__])) {
+		// No, so determine it
+		$GLOBALS[__FUNCTION__] = getConfig('check_double_email');
+	} // END - if
+
+	// Return cached entry
+	return $GLOBALS[__FUNCTION__];
+}
+
+// Checks wether 'check_double_email' is 'Y'
+function isCheckDoubleEmailEnabled () {
+	// Is the cache entry set?
+	if (!isset($GLOBALS[__FUNCTION__])) {
+		// No, so determine it
+		$GLOBALS[__FUNCTION__] = (getCheckDoubleEmail() == 'Y');
+	} // END - if
+
+	// Return cached entry
+	return $GLOBALS[__FUNCTION__];
+}
+
+// Getter for 'display_home_in_index'
+function getDisplayHomeInIndex () {
+	// Is the cache entry set?
+	if (!isset($GLOBALS[__FUNCTION__])) {
+		// No, so determine it
+		$GLOBALS[__FUNCTION__] = getConfig('display_home_in_index');
+	} // END - if
+
+	// Return cached entry
+	return $GLOBALS[__FUNCTION__];
+}
+
+// Checks wether 'display_home_in_index' is 'Y'
+function isDisplayHomeInIndexEnabled () {
+	// Is the cache entry set?
+	if (!isset($GLOBALS[__FUNCTION__])) {
+		// No, so determine it
+		$GLOBALS[__FUNCTION__] = (getDisplayHomeInIndex() == 'Y');
+	} // END - if
+
+	// Return cached entry
+	return $GLOBALS[__FUNCTION__];
+}
+
 // Checks wether proxy configuration is used
 function isProxyUsed () {
 	// Do we have cache?
@@ -2541,7 +2589,7 @@ function createConfigurationTimeSelections ($configEntry, $stamps, $align = 'cen
 	$configValue = getConfig($configEntry);
 
 	// Call inner method
-	return createTimeSelections($configValue, $configEntry, $stamps, $align);
+	return createTimeSelections($configValue, $configEntry, $stamps, $align, true);
 }
 
 // Shortens converting of German comma to Computer's version in POST data
@@ -2608,33 +2656,5 @@ function getTotalUnconfirmedMails ($userid) {
 	return $GLOBALS[__FUNCTION__][$userid];
 }
 
-//-----------------------------------------------------------------------------
-//                        Configuration wrapper
-//-----------------------------------------------------------------------------
-
-// Getter for 'check_double_email'
-function getCheckDoubleEmail () {
-	// Is the cache entry set?
-	if (!isset($GLOBALS[__FUNCTION__])) {
-		// No, so determine it
-		$GLOBALS[__FUNCTION__] = getConfig('check_double_email');
-	} // END - if
-
-	// Return cached entry
-	return $GLOBALS[__FUNCTION__];
-}
-
-// Checks wether 'check_double_email' is 'Y'
-function isCheckDoubleEmailEnabled () {
-	// Is the cache entry set?
-	if (!isset($GLOBALS[__FUNCTION__])) {
-		// No, so determine it
-		$GLOBALS[__FUNCTION__] = (getCheckDoubleEmail() == 'Y');
-	} // END - if
-
-	// Return cached entry
-	return $GLOBALS[__FUNCTION__];
-}
-
 // [EOF]
 ?>
diff --git a/inc/xml-functions.php b/inc/xml-functions.php
index f2de150926..09373597f1 100644
--- a/inc/xml-functions.php
+++ b/inc/xml-functions.php
@@ -194,7 +194,7 @@ function isInvalidXmlType ($type) {
 	$type = strtolower(trim($type));
 
 	// Is it found?
-	return (in_array($type, array('string', 'array', 'bool', 'int')));
+	return (in_array($type, array('string', 'array', 'bool', 'int', 'callback')));
 }
 
 // Checks if given condition is valid
diff --git a/index.php b/index.php
index 52c0c20051..de74187c5a 100644
--- a/index.php
+++ b/index.php
@@ -55,41 +55,47 @@ $GLOBALS['output_mode'] = '0';
 // Load config.php
 require('inc/config-global.php');
 
-// Set content type
-setContentType('text/html');
+// Shall we display 'home' in index.php?
+if (isDisplayHomeInIndexEnabled()) {
+	// Include module
+	doIncludeModule();
+} else {
+	// Check for cookies
+	if ((isSessionVariableSet('visited')) || (getConfig('index_delay') > -1)) {
+		// Set content type
+		setContentType('text/html');
 
-// Check for cookies
-if ((isSessionVariableSet('visited')) || (getConfig('index_delay') > -1)) {
-	// Header
-	loadIncludeOnce('inc/header.php');
+		// Header
+		loadIncludeOnce('inc/header.php');
 
-	// Is the index page configured for redirect pr not?
-	if (getConfig('index_cookie') > 0) {
-		// Set cookie and remeber it for specified time
-		setSession('visited', 'true');
-	} elseif (isSessionVariableSet('visited')) {
-		// Remove cookie when admin set 0 in setup
-		setSession('visited', '');
-	}
+		// Is the index page configured for redirect pr not?
+		if (getConfig('index_cookie') > 0) {
+			// Set cookie and remeber it for specified time
+			setSession('visited', 'true');
+		} elseif (isSessionVariableSet('visited')) {
+			// Remove cookie when admin set 0 in setup
+			setSession('visited', '');
+		}
 
-	// Template laden
-	loadTemplate('index');
+		// Template laden
+		loadTemplate('index');
 
-	// Shall I insert an automated forward?
-	if (getConfig('index_delay') > 0) {
-		// This will be a JavaScript-redirect!
-		$content['delay']  = (getConfig('index_delay') * 1000 + 500);
-		$content['module'] = 'index';
+		// Shall I insert an automated forward?
+		if (getConfig('index_delay') > 0) {
+			// This will be a JavaScript-redirect!
+			$content['delay']  = (getConfig('index_delay') * 1000 + 500);
+			$content['module'] = 'index';
 
-		// Load template
-		loadTemplate('index_forward', false, $content);
-	} // END - if
+			// Load template
+			loadTemplate('index_forward', false, $content);
+		} // END - if
 
-	// Footer
-	loadIncludeOnce('inc/footer.php');
-} else {
-	// Redirect to main page
-	redirectToUrl('modules.php?module=index');
+		// Footer (which will call shutdown() for us)
+		loadIncludeOnce('inc/footer.php');
+	} else {
+		// Redirect to main page
+		redirectToUrl('modules.php?module=index');
+	}
 }
 
 // [EOF]
diff --git a/install/menu-de.sql b/install/menu-de.sql
index 6e4a3bac3e..d257a91e33 100644
--- 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öschen','Löschen Sie hierrüber E-Mails (sowohl Bonus- als auch Normal-Mails) aus Ihrem {?mt_word?}-System. Nur bei Normal-Mails: {OPEN_CONFIG}POINTS{CLOSE_CONFIG} aus den unbestätigten Mails werden dem Werber wieder vergütet.','7');
-INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES ('misc','extensions','Erweiterungen','Erweiterungen installieren, updaten, sperren, löschen usw.','8');
+INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('email','del_email','E-Mail löschen','Löschen Sie hierrüber E-Mails (sowohl Bonus- als auch Normal-Mails) aus Ihrem {?mt_word?}-System. Nur bei Normal-Mails: {OPEN_CONFIG}POINTS{CLOSE_CONFIG} aus den unbestätigten Mails werden dem Werber wieder vergütet.','7');
+INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('misc','extensions','Erweiterungen','Erweiterungen installieren, updaten, sperren, lö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 702285728e..a08a1739b7 100644
--- 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öschen','Löschen Sie hierrüber E-Mails (sowohl Bonus- als auch Normal-Mails) aus Ihrem {?mt_word?}-System. Nur bei Normal-Mails: {OPEN_CONFIG}POINTS{CLOSE_CONFIG} aus den unbestätigten Mails werden dem Werber wieder vergütet.','7');
-INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES ('misc','extensions','Erweiterungen','Erweiterungen installieren, updaten, sperren, löschen usw.','8');
+INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('email','del_email','E-Mail löschen','Löschen Sie hierrüber E-Mails (sowohl Bonus- als auch Normal-Mails) aus Ihrem {?mt_word?}-System. Nur bei Normal-Mails: {OPEN_CONFIG}POINTS{CLOSE_CONFIG} aus den unbestätigten Mails werden dem Werber wieder vergütet.','7');
+INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('misc','extensions','Erweiterungen','Erweiterungen installieren, updaten, sperren, lö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 528c4deac4..9a177b93d3 100644
--- 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?}_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.php b/mailid.php
index 162ff01041..691017aa90 100644
--- a/mailid.php
+++ b/mailid.php
@@ -97,7 +97,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 		switch ($ltype) {
 			case 'NORMAL':
 				// Is the stats id valid?
-				$result = SQL_QUERY_ESC("SELECT `pool_id`, `url`, `subject` FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `id`=%s LIMIT 1",
+				$result = SQL_QUERY_ESC("SELECT `pool_id`,`url`,`subject` FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `id`=%s LIMIT 1",
 					array($mailId), __FILE__, __LINE__);
 				break;
 
@@ -106,7 +106,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 				redirectOnUninstalledExtension('bonus');
 
 				// Bonus-Mails
-				$result = SQL_QUERY_ESC("SELECT `id`, `url`, `subject` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
+				$result = SQL_QUERY_ESC("SELECT `id`,`url`,`subject` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
 					array($bonusId), __FILE__, __LINE__);
 				break;
 
@@ -153,7 +153,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 							break;
 
 						case 'BONUS':
-							$result = SQL_QUERY_ESC("SELECT `points`, `time` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
+							$result = SQL_QUERY_ESC("SELECT `points`,`time` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
 								array($bonusId), __FILE__, __LINE__);
 							if (SQL_NUMROWS($result) == 1) {
 								list($points, $time) = SQL_FETCHROW($result);
diff --git a/mailid_top.php b/mailid_top.php
index 57c541e972..dbd32df25c 100644
--- a/mailid_top.php
+++ b/mailid_top.php
@@ -84,12 +84,12 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 
 	// Maybe he wants to confirm an email?
 	if ($mailId > 0) {
-		$result_main = SQL_QUERY_ESC("SELECT `id`, `link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `stats_id`=%s AND `userid`=%s LIMIT 1",
+		$result_main = SQL_QUERY_ESC("SELECT `id`,`link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `stats_id`=%s AND `userid`=%s LIMIT 1",
 			array($mailId, $userId), __FILE__, __LINE__);
 		$type = 'mailid';
 		$urlId = $mailId;
 	} elseif ($bonusId > 0) {
-		$result_main = SQL_QUERY_ESC("SELECT `id`, `link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `bonus_id`=%s AND `userid`=%s LIMIT 1",
+		$result_main = SQL_QUERY_ESC("SELECT `id`,`link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `bonus_id`=%s AND `userid`=%s LIMIT 1",
 			array($bonusId, $userId), __FILE__, __LINE__);
 		$type = 'bonusid';
 		$urlId = $bonusId;
@@ -105,12 +105,12 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 		// @TODO Rewrite this to a filter
 		switch ($ltype) {
 			case 'NORMAL':
-				$result_mailid = SQL_QUERY_ESC("SELECT `pool_id`, `userid`, `id` FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `id`=%s LIMIT 1",
+				$result_mailid = SQL_QUERY_ESC("SELECT `pool_id`,`userid`,`id` FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `id`=%s LIMIT 1",
 					array($mailId), __FILE__, __LINE__);
 				break;
 
 			case 'BONUS':
-				$result_mailid = SQL_QUERY_ESC("SELECT `id`, `id`, `is_notify` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
+				$result_mailid = SQL_QUERY_ESC("SELECT `id`,`id`,`is_notify` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
 					array($bonusId), __FILE__, __LINE__);
 				break;
 
@@ -154,7 +154,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 							break;
 
 						case 'BONUS':
-							$result = SQL_QUERY_ESC("SELECT `time`, `points` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
+							$result = SQL_QUERY_ESC("SELECT `time`,`points` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
 								array(bigintval($pool)), __FILE__, __LINE__);
 
 							// Entry found?
diff --git a/modules.php b/modules.php
index 09fef37135..cf9d281b44 100644
--- a/modules.php
+++ b/modules.php
@@ -51,93 +51,8 @@ $GLOBALS['module'] = 'unknown';
 // Needed include files
 require('inc/config-global.php');
 
-// Set content type
-setContentType('text/html');
-
-// The header file
-loadIncludeOnce('inc/header.php');
-
-// Modules are by default not valid!
-$isModuleValid = false;
-
-// Init module state as 'failed' (always failed first)
-$moduleState = 'failed';
-
-// Is the maintenance mode active or goes all well?
-if ((isExtensionActive('maintenance')) && (isMaintenanceEnabled()) && (!isAdmin()) && (getModule() != 'admin')) {
-	// Maintain mode is active and you are no admin
-	addFatalMessage(__FILE__, __LINE__, '{--MAILER_DOWN_FOR_MAINTENANCE--}');
-} elseif ((SQL_IS_LINK_UP()) && (!ifFatalErrorsDetected())) {
-	// Construct module name
-	$GLOBALS['module_inc'] =  sprintf("inc/modules/%s.php", getModule());
-
-	// Check module permission (again)
-	$moduleState = checkModulePermissions();
-
-	// Which permission/error state do we have?
-	switch ($moduleState) {
-		case 'cache_miss': // The cache is gone
-		case 'admin_only': // Admin-only access
-		case 'mem_only': // Member-only access
-		case 'done': // All fine!
-			// Does the module exists on local file system?
-			if ((isIncludeReadable($GLOBALS['module_inc'])) && (!ifFatalErrorsDetected())) {
-				// Module is valid, active and located on the local disc...
-				$isModuleValid = true;
-			} elseif (!ifFatalErrorsDetected()) {
-				// Set HTTP status
-				setHttpStatus('404');
-
-				// Module not found
-				addFatalMessage(__FILE__, __LINE__, '{--MODULE_REGISTRY_404--}');
-
-				// Set module to error module (non-existent!)
-				setModule('error');
-			}
-			break;
-
-		case '404':
-			// Set HTTP status
-			setHttpStatus('404');
-
-			// Add fatal message
-			addFatalMessage(__FILE__, __LINE__, '{--MODULE_REGISTRY_404--}');
-			break;
-
-		case 'locked':
-			// Set HTTP status
-			setHttpStatus('403 FORBIDDEN');
-
-			if (!isIncludeReadable($GLOBALS['module_inc'])) {
-				// Set HTTP status again
-				setHttpStatus('404 NOT FOUND');
-
-				// Module does addionally not exists
-				addFatalMessage(__FILE__, __LINE__, '{--MODULE_REGISTRY_404--}');
-			} // END - if
-
-			// Add fatal message
-			addFatalMessage(__FILE__, __LINE__, '{--MODULE_REGISTRY_IS_LOCKED--}');
-			break;
-
-		default:
-			// Unknown module status
-			logDebugMessage(__FILE__, __LINE__, sprintf("Unknown status %s return from module check. Module=%s", $moduleState, getModule()));
-			addFatalMessage(__FILE__, __LINE__, '{%message,UNKNOWN_MODULE_STATUS=' . $moduleState . '%}');
-			break;
-	} // END - switch
-} elseif (!ifFatalErrorsDetected()) {
-	// SQL problems detected
-	addFatalMessage(__FILE__, __LINE__, '{--MYSQL_ERRORS--}');
-}
-
-if (($isModuleValid === true) && (isset($GLOBALS['module_inc']))) {
-	// Everything is okay so we can load the module
-	loadIncludeOnce($GLOBALS['module_inc']);
-} // END - if
-
-// Add the footer (this will call shutdown())
-loadIncludeOnce('inc/footer.php');
+// Include module
+doIncludeModule();
 
 // [EOF]
 ?>
diff --git a/templates/de/emails/member/member_surfbar_url_pending_rejected.tpl b/templates/de/emails/member/member_surfbar_url_pending_rejected.tpl
index 0e231647ec..d3d3ac99f2 100644
--- a/templates/de/emails/member/member_surfbar_url_pending_rejected.tpl
+++ b/templates/de/emails/member/member_surfbar_url_pending_rejected.tpl
@@ -4,7 +4,7 @@ Ein Administrator hat soeben Ihre gebuchte URL für unsere Surfbar abgelehnt
 
 Hier sind alle Daten dazu:
 ------------------------------------------
-Mitglieder-Id: $content[url_userid]
+Mitglieder-Id: $content[url_id]
 ------------------------------------------
 Gebuchte URL: $content[url]
 ------------------------------------------
diff --git a/templates/de/html/admin/admin_add_forced_ad.tpl b/templates/de/html/admin/admin_add_forced_ad.tpl
new file mode 100644
index 0000000000..66049a3253
--- /dev/null
+++ b/templates/de/html/admin/admin_add_forced_ad.tpl
@@ -0,0 +1,111 @@
+

+

+
+	
+		
+	
+
+	
+		
+		
+	
+
+	
+		
+		
+	
+
+	
+		
+		
+	
+
+	
+		
+		
+	
+
+	
+		
+		
+	
+
+	
+		
+		
+	
+
+	
+		
+	
+
+	
+		
+		
+	
+
+	
+		
+		
+	
+
+	
+		
+	
+
+	
+		
+		
+	
+
+	
+		
+	
+

+			{--ADMIN_ADD_FORCED_AD_TITLE--}
+		

+			{--ADMIN_ENTER_FORCED_AD_CLICK_URL--}
+		
+			
+		

+			{--ADMIN_ENTER_FORCED_ALTERNATE_TEXT--}
+		
+			
+		

+			{--ADMIN_SELECT_FORCED_HAS_FRAMEBREAKER--}
+		
+			{%template,NoYesSelectionBox=forced_ads_framebreaker%}
+		

+			{--ADMIN_ENTER_FORCED_AD_RELOAD_LOCK--}
+		
+			$content[reload_lock]
+		

+			{--ADMIN_ENTER_FORCED_AD_MINIMUM_STAY--}
+		
+			$content[min_stay]
+		

+			{--ADMIN_SELECT_FORCED_AD_TYPE--}
+		
+			{%template,ForcedAdTypeSelectionBox%}
+		

+			{--ADMIN_ADD_FORCED_AD_POPUP_BANNER_ONLY--}
+		

+			{--ADMIN_ENTER_FORCED_AD_WIDTH--}
+		
+			
+		

+			{--ADMIN_ENTER_FORCED_AD_HEIGHT--}
+		
+			
+		

+			{--ADMIN_ADD_FORCED_AD_ADDITIONAL_DATA--}
+		

+			{--ADMIN_ENTER_FORCED_AD_URL--}
+		
+			
+		

+			
+			
+		

+

+

diff --git a/templates/de/html/admin/admin_config_bonus.tpl b/templates/de/html/admin/admin_config_bonus.tpl
index dab831ea97..c67ed28c0a 100644
--- a/templates/de/html/admin/admin_config_bonus.tpl
+++ b/templates/de/html/admin/admin_config_bonus.tpl
@@ -27,7 +27,7 @@
 			{--ADMIN_CONFIG_BONUS_RALLYE_CLICK_INCLUDE--}
 		
 		
-			{%template,ConfigurationYesNoSelectionBox=bonus_click%}
+			{%template,ConfigurationYesNoSelectionBox=include_bonus_click%}
 		
 	
 	
@@ -35,7 +35,7 @@
 			{--ADMIN_CONFIG_BONUS_RALLYE_LOGIN_INCLUDE--}
 		
 		
-			{%template,ConfigurationYesNoSelectionBox=bonus_login%}
+			{%template,ConfigurationYesNoSelectionBox=include_bonus_login%}
 		
 	
 	
@@ -43,7 +43,7 @@
 			{--ADMIN_CONFIG_BONUS_RALLYE_ORDER_INCLUDE--}
 		
 		
-			{%template,ConfigurationYesNoSelectionBox=bonus_order%}
+			{%template,ConfigurationYesNoSelectionBox=include_bonus_order%}
 		
 	
 	
@@ -51,7 +51,7 @@
 			{--ADMIN_CONFIG_BONUS_RALLYE_STATS_INCLUDE--}
 		
 		
-			{%template,ConfigurationYesNoSelectionBox=bonus_stats%}
+			{%template,ConfigurationYesNoSelectionBox=include_bonus_stats%}
 		
 	
 	
@@ -59,7 +59,7 @@
 			{--ADMIN_CONFIG_BONUS_RALLYE_REFERAL_INCLUDE--}
 		
 		
-			{%template,ConfigurationYesNoSelectionBox=bonus_ref%}
+			{%template,ConfigurationYesNoSelectionBox=include_bonus_ref%}
 		
 	
 	
diff --git a/templates/de/html/admin/admin_config_home.tpl b/templates/de/html/admin/admin_config_home.tpl
index 6115145207..a186d50bf2 100644
--- a/templates/de/html/admin/admin_config_home.tpl
+++ b/templates/de/html/admin/admin_config_home.tpl
@@ -1,20 +1,48 @@
 

-
+
+

-		
-		
-		
-		
+		
+		
+	
+	
+		
+		
+	
+	
+		
+		
-	$content
 	
-		

 	

-			{--ADMIN_CONFIG_HOME_TITLE--}
+		
+			{--ADMIN_CONFIG_HOME_SETTINGS_TITLE--}
 		
 	

 	
{--ID_SELECT--}{--ADMIN_MENU_WHAT--}{--ADMIN_HOME_ACTION--}
+			{--ADMIN_CONFIG_INDEX_DELAY--}
+		
+			
+		
{--ADMIN_CONFIG_INDEX_COOKIE--}$content[cookie_selection]
{--ADMIN_CONFIG_INDEX_DISPLAY_HOME_IN_INDEX--}
+			{%template,ConfigurationYesNoSelectionBox=display_home_in_index%}
+		
 	

-			
{--ADMIN_CONFIG_HOME_NOTE--}

+				
+			
+			
 		
 	

 

+
 

diff --git a/templates/de/html/admin/admin_config_home_row.tpl b/templates/de/html/admin/admin_config_home_row.tpl
index 46a6323541..11f5d85d80 100644
--- a/templates/de/html/admin/admin_config_home_row.tpl
+++ b/templates/de/html/admin/admin_config_home_row.tpl
@@ -1,7 +1 @@
-
-	$content[id]
-	$content[title]
-	
-		$content[link]
-	
-
+
diff --git a/templates/de/html/admin/admin_config_home_settings.tpl b/templates/de/html/admin/admin_config_home_settings.tpl
index be203fef84..11f5d85d80 100644
--- a/templates/de/html/admin/admin_config_home_settings.tpl
+++ b/templates/de/html/admin/admin_config_home_settings.tpl
@@ -1,42 +1 @@
-

-

-
-	
-		
-	
-	
-		
-		
-	
-	
-		
-		
-	
-	
-		
-	
-

-			{--ADMIN_CONFIG_HOME_SETTINGS_TITLE--}
-		

-			{--ADMIN_CONFIG_INDEX_DELAY--}:
-		
-			
-		
{--ADMIN_CONFIG_INDEX_COOKIE--}$content[cookie_selection]

-			
-			
-		

-

-

+
diff --git a/templates/de/html/admin/admin_delete_surfbar_urls_row.tpl b/templates/de/html/admin/admin_delete_surfbar_urls_row.tpl
index 31f5d51f30..c9d7a77bec 100644
--- a/templates/de/html/admin/admin_delete_surfbar_urls_row.tpl
+++ b/templates/de/html/admin/admin_delete_surfbar_urls_row.tpl
@@ -1,7 +1,7 @@
 
 	
 		
-		
+		
 		$content[url_userid]
 	
 	
diff --git a/templates/de/html/admin/admin_edit_surfbar_urls_row.tpl b/templates/de/html/admin/admin_edit_surfbar_urls_row.tpl
index 45c4ab22c1..5d1aa450fd 100644
--- a/templates/de/html/admin/admin_edit_surfbar_urls_row.tpl
+++ b/templates/de/html/admin/admin_edit_surfbar_urls_row.tpl
@@ -1,7 +1,7 @@
 
 	
 		
-		
+		
 		$content[url_userid]
 	
 	
diff --git a/templates/de/html/admin/admin_list_forced_ads.tpl b/templates/de/html/admin/admin_list_forced_ads.tpl
new file mode 100644
index 0000000000..b6fc2585c2
--- /dev/null
+++ b/templates/de/html/admin/admin_list_forced_ads.tpl
@@ -0,0 +1,29 @@
+

+

+
+
+	
+
+
+	
+	
+	
+	
+	
+	
+	
+
+$content
+
+	
+
+

+		{--ADMIN_LIST_FORCED_ADS_TITLE--}
+	
{--ID_SELECT--}{--ADMIN_TEST_URL--}{--ADMIN_FORCED_ADS_TYPE--}{--ADMIN_FORCED_ADS_HAS_FRAMEBREAKER--}{--ADMIN_FORCED_ADS_ADDED--}{--ADMIN_FORCED_ADS_LAST_LOCKED--}{--ADMIN_FORCED_ADS_LOCK_REASON--}

+		
+		
+		
+		
+	

+

+

diff --git a/templates/de/html/admin/admin_list_forced_ads_row.tpl b/templates/de/html/admin/admin_list_forced_ads_row.tpl
new file mode 100644
index 0000000000..a9fd1e38ad
--- /dev/null
+++ b/templates/de/html/admin/admin_list_forced_ads_row.tpl
@@ -0,0 +1,23 @@
+
+	
+		
+	
+	
+		{--ADMIN_TEST_URL--}
+	
+	
+		{%pipe,translateForcedAdType=$content[forced_ads_type]%}
+	
+	
+		{%pipe,translateYesNo=$content[forced_ads_framebreaker]%}
+	
+	
+		$content[forced_ads_added]
+	
+	
+		$content[forced_ads_last_locked]
+	
+	
+		{%pipe,fixEmptyContentToDashes=$content[forced_ads_lock_reason]%}
+	
+
diff --git a/templates/de/html/admin/admin_list_home.tpl b/templates/de/html/admin/admin_list_home.tpl
new file mode 100644
index 0000000000..6115145207
--- /dev/null
+++ b/templates/de/html/admin/admin_list_home.tpl
@@ -0,0 +1,20 @@
+

+
+	
+		
+	
+	
+		
+		
+		
+	
+	$content
+	
+		
+	
+

+			{--ADMIN_CONFIG_HOME_TITLE--}
+		
{--ID_SELECT--}{--ADMIN_MENU_WHAT--}{--ADMIN_HOME_ACTION--}

+			
{--ADMIN_CONFIG_HOME_NOTE--}

+		

+

diff --git a/templates/de/html/admin/admin_list_home_row.tpl b/templates/de/html/admin/admin_list_home_row.tpl
new file mode 100644
index 0000000000..46a6323541
--- /dev/null
+++ b/templates/de/html/admin/admin_list_home_row.tpl
@@ -0,0 +1,7 @@
+
+	$content[id]
+	$content[title]
+	
+		$content[link]
+	
+
diff --git a/templates/de/html/admin/admin_list_mods_stats.tpl b/templates/de/html/admin/admin_list_mods_stats.tpl
new file mode 100644
index 0000000000..b8f1e31f93
--- /dev/null
+++ b/templates/de/html/admin/admin_list_mods_stats.tpl
@@ -0,0 +1,13 @@
+

+
+	
+		
+		
+	
+	$content
+	
+		
+	
+
{--ADMIN_MODS_TITLE--}{--ADMIN_MODS_CLICKS--}
{--ADMIN_MODS_EDIT_NOTE--}

+

diff --git a/templates/de/html/admin/admin_list_mods_stats2.tpl b/templates/de/html/admin/admin_list_mods_stats2.tpl
new file mode 100644
index 0000000000..fadb0d881c
--- /dev/null
+++ b/templates/de/html/admin/admin_list_mods_stats2.tpl
@@ -0,0 +1,14 @@
+

+
+	
+		
+		
+	
+	$content
+	
+		
+	
+
{--ADMIN_MODS_WHAT_ACTION--}{--ADMIN_MODS_CLICKS--}

+			{--ADMIN_MODS_STATS_FOOTER--}
+		

+

diff --git a/templates/de/html/admin/admin_list_mods_stats2_row.tpl b/templates/de/html/admin/admin_list_mods_stats2_row.tpl
new file mode 100644
index 0000000000..ca7ddb52c8
--- /dev/null
+++ b/templates/de/html/admin/admin_list_mods_stats2_row.tpl
@@ -0,0 +1,8 @@
+
+	
+		{%pipe,fixEmptyContentToDashes=$content[title]%} ($content[action])
+	
+	
+		$content[counter]
+	
+
diff --git a/templates/de/html/admin/admin_list_mods_stats_row.tpl b/templates/de/html/admin/admin_list_mods_stats_row.tpl
new file mode 100644
index 0000000000..66f908f07a
--- /dev/null
+++ b/templates/de/html/admin/admin_list_mods_stats_row.tpl
@@ -0,0 +1,8 @@
+
+	
+		{%pipe,fixEmptyContentToDashes=$content[title]%} ($content[module])
+	
+	
+		{%pipe,translateComma=$content[clicks]%}
+	
+
diff --git a/templates/de/html/admin/admin_lock_surfbar_urls_row.tpl b/templates/de/html/admin/admin_lock_surfbar_urls_row.tpl
index 3d16f13619..969e5f5a15 100644
--- a/templates/de/html/admin/admin_lock_surfbar_urls_row.tpl
+++ b/templates/de/html/admin/admin_lock_surfbar_urls_row.tpl
@@ -1,7 +1,7 @@
 
 	
 		
-		
+		
 		
 		$content[url_userid]
 	
diff --git a/templates/de/html/admin/admin_mods_stats.tpl b/templates/de/html/admin/admin_mods_stats.tpl
index bb5a210d75..11f5d85d80 100644
--- a/templates/de/html/admin/admin_mods_stats.tpl
+++ b/templates/de/html/admin/admin_mods_stats.tpl
@@ -1,11 +1 @@
-
-	
-		
-		
-	
-	$content
-	
-		
-	
-
{--ADMIN_MODS_TITLE--}{--ADMIN_MODS_CLICKS--}
{--ADMIN_MODS_EDIT_NOTE--}

+
diff --git a/templates/de/html/admin/admin_mods_stats2.tpl b/templates/de/html/admin/admin_mods_stats2.tpl
index fadb0d881c..11f5d85d80 100644
--- a/templates/de/html/admin/admin_mods_stats2.tpl
+++ b/templates/de/html/admin/admin_mods_stats2.tpl
@@ -1,14 +1 @@
-

-
-	
-		
-		
-	
-	$content
-	
-		
-	
-
{--ADMIN_MODS_WHAT_ACTION--}{--ADMIN_MODS_CLICKS--}

-			{--ADMIN_MODS_STATS_FOOTER--}
-		

-

+
diff --git a/templates/de/html/admin/admin_mods_stats2_row.tpl b/templates/de/html/admin/admin_mods_stats2_row.tpl
index ca7ddb52c8..11f5d85d80 100644
--- a/templates/de/html/admin/admin_mods_stats2_row.tpl
+++ b/templates/de/html/admin/admin_mods_stats2_row.tpl
@@ -1,8 +1 @@
-
-	
-		{%pipe,fixEmptyContentToDashes=$content[title]%} ($content[action])
-	
-	
-		$content[counter]
-	
-
+
diff --git a/templates/de/html/admin/admin_mods_stats_row.tpl b/templates/de/html/admin/admin_mods_stats_row.tpl
index 3a55187f94..11f5d85d80 100644
--- a/templates/de/html/admin/admin_mods_stats_row.tpl
+++ b/templates/de/html/admin/admin_mods_stats_row.tpl
@@ -1,8 +1 @@
-
-	
-		{%pipe,fixEmptyContentToDashes=$content[title]%} ($content[module])
-	
-	
-		$content[clicks]
-	
-
+
diff --git a/templates/de/html/admin/admin_undelete_surfbar_urls_row.tpl b/templates/de/html/admin/admin_undelete_surfbar_urls_row.tpl
index 6ac05fe1ce..53c040eea1 100644
--- a/templates/de/html/admin/admin_undelete_surfbar_urls_row.tpl
+++ b/templates/de/html/admin/admin_undelete_surfbar_urls_row.tpl
@@ -1,7 +1,7 @@
 
 	
 		
-		
+		
 		$content[url_userid]
 	
 	
diff --git a/templates/de/html/beg/beg_banner.tpl b/templates/de/html/beg/beg_banner.tpl
index 713c28838e..11f5d85d80 100644
--- a/templates/de/html/beg/beg_banner.tpl
+++ b/templates/de/html/beg/beg_banner.tpl
@@ -1 +1 @@
-Dieser Text steht im Template beg_banner.tpl und möchte geändert werden!
+
diff --git a/templates/de/html/beg/beg_done.tpl b/templates/de/html/beg/beg_done.tpl
index 53937baace..82596b3cb0 100644
--- a/templates/de/html/beg/beg_done.tpl
+++ b/templates/de/html/beg/beg_done.tpl
@@ -1,11 +1,11 @@
-

+

 	{--BEG_USERID_STEAL_1--}$content[userid]{--BEG_USERID_STEAL_2--}{%pipe,translateComma=$content[points]%}{--BEG_USERID_STEAL_3--}
 

 
-

+

 	{%message,BEG_CLICKS=$content[clicks]%}
 

 
-

+

 	{--BEG_THANKS_FOR_CLICK--}
 

diff --git a/templates/de/html/beg/beg_footer_banner.tpl b/templates/de/html/beg/beg_footer_banner.tpl
new file mode 100644
index 0000000000..3b5e68992c
--- /dev/null
+++ b/templates/de/html/beg/beg_footer_banner.tpl
@@ -0,0 +1 @@
+Dieser Text steht im Template beg_footer_banner.tpl und möchte geändert werden!
diff --git a/templates/de/html/beg/beg_header_banner.tpl b/templates/de/html/beg/beg_header_banner.tpl
new file mode 100644
index 0000000000..04d6e8a3b7
--- /dev/null
+++ b/templates/de/html/beg/beg_header_banner.tpl
@@ -0,0 +1 @@
+Dieser Text steht im Template beg_header_banner.tpl und möchte geändert werden!
diff --git a/templates/de/html/beg/beg_link.tpl b/templates/de/html/beg/beg_link.tpl
index a2d0f4c22d..e3f8caae2d 100644
--- a/templates/de/html/beg/beg_link.tpl
+++ b/templates/de/html/beg/beg_link.tpl
@@ -2,7 +2,7 @@
 
@@ -17,7 +17,7 @@
 					{%message,BEG_LINK_USERID=$content[userid]%}
 				
-			

+			

 				
$content[message]

 			

 			

@@ -28,7 +28,7 @@
 	

 	

 		
-			
$content[banner]

+			
$content[header_banner]

 				
 	

 	

 			

 	

 		
-			
$content[banner]

+			
$content[footer_banner]

 				
 	

 

diff --git a/templates/de/html/ext/ext_forced.tpl b/templates/de/html/ext/ext_forced.tpl
index 550e5b1cae..0b47867b98 100644
--- a/templates/de/html/ext/ext_forced.tpl
+++ b/templates/de/html/ext/ext_forced.tpl
@@ -1,8 +1,9 @@
 

-Lassen Sie Ihre Sponsoren Forced-Banner oder -Textlinks buchen und geben Sie
-Ihren Mitgliedern für jeden Klick einen festen - alternativ auch
-dynamischen - Betrag an {OPEN_CONFIG}POINTS{CLOSE_CONFIG}. Sie können auch
-selber welche einstellen bzw. aus den Werbenetzwerken welche übernehmen.
+Lassen Sie Ihre Sponsoren und Mitglieder Forced-Banner oder -Textlinks buchen
+und geben Sie Ihren Mitgliedern für jeden Klick einen festen - alternativ
+auch dynamischen - Betrag an {OPEN_CONFIG}POINTS{CLOSE_CONFIG}. Sie können
+auch selber welche einstellen bzw. aus den Werbenetzwerken welche
+übernehmen.
 

 
 

diff --git a/templates/de/html/ext/ext_surfbar.tpl b/templates/de/html/ext/ext_surfbar.tpl
index 523132ffad..fd42b7db63 100644
--- a/templates/de/html/ext/ext_surfbar.tpl
+++ b/templates/de/html/ext/ext_surfbar.tpl
@@ -1,5 +1,5 @@
 

-Eine Surfbar für Ihre Mitglieder mit prozentualer Ref-Vergütung
+Ein Besuchertausch für Ihre Mitglieder mit prozentualer Ref-Vergütung
 (optional) und vielem mehr. Die gebuchten URLs werden bei aktivierter Surfbar-
 Erweiterung automatisch in ihr gesammelt und sind dann sofort ansurfbar. Die
 Vergütung kann zu einem Fix-Preis erfolgen oder auch dynamisch.
@@ -20,11 +20,12 @@ jedoch nur von der Basisvergütung berechnet.
 

 
 

-Es können auch URLs direkt und nur in die Surfbar gebucht werden. Sie
-können zudem eigene URLs (nur aus Werbenetzwerken nehmen, wo das
-Einbinden der URL in eine Surfbar erlaubt ist!) aus dem Adminbereich
-hinzufügen und dabei eine Reload-Sperre unabhängig von den
-Ausgangseinstellungen in Sekunden angeben.
+Es können auch URLs direkt und nur in den Besuchertausch gebucht werden.
+Sie können zudem eigene URLs (eigene URLs oder aus Werbenetzwerken
+"Traffic-Kampagnen" nehmen, wo das Einbinden der URL in einen
+Besuchertausch erlaubt ist!) aus dem Adminbereich hinzufügen und dabei
+eine Reload-Sperre unabhängig von den Ausgangseinstellungen in Sekunden
+angeben.
 

 
 

diff --git a/templates/de/html/ext/ext_teams.tpl b/templates/de/html/ext/ext_teams.tpl
new file mode 100644
index 0000000000..faf742e058
--- /dev/null
+++ b/templates/de/html/ext/ext_teams.tpl
@@ -0,0 +1,37 @@
+

+	Ihre Mitglieder können Teams bilden um ein gemeinsames Ziel (z.B. den
+	Gewinn einer Referal-Rallye) zu erreichen. Dabei können Sie den
+	Mitgliedern eine Frist setzen, bis wann die Team-Anmeldungen bzw.
+	-beitritte, -austritte oder -wechsel maximal geschehen dürfen. Teams
+	sind vielfältig einsetzbar, Teams können gegeneinander in
+	verschiedenen Rallyes antreten, der Gewinn wird dann nach vom Administrator
+	einstellbare Kriterien an die Mitglieder des gewinnenden Teams aufgeteilt.
+

+
+

+	Auch ist eine Jackpot-Jagt zwischen den Teams möglich, wo dann der
+	Jackpot nach vom Administrator einstellbare Kriterien aufgeteilt wird.
+

+
+

+	Ein Aufteilungskriteritum kann z.B. während des vergangenen Zeitraums
+	der erwirtschaftete {?POINTS?}-Stand sein (dieser wird separat pro
+	Teammitglied und separat für das gesamte Team gemessen). Der Gewinn
+	teilt sich dann anhand des zuvor genannten, erwirtschafteten Guthabens sich
+	prozentual auf.
+

+
+

+	Hingegen ist bei einem statischen Kriteritum (beide gleichzeitig geht nicht)
+	der Gewinn des einzelnen Mitgliedes sein in dem Zeitraum erwirtschaftesten
+	Guthaben. Beide Kriterien sind für jede Rallye individuell einstellbar.
+

+
+

+	Generell - also ohne irgendwelche Rallyes - sind Teams dazu da um zum
+	Beispiel Guthaben in einem gemeinsamen Werbetopf (der nicht
+	auszahlungfähig ist) zu sammeln und die Gründungsmitglieder
+	können dann mit dem Guthaben Buchungen aufgeben (auch als
+	"Team-Buchung" im Script genannt). Bei generellen Teams ist
+	dem Teamleiter erlaubt, Kriterien in vom Administrator festlegbaren
+

diff --git a/templates/de/html/select/select_forced_ads_type_box.tpl b/templates/de/html/select/select_forced_ads_type_box.tpl
new file mode 100644
index 0000000000..8bc5eb9120
--- /dev/null
+++ b/templates/de/html/select/select_forced_ads_type_box.tpl
@@ -0,0 +1,3 @@
+

+	$content[selection_box]
+

diff --git a/templates/de/html/select/select_forced_ads_type_option.tpl b/templates/de/html/select/select_forced_ads_type_option.tpl
new file mode 100644
index 0000000000..a49aa0fae7
--- /dev/null
+++ b/templates/de/html/select/select_forced_ads_type_option.tpl
@@ -0,0 +1,3 @@
+
diff --git a/templates/xml/admin/admin_add_do_forced_ads.xml b/templates/xml/admin/admin_add_do_forced_ads.xml
new file mode 100644
index 0000000000..4b989c7653
--- /dev/null
+++ b/templates/xml/admin/admin_add_do_forced_ads.xml
@@ -0,0 +1,120 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+		
+		
+		
+		
+		
+		
+		
+		
+		
+	
+	
+	
+		
+		
+		
+		
+		
+		
+		
+		
+		
+	
+	
+	
+		
+		
+		
+		
+		
+		
+			
+			
+				
+				
+			
+		
+		
+		
+			
+			
+				
+				
+			
+		
+		
+		
+		
+		
+		
+	
+
diff --git a/templates/xml/admin/admin_delete_do_surfbar_urls.xml b/templates/xml/admin/admin_delete_do_surfbar_urls.xml
index 4ecd4e3c8c..a2dbf7543f 100644
--- a/templates/xml/admin/admin_delete_do_surfbar_urls.xml
+++ b/templates/xml/admin/admin_delete_do_surfbar_urls.xml
@@ -32,10 +32,6 @@ MA  02110-1301  USA
 	//-->
 	
 	
-	
-	
 	
diff --git a/templates/xml/admin/admin_delete_show_surfbar_urls.xml b/templates/xml/admin/admin_delete_show_surfbar_urls.xml
index 3d70110a6e..bbb1134220 100644
--- a/templates/xml/admin/admin_delete_show_surfbar_urls.xml
+++ b/templates/xml/admin/admin_delete_show_surfbar_urls.xml
@@ -32,10 +32,6 @@ MA  02110-1301  USA
 	//-->
 	
 	
-	
-	
 	
diff --git a/templates/xml/admin/admin_edit_do_surfbar_urls.xml b/templates/xml/admin/admin_edit_do_surfbar_urls.xml
index daa5e51005..00a792109a 100644
--- a/templates/xml/admin/admin_edit_do_surfbar_urls.xml
+++ b/templates/xml/admin/admin_edit_do_surfbar_urls.xml
@@ -32,10 +32,6 @@ MA  02110-1301  USA
 	//-->
 	
 	
-	
-	
 	
diff --git a/templates/xml/admin/admin_edit_show_surfbar_urls.xml b/templates/xml/admin/admin_edit_show_surfbar_urls.xml
index 7afa2acc67..88b6306507 100644
--- a/templates/xml/admin/admin_edit_show_surfbar_urls.xml
+++ b/templates/xml/admin/admin_edit_show_surfbar_urls.xml
@@ -32,10 +32,6 @@ MA  02110-1301  USA
 	//-->
 	
 	
-	
-	
 	
@@ -65,7 +61,7 @@ MA  02110-1301  USA
 		//-->
 		
 		
-		 
+		
 	
 	
 		
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+		
+		
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+		
+		
+		
+		
+			
+			
+		
+	
+	
+	
+		
+		
+			
+			
+			
+			
+				
+				
+			
+		
+		
+		
+			
+			
+				
+			
+		
+	
+
diff --git a/templates/xml/admin/admin_lock_do_surfbar_urls.xml b/templates/xml/admin/admin_lock_do_surfbar_urls.xml
index 1951a9b7f4..d757f1f018 100644
--- a/templates/xml/admin/admin_lock_do_surfbar_urls.xml
+++ b/templates/xml/admin/admin_lock_do_surfbar_urls.xml
@@ -32,10 +32,6 @@ MA  02110-1301  USA
 	//-->
 	
 	
-	
-	
 	
diff --git a/templates/xml/admin/admin_lock_show_surfbar_urls.xml b/templates/xml/admin/admin_lock_show_surfbar_urls.xml
index 870748fc1d..efab6dd59f 100644
--- a/templates/xml/admin/admin_lock_show_surfbar_urls.xml
+++ b/templates/xml/admin/admin_lock_show_surfbar_urls.xml
@@ -32,10 +32,6 @@ MA  02110-1301  USA
 	//-->
 	
 	
-	
-	
 	
diff --git a/templates/xml/admin/admin_undelete_do_surfbar_urls.xml b/templates/xml/admin/admin_undelete_do_surfbar_urls.xml
index 7910f59f19..9e27d6f8ee 100644
--- a/templates/xml/admin/admin_undelete_do_surfbar_urls.xml
+++ b/templates/xml/admin/admin_undelete_do_surfbar_urls.xml
@@ -32,10 +32,6 @@ MA  02110-1301  USA
 	//-->
 	
 	
-	
-	
 	
diff --git a/templates/xml/admin/admin_undelete_show_surfbar_urls.xml b/templates/xml/admin/admin_undelete_show_surfbar_urls.xml
index 2b80c606f2..674bc7e463 100644
--- a/templates/xml/admin/admin_undelete_show_surfbar_urls.xml
+++ b/templates/xml/admin/admin_undelete_show_surfbar_urls.xml
@@ -32,10 +32,6 @@ MA  02110-1301  USA
 	//-->
 	
 	
-	
-	
 	
diff --git a/templates/xml/admin_data_template.xml b/templates/xml/admin_data_template.xml
index 6fc9904e62..04fca14881 100644
--- a/templates/xml/admin_data_template.xml
+++ b/templates/xml/admin_data_template.xml
@@ -35,10 +35,6 @@ MA  02110-1301  USA
 	//-->
 	
 	
-	
-