Even more rewrites/fixes from EL branch (please report any broken part after you...

diff --git a/birthday_confirm.php b/birthday_confirm.php
index 11b24eee014c0b6fb583c62edef108bc1d9729eb..7b5bffac08891a8b1b4cd89e48acd5e35c8290e8 100644 (file)
--- a/birthday_confirm.php
+++ b/birthday_confirm.php
@@ -63,7 +63,8 @@ $userid = bigintval(getRequestParameter('userid'));
 $chk = bigintval(getRequestParameter('check'), false);
 
 // Check if link is not clicked so far
-$result = SQL_QUERY_ESC("SELECT b.points, d.gender, d.surname, d.family, d.status, d.ref_payout
+$result = SQL_QUERY_ESC("SELECT
+       b.points, d.userid, d.gender, d.surname, d.family, d.status, d.ref_payout
 FROM
        `{?_MYSQL_PREFIX?}_user_birthday` AS b
 INNER JOIN
@@ -71,9 +72,13 @@ INNER JOIN
 ON
        b.userid=d.userid
 WHERE
-       b.userid=%s AND b.chk_value='%s'
+       b.userid=%s AND
+       b.chk_value='%s'
 LIMIT 1",
-       array($userid, $chk), __FILE__, __LINE__);
+       array(
+               $userid,
+               $chk
+       ), __FILE__, __LINE__);
 //* DEBUG: */ outputHtml("userid=".$userid.",chk=".$chk." (".strlen($chk).'/'.strlen(getRequestParameter('check')).'/'.SQL_NUMROWS($result).")<br />");
 
 // Prepare content
@@ -99,10 +104,6 @@ if (SQL_NUMROWS($result) == 1) {
                SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_birthday` WHERE `userid`=%s AND `chk_value`='%s' LIMIT 1",
                        array($userid, $chk), __FILE__, __LINE__);
 
-               // "Translate" some data
-               $data['gender'] = translateGender($data['gender']);
-               $data['points'] = translateComma($data['points']);
-
                // Load message from template
                $content['message'] = loadTemplate('birthday_msg', true, $data);
        } else {

diff --git a/inc/extensions/ext-network.php b/inc/extensions/ext-network.php
index a08448b0a4968c9b9e2c1cfe19f9169b8548d176..c74f1153f92df4485b639419e37feb43f65c555f 100644 (file)
--- a/inc/extensions/ext-network.php
+++ b/inc/extensions/ext-network.php
@@ -108,8 +108,8 @@ PRIMARY KEY (`network_type_id`)
 `network_param_id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `network_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `network_type_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
-`request_param_key` VARCHAR(10) NOT NULL DEFAULT 'invalid',
-`request_param_value` VARCHAR(10) NOT NULL DEFAULT 'invalid',
+`request_param_key` VARCHAR(20) NOT NULL DEFAULT 'invalid',
+`request_param_value` VARCHAR(20) NOT NULL DEFAULT 'invalid',
 `request_param_default` VARCHAR(255) NULL DEFAULT NULL,
 UNIQUE `provider_type_key` (`network_id`,`network_type_id`,`request_param_key`),
 UNIQUE `provider_type_value` (`network_id`,`network_type_id`,`request_param_value`),
@@ -148,17 +148,17 @@ PRIMARY KEY (`network_translate_id`)
 ) TYPE={?_TABLE_TYPE?} COMMENT='Translations for array keys, generic data, DO NOT ALTER!'");
 
                // Array-Element translation tables per type/provider
-               addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_network_return_types`');
-               addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_network_return_types` (
-`network_return_id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
+               addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_network_array_translation`');
+               addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_network_array_translation` (
+`network_array_id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `network_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `network_type_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
-`network_return_index` SMALLINT(5) UNSIGNED NOT NULL DEFAULT 0,
+`network_array_index` SMALLINT(5) UNSIGNED NOT NULL DEFAULT 0,
 `network_index_translation` VARCHAR(100) NOT NULL DEFAULT '',
-UNIQUE `provider_type_key` (`network_id`,`network_type_id`,`network_return_index`),
+UNIQUE `provider_type_key` (`network_id`,`network_type_id`,`network_array_index`),
 UNIQUE `provider_type_trans` (`network_id`,`network_type_id`,`network_index_translation`),
-PRIMARY KEY (`network_return_id`)
-) TYPE={?_TABLE_TYPE?} COMMENT='Return types'");
+PRIMARY KEY (`network_array_id`)
+) TYPE={?_TABLE_TYPE?} COMMENT='Return codes'");
 
                // Data from the webmaster (you!)
                addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_network_config`');
@@ -233,7 +233,7 @@ PRIMARY KEY (`network_reload_id`)
                // - Webmaster's site id is not unlocked for choosen type
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_error_types` (`network_code`) VALUES ('SITE_ID_NOT_ALLOWED_TYPE')");
                // - Request parameters incomplete
-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_error_types` (`network_code`) VALUES ('REQUEST_PARAMS_INCOMPLETE')");
+               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_error_types` (`network_code`) VALUES ('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`) VALUES
@@ -256,6 +256,7 @@ PRIMARY KEY (`network_reload_id`)
 ('megad', 'Mega-Ad', 'http://www.mega-ad.de/?ref=303', '|', '|', 'GET', 'WINDOWS-1252'),
 ('power-promo', 'Power-Promo', 'http://www.power-promo.de?ref=1231', '|', '|', 'GET', 'WINDOWS-1252'),
 ('secash', 'SeCash', 'http://www.secash.de?ref=758', '|', '|', 'GET', 'WINDOWS-1252'),
+('swizerland', 'The-Swizerland-Ad-Network', 'http://www.the-switzerland-ad-network.ch?ref=3', '|', '|', 'GET', 'WINDOWS-1252'),
 ('ultrapromo', 'UltraPROMO', 'http://www.ultrapromo.eu?ref=485', '|', '|', 'GET', 'WINDOWS-1252'),
 ('werbepartnercc', 'Der Werbepartner.cc', 'http://www.werbepartner.cc/sponsor/?ref=696', '|', '|', 'GET', 'WINDOWS-1252'),
 ('yoomedia', 'Yoo!Media Solutions', 'http://www.yoomedia.de?ref=1715', '|', '|', 'GET', 'WINDOWS-1252')");
@@ -482,46 +483,59 @@ PRIMARY KEY (`network_reload_id`)
 (101, 19, 'textmail', 'http://www.secash.de/interface/', 'http://www.secash.de/codes/paidmail.php?id=%UID%&bid=%CID%&aid=%SID%', NULL),
 (124, 19, 'traffic', 'http://www.secash.de/interface/', 'http://www.secash.de/codes/traffic.php?id=%UID%&bid=%CID%&aid=%SID%', 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/', 'http://www.the-switzerland-ad-network.ch/codes/klickbanner.php?id=%UID%&bid=%CID%&aid=%SID%', '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/', '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/', 'http://www.the-switzerland-ad-network.ch/codes/klickbanner.php?id=%UID%&bid=%CID%&aid=%SID%', '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/', 'http://www.the-switzerland-ad-network.ch/codes/forcedbannerklick.php?id=%UID%&bid=%CID%&aid=%SID%', '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/', 'http://www.the-switzerland-ad-network.ch/codes/forcedtextlinkklick.php?id=%UID%&bid=%CID%&aid=%SID%', NULL),
+(210, 20, 'popup', 'http://www.the-switzerland-ad-network.ch/interface/', 'http://www.the-switzerland-ad-network.ch/codes/popup.php?id=%UID%&bid=%CID%&aid=%SID%', NULL),
+(206, 20, 'skybanner_view', 'http://www.the-switzerland-ad-network.ch/interface/', 'http://www.the-switzerland-ad-network.ch/codes/skybannerklick.php?id=%UID%&bid=%CID%&aid=%SID%', '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/', 'http://www.the-switzerland-ad-network.ch/codes/textlinkview.php?id=%UID%&bid=%CID%&aid=%SID%', NULL),
+(211, 20, 'textmail', 'http://www.the-switzerland-ad-network.ch/interface/', 'http://www.the-switzerland-ad-network.ch/codes/paidmail.php?id=%UID%&bid=%CID%&aid=%SID%', NULL),
+(209, 20, 'traffic', 'http://www.the-switzerland-ad-network.ch/interface/', 'http://www.the-switzerland-ad-network.ch/codes/traffic.php?id=%UID%&bid=%CID%&aid=%SID%', 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
-(125, 20, '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, 20, '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, 20, '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%'),
-(128, 20, 'forcedbanner', 'http://www.ultrapromo.eu/interface/', 'http://www.ultrapromo.eu/codes/forcedbannerklick.php?id=%UID%&bid=%CID%&aid=%SID%', 'http://www.ultrapromo.eu/codes/forcedbannerview.php?id=%UID%&bid=%CID%&aid=%SID%'),
-(129, 20, 'forcedtextlink', 'http://www.ultrapromo.eu/interface/', 'http://www.ultrapromo.eu/codes/forcedtextlinkklick.php?id=%UID%&bid=%CID%&aid=%SID%', NULL),
-(130, 20, 'popup', 'http://www.ultrapromo.eu/interface/', 'http://www.ultrapromo.eu/codes/popup.php?id=%UID%&bid=%CID%&aid=%SID%', NULL),
-(131, 20, 'skybanner_view', 'http://www.ultrapromo.eu/interface/', 'http://www.ultrapromo.eu/codes/skybannerklick.php?id=%UID%&bid=%CID%&aid=%SID%', 'http://www.ultrapromo.eu/codes/skybannerview.php?id=%UID%&bid=%CID%&aid=%SID%'),
-(132, 20, 'textlink_view', 'http://www.ultrapromo.eu/interface/', 'http://www.ultrapromo.eu/codes/textlinkview.php?id=%UID%&bid=%CID%&aid=%SID%', NULL),
-(133, 20, 'textmail', 'http://www.ultrapromo.eu/interface/', 'http://www.ultrapromo.eu/codes/paidmail.php?id=%UID%&bid=%CID%&aid=%SID%', NULL),
-(134, 20, 'traffic', 'http://www.ultrapromo.eu/interface/', 'http://www.ultrapromo.eu/codes/traffic.php?id=%UID%&bid=%CID%&aid=%SID%', NULL)");
+(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%'),
+(128, 21, 'forcedbanner', 'http://www.ultrapromo.eu/interface/', 'http://www.ultrapromo.eu/codes/forcedbannerklick.php?id=%UID%&bid=%CID%&aid=%SID%', 'http://www.ultrapromo.eu/codes/forcedbannerview.php?id=%UID%&bid=%CID%&aid=%SID%'),
+(129, 21, 'forcedtextlink', 'http://www.ultrapromo.eu/interface/', 'http://www.ultrapromo.eu/codes/forcedtextlinkklick.php?id=%UID%&bid=%CID%&aid=%SID%', NULL),
+(130, 21, 'popup', 'http://www.ultrapromo.eu/interface/', 'http://www.ultrapromo.eu/codes/popup.php?id=%UID%&bid=%CID%&aid=%SID%', NULL),
+(131, 21, 'skybanner_view', 'http://www.ultrapromo.eu/interface/', 'http://www.ultrapromo.eu/codes/skybannerklick.php?id=%UID%&bid=%CID%&aid=%SID%', 'http://www.ultrapromo.eu/codes/skybannerview.php?id=%UID%&bid=%CID%&aid=%SID%'),
+(132, 21, 'textlink_view', 'http://www.ultrapromo.eu/interface/', 'http://www.ultrapromo.eu/codes/textlinkview.php?id=%UID%&bid=%CID%&aid=%SID%', NULL),
+(133, 21, 'textmail', 'http://www.ultrapromo.eu/interface/', 'http://www.ultrapromo.eu/codes/paidmail.php?id=%UID%&bid=%CID%&aid=%SID%', NULL),
+(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 - 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
-(145, 21, 'textlink_click', 'http://www.werbepartner.cc/sponsor/data/get.php', 'http://www.werbepartner.cc/sponsor/data/werbung.php', NULL),
-(146, 21, '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, 21, 'textmail', 'http://www.werbepartner.cc/sponsor/data/get.php', 'http://www.werbepartner.cc/sponsor/data/werbung.php', NULL),
-(148, 21, 'layer', 'http://www.werbepartner.cc/sponsor/data/get.php', 'http://www.werbepartner.cc/sponsor/data/get.php', NULL),
-(149, 21, 'skybanner_click', 'http://www.werbepartner.cc/sponsor/data/get.php', 'http://www.werbepartner.cc/sponsor/data/get.php', 'http://www.werbepartner.cc/sponsor/data/get.php'),
-(150, 21, 'surfbar_click', 'http://www.werbepartner.cc/sponsor/data/get.php', 'http://www.werbepartner.cc/sponsor/data/get.php', NULL),
-(151, 21, 'banner_view', 'http://www.werbepartner.cc/sponsor/data/get.php', 'http://www.werbepartner.cc/sponsor/data/get.php', 'http://www.werbepartner.cc/sponsor/data/get.php'),
-(152, 21, 'popup', 'http://www.werbepartner.cc/sponsor/data/get.php', 'http://www.werbepartner.cc/sponsor/data/get.php', NULL),
-(153, 21, 'banner_click', 'http://www.werbepartner.cc/sponsor/data/get.php', 'http://www.werbepartner.cc/sponsor/data/get.php', 'http://www.werbepartner.cc/sponsor/data/get.php'),
-(154, 21, 'forcedtextlink', 'http://www.werbepartner.cc/sponsor/data/get.php', 'http://www.werbepartner.cc/sponsor/data/get.php', NULL),
-(155, 21, 'traffic', 'http://www.werbepartner.cc/sponsor/data/get.php', 'http://www.werbepartner.cc/sponsor/data/get.php', NULL)");
+(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),
+(148, 22, 'layer', 'http://www.werbepartner.cc/sponsor/data/get.php', 'http://www.werbepartner.cc/sponsor/data/get.php', NULL),
+(149, 22, 'skybanner_click', 'http://www.werbepartner.cc/sponsor/data/get.php', 'http://www.werbepartner.cc/sponsor/data/get.php', 'http://www.werbepartner.cc/sponsor/data/get.php'),
+(150, 22, 'surfbar_click', 'http://www.werbepartner.cc/sponsor/data/get.php', 'http://www.werbepartner.cc/sponsor/data/get.php', NULL),
+(151, 22, 'banner_view', 'http://www.werbepartner.cc/sponsor/data/get.php', 'http://www.werbepartner.cc/sponsor/data/get.php', 'http://www.werbepartner.cc/sponsor/data/get.php'),
+(152, 22, 'popup', 'http://www.werbepartner.cc/sponsor/data/get.php', 'http://www.werbepartner.cc/sponsor/data/get.php', NULL),
+(153, 22, 'banner_click', 'http://www.werbepartner.cc/sponsor/data/get.php', 'http://www.werbepartner.cc/sponsor/data/get.php', 'http://www.werbepartner.cc/sponsor/data/get.php'),
+(154, 22, 'forcedtextlink', 'http://www.werbepartner.cc/sponsor/data/get.php', 'http://www.werbepartner.cc/sponsor/data/get.php', NULL),
+(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
-(156, 22, 'banner_click', 'http://www.yoomedia.de/interface_2.0/out_banner.php', 'http://www.yoomedia.de/code/z-bannerklf.php?id=%UID%&sid=%SID%', 'http://www.yoomedia.de/code/z-banner.php?id=%UID%&sid=%SID%&bid=%BID%'),
-(157, 22, 'textlink_click', 'http://www.yoomedia.de/interface_2.0/out_textlink.php', 'http://www.yoomedia.de/code/t-textlink.php?id=%UID%&sid=%SID%', NULL),
-(158, 22, 'surfbar_click', 'http://www.yoomedia.de/interface_2.0/out_sbanner.php', 'http://www.yoomedia.de/code/s-bannerklf.php?id=%UID%&sid=%SID%', 'http://www.yoomedia.de/code/s-banner.php?id=%UID%&sid=%SID%&bid=%BID%'),
-(159, 22, 'forcedbanner', 'http://www.yoomedia.de/interface_2.0/out_fbanner.php', 'http://www.yoomedia.de/code/f-bannerklf.php?id=%UID%&sid=%SID%', 'http://www.yoomedia.de/code/f-banner.php?id=%UID%&sid=%SID%&bid=%BID%'),
-(160, 22, 'pagepeel', 'http://www.yoomedia.de/interface_2.0/out_pagepeel.php', 'http://www.yoomedia.de/code/p-peel.php?id=%UID%&sid=%SID%', NULL),
-(161, 22, 'textmail', 'http://www.yoomedia.de/interface_2.0/out_textmail.php', 'http://www.yoomedia.de/code/t-mail.php?id=%UID%&sid=%SID%', NULL),
-(162, 22, 'htmlmail', 'http://www.yoomedia.de/interface_2.0/out_htmlmail.php', 'http://www.yoomedia.de/code/h-mail.php?id=%UID%&sid=%SID%', NULL),
-(163, 22, 'layer_click', 'http://www.yoomedia.de/interface_2.0/out_layer.php', 'http://www.yoomedia.de/code/l-layer.php?id=%UID%&sid=%SID%', NULL),
-(164, 22, 'popup', 'http://www.yoomedia.de/interface_2.0/out_popup.php', 'http://www.yoomedia.de/code/p-popup.php?id=%UID%&sid=%SID%', NULL),
-(165, 22, 'popdown', 'http://www.yoomedia.de/interface_2.0/out_popdown.php', 'http://www.yoomedia.de/code/p-popdown.php?id=%UID%&sid=%SID%', NULL),
-(166, 22, 'lead', 'http://www.yoomedia.de/interface_2.0/out_lead.php', 'http://www.yoomedia.de/code/lead.php?id=%UID%&sid=%SID%', NULL)");
+(156, 23, 'banner_click', 'http://www.yoomedia.de/interface_2.0/out_banner.php', 'http://www.yoomedia.de/code/z-bannerklf.php?id=%UID%&sid=%SID%', 'http://www.yoomedia.de/code/z-banner.php?id=%UID%&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=%UID%&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=%UID%&sid=%SID%', 'http://www.yoomedia.de/code/s-banner.php?id=%UID%&sid=%SID%&bid=%BID%'),
+(159, 23, 'forcedbanner', 'http://www.yoomedia.de/interface_2.0/out_fbanner.php', 'http://www.yoomedia.de/code/f-bannerklf.php?id=%UID%&sid=%SID%', 'http://www.yoomedia.de/code/f-banner.php?id=%UID%&sid=%SID%&bid=%BID%'),
+(160, 23, 'pagepeel', 'http://www.yoomedia.de/interface_2.0/out_pagepeel.php', 'http://www.yoomedia.de/code/p-peel.php?id=%UID%&sid=%SID%', NULL),
+(161, 23, 'textmail', 'http://www.yoomedia.de/interface_2.0/out_textmail.php', 'http://www.yoomedia.de/code/t-mail.php?id=%UID%&sid=%SID%', NULL),
+(162, 23, 'htmlmail', 'http://www.yoomedia.de/interface_2.0/out_htmlmail.php', 'http://www.yoomedia.de/code/h-mail.php?id=%UID%&sid=%SID%', NULL),
+(163, 23, 'layer_click', 'http://www.yoomedia.de/interface_2.0/out_layer.php', 'http://www.yoomedia.de/code/l-layer.php?id=%UID%&sid=%SID%', NULL),
+(164, 23, 'popup', 'http://www.yoomedia.de/interface_2.0/out_popup.php', 'http://www.yoomedia.de/code/p-popup.php?id=%UID%&sid=%SID%', NULL),
+(165, 23, 'popdown', 'http://www.yoomedia.de/interface_2.0/out_popdown.php', 'http://www.yoomedia.de/code/p-popdown.php?id=%UID%&sid=%SID%', NULL),
+(166, 23, 'lead', 'http://www.yoomedia.de/interface_2.0/out_lead.php', 'http://www.yoomedia.de/code/lead.php?id=%UID%&sid=%SID%', NULL)");
 
                // Request parameters per type handler - A3H
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_param_id`, `network_id`, `network_type_id`, `request_param_key`, `request_param_value`, `request_param_default`) VALUES
@@ -530,7 +544,7 @@ PRIMARY KEY (`network_reload_id`)
 (3, 1, 1, 'password', 'pw', NULL),
 (4, 1, 1, 'reload', 'reload', NULL),
 (5, 1, 1, 'reward', 'verguetung', NULL),
-(6, 1, 1, 'min_stay', 'ma', NULL),
+(6, 1, 1, 'minimum_stay', 'ma', NULL),
 (7, 1, 1, 'type', 'typ', NULL),
 (8, 1, 1, 'remain', 'uebrig', NULL),
 (9, 1, 1, 'size', 'size', NULL),
@@ -553,7 +567,7 @@ PRIMARY KEY (`network_reload_id`)
 (26, 1, 4, 'password', 'pw', NULL),
 (27, 1, 4, 'reload', 'reload', NULL),
 (28, 1, 4, 'reward', 'verguetung', NULL),
-(29, 1, 4, 'min_stay', 'ma', NULL),
+(29, 1, 4, 'minimum_stay', 'ma', NULL),
 (30, 1, 4, 'remain', 'uebrig', NULL),
 (31, 1, 4, 'size', 'size', NULL),
 (32, 1, 5, 'id', 'id', NULL),
@@ -561,7 +575,7 @@ PRIMARY KEY (`network_reload_id`)
 (34, 1, 5, 'password', 'pw', NULL),
 (35, 1, 5, 'reload', 'reload', NULL),
 (36, 1, 5, 'reward', 'verguetung', NULL),
-(37, 1, 5, 'min_stay', 'ma', NULL),
+(37, 1, 5, 'minimum_stay', 'ma', NULL),
 (38, 1, 5, 'type', 'typ', 'text'),
 (39, 1, 5, 'remain', 'uebrig', NULL),
 (40, 1, 11, 'id', 'id', NULL),
@@ -569,7 +583,7 @@ PRIMARY KEY (`network_reload_id`)
 (42, 1, 11, 'password', 'pw', NULL),
 (43, 1, 11, 'reload', 'reload', NULL),
 (44, 1, 11, 'reward', 'verguetung', NULL),
-(45, 1, 11, 'min_stay', 'ma', NULL),
+(45, 1, 11, 'minimum_stay', 'ma', NULL),
 (46, 1, 11, 'type', 'typ', 'html'),
 (47, 1, 11, 'remain', 'uebrig', NULL),
 (48, 1, 6, 'id', 'id', NULL),
@@ -584,14 +598,14 @@ PRIMARY KEY (`network_reload_id`)
 (57, 1, 7, 'password', 'pw', NULL),
 (58, 1, 7, 'reload', 'reload', NULL),
 (59, 1, 7, 'reward', 'verguetung', NULL),
-(60, 1, 7, 'min_stay', 'ma', NULL),
+(60, 1, 7, 'minimum_stay', 'ma', NULL),
 (61, 1, 7, 'remain', 'uebrig', NULL),
 (62, 1, 8, 'id', 'id', NULL),
 (63, 1, 8, 'sid', 'sid', NULL),
 (64, 1, 8, 'password', 'pw', NULL),
 (65, 1, 8, 'reload', 'reload', NULL),
 (66, 1, 8, 'reward', 'verguetung', NULL),
-(67, 1, 8, 'min_stay', 'ma', NULL),
+(67, 1, 8, 'minimum_stay', 'ma', NULL),
 (68, 1, 8, 'remain', 'uebrig', NULL),
 (69, 1, 9, 'id', 'id', NULL),
 (70, 1, 9, 'sid', 'sid', NULL),
@@ -659,14 +673,14 @@ PRIMARY KEY (`network_reload_id`)
 (1388, 2, 193, 'reload', 'reload', NULL),
 (1389, 2, 193, 'remain', 'uebrig', NULL),
 (1390, 2, 193, 'size', 'size', NULL),
-(1391, 2, 193, 'min_stay', 'ma', NULL),
+(1391, 2, 193, 'minimum_stay', 'ma', NULL),
 (1392, 2, 194, 'id', 'id', NULL),
 (1393, 2, 194, 'sid', 'sid', NULL),
 (1394, 2, 194, 'password', 'pw', NULL),
 (1395, 2, 194, 'reward', 'verguetung', NULL),
 (1396, 2, 194, 'reload', 'reload', NULL),
 (1397, 2, 194, 'remain', 'uebrig', NULL),
-(1398, 2, 194, 'min_stay', 'ma', NULL),
+(1398, 2, 194, 'minimum_stay', 'ma', NULL),
 (1399, 2, 194, 'type', 'typ', 'text'),
 (1400, 2, 195, 'id', 'id', NULL),
 (1401, 2, 195, 'sid', 'sid', NULL),
@@ -674,7 +688,7 @@ PRIMARY KEY (`network_reload_id`)
 (1403, 2, 195, 'reward', 'verguetung', NULL),
 (1404, 2, 195, 'reload', 'reload', NULL),
 (1405, 2, 195, 'remain', 'uebrig', NULL),
-(1406, 2, 195, 'min_stay', 'ma', NULL),
+(1406, 2, 195, 'minimum_stay', 'ma', NULL),
 (1407, 2, 195, 'type', 'typ', 'html'),
 (1408, 2, 196, 'id', 'id', NULL),
 (1409, 2, 196, 'sid', 'sid', NULL),
@@ -696,7 +710,7 @@ PRIMARY KEY (`network_reload_id`)
 (1425, 2, 198, 'reward', 'verguetung', NULL),
 (1426, 2, 198, 'reload', 'reload', NULL),
 (1427, 2, 198, 'remain', 'uebrig', NULL),
-(1428, 2, 198, 'min_stay', 'ma', NULL),
+(1428, 2, 198, 'minimum_stay', 'ma', NULL),
 (1429, 2, 199, 'id', 'id', NULL),
 (1430, 2, 199, 'sid', 'sid', NULL),
 (1431, 2, 199, 'password', 'pw', NULL),
@@ -751,14 +765,14 @@ PRIMARY KEY (`network_reload_id`)
 (1286, 5, 180, 'reload', 'reload', NULL),
 (1287, 5, 180, 'remain', 'uebrig', NULL),
 (1288, 5, 180, 'size', 'size', '468x60'),
-(1289, 5, 180, 'min_stay', 'ma', NULL),
+(1289, 5, 180, 'minimum_stay', 'ma', NULL),
 (1290, 5, 181, 'id', 'id', NULL),
 (1291, 5, 181, 'sid', 'sid', NULL),
 (1292, 5, 181, 'password', 'pw', NULL),
 (1293, 5, 181, 'reload', 'reload', NULL),
 (1294, 5, 181, 'reward', 'verguetung', NULL),
 (1295, 5, 181, 'remain', 'uebrig', NULL),
-(1296, 5, 181, 'min_stay', 'ma', NULL),
+(1296, 5, 181, 'minimum_stay', 'ma', NULL),
 (1297, 5, 181, 'type', 'typ', 'text'),
 (1306, 5, 182, 'id', 'id', NULL),
 (1307, 5, 182, 'sid', 'sid', NULL),
@@ -773,14 +787,14 @@ PRIMARY KEY (`network_reload_id`)
 (1316, 5, 183, 'reload', 'reload', NULL),
 (1317, 5, 183, 'reward', 'verguetung', NULL),
 (1318, 5, 183, 'remain', 'uebrig', NULL),
-(1319, 5, 183, 'min_stay', 'ma', NULL),
+(1319, 5, 183, 'minimum_stay', 'ma', NULL),
 (1320, 5, 184, 'id', 'id', NULL),
 (1321, 5, 184, 'sid', 'sid', NULL),
 (1322, 5, 184, 'password', 'pw', NULL),
 (1323, 5, 184, 'reload', 'reload', NULL),
 (1324, 5, 184, 'reward', 'verguetung', NULL),
 (1325, 5, 184, 'remain', 'uebrig', NULL),
-(1326, 5, 184, 'min_stay', 'ma', NULL),
+(1326, 5, 184, 'minimum_stay', 'ma', NULL),
 (1327, 5, 185, 'id', 'id', NULL),
 (1328, 5, 185, 'sid', 'sid', NULL),
 (1329, 5, 185, 'password', 'pw', NULL),
@@ -797,7 +811,7 @@ PRIMARY KEY (`network_reload_id`)
 (1301, 5, 187, 'reload', 'reload', NULL),
 (1302, 5, 187, 'reward', 'verguetung', NULL),
 (1303, 5, 187, 'remain', 'uebrig', NULL),
-(1304, 5, 187, 'min_stay', 'ma', NULL),
+(1304, 5, 187, 'minimum_stay', 'ma', NULL),
 (1305, 5, 187, 'type', 'typ', 'html')");
 
                // Request parameters per type handler - Ads4
@@ -809,7 +823,7 @@ PRIMARY KEY (`network_reload_id`)
 (83, 6, 14, 'reward', 'verg', NULL),
 (84, 6, 14, 'reload', 'reload', NULL),
 (85, 6, 14, 'remain', 'uebrig', NULL),
-(86, 6, 14, 'min_stay', 'ma', NULL),
+(86, 6, 14, 'minimum_stay', 'ma', NULL),
 (87, 6, 15, 'id', 'id', NULL),
 (88, 6, 15, 'password', 'pwd', NULL),
 (89, 6, 15, 'currency', 'waehrung', NULL),
@@ -817,7 +831,7 @@ PRIMARY KEY (`network_reload_id`)
 (91, 6, 15, 'reward', 'verg', NULL),
 (92, 6, 15, 'reload', 'reload', NULL),
 (93, 6, 15, 'remain', 'uebrig', NULL),
-(94, 6, 15, 'min_stay', 'ma', NULL),
+(94, 6, 15, 'minimum_stay', 'ma', NULL),
 (95, 6, 16, 'id', 'id', NULL),
 (96, 6, 16, 'password', 'pw', NULL),
 (97, 6, 16, 'currency', 'waehrung', NULL),
@@ -825,7 +839,7 @@ PRIMARY KEY (`network_reload_id`)
 (99, 6, 16, 'reward', 'verg', NULL),
 (100, 6, 16, 'reload', 'reload', NULL),
 (101, 6, 16, 'remain', 'uebrig', NULL),
-(102, 6, 16, 'min_stay', 'ma', NULL),
+(102, 6, 16, 'minimum_stay', 'ma', NULL),
 (789, 6, 119, 'id', 'id', NULL),
 (790, 6, 119, 'password', 'pwd', NULL),
 (791, 6, 119, 'currency', 'waehrung', NULL),
@@ -833,7 +847,7 @@ PRIMARY KEY (`network_reload_id`)
 (793, 6, 119, 'reward', 'verg', NULL),
 (794, 6, 119, 'reload', 'reload', NULL),
 (795, 6, 119, 'remain', 'uebrig', NULL),
-(796, 6, 119, 'min_stay', 'ma', NULL)");
+(796, 6, 119, 'minimum_stay', 'ma', NULL)");
 
                // Request parameters per type handler - Ads4Webbis
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_param_id`, `network_id`, `network_type_id`, `request_param_key`, `request_param_value`, `request_param_default`) VALUES
@@ -885,14 +899,14 @@ PRIMARY KEY (`network_reload_id`)
 (148, 7, 24, 'remain', 'uebrig', NULL),
 (149, 7, 24, 'reload', 'reload', NULL),
 (150, 7, 24, 'reward', 'verguetung', NULL),
-(151, 7, 24, 'min_stay', 'ma', NULL),
+(151, 7, 24, 'minimum_stay', 'ma', NULL),
 (152, 7, 25, 'extra', 'typ', 'paidmail'),
 (153, 7, 25, 'id', 'id', NULL),
 (154, 7, 25, 'password', 'pw', NULL),
 (155, 7, 25, 'remain', 'uebrig', NULL),
 (156, 7, 25, 'reload', 'reload', NULL),
 (157, 7, 25, 'reward', 'verguetung', NULL),
-(158, 7, 25, 'min_stay', 'ma', NULL),
+(158, 7, 25, 'minimum_stay', 'ma', NULL),
 (797, 7, 120, 'extra', 'typ', 'traffic'),
 (798, 7, 120, 'id', 'id', NULL),
 (799, 7, 120, 'password', 'pw', NULL),
@@ -938,7 +952,7 @@ PRIMARY KEY (`network_reload_id`)
 (192, 8, 33, 'remain', 'uebrig', NULL),
 (193, 8, 33, 'reload', 'reload', NULL),
 (194, 8, 33, 'reward', 'verguetung', NULL),
-(195, 8, 33, 'min_stay', 'ma', NULL),
+(195, 8, 33, 'minimum_stay', 'ma', NULL),
 (196, 8, 30, 'extra', 'typ', 'skybannerview'),
 (197, 8, 30, 'id', 'id', NULL),
 (198, 8, 30, 'password', 'pw', NULL),
@@ -957,7 +971,7 @@ PRIMARY KEY (`network_reload_id`)
 (211, 8, 34, 'remain', 'uebrig', NULL),
 (212, 8, 34, 'reload', 'reload', NULL),
 (213, 8, 34, 'reward', 'verguetung', NULL),
-(214, 8, 34, 'min_stay', 'ma', NULL),
+(214, 8, 34, 'minimum_stay', 'ma', NULL),
 (803, 8, 121, 'extra', 'typ', 'traffic'),
 (804, 8, 121, 'id', 'id', NULL),
 (805, 8, 121, 'password', 'pw', NULL),
@@ -1095,14 +1109,14 @@ PRIMARY KEY (`network_reload_id`)
 (265, 11, 38, 'reload', 'reload', NULL),
 (266, 11, 38, 'remain', 'uebrig', NULL),
 (267, 11, 38, 'size', 'size', NULL),
-(268, 11, 38, 'min_stay', 'ma', NULL),
+(268, 11, 38, 'minimum_stay', 'ma', NULL),
 (269, 11, 39, 'id', 'id', NULL),
 (270, 11, 39, 'sid', 'sid', NULL),
 (271, 11, 39, 'password', 'pw', NULL),
 (272, 11, 39, 'reward', 'verguetung', NULL),
 (273, 11, 39, 'reload', 'reload', NULL),
 (274, 11, 39, 'remain', 'uebrig', NULL),
-(275, 11, 39, 'min_stay', 'ma', NULL),
+(275, 11, 39, 'minimum_stay', 'ma', NULL),
 (276, 11, 39, 'type', 'typ', 'text'),
 (277, 11, 48, 'id', 'id', NULL),
 (278, 11, 48, 'sid', 'sid', NULL),
@@ -1110,7 +1124,7 @@ PRIMARY KEY (`network_reload_id`)
 (280, 11, 48, 'reward', 'verguetung', NULL),
 (281, 11, 48, 'reload', 'reload', NULL),
 (282, 11, 48, 'remain', 'uebrig', NULL),
-(283, 11, 48, 'min_stay', 'ma', NULL),
+(283, 11, 48, 'minimum_stay', 'ma', NULL),
 (284, 11, 48, 'type', 'typ', 'html'),
 (285, 11, 40, 'id', 'id', NULL),
 (286, 11, 40, 'sid', 'sid', NULL),
@@ -1132,14 +1146,14 @@ PRIMARY KEY (`network_reload_id`)
 (302, 11, 41, 'reward', 'verguetung', NULL),
 (303, 11, 41, 'reload', 'reload', NULL),
 (304, 11, 41, 'remain', 'uebrig', NULL),
-(305, 11, 41, 'min_stay', 'ma', NULL),
+(305, 11, 41, 'minimum_stay', 'ma', NULL),
 (306, 11, 42, 'id', 'id', NULL),
 (307, 11, 42, 'sid', 'sid', NULL),
 (308, 11, 42, 'password', 'pw', NULL),
 (309, 11, 42, 'reward', 'verguetung', NULL),
 (310, 11, 42, 'reload', 'reload', NULL),
 (311, 11, 42, 'remain', 'uebrig', NULL),
-(312, 11, 42, 'min_stay', 'ma', NULL),
+(312, 11, 42, 'minimum_stay', 'ma', NULL),
 (313, 11, 43, 'id', 'id', NULL),
 (314, 11, 43, 'sid', 'sid', NULL),
 (315, 11, 43, 'password', 'pw', NULL),
@@ -1190,14 +1204,14 @@ PRIMARY KEY (`network_reload_id`)
 (357, 12, 54, 'reload', 'reload', NULL),
 (358, 12, 54, 'remain', 'uebrig', NULL),
 (359, 12, 54, 'size', 'size', NULL),
-(360, 12, 54, 'min_stay', 'ma', NULL),
+(360, 12, 54, 'minimum_stay', 'ma', NULL),
 (361, 12, 55, 'id', 'id', NULL),
 (362, 12, 55, 'sid', 'sid', NULL),
 (363, 12, 55, 'password', 'pw', NULL),
 (364, 12, 55, 'reward', 'verguetung', NULL),
 (365, 12, 55, 'reload', 'reload', NULL),
 (366, 12, 55, 'remain', 'uebrig', NULL),
-(367, 12, 55, 'min_stay', 'ma', NULL),
+(367, 12, 55, 'minimum_stay', 'ma', NULL),
 (368, 12, 55, 'type', 'typ', 'text'),
 (369, 12, 56, 'id', 'id', NULL),
 (370, 12, 56, 'sid', 'sid', NULL),
@@ -1205,7 +1219,7 @@ PRIMARY KEY (`network_reload_id`)
 (372, 12, 56, 'reward', 'verguetung', NULL),
 (373, 12, 56, 'reload', 'reload', NULL),
 (374, 12, 56, 'remain', 'uebrig', NULL),
-(375, 12, 56, 'min_stay', 'ma', NULL),
+(375, 12, 56, 'minimum_stay', 'ma', NULL),
 (376, 12, 56, 'type', 'typ', 'html'),
 (377, 12, 57, 'id', 'id', NULL),
 (378, 12, 57, 'sid', 'sid', NULL),
@@ -1227,14 +1241,14 @@ PRIMARY KEY (`network_reload_id`)
 (394, 12, 59, 'reward', 'verguetung', NULL),
 (395, 12, 59, 'reload', 'reload', NULL),
 (396, 12, 59, 'remain', 'uebrig', NULL),
-(397, 12, 59, 'min_stay', 'ma', NULL),
+(397, 12, 59, 'minimum_stay', 'ma', NULL),
 (398, 12, 60, 'id', 'id', NULL),
 (399, 12, 60, 'sid', 'sid', NULL),
 (400, 12, 60, 'password', 'pw', NULL),
 (401, 12, 60, 'reward', 'verguetung', NULL),
 (402, 12, 60, 'reload', 'reload', NULL),
 (403, 12, 60, 'remain', 'uebrig', NULL),
-(404, 12, 60, 'min_stay', 'ma', NULL),
+(404, 12, 60, 'minimum_stay', 'ma', NULL),
 (405, 12, 61, 'id', 'id', NULL),
 (406, 12, 61, 'sid', 'sid', NULL),
 (407, 12, 61, 'password', 'pw', NULL),
@@ -1355,14 +1369,14 @@ PRIMARY KEY (`network_reload_id`)
 (940, 15, 143, 'remain', 'uebrig', NULL),
 (941, 15, 143, 'reload', 'reload', NULL),
 (942, 15, 143, 'reward', 'verguetung', NULL),
-(943, 15, 143, 'min_stay', 'ma', NULL),
+(943, 15, 143, 'minimum_stay', 'ma', NULL),
 (944, 15, 144, 'extra', 'typ', 'paidmail'),
 (945, 15, 144, 'id', 'id', NULL),
 (946, 15, 144, 'password', 'pw', NULL),
 (947, 15, 144, 'remain', 'uebrig', NULL),
 (948, 15, 144, 'reload', 'reload', NULL),
 (949, 15, 144, 'reward', 'verguetung', NULL),
-(950, 15, 144, 'min_stay', 'ma', NULL)");
+(950, 15, 144, 'minimum_stay', 'ma', NULL)");
 
                // Request parameters per type handler - Make-Euros
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_param_id`, `network_id`, `network_type_id`, `request_param_key`, `request_param_value`, `request_param_default`) VALUES
@@ -1419,14 +1433,14 @@ PRIMARY KEY (`network_reload_id`)
 (465, 16, 68, 'reload', 'reload', NULL),
 (466, 16, 68, 'remain', 'uebrig', NULL),
 (467, 16, 68, 'size', 'size', NULL),
-(468, 16, 68, 'min_stay', 'ma', NULL),
+(468, 16, 68, 'minimum_stay', 'ma', NULL),
 (469, 16, 70, 'id', 'id', NULL),
 (470, 16, 70, 'sid', 'sid', NULL),
 (471, 16, 70, 'password', 'pw', NULL),
 (472, 16, 70, 'reward', 'verguetung', NULL),
 (473, 16, 70, 'reload', 'reload', NULL),
 (474, 16, 70, 'remain', 'uebrig', NULL),
-(475, 16, 70, 'min_stay', 'ma', NULL),
+(475, 16, 70, 'minimum_stay', 'ma', NULL),
 (476, 16, 70, 'type', 'typ', 'text'),
 (477, 16, 71, 'id', 'id', NULL),
 (478, 16, 71, 'sid', 'sid', NULL),
@@ -1434,7 +1448,7 @@ PRIMARY KEY (`network_reload_id`)
 (480, 16, 71, 'reward', 'verguetung', NULL),
 (481, 16, 71, 'reload', 'reload', NULL),
 (482, 16, 71, 'remain', 'uebrig', NULL),
-(483, 16, 71, 'min_stay', 'ma', NULL),
+(483, 16, 71, 'minimum_stay', 'ma', NULL),
 (484, 16, 71, 'type', 'typ', 'html'),
 (485, 16, 72, 'id', 'id', NULL),
 (486, 16, 72, 'sid', 'sid', NULL),
@@ -1456,14 +1470,14 @@ PRIMARY KEY (`network_reload_id`)
 (502, 16, 74, 'reward', 'verguetung', NULL),
 (503, 16, 74, 'reload', 'reload', NULL),
 (504, 16, 74, 'remain', 'uebrig', NULL),
-(505, 16, 74, 'min_stay', 'ma', NULL),
+(505, 16, 74, 'minimum_stay', 'ma', NULL),
 (506, 16, 75, 'id', 'id', NULL),
 (507, 16, 75, 'sid', 'sid', NULL),
 (508, 16, 75, 'password', 'pw', NULL),
 (509, 16, 75, 'reward', 'verguetung', NULL),
 (510, 16, 75, 'reload', 'reload', NULL),
 (511, 16, 75, 'remain', 'uebrig', NULL),
-(512, 16, 75, 'min_stay', 'ma', NULL),
+(512, 16, 75, 'minimum_stay', 'ma', NULL),
 (513, 16, 76, 'id', 'id', NULL),
 (514, 16, 76, 'sid', 'sid', NULL),
 (515, 16, 76, 'password', 'pw', NULL),
@@ -1593,14 +1607,14 @@ PRIMARY KEY (`network_reload_id`)
 (573, 18, 84, 'reload', 'reload', NULL),
 (574, 18, 84, 'remain', 'uebrig', NULL),
 (575, 18, 84, 'size', 'size', NULL),
-(576, 18, 84, 'min_stay', 'ma', NULL),
+(576, 18, 84, 'minimum_stay', 'ma', NULL),
 (577, 18, 85, 'id', 'id', NULL),
 (578, 18, 85, 'sid', 'sid', NULL),
 (579, 18, 85, 'password', 'pw', NULL),
 (580, 18, 85, 'reward', 'verguetung', NULL),
 (581, 18, 85, 'reload', 'reload', NULL),
 (582, 18, 85, 'remain', 'uebrig', NULL),
-(583, 18, 85, 'min_stay', 'ma', NULL),
+(583, 18, 85, 'minimum_stay', 'ma', NULL),
 (584, 18, 85, 'type', 'typ', 'text'),
 (585, 18, 86, 'id', 'id', NULL),
 (586, 18, 86, 'sid', 'sid', NULL),
@@ -1608,7 +1622,7 @@ PRIMARY KEY (`network_reload_id`)
 (588, 18, 86, 'reward', 'verguetung', NULL),
 (589, 18, 86, 'reload', 'reload', NULL),
 (590, 18, 86, 'remain', 'uebrig', NULL),
-(591, 18, 86, 'min_stay', 'ma', NULL),
+(591, 18, 86, 'minimum_stay', 'ma', NULL),
 (592, 18, 86, 'type', 'typ', 'html'),
 (593, 18, 87, 'id', 'id', NULL),
 (594, 18, 87, 'sid', 'sid', NULL),
@@ -1630,14 +1644,14 @@ PRIMARY KEY (`network_reload_id`)
 (610, 18, 89, 'reward', 'verguetung', NULL),
 (611, 18, 89, 'reload', 'reload', NULL),
 (612, 18, 89, 'remain', 'uebrig', NULL),
-(613, 18, 89, 'min_stay', 'ma', NULL),
+(613, 18, 89, 'minimum_stay', 'ma', NULL),
 (614, 18, 90, 'id', 'id', NULL),
 (615, 18, 90, 'sid', 'sid', NULL),
 (616, 18, 90, 'password', 'pw', NULL),
 (617, 18, 90, 'reward', 'verguetung', NULL),
 (618, 18, 90, 'reload', 'reload', NULL),
 (619, 18, 90, 'remain', 'uebrig', NULL),
-(620, 18, 90, 'min_stay', 'ma', NULL),
+(620, 18, 90, 'minimum_stay', 'ma', NULL),
 (621, 18, 91, 'id', 'id', NULL),
 (622, 18, 91, 'sid', 'sid', NULL),
 (623, 18, 91, 'password', 'pw', NULL),
@@ -1699,14 +1713,14 @@ PRIMARY KEY (`network_reload_id`)
 (676, 19, 100, 'reward', 'verguetung', NULL),
 (677, 19, 100, 'reload', 'reload', NULL),
 (678, 19, 100, 'remain', 'uebrig', NULL),
-(679, 19, 100, 'min_stay', 'ma', NULL),
+(679, 19, 100, 'minimum_stay', 'ma', NULL),
 (680, 19, 101, 'extra', 'typ', 'paidmail'),
 (681, 19, 101, 'id', 'id', NULL),
 (682, 19, 101, 'password', 'pw', NULL),
 (683, 19, 101, 'reward', 'verguetung', NULL),
 (684, 19, 101, 'reload', 'reload', NULL),
 (685, 19, 101, 'remain', 'uebrig', NULL),
-(686, 19, 101, 'min_stay', 'ma', NULL),
+(686, 19, 101, 'minimum_stay', 'ma', NULL),
 (821, 19, 124, 'extra', 'typ', 'traffic'),
 (822, 19, 124, 'id', 'id', NULL),
 (823, 19, 124, 'password', 'pw', NULL),
@@ -1714,237 +1728,302 @@ PRIMARY KEY (`network_reload_id`)
 (825, 19, 124, 'reload', 'reload', NULL),
 (826, 19, 124, 'reward', 'verguetung', NULL)");
 
+               // Request parameters per type handler - Swizerland
+               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_param_id`, `network_id`, `network_type_id`, `request_param_key`, `request_param_value`, `request_param_default`) VALUES
+(1446, 20, 202, 'extra', 'typ', 'forcedbanner'),
+(1447, 20, 202, 'id', 'id', NULL),
+(1448, 20, 202, 'password', 'pw', NULL),
+(1449, 20, 202, 'remain', 'uebrig', NULL),
+(1450, 20, 202, 'reload', 'reload', NULL),
+(1451, 20, 202, 'reward', 'verguetung', NULL),
+(1452, 20, 203, 'extra', 'typ', 'forcedtextlink'),
+(1453, 20, 203, 'id', 'id', NULL),
+(1454, 20, 203, 'password', 'pw', NULL),
+(1455, 20, 203, 'remain', 'uebrig', NULL),
+(1456, 20, 203, 'reload', 'reload', NULL),
+(1457, 20, 203, 'reward', 'verguetung', NULL),
+(1458, 20, 204, 'extra', 'typ', 'bannerview'),
+(1459, 20, 204, 'id', 'id', NULL),
+(1460, 20, 204, 'password', 'pw', NULL),
+(1461, 20, 204, 'remain', 'uebrig', NULL),
+(1462, 20, 204, 'reload', 'reload', NULL),
+(1463, 20, 204, 'reward', 'verguetung', NULL),
+(1464, 20, 205, 'extra', 'typ', 'bannerklick'),
+(1465, 20, 205, 'id', 'id', NULL),
+(1466, 20, 205, 'password', 'pw', NULL),
+(1467, 20, 205, 'remain', 'uebrig', NULL),
+(1468, 20, 205, 'reload', 'reload', NULL),
+(1469, 20, 205, 'reward', 'verguetung', NULL),
+(1470, 20, 206, 'extra', 'typ', 'skybannerview'),
+(1471, 20, 206, 'id', 'id', NULL),
+(1472, 20, 206, 'password', 'pw', NULL),
+(1473, 20, 206, 'remain', 'uebrig', NULL),
+(1474, 20, 206, 'reload', 'reload', NULL),
+(1475, 20, 206, 'reward', 'verguetung', NULL),
+(1476, 20, 207, 'extra', 'typ', 'buttonview'),
+(1477, 20, 207, 'id', 'id', NULL),
+(1478, 20, 207, 'password', 'pw', NULL),
+(1479, 20, 207, 'remain', 'uebrig', NULL),
+(1480, 20, 207, 'reload', 'reload', NULL),
+(1481, 20, 207, 'reward', 'verguetung', NULL),
+(1482, 20, 208, 'extra', 'typ', 'textview'),
+(1483, 20, 208, 'id', 'id', NULL),
+(1484, 20, 208, 'password', 'pw', NULL),
+(1485, 20, 208, 'remain', 'uebrig', NULL),
+(1486, 20, 208, 'reload', 'reload', NULL),
+(1487, 20, 208, 'reward', 'verguetung', NULL),
+(1488, 20, 209, 'extra', 'typ', 'traffic'),
+(1489, 20, 209, 'id', 'id', NULL),
+(1490, 20, 209, 'password', 'pw', NULL),
+(1491, 20, 209, 'remain', 'uebrig', NULL),
+(1492, 20, 209, 'reload', 'reload', NULL),
+(1493, 20, 209, 'reward', 'verguetung', NULL),
+(1494, 20, 210, 'extra', 'typ', 'popup'),
+(1495, 20, 210, 'id', 'id', NULL),
+(1496, 20, 210, 'password', 'pw', NULL),
+(1497, 20, 210, 'remain', 'uebrig', NULL),
+(1498, 20, 210, 'reload', 'reload', NULL),
+(1499, 20, 210, 'reward', 'verguetung', NULL),
+(1500, 20, 210, 'minimum_stay', 'ma', NULL),
+(1501, 20, 211, 'extra', 'typ', 'paidmail'),
+(1502, 20, 211, 'id', 'id', NULL),
+(1503, 20, 211, 'password', 'pw', NULL),
+(1504, 20, 211, 'remain', 'uebrig', NULL),
+(1505, 20, 211, 'reload', 'reload', NULL),
+(1506, 20, 211, 'reward', 'verguetung', NULL),
+(1507, 20, 211, 'minimum_stay', 'ma', NULL)");
+
                // Request parameters per type handler - UltraPROMO
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_param_id`, `network_id`, `network_type_id`, `request_param_key`, `request_param_value`, `request_param_default`) VALUES
-(827, 20, 128, 'extra', 'typ', 'forcedbanner'),
-(828, 20, 128, 'id', 'id', NULL),
-(829, 20, 128, 'password', 'pw', NULL),
-(830, 20, 128, 'remain', 'uebrig', NULL),
-(831, 20, 128, 'reload', 'reload', NULL),
-(832, 20, 128, 'reward', 'verguetung', NULL),
-(833, 20, 129, 'extra', 'typ', 'forcedtextlink'),
-(834, 20, 129, 'id', 'id', NULL),
-(835, 20, 129, 'password', 'pw', NULL),
-(836, 20, 129, 'remain', 'uebrig', NULL),
-(837, 20, 129, 'reload', 'reload', NULL),
-(838, 20, 129, 'reward', 'verguetung', NULL),
-(839, 20, 126, 'extra', 'typ', 'bannerview'),
-(840, 20, 126, 'id', 'id', NULL),
-(841, 20, 126, 'password', 'pw', NULL),
-(842, 20, 126, 'remain', 'uebrig', NULL),
-(843, 20, 126, 'reload', 'reload', NULL),
-(844, 20, 126, 'reward', 'verguetung', NULL),
-(845, 20, 125, 'extra', 'typ', 'bannerklick'),
-(846, 20, 125, 'id', 'id', NULL),
-(847, 20, 125, 'password', 'pw', NULL),
-(848, 20, 125, 'remain', 'uebrig', NULL),
-(849, 20, 125, 'reload', 'reload', NULL),
-(850, 20, 125, 'reward', 'verguetung', NULL),
-(851, 20, 131, 'extra', 'typ', 'skybannerview'),
-(852, 20, 131, 'id', 'id', NULL),
-(853, 20, 131, 'password', 'pw', NULL),
-(854, 20, 131, 'remain', 'uebrig', NULL),
-(855, 20, 131, 'reload', 'reload', NULL),
-(856, 20, 131, 'reward', 'verguetung', NULL),
-(857, 20, 127, 'extra', 'typ', 'buttonview'),
-(858, 20, 127, 'id', 'id', NULL),
-(859, 20, 127, 'password', 'pw', NULL),
-(860, 20, 127, 'remain', 'uebrig', NULL),
-(861, 20, 127, 'reload', 'reload', NULL),
-(862, 20, 127, 'reward', 'verguetung', NULL),
-(863, 20, 132, 'extra', 'typ', 'textview'),
-(864, 20, 132, 'id', 'id', NULL),
-(865, 20, 132, 'password', 'pw', NULL),
-(866, 20, 132, 'remain', 'uebrig', NULL),
-(867, 20, 132, 'reload', 'reload', NULL),
-(868, 20, 132, 'reward', 'verguetung', NULL),
-(869, 20, 134, 'extra', 'typ', 'traffic'),
-(870, 20, 134, 'id', 'id', NULL),
-(871, 20, 134, 'password', 'pw', NULL),
-(872, 20, 134, 'remain', 'uebrig', NULL),
-(873, 20, 134, 'reload', 'reload', NULL),
-(874, 20, 134, 'reward', 'verguetung', NULL),
-(875, 20, 130, 'extra', 'typ', 'popup'),
-(876, 20, 130, 'id', 'id', NULL),
-(877, 20, 130, 'password', 'pw', NULL),
-(878, 20, 130, 'remain', 'uebrig', NULL),
-(879, 20, 130, 'reload', 'reload', NULL),
-(880, 20, 130, 'reward', 'verguetung', NULL),
-(881, 20, 130, 'min_stay', 'ma', NULL),
-(882, 20, 133, 'extra', 'typ', 'paidmail'),
-(883, 20, 133, 'id', 'id', NULL),
-(884, 20, 133, 'password', 'pw', NULL),
-(885, 20, 133, 'remain', 'uebrig', NULL),
-(886, 20, 133, 'reload', 'reload', NULL),
-(887, 20, 133, 'reward', 'verguetung', NULL),
-(888, 20, 133, 'min_stay', 'ma', NULL)");
+(827, 21, 128, 'extra', 'typ', 'forcedbanner'),
+(828, 21, 128, 'id', 'id', NULL),
+(829, 21, 128, 'password', 'pw', NULL),
+(830, 21, 128, 'remain', 'uebrig', NULL),
+(831, 21, 128, 'reload', 'reload', NULL),
+(832, 21, 128, 'reward', 'verguetung', NULL),
+(833, 21, 129, 'extra', 'typ', 'forcedtextlink'),
+(834, 21, 129, 'id', 'id', NULL),
+(835, 21, 129, 'password', 'pw', NULL),
+(836, 21, 129, 'remain', 'uebrig', NULL),
+(837, 21, 129, 'reload', 'reload', NULL),
+(838, 21, 129, 'reward', 'verguetung', NULL),
+(839, 21, 126, 'extra', 'typ', 'bannerview'),
+(840, 21, 126, 'id', 'id', NULL),
+(841, 21, 126, 'password', 'pw', NULL),
+(842, 21, 126, 'remain', 'uebrig', NULL),
+(843, 21, 126, 'reload', 'reload', NULL),
+(844, 21, 126, 'reward', 'verguetung', NULL),
+(845, 21, 125, 'extra', 'typ', 'bannerklick'),
+(846, 21, 125, 'id', 'id', NULL),
+(847, 21, 125, 'password', 'pw', NULL),
+(848, 21, 125, 'remain', 'uebrig', NULL),
+(849, 21, 125, 'reload', 'reload', NULL),
+(850, 21, 125, 'reward', 'verguetung', NULL),
+(851, 21, 131, 'extra', 'typ', 'skybannerview'),
+(852, 21, 131, 'id', 'id', NULL),
+(853, 21, 131, 'password', 'pw', NULL),
+(854, 21, 131, 'remain', 'uebrig', NULL),
+(855, 21, 131, 'reload', 'reload', NULL),
+(856, 21, 131, 'reward', 'verguetung', NULL),
+(857, 21, 127, 'extra', 'typ', 'buttonview'),
+(858, 21, 127, 'id', 'id', NULL),
+(859, 21, 127, 'password', 'pw', NULL),
+(860, 21, 127, 'remain', 'uebrig', NULL),
+(861, 21, 127, 'reload', 'reload', NULL),
+(862, 21, 127, 'reward', 'verguetung', NULL),
+(863, 21, 132, 'extra', 'typ', 'textview'),
+(864, 21, 132, 'id', 'id', NULL),
+(865, 21, 132, 'password', 'pw', NULL),
+(866, 21, 132, 'remain', 'uebrig', NULL),
+(867, 21, 132, 'reload', 'reload', NULL),
+(868, 21, 132, 'reward', 'verguetung', NULL),
+(869, 21, 134, 'extra', 'typ', 'traffic'),
+(870, 21, 134, 'id', 'id', NULL),
+(871, 21, 134, 'password', 'pw', NULL),
+(872, 21, 134, 'remain', 'uebrig', NULL),
+(873, 21, 134, 'reload', 'reload', NULL),
+(874, 21, 134, 'reward', 'verguetung', NULL),
+(875, 21, 130, 'extra', 'typ', 'popup'),
+(876, 21, 130, 'id', 'id', NULL),
+(877, 21, 130, 'password', 'pw', NULL),
+(878, 21, 130, 'remain', 'uebrig', NULL),
+(879, 21, 130, 'reload', 'reload', NULL),
+(880, 21, 130, 'reward', 'verguetung', NULL),
+(881, 21, 130, 'minimum_stay', 'ma', NULL),
+(882, 21, 133, 'extra', 'typ', 'paidmail'),
+(883, 21, 133, 'id', 'id', NULL),
+(884, 21, 133, 'password', 'pw', NULL),
+(885, 21, 133, 'remain', 'uebrig', NULL),
+(886, 21, 133, 'reload', 'reload', NULL),
+(887, 21, 133, 'reward', 'verguetung', NULL),
+(888, 21, 133, 'minimum_stay', 'ma', NULL)");
 
                // Request parameters per type handler - Der Werbepartner.cc
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_param_id`, `network_id`, `network_type_id`, `request_param_key`, `request_param_value`, `request_param_default`) VALUES
-(951, 21, 145, 'extra', 'art', 'Textlinkklick'),
-(952, 21, 145, 'reload', 'reload', NULL),
-(953, 21, 145, 'reward', 'verg', NULL),
-(954, 21, 145, 'remain', 'offen', NULL),
-(955, 21, 145, 'sid', 'sid', NULL),
-(956, 21, 145, 'id', 'uid', NULL),
-(957, 21, 145, 'password', 'pw', NULL),
-(958, 21, 146, 'extra', 'art', 'Forcedbanner'),
-(959, 21, 146, 'reload', 'reload', NULL),
-(960, 21, 146, 'reward', 'verg', NULL),
-(961, 21, 146, 'remain', 'offen', NULL),
-(962, 21, 146, 'sid', 'sid', NULL),
-(963, 21, 146, 'id', 'uid', NULL),
-(964, 21, 146, 'password', 'pw', NULL),
-(965, 21, 147, 'extra', 'art', 'Paidmail'),
-(966, 21, 147, 'reload', 'reload', NULL),
-(967, 21, 147, 'reward', 'verg', NULL),
-(968, 21, 147, 'remain', 'offen', NULL),
-(969, 21, 147, 'sid', 'sid', NULL),
-(970, 21, 147, 'id', 'uid', NULL),
-(971, 21, 147, 'password', 'pw', NULL),
-(972, 21, 148, 'extra', 'art', 'Layer'),
-(973, 21, 148, 'reload', 'reload', NULL),
-(974, 21, 148, 'reward', 'verg', NULL),
-(975, 21, 148, 'remain', 'offen', NULL),
-(976, 21, 148, 'sid', 'sid', NULL),
-(977, 21, 148, 'id', 'uid', NULL),
-(978, 21, 148, 'password', 'pw', NULL),
-(979, 21, 149, 'extra', 'art', 'Skybannerklick'),
-(980, 21, 149, 'reload', 'reload', NULL),
-(981, 21, 149, 'reward', 'verg', NULL),
-(982, 21, 149, 'remain', 'offen', NULL),
-(983, 21, 149, 'sid', 'sid', NULL),
-(984, 21, 149, 'id', 'uid', NULL),
-(985, 21, 149, 'password', 'pw', NULL),
-(986, 21, 150, 'extra', 'art', 'Surfbarklick'),
-(987, 21, 150, 'reload', 'reload', NULL),
-(988, 21, 150, 'reward', 'verg', NULL),
-(989, 21, 150, 'remain', 'offen', NULL),
-(990, 21, 150, 'sid', 'sid', NULL),
-(991, 21, 150, 'id', 'uid', NULL),
-(992, 21, 150, 'password', 'pw', NULL),
-(993, 21, 151, 'extra', 'art', 'Bannerview'),
-(994, 21, 151, 'reload', 'reload', NULL),
-(995, 21, 151, 'reward', 'verg', NULL),
-(996, 21, 151, 'remain', 'offen', NULL),
-(997, 21, 151, 'sid', 'sid', NULL),
-(998, 21, 151, 'id', 'uid', NULL),
-(999, 21, 151, 'password', 'pw', NULL),
-(1000, 21, 152, 'extra', 'art', 'PopUp'),
-(1001, 21, 152, 'reload', 'reload', NULL),
-(1002, 21, 152, 'reward', 'verg', NULL),
-(1003, 21, 152, 'remain', 'offen', NULL),
-(1004, 21, 152, 'sid', 'sid', NULL),
-(1005, 21, 152, 'id', 'uid', NULL),
-(1006, 21, 152, 'password', 'pw', NULL),
-(1007, 21, 153, 'extra', 'art', 'Bannerklick'),
-(1008, 21, 153, 'reload', 'reload', NULL),
-(1009, 21, 153, 'reward', 'verg', NULL),
-(1010, 21, 153, 'type', 'offen', NULL),
-(1011, 21, 153, 'sid', 'sid', NULL),
-(1012, 21, 153, 'id', 'uid', NULL),
-(1013, 21, 153, 'password', 'pw', NULL),
-(1014, 21, 154, 'extra', 'art', 'Forcedtextlink'),
-(1015, 21, 154, 'reload', 'reload', NULL),
-(1016, 21, 154, 'reward', 'verg', NULL),
-(1017, 21, 154, 'remain', 'offen', NULL),
-(1018, 21, 154, 'sid', 'sid', NULL),
-(1019, 21, 154, 'id', 'uid', NULL),
-(1020, 21, 154, 'password', 'pw', NULL),
-(1021, 21, 155, 'extra', 'art', 'Traffic'),
-(1022, 21, 155, 'reload', 'reload', NULL),
-(1023, 21, 155, 'reward', 'verg', NULL),
-(1024, 21, 155, 'remain', 'offen', NULL),
-(1025, 21, 155, 'sid', 'sid', NULL),
-(1026, 21, 155, 'id', 'id', NULL),
-(1027, 21, 155, 'password', 'pw', NULL)");
+(951, 22, 145, 'extra', 'art', 'Textlinkklick'),
+(952, 22, 145, 'reload', 'reload', NULL),
+(953, 22, 145, 'reward', 'verg', NULL),
+(954, 22, 145, 'remain', 'offen', NULL),
+(955, 22, 145, 'sid', 'sid', NULL),
+(956, 22, 145, 'id', 'uid', NULL),
+(957, 22, 145, 'password', 'pw', NULL),
+(958, 22, 146, 'extra', 'art', 'Forcedbanner'),
+(959, 22, 146, 'reload', 'reload', NULL),
+(960, 22, 146, 'reward', 'verg', NULL),
+(961, 22, 146, 'remain', 'offen', NULL),
+(962, 22, 146, 'sid', 'sid', NULL),
+(963, 22, 146, 'id', 'uid', NULL),
+(964, 22, 146, 'password', 'pw', NULL),
+(965, 22, 147, 'extra', 'art', 'Paidmail'),
+(966, 22, 147, 'reload', 'reload', NULL),
+(967, 22, 147, 'reward', 'verg', NULL),
+(968, 22, 147, 'remain', 'offen', NULL),
+(969, 22, 147, 'sid', 'sid', NULL),
+(970, 22, 147, 'id', 'uid', NULL),
+(971, 22, 147, 'password', 'pw', NULL),
+(972, 22, 148, 'extra', 'art', 'Layer'),
+(973, 22, 148, 'reload', 'reload', NULL),
+(974, 22, 148, 'reward', 'verg', NULL),
+(975, 22, 148, 'remain', 'offen', NULL),
+(976, 22, 148, 'sid', 'sid', NULL),
+(977, 22, 148, 'id', 'uid', NULL),
+(978, 22, 148, 'password', 'pw', NULL),
+(979, 22, 149, 'extra', 'art', 'Skybannerklick'),
+(980, 22, 149, 'reload', 'reload', NULL),
+(981, 22, 149, 'reward', 'verg', NULL),
+(982, 22, 149, 'remain', 'offen', NULL),
+(983, 22, 149, 'sid', 'sid', NULL),
+(984, 22, 149, 'id', 'uid', NULL),
+(985, 22, 149, 'password', 'pw', NULL),
+(986, 22, 150, 'extra', 'art', 'Surfbarklick'),
+(987, 22, 150, 'reload', 'reload', NULL),
+(988, 22, 150, 'reward', 'verg', NULL),
+(989, 22, 150, 'remain', 'offen', NULL),
+(990, 22, 150, 'sid', 'sid', NULL),
+(991, 22, 150, 'id', 'uid', NULL),
+(992, 22, 150, 'password', 'pw', NULL),
+(993, 22, 151, 'extra', 'art', 'Bannerview'),
+(994, 22, 151, 'reload', 'reload', NULL),
+(995, 22, 151, 'reward', 'verg', NULL),
+(996, 22, 151, 'remain', 'offen', NULL),
+(997, 22, 151, 'sid', 'sid', NULL),
+(998, 22, 151, 'id', 'uid', NULL),
+(999, 22, 151, 'password', 'pw', NULL),
+(1000, 22, 152, 'extra', 'art', 'PopUp'),
+(1001, 22, 152, 'reload', 'reload', NULL),
+(1002, 22, 152, 'reward', 'verg', NULL),
+(1003, 22, 152, 'remain', 'offen', NULL),
+(1004, 22, 152, 'sid', 'sid', NULL),
+(1005, 22, 152, 'id', 'uid', NULL),
+(1006, 22, 152, 'password', 'pw', NULL),
+(1007, 22, 153, 'extra', 'art', 'Bannerklick'),
+(1008, 22, 153, 'reload', 'reload', NULL),
+(1009, 22, 153, 'reward', 'verg', NULL),
+(1010, 22, 153, 'type', 'offen', NULL),
+(1011, 22, 153, 'sid', 'sid', NULL),
+(1012, 22, 153, 'id', 'uid', NULL),
+(1013, 22, 153, 'password', 'pw', NULL),
+(1014, 22, 154, 'extra', 'art', 'Forcedtextlink'),
+(1015, 22, 154, 'reload', 'reload', NULL),
+(1016, 22, 154, 'reward', 'verg', NULL),
+(1017, 22, 154, 'remain', 'offen', NULL),
+(1018, 22, 154, 'sid', 'sid', NULL),
+(1019, 22, 154, 'id', 'uid', NULL),
+(1020, 22, 154, 'password', 'pw', NULL),
+(1021, 22, 155, 'extra', 'art', 'Traffic'),
+(1022, 22, 155, 'reload', 'reload', NULL),
+(1023, 22, 155, 'reward', 'verg', NULL),
+(1024, 22, 155, 'remain', 'offen', NULL),
+(1025, 22, 155, 'sid', 'sid', NULL),
+(1026, 22, 155, 'id', 'id', NULL),
+(1027, 22, 155, 'password', 'pw', NULL)");
 
                // Request parameters per type handler - Yoo!Media
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_param_id`, `network_id`, `network_type_id`, `request_param_key`, `request_param_value`, `request_param_default`) VALUES
-(1028, 22, 156, 'id', 'id', NULL),
-(1029, 22, 156, 'sid', 'sid', NULL),
-(1030, 22, 156, 'password', 'pw', NULL),
-(1031, 22, 156, 'reload', 'reload', NULL),
-(1032, 22, 156, 'remain', 'uebrig', NULL),
-(1033, 22, 156, 'reward', 'verguetung', NULL),
-(1034, 22, 156, 'size', 'size', '468x60'),
-(1035, 22, 156, 'erotic', 'erotik', NULL),
-(1036, 22, 157, 'id', 'id', NULL),
-(1037, 22, 157, 'sid', 'sid', NULL),
-(1038, 22, 157, 'password', 'pw', NULL),
-(1039, 22, 157, 'reload', 'reload', NULL),
-(1040, 22, 157, 'reward', 'verguetung', NULL),
-(1041, 22, 157, 'erotic', 'erotik', NULL),
-(1042, 22, 157, 'remain', 'uebrig', NULL),
-(1043, 22, 158, 'id', 'id', NULL),
-(1044, 22, 158, 'sid', 'sid', NULL),
-(1045, 22, 158, 'password', 'pw', NULL),
-(1046, 22, 158, 'reload', 'reload', NULL),
-(1047, 22, 158, 'reward', 'verguetung', NULL),
-(1048, 22, 158, 'remain', 'uebrig', NULL),
-(1049, 22, 158, 'size', 'size', '468x60'),
-(1050, 22, 158, 'erotic', 'erotik', NULL),
-(1051, 22, 159, 'id', 'id', NULL),
-(1052, 22, 159, 'sid', 'sid', NULL),
-(1053, 22, 159, 'password', 'pw', NULL),
-(1054, 22, 159, 'reload', 'reload', NULL),
-(1055, 22, 159, 'min_stay', 'ma', NULL),
-(1056, 22, 159, 'remain', 'uebrig', NULL),
-(1057, 22, 159, 'reward', 'verguetung', NULL),
-(1058, 22, 159, 'size', 'size', '468x60'),
-(1059, 22, 159, 'erotic', 'erotik', NULL),
-(1060, 22, 160, 'id', 'id', NULL),
-(1061, 22, 160, 'sid', 'sid', NULL),
-(1062, 22, 160, 'password', 'pw', NULL),
-(1063, 22, 160, 'reload', 'reload', NULL),
-(1064, 22, 160, 'remain', 'uebrig', NULL),
-(1065, 22, 160, 'reward', 'verguetung', NULL),
-(1066, 22, 160, 'erotic', 'erotik', NULL),
-(1067, 22, 161, 'id', 'id', NULL),
-(1068, 22, 161, 'sid', 'sid', NULL),
-(1069, 22, 161, 'password', 'pw', NULL),
-(1070, 22, 161, 'reload', 'reload', NULL),
-(1071, 22, 161, 'min_stay', 'ma', NULL),
-(1072, 22, 161, 'remain', 'uebrig', NULL),
-(1073, 22, 161, 'reward', 'verguetung', NULL),
-(1074, 22, 161, 'erotic', 'erotik', NULL),
-(1075, 22, 162, 'id', 'id', NULL),
-(1076, 22, 162, 'sid', 'sid', NULL),
-(1077, 22, 162, 'password', 'pw', NULL),
-(1078, 22, 162, 'reload', 'reload', NULL),
-(1079, 22, 162, 'min_stay', 'ma', NULL),
-(1080, 22, 162, 'remain', 'uebrig', NULL),
-(1081, 22, 162, 'reward', 'verguetung', NULL),
-(1082, 22, 162, 'erotic', 'erotik', NULL),
-(1083, 22, 163, 'id', 'id', NULL),
-(1084, 22, 163, 'sid', 'sid', NULL),
-(1085, 22, 163, 'password', 'pw', NULL),
-(1086, 22, 163, 'reload', 'reload', NULL),
-(1087, 22, 163, 'remain', 'uebrig', NULL),
-(1088, 22, 163, 'reward', 'verguetung', NULL),
-(1089, 22, 163, 'erotic', 'erotik', NULL),
-(1090, 22, 164, 'id', 'id', NULL),
-(1091, 22, 164, 'sid', 'sid', NULL),
-(1092, 22, 164, 'password', 'pw', NULL),
-(1093, 22, 164, 'reload', 'reload', NULL),
-(1094, 22, 164, 'min_stay', 'ma', NULL),
-(1095, 22, 164, 'remain', 'uebrig', NULL),
-(1096, 22, 164, 'reward', 'verguetung', NULL),
-(1097, 22, 164, 'erotic', 'erotik', NULL),
-(1098, 22, 165, 'id', 'id', NULL),
-(1099, 22, 165, 'sid', 'sid', NULL),
-(1100, 22, 165, 'password', 'pw', NULL),
-(1101, 22, 165, 'reload', 'reload', NULL),
-(1102, 22, 165, 'min_stay', 'ma', NULL),
-(1103, 22, 165, 'reward', 'verguetung', NULL),
-(1104, 22, 165, 'remain', 'uebrig', NULL),
-(1105, 22, 165, 'erotic', 'erotik', NULL),
-(1106, 22, 166, 'id', 'id', NULL),
-(1107, 22, 166, 'sid', 'sid', NULL),
-(1108, 22, 166, 'password', 'pw', NULL),
-(1109, 22, 166, 'remain', 'uebrig', NULL),
-(1110, 22, 166, 'reward', 'verguetung', NULL),
-(1111, 22, 166, 'erotic', 'erotik', NULL)");
+(1028, 23, 156, 'id', 'id', NULL),
+(1029, 23, 156, 'sid', 'sid', NULL),
+(1030, 23, 156, 'password', 'pw', NULL),
+(1031, 23, 156, 'reload', 'reload', NULL),
+(1032, 23, 156, 'remain', 'uebrig', NULL),
+(1033, 23, 156, 'reward', 'verguetung', NULL),
+(1034, 23, 156, 'size', 'size', '468x60'),
+(1035, 23, 156, 'erotic', 'erotik', NULL),
+(1036, 23, 157, 'id', 'id', NULL),
+(1037, 23, 157, 'sid', 'sid', NULL),
+(1038, 23, 157, 'password', 'pw', NULL),
+(1039, 23, 157, 'reload', 'reload', NULL),
+(1040, 23, 157, 'reward', 'verguetung', NULL),
+(1041, 23, 157, 'erotic', 'erotik', NULL),
+(1042, 23, 157, 'remain', 'uebrig', NULL),
+(1043, 23, 158, 'id', 'id', NULL),
+(1044, 23, 158, 'sid', 'sid', NULL),
+(1045, 23, 158, 'password', 'pw', NULL),
+(1046, 23, 158, 'reload', 'reload', NULL),
+(1047, 23, 158, 'reward', 'verguetung', NULL),
+(1048, 23, 158, 'remain', 'uebrig', NULL),
+(1049, 23, 158, 'size', 'size', '468x60'),
+(1050, 23, 158, 'erotic', 'erotik', NULL),
+(1051, 23, 159, 'id', 'id', NULL),
+(1052, 23, 159, 'sid', 'sid', NULL),
+(1053, 23, 159, 'password', 'pw', NULL),
+(1054, 23, 159, 'reload', 'reload', NULL),
+(1055, 23, 159, 'minimum_stay', 'ma', NULL),
+(1056, 23, 159, 'remain', 'uebrig', NULL),
+(1057, 23, 159, 'reward', 'verguetung', NULL),
+(1058, 23, 159, 'size', 'size', '468x60'),
+(1059, 23, 159, 'erotic', 'erotik', NULL),
+(1060, 23, 160, 'id', 'id', NULL),
+(1061, 23, 160, 'sid', 'sid', NULL),
+(1062, 23, 160, 'password', 'pw', NULL),
+(1063, 23, 160, 'reload', 'reload', NULL),
+(1064, 23, 160, 'remain', 'uebrig', NULL),
+(1065, 23, 160, 'reward', 'verguetung', NULL),
+(1066, 23, 160, 'erotic', 'erotik', NULL),
+(1067, 23, 161, 'id', 'id', NULL),
+(1068, 23, 161, 'sid', 'sid', NULL),
+(1069, 23, 161, 'password', 'pw', NULL),
+(1070, 23, 161, 'reload', 'reload', NULL),
+(1071, 23, 161, 'minimum_stay', 'ma', NULL),
+(1072, 23, 161, 'remain', 'uebrig', NULL),
+(1073, 23, 161, 'reward', 'verguetung', NULL),
+(1074, 23, 161, 'erotic', 'erotik', NULL),
+(1075, 23, 162, 'id', 'id', NULL),
+(1076, 23, 162, 'sid', 'sid', NULL),
+(1077, 23, 162, 'password', 'pw', NULL),
+(1078, 23, 162, 'reload', 'reload', NULL),
+(1079, 23, 162, 'minimum_stay', 'ma', NULL),
+(1080, 23, 162, 'remain', 'uebrig', NULL),
+(1081, 23, 162, 'reward', 'verguetung', NULL),
+(1082, 23, 162, 'erotic', 'erotik', NULL),
+(1083, 23, 163, 'id', 'id', NULL),
+(1084, 23, 163, 'sid', 'sid', NULL),
+(1085, 23, 163, 'password', 'pw', NULL),
+(1086, 23, 163, 'reload', 'reload', NULL),
+(1087, 23, 163, 'remain', 'uebrig', NULL),
+(1088, 23, 163, 'reward', 'verguetung', NULL),
+(1089, 23, 163, 'erotic', 'erotik', NULL),
+(1090, 23, 164, 'id', 'id', NULL),
+(1091, 23, 164, 'sid', 'sid', NULL),
+(1092, 23, 164, 'password', 'pw', NULL),
+(1093, 23, 164, 'reload', 'reload', NULL),
+(1094, 23, 164, 'minimum_stay', 'ma', NULL),
+(1095, 23, 164, 'remain', 'uebrig', NULL),
+(1096, 23, 164, 'reward', 'verguetung', NULL),
+(1097, 23, 164, 'erotic', 'erotik', NULL),
+(1098, 23, 165, 'id', 'id', NULL),
+(1099, 23, 165, 'sid', 'sid', NULL),
+(1100, 23, 165, 'password', 'pw', NULL),
+(1101, 23, 165, 'reload', 'reload', NULL),
+(1102, 23, 165, 'minimum_stay', 'ma', NULL),
+(1103, 23, 165, 'reward', 'verguetung', NULL),
+(1104, 23, 165, 'remain', 'uebrig', NULL),
+(1105, 23, 165, 'erotic', 'erotik', NULL),
+(1106, 23, 166, 'id', 'id', NULL),
+(1107, 23, 166, 'sid', 'sid', NULL),
+(1108, 23, 166, 'password', 'pw', NULL),
+(1109, 23, 166, 'remain', 'uebrig', NULL),
+(1110, 23, 166, 'reward', 'verguetung', NULL),
+(1111, 23, 166, 'erotic', 'erotik', NULL)");
 
                // Fix empty defaults to NULL
                addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_network_types` SET `network_type_banner_url`=NULL WHERE `network_type_banner_url`=''");
@@ -1960,8 +2039,8 @@ PRIMARY KEY (`network_reload_id`)
                addAdminMenuSql('network','list_networks','Auflisten/Verwalten','<strong>Experten-Einstellungen!</strong> Hier &auml;ndern Sie die Einstellungen an den Grunddaten (Stammdaten) des jeweiligen Werbenetzwerks ab. Sie sollten hier generell nichts einstellen und <a href="http://forum.mxchange.org/forum-43.html" target="_blank" title="Direktlink zum Forum">im Forum</a> um Hilfe fragen, wenn Sie selber ein Werbenetzwerk einrichten m&ouml;chten.',6);
                addAdminMenuSql('network','list_network_types','Werbearten','<strong>Experten-Einstellungen!</strong> Hier &auml;ndern Sie die Einstellungen zu den Werbearten pro Werbenetzwerken. Sie sollten hier generell nichts einstellen und <a href="http://forum.mxchange.org/forum-43.html" target="_blank" title="Direktlink zum Forum">im Forum</a> um Hilfe fragen, wenn Sie selber ein Werbenetzwerk einrichten m&ouml;chten.',7);
                addAdminMenuSql('network','list_network_params','Abfrageparameter','<strong>Experten-Einstellungen!</strong> Hier stellen Sie die Abfrageparameter (wie sie genannt werden m&uuml;ssen, um das API-Script korrekt aufrufen zu k&ouml;nnen) ein, pro Werbenetzwerk. Sie sollten hier generell nichts einstellen und <a href="http://forum.mxchange.org/forum-43.html" target="_blank" title="Direktlink zum Forum">im Forum</a> um Hilfe fragen, wenn Sie selber ein Werbenetzwerk einrichten m&ouml;chten.',8);
-               addAdminMenuSql('network','list_network_return_codes','R&uuml;ckgabewerte','<strong>Experten-Einstellungen!</strong> Hier stellen Sie die Zuweisungen der aus der analysierten API-Antwort Array-Elementen zu den Datenspalten ein. Sie sollten hier generell nichts einstellen und <a href="http://forum.mxchange.org/forum-43.html" target="_blank" title="Direktlink zum Forum">im Forum</a> um Hilfe fragen, wenn Sie selber ein Werbenetzwerk einrichten m&ouml;chten.',9);
-               addAdminMenuSql('network','list_network_error_codes','Fehlercodes','<strong>Experten-Einstellungen!</strong> Hier stellen Sie die R&uuml;ckgabewerte ein, die im Falle eines Fehlers pro API-Script kommen k&ouml;nnen. Sie sollten hier generell nichts einstellen und <a href="http://forum.mxchange.org/forum-43.html" target="_blank" title="Direktlink zum Forum">im Forum</a> um Hilfe fragen, wenn Sie selber ein Werbenetzwerk einrichten m&ouml;chten.',10);
+               addAdminMenuSql('network','list_network_array_translation','Antwort-Array','<strong>Experten-Einstellungen!</strong> Hier stellen Sie die Zuweisungen der aus der analysierten API-Antwort Array-Elementen zu den Datenspalten ein. Sie sollten hier generell nichts einstellen und <a href="http://forum.mxchange.org/forum-43.html" target="_blank" title="Direktlink zum Forum">im Forum</a> um Hilfe fragen, wenn Sie selber ein Werbenetzwerk einrichten m&ouml;chten.',9);
+               addAdminMenuSql('network','list_network_error_codes','Fehlercodes','<strong>Experten-Einstellungen!</strong> Hier stellen Sie die Fehlercodes ein, die im Falle eines Fehlers pro API-Script kommen k&ouml;nnen. Sie sollten hier generell nichts einstellen und <a href="http://forum.mxchange.org/forum-43.html" target="_blank" title="Direktlink zum Forum">im Forum</a> um Hilfe fragen, wenn Sie selber ein Werbenetzwerk einrichten m&ouml;chten.',10);
                addAdminMenuSql('network','list_network_error_types','Fehlertypen','<strong>Experten-Einstellungen!</strong> Hier stellen Sie die Namen von Fehlercodes ein, die Scripte zur&uuml;ckliefern k&ouml;nnen. <strong>Dies sind INTERNE Daten und sollten nur vom Entwicklerteam angepasst werden.</strong> Stellen Sie an diesen Einstellungen bitte nichts um. Sie sollten hier generell nichts einstellen und <a href="http://forum.mxchange.org/forum-43.html" target="_blank" title="Direktlink zum Forum">im Forum</a> um Hilfe fragen, wenn Sie selber ein Werbenetzwerk einrichten m&ouml;chten.',11);
 
                // Configuration entries
@@ -1976,7 +2055,7 @@ PRIMARY KEY (`network_reload_id`)
                addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_network_error_codes`');
                addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_network_error_types`');
                addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_network_translations`');
-               addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_network_return_types`');
+               addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_network_array_translation`');
                addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_network_config`');
                addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_network_types_config`');
                addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_network_cache`');

diff --git a/inc/extensions/ext-sql_patches.php b/inc/extensions/ext-sql_patches.php
index 54a7bc840113c0230249c27520bd101460e0ea23..68d4ea59e1767755c22b7e9e67001e2c69afdb96 100644 (file)
--- a/inc/extensions/ext-sql_patches.php
+++ b/inc/extensions/ext-sql_patches.php
@@ -281,7 +281,7 @@ switch (getExtensionMode()) {
                                        // Switch to JPEG format
                                        $auto_type = 'jpg';
                                }
-                               addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD `img_type` ENUM('jpg','png') NOT NULL DEFAULT '".$auto_type."'");
+                               addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD `img_type` ENUM('jpg','png') NOT NULL DEFAULT '" . $auto_type . "'");
 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Generierung des Mailbest&auml;tigungscodes h&auml;ngt davon ab, ob die PHP-Funktion <u>imagecreatefromjpeg()</u> und das JPEG-Bild vorhanden sind oder nicht.");

diff --git a/inc/functions.php b/inc/functions.php
index 03376db72e20103835833c2b16695e5e1b336895..eec116f9c7cd0c52b9a87f25ef4dd13ff2a8f696 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -2397,9 +2397,10 @@ function displayParsingTime() {
        if ($runTime < 0) $runTime = '0';
 
        // Prepare output
+       // @TODO This can be easily moved out after the merge from EL branch to this is complete
        $content = array(
-               'runtime'  => translateComma($runTime),
-               'timeSQLs' => translateComma(getConfig('sql_time') * 1000),
+               'run_time' => translateComma($runTime),
+               'sql_time' => translateComma(getConfig('sql_time') * 1000),
        );
 
        // Load the template

diff --git a/inc/language/beg_de.php b/inc/language/beg_de.php
index 19cae426e517821163da10d6b641e751c12f8b67..50dbbab0ff51aa17c5ebe2438e7ca38a988dcf64 100644 (file)
--- a/inc/language/beg_de.php
+++ b/inc/language/beg_de.php
@@ -50,7 +50,7 @@ addMessages(array(
        'ADMIN_CONFIG_BEG_UID_TIMEOUT' => "Zeitsperre gegen eine Mitglieder-Id",
        'ADMIN_CONFIG_BEG_REMOTE_IP_TIMEOUT' => "Zeitsperre gegen eine IP-Nummer",
        'BEG_LINK_BY' => "Bettel-Link bei <strong>{?MAIN_TITLE?}</strong>",
-       'BEG_LINK_USERID' => "Unser Mitglied <strong>%s</strong> hat {?POINTS?} gebettelt.",
+       'BEG_LINK_USERID' => "Unser Mitglied <span class=\"data\">%s</span> hat {?POINTS?} gebettelt.",
        'BEG_UID_STEAL_1' => "Das Mitglied ",
        'BEG_UID_STEAL_2' => " hat soeben ",
        'BEG_UID_STEAL_3' => " {?POINTS?} bei Ihnen erbettelt.",
@@ -66,13 +66,13 @@ addMessages(array(
        'BEG_MEMBER_EARN_1' => "Sie erhalten von",
        'BEG_MEMBER_EARN_2' => "bis",
        'BEG_MEMBER_EARN_3' => "f&uuml;r jeden Klick auf Ihren Bettellink.",
-       'BEG_MEMBER_TIMEOUT' => "Die Zeitsperre ist derzeit eingestellt auf <strong>%s</strong>. Innerhalb dieser Zeit erhalten Sie keine erneute Verg&uuml;tung.",
+       'BEG_MEMBER_TIMEOUT' => "Die Zeitsperre ist derzeit eingestellt auf <span class=\"data\">{%config,createFancyTime=beg_timeout%}</span>. Innerhalb dieser Zeit erhalten Sie keine erneute Verg&uuml;tung.",
        'BEG_MEMBER_HAVE_FUN' => "Viel Spass beim {?POINTS?}-Betteln.",
        'BEG_GUEST_TRAILER' => "{?POINTS?} erbetteln bei...",
        'BEG_GUEST_EARN_1' => "Betteln macht sich bezahlt! F&uuml;r jeden Klick erhalten Sie von",
        'BEG_GUEST_EARN_2' => "bis",
        'BEG_GUEST_EARN_3' => "auf Ihr Mitgliedskonto direkt gutgeschrieben. Zuddem verdienen Sie an den erbettelteten {?POINTS?} Ihrer Refferal mit.",
-       'BEG_GUEST_TIMEOUT' => "Sie k&ouml;nnen derzeit alle <strong>%s</strong> {?POINTS?} betteln.",
+       'BEG_GUEST_TIMEOUT' => "Sie k&ouml;nnen derzeit alle <span class=\"data\">%s</span> {?POINTS?} betteln.",
        'BEG_GUEST_HAVE_FUN' => "Heute noch anmelden und Spass haben.",
        'ADMIN_BEG_POINTS_MAX' => "Maximale erbettelbare {?POINTS?} bei Klick auf Bettellink",
        'ADMIN_BEG_USERID' => "Mitglied-Account zum Abbuchen der erbettelten {?POINTS?}",
@@ -102,7 +102,7 @@ addMessages(array(
        'BEG_TOTAL' => "Gesamt erbettelt",
        'BEG_POINTS' => "Erbettelt",
        'BEG_MEMBER_TOTAL' => "Erbettelte {?POINTS?} aller Mitglieder",
-       'ADMIN_BEG_TIMEOUT' => "Es werden nur Mitglieder ausgewertet und hier aufgelistet, die sp&auml;testens am <strong>%s</strong> noch aktiv waren. Alle anderen Mitglieder erhalten die Verg&uuml;tung nicht.",
+       'ADMIN_BEG_TIMEOUT' => "Es werden nur Mitglieder ausgewertet und hier aufgelistet, die sp&auml;testens am <span class=\"data\">%s</span> noch aktiv waren. Alle anderen Mitglieder erhalten die Verg&uuml;tung nicht.",
        'ADMIN_EDIT_BEG_RALLYE_SETTINGS' => "Einstellungen an der Bettel-Rallye",
        'ADMIN_BEG_RALLYE_ACTIVE' => "Ist die Bettel-Rallye aktiv? (Mails k&ouml;nnen optional versendet werden!)",
        'ADMIN_BEG_RALLYE_ONLY_ACTIVE' => "Nur aktive Mitglieder nehmen dran?<br /><div class=\"admin_note\">(Nur in Verbindung mit der Erweiterung <strong>autopurge</strong>!)</div>",

diff --git a/inc/language/bonus_de.php b/inc/language/bonus_de.php
index 22665c1a5949f07341c5b4831012524e8bcccb7e..84eaf36674f7ed67932b7e98341c36d7c0dda2ed 100644 (file)
--- a/inc/language/bonus_de.php
+++ b/inc/language/bonus_de.php
@@ -82,7 +82,7 @@ addMessages(array(
        'ADMIN_BONUS_WITHDRAW_PREPARED' => "Vergütung des Aktiv-Bonuses vorbereitet.",
        'ADMIN_BONUS_WINNER_HIGLIGHTED' => "Mögliche Gewinner der Aktiv-Rallye sind dick marktiert.",
        'ADMIN_BONUS_ALREADY_WITHDRAW' => "Manuelle Vergütungvorbereitung bereits betätigt.",
-       'ADMIN_BONUS_TIMEOUT' => "Es werden nur Mitglieder ausgewertet und hier aufgelistet, die sp&auml;testens am <strong>%s</strong> noch aktiv waren. Alle anderen Mitglieder erhalten die Verg&uuml;tung nicht.",
+       'ADMIN_BONUS_TIMEOUT' => "Es werden nur Mitglieder ausgewertet und hier aufgelistet, die sp&auml;testens am <span class=\"data\">%s</span> noch aktiv waren. Alle anderen Mitglieder erhalten die Verg&uuml;tung nicht.",
        'ADMIN_BONUS_USERID' => "Mitgliedskonto zum Abbuchen der {?POINTS?}",
        'ADMIN_CONFIG_BONUS_TIMEOUT' => "Verweildauer von Aktiv-Bonus-Eintr&auml;gen",
        'ADMIN_BONUS_TURBO_LINES' => "Anzahl angezeigter Aktiv-Bonus-Empf&auml;nger in <strong>show_bonus.php</strong>",
@@ -131,7 +131,7 @@ addMessages(array(
        'ADMIN_BONUS_RALLYE_REF_INCLUDE'   => "Referal-Bonus in monatlicher Auswertung mit einschliessen?",
 
 // Header
-       'MEMBER_MAIL_BONUS_DETAILS_TITLE' => "Details zur Bonusmail <strong>%s</strong>:",
+       'MEMBER_MAIL_BONUS_DETAILS_TITLE' => "Details zur Bonusmail <span class=\"data\">%s</span>:",
 
 // Subject lines
        'BONUS_RALLYE_DI_NOTIFY' => "HINWEIS: Aktiv-Rallye gestoppt.",

diff --git a/inc/language/de.php b/inc/language/de.php
index 4c8271b0be2215a3b827b2c4a0db01881d8b725c..b91dfb6f5adbdf3f3b8177dbefcc24d0518bb789 100644 (file)
--- a/inc/language/de.php
+++ b/inc/language/de.php
@@ -59,10 +59,6 @@ addMessages(array(
        'LANG_DOWN_MAINTAINCE' => "System wegen Wartungsarbeiten geschlossen.",
        'LANG_MOD_REG_404' => "Modul <span class=\"data\">%s</span> existiert nicht.",
        'LANG_UNKNOWN_MODULE' => "Unbekanntes Modul",
-       'META_YOUR_NAME_1' => "Ihr Name hier",
-       'META_YOUR_NAME_2' => "Ihr Name nochmal",
-       'META_DESCRIPTION' => "Beschreibung Ihrer Webseite hier",
-       'META_KEYWORDS' => "mailtausch, mailversand, kostenlos, kostenloser, mailexchange, werbemail, werbemailversand, exchange, werbepunkte, punkte, auktion, auktionen, umsonst, sms kostenlos, produkte, produktproben, gewinn, gewinnspiel, gratis sms, promotion, besucher, werbung, linkliste, geldverdienen, verdienen, traffic, hits",
        'LANG_WARNING' => "Warnung",
        'DIE_CONFIG_CHANGED_YOU' => "Sie haben Ihre Config-Datei editiert! Auf Wiedersehen...",
        'DIE_RUN_INSTALL_MYSQL' => "Bitte rufen Sie http://your-domain.com/install.php auf, um Ihre MySQL-Daten einzurichten.",
@@ -74,7 +70,7 @@ addMessages(array(
        'LANG_NO_RENDER_DIRECT' => "Sie haben weder 'render' noch 'direct' als Ausgabe-Modus eingestellt.",
        'INSTALLATION' => "Installation des Scriptes",
        'INSTALL_PROBLEMS_DETECTED' => "Es wurden bei der Initialisierung des Installationsvorganges Probleme festgestellt.",
-       'FATAL_NO' => "Fataler Fehler Nr. ",
+       'FATAL_NO' => "Fataler Fehler Nr. #",
        'FATAL_CORRECT_ERRORS' => "Kann nicht fortsetzen! Bitte korregieren Sie erst die obrigen Probleme und versuchen Sie es dann erneut.",
        'YES' => "Ja",
        'NO' => "Nein",
@@ -148,7 +144,7 @@ addMessages(array(
        'EDIT_MENUS' => "Men&uuml;s bearbeiten",
        'DEL_MENUS' => "Men&uuml;s l&ouml;schen",
        'EDIT_ADMIN_MENU' => "Admin-Men&uuml;eintr&auml;ge &auml;ndern",
-       'EDIT_MENU' => "Es soll/sollen <strong>%s</strong> Men&uuml;eintrag/-eintr&auml;ge ge&auml;ndert werden:",
+       'EDIT_MENU' => "Es soll/sollen <span class=\"data\">%s</span> Men&uuml;eintrag/-eintr&auml;ge ge&auml;ndert werden:",
        'ENTRY_MODIFY' => "Eintrag",
        'SUBMIT_CHANGES' => "&Auml;nderungen durchf&uuml;hren",
        'ENTRY_404_1' => "Eintrag <em>",
@@ -313,6 +309,7 @@ addMessages(array(
        'LOGIN_COOKIES_DISABLED' => "Sie haben in Ihrem Browser entweder die Cookies ausgeschaltet, oder die Sicherheitsstufe ist zu hoch eingestellt.",
        'LOGIN_UNKNOWN_ERROR' => "Es ist ein unerwarteter Account-Status aufgetreten. Bitte melden Sie sich beim Support dieses {?mt_word2?}.",
        'LOGIN_UNKNOWN_STATUS' => "Ihr Account weisst einen unbekannten Status auf. Bitte melden Sie sich beim Support dieses {?mt_word2?}.",
+       // @TODO Following two are unused?
        'GUEST_REG_POINTS_1' => "F&uuml;r Ihre Anmeldung haben wir Ihnen als Willkommensgutschrift",
        'GUEST_REG_POINTS_2' => "{?POINTS?} gutgeschrieben. Sie k&ouml;nnen bereits jetzt schon Mails an die anderen Mitglieder verschicken - solange Empf&auml;nger auch erreichbar sind.",
        'GUEST_SELECT_LIFETIME' => "Wie lange soll Auto-Login aktiv sein?",
@@ -483,8 +480,7 @@ addMessages(array(
        'MEMBER_SENDING_DONE' => "Ihre gebuchte Mail wurde soeben vollst&auml;ndig von unserem System versendet! Wir w&uuml;nschen Ihnen viel Erfolg mit Ihrer Werbebuchung.",
        'MEMBER_NOTIFY_DONE' => "Den weiteren Verlauf dieser Werbebuchung k&ouml;nnen Sie im Mitgliedsbereich unter Statistiken verfolgen.",
        'MEMBER_SUBJ_SEND_DONE' => "Ihre Werbebuchung wurde versandt",
-       'GUEST_SELECT_LEAST_CATS_1' => "Bitte w&auml;hlen Sie mindestens <strong><BIG>",
-       'GUEST_SELECT_LEAST_CATS_2' => "</BIG></strong> Kategorien aus. Anderfalls erfolgt keine Anmeldung.",
+       'GUEST_SELECT_LEAST_CATS' => "Bitte w&auml;hlen Sie mindestens <span class=\"data\">{?least_cats?}</span> Kategorien aus. Anderfalls erfolgt keine Anmeldung.",
        'MEMBER_POOL_CONTENT' => "Ihre Mails im Sende-Pool",
        'MEMBER_STATS_CONTENT' => "Statistiken versandter Mails",
        'EMAIL_END_SEND' => "Vollst&auml;ndig versendet",
@@ -634,8 +630,7 @@ addMessages(array(
        'USER_ID' => "Mitglied",
        'UNCONFIRMED_LINKS' => "Unbest&auml;tigte Mails",
        'ADMIN_MEMBER_LINKS' => "Das Mitglied <span class=\"data\">%s</span> hat alle seine Mails best&auml;tigt.",
-       'MEMBER_TOTAL_LINKS_1' => "Es m&uuml;ssen noch <strong>",
-       'MEMBER_TOTAL_LINKS_2' => "</strong> Mails von diesem Mitglied best&auml;tigt werden.",
+       'MEMBER_TOTAL_LINKS' => "Es m&uuml;ssen noch <span class=\"data\">%s</span> Mails von diesem Mitglied best&auml;tigt werden.",
        'ADMIN_DEL_UNCONFIRMED_LINKS' => "Alle unbest&auml;tigten Mails l&ouml;schen",
        'ADMIN_LINKS_DELETED' => "Links f&uuml;r unbest&auml;tigte Mails wurden gel&ouml;scht.",
        'ADMIN_DEL_LINK_SUBJ' => "Ihr unbest&auml;tigen Mails wurden gel&ouml;scht.",
@@ -711,15 +706,14 @@ addMessages(array(
        'GUEST_STATS_INACTIVE' => "Mitgliederstatistik deaktiviert",
        'CHANGE_MENUS' => "&Auml;ndern",
        'CHANGE_MEMBER_MENU' => "Verdecken, anzeigen, deaktivieren, aktivieren des Mitgliedsmen&uuml;s",
-       'CHANGE_MENU_1' => "&Auml;ndern von <strong>",
-       'CHANGE_MENU_2' => "</strong> Men&uuml;eintr&auml;gen",
+       'CHANGE_MENU' => "&Auml;ndern von <span class=\"data\">%s</span> Men&uuml;eintr&auml;gen",
        'IS_VISIBLE' => "Wird angezeigt",
        'IS_ACTIVE' => "Aktiviert",
        'CHANGE_ENTRIES' => "&Auml;nderungen durchf&uuml;hren",
        'BASE_URL_NOTE' => "Ohne abschliessendem /.",
        'ADMIN_WRONG_CALL' => "Falscher Aufruf einer Aktion oder des Scriptes. Bitte navigieren Sie links weiter.",
        'ADMIN_IS_SYSTEM_TASK' => "System-Task",
-       'ADMIN_NEW_EXT_SUBJ' => "Neue Erweiterung gefunden",
+       'ADMIN_NEW_EXTENSION_SUBJ' => "Neue Erweiterung gefunden",
        'ADMIN_TASK_SUBJECT' => "Aufgabenbetreff",
        'ADMIN_TASK_TEXT' => "Aufgabentext",
        'ADMIN_REGISTER_EXTENSION' => "Registrieren",
@@ -734,27 +728,26 @@ addMessages(array(
        'ADMIN_NO_EXTENSION_REGISTERED' => "Derzeit haben Sie keine Erweiterung in Ihrem {?mt_word?} registriert.",
        'ADMIN_EXTENSION_REGISTERED' => "Erweiterung <span class=\"data\">%s</span> wurde in Ihrem {?mt_word?} registriert.",
        'ADMIN_EXTENSION_NOT_REGISTERED' => "Erweiterung <span class=\"data\">%s</span> wurde in Ihrem {?mt_word?} <u>nicht</u> registriert.",
-       'ADMIN_EXT_ALREADY_REGISTERED' => "Erweiterung bereits registriert.",
-       'ADMIN_EXT_NO_INFO_FOUND' => "Keine Informationen zu dieser Erweiterung gefunden.",
-       'ADMIN_EXT_DOWNLOAD_LINK' => "Download-Link",
-       'ADMIN_EXT_FILE_SIZE' => "Downloadgr&ouml;&szlig;e",
-       'ADMIN_EXT_FILE_CTIME' => "Erweiterung erstellt am",
-       'ADMIN_EXT_FILE_VERSION' => "Version (alt)",
-       'ADMIN_EXT_TOTAL_FSIZE' => "Downloadgesamtgr&ouml;sse",
-       'ADMIN_EXT_TOTAL_FOUND' => "Gesamt gefundene Erweiterungen",
-       'ADMIN_EXT_VERSION' => "Version",
-       'ADMIN_EXT_AUTOPURGE_404' => "autopurge nicht installiert.",
-       'ADMIN_EXT_BONUS_OUTDATED' => "Ihre Bonus-Erweiterung ist veraltet! Version <span class=\"data\">%s</span> oder h&ouml;her wird ben&ouml;tigt.",
-       'ADMIN_EXT_BONUS_404' => "bonus nicht installiert.",
-       'ADMIN_EXT_CSSFILE' => "CSS?",
-       'ADMIN_EXT_CHANGED' => "Erweiterungen ge&auml;ndert.",
-       'ADMIN_EXT_REGISTER_NEXT_LINK' => "Weiter zur Task-&Uuml;bersicht...",
+       'ADMIN_EXTENSION_ALREADY_REGISTERED' => "Erweiterung bereits registriert.",
+       'ADMIN_EXTENSION_NO_INFO_FOUND' => "Keine Informationen zu dieser Erweiterung gefunden.",
+       'ADMIN_EXTENSION_DOWNLOAD_LINK' => "Download-Link",
+       'ADMIN_EXTENSION_FILE_SIZE' => "Downloadgr&ouml;&szlig;e",
+       'ADMIN_EXTENSION_FILE_CTIME' => "Erweiterung erstellt am",
+       'ADMIN_EXTENSION_FILE_VERSION' => "Version (alt)",
+       'ADMIN_EXTENSION_TOTAL_FSIZE' => "Downloadgesamtgr&ouml;sse",
+       'ADMIN_EXTENSION_TOTAL_FOUND' => "Gesamt gefundene Erweiterungen",
+       'ADMIN_EXTENSION_VERSION' => "Version",
+       'ADMIN_EXTENSION_AUTOPURGE_404' => "autopurge nicht installiert.",
+       'ADMIN_EXTENSION_BONUS_OUTDATED' => "Ihre Bonus-Erweiterung ist veraltet! Version <span class=\"data\">%s</span> oder h&ouml;her wird ben&ouml;tigt.",
+       'ADMIN_EXTENSION_BONUS_404' => "bonus nicht installiert.",
+       'ADMIN_EXTENSION_CSSFILE' => "CSS?",
+       'ADMIN_EXTENSION_CHANGED' => "Es wurden <span class=\"data\">%s</span> Erweiterungen ge&auml;ndert.",
+       'ADMIN_EXTENSION_EDITED' => "Es wurden <span class=\"data\">%s</span> Erweiterungen editiert.",
+       'ADMIN_EXTENSION_REGISTER_NEXT_LINK' => "Weiter zur Task-&Uuml;bersicht...",
        'ADMIN_DELETE_ENTRIES' => "L&ouml;schen",
        'ADMIN_REGISTERED_EXTENSIONS' => "Registrierte Erweiterungen",
-       'ADMIN_EXT_NAME' => "Erweiterungsurname",
-       'ADMIN_EXT_LANG' => "Sprachdatei",
-       'ADMIN_EXT_ADMIN' => "Admin-Bereich?",
-       'ADMIN_EXT_ACTIVE' => "Aktiviert?",
+       'ADMIN_EXTENSION_NAME' => "Erweiterungsname",
+       'ADMIN_EXTENSION_ACTIVE' => "Aktiviert?",
        'ADMIN_DE_ACTIVATE' => "De-/Aktivieren",
        'ADMIN_SEARCH_NEW_EXTENSIONS' => "Nach neuen Erweiterungen suchen...",
        'JACKPOT_POINTS' => "{?POINTS?} im Jackpot",
@@ -780,7 +773,7 @@ addMessages(array(
        'DELETE_PAYMENT' => "Verg&uuml;tungen l&ouml;schen",
        'REF_PAYOUT' => "Wie viele Mails m&uuml;ssen die Mitglieder mindestens best&auml;tigen, um den Willkommensbonus, einmaliger Referal-Bonus usw. gutgeschrieben zu bekommen?",
        'ADMIN_EXTENSION_UPDATED' => "Erweiterung aktualisiert.",
-       'ADMIN_UPDATE_EXT_SUBJ' => "Erweiterung-Update installiert",
+       'ADMIN_UPDATE_EXTENSION_SUBJ' => "Erweiterung-Update installiert",
        'MEMBER_ORDER_PAGE1_INTRO' => "Mailbuchung - Schritt 1 von 4: PLZ eingeben",
        'MEMBER_ORDER_PAGE2_INTRO' => "Mailbuchung - Schritt 2 von 4: Daten eingeben",
        'MEMBER_ORDER_PAGE3_INTRO' => "Mailbuchung - Schritt 3 von 4: Frame-Killer Test und Absenden",
@@ -875,8 +868,7 @@ addMessages(array(
        '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?",
-       'BONUS_EXTENSION_UPGRADE_1' => "Bitte aktualisieren Sie Ihre Bonus-Erweiterung auf Version <u>",
-       'BONUS_EXTENSION_UPGRADE_2' => "</u> oder neuer.",
+       'BONUS_EXTENSION_UPGRADE' => "Bitte aktualisieren Sie Ihre Bonus-Erweiterung auf Version <span class=\"data\">v0.2.2</span> oder neuer.",
        '_ON' => "an",
        'CLICK_STATISTICS' => "Mail-Statistik",
        'ADMIN_SELECT_DEF_REFID' => "Standart Referal-Id bei Anmeldung &uuml;ber <strong>keinen</strong> Ref-Link",
@@ -976,10 +968,8 @@ addMessages(array(
        'ADMIN_ENTER_ALTERNATE_TEXT' => "Alternativen Text",
        'ADMIN_SELECT_BANNER_ACTIVE' => "Ist der Banner aktiv?",
        'ADMIN_SUBMIT_BANNER' => "Banner hinzuf&uuml;gen",
-       'ADMIN_LIST_REFERALS_1' => "Referal-&Uuml;bersicht des Mitgliedes ",
-       'ADMIN_LIST_REFERALS_2' => " in allen Ebenen:",
-       'ADMIN_LIST_REFERALS_LEVEL_1' => "Referals in Ebene ",
-       'ADMIN_LIST_REFERALS_LEVEL_2' => ":",
+       'ADMIN_LIST_REFERALS' => "Referal-&Uuml;bersicht des Mitgliedes <span class=\"data\">%s</span> in allen Ebenen:",
+       'ADMIN_LIST_REFERALS_LEVEL' => "Referals in Ebene <span class=\"data\">%s</span>:",
        'ADMIN_LIST_REFERALS_NOTE' => "<strong>&Auml;nderung:</strong> Klicken Sie die Mitglieder-Id an und gelangen Sie zum Mitgliederprofil. Klicken Sie Anzahl Referals an, werden die Referals des jeweiligen Mitgliedes aufgelistet.",
        'ADMIN_NORMAL_MAIL_ALREADY_DELETED' => "Mitglieder-Mail bereits gel&ouml;scht.",
        'INITIAL_RELEASE' => "Erste Alpha-Version",
@@ -1043,13 +1033,13 @@ addMessages(array(
        'ADMIN_POINTS_TO_JACKPOT' => "Es wurden <span class=\"data\">%s&nbsp; {?POINTS?}</span> in den Jackpot gelegt.",
        'ADMIN_NO_POINTS_REPAYED' => "Die Mailbuchung hatte keine {?POINTS?} zum zur&uuml;ckbuchen.",
        'ADMIN_POINTS_SHREDDED' => "Es wurden <span class=\"data\">%s&nbsp; {?POINTS?}</span> geschrettert.",
-       'EXTENSION_PROBLEM_EXT_INACTIVE' => "Kann nicht fortfahren! Fehler: Erweiterung <span class=\"data\">%s</span> deaktiviert.",
-       'ADMIN_EXTENSION_PROBLEM_EXT_INACTIVE' => "Die Erweiterung <span class=\"data\">%s</span> ist derzeit deaktiviert. <a href=\"{%%url=modules.php?module=admin&amp;what=extensions%%}\">Hier</a> k&ouml;nnen Sie diese aktivieren.",
-       'EXTENSION_PROBLEM_EXT_NOT_INSTALLED' => "Kann nicht fortfahren! Fehler: Erweiterung <span class=\"data\">%s</span> nicht installiert.",
-       'ADMIN_EXTENSION_PROBLEM_EXT_NOT_INSTALLED' => "Die Erweiterung <span class=\"data\">%s</span> ist derzeit nicht installiert. <a href=\"{%%url=modules.php?module=admin&amp;what=extensions%%}\">Hier</a> k&ouml;nnen Sie diese aktivieren.",
+       'EXTENSION_PROBLEM_EXTENSION_INACTIVE' => "Kann nicht fortfahren! Fehler: Erweiterung <span class=\"data\">%s</span> deaktiviert.",
+       'ADMIN_EXTENSION_PROBLEM_EXTENSION_INACTIVE' => "Die Erweiterung <span class=\"data\">%s</span> ist derzeit deaktiviert. <a href=\"{%%url=modules.php?module=admin&amp;what=extensions%%}\">Hier</a> k&ouml;nnen Sie diese aktivieren.",
+       'EXTENSION_PROBLEM_EXTENSION_NOT_INSTALLED' => "Kann nicht fortfahren! Fehler: Erweiterung <span class=\"data\">%s</span> nicht installiert.",
+       'ADMIN_EXTENSION_PROBLEM_EXTENSION_NOT_INSTALLED' => "Die Erweiterung <span class=\"data\">%s</span> ist derzeit nicht installiert. <a href=\"{%%url=modules.php?module=admin&amp;what=extensions%%}\">Hier</a> k&ouml;nnen Sie diese aktivieren.",
        'EXTENSION_PROBLEM_NOT_INSTALLED' => "Erweiterung <span class=\"data\">%s</span> nicht installiert.",
        'EXTENSION_PROBLEM_UNSET_EXT' => "Skriptfehler: Parameter <strong>ext</strong> nicht gesetzt.",
-       'EXTENSION_WARNING_EXT_INACTIVE' => "Die Erweiterung <span class=\"data\">%s</span> ist nicht aktiv. Dies kann zu St&ouml;rungen f&uuml;hren.<br />\nBitte aktivieren Sie diese unter <em>Verschiedenes-&gt;Erweiterungen</em>.",
+       'EXTENSION_WARNING_EXTENSION_INACTIVE' => "Die Erweiterung <span class=\"data\">%s</span> ist nicht aktiv. Dies kann zu St&ouml;rungen f&uuml;hren.<br />\nBitte aktivieren Sie diese unter <em>Verschiedenes-&gt;Erweiterungen</em>.",
        'EXTENSION_WARNING_USER_LIMIT' => "Die Erweiterung <u>user</u> ist nicht aktiv. Die Anzahl Mitglieder pro Seite wurde auf 100 gesetzt. Bitte aktivieren Sie diese unter <em>Verschiedenes-&gt;Erweiterungen</em>.",
        'ADMIN_PROXY_SETTINGS_INVALID' => "Ihre Proxy-Einstellungen scheinen ung&uuml;ltig zu sein.",
        'ADMIN_EDIT_PROXY_SETTINGS' => "Proxy-Einstellungen &auml;ndern",
@@ -1062,7 +1052,7 @@ addMessages(array(
        '_UNUSED' => "Im Aufbau",
        'ADMIN_DELETED_MAILS_COUNT' => "Es wurden <span class=\"data\">%s</span> Eintr&auml;ge gel&ouml;scht.",
        'EMAIL_DELETE_COUNT' => "Buchungseintr&auml;ge gel&ouml;scht",
-       'MXCHANGE_HAS_DIED' => "{?TITLE?} ist in Script/Funktion <span class=\"data\">%s</span>, Zeile <span class=\"data\">%s</span> mit folgender Meldung abgebrochen: <span class=\"data\">%s</span>",
+       'MAILER_HAS_DIED' => "{?TITLE?} ist in Script/Funktion <span class=\"data\">%s</span>, Zeile <span class=\"data\">%s</span> mit folgender Meldung abgebrochen: <span class=\"data\">%s</span>",
        'ADMIN_CONFIG_POINTS_TITLE' => "Einstellungen f&uuml;r {?POINTS?}",
        'APP_DIE_TITLE' => "Bug im Script erkannt!",
        'ADMIN_CONTACT_LINK_TITLE' => "Kontakt zum Administrator",
@@ -1099,6 +1089,7 @@ addMessages(array(
        'ADMIN_RESET_PASS_LINK' => "Jetzt Ihr Administratorkennwort zur&uuml;cksetzen (n&ouml;tiger Schritt!)",
        'ADMIN_SUPPORT_FORUM_LINK' => "Direktlink zum Support-Forum (neues Fenster)",
        'ADMIN_SUPPORT_BUGTRACKER_LINK' => "Direktlink zum Bug-Tracker (neues Fenster)",
+       'ADMIN_SUPPORT_WIKI_LINK' => "Direktlink zum Doku-Wiki (neues Fenster)",
        'ADMIN_REFERAL_LEVEL_ZERO_NOTICE' => "Die Referal-Ebene 0 ist das Mitglied selber und sollte daher auf 100% stehen. Sie sollte auch nicht ge&auml;ndert oder gel&ouml;scht werden! Dann erhalten Ihre Mitglieder keine {?POINTS?} gutgeschrieben.",
        'ADMIN_ALL_ENTRIES_REMOVED' => "Alle ausgew&auml;hlten Eintr&auml;ge sind gel&ouml;scht.",
        'ADMIN_SOME_ENTRIES_NOT_DELETED' => "Es wurden <span class=\"data\">%s</span> von <span class=\"data\">%s</span> ausgew&auml;hlten Eintr&auml;ge gel&ouml;scht.",
@@ -1141,7 +1132,7 @@ addMessages(array(
        'ADMIN_ACCESS_DENIED' => "Zugriff auf den Adminmen&uuml;punkt <span class=\"data\">%s</span> nicht gestattet.",
        'ADMIN_URL_BLACKLIST_DISABLED' => "URL-Sperrliste ist deaktiviert.",
        'ADMIN_MENU_IS_EMPTY' => "Das von Ihnen ausgew&auml;hlte Men&uuml; <span class=\"data\">%s</span> ist leer.",
-       'ADMIN_EXT_TEXT_FILE_MISSING' => "Die Erweiterung <span class=\"data\">%s</span> hat keinen Beschreibungstext. Bitte melden Sie dies uns <a href=\"http://bugs.mxchange.org\" target=\"_blank\" title=\"Direkter Link zum Bug-Tracker\">im Bug-Tracker</a>.",
+       'ADMIN_EXTENSION_TEXT_FILE_MISSING' => "Die Erweiterung <span class=\"data\">%s</span> hat keinen Beschreibungstext. Bitte melden Sie dies uns <a href=\"http://bugs.mxchange.org\" target=\"_blank\" title=\"Direkter Link zum Bug-Tracker\">im Bug-Tracker</a>.",
        'GUEST_STATS_NO_CLICKS' => "Keine Klicks in Ihrem {?mt_word?} verzeichnet.",
        'ADMIN_EXTENSIONS_REMOVED' => "Es wurden <span class=\"data\">%s</span> Erweiterungen aus Ihrem {?mt_word?} entfernt.",
        'ADMIN_WARNING_SQL_PATCHES_MISSING' => "Eine essentielle Erweiterung <span=\"data\">sql_patches</span> ist noch nicht installiert. Bitte erledigen Sie dies bald, da Ihr {?mt_word?} sonst nicht funktioniert.",
@@ -1157,8 +1148,7 @@ addMessages(array(
        'MEMBER_MAIL_NORMAL_CONFIRMED_UNKNOWN' => "Es konnte nicht festgestellt werden, wann Sie die Klickmail <span class=\"data\">%s</span> best&auml;tigt hatten.",
 
 // @TODO Rewrite these two constants
-       'MEMBER_MAIL_NORMAL_DETAILS_TITLE_1' => "Details zur Klickmail <u>",
-       'MEMBER_MAIL_NORMAL_DETAILS_TITLE_2' => "</u>:",
+       'MEMBER_MAIL_NORMAL_DETAILS_TITLE' => "Details zur Klickmail <span class=\"data\">%s</span>:",
 
        'EMAIL_STATUS_ACTIVE' => "Wird gerade versendet",
        'EMAIL_STATUS_ADMIN' => "Wartet auf Freischaltung",
@@ -1172,11 +1162,11 @@ addMessages(array(
        'MEMBER_ACTIVITY_INACTIVE' => "Inaktiv",
 
 // Member reflist
-// @TODO Rewrite these five constants
+// @TODO Rewrite these three constants
        'MEMBER_REFLIST_LIST_TITLE_1' => "Ihre Referals in Ebene <u>",
        'MEMBER_REFLIST_LIST_TITLE_2' => "</u> (<u>",
        'MEMBER_REFLIST_LIST_TITLE_3' => "&#37;</u>)",
-       'MEMBER_REFLIST_COUNTER' => "In dieser Ebene haben Sie <strong>%s</strong> Mitglieder geworben.",
+       'MEMBER_REFLIST_COUNTER' => "In dieser Ebene haben Sie <span class=\"data\">%s</span> Mitglieder geworben.",
        'MEMBER_REFLIST_TITLE' => "Referal-&Uuml;bersicht",
        'MEMBER_REFLIST_POINTS' => "Verdienst des Mitgliedes",
        'MEMBER_REFLIST_ACTIVITY' => "Mitglied aktiv?",

diff --git a/inc/language/doubler_de.php b/inc/language/doubler_de.php
index df79c37f12e29b18254db0111ef386da35263883..fdfed8e503da349e8275ab5ef8c8b0524bfac854 100644 (file)
--- a/inc/language/doubler_de.php
+++ b/inc/language/doubler_de.php
@@ -86,6 +86,7 @@ addMessages(array(
        'DOUBLER_ENTER_POINTS' => "{?POINTS?} zum Verdoppeln",
        'DOUBLER_NOW' => "Verdoppeln.",
        'DOUBLER_ALREADY_PAYED' => "Es wurden bereits <strong>%s {?POINTS?}</strong> ausgezahlt.",
+       'MEMBER_DOUBLER_ALREADY_PAYED' => "Es wurden bereits <strong>{%config,translateComma=doubler_points%} {?POINTS?}</strong> ausgezahlt.",
        'DOUBLER_MINIMUM_IS' => "Mindestens",
        'DOUBLER_MAXIMUM_IS' => "verdoppeln, maximal",
        'DOUBLER_HAVE_FUN' => "Viel Spa&szlig;.",

diff --git a/inc/language/holiday_de.php b/inc/language/holiday_de.php
index f18ed4dc792831cfe601b446118561202a47a34c..bf561b051a9bfff1742c3b4e2836fa1f638c0285 100644 (file)
--- a/inc/language/holiday_de.php
+++ b/inc/language/holiday_de.php
@@ -47,7 +47,7 @@ addMessages(array(
        'HOLIDAY_MEMBER_TITLE' => "Von wann bis wann sind Sie im Urlaub?",
        'HOLIDAY_MEMBER_TSTART' => "Anfang Ihres Urlaubes",
        'HOLIDAY_MEMBER_TEND' => "Ende Ihres Urlaubes",
-       'HOLIDAY_MAX_DAYS' => "Sie k&ouml;nnen nicht mehr als <strong>%s</strong> Tag(e) an Urlaub einstellen.",
+       'HOLIDAY_MAX_DAYS' => "Sie k&ouml;nnen nicht mehr als <span class=\"data\">%s</span> Tag(e) an Urlaub einstellen.",
        'HOLIDAY_ADD' => "Urlaubsschaltung aktivieren",
        'HOLIDAY_COMMENTS' => "Sonstige Hinweise an uns",
        'HOLIDAY_NOTES' => "Sobald Sie das Formular abgeschickt haben, wird die Urlaubsschaltung f&uuml;r Ihren Account aktiviert. Sie k&ouml;nnen sich weiterhin im Mitgliedsbereich aufhalten, k&ouml;nnen aber keine Mails mehr empfangen und auch selber keine mehr buchen.",

diff --git a/inc/language/install_de.php b/inc/language/install_de.php
index 049bf3dc39bf1c3c5417f3650c4158ec36af3414..50f2bf40c071c058b6b2de5232a47bfef6fd0b45 100644 (file)
--- a/inc/language/install_de.php
+++ b/inc/language/install_de.php
@@ -44,8 +44,8 @@ if (!defined('__SECURITY')) {
 
 // Language definitions
 addMessages(array(
-       'INSTALLATION_OF_MXCHANGE' => "Installation von {?mt_word?}-Projekt-Script",
-       'SETUP_OF_MXCHANGE' => "Installation von {?mt_word?}-Projekt-Script - {?MAIN_TITLE?}",
+       'INSTALLATION_OF_MAILER' => "Installation von {?mt_word?}-Projekt-Script",
+       'SETUP_OF_MAILER' => "Installation von {?mt_word?}-Projekt-Script - {?MAIN_TITLE?}",
        'INSTALL_MISSING_DUMPS' => "Die SQL-Dumps wurden nicht gefunden! Diese sollten auch mit hochgeladen werden und lesbar sein (CHMOD 644).",
        'INSTALL_ENABLE_BACKLINK' => "Backlink (=R&uuml;ckverlinkung zu mxchange.org setzen?) <em>rel=&quot;external&quot;</em> ist gesetzt. Bitte nicht den Backlink einbauen, und <strong>nofollow</strong> verwenden! Das schadet allen.",
        'WRONG_PAGE' => "Sie oder dieses Script haben eine falsche Seite ausgew&auml;hlt.",

diff --git a/inc/language/mailid_de.php b/inc/language/mailid_de.php
index 33fb535f2f79e943a6580a4084740e01cabeb132..87031681e1a3e44b78b1bb2cf6db212954c0f80b 100644 (file)
--- a/inc/language/mailid_de.php
+++ b/inc/language/mailid_de.php
@@ -50,7 +50,7 @@ addMessages(array(
        'THANX_POINTS_LOCKED' => "Vielen Dank f&uuml;r die Best&auml;tigung der Mail. Die <span class=\"member_done\">%s</span> {?POINTS?} werden Ihnen bald gutgeschrieben.",
        'POINTS_NOT_ADDED' => "Falscher Best&auml;tigungscode eingegeben! Die <span class=\"member_failed\">%s</span> {?POINTS?} wurden dem Versender wieder gutgeschrieben.",
        'ENTER_CODE' => "Code eingeben",
-       'MEMBER_TIME_COUNTER' => "Gutschrift der {?POINTS?} erfolgt in <strong>%s</strong> ...",
+       'MEMBER_TIME_COUNTER' => "Gutschrift der {?POINTS?} erfolgt in <span class=\"data\">%s</span> ...",
        'SUBMIT_CODE' => "Abschicken",
        'MAILID_TOTAL_POINTS' => "Ihr Kontostand betr&auml;gt jetzt <span class=\"member_done\">%s {?POINTS?}</span>.",
        'MEMBER_GENERAL_MAIL_PROBLEM' => "Allgemeines Mail-Problem erkannt. Bitte beim Support melden"

diff --git a/inc/language/mediadata_de.php b/inc/language/mediadata_de.php
index 2215bdf2f8414e1270d8952aacf7c9a82249a988..ccffd66860d8f083540fd6a3a39288a6012c7fb7 100644 (file)
--- a/inc/language/mediadata_de.php
+++ b/inc/language/mediadata_de.php
@@ -89,9 +89,7 @@ addMessages(array(
        'USERS_UNCONFIRMED' => "Auf Freischaltung wartend",
        'USERS_LOCKED' => "Gesperrte Accounts",
        'USER_MT_START' => "Start dieses {?mt_word2?}",
-       'USER_MT_PROJECTED_1' => "Voraussichtlich: Am <strong>",
-       'USER_MT_PROJECTED_2' => "</strong> werden wir <strong>",
-       'USER_MT_PROJECTED_3' => "</strong> Mitglieder erreicht haben.",
+       'USER_MT_PROJECTED' => "Voraussichtlich: Am <span class=\"data\">%s</span> werden wir <strong>{?mt_stage?}</strong> Mitglieder erreicht haben.",
        'USER_PROJECTION_UNKNOWN' => "<em>unbekanntes Datum</em>",
 ));
 

diff --git a/inc/language/network_de.php b/inc/language/network_de.php
index f6b93063b665bb9265720cb98e726ae52f96a851..99b0beb2089d674326c9bbdb95007d900ad5e3b4 100644 (file)
--- a/inc/language/network_de.php
+++ b/inc/language/network_de.php
@@ -60,27 +60,30 @@ addMessages(array(
        'ADMIN_NETWORK_TYPES_NOT_ADDED' => "Der Werbeart-Handler <span class=\"data\">%s</span> wurde nicht hinzugef&uuml;gt.",
        'ADMIN_NETWORK_TYPES_NOTHING_FOUND' => "Es wurden keine Werbart-Handler zum Editieren oder L&ouml;schen gefunden.",
        'ADMIN_NETWORK_REQUEST_PARAMETER_ALREADY_ADDED' => "Ein API-Parameter <span class=\"data\">%s</span> existiert bereits.",
-       'ADMIN_NETWORK_REQUEST_PARAMS_404' => "Es wurden keine API-Parameter zum Werbenetzwerk <span class=\"data\">%s</span> gefunden.",
+       'ADMIN_NETWORK_REQUEST_PARAMETER_404' => "Es wurden keine API-Parameter zum Werbenetzwerk <span class=\"data\">%s</span> gefunden.",
        'ADMIN_NETWORK_REQUEST_PARAMETER_NOT_ADDED' => "Der API-Parameter <span class=\"data\">%s</span> wurde nicht hinzugef&uuml;gt.",
-       'ADMIN_NETWORK_REQUEST_PARAMS_NOTHING_CHANGED' => "Es wurden keine &Auml;nderungen an den API-Parametern ausgef&uuml;hrt.",
-       'ADMIN_NETWORK_REQUEST_PARAMS_NOTHING_REMOVED' => "Es wurden keine API-Parameter gel&ouml;scht.",
+       'ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_CHANGED' => "Es wurden keine &Auml;nderungen an den API-Parametern ausgef&uuml;hrt.",
+       'ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_REMOVED' => "Es wurden keine API-Parameter gel&ouml;scht.",
+       'ADMIN_NETWORK_ARRAY_TRANSLATION_404' => "Es wurden keine &Uuml;bersetzungen zum Antwort-Array zum Werbenetzwerk <span class=\"data\">%s</span> gefunden.",
        // - Form titles
        'ADMIN_NETWORK_ADD_TITLE' => "Neues Werbenetzwerk hinzuf&uuml;gen - Allgemeine Daten",
        'ADMIN_NETWORK_EDIT_TITLE' => "Werbenetzwerk editieren - Allgemeine Daten",
        'ADMIN_NETWORK_DELETE_TITLE' => "Werbenetzwerk l&ouml;schen - Allgemeine Daten",
-       'ADMIN_NETWORK_SELECT_TITLE' => "Werbenetzwerk ausw&auml;hlen",
+       'ADMIN_NETWORK_SELECT_TITLE' => "Bitte w&auml;hlen Sie ein Werbenetzwerk aus",
+       'ADMIN_NETWORK_TYPE_SELECT_TITLE' => "Bitte w&auml;hlen Sie einen Werbeart-Handler aus",
        'ADMIN_NETWORK_TYPES_ADD_TITLE' => "Werbenetzwerk verwalten - Neue Werbeart hinzuf&uuml;gen",
        'ADMIN_NETWORK_TYPES_LIST_TITLE' => "Werbeart-Handler auflisten und verwalten",
        'ADMIN_NETWORK_TYPES_EDIT_TITLE' => "Werbeart-Handler editieren",
        'ADMIN_NETWORK_TYPES_DELETE_TITLE' => "Werbeart-Handle l&ouml;schen",
-       'ADMIN_NETWORK_REQUEST_PARAMS_ADD_TITLE' => "Werbenetzwerk verwalten - Neuen API-Parameter hinzuf&uuml;gen",
-       'ADMIN_NETWORK_REQUEST_PARAMS_LIST_TITLE' => "API-Parameter auflisten und verwalten",
-       'ADMIN_NETWORK_REQUEST_PARAMS_EDIT_TITLE' => "API-Parameter editieren",
-       'ADMIN_NETWORK_REQUEST_PARAMS_DELETE_TITLE' => "API-Parameter l&ouml;schen",
+       'ADMIN_NETWORK_REQUEST_PARAMETER_ADD_TITLE' => "Werbenetzwerk verwalten - Neuen API-Parameter hinzuf&uuml;gen",
+       'ADMIN_NETWORK_REQUEST_PARAMETER_LIST_TITLE' => "API-Parameter auflisten und verwalten",
+       'ADMIN_NETWORK_REQUEST_PARAMETER_EDIT_TITLE' => "API-Parameter editieren",
+       'ADMIN_NETWORK_REQUEST_PARAMETER_DELETE_TITLE' => "API-Parameter l&ouml;schen",
+       'ADMIN_NETWORK_ARRAY_TRANSLATION_ADD_TITLE' => "Werbenetzwerk verwalten - Neuen R&uuml;ckgabewert hinzuf&uuml;gen",
        // - Link titles
        'ADMIN_NETWORK_LIST_TYPES_LINK_TITLE' => "Weiter zu den Werbearten",
        'ADMIN_NETWORK_LIST_PARAMS_LINK_TITLE' => "Weiter zu den API-Parametern",
-       'ADMIN_NETWORK_LIST_RETURN_CODES_LINK_TITLE' => "Weiter zu den R&uuml;ckgabewerten",
+       'ADMIN_NETWORK_LIST_ARRAY_TRANSLATION_LINK_TITLE' => "Weiter zu den &Uuml;bersetzungen zum Antwort-Arrayn",
        'ADMIN_NETWORK_LIST_ERROR_CODES_LINK_TITLE' => "Weiter zu den Fehlercodes",
        // - Buttons
        'ADMIN_NETWORK_ADD' => "Allgemeine Daten anlegen",
@@ -89,16 +92,18 @@ addMessages(array(
        'ADMIN_NETWORK_DELETE' => "L&ouml;schen",
        'ADMIN_NETWORK_REMOVE' => "Daten entfernen",
        'ADMIN_NETWORK_CHOOSE' => "Werbenetzwerk ausw&auml;hlen",
+       'ADMIN_NETWORK_TYPE_CHOOSE' => "Werbeart-Handler ausw&auml;hlen",
        'ADMIN_NETWORK_TYPES_ADD' => "Werbeart hinzuf&uuml;gen",
        'ADMIN_NETWORK_TYPES_EDIT' => "Editieren",
        'ADMIN_NETWORK_TYPES_DELETE' => "L&ouml;schen",
        'ADMIN_NETWORK_TYPES_CHANGE' => "Handler &auml;ndern",
        'ADMIN_NETWORK_TYPES_REMOVE' => "Handler entfernen",
-       'ADMIN_NETWORK_REQUEST_PARAMS_ADD' => "API-Parameter hinzuf&uuml;gen",
-       'ADMIN_NETWORK_REQUEST_PARAMS_EDIT' => "Editieren",
-       'ADMIN_NETWORK_REQUEST_PARAMS_DELETE' => "L&ouml;schen",
-       'ADMIN_NETWORK_REQUEST_PARAMS_CHANGE' => "API-Parameter &auml;ndern",
-       'ADMIN_NETWORK_REQUEST_PARAMS_REMOVE' => "API-Parameter entfernen",
+       'ADMIN_NETWORK_REQUEST_PARAMETER_ADD' => "API-Parameter hinzuf&uuml;gen",
+       'ADMIN_NETWORK_REQUEST_PARAMETER_EDIT' => "Editieren",
+       'ADMIN_NETWORK_REQUEST_PARAMETER_DELETE' => "L&ouml;schen",
+       'ADMIN_NETWORK_REQUEST_PARAMETER_CHANGE' => "API-Parameter &auml;ndern",
+       'ADMIN_NETWORK_REQUEST_PARAMETER_REMOVE' => "API-Parameter entfernen",
+       'ADMIN_NETWORK_ARRAY_TRANSLATION_ADD' => "R&uuml;ckgabewert hinzuf&uuml;gen",
        // - Success titles
        'ADMIN_NETWORK_ADDED_TITLE' => "Allgemeine Werbenetzwerkdaten hinzugef&uuml;gt.",
        'ADMIN_NETWORK_TYPES_ADDED_TITLE' => "Werbeart-Handler hinzugef&uuml;gt.",
@@ -107,18 +112,19 @@ addMessages(array(
        'ADMIN_NETWORK_UPDATED' => "Es wurden <span class=\"data\">%s</span> Eintr&auml;ge in den allgemeinen Daten aktualisiert.",
        'ADMIN_NETWORK_REMOVED' => "Es wurden <span class=\"data\">%s</span> Eintr&auml;ge aus den allgemeinen Daten gel&ouml;scht.",
        'ADMIN_NETWORK_TYPES_UPDATED' => "Es wurden <span class=\"data\">%s</span> Werbeart-Handler aktualisiert.",
-       'ADMIN_NETWORK_REQUEST_PARAMS_UPDATED' => "Es wurden <span class=\"data\">%s</span> API-Parameter aktualisiert.",
+       'ADMIN_NETWORK_REQUEST_PARAMETER_UPDATED' => "Es wurden <span class=\"data\">%s</span> API-Parameter aktualisiert.",
        'ADMIN_NETWORK_TYPES_REMOVED' => "Es wurden <span class=\"data\">%s</span> Werbeart-Handler gel&ouml;scht.",
-       'ADMIN_NETWORK_REQUEST_PARAMS_REMOVED' => "Es wurden <span class=\"data\">%s</span> API-Parameter gel&ouml;scht.",
+       'ADMIN_NETWORK_REQUEST_PARAMETER_REMOVED' => "Es wurden <span class=\"data\">%s</span> API-Parameter gel&ouml;scht.",
        // - Form notes
        'ADMIN_NETWORK_ADD_NOTE' => "Mehr Datenschutz bei POST-Abfragen bedeutet, dass die von den Internetanbietern betriebenen Caches (Proxy) die POST-Daten nicht mitloggen (so eine Art Kodex). Der Zeichensatz ist meistens ISO-8859-1 oder WINDOWS-1252.",
        'ADMIN_NETWORK_LIST_NOTE' => "Seien Sie mit dem L&ouml;schen und Editieren von Allgemeine Daten sehr vorsichtig. Sie sollten hierzu R&uuml;cksprache <a href=\"http://forum.mxchange.org/forum-43.html\" target=\"_blank\" title=\"Direktlink zum Forum\">im Forum</a> halten.",
        'ADMIN_NETWORK_TYPES_ADD_NOTE' => "F&uuml;gen Sie hier weitere Werbearten dem ausgw&auml;hlten Werbenetzwerk hinzu. Die Klick- und Banner-URL m&uuml;ssen dabei Platzhalter enthalten, die Sie der Dokumentation und <a href=\"http://forum.mxchange.org/forum-43.html\" rel=\"external\" title=\"Direkt-Link zur Forumkategorie Werbenetzwerke\" target=\"_blank\">dem Forum</a> entnehmen k&ouml;nnen. Die API-URL muss nur bis zum Fragezeichen eingegeben werden. Richtig: <strong>http://www.some-sponsor.invalid/inteface/script.php</strong>, falsch: <strike>http://www.some-sponsor.invalid/inteface/script.php?uid=123&amp;pw=xyzxyzxyz</strike>",
        'ADMIN_NETWORK_TYPES_LIST_NOTE' => "Seien Sie mit dem L&ouml;schen und Editieren von Werbeart-Handlern sehr vorsichtig. Sie sollten hierzu R&uuml;cksprache <a href=\"http://forum.mxchange.org/forum-43.html\" target=\"_blank\" title=\"Direktlink zum Forum\">im Forum</a> halten. Dokumentation zu den Platzhaltern (&#37;FOO&#37;, &#37;BAR&#37; usw.) finden Sie in der Dokumentation DOCs/de/network/README.txt.",
-       'ADMIN_NETWORK_REQUEST_PARAMS_ADD_NOTE' => "F&uuml;gen Sie hier weitere API-Parameter dem ausgw&auml;hlten Werbenetzwerk hinzu. Geben Sie keine Werte an, wie z.B. 5 Sekunden oder 30 Mails, geben Sie bei API-Parameter den GET- bzw. POST-Parameternamen an.",
-       'ADMIN_NETWORK_REQUEST_PARAMS_LIST_NOTE' => "Seien Sie mit dem L&ouml;schen und Editieren von API-Parameter sehr vorsichtig. Sie sollten hierzu R&uuml;cksprache <a href=\"http://forum.mxchange.org/forum-43.html\" target=\"_blank\" title=\"Direktlink zum Forum\">im Forum</a> halten. Dokumentation zu den Abfragenamen (&#37;FOO&#37;, &#37;BAR&#37; usw.) finden Sie in der Dokumentation DOCs/de/network/README.txt.",
+       'ADMIN_NETWORK_REQUEST_PARAMETER_ADD_NOTE' => "F&uuml;gen Sie hier weitere API-Parameter dem ausgw&auml;hlten Werbenetzwerk hinzu. Geben Sie keine Werte an, wie z.B. 5 Sekunden oder 30 Mails, geben Sie bei API-Parameter den GET- bzw. POST-Parameternamen an.",
+       'ADMIN_NETWORK_REQUEST_PARAMETER_LIST_NOTE' => "Seien Sie mit dem L&ouml;schen und Editieren von API-Parameter sehr vorsichtig. Sie sollten hierzu R&uuml;cksprache <a href=\"http://forum.mxchange.org/forum-43.html\" target=\"_blank\" title=\"Direktlink zum Forum\">im Forum</a> halten. Dokumentation zu den Abfragenamen (&#37;FOO&#37;, &#37;BAR&#37; usw.) finden Sie in der Dokumentation DOCs/de/network/README.txt.",
+       'ADMIN_NETWORK_ARRAY_TRANSLATION_ADD_NOTE' => "F&uuml;gen Sie hier weitere Array-Element-&Uuml;bersetzungen zu dem ausgew&auml;hlten Netzwerk und Werbeart-Handler ein.",
        // - Other messages
-       'ADMIN_NETWORK_REQUEST_PARAMS_LIST_LIMITED_TO_TYPE' => "Es wurden nur die API-Parameter des ausgew&auml;hlten Werbeart-Handlers angezeigt.",
+       'ADMIN_NETWORK_REQUEST_PARAMETER_LIST_LIMITED_TO_TYPE' => "Es wurden nur die API-Parameter des ausgew&auml;hlten Werbeart-Handlers angezeigt.",
        // - Advertise types
        'ADMIN_NETWORK_TYPES_BANNER_CLICK' => "Banner-Klick",
        'ADMIN_NETWORK_TYPES_BANNER_VIEW' => "Banner-View",
@@ -170,23 +176,36 @@ addMessages(array(
        'ADMIN_NETWORK_TYPES_BANNER_URL' => "Banner-URL der Werbeart",
        // - API request parameter
        'ADMIN_NETWORK_TYPE_SELECT' => "Werbeart-Handler ausw&auml;hlen",
-       'ADMIN_NETWORK_REQUEST_PARAMS_KEY' => "Abfragename",
-       'ADMIN_NETWORK_REQUEST_PARAMS_VALUE' => "API-Parameter",
-       'ADMIN_NETWORK_REQUEST_PARAMS_DEFAULT' => "Standartwert",
-       'ADMIN_NETWORK_REQUEST_PARAMS_ID' => "Affiliate-/Publisher-Id",
-       'ADMIN_NETWORK_REQUEST_PARAMS_SID' => "Webseiten-Id",
-       'ADMIN_NETWORK_REQUEST_PARAMS_HASH' => "Webseiten-Hash",
-       'ADMIN_NETWORK_REQUEST_PARAMS_PASSWORD' => "Interface-Kennwort",
-       'ADMIN_NETWORK_REQUEST_PARAMS_RELOAD' => "Maximale Reloadsperre",
-       'ADMIN_NETWORK_REQUEST_PARAMS_MINIMUM_STAY' => "Mindestauffenthalt",
-       'ADMIN_NETWORK_REQUEST_PARAMS_MAXIMUM_STAY' => "Maximaler Auffenthalt",
-       'ADMIN_NETWORK_REQUEST_PARAMS_CURRENCY' => "W&auml;hrung",
-       'ADMIN_NETWORK_REQUEST_PARAMS_TYPE' => "Typ (z.B. klick/view)",
-       'ADMIN_NETWORK_REQUEST_PARAMS_REMAIN' => "Mindestanzahl der restlichen Klicks",
-       'ADMIN_NETWORK_REQUEST_PARAMS_REWARD' => "Mindestverg&uuml;tung",
-       'ADMIN_NETWORK_REQUEST_PARAMS_SIZE' => "Werbemittelgr&ouml;sse",
-       'ADMIN_NETWORK_REQUEST_PARAMS_EROTIC' => "Erotik erlaubt",
-       'ADMIN_NETWORK_REQUEST_PARAMS_EXTRA' => "Extra-Parameter",
+       'ADMIN_NETWORK_REQUEST_PARAMETER_KEY' => "Abfragename",
+       'ADMIN_NETWORK_REQUEST_PARAMETER_VALUE' => "API-Parameter",
+       'ADMIN_NETWORK_REQUEST_PARAMETER_DEFAULT' => "Standartwert",
+       'ADMIN_NETWORK_REQUEST_PARAMETER_ID' => "Affiliate-/Publisher-Id",
+       'ADMIN_NETWORK_REQUEST_PARAMETER_SID' => "Webseiten-Id",
+       'ADMIN_NETWORK_REQUEST_PARAMETER_HASH' => "Webseiten-Hash",
+       'ADMIN_NETWORK_REQUEST_PARAMETER_PASSWORD' => "Interface-Kennwort",
+       'ADMIN_NETWORK_REQUEST_PARAMETER_RELOAD' => "Maximale Reloadsperre",
+       'ADMIN_NETWORK_REQUEST_PARAMETER_MINIMUM_STAY' => "Mindestauffenthalt",
+       'ADMIN_NETWORK_REQUEST_PARAMETER_MAXIMUM_STAY' => "Maximaler Auffenthalt",
+       'ADMIN_NETWORK_REQUEST_PARAMETER_CURRENCY' => "W&auml;hrung",
+       'ADMIN_NETWORK_REQUEST_PARAMETER_TYPE' => "Typ (z.B. klick/view)",
+       'ADMIN_NETWORK_REQUEST_PARAMETER_REMAIN' => "Mindestanzahl der restlichen Klicks",
+       'ADMIN_NETWORK_REQUEST_PARAMETER_REWARD' => "Mindestverg&uuml;tung",
+       'ADMIN_NETWORK_REQUEST_PARAMETER_SIZE' => "Werbemittelgr&ouml;sse",
+       'ADMIN_NETWORK_REQUEST_PARAMETER_EROTIC' => "Erotik erlaubt",
+       'ADMIN_NETWORK_REQUEST_PARAMETER_EXTRA' => "Extra-Parameter",
+       // - Return code translation
+       'ADMIN_NETWORK_ARRAY_TRANSLATION_INDEX' => "R&uuml;ckgabe-Code ausw&auml;hlen",
+       'ADMIN_NETWORK_ARRAY_TRANSLATION_INDEX_TRANSLATION' => "",
+       // Error codes
+       'ADMIN_NETWORK_AFF_ID_PASS_WRONG_ERROR_CODE' => "Affiliate-Id oder -Passwort falsch",
+       'ADMIN_NETWORK_SITE_ID_NOT_ASSIGNED_ERROR_CODE' => "Seiten-Id nicht zugewiesen/ung&uuml;ltig",
+       'ADMIN_NETWORK_SITE_ID_LOCKED_ERROR_CODE' => "Seiten-Id ist gesperrt (Webseite gesperrt)",
+       'ADMIN_NETWORK_INTERFACE_DATA_ERROR_ERROR_CODE' => "Allgemeiner Fehler im Interface",
+       'ADMIN_NETWORK_NO_CAMPAIGNS_FOUND_ERROR_CODE' => "Keine Kampagnen zu Suchkriterien gefunden",
+       'ADMIN_NETWORK_NO_CAMPAIGNS_FOUND_INTERFACE_ERROR_CODE' => "Keine f. Interface freigegebene Kampagnen gefunden",
+       'ADMIN_NETWORK_REQUESTS_DEPLETED_ERROR_CODE' => "API-Abfragen ersch&ouml;pft",
+       'ADMIN_NETWORK_REQUEST_PARAMETER_INCOMPLETE_ERROR_CODE' => "API-Abfrageparameter nicht komplett",
+       'ADMIN_NETWORK_SITE_ID_NOT_ALLOWED_TYPE_ERROR_CODE' => "Seiten-Id nicht freigegeben",
 ));
 
 // [EOF]

diff --git a/inc/language/rallye_de.php b/inc/language/rallye_de.php
index 871d3f83c636fa2d0893141b8e4c18518ccf3340..d73ff341756e20242601e3bdf10492e7c1c22efe 100644 (file)
--- a/inc/language/rallye_de.php
+++ b/inc/language/rallye_de.php
@@ -60,7 +60,7 @@ addMessages(array(
        'RALLYE_TEMPLATE' => "Template (anstelle freien HTML-Codes)",
        'RALLYE_PROBLEM_CREATE' => "Problem beim Erzeugen der Referal-Rallye.",
        'RALLYE_NO_RALLYES_SETUP' => "Bitte fügen Sie zuerst eine neue Referal-Rallye hinzu.",
-       'RALLYE_CONFIG_PRICES' => "Preise einrichten f&uuml;r Referal-Rallye <strong>%s</strong>",
+       'RALLYE_CONFIG_PRICES' => "Preise einrichten f&uuml;r Referal-Rallye <span class=\"data\">%s</span>",
        'RALLYE_PRICE_LEVEL' => "Platz eingeben (1, 2, 3, usw.)",
        'RALLYE_PRICE_POINTS' => "Preis in {?POINTS?}",
        'RALLYE_PRICE_INFOS' => "Preisbeschreibung (<span class=\"tiny\">Sie k&ouml;nnen auch nur die Beschreibung eingeben!</span>)",
@@ -94,9 +94,7 @@ addMessages(array(
        'RALLYE_ASSIGNED_PRICES' => "Bereits eingerichtete Preise",
        'RALLYE_ASSIGNED_USERS' => "Teilnehmende Mitglieder",
        'RALLYE_LIST_OVERVIEW_TITLE' => "Datenbl&auml;tter der Referal-Rallyes",
-       'RALLYE_NO_RALLYES_SELECTED_1' => "Sie haben keine ",
-       'RALLYE_NO_RALLYES_SELECTED_2' => "Rallyes zum Editieren",
-       'RALLYE_NO_RALLYES_SELECTED_3' => " ausgew&auml;hlt.",
+       'RALLYE_NO_RALLYES_SELECTED' => "Sie haben keine <a href=\"{%url=modules.php?module=admin&amp;what=list_rallyes%}\">Rallyes zum Editieren</a> ausgew&auml;hlt.",
        'RALLYE_DEACTIVATE_NOW' => "Rallye deaktivieren",
        'RALLYE_ACTIVATE_NOW' => "Rallye aktivieren",
        'RALLYE_STOP_NOTIFY_NOW' => "Nicht mehr benachrichtigen",
@@ -110,8 +108,7 @@ addMessages(array(
        'RALLYE_MEMBER_NOTIFY' => "REF-RALLYE GESTARTET: %s",
        'RALLYE_ADMIN_NOTIFY' => "Neue Ref-Rallye: %s",
        'RALLYE_ADMIN_USERS_404' => "Zur ausgew&auml;hlten Referal-Rallye sind noch keine Mitglieder hinzugef&uuml;gt worden.",
-// @TODO Rewrite following two lines to one
-       'RALLYE_LIST_USERS' => "Teilnehmende Mitglieder an der Referal-Rallye <u>%s</u>",
+       'RALLYE_LIST_USERS' => "Teilnehmende Mitglieder an der Referal-Rallye <span class=\"data\">%s</span>",
        'RALLYE_OLD_REFS' => "Refs vor Referal-Rallye",
        'RALLYE_NEW_REFS' => "Neue Refs",
        'RALLYE_STOP_AUTO_ADD_NOW' => "Auto-Beitreten neuer Mitglieder deaktivieren",

diff --git a/inc/language/refback_de.php b/inc/language/refback_de.php
index 54a610c4ca0082ce1a210bb5bb5ff52b3f8e0c32..f9d58878c1b507e1e920d0dd7fc3882b289b8779 100644 (file)
--- a/inc/language/refback_de.php
+++ b/inc/language/refback_de.php
@@ -45,8 +45,8 @@ if (!defined('__SECURITY')) {
 // Admin language strings
 // @TODO Rewrite these constants to one
 addMessages(array(
-       'ADMIN_LIST_USER_NOREFS' => "Das Mitglied <strong>%s</strong> hat in dieser Referal-Ebene keine Refs.",
-       'ADMIN_LIST_USER_NODATA' => "Das Mitglied <strong>%s</strong> wurde bereits gel&ouml;scht.",
+       'ADMIN_LIST_USER_NOREFS' => "Das Mitglied <span class=\"data\">%s</span> hat in dieser Referal-Ebene keine Refs.",
+       'ADMIN_LIST_USER_NODATA' => "Das Mitglied <span class=\"data\">%s</span> wurde bereits gel&ouml;scht.",
        'ADMIN_CONFIG_REFBACK_TITLE' => "Refback-Einstellungen",
        'ADMIN_CONFIG_REFBACK_ENABLED' => "Refback eingeschaltet? (Wenn nein, ist nur die Referal-&Uuml;bersicht funktionell.)",
        'ADMIN_CONFIG_REFBACK_MIN_PERCENTS' => "Minimum erlaubte Refback-Prozente:<br /><span class=\"admin_note\">(0&#37; ist immer erlaubt!)</span>",
@@ -71,9 +71,7 @@ addMessages(array(
        'MEMBER_REFBACK_DELETED_SUBMIT' => "Nicht m&ouml;glich",
        'MEMBER_REFBACK_DELETED_TITLE' => "Einstellen von Ref-Back ist f&uuml;r gel&ouml;schte Mitglieder nicht m&ouml;glich.",
        'MEMBER_REFBACK_DISABLED' => "Refback ist administrativ deaktiviert. Bitte nutze die Referal-&Uuml;bersicht links im Men&uuml;.",
-       'MEMBER_REFBACK_MIN_MAX_NOTE_1' => "<strong>Hinweis:</strong> Sie k&ouml;nnen derzeit zwischen <u>",
-       'MEMBER_REFBACK_MIN_MAX_NOTE_2' => "</u> und <u>",
-       'MEMBER_REFBACK_MIN_MAX_NOTE_3' => "</u> Prozent, inklusive, Refback einstellen.",
+       'MEMBER_REFBACK_MIN_MAX_NOTE' => "<strong>Hinweis:</strong> Sie k&ouml;nnen derzeit zwischen <u>{%config,translateComma=refback_min_perc%}</u> und <u>{%config,translateComma=refback_max_perc%}</u> Prozent, inklusive, Refback einstellen.",
 
 // Error messages for members
        'MEMBER_REFBACK_ERROR_MESSAGE' => "Fehler beim Einstellen des Ref-Backs. Fehlermeldung:<br />\n<span class=\"data\">%s</span>",

diff --git a/inc/language/sponsor_de.php b/inc/language/sponsor_de.php
index cd52172e630bb890ed93049f47232c62ae6a9eb2..6f7463b76ac8d92985cee8851c3faa08bcf65fca 100644 (file)
--- a/inc/language/sponsor_de.php
+++ b/inc/language/sponsor_de.php
@@ -117,8 +117,8 @@ addMessages(array(
        'ADMIN_SPONSOR_POINTS_SUBTRACTED' => "{?POINTS?} wurden abgezogen.",
        'ADMIN_SPONSPOR_CANNOT_LOCK_PENDING_UNCINFIRMED_ACCOUNTS' => "Sie können keine auf Freischaltung wartende oder unbestätigte Accounts sperren/freigeben.",
 // @TODO Rewrite these four constants to one and use sprintf()
-       'ADMIN_HEADER_DEL_SPONSOR' => "Sponsorenaccount <strong>%s</strong> l&ouml;schen",
-       'ADMIN_TEXT_DEL_SPONSOR' => "M&ouml;chten Sie den Sponsoren <strong>%s</strong> mit samt aller seiner Bestellungen unwiederruflich l&ouml;schen?",
+       'ADMIN_HEADER_DEL_SPONSOR' => "Sponsorenaccount <span class=\"data\">%s</span> l&ouml;schen",
+       'ADMIN_TEXT_DEL_SPONSOR' => "M&ouml;chten Sie den Sponsoren <span class=\"data\">%s</span> mit samt aller seiner Bestellungen unwiederruflich l&ouml;schen?",
        'ADMIN_SPONSOR_DELETED' => "Sponsorenaccount <span class=\"data\">%s</span> entfernt.",
        'GUEST_SPONSOR_TITLE' => "Anmeldung als Sponsor",
        'SPONSOR_ENTER_COMPANY_DATA' => "Daten zum Unternehmen",

diff --git a/inc/libs/active_functions.php b/inc/libs/active_functions.php
index c5ed6c7a0bef39510da69e4695b162a62c01bd62..124ed344612d5675449b6f12d46fca63e3868c9b 100644 (file)
--- a/inc/libs/active_functions.php
+++ b/inc/libs/active_functions.php
@@ -48,7 +48,7 @@ function FILTER_ADD_LINK_ACTIVE_LIST () {
        if (isExtensionActive('online')) {
                // Init content
                $content = array(
-                       'menu' => '<a class="menu_blur" href="{%url=modules.php?module=index&amp;what=active%}">{%config=menu_blur_spacer%}' . getMessage('GUEST_ACTIVE_LINK') . '</a>',
+                       'menu' => '<a class="menu_blur" href="{%url=modules.php?module=index&amp;what=active%}">{%config=menu_blur_spacer%}{--GUEST_ACTIVE_LINK--}</a>',
                        'what' => 'active'
                );
 

diff --git a/inc/libs/admins_functions.php b/inc/libs/admins_functions.php
index 3ec0d018869a6c7d6a770bb94d0266f6822b8ad7..8bca848b23df1734b35837a63ac806ac2d015035 100644 (file)
--- a/inc/libs/admins_functions.php
+++ b/inc/libs/admins_functions.php
@@ -212,7 +212,7 @@ function adminsChangeAdminAccount ($postData, $element = '') {
                                        SQL_QUERY_ESC("UPDATE
        `{?_MYSQL_PREFIX?}_admins`
 SET
-       `login`='%s'".$add.",
+       `login`='%s'" . $add . ",
        `email`='%s',
        `default_acl`='%s',
        `la_mode`='%s'
@@ -231,7 +231,7 @@ LIMIT 1",
                                        SQL_QUERY_ESC("UPDATE
        `{?_MYSQL_PREFIX?}_admins`
 SET
-       `login`='%s'".$add.",
+       `login`='%s'" . $add . ",
        `email`='%s',
        `la_mode`='%s'
 WHERE

diff --git a/inc/libs/bonus_functions.php b/inc/libs/bonus_functions.php
index f3424a46d76c9942119a1d2f48410e200b5b2820..21ef2d6d1b2dcbefc3e2aa155f0a8498496dcc7c 100644 (file)
--- a/inc/libs/bonus_functions.php
+++ b/inc/libs/bonus_functions.php
@@ -188,9 +188,6 @@ LIMIT 1",
                                        // Is it not empty? Then use it
                                        if (!empty($nick)) $rows['userid'] = $nick;
                                } // END - if
-
-                               // Translate comma
-                               $rows['points'] = translateComma($rows['points']);
                        } // END - if
 
                        // Free result
@@ -204,7 +201,7 @@ LIMIT 1",
                        $OUT .= "<tr>
   <td class=\"bonus_rank_".$rows['rank']." bottom switch_sw".$rows['sw']."\">".$rows['rank'].".</td>
   <td class=\"bonus_rank_".$rows['rank']." bottom switch_sw".$rows['sw']."\" align=\"center\">".$rows['userid']."</td>
-  <td class=\"bonus_rank_".$rows['rank']." bottom switch_sw".$rows['sw']."\" align=\"center\">".$rows['points']."</td>
+  <td class=\"bonus_rank_".$rows['rank']." bottom switch_sw".$rows['sw']."\" align=\"center\">{%pipe,translateComma=".$rows['points']."%}</td>
 </tr>\n";
 
                        // Switch color
@@ -321,7 +318,7 @@ LIMIT 1",
 
        if (($bonus === true) && (getRequestParameter('mode') == 'bonus')) {
                // Output message with added points
-               $GLOBALS['message'] .= '<div class="tiny">' . getMessage('BONUS_LOGIN_BONUS_ADDED') . '</div>';
+               $GLOBALS['message'] .= '<div class="tiny">{--BONUS_LOGIN_BONUS_ADDED--}</div>';
        } elseif (isExtensionActive('bonus')) {
                // No login bonus added!
                $GLOBALS['message'] .= '<div class="member_failed">{--BONUS_LOGIN_BONUS_NOT_ADDED--}</div>';

diff --git a/inc/libs/doubler_functions.php b/inc/libs/doubler_functions.php
index 6333ababde6c017e22cc9ef13c6eee8c8decd204..b6eddaf4432c2349b6baacf6ab2f3428feb7ccb3 100644 (file)
--- a/inc/libs/doubler_functions.php
+++ b/inc/libs/doubler_functions.php
@@ -70,15 +70,21 @@ function generateDoublerTable ($userid = '0', $done = 'N', $ref = 'N', $sort = '
        }
 
        // List entries
-       $result = SQL_QUERY("SELECT
+       $result = SQL_QUERY_ESC("SELECT
        `userid`, `refid`, `points`, `timemark`
 FROM
        `{?_MYSQL_PREFIX?}_doubler`
 WHERE
-       `completed`='".$done."' AND `is_ref`='".$ref."'".$add."
+       `completed`='%s' AND `is_ref`='%s'" . $add . "
 ORDER BY
-       `timemark` ".$sort."
-LIMIT ".$limit, __FUNCTION__, __LINE__);
+       `timemark` %s
+LIMIT %s",
+               array(
+                       $done,
+                       $ref,
+                       $sort,
+                       $limit
+               ), __FUNCTION__, __LINE__);
 
        if (SQL_NUMROWS($result) > 0) {
                // List entries

diff --git a/inc/libs/html_mail_functions.php b/inc/libs/html_mail_functions.php
index 8630b681283b234c2360fbad7e3ad5608b00d92c..0ca2f48b0402d0357f9cfcb221930476f9afce82 100644 (file)
--- a/inc/libs/html_mail_functions.php
+++ b/inc/libs/html_mail_functions.php
@@ -148,7 +148,7 @@ function insertUrlsIntoHtml ($text) {
        } // END - foreach
 
        // Replace new-lines agains <br />-s and finally compile possible own HTML tags out...
-       return compileCode(str_replace("\n", "<br />\n", $text));
+       return preCompileCode(str_replace("\n", "<br />\n", $text));
 }
 
 // Sends a HTML mail to the user

diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php
index 8220abf5c184426331081c1781955d64759300db..b33bfea63ba7edea3f7d49082ede2fad9a7fb682 100644 (file)
--- a/inc/libs/network_functions.php
+++ b/inc/libs/network_functions.php
@@ -132,39 +132,46 @@ function isNetworkRequestParameterValid ($key, $type, $networkId) {
 }
 
 // "Getter" for a network's data by provided id number
-function getNetworkDataById ($id) {
+function getNetworkDataById ($id, $column = '') {
        // Ids lower one are not accepted
        if ($id < 1) {
                // Not good, should be fixed
                debug_report_bug('Network id ' . $id . ' is smaller than 1.');
        } // END - if
 
-       // By default we have no data
-       $networkData = array();
+       // Is it cached?
+       if (!isset($GLOBALS['network_data'][$id])) {
+               // By default we have no data
+               $GLOBALS['network_data'][$id] = array();
 
-       // Query for the network data
-       $result = SQL_QUERY_ESC("SELECT
+               // 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`
 FROM
        `{?_MYSQL_PREFIX?}_network_data`
 WHERE
        `network_id`=%s
 LIMIT 1",
-               array(bigintval($id)), __FUNCTION__, __LINE__);
+                       array(bigintval($id)), __FUNCTION__, __LINE__);
 
-       // Do we have an entry?
-       if (SQL_NUMROWS($result) == 1) {
-               // Then get it
-               $networkData = SQL_FETCHARRAY($result);
+               // Do we have an entry?
+               if (SQL_NUMROWS($result) == 1) {
+                       // Then get it
+                       $GLOBALS['network_data'][$id] = SQL_FETCHARRAY($result);
+               } // END - if
 
-               // Solve disabled
+               // Free result
+               SQL_FREERESULT($result);
        } // END - if
 
-       // Free result
-       SQL_FREERESULT($result);
-
        // Return result
-       return $networkData;
+       if (empty($column)) {
+               // Return array
+               return $GLOBALS['network_data'][$id];
+       } else {
+               // Return column
+               return $GLOBALS['network_data'][$id][$column];
+       }
 }
 
 // "Getter" for a network type data by provided id number
@@ -176,7 +183,7 @@ function getNetworkTypeDataById ($id) {
        } // END - if
 
        // By default we have no data
-       $networkTypeData = array();
+       $GLOBALS['network_type_data'][$id] = array();
 
        // Query for the network data
        $result = SQL_QUERY_ESC("SELECT
@@ -191,14 +198,14 @@ LIMIT 1",
        // Do we have an entry?
        if (SQL_NUMROWS($result) == 1) {
                // Then get it
-               $networkTypeData = SQL_FETCHARRAY($result);
+               $GLOBALS['network_type_data'][$id] = SQL_FETCHARRAY($result);
        } // END - if
 
        // Free result
        SQL_FREERESULT($result);
 
        // Return result
-       return $networkTypeData;
+       return $GLOBALS['network_type_data'][$id];
 }
 
 // "Getter" for a network request parameter data by provided id number
@@ -300,7 +307,10 @@ ORDER BY
                $rows = array();
                while ($row = SQL_FETCHARRAY($result)) {
                        // Is this valid, then add it
-                       if ((is_array($row)) && (isset($row['network_id']))) $rows[] = $row;
+                       if ((is_array($row)) && (isset($row['network_id']))) {
+                               // Add entry
+                               $rows[$row['network_id']] = $row;
+                       } // END - if
                } // END - while
 
                // Generate the selection box
@@ -317,6 +327,50 @@ ORDER BY
        return $content;
 }
 
+// Generator (somewhat getter) for a list of network types for given network id
+function generateAdminNetworkTypeList ($networkId) {
+       // Init content
+       $content = '';
+
+       // Query all types of this network
+       $result = SQL_QUERY_ESC("SELECT
+       `network_type_id`, `network_type_handle`
+FROM
+       `{?_MYSQL_PREFIX?}_network_types`
+WHERE
+       `network_id`=%s
+ORDER BY
+       `network_type_handle` ASC",
+               array(
+                       bigintval($networkId)
+               ), __FILE__, __LINE__);
+
+       // Do we have entries?
+       if (SQL_NUMROWS($result) > 0) {
+               // List all entries
+               $rows = array();
+               while ($row = SQL_FETCHARRAY($result)) {
+                       // Is this valid, then add it
+                       if ((is_array($row)) && (isset($row['network_type_id']))) {
+                               // Add entry
+                               $rows[$row['network_type_id']] = $row;
+                       } // END - if
+               } // END - while
+
+               // Generate the selection box
+               $content = generateSelectionBoxFromArray($rows, 'network_type', 'network_type_id');
+       } else {
+               // Nothing selected
+               $content = loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_ENTRIES_404'));
+       }
+
+       // Free the result
+       SQL_FREERESULT($result);
+
+       // Return content
+       return $content;
+}
+
 // Generator (somewhat getter) for network type options
 function generateNetworkTypeOptions ($id) {
        // Is this an array, then we just came back from edit/delete actions
@@ -331,7 +385,10 @@ function generateNetworkTypeOptions ($id) {
                        'network_type_handle',
                        $id,
                        '',
-                       sprintf("WHERE `network_id`=%s", getRequestParameter('network'))
+                       sprintf(
+                               "WHERE `network_id`=%s",
+                               bigintval(getRequestParameter('network'))
+                       )
                );
        } // END - if
 
@@ -352,8 +409,8 @@ function generateNetworkRequestKeyOptions ($key) {
                                'hash',
                                'password',
                                'reload',
-                               'max_stay',
-                               'min_stay',
+                               'maximum_stay',
+                               'minimum_stay',
                                'currency',
                                'type',
                                'remain',
@@ -363,20 +420,20 @@ function generateNetworkRequestKeyOptions ($key) {
                                'extra'
                        ),
                        array(
-                               '{--ADMIN_NETWORK_REQUEST_PARAMS_ID--}',
-                               '{--ADMIN_NETWORK_REQUEST_PARAMS_SID--}',
-                               '{--ADMIN_NETWORK_REQUEST_PARAMS_HASH--}',
-                               '{--ADMIN_NETWORK_REQUEST_PARAMS_PASSWORD--}',
-                               '{--ADMIN_NETWORK_REQUEST_PARAMS_RELOAD--}',
-                               '{--ADMIN_NETWORK_REQUEST_PARAMS_MAXIMUM_STAY--}',
-                               '{--ADMIN_NETWORK_REQUEST_PARAMS_MINIMUM_STAY--}',
-                               '{--ADMIN_NETWORK_REQUEST_PARAMS_CURRENCY--}',
-                               '{--ADMIN_NETWORK_REQUEST_PARAMS_TYPE--}',
-                               '{--ADMIN_NETWORK_REQUEST_PARAMS_REMAIN--}',
-                               '{--ADMIN_NETWORK_REQUEST_PARAMS_REWARD--}',
-                               '{--ADMIN_NETWORK_REQUEST_PARAMS_SIZE--}',
-                               '{--ADMIN_NETWORK_REQUEST_PARAMS_EROTIC--}',
-                               '{--ADMIN_NETWORK_REQUEST_PARAMS_EXTRA--}'
+                               '{--ADMIN_NETWORK_REQUEST_PARAMETER_ID--}',
+                               '{--ADMIN_NETWORK_REQUEST_PARAMETER_SID--}',
+                               '{--ADMIN_NETWORK_REQUEST_PARAMETER_HASH--}',
+                               '{--ADMIN_NETWORK_REQUEST_PARAMETER_PASSWORD--}',
+                               '{--ADMIN_NETWORK_REQUEST_PARAMETER_RELOAD--}',
+                               '{--ADMIN_NETWORK_REQUEST_PARAMETER_MAXIMUM_STAY--}',
+                               '{--ADMIN_NETWORK_REQUEST_PARAMETER_MINIMUM_STAY--}',
+                               '{--ADMIN_NETWORK_REQUEST_PARAMETER_CURRENCY--}',
+                               '{--ADMIN_NETWORK_REQUEST_PARAMETER_TYPE--}',
+                               '{--ADMIN_NETWORK_REQUEST_PARAMETER_REMAIN--}',
+                               '{--ADMIN_NETWORK_REQUEST_PARAMETER_REWARD--}',
+                               '{--ADMIN_NETWORK_REQUEST_PARAMETER_SIZE--}',
+                               '{--ADMIN_NETWORK_REQUEST_PARAMETER_EROTIC--}',
+                               '{--ADMIN_NETWORK_REQUEST_PARAMETER_EXTRA--}'
                        ),
                        $key,
                        '', '',
@@ -388,6 +445,27 @@ function generateNetworkRequestKeyOptions ($key) {
        return $GLOBALS['network_request_param_key'][$key];
 }
 
+// Generator (somewhat getter) for (return) array translation
+function generateNetworkArrayTranslationOptions ($default) {
+       // Is it cached?
+       if (!isset($GLOBALS['network_array_translation'][$default])) {
+               // Generate and cache it
+               $GLOBALS['network_array_translation'][$default] = generateOptionList(
+                       'network_request_params',
+                       'network_param_id',
+                       'request_param_key',
+                       $default,
+                       '',
+                       sprintf("WHERE `network_id`='%s'", bigintval(getRequestParameter('network'))),
+                       $GLOBALS['network_array_translation_disabled'],
+                       'ADMIN_NETWORK_REQUEST_PARAMETER_'
+               );
+       } // END - if
+
+       // Return content
+       return $GLOBALS['network_array_translation'][$default];
+}
+
 //------------------------------------------------------------------------------
 //                             Call-back functions
 //------------------------------------------------------------------------------
@@ -447,7 +525,10 @@ function doAdminNetworkProcessHandlenetworkForm () {
                                                // Make selection box for network_request_type
                                                $networkData['network_request_type'] = generateOptionList(
                                                        '/ARRAY/',
-                                                       array('GET','POST'),
+                                                       array(
+                                                               'GET',
+                                                               'POST'
+                                                       ),
                                                        array(
                                                                getMessage('ADMIN_NETWORK_REQUEST_TYPE_GET'),
                                                                getMessage('ADMIN_NETWORK_REQUEST_TYPE_POST')
@@ -636,7 +717,7 @@ function doAdminNetworkProcessHandlerequestparamsForm () {
                        $GLOBALS['network_display'] = false;
                } else {
                        // Nothing selected/found
-                       loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_REQUEST_PARAMS_NOTHING_FOUND'));
+                       loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_FOUND'));
                }
        } // END - if
 }
@@ -728,7 +809,7 @@ function doAdminNetworkProcessAddnetworktypeForm () {
        unsetPostRequestParameter('ok');
 
        // Add id
-       setPostRequestParameter('network_id', getRequestParameter('network'));
+       setPostRequestParameter('network_id', bigintval(getRequestParameter('network')));
 
        // Is network_type_banner_url set?
        if (postRequestParameter('network_type_banner_url') == '') {
@@ -849,10 +930,10 @@ function doAdminNetworkProcessChangenetworkparamForm () {
                // Do we have updates?
                if ($updated > 0) {
                        // Updates done
-                       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_REQUEST_PARAMS_UPDATED', $updated));
+                       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_REQUEST_PARAMETER_UPDATED', $updated));
                } else {
                        // Nothing changed
-                       loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_REQUEST_PARAMS_NOTHING_CHANGED'));
+                       loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_CHANGED'));
                }
        } // END - if
 }
@@ -903,10 +984,10 @@ function doAdminNetworkProcessRemovenetworkparamForm () {
                // Do we have removes?
                if ($removed > 0) {
                        // Removals done
-                       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_REQUEST_PARAMS_REMOVED', $removed));
+                       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_REQUEST_PARAMETER_REMOVED', $removed));
                } else {
                        // Nothing removed
-                       loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_REQUEST_PARAMS_NOTHING_REMOVED'));
+                       loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_REMOVED'));
                }
        } // END - if
 }
@@ -926,7 +1007,7 @@ function doAdminNetworkProcessAddnetworkparamForm () {
        unsetPostRequestParameter('ok');
 
        // Add id
-       setPostRequestParameter('network_id', getRequestParameter('network'));
+       setPostRequestParameter('network_id', bigintval(getRequestParameter('network')));
 
        // Is request_param_default set?
        if (postRequestParameter('request_param_default') == '') {
@@ -953,5 +1034,22 @@ function doAdminNetworkProcessAddnetworkparamForm () {
        }
 }
 
+// Do expression code for this extension
+function doExpressionNetwork ($data) {
+       // Construct replacer
+       $replacer = sprintf(
+               "\" . %s(%s, '%s') . \"",
+               $data['callback'],
+               $data['matches'][4][$data['key']],
+               $data['extra_func']
+       );
+
+       // Replace the code
+       $code = replaceExpressionCode($data, $replacer);
+
+       // Return it
+       return $code;
+}
+
 // [EOF]
 ?>

diff --git a/inc/libs/newsletter_functions.php b/inc/libs/newsletter_functions.php
index 8ecfe7373de5b24cc79bbf5ec5c23f05326b0b56..ea035521c2b8a034fd77123b82e21f4d3e9415a0 100644 (file)
--- a/inc/libs/newsletter_functions.php
+++ b/inc/libs/newsletter_functions.php
@@ -121,8 +121,8 @@ function insertNewsletterUrls ($text) {
                $text .= $part;
        }
 
-       // Compile possible own HTML tags out...
-       return compileCode($text);
+       // Pre-ompile possible own HTML tags out...
+       return preCompileCode($text);
 }
 
 // Wrapper for sending newsletter and wrapping URLs / HTML mail

diff --git a/inc/libs/primera_functions.php b/inc/libs/primera_functions.php
index 6643755e7f32725285afdd59ff888d5484c6cde0..baf88c8796b5bf106a82eef3da02119d7e957a9e 100644 (file)
--- a/inc/libs/primera_functions.php
+++ b/inc/libs/primera_functions.php
@@ -258,7 +258,7 @@ function executePrimeraWithdraw ($primusNick, $userMd5, $amount) {
        $api = new PrimeraApi($primusNick, $userMd5);
 
        // Prepare purpose
-       eval("\$purpose = \"".compileRawCode(getMaskedMessage('PRIMERA_API_PURPOSE_WITHDRAW', getSession('sponsorid')))."\";");
+       eval('$purpose = "' . preCompileCode(getMaskedMessage('PRIMERA_API_PURPOSE_WITHDRAW', getSession('sponsorid'))) . '";');
 
        // Pay the Primera
        return $api->payPrimera($primusNick, $amount, $purpose);
@@ -270,7 +270,7 @@ function executePrimeraPayout ($primusNick, $userMd5, $amount) {
        $api = new PrimeraApi(getConfig('primera_api_name'), getConfig('primera_api_md5'));
 
        // Prepare purpose
-       eval("\$purpose = \"".compileRawCode(getMaskedMessage('PRIMERA_API_PURPOSE_PAYOUT', getMemberId()))."\";");
+       eval('$purpose = "' . preCompileCode(getMaskedMessage('PRIMERA_API_PURPOSE_PAYOUT', getMemberId())) . '";');
 
        // Pay the Primera
        return $api->payPrimera($primusNick, $amount, $purpose);

diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php
index ba5e615897a5565f36b1de50d56b0c150f664935..4e03f7ecba9c6e2212103e1ee12d5bf12df7f1da 100644 (file)
--- a/inc/libs/rallye_functions.php
+++ b/inc/libs/rallye_functions.php
@@ -159,21 +159,23 @@ function addReferalRallyePrices ($rallye, $mode='email') {
        } // END - switch
 
        // Load prices
-       $result_prices = SQL_QUERY("SELECT
+       $result_prices = SQL_QUERY_ESC("SELECT
        `price_level`, `points`, `info`
 FROM
        `{?_MYSQL_PREFIX?}_rallye_prices`
 WHERE
-       `rallye_id`='".$rallye."'
+       `rallye_id`=%s
 ORDER BY
        `price_level` ASC",
-               __FUNCTION__, __LINE__);
+               array($rallye), __FUNCTION__, __LINE__);
+
+       // Entries found?
        if (SQL_NUMROWS($result_prices) > 0) {
                // Load prices
                if ($mode == "\n") $prices = "{--RALLYE_MEMBER_PRICES_ADDED--}:".$mode."------------------------------".$mode;
                $prices = '';
                while ($content = SQL_FETCHARRAY($result_prices)) {
-                       $prices .= $content['price_level'].getMessage('RALLYE_PRICE').": ";
+                       $prices .= $content['price_level']. '{--RALLYE_PRICE--}: ';
                        if (!empty($content['info'])) {
                                $prices .= $content['info'];
                        } else {
@@ -304,9 +306,9 @@ LIMIT 1",
                $SW = 3 - $SW;
        } // END - for
 
-       // Translate min_prices/users
-       $content['min_prices'] = determineReferalRallyeMinimumPrices($min_prices);
-       $content['min_users']  = determineReferalRallyeMinimumUsers($min_users);
+       // Add min_prices/users
+       $content['min_prices'] = bigintval($min_prices);
+       $content['min_users']  = bigintval($min_users);
 
        // Add footer
        $OUT .= loadTemplate('guest_rallye_footer', true, $content);
@@ -777,21 +779,21 @@ function addReferalRallyeTemplateSelection ($name = 'template', $default = '') {
                $read = substr($read, 7, strpos($read, '.') - 7);
 
                // Accept only template names between 1 and 255 chars length
-               if ((strlen($read) < 256) && (!empty($read))) $ral[] = $read;
-       } // END - while
+               if ((strlen($read) < 256) && (!empty($read))) {
+                       // Valid entry found!
+                       $ral[$read] = $read;
+               } else {
+                       // Log invalid
+                       logDebugMessage(__FUNCTION__, __LINE__, sprintf("WARNING: Template %s not used.", $read));
+               }
+       } // END - foreach
 
        // Do we have found templates which we can link with the new rallye?
        if (!empty($ral[0])) {
                // Generate selection box for all found templates
-               // @TODO Rewrite this to our API function
-               $OUT  = "<select name=\"".$name."\" size=\"1\" class=\"admin_select\">
-  <option value=\"\">{--SELECT_NONE--}</option>\n";
-               foreach ($ral as $rallye) {
-                       $OUT .= "  <option value=\"".$rallye."\"";
-                       if ($default == $rallye) $OUT .= ' selected="selected"';
-                       $OUT .= ">".$rallye."</option>\n";
-               } // END - foreach
-               $OUT .= "</select>\n";
+               $OUT  = '<select name="' . $name . '" size="1" class="admin_select">';
+               $OUT .= generateOptionList('/ARRAY/', array_keys($ral), array_values($ral), $default, '', 'none');
+               $OUT .= '</select>';
        } else {
                // No rallye templates found
                $OUT = getMessage('RALLYE_NO_TEMPLATES_FOUND');
@@ -801,8 +803,8 @@ function addReferalRallyeTemplateSelection ($name = 'template', $default = '') {
        return $OUT;
 }
 
-//
-function getReferalRallyeRefsCount ($userid, $old = '0') {
+// @TODO Please document this function
+function getReferalRallyeRefsCount ($currUserid, $old = '0') {
        // Check current refs
        if (isExtensionInstalledAndNewer('cache', '0.1.2')) {
                // Get refs from cache
@@ -810,7 +812,7 @@ function getReferalRallyeRefsCount ($userid, $old = '0') {
                foreach ($GLOBALS['cache_array']['refsystem']['userid'] as $id => $userid) {
                        // Do we have a ref for this user?
                        //* DEBUG: */ print("id={$id},userid={$userid},userid={$userid},old={$old},level={$GLOBALS['cache_array']['refsystem']['level'][$id]}<br />");
-                       if (($userid == $userid) && ($GLOBALS['cache_array']['refsystem']['level'][$id] == 1)) {
+                       if (($currUserid == $userid) && ($GLOBALS['cache_array']['refsystem']['level'][$id] == 1)) {
                                //* DEBUG: */ print("userid matches!<br />");
                                foreach ($GLOBALS['cache_array']['refdepths']['level'] as $level) {
                                        if (($level == $GLOBALS['cache_array']['refsystem']['level'][$id]) && ($level == 1)) {
@@ -844,12 +846,25 @@ function getReferalRallyeRefsCount ($userid, $old = '0') {
                } // END - if
        } else {
                // Load current refs from database
-               $result_ref = SQL_QUERY_ESC("SELECT SUM(s.counter) AS cnt
-FROM `{?_MYSQL_PREFIX?}_refsystem` AS s
-LEFT JOIN `{?_MYSQL_PREFIX?}_refdepths` AS d
-ON s.level=d.level
-WHERE s.userid=%s AND s.level=1", array(bigintval($userid)), __FUNCTION__, __LINE__);
+               $result_ref = SQL_QUERY_ESC("SELECT
+       SUM(s.counter) AS cnt
+FROM
+       `{?_MYSQL_PREFIX?}_refsystem` AS s
+LEFT JOIN
+       `{?_MYSQL_PREFIX?}_refdepths` AS d
+ON
+       s.level=d.level
+WHERE
+       s.userid=%s AND
+       s.level=1",
+                       array(
+                               bigintval($userid)
+                       ), __FUNCTION__, __LINE__);
+
+               // Load count @TODO Can't we rewrite this to our API?
                list($cnt) = SQL_FETCHROW($result_ref);
+
+               // Free result
                SQL_FREERESULT($result_ref);
                if (empty($cnt)) {
                        $cnt = '0';

diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php
index d73f86568fe9d32b1e0f5aa40e7611e26cfb8d02..d4db9cc067579c853e3c018a0cdc4180fcffd490 100644 (file)
--- a/inc/libs/register_functions.php
+++ b/inc/libs/register_functions.php
@@ -48,8 +48,10 @@ function ifRequiredRegisterFieldsAreSet (&$array) {
        $ret = true;
        foreach ($array as $key => $value) {
                // Check all fields that must register
-               $result = SQL_QUERY("SELECT `id` FROM `{?_MYSQL_PREFIX?}_must_register` WHERE `field_name`='".$key."' AND `field_required`='Y' LIMIT 1",
-                       __FUNCTION__, __LINE__);
+               $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_must_register` WHERE `field_name`='%s' AND `field_required`='Y' LIMIT 1",
+                       array($key), __FUNCTION__, __LINE__);
+
+               // Entry found?
                if (SQL_NUMROWS($result) == 1) {
                        // Check if extension country is not found (you have to enter the 2-chars long country code) or
                        // if extensions is present check if country code was selected

diff --git a/inc/libs/rewrite_functions.php b/inc/libs/rewrite_functions.php
index 6a23cf91bfdce1e71335fda64b22300c2e9540e0..5b76d5a1b31859742baf55c5e72d3f37c8086820 100644 (file)
--- a/inc/libs/rewrite_functions.php
+++ b/inc/libs/rewrite_functions.php
@@ -49,10 +49,9 @@ function rewriteLinksInCode ($HTML) {
 
        // Generate target URL
        $target = '{?URL?}/cms/';
-       $output = $HTML;
 
        // Final eval()
-       $eval = '$output = "' . compileCode(escapeQuotes($output)) . '";';
+       $eval = '$output = "' . preCompileCode(escapeQuotes($HTML)) . '";';
        eval($eval);
 
        // Convert modules.php?module=...

diff --git a/inc/libs/sponsor_functions.php b/inc/libs/sponsor_functions.php
index ee59586f50d798230b1e80d1961af8d6f1b4672d..983a46b9685115caef2efbedd2e14211a494e18c 100644 (file)
--- a/inc/libs/sponsor_functions.php
+++ b/inc/libs/sponsor_functions.php
@@ -162,14 +162,14 @@ function handlSponsorRequest (&$postData, $update=false, $messageArray=array(),
                                }
 
                                // Implode all data into strings
-                               $KEYS   = implode("`, `"  , $DATA['keys']);
-                               $valueS = str_repeat("%s', '", count($DATA['values']) - 1);
+                               $keyArray   = implode("`, `"  , $DATA['keys']);
+                               $valueArray = str_repeat("%s', '", count($DATA['values']) - 1);
 
                                // Generate string
-                               $sql = "INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_data` (`".$KEYS."`) VALUES ('".$valueS."%s')";
+                               $sql = "INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_data` (`" . $keyArray . "`) VALUES ('" . $valueArray . "%s')";
 
                                // Generate message
-                               $message = getMessageFromIndexedArray(getMessage('ADMIN_SPONSOR_ADDED'), "added", $messageArray);
+                               $message = getMessageFromIndexedArray(getMessage('ADMIN_SPONSOR_ADDED'), 'added', $messageArray);
                                $ret = 'added';
                        } elseif (($update === true) && (isAdmin())) {
                                // Add all data as hidden data
@@ -439,8 +439,7 @@ function saveSponsorData ($postData, $content) {
        $DATA[] = getSession('sponsorpass');
 
        // Saving data was completed... ufff...
-       switch (getWhat())
-       {
+       switch (getWhat()) {
                case 'account': // Change account data
                        if ($EMAIL === true) {
                                $message   = getMessage('SPONSOR_ACCOUNT_EMAIL_CHANGED');
@@ -469,9 +468,11 @@ function saveSponsorData ($postData, $content) {
                        $message = getMaskedMessage('SPONSOR_UNKNOWN_WHAT', getWhat());
                        $templ = ''; $subj = '';
                        break;
-       }
+       } // END - switch
 
+       // Has an entry updated?
        if (SQL_AFFECTEDROWS() == 1) {
+               // Template and subject are set?
                if (!empty($templ) && !empty($subj)) {
                        // Run SQL command and check for success
                        $result = SQL_QUERY_ESC($sql, $DATA, __FUNCTION__, __LINE__);
@@ -479,7 +480,7 @@ function saveSponsorData ($postData, $content) {
                        // Add all data to content
                        $content['new_data'] = $postData;
 
-                       // Change some data
+                       // Translate some data
                        if (isset($content['gender']))             $content['gender']                  = translateGender($content['gender']);
                        if (isset($content['new_data']['gender'])) $content['new_data']['gender']      = translateGender($content['new_data']['gender']);
                        if (isset($content['receive_warnings']))   $content['new_data']['receive']     = translateYesNo($content['new_data']['receive_warnings']);

diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php
index b36ceb782ab6b6476982081600438f621e2b476b..6716188e18beb2db07f90446beb5c3292fd587a1 100644 (file)
--- a/inc/libs/surfbar_functions.php
+++ b/inc/libs/surfbar_functions.php
@@ -216,7 +216,7 @@ function SURFBAR_MEMBER_ACTIONS ($urlId, $status) {
 }
 
 // Do the member form request
-function SURFBAR_MEMBER_DO_FORM ($formData, $URLs) {
+function SURFBAR_MEMBER_DO_FORM ($formData, $urlArray) {
        // By default no action is performed
        $performed = false;
 
@@ -227,10 +227,10 @@ function SURFBAR_MEMBER_DO_FORM ($formData, $URLs) {
        } elseif ((!isset($formData['id'])) || (!isset($formData['action']))) {
                // Important form elements are missing!
                return false;
-       } elseif (!isset($URLs[$formData['id']])) {
+       } elseif (!isset($urlArray[$formData['id']])) {
                // id not found in cache
                return false;
-       } elseif (!SURFBAR_VALIDATE_MEMBER_ACTION_STATUS($formData['action'], $URLs[$formData['id']]['url_status'])) {
+       } elseif (!SURFBAR_VALIDATE_MEMBER_ACTION_STATUS($formData['action'], $urlArray[$formData['id']]['url_status'])) {
                // Action not allowed for current URL status
                return false;
        }
@@ -250,10 +250,10 @@ function SURFBAR_MEMBER_DO_FORM ($formData, $URLs) {
        // Is the function there?
        if (function_exists($functionName)) {
                // Add new status
-               $URLs[$formData['id']]['new_status'] = SURFBAR_GET_NEW_STATUS('new_status');
+               $urlArray[$formData['id']]['new_status'] = SURFBAR_GET_NEW_STATUS('new_status');
 
                // Extract URL data for call-back
-               $urlData = array(merge_array($URLs[$formData['id']], array($action => $formData)));
+               $urlData = array(merge_array($urlArray[$formData['id']], array($action => $formData)));
 
                // Action found so execute it
                $performed = call_user_func_array($functionName, $urlData);
@@ -560,7 +560,7 @@ function SURFBAR_GET_URL_DATA ($searchTerm, $column = 'url_id', $order = 'url_id
 FROM
        `{?_MYSQL_PREFIX?}_surfbar_urls`
 WHERE
-       `%s`='%s'".$add."
+       `%s`='%s'" . $add . "
 ORDER BY
        `%s` %s
 %s",
@@ -626,9 +626,6 @@ function SURFBAR_REGISTER_URL ($url, $userid, $status = 'PENDING', $addMode = 'r
                return false;
        } // END - if
 
-       // Translate status and limit
-       $content['limit'] = translateSurfbarLimit($content['limit']);
-
        // If in reg-mode we notify admin
        if (($addMode == 'reg') || (getConfig('surfbar_notify_admin_unlock') == 'Y')) {
                // Notify admin even when he as unlocked an email
@@ -724,12 +721,8 @@ function SURFBAR_NOTIFY_USER ($messageType, $content) {
 // @TODO Can't we use our new expression language instead of this ugly code?
 function SURFBAR_PREPARE_CONTENT_FOR_TEMPLATE ($content) {
        // Prepare some code
-       if (isset($content['url_status']))      $content['url_status']      = translateSurfbarUrlStatus($content['url_status']);
        if (isset($content['url_registered']))  $content['url_registered']  = generateDateTime($content['url_registered'], 2);
        if (isset($content['url_last_locked'])) $content['url_last_locked'] = generateDateTime($content['url_last_locked'], 2);
-       if (isset($content['url_views_total'])) $content['url_views_total'] = translateComma($content['url_views_total']);
-       if (isset($content['url_views_allowed']))   $content['url_views_allowed']   = translateComma($content['url_views_allowed']);
-       if (isset($content['views_max']))       $content['views_max']       = translateComma($content['views_max']);
 
        // Return translated content
        return $content;
@@ -819,7 +812,7 @@ function SURFBAR_DETERMINE_TEMPLATE_NAME() {
        if (isGetRequestParameterSet('frame')) {
                // Use the frame as a template name part... ;-)
                $templateName = sprintf("surfbar_frame_%s",
-               getRequestParameter('frame')
+                       getRequestParameter('frame')
                );
        } // END - if
 
@@ -1502,7 +1495,7 @@ GROUP BY
 // Load all URLs of the current user and return it as an array
 function SURFBAR_GET_USER_URLS () {
        // Init array
-       $URLs = array();
+       $urlArray = array();
 
        // Begin the query
        $result = SQL_QUERY_ESC("SELECT
@@ -1530,7 +1523,7 @@ ORDER BY
                // Load all rows
                while ($row = SQL_FETCHARRAY($result)) {
                        // Add the row
-                       $URLs[$row['id']] = $row;
+                       $urlArray[$row['id']] = $row;
                } // END - while
        } // END - if
 
@@ -1538,7 +1531,7 @@ ORDER BY
        SQL_FREERESULT($result);
 
        // Return the array
-       return $URLs;
+       return $urlArray;
 }
 
 // "Getter" for member action array for given status
@@ -1756,14 +1749,14 @@ function SURFBAR_GET_DATA ($element) {
                // Then take it
                $data = $GLOBALS['surfbar_cache'][$element];
        } else { // END - if
-               print("<pre>");
+               print('<pre>');
                print_r($GLOBALS['surfbar_cache']);
-               print("</pre>");
-               debug_report_bug();
+               print('</pre>');
+               debug_report_bug('Element ' . $element . ' not found.');
        }
 
        // Return result
-       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "element[$element]={$data}", false);
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'element[' . $element . ']=[' . gettype($data) . ']' . $data, false);
        return $data;
 }
 

diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php
index ed919e1267f09e60d2dc90baa317955e97baf1cb..16ea671c73367af7d995b6d4efd08013d7734784 100644 (file)
--- a/inc/libs/task_functions.php
+++ b/inc/libs/task_functions.php
@@ -208,13 +208,13 @@ function outputAdvancedOverview (&$result_main) {
                                $content['purged_bonus_mails'] = '<a href="{%url=modules.php?module=admin&amp;what=email_details%}">' . $value . '</a>';
                        } // END - if
                } elseif (isExtensionActive('bonus')) {
-                       $content['purged_bonus_mails'] = getMaskedMessage('ADMIN_EXT_BONUS_OUTDATED', '0.1.8');
+                       $content['purged_bonus_mails'] = getMaskedMessage('ADMIN_EXTENSION_BONUS_OUTDATED', '0.1.8');
                } else {
-                       $content['purged_bonus_mails'] = '<span class="admin_note">{--ADMIN_EXT_BONUS_404--}</span>';
+                       $content['purged_bonus_mails'] = '<span class="admin_note">{--ADMIN_EXTENSION_BONUS_404--}</span>';
                }
        } else {
-               $content['purged_bonus_mails'] = '<span class="admin_note">{--ADMIN_EXT_AUTOPURGE_404--}</span>';
-               $content['purged_mails'] = '<span class="admin_note">{--ADMIN_EXT_AUTOPURGE_404--}</span>';
+               $content['purged_bonus_mails'] = '<span class="admin_note">{--ADMIN_EXTENSION_AUTOPURGE_404--}</span>';
+               $content['purged_mails'] = '<span class="admin_note">{--ADMIN_EXTENSION_AUTOPURGE_404--}</span>';
        }
 
        //
@@ -228,9 +228,9 @@ function outputAdvancedOverview (&$result_main) {
                        $content['send_bonus_mails'] = '<a href="{%url=modules.php?module=admin&amp;what=email_details%}">' . $value . '</a>';
                } // END - if
        } elseif (isExtensionActive('bonus')) {
-               $content['send_bonus_mails'] = getMaskedMessage('ADMIN_EXT_BONUS_OUTDATED', '0.1.8');
+               $content['send_bonus_mails'] = getMaskedMessage('ADMIN_EXTENSION_BONUS_OUTDATED', '0.1.8');
        } else {
-               $content['send_bonus_mails'] = getMessage('ADMIN_EXT_BONUS_404');
+               $content['send_bonus_mails'] = getMessage('ADMIN_EXTENSION_BONUS_404');
        }
 
        if (isExtensionActive('autopurge')) {

diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index af1e552320412fe79659b800254069069e156db7..ca86a9b5f88182e50c2ba16fd2ad19bf97755b92 100644 (file)
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -334,7 +334,7 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
                                if ((isExtensionInstalledAndNewer('bonus', '0.3.5')) && (getConfig('bonus_mode') != 'ADD')) handleBonusPoints('login_bonus');
                        } // END - if
 
-                       // @TODO Make this filter working: $URL = runFilterChain('do_login', array('content' => $content, 'addon' => $ADDON));
+                       // @TODO Make this filter working: $url = runFilterChain('do_login', array('content' => $content, 'addon' => $ADDON));
 
                        // Set member id
                        setMemberId($userid);
@@ -351,14 +351,14 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
                                                // Procedure to checking for login data
                                                if (($GLOBALS['bonus_payed'] === true) && (isExtensionActive('bonus'))) {
                                                        // Bonus added (just displaying!)
-                                                       $URL = 'modules.php?module=chk_login&mode=bonus';
+                                                       $url = 'modules.php?module=chk_login&mode=bonus';
                                                } else {
                                                        // Bonus not added
-                                                       $URL = 'modules.php?module=chk_login&mode=login';
+                                                       $url = 'modules.php?module=chk_login&mode=login';
                                                }
                                        } else {
                                                // Use this URL
-                                               $URL = $successUrl;
+                                               $url = $successUrl;
                                        }
                                } else {
                                        // Cannot update counter!
@@ -393,14 +393,14 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
        // Error code provided?
        if ($errorCode > 0) {
                // Then reconstruct the URL
-               $URL = $errorUrl . $errorCode;
+               $url = $errorUrl . $errorCode;
 
                // Extension set? Then add it as well.
-               if (!empty($ext)) $URL .= '&ext=' . $ext;
+               if (!empty($ext)) $url .= '&ext=' . $ext;
        } // END - if
 
        // Return URL
-       return $URL;
+       return $url;
 }
 
 // Try to send a new password for the given user account

diff --git a/inc/libs/wernis_functions.php b/inc/libs/wernis_functions.php
index 9105d95f170aca49e7da6ef2592ab699d5ada8f2..adffe64f9037dfa1de06c6a19035e63d76aaf0b9 100644 (file)
--- a/inc/libs/wernis_functions.php
+++ b/inc/libs/wernis_functions.php
@@ -239,7 +239,7 @@ function WERNIS_EXECUTE_WITHDRAW ($wdsId, $userMd5, $amount) {
        $result = false;
 
        // Prepare the purpose
-       eval("\$purpose = \"".compileRawCode(getMaskedMessage('WERNIS_API_PURPOSE_WITHDRAW', getMemberId()))."\";");
+       eval('$purpose = "' . preCompileCode(getMaskedMessage('WERNIS_API_PURPOSE_WITHDRAW', getMemberId())) . '";');
 
        // Prepare the request data
        $requestData = array(
@@ -279,7 +279,7 @@ function WERNIS_EXECUTE_PAYOUT ($wdsId, $amount) {
        $result = false;
 
        // Prepare the purpose
-       eval("\$purpose = \"".compileRawCode(getMaskedMessage('WERNIS_API_PURPOSE_PAYOUT', getMemberId()))."\";");
+       eval('$purpose = "' . preCompileCode(getMaskedMessage('WERNIS_API_PURPOSE_PAYOUT', getMemberId())) . '";');
 
        // Prepare the request data
        $requestData = array(

diff --git a/inc/mails/beg_mails.php b/inc/mails/beg_mails.php
index b9a65e462f446f22abd062ef175723a3f375a6a2..4dcba25b0d53479ea2b44449ae4da86b898230cb 100644 (file)
--- a/inc/mails/beg_mails.php
+++ b/inc/mails/beg_mails.php
@@ -138,10 +138,10 @@ LIMIT 1",
                        $receiver = implode(';', $userids);
 
                        // Prepare URL
-                       $URL = 'modules.php?module=index&what=login';
+                       $url = 'modules.php?module=index&what=login';
 
                        // Insert mail
-                       addBonusMailToQueue($subject, $message, $receiver, getConfig('beg_notify_bonus'), getConfig('beg_notify_wait'), $URL, 0, 'normal', SQL_NUMROWS($result_main));
+                       addBonusMailToQueue($subject, $message, $receiver, getConfig('beg_notify_bonus'), getConfig('beg_notify_wait'), $url, 0, 'normal', SQL_NUMROWS($result_main));
                } // END - if
        } // END - if
 

diff --git a/inc/mails/bonus_mails.php b/inc/mails/bonus_mails.php
index ed88899d9f5953dc9f50caa4a2b5d844228d6987..a2d715f7ead7a94bba2b33e88c61b83f20ac4c8d 100644 (file)
--- a/inc/mails/bonus_mails.php
+++ b/inc/mails/bonus_mails.php
@@ -127,10 +127,10 @@ LIMIT 1",
                        $receiver = implode(';', $userids);
 
                        // Prepare URL
-                       $URL = 'modules.php?module=index&what=login';
+                       $url = 'modules.php?module=index&what=login';
 
                        // Insert mail
-                       addBonusMailToQueue($subject, $message, $receiver, getConfig('bonus_notify_points'), getConfig('bonus_notify_wait'), $URL, 0, 'normal', SQL_NUMROWS($result_main));
+                       addBonusMailToQueue($subject, $message, $receiver, getConfig('bonus_notify_points'), getConfig('bonus_notify_wait'), $url, 0, 'normal', SQL_NUMROWS($result_main));
                } // END - if
        } // END - if
 

diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index 7822bf081ffafcc12e37c2c6716ded7d0f16f7e7..f798980ef65caba77bd40755dd7a1d79cd81d907 100644 (file)
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -229,7 +229,7 @@ if (!isAdminRegistered()) {
                switch ($ret) {
                        case 'done': // Admin and password are okay, so we log in now
                                // Construct URL and redirect
-                               $URL = 'modules.php?module=admin&';
+                               $url = 'modules.php?module=admin&';
 
                                // Rewrite overview module
                                if (getWhat() == 'overview') {
@@ -237,12 +237,12 @@ if (!isAdminRegistered()) {
                                } // END - if
 
                                // Add data to URL
-                               if (isWhatSet())        $URL .= 'what='.getWhat();
-                                elseif (isActionSet()) $URL .= 'action='.getAction();
-                                elseif (isGetRequestParameterSet('area'))  $URL .= 'area='.getRequestParameter('area');
+                               if (isWhatSet())        $url .= 'what='.getWhat();
+                                elseif (isActionSet()) $url .= 'action='.getAction();
+                                elseif (isGetRequestParameterSet('area'))  $url .= 'area='.getRequestParameter('area');
 
                         // Load URL
-                        redirectToUrl($URL);
+                        redirectToUrl($url);
                         break;
 
                        case '404': // Administrator login not found
@@ -312,7 +312,13 @@ if (!isAdminRegistered()) {
                        }
                } elseif (isGetRequestParameterSet('area')) {
                        // Restore old area value
-                       $content = merge_array($content, array('target' => 'area', 'value' => getRequestParameter('area')));
+                       $content = merge_array(
+                               $content,
+                               array(
+                                       'target' => 'area',
+                                       'value'  => getRequestParameter('area')
+                               )
+                       );
                } else {
                        // Set default values
                        $content = merge_array($content, array('target' => 'action', 'value' => 'login'));

diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php
index 46b470a6be5a9eef0b42915083d6cf3271f2f4d6..a6e033567a2374c6f2b854cdec95287ecc7ec46e 100644 (file)
--- a/inc/modules/admin/overview-inc.php
+++ b/inc/modules/admin/overview-inc.php
@@ -294,7 +294,7 @@ LIMIT 1",
                                                        ));
                                                } else {
                                                        // Task is closed so nothing is todo
-                                                       $OUT .= '<div class="admin_failed">{--ADMIN_EXT_ALREADY_REGISTERED--}</div>';
+                                                       $OUT .= '<div class="admin_failed">{--ADMIN_EXTENSION_ALREADY_REGISTERED--}</div>';
 
                                                        // Close task but not already closed, solved, deleted or update tasks
                                                        if ((!in_array($taskData['status'], array('CLOSED','DELETED','SOLVED'))) && ($taskData['task_type'] != 'EXTENSION_UPDATE')) {

diff --git a/inc/modules/admin/what-add_points.php b/inc/modules/admin/what-add_points.php
index f3465c23017eb1cecaa1e8dada4eecba212d2638..5d31043b18b6b9e079c97bedc325903a37138a22 100644 (file)
--- a/inc/modules/admin/what-add_points.php
+++ b/inc/modules/admin/what-add_points.php
@@ -117,7 +117,7 @@ if (getRequestParameter('userid') == 'all') {
                }
        } else {
                // User not found!
-               loadTemplate('admin_settings_saved', false, '<div class="admin_failed">' . getMaskedMessage('ADMIN_MEMBER_404', getRequestParameter('userid')) . '</div>');
+               loadTemplate('admin_settings_saved', false, '<div class="admin_failed">' . getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))) . '</div>');
        }
 } else {
        // Output selection form with all confirmed user accounts listed

diff --git a/inc/modules/admin/what-config_payouts.php b/inc/modules/admin/what-config_payouts.php
index f9a6ed4a5cf7a91784c397cfde7f252fb3e66196..f92bfb20e1708ee2082b5ac3094d69d7b2330307 100644 (file)
--- a/inc/modules/admin/what-config_payouts.php
+++ b/inc/modules/admin/what-config_payouts.php
@@ -99,16 +99,19 @@ if ((isFormSent('edit')) && (countPostSelection() > 0)) {
                        if ((isPostRequestParameterSet('title', $id)) && (postRequestParameter('rate', $id) > 0)) {
                                // Update entry
                                addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_payout_types` SET
-type='%s',
-rate=%s,
-min_points=%s,
-allow_url='%s'
-WHERE `id`='".$id."' LIMIT 1",
+       type='%s',
+       rate=%s,
+       min_points=%s,
+       allow_url='%s'
+WHERE
+       `id`=%s
+LIMIT 1",
                                array(
                                        postRequestParameter('title', $id),
                                        convertCommaToDot(postRequestParameter('rate', $id)),
                                        convertCommaToDot(postRequestParameter('min_points' , $id)),
                                        postRequestParameter('allow', $id),
+                                       bigintval($id)
                                ),__FILE__, __LINE__, false));
                        }
                }

diff --git a/inc/modules/admin/what-del_user.php b/inc/modules/admin/what-del_user.php
index d533515a6a066a16b828254a3c4bcf0ced5f0aa7..17973ef9d844f3b3da4e9a5dadf92e9395e4e704 100644 (file)
--- a/inc/modules/admin/what-del_user.php
+++ b/inc/modules/admin/what-del_user.php
@@ -56,7 +56,7 @@ if ((isFormSent()) || ((isFormSent('del')) && (isPostRequestParameterSet(('reaso
                loadTemplate('admin_settings_saved', false, getMessage('ADMIN_DEL_COMPLETED'));
        } else {
                // Account does not exists!
-               loadTemplate('admin_settings_saved', false, '<div class="admin_failed">' . getMaskedMessage('ADMIN_MEMBER_404', getRequestParameter('userid')) . '</div>');
+               loadTemplate('admin_settings_saved', false, '<div class="admin_failed">' . getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))) . '</div>');
        }
 } elseif (isPostRequestParameterSet('no')) {
        // Do not delete him...
@@ -72,16 +72,16 @@ if ((isFormSent()) || ((isFormSent('del')) && (isPostRequestParameterSet(('reaso
                        'email'   => generateEmailLink(getUserData('email'), 'user_data'),
                        'surname' => getUserData('surname'),
                        'family'  => getUserData('family'),
-                       'header'  => getMaskedMessage('ADMIN_HEADER_DEL_ACCOUNT', getRequestParameter('userid')),
-                       'text'    => getMaskedMessage('ADMIN_TEXT_DEL_ACCOUNT', getRequestParameter('userid')),
-                       'userid'  => getRequestParameter('userid')
+                       'header'  => getMaskedMessage('ADMIN_HEADER_DEL_ACCOUNT', bigintval(getRequestParameter('userid'))),
+                       'text'    => getMaskedMessage('ADMIN_TEXT_DEL_ACCOUNT', bigintval(getRequestParameter('userid'))),
+                       'userid'  => bigintval(getRequestParameter('userid'))
                );
 
                // Display form
                loadTemplate('admin_del_user', false, $content);
        } else {
                // Account does not exists!
-               loadTemplate('admin_settings_saved', false, '<div class="admin_failed">' . getMaskedMessage('ADMIN_MEMBER_404', getRequestParameter('userid')) . '</div>');
+               loadTemplate('admin_settings_saved', false, '<div class="admin_failed">' . getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))) . '</div>');
        }
 }
 

diff --git a/inc/modules/admin/what-edit_user.php b/inc/modules/admin/what-edit_user.php
index 9beed352b6fbe974f3c66c7f848f6b8cb039a244..a9acd58ae12661378ace2c814c3d265ec1ac1a1b 100644 (file)
--- a/inc/modules/admin/what-edit_user.php
+++ b/inc/modules/admin/what-edit_user.php
@@ -136,7 +136,7 @@ LIMIT 1",
        }
 } else {
        // Account does not exists!
-       loadTemplate('admin_settings_saved', false, '<div class="admin_failed">' . getMaskedMessage('ADMIN_MEMBER_404', getRequestParameter('userid')) . '</div>');
+       loadTemplate('admin_settings_saved', false, '<div class="admin_failed">' . getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))) . '</div>');
 }
 
 // Free the result

diff --git a/inc/modules/admin/what-extensions.php b/inc/modules/admin/what-extensions.php
index d762d360882016b93ae46d21fff33296edc50bac..965bc1f8bd0596947ee5bcf40f27a72a16661948 100644 (file)
--- a/inc/modules/admin/what-extensions.php
+++ b/inc/modules/admin/what-extensions.php
@@ -63,13 +63,16 @@ if (isGetRequestParameterSet('reg_ext')) {
                        // De/activate extension
                        $ACT = 'N'; setExtensionMode('deactivate');
                        if ($active != 'Y') { $ACT = 'Y'; setExtensionMode('activate'); }
-                       SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_extensions` SET `ext_active`='".$ACT."' WHERE `id`=%s AND `ext_active`='%s' LIMIT 1",
-                               array(bigintval($ext_id), $active), __FILE__, __LINE__);
+                       SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_extensions` SET `ext_active`='%s' WHERE `id`=%s AND `ext_active`='%s' LIMIT 1",
+                               array($ACT, bigintval($ext_id), $active), __FILE__, __LINE__);
 
                        // Run embeded SQL commands
                        doExtensionSqls($ext_id, getExtensionMode());
                }
-       }
+       } // END - foreach
+
+       // Redirect to prevent missing cache in js.php
+       redirectToUrl('modules.php?module=admin&what=extensions&changed=' . countPostSelection());
 } elseif (((isFormSent('edit')) || (isPostRequestParameterSet('modify'))) && (countPostSelection() > 0) && (!isDemoModeActive())) {
        // Change settings like CSS file load
        if (isPostRequestParameterSet('modify')) {
@@ -109,8 +112,8 @@ if (isGetRequestParameterSet('reg_ext')) {
                        }
                }
 
-               // Extensions changed
-               loadTemplate('admin_settings_saved', false, getMessage('ADMIN_EXT_CHANGED'));
+               // Redirect to prevent missing cache in js.php
+               redirectToUrl('modules.php?module=admin&what=extensions&edited=' . countPostSelection());
        } else {
                // Edit selected entries
                $SW = 2; $OUT = '';
@@ -224,14 +227,23 @@ if (isGetRequestParameterSet('reg_ext')) {
                } // END - if
        } // END - foreach
 
-       // Extensions removed
-       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_EXTENSIONS_REMOVED', countPostSelection()));
+       // Redirect to prevent missing cache in js.php
+       redirectToUrl('modules.php?module=admin&what=extensions&removed=' . countPostSelection());
 } elseif ((isGetRequestParameterSet('do')) && (!isDemoModeActive())) {
        // Other things to do
        $do = SQL_ESCAPE(secureString(getRequestParameter('do')));
 } elseif (isGetRequestParameterSet('do')) {
        // Demo mode active!
        $do = 'demo';
+} elseif (isGetRequestParameterSet('changed')) {
+       // Extensions changed
+       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_EXTENSION_CHANGED', bigintval(getRequestParameter('changed'))));
+} elseif (isGetRequestParameterSet('edited')) {
+       // Extensions changed
+       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_EXTENSION_EDITED', bigintval(getRequestParameter('edited'))));
+} elseif (isGetRequestParameterSet('removed')) {
+       // Extensions changed
+       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_EXTENSIONS_REMOVED', bigintval(getRequestParameter('removed'))));
 }
 
 // Shall we display active/inactive extensions?
@@ -333,12 +345,12 @@ ORDER BY `ext_name` ASC", __FILE__, __LINE__);
                                                        if (isExtensionActive('task')) {
                                                                loadTemplate('admin_next_link', false, array(
                                                                        'url'   => 'modules.php?module=admin&what=list_task',
-                                                                       'title' => getMessage('ADMIN_EXT_REGISTER_NEXT_LINK')
+                                                                       'title' => getMessage('ADMIN_EXTENSION_REGISTER_NEXT_LINK')
                                                                ));
                                                        } else {
                                                                loadTemplate('admin_next_link', false, array(
                                                                        'url'   => 'modules.php?module=admin',
-                                                                       'title' => getMessage('ADMIN_EXT_REGISTER_NEXT_LINK')
+                                                                       'title' => getMessage('ADMIN_EXTENSION_REGISTER_NEXT_LINK')
                                                                ));
                                                        }
                                                } else {
@@ -382,7 +394,7 @@ ORDER BY `ext_name` ASC", __FILE__, __LINE__);
        case 'demo':
                loadTemplate('admin_settings_saved', false, getMessage('SETTINGS_NOT_SAVED'));
                break;
-}
+} // END - switch
 
 // [EOF]
 ?>

diff --git a/inc/modules/admin/what-list_country.php b/inc/modules/admin/what-list_country.php
index 4407bc58ccd15a0ce08d74d6329f431c55326c7a..d4f2fbdddc860486b7a26168d7a5f13e157c525d 100644 (file)
--- a/inc/modules/admin/what-list_country.php
+++ b/inc/modules/admin/what-list_country.php
@@ -152,7 +152,7 @@ if ((isFormSent('add')) && (isPostRequestParameterSet('code')) && (isPostRequest
        if ((isPostRequestParameterSet('modify')) && (isPostRequestParameterSet('id'))) {
                // Modify
                foreach (postRequestParameter('id') as $id => $sel) {
-                       addSql("UPDATE `{?_MYSQL_PREFIX?}_countries` SET `code`='".postRequestParameter('code', $id)."', `descr`='".postRequestParameter('descr', $id)."', `is_active`='".postRequestParameter('is_active', $id)."' WHERE `id`='".$id."' LIMIT 1");
+                       addSql("UPDATE `{?_MYSQL_PREFIX?}_countries` SET `code`='" . postRequestParameter('code', $id) . "', `descr`='" . postRequestParameter('descr', $id) . "', `is_active`='" . postRequestParameter('is_active', $id) . "' WHERE `id`=" . bigintval($id) . " LIMIT 1");
                }
 
                // Create message

diff --git a/inc/modules/admin/what-list_links.php b/inc/modules/admin/what-list_links.php
index 60b4e041b6240e0ab516bcc214c331397f6d8811..c74ec6ca251d8fe92d689a43a6b8779057064f39 100644 (file)
--- a/inc/modules/admin/what-list_links.php
+++ b/inc/modules/admin/what-list_links.php
@@ -167,11 +167,11 @@ if (isGetRequestParameterSet('userid')) {
                        }
                } else {
                        // No mails left to confirm
-                       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_MEMBER_LINKS', getRequestParameter('userid')));
+                       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_MEMBER_LINKS', bigintval(getRequestParameter('userid'))));
                }
        } else {
                // User not found
-               loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_MEMBER_404', getRequestParameter('userid')));
+               loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))));
        }
 } else {
        // Output selection form with all confirmed user accounts listed

diff --git a/inc/modules/admin/what-list_network_params.php b/inc/modules/admin/what-list_network_params.php
index 65a55abe35eb088493d28ca503bc1360a87a02cd..93fcab6108ae4c74c5d6ee878a0ca9fc49007c2c 100644 (file)
--- a/inc/modules/admin/what-list_network_params.php
+++ b/inc/modules/admin/what-list_network_params.php
@@ -78,7 +78,7 @@ if (isGetRequestParameterSet('network')) {
                $ADD = sprintf(" AND p.`network_type_id`=%s", bigintval(postRequestParameter('network_type_id')));
 
                // Display message
-               loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NETWORK_REQUEST_PARAMS_LIST_LIMITED_TO_TYPE'));
+               loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NETWORK_REQUEST_PARAMETER_LIST_LIMITED_TO_TYPE'));
        } // END - if
 
        // Load all advert types for given network
@@ -122,7 +122,7 @@ ORDER BY
                // Prepare data for template
                $content = array(
                        'rows'            => $OUT,
-                       'network_id'      => getRequestParameter('network'),
+                       'network_id'      => bigintval(getRequestParameter('network')),
                        'network_title'   => $networkData['network_title'],
                        'network_reflink' => $networkData['network_reflink'],
                );
@@ -131,18 +131,12 @@ ORDER BY
                loadTemplate('admin_list_network_params', false, $content);
        } else {
                // No entries found
-               loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_REQUEST_PARAMS_404', $networkData['network_title']));
+               loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_REQUEST_PARAMETER_404', $networkData['network_title']));
        }
 
        // Free result
        SQL_FREERESULT($result);
 
-       // Add options list for network type
-       $networkData['type_options'] = generateNetworkTypeOptions(postRequestParameter('network_type_id'));
-
-       // Add options for parameter keys
-       $networkData['key_options'] = generateNetworkRequestKeyOptions('');
-
        // Add form for adding new params
        loadTemplate('admin_add_network_params', false, $networkData);
 } else {

diff --git a/inc/modules/admin/what-list_network_types.php b/inc/modules/admin/what-list_network_types.php
index ce118a8891e10151f335fef9f3207ac6591b4989..c5a01a4b2998a8526e54c31c60e83b2594f52abe 100644 (file)
--- a/inc/modules/admin/what-list_network_types.php
+++ b/inc/modules/admin/what-list_network_types.php
@@ -102,7 +102,7 @@ ORDER BY
                // Prepare data for template
                $content = array(
                        'rows'            => $OUT,
-                       'network_id'      => getRequestParameter('network'),
+                       'network_id'      => bigintval(getRequestParameter('network')),
                        'network_title'   => $networkData['network_title'],
                        'network_reflink' => $networkData['network_reflink'],
                );

diff --git a/inc/modules/admin/what-list_notifications.php b/inc/modules/admin/what-list_notifications.php
index 07d001c71e11a62b517db514682e1ba4c8fff267..c337999dbb34aa3be46bb58a87e2c6cfea953e45 100644 (file)
--- a/inc/modules/admin/what-list_notifications.php
+++ b/inc/modules/admin/what-list_notifications.php
@@ -65,7 +65,7 @@ ORDER BY timestamp DESC";
        $result_max = SQL_QUERY($SQL2, __FILE__, __LINE__);
 } else {
        // Bonus extension required!
-       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_EXTENSION_PROBLEM_EXT_NOT_INSTALLED', 'bonus'));
+       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_EXTENSION_PROBLEM_EXTENSION_NOT_INSTALLED', 'bonus'));
 }
 
 // Create limitation line

diff --git a/inc/modules/admin/what-list_payouts.php b/inc/modules/admin/what-list_payouts.php
index 1d56c3a78563ba931c12840f151e33f34551d9aa..00a5e0b55da43c9c39006389faf72aa110ea0b2d 100644 (file)
--- a/inc/modules/admin/what-list_payouts.php
+++ b/inc/modules/admin/what-list_payouts.php
@@ -48,15 +48,15 @@ addMenuDescription('admin', __FILE__);
 if (isGetRequestParameterSet(('pid'))) {
        // First let's get the member's id
        $result = SQL_QUERY_ESC("SELECT userid, target_account, payout_total, payout_timestamp, password FROM `{?_MYSQL_PREFIX?}_user_payouts` WHERE `id`=%s LIMIT 1",
-       array(getRequestParameter('pid')), __FILE__, __LINE__);
+               array(getRequestParameter('pid')), __FILE__, __LINE__);
        list($userid, $tuserid, $points, $tstamp, $tpass) = SQL_FETCHROW($result);
        SQL_FREERESULT($result);
 
        // Obtain some data
        if (!isGetRequestParameterSet(('task')) && (!empty($userid)) && ($userid > 0)) {
                // Get task id from database
-               $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_task_system` WHERE `userid`=%s AND `task_type`='PAYOUT_REQUEST' AND task_created='".$tstamp."' LIMIT 1",
-               array(bigintval($userid)), __FILE__, __LINE__);
+               $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_task_system` WHERE `userid`=%s AND `task_type`='PAYOUT_REQUEST' AND `task_created`=%s LIMIT 1",
+                       array(bigintval($userid), bigintval($tstamp)), __FILE__, __LINE__);
                list($task) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
                if (empty($task)) $task = '0';
@@ -111,7 +111,7 @@ LIMIT 1",
                                                }
 
                                                // Transfer variables...
-                                               $eval = '$URL = "' . $eurl . '";';
+                                               $eval = '$url = "' . $eurl . '";';
                                                $reason = encodeString(getMessage('PAYOUT_REASON_PAYOUT'), false);
 
                                                // Run code...
@@ -119,7 +119,7 @@ LIMIT 1",
                                                eval($eval);
 
                                                // Execute transfer
-                                               $ret = sendGetRequest($URL);
+                                               $ret = sendGetRequest($url);
                                        } else {
                                                // No URL to run
                                                $ret[0] = $eok;

diff --git a/inc/modules/admin/what-list_rallyes.php b/inc/modules/admin/what-list_rallyes.php
index 302932926398558cdda6b596714e4256e784578d..d6bb58f5f338f1f5c1801f1ed01ebdfc63a25ba6 100644 (file)
--- a/inc/modules/admin/what-list_rallyes.php
+++ b/inc/modules/admin/what-list_rallyes.php
@@ -230,7 +230,7 @@ LIMIT 1",
                loadTemplate('admin_edit_rallyes', false, $OUT);
        } else {
                // Nothing selected to edit
-               loadTemplate('admin_settings_saved', false, loadTemplate('admin_list_rallye_noselect', true));
+               loadTemplate('admin_settings_saved', false, getMessage('RALLYE_NO_RALLYES_SELECTED'));
        }
 } elseif ((getRequestParameter('sub') == 'users') && (getRequestParameter('rallye') > 0)) {
        // List users and their refs before start and current

diff --git a/inc/modules/admin/what-list_sponsor.php b/inc/modules/admin/what-list_sponsor.php
index e1cb35fec691266c692ddd4effa0cc3a47a200c1..51d355d9993ae72532454a4a45394219e933952e 100644 (file)
--- a/inc/modules/admin/what-list_sponsor.php
+++ b/inc/modules/admin/what-list_sponsor.php
@@ -96,7 +96,7 @@ WHERE `id`='%s' LIMIT 1",
                loadTemplate('admin_list_sponsor_details', false, $content);
        } else {
                // Sponsor not found
-               loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_SPONSOR_404', getRequestParameter('id')));
+               loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_SPONSOR_404', bigintval(getRequestParameter('id'))));
        }
 } elseif (isGetRequestParameterSet('rid')) {
        // Search for sponsor

diff --git a/inc/modules/admin/what-list_wernis.php b/inc/modules/admin/what-list_wernis.php
index b0bc87244623fd8ab84ecfaaa681b108e4585d95..9ef5489abbc2546fc64bc76616e13b7eefb1babb 100644 (file)
--- a/inc/modules/admin/what-list_wernis.php
+++ b/inc/modules/admin/what-list_wernis.php
@@ -40,7 +40,7 @@
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!isAdmin())) {
        die();
-}
+} // END - if
 
 // Add description as navigation point
 addMenuDescription('admin', __FILE__);
@@ -62,11 +62,7 @@ if (SQL_NUMROWS($result) > 0) {
        while ($content = SQL_FETCHARRAY($result)) {
                // Translate some data and add color
                $content['sw']               = $SW;
-               $content['link']             = generateUserProfileLink($content['userid']);
-               $content['wernis_amount']    = translateComma($content['wernis_amount']);
                $content['wernis_timestamp'] = generateDateTime($content['wernis_timestamp'], 2);
-               $content['raw_type']         = strtolower($content['wernis_type']);
-               $content['wernis_type']      = WERNIS_TRANSFER_STATUS($content['wernis_type']);
 
                // Fix empty message and status
                if (empty($content['wernis_api_message'])) $content['wernis_api_message'] = '---';

diff --git a/inc/modules/admin/what-lock_user.php b/inc/modules/admin/what-lock_user.php
index 1f334602c0f38dfbbfb66387d57802cd53f2fe9a..f91f2aedd4e6126dc03cefe6465ee6c5151bc326 100644 (file)
--- a/inc/modules/admin/what-lock_user.php
+++ b/inc/modules/admin/what-lock_user.php
@@ -75,7 +75,7 @@ if (isGetRequestParameterSet('userid')) {
                        } // END - if
 
                        // Prepare message
-                       $message = getMaskedMessage('USER_ACCOUNT_LOCKED', getRequestParameter('userid'));
+                       $message = getMaskedMessage('USER_ACCOUNT_LOCKED', bigintval(getRequestParameter('userid')));
                        $ACT = true;
                } elseif ((isPostRequestParameterSet('unlock')) && (getUserData('status') == 'LOCKED')) {
                        // Ok, unlock the account!
@@ -110,7 +110,7 @@ LIMIT 1",
                        } // END - if
 
                        // Prepare message
-                       $message = getMaskedMessage('USER_ACCOUNT_UNLOCKED', getRequestParameter('userid'));
+                       $message = getMaskedMessage('USER_ACCOUNT_UNLOCKED', bigintval(getRequestParameter('userid')));
                        $ACT = true;
                } elseif (isFormSent('del')) {
                        // Delete the account
@@ -118,19 +118,15 @@ LIMIT 1",
                        loadIncludeOnce('inc/modules/admin/what-del_user.php');
                } elseif (isPostRequestParameterSet('no')) {
                        // Do not lock him...
-                       $URL = adminCreateUserLink(getRequestParameter('userid'));
+                       $url = adminCreateUserLink(getRequestParameter('userid'));
                } else {
                        // Load user data we need
                        if (fetchUserData(getRequestParameter('userid'))) {
                                // Transfer data to constants for the template
-                               $content['email']   = generateEmailLink(getUserData('email'), 'user_data');
-                               $content['surname'] = getUserData('surname');
-                               $content['family']  = getUserData('family');
-                               $content['status']  = getUserData('status');
-                               $content['userid']  = bigintval(getRequestParameter('userid'));
+                               $content['userid']  = getRequestParameter('userid');
 
                                // Realy want to lock?
-                               switch ($content['status']) {
+                               switch (getUserData('status')) {
                                        case 'CONFIRMED': // Yes, lock him down... ;-)
                                                $content['ok']     = 'lock';
                                                $content['header'] = getMaskedMessage('ADMIN_HEADER_LOCK_ACCOUNT', $content['userid']);
@@ -150,32 +146,29 @@ LIMIT 1",
                                                break;
                                }
 
-                               // Translate user status
-                               $content['status'] = translateUserStatus($content['status']);
-
                                // Output form
                                loadTemplate('admin_lock_user', false, $content);
                        } else {
                                // Account does not exists!
-                               loadTemplate('admin_settings_saved', false, '<div class="admin_failed">' . getMaskedMessage('ADMIN_MEMBER_404', getRequestParameter('userid')) . '</div>');
+                               loadTemplate('admin_settings_saved', false, '<div class="admin_failed">' . getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))) . '</div>');
                        }
                }
 
                // Is an URL set?
-               if (!empty($URL)) {
+               if (!empty($url)) {
                        // Reload and die...
-                       redirectToUrl($URL);
+                       redirectToUrl($url);
                } elseif ($ACT) {
                        // An action was performed...
                        if (!empty($message)) {
                                loadTemplate('admin_settings_saved', false, '<div class="admin_failed">' . $message . '</div>');
                        } else {
-                               loadTemplate('admin_settings_saved', false, '<div class="admin_failed">' . getMessage('ADMIN_USER_UPDATED') . '</div>');
+                               loadTemplate('admin_settings_saved', false, '<div class="admin_failed">{--ADMIN_USER_UPDATED--}</div>');
                        }
                }
        } else {
                // Account does not exists!
-               loadTemplate('admin_settings_saved', false, '<div class="admin_failed">' . getMaskedMessage('ADMIN_MEMBER_404', getRequestParameter('userid')) . '</div>');
+               loadTemplate('admin_settings_saved', false, '<div class="admin_failed">' . getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))) . '</div>');
        }
 } else {
        // List all users

diff --git a/inc/modules/admin/what-memedit.php b/inc/modules/admin/what-memedit.php
index ac894ac23a9de0c5ddfe6b30ef639de221d4825c..3194832be964010a38f295f873cbbe7bb8aadee6 100644 (file)
--- a/inc/modules/admin/what-memedit.php
+++ b/inc/modules/admin/what-memedit.php
@@ -183,8 +183,11 @@ if ((isFormSent('edit')) && (countPostSelection() > 0) && (!isDemoModeActive()))
        // An act is done...
        foreach (postRequestParameter('sel') as $sel => $menu) {
                $AND = "(`what` = '' OR `what` IS NULL)";
+
                $sel = bigintval($sel);
-               if (!empty($SUB)) $AND = "`action`='".$SUB."'";
+
+               if (!empty($SUB)) $AND = "`action`='" . $SUB . "'";
+
                switch (postRequestParameter('ok')) {
                        case 'edit': // Edit menu
                                SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `title`='%s', `action`='%s', `what`='%s' WHERE ".$AND." AND `id`=%s LIMIT 1",

diff --git a/inc/modules/admin/what-overview.php b/inc/modules/admin/what-overview.php
index 80b1d4f7314a1b6419c7ab81eeece844b6528b32..54c22b15194a2eda302c09801037202446dfa544 100644 (file)
--- a/inc/modules/admin/what-overview.php
+++ b/inc/modules/admin/what-overview.php
@@ -94,8 +94,8 @@ if (!ifAdminMenuHasEntries(getAction())) {
 } elseif ($taskExt === false) {
        if (isExtensionActive('task')) {
                // Output warning message
-               loadTemplate('admin_settings_saved', false, getMaskedMessage('EXTENSION_WARNING_EXT_INACTIVE', 'task'));
-       }
+               loadTemplate('admin_settings_saved', false, getMaskedMessage('EXTENSION_WARNING_EXTENSION_INACTIVE', 'task'));
+       } // END - if
 
        // List selected tasks on overview when task management is not active
        outputSeletectedTasks(postRequestArray(), $result_tasks);

diff --git a/inc/modules/admin/what-payments.php b/inc/modules/admin/what-payments.php
index f139aa4de75890be9caf0a3744efb568b12db31e..8de522a367b76e695a5a096bbb7edf2b858bfd7b 100644 (file)
--- a/inc/modules/admin/what-payments.php
+++ b/inc/modules/admin/what-payments.php
@@ -66,13 +66,13 @@ if (isFormSent()) {
 
                case 'edit':
                        foreach (postRequestParameter('time') as $id => $value) {
-                               addSql("UPDATE `{?_MYSQL_PREFIX?}_payments` SET time='".$value."', payment='".postRequestParameter('pay', $id)."', price='".postRequestParameter('price', $id)."', mail_title='".postRequestParameter('title', $id)."' WHERE `id`='".$id."' LIMIT 1");
+                               addSql("UPDATE `{?_MYSQL_PREFIX?}_payments` SET `time`='" . $value . "', `payment`='".postRequestParameter('pay', $id)."', price='".postRequestParameter('price', $id)."', mail_title='".postRequestParameter('title', $id)."' WHERE `id`='".$id."' LIMIT 1");
                        }
                        break;
 
                case 'del':
                        foreach (postRequestParameter('id') as $id => $value) {
-                               addSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_payments` WHERE `id`='".$id."' LIMIT 1");
+                               addSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_payments` WHERE `id`=" . bigintval($id) . " LIMIT 1");
                        }
                        break;
        } // END - switch

diff --git a/inc/modules/admin/what-repair_gmnu.php b/inc/modules/admin/what-repair_gmnu.php
index d2d4a027c8b44c1d1b46269903f7c1c8eebe7331..63a9f4413ce8cc675bed9770b46e1fb78871be41 100644 (file)
--- a/inc/modules/admin/what-repair_gmnu.php
+++ b/inc/modules/admin/what-repair_gmnu.php
@@ -54,7 +54,10 @@ while ($content = SQL_FETCHARRAY($result_fix)) {
        $ACTIONS[] = $content['action'];
 
        // Fix weight
-       $result_sort = SQL_QUERY("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET sort='".$cnt."' WHERE `id`='".$content['id']."' LIMIT 1", __FILE__, __LINE__);
+       $result_sort = SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `sort`='%s WHERE `id`=%s' LIMIT 1",
+               array($cnt, $content['id']), __FILE__, __LINE__);
+
+       // Get updated rows
        $REP += SQL_AFFECTEDROWS();
 
        // Count one up
@@ -67,7 +70,7 @@ $result_sort = SQL_QUERY("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET sort='999' W
 // Now sort every each menu
 foreach ($ACTIONS as $action) {
        $result_fix = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_guest_menu` WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort`",
-       array($action), __FILE__, __LINE__);
+               array($action), __FILE__, __LINE__);
        $cnt = 1;
        while ($content = SQL_FETCHARRAY($result_fix)) {
                // Fix weight

diff --git a/inc/modules/admin/what-send_newsletter.php b/inc/modules/admin/what-send_newsletter.php
index 6db44f6c4373fbbbe794b26a4846e2c4781f7695..22c3685833d5cbc586f4cb32bb3c0ea47b57ca10 100644 (file)
--- a/inc/modules/admin/what-send_newsletter.php
+++ b/inc/modules/admin/what-send_newsletter.php
@@ -70,21 +70,21 @@ ORDER BY
                        }
 
                        // Compile message
-                       setPostRequestParameter('text', compileCode(postRequestParameter('text')));
+                       setPostRequestParameter('text', preCompileCode(postRequestParameter('text')));
 
                        // Load template
                        $message = loadEmailTemplate($template, array('text' => postRequestParameter('text')), $content['userid']);
 
                        // ... and send it away!
                        sendNewsletter($content['email'], postRequestParameter('subject'), $message, postRequestParameter('mode'));
-               }
-
-               // Free memory
-               SQL_FREERESULT($result);
+               } // END - while
 
                // Output message
                loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NL_SEND_DONE'));
-       }
+       } // END - if
+
+       // Free memory
+       SQL_FREERESULT($result);
 } else {
        // Copy data into constants for the template and load it
        $content['datestamp'] = generateDateTime(time(), 3);

diff --git a/inc/modules/admin/what-sub_points.php b/inc/modules/admin/what-sub_points.php
index 9667e9be6a20fc4f173d29470c3394ac31898085..4b72569767e18fde12ad0aea6819e9559d2029b5 100644 (file)
--- a/inc/modules/admin/what-sub_points.php
+++ b/inc/modules/admin/what-sub_points.php
@@ -109,7 +109,7 @@ if (getRequestParameter('userid') == 'all') {
                }
        } else {
                // User not found!
-               loadTemplate('admin_settings_saved', false, '<div class="admin_failed">' . getMaskedMessage('ADMIN_MEMBER_404', getRequestParameter('userid')) . '</div>');
+               loadTemplate('admin_settings_saved', false, '<div class="admin_failed">' . getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))) . '</div>');
        }
 } else {
        // Output selection form with all confirmed user accounts listed

diff --git a/inc/modules/admin/what-surfbar_stats.php b/inc/modules/admin/what-surfbar_stats.php
index 54ff5df476f48c92f282f3778132f8dd43861973..62a5ca2c7351ab76fccdcf423746a8feaef1da99 100644 (file)
--- a/inc/modules/admin/what-surfbar_stats.php
+++ b/inc/modules/admin/what-surfbar_stats.php
@@ -109,10 +109,10 @@ ORDER BY
        // Entries found?
        if (SQL_NUMROWS($result) > 0) {
                // Get all rows
-               $OUT = ''; $SW = 2; $urls = '0'; $visits = '0';
+               $OUT = ''; $SW = 2; $urlArray = '0'; $visits = '0';
                while ($content = SQL_FETCHARRAY($result)) {
                        // Count totals
-                       $urls   += $content['visited_urls'];
+                       $urlArray   += $content['visited_urls'];
                        $visits += $content['total_visits'];
 
                        // "Translate" some data
@@ -130,7 +130,7 @@ ORDER BY
                // Prepare content
                $content = array(
                        'rows'   => $OUT,
-                       'urls'   => $urls,
+                       'urls'   => $urlArray,
                        'visits' => $visits
                );
 

diff --git a/inc/modules/admin/what-theme_check.php b/inc/modules/admin/what-theme_check.php
index 33a1ed803a11d885c689dbd86faa0e8664c8326e..153d93a3a468d14ebef659380640f33a251e51d6 100644 (file)
--- a/inc/modules/admin/what-theme_check.php
+++ b/inc/modules/admin/what-theme_check.php
@@ -89,7 +89,7 @@ if (($response[count($response) - 1] == '[EOF]') && ($response[0] != '[EOF]')) {
                                // Extract language strings from reponse
                                $langDummy = explode('[nl]', $response[$idx + 4]);
                                $languages = array();
-                               $themeInfo = getMessage('ADMIN_EXT_NO_INFO_FOUND');
+                               $themeInfo = getMessage('ADMIN_EXTENSION_NO_INFO_FOUND');
 
                                // Trim every data line
                                foreach ($langDummy as $k => $v) {

diff --git a/inc/modules/admin/what-theme_edit.php b/inc/modules/admin/what-theme_edit.php
index a76d8e46e61ebad61742fe4a827ae04a532005b7..04b637aa35a336ac121f96c1e65dde0e821e221e 100644 (file)
--- a/inc/modules/admin/what-theme_edit.php
+++ b/inc/modules/admin/what-theme_edit.php
@@ -59,14 +59,14 @@ if (countPostSelection() > 0) {
                if (isPostRequestParameterSet(('status'))) {
                        // Change status
                        if (postRequestParameter('active', $id) == 'Y') {
-                               $sql = "UPDATE `{?_MYSQL_PREFIX?}_themes` SET theme_active='N' WHERE `id`='".$id."' LIMIT 1";
+                               $sql = "UPDATE `{?_MYSQL_PREFIX?}_themes` SET theme_active='N' WHERE `id`=" . bigintval($id) . " LIMIT 1";
                        } else {
-                               $sql = "UPDATE `{?_MYSQL_PREFIX?}_themes` SET theme_active='Y' WHERE `id`='".$id."' LIMIT 1";
+                               $sql = "UPDATE `{?_MYSQL_PREFIX?}_themes` SET theme_active='Y' WHERE `id`=" . bigintval($id) . " LIMIT 1";
                        }
                        $OUT = getMessage('ADMIN_THEMES_UPDATED');
                } elseif (isFormSent('del')) {
                        // Delete themes
-                       $sql = "DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_themes` WHERE `id`='".$id."' LIMIT 1";
+                       $sql = "DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_themes` WHERE `id`=" . bigintval($id) . " LIMIT 1";
                        $OUT = getMessage('ADMIN_THEMES_DELETED');
                }
 

diff --git a/inc/modules/admin/what-usage.php b/inc/modules/admin/what-usage.php
index 616a72f42d4f478f6101709cd2151f6ca38cecb4..069171dd7126c82688c3cd0661d757ef9cdd13ab 100644 (file)
--- a/inc/modules/admin/what-usage.php
+++ b/inc/modules/admin/what-usage.php
@@ -86,7 +86,7 @@ if (isGetRequestParameterSet('image')) {
 
 if ((!empty($FQFN)) && (isFileReadable($FQFN))) {
        // @TODO This code is double, see loadTemplate() and loadEmailTemplate() in functions.php
-       eval("\$content=\"".SQL_ESCAPE(readFromFile($FQFN))."\";");
+       eval('$content="' . SQL_ESCAPE(readFromFile($FQFN)) . '";');
        // Until here...
 
        // Replace URLs

diff --git a/inc/modules/guest/what-extensions.php b/inc/modules/guest/what-extensions.php
index e3bdb8d0f3ccfd7ae4eb89733ce0a9a4081d79a8..e4b580499b61aac548e2c00eb08bfea2e1a0f063 100644 (file)
--- a/inc/modules/guest/what-extensions.php
+++ b/inc/modules/guest/what-extensions.php
@@ -10,8 +10,8 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Mit uns Punkte erbetteln!                        *
  * -------------------------------------------------------------------- *
- * $Revision:: 1690                                                   $ *
- * $Date:: 2010-01-01 17:04:52 +0100 (Fri, 01 Jan 2010)               $ *
+ * $Revision:: 1794                                                   $ *
+ * $Date:: 2010-05-28 19:55:19 +0200 (Fri, 28 May 2010)               $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author:: quix0r                                                   $ *
  * Needs to be in all Files and every File needs "svn propset           *

diff --git a/inc/modules/guest/what-login.php b/inc/modules/guest/what-login.php
index caa950e645b78557451d185eaf89168301672848..b3e272c6c57a42851b016cc1ce1bcca3f5351138 100644 (file)
--- a/inc/modules/guest/what-login.php
+++ b/inc/modules/guest/what-login.php
@@ -55,7 +55,7 @@ if ((!isExtensionActive('user')) && (!isAdmin())) {
 $errorCode = '0';
 $userid = false;
 $hash = '';
-$URL = '';
+$url = '';
 $add = '';
 
 // Already logged in?
@@ -82,13 +82,13 @@ if ((isMemberIdSet()) && (isSessionVariableSet('u_hash'))) {
 
 if (isMember()) {
        // Login immidiately...
-       $URL = 'modules.php?module=login';
+       $url = 'modules.php?module=login';
 } elseif ((isFormSent()) && ('' . $userid . '' != '' . postRequestParameter('id') . '')) {
        // Invalid input (no nickname extension installed but nickname entered)
        $errorCode = getCode('EXTENSION_PROBLEM');
 } elseif (isFormSent()) {
        // Try the login (see inc/libs/user_functions.php)
-       $URL = doUserLogin(postRequestParameter('id'), postRequestParameter('password'));
+       $url = doUserLogin(postRequestParameter('id'), postRequestParameter('password'));
 } elseif ((isPostRequestParameterSet('new_pass')) && (isset($userid))) {
        // Try the userid/email lookup (see inc/libs/user_functions.php)
        $errorCode = doNewUserPassword(postRequestParameter('email'), $userid);
@@ -134,14 +134,14 @@ if (isExtensionActive('nickname')) {
 }
 
 // Was an URL constructed?
-if (!empty($URL)) {
+if (!empty($url)) {
        // URL was constructed
        if (ifFatalErrorsDetected()) {
                // Handle fatal errors
                runFilterChain('handle_fatal_errors');
        } else {
                // Load URL
-               redirectToUrl($URL);
+               redirectToUrl($url);
        }
 } // END - if
 

diff --git a/inc/modules/guest/what-mediadata.php b/inc/modules/guest/what-mediadata.php
index 0edbaa79cd54937d5f8fb25031eeb30e7194c965..50078e5ade00e38f53b5e1f732222b8ea181f9dd 100644 (file)
--- a/inc/modules/guest/what-mediadata.php
+++ b/inc/modules/guest/what-mediadata.php
@@ -75,9 +75,9 @@ if ($content['user_count'] > 0) {
 $TEST = makeTime(0, 0, 0, $PROJECTED);
 
 if ($TEST > time()) {
-       $content['projected'] = generateDateTime($PROJECTED, 3);
+       $content['projected'] = getMaskedMessage('USER_MT_PROJECTED', generateDateTime($PROJECTED, 3));
 } else {
-       $content['projected'] = getMessage('USER_PROJECTION_UNKNOWN');
+       $content['projected'] = getMaskedMessage('USER_MT_PROJECTED', getMessage('USER_PROJECTION_UNKNOWN'));
 }
 
 // User who can receive mails
@@ -292,10 +292,10 @@ ON t.userid=d.userid",
        $OUT_SPECIAL .= loadTemplate('mediadata_extra_row', true, $data);
 } // END - if
 
-$content['out_extra']      = $OUT_EXTRA;
-$content['out_points']     = $OUT_POINTS;
-$content['out_user']       = $OUT_USER;
-$content['out_special']    = $OUT_SPECIAL;
+$content['out_extra']   = $OUT_EXTRA;
+$content['out_points']  = $OUT_POINTS;
+$content['out_user']    = $OUT_USER;
+$content['out_special'] = $OUT_SPECIAL;
 
 // Patch timespamp
 $content['patch_ctime'] = generateDateTime(getConfig('patch_ctime'), 2);

diff --git a/inc/modules/guest/what-sponsor_login.php b/inc/modules/guest/what-sponsor_login.php
index a20b2e90400f8ddf7e4f3d277be3ba77481a18d6..a9e1c850c633c80e99846938f44a29c1290c430a 100644 (file)
--- a/inc/modules/guest/what-sponsor_login.php
+++ b/inc/modules/guest/what-sponsor_login.php
@@ -76,17 +76,22 @@ LIMIT 1", array(getRequestParameter('hash')), __FILE__, __LINE__);
                // Sponsor found, load his data...
                $data = SQL_FETCHARRAY($result);
 
-               // Translate gender and comma
-               $data['gender']  = translateGender($data['gender']);
-               $data['points'] = translateComma($data['points']);
-               $data['pay']    = translateComma($data['pay']);
-
                // Unconfirmed account or changed email address?
                if ($data['status'] == 'UNCONFIRMED') {
                        // Set account to pending
-                       SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_sponsor_data` SET `status`='PENDING'
-WHERE `id`='%s' AND hash='%s' AND `status`='UNCONFIRMED' LIMIT 1",
-                       array(bigintval($data['id']), getRequestParameter('hash')), __FILE__, __LINE__);
+                       SQL_QUERY_ESC("UPDATE
+       `{?_MYSQL_PREFIX?}_sponsor_data`
+SET
+       `status`='PENDING'
+WHERE
+       `id`=%s AND
+       hash='%s' AND
+       `status`='UNCONFIRMED'
+LIMIT 1",
+                               array(
+                                       bigintval($data['id']),
+                                       getRequestParameter('hash')
+                               ), __FILE__, __LINE__);
 
                        // Check on success
                        if (SQL_AFFECTEDROWS() == 1) {
@@ -155,7 +160,6 @@ WHERE email='%s' AND (`status`='UNCONFIRMED' OR `status`='EMAIL') LIMIT 1",
                        $data = SQL_FETCHARRAY($result);
 
                        // Translate some data
-                       $data['gender']          = translateGender($data['gender']);
                        $data['sponsor_created'] = generateDateTime($data['sponsor_created']);
 
                        // Prepare email and send it to the sponsor

diff --git a/inc/modules/guest/what-sponsor_reg.php b/inc/modules/guest/what-sponsor_reg.php
index f1ccf3837a93c83af396a725ba971937993a860b..d0d9fff8bbe604188c307bbc9fc9abd278c0670c 100644 (file)
--- a/inc/modules/guest/what-sponsor_reg.php
+++ b/inc/modules/guest/what-sponsor_reg.php
@@ -331,15 +331,13 @@ ORDER BY `pay_name`", __FILE__, __LINE__);
 
                        // Errors found?
                        if (count($FORM_ERRORS) > 0) {
-                               $OUT = "<div align=\"center\">
-  <strong><div class=\"guest_failed\">".getMessage('SPONSOR_REGISTER_SOMETHING_MISSING').":</div></strong><br />
-</div>
-<ol>\n";
+                               $OUT = loadTemplate('admin_settings_saved', true, getMessage('SPONSOR_REGISTER_SOMETHING_MISSING');
+                               $OUT .= '<ol>';
                                foreach ($FORM_ERRORS as $error) {
-                                       $OUT .= "<li>".$error."</li>\n";
+                                       $OUT .= '<li>' . $error . '</li>';
                                } // END - foreach
 
-                               $OUT .= "</ol><br />\n";
+                               $OUT .= '</ol>';
                        } // END - if
 
                        $content['form_errors'] = $OUT;

diff --git a/inc/modules/guest/what-stats.php b/inc/modules/guest/what-stats.php
index c66524f7ca36ae9afe2400fd1d54077a8f31655c..9fe4fc71489b362f38557eedd9b30b375f2dcbc9 100644 (file)
--- a/inc/modules/guest/what-stats.php
+++ b/inc/modules/guest/what-stats.php
@@ -66,7 +66,7 @@ switch (getRequestParameter('mode')) {
 
        default:
                // Unsupported mode
-               debug_report_bug(sprintf("Unsupported mode <strong>%s</strong> detected.", secureString(getRequestParameter('mode'))));
+               debug_report_bug(sprintf("Unsupported mode <span class=\"data\">%s</span> detected.", secureString(getRequestParameter('mode'))));
                break;
 }
 

diff --git a/inc/modules/login.php b/inc/modules/login.php
index 7e717d182f5a9653a1143007db79d8a2ce00f827..e03e32b54794ca49d3a9ad1dd22dec974608cc4f 100644 (file)
--- a/inc/modules/login.php
+++ b/inc/modules/login.php
@@ -41,9 +41,9 @@
 if (!defined('__SECURITY')) {
        die();
 } elseif (!isMember()) {
-       $URL = 'modules.php?module=index';
-       if (checkModulePermissions('login') == 'mem_only') $URL .= '&code=' . getCode('MODULE_MEM_ONLY') . '&mod=' . getModule();
-       redirectToUrl($URL);
+       $url = 'modules.php?module=index';
+       if (checkModulePermissions('login') == 'mem_only') $url .= '&code=' . getCode('MODULE_MEM_ONLY') . '&mod=' . getModule();
+       redirectToUrl($url);
 } // END - if
 
 // Disable block mode by default

diff --git a/inc/modules/member/what-beg2.php b/inc/modules/member/what-beg2.php
index 67bc6e328171876e29c7fb7a8a339ac04bed354b..b448c2f40f48d68e487d2e2667d25deddb331979 100644 (file)
--- a/inc/modules/member/what-beg2.php
+++ b/inc/modules/member/what-beg2.php
@@ -68,7 +68,7 @@ $result = SQL_QUERY_ESC("SELECT
 FROM
        `{?_MYSQL_PREFIX?}_user_data`
 WHERE
-       `beg_points` > 0 AND `status`='CONFIRMED'".$lastOnline."
+       `beg_points` > 0 AND `status`='CONFIRMED'" . $lastOnline . "
 ORDER BY
        `beg_points` DESC, `last_online` DESC, `userid` ASC LIMIT %s",
        array(

diff --git a/inc/modules/member/what-bonus.php b/inc/modules/member/what-bonus.php
index 5c9871a969c333a9ccda3f18a087520a6a03561b..8d84a59412adb76a3fbf5b85c83db6c414d8e9d2 100644 (file)
--- a/inc/modules/member/what-bonus.php
+++ b/inc/modules/member/what-bonus.php
@@ -81,7 +81,7 @@ $result = SQL_QUERY_ESC("SELECT
 FROM
        `{?_MYSQL_PREFIX?}_user_data`
 WHERE
-       ".$USE." > 0 AND `status`='CONFIRMED'".$lastOnline."
+       " . $USE . " > 0 AND `status`='CONFIRMED'" . $lastOnline . "
 ORDER BY
        `points` DESC,
        last_online DESC,

diff --git a/inc/modules/member/what-logout.php b/inc/modules/member/what-logout.php
index d16554c595308dd84941c699373b2ddc43fdeb7c..5d7612c970ee599b4d2e464c36b88c8fd9ba1d24 100644 (file)
--- a/inc/modules/member/what-logout.php
+++ b/inc/modules/member/what-logout.php
@@ -45,21 +45,21 @@ if (!defined('__SECURITY')) {
 }
 
 // Base URL for redirection (both cases)
-$URL = 'modules.php?module=index&code=';
+$url = 'modules.php?module=index&code=';
 
 if (destroyMemberSession()) {
        // Remove theme cookie as well
        if (isExtensionActive('theme')) setTheme('');
 
        // Logout completed
-       $URL .= getCode('LOGOUT_DONE');
+       $url .= getCode('LOGOUT_DONE');
 } else {
        // Cannot logout! :-(
-       $URL .= getCode('LOGOUT_FAILED');
+       $url .= getCode('LOGOUT_FAILED');
 }
 
 // Load the URL
-redirectToUrl($URL);
+redirectToUrl($url);
 
 // [EOF]
 ?>

diff --git a/inc/modules/member/what-mydata.php b/inc/modules/member/what-mydata.php
index 0574fd7f5adedc43b409e084aab3dd659896f292..28a0f11ad17e9ce30c0bb68ab711534a091b217a 100644 (file)
--- a/inc/modules/member/what-mydata.php
+++ b/inc/modules/member/what-mydata.php
@@ -58,7 +58,7 @@ $content = array(
 );
 
 // Init variable to prevent notices
-$URL = '';
+$url = '';
 
 // Detect what the member wants to do
 $mode = 'show'; // Show his data
@@ -72,7 +72,6 @@ switch ($mode) {
                $content = merge_array($content, getUserDataArray());
 
                // Translate some things
-               $content['gender']      = translateGender($content['gender']);
                $content['last_update'] = generateDateTime($content['last_update'], 0);
 
                // How far is last change on his profile away from now?
@@ -318,13 +317,13 @@ LIMIT 1",
        case 'notify': // Switch off notfication
                SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `notified`='N', `last_update`=UNIX_TIMESTAMP() WHERE `userid`=%s LIMIT 1",
                        array(getMemberId()), __FILE__, __LINE__);
-               $URL = 'modules.php?module=login&what=welcome&code=' . urlencode(getMessage('PROFILE_UPDATED'));
+               $url = 'modules.php?module=login&what=welcome&code=' . urlencode(getMessage('PROFILE_UPDATED'));
                break;
 } // END - switch
 
-if (!empty($URL)) {
+if (!empty($url)) {
        // Load generated URL
-       redirectToUrl($URL);
+       redirectToUrl($url);
 } // END - if
 
 // [EOF]

diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php
index c9bfafc8b1a5d2b84a7716cb103e554e2ccad803..c360728d6a4ced1ca965ea09cf2ff280f2466675 100644 (file)
--- a/inc/modules/member/what-order.php
+++ b/inc/modules/member/what-order.php
@@ -52,7 +52,7 @@ if ((!isExtensionActive('order')) && (!isAdmin())) {
        return;
 } // END - if
 
-$URL = ''; $id = '0';
+$url = ''; $id = '0';
 $whereStatement = " WHERE `visible`='Y'";
 
 // Set undefined array elements
@@ -130,12 +130,12 @@ LIMIT 1",
        if ($type == 'TEMP') {
                // No entry found, so we need to check out the stats table as well... :)
                // We have to add that suff here, now we continue WITHOUT checking and check the text and subject against some filters
-               $URL = '';
+               $url = '';
                if (getConfig('allow_url_in_text') == 'Y') {
                        // Test submitted text against some filters (length, URLs in text etc.)
                        if ((strpos(strtolower(postRequestParameter('text')), 'https://') > -1) || (strpos(strtolower(postRequestParameter('text')), 'http://') > -1) || (strpos(strtolower(postRequestParameter('text')), "www") > -1)) {
                                // URL found!
-                               $URL = 'modules.php?module=login&what=order&code=' . getCode('URL_FOUND');
+                               $url = 'modules.php?module=login&what=order&code=' . getCode('URL_FOUND');
                        } // END - if
 
                        // Remove new-line and carriage-return characters
@@ -144,7 +144,7 @@ LIMIT 1",
                        // Text length within allowed length?
                        if (strlen($TEST) > getConfig('max_tlength')) {
                                // Text is too long!
-                               $URL = 'modules.php?module=login&what=order&code=' . getCode('OVERLENGTH');
+                               $url = 'modules.php?module=login&what=order&code=' . getCode('OVERLENGTH');
                        } // END - if
                } // END - if
 
@@ -154,7 +154,7 @@ LIMIT 1",
                        setPostRequestParameter('subject', str_replace("\\", '[nl]', substr(postRequestParameter('subject'), 0, 200)));
                        if ((strpos(strtolower(postRequestParameter('subject')), 'http://') > -1) || (strpos(strtolower(postRequestParameter('subject')), "www") > -1)) {
                                // URL in subject found
-                               $URL = 'modules.php?module=login&what=order&code=' . getCode('SUBJ_URL');
+                               $url = 'modules.php?module=login&what=order&code=' . getCode('SUBJ_URL');
                        } // END - if
                } // END - if
 
@@ -169,7 +169,7 @@ LIMIT 1",
                                list($blist) = SQL_FETCHROW($result);
 
                                // Create redirect-URL
-                               $URL = 'modules.php?module=login&what=order&code=' . getCode('BLIST_URL') . '&blist=' . $blist;
+                               $url = 'modules.php?module=login&what=order&code=' . getCode('BLIST_URL') . '&blist=' . $blist;
                        } // END - if
 
                        // Free result
@@ -179,13 +179,13 @@ LIMIT 1",
                // Enougth receivers entered?
                if ((postRequestParameter('receiver') < getConfig('order_min')) && (!isAdmin())) {
                        // Less than allowed receivers entered!
-                       $URL = 'modules.php?module=login&amp;what=order&amp;code=' . getCode('MORE_RECEIVERS3');
+                       $url = 'modules.php?module=login&amp;what=order&amp;code=' . getCode('MORE_RECEIVERS3');
                } // END - if
 
                // Validate URL
                if (!isUrlValid(postRequestParameter('url'))) {
                        // URL is invalid!
-                       $URL = 'modules.php?module=login&amp;what=order&amp;code=' . getCode('INVALID_URL');
+                       $url = 'modules.php?module=login&amp;what=order&amp;code=' . getCode('INVALID_URL');
                } // END - if
 
                // Probe for HTML extension
@@ -196,7 +196,7 @@ LIMIT 1",
                                setPostRequestParameter('text', checkHtmlTags(postRequestParameter('text')));
 
                                // Maybe invalid tags found?
-                               if (!isPostRequestParameterSet('text')) $URL = 'modules.php?module=login&amp;what=order&amp;code=' . getCode('INVALID_TAGS')."&amp;id=".$id;
+                               if (!isPostRequestParameterSet('text')) $url = 'modules.php?module=login&amp;what=order&amp;code=' . getCode('INVALID_TAGS')."&amp;id=".$id;
                        } else {
                                // Remove any HTML code
                                setPostRequestParameter('text', str_replace('<', '{OPEN_HTML}', str_replace('>', '{CLOSE_HTML}', postRequestParameter('text'))));
@@ -206,15 +206,15 @@ LIMIT 1",
                // Is mail type set?
                if ((!isPostRequestParameterSet('mail_type')) || (postRequestParameter('mail_type') < 1)) {
                        // Not correctly set
-                       $URL = 'modules.php?module=login&amp;what=order&amp;code=' . getCode('NO_MAIL_TYPE');
+                       $url = 'modules.php?module=login&amp;what=order&amp;code=' . getCode('NO_MAIL_TYPE');
                } // END - if
        } elseif (!isAdmin()) {
                // He has already sent a mail within a specific time
-               $URL = 'modules.php?module=login&amp;what=order&amp;code=' . getCode('URL_TLOCK') . '&amp;id=' . $id;
+               $url = 'modules.php?module=login&amp;what=order&amp;code=' . getCode('URL_TLOCK') . '&amp;id=' . $id;
        }
 
        // Still no error?
-       if (empty($URL)) {
+       if (empty($url)) {
                // Check if category and number of receivers is okay
                $add = '';
                if ((getConfig('order_multi_page') == 'Y') && (isPostRequestParameterSet('zip')) && (postRequestParameter('zip') != '')) {
@@ -415,22 +415,22 @@ LIMIT 1",
                                } // END - if
 
                                // id is received so we can redirect the user, used points will be added when he send's out the mail
-                               $URL = 'modules.php?module=frametester&amp;order=' . $id;
+                               $url = 'modules.php?module=frametester&amp;order=' . $id;
                        } elseif ($content['target_send'] == '0') {
                                // Not enougth receivers found which can receive mails
-                               $URL = 'modules.php?module=login&amp;what=order&amp;code=' . getCode('MORE_RECEIVERS2');
+                               $url = 'modules.php?module=login&amp;what=order&amp;code=' . getCode('MORE_RECEIVERS2');
                        } else {
                                // No enougth points left!
-                               $URL = 'modules.php?module=login&amp;what=order&amp;code=' . getCode('MORE_POINTS');
+                               $url = 'modules.php?module=login&amp;what=order&amp;code=' . getCode('MORE_POINTS');
                        }
                } else  {
                        // Ordered more mails than he can send in this category
-                       $URL = 'modules.php?module=login&amp;what=order&amp;code=' . getCode('NO_RECS_LEFT');
+                       $url = 'modules.php?module=login&amp;what=order&amp;code=' . getCode('NO_RECS_LEFT');
                }
        }
 } elseif (postRequestParameter('receiver') == '0') {
        // Not enougth receivers selected
-       $URL = 'modules.php?module=login&amp;what=order&amp;code=' . getCode('MORE_RECEIVERS1');
+       $url = 'modules.php?module=login&amp;what=order&amp;code=' . getCode('MORE_RECEIVERS1');
 } elseif (($ALLOWED == '0') && (getConfig('order_max_full') == 'ORDER')) {
        // No more mail orders allowed
        loadTemplate('admin_settings_saved', false, getMessage('MEMBER_ORDER_ALLOWED_EXHAUSTED'));
@@ -703,9 +703,9 @@ LIMIT 1",
        loadTemplate('admin_settings_saved', false, getMaskedMessage('MEMBER_LINKS_LEFT'), $links);
 }
 
-if (!empty($URL)) {
+if (!empty($url)) {
        // Redirect to requested URL
-       redirectToUrl($URL);
+       redirectToUrl($url);
 } // END - if
 
 // [EOF]

diff --git a/inc/modules/member/what-points.php b/inc/modules/member/what-points.php
index 9f4ffc049b4d8e7c097257192a7123e1a31616f7..a55da246a53ee8c6f1f48e1df01ebaa01345fe7e 100644 (file)
--- a/inc/modules/member/what-points.php
+++ b/inc/modules/member/what-points.php
@@ -115,16 +115,8 @@ while ($data = SQL_FETCHARRAY($result_depths)) {
        // Free result
        SQL_FREERESULT($result_refs);
 
-       // Transfer data to array for template
-       $row = array(
-               'level'    => $content['level'],
-               'percents' => translateComma($content['percents']),
-               'points'   => translateComma($content['points']),
-               'refs'     => translateComma($content['counter']),
-       );
-
        // Output row
-       $OUT .= loadTemplate('member_points_row', true, $row);
+       $OUT .= loadTemplate('member_points_row', true, $content);
 } // END - while
 
 // Free memory
@@ -134,7 +126,9 @@ SQL_FREERESULT($result_depths);
 $content['rows'] = $OUT;
 
 // Initialize variables
-$CONFIRMED = '---'; $SENT = '---'; $RECEIVED = '---';
+$CONFIRMED = '---';
+$SENT      = '---';
+$RECEIVED  = '---';
 
 // Only user >= v0.1.2: Fetch confirmed mails counter
 if (isExtensionInstalledAndNewer('user', '0.1.2')) {
@@ -158,9 +152,9 @@ if (isExtensionInstalledAndNewer('user', '0.1.2')) {
 if ($totalLocked == '0') $totalLocked = '0.00000';
 
 // Remember several values in constants
-$content['sum']   = translateComma($totalPoints - getUserData('used_points'), false);
-$content['tref']  = translateComma($totalReferals);
-$content['tlock'] = translateComma($totalLocked);
+$content['sum']   = ($totalPoints - getUserData('used_points'), false);
+$content['tref']  = $totalReferals;
+$content['tlock'] = $totalLocked;
 
 // Fixes a bug when there is no bonus extension installed
 if (isExtensionInstalledAndOlder('bonus', '0.4.4')) setConfigEntry('bonus_active', 'X');
@@ -173,9 +167,6 @@ if ((isExtensionInstalledAndNewer('bonus', '0.2.2')) && (isExtensionActive('bonu
        // Fetch some data and init others (to avoid a notice here)
        $content['login'] = getUserData('login_bonus');
        $content['turbo'] = getUserData('turbo_bonus');
-       $content['ref']   = '0.00000';
-       $content['order'] = '0.00000';
-       $content['stats'] = '0.00000';
 
        // Get more data if ext-bonus is newer
        if (isExtensionInstalledAndNewer('bonus', '0.4.4')) {
@@ -185,18 +176,7 @@ if ((isExtensionInstalledAndNewer('bonus', '0.2.2')) && (isExtensionActive('bonu
        } // END - if
 
        // Total bonus points
-       $content['ttotal'] = translateComma($content['turbo'] + $content['login'] + $content['ref'] + $content['order'] + $content['stats'], false);
-
-       // Translate more data
-       $content['turbo'] = translateComma($content['turbo']);
-       $content['login'] = translateComma($content['login']);
-
-       if (isExtensionInstalledAndNewer('bonus', '0.4.4')) {
-               // Add referal, stats and order bonys
-               $content['ref']   = translateComma($content['ref']);
-               $content['order'] = translateComma($content['order']);
-               $content['stats'] = translateComma($content['stats']);
-       } // END - if
+       $content['ttotal'] = $content['turbo'] + $content['login'] + $content['ref'] + $content['order'] + $content['stats'];
 
        // Output rows
        $content['special_rows'] = loadTemplate('member_points_bonus_rows', true, $content);
@@ -209,9 +189,9 @@ if ((isExtensionInstalledAndNewer('bonus', '0.2.2')) && (isExtensionActive('bonu
 }
 
 // Remeber values for the final template
-$content['receive']   = translateComma($RECEIVED);
-$content['confirmed'] = translateComma($CONFIRMED);
-$content['sent']      = translateComma($SENT);
+$content['receive']   = $RECEIVED;
+$content['confirmed'] = $CONFIRMED;
+$content['sent']      = $SENT;
 
 // Load final template
 if (isExtensionActive('user')) {

diff --git a/inc/modules/member/what-rallyes.php b/inc/modules/member/what-rallyes.php
index e26d09807a4d5b6408ff3019c60ecabd9dad7d1b..52b19648003f718e96c9fe65dec1e28a7a7a600b 100644 (file)
--- a/inc/modules/member/what-rallyes.php
+++ b/inc/modules/member/what-rallyes.php
@@ -65,7 +65,7 @@ INNER JOIN
 ON
        d.admin_id=a.id
 WHERE
-       d.notified='Y'".$ADD."
+       d.notified='Y'" . $ADD . "
 ORDER BY
        d.end_time ASC
 LIMIT 1", __FILE__, __LINE__);

diff --git a/inc/modules/member/what-refback.php b/inc/modules/member/what-refback.php
index 10f9907e76f3d94e1ba8c3209df12290b9f4f51f..70967c9f6aea2a35932c50fd1241cb2e901ce143 100644 (file)
--- a/inc/modules/member/what-refback.php
+++ b/inc/modules/member/what-refback.php
@@ -94,9 +94,6 @@ if ((isFormSent('edit')) && (isPostRequestParameterSet('id'))) {
                // Read data from refback table
                $content = getArrayFromUserRefbackData(postRequestParameter('id'));
 
-               // Translate comma
-               $content['refback'] = translateComma($content['refback']);
-
                // Load form for editing
                loadTemplate('member_refback_edit', false, $content);
        }
@@ -120,7 +117,7 @@ if (SQL_NUMROWS($result) > 0) {
        while ($content = SQL_FETCHARRAY($result)) {
                // Init variables
                $rows = '';
-               $counter = '0';
+               $content['counter'] = 0;
                $SW = 2;
 
                // Check for users ref in this level
@@ -131,9 +128,7 @@ if (SQL_NUMROWS($result) > 0) {
 
                        // Add/"translate" more content
                        $refRow['sw']          = $SW;
-                       $refRow['points']      = translateComma($refRow['points']);
-                       $refRow['refback']     = translateComma($refRow['refback']);
-                       // UNUSED: $refRow['status']      = translateUserStatus($refRow['status']);
+                       // @TODO UNUSED: $refRow['status']      = translateUserStatus($refRow['status']);
                        $refRow['joined']      = generateDateTime($refRow['joined'], '3');
                        if (empty($refRow['nickname'])) $refRow['nickname'] = '---';
 
@@ -145,13 +140,11 @@ if (SQL_NUMROWS($result) > 0) {
                        }
 
                        // Count this ref and switch color
-                       $counter++;
+                       $content['counter']++;
                        $SW = 3 - $SW;
                } // END - foreach
 
                // Remember the content
-               $content['counter']  = translateComma($counter);
-               $content['percents'] = translateComma($content['percents']);
                $content['rows']     = $rows;
 
                // Load level template
@@ -168,5 +161,5 @@ if (SQL_NUMROWS($result) > 0) {
 // Free result
 SQL_FREERESULT($result);
 
-//
+// [EOF]
 ?>

diff --git a/inc/modules/member/what-surfbar_list.php b/inc/modules/member/what-surfbar_list.php
index a4c3b1b850d7713aa2707ad8516120fbf86f2948..e3446626e33be9c2f759d72b41b3d92bd23740ac 100644 (file)
--- a/inc/modules/member/what-surfbar_list.php
+++ b/inc/modules/member/what-surfbar_list.php
@@ -53,12 +53,12 @@ if ((!isExtensionActive('surfbar')) && (!isAdmin())) {
 } // END - if
 
 // Load user URLs
-$URLs = SURFBAR_GET_USER_URLS();
+$urlArray = SURFBAR_GET_USER_URLS();
 
 // Are there entries or form is submitted?
 if ((isFormSent()) && (isPostRequestParameterSet(('action'))) && (isPostRequestParameterSet('id'))) {
        // Process the form
-       if (SURFBAR_MEMBER_DO_FORM(postRequestArray(), $URLs)) {
+       if (SURFBAR_MEMBER_DO_FORM(postRequestArray(), $urlArray)) {
                // Action performed but shall we display it?
                if (((postRequestParameter('action') != 'edit') && (postRequestParameter('action') != "delete")) || (isPostRequestParameterSet(('execute')))) {
                        // Display "action done" message if action is wether 'edit' nor 'delete' or has been executed
@@ -68,10 +68,10 @@ if ((isFormSent()) && (isPostRequestParameterSet(('action'))) && (isPostRequestP
                // Something went wrong
                loadTemplate('admin_settings_saved', false, getMessage('MEMBER_SURFBAR_ACTION_FAILED'));
        }
-} elseif (count($URLs) > 0) {
+} elseif (count($urlArray) > 0) {
        // List all URLs
        $OUT = ''; $SW = 2;
-       foreach ($URLs as $id => $content) {
+       foreach ($urlArray as $id => $content) {
                // "Translate"/insert data
                $content['sw'] = $SW;
                $content['url'] = generateDerefererUrl($content['url']);

diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php
index 122f0daa22fcf3f2024adfcdb86e56678d79d94b..ba40074cf842234a089c2d9e22d1f5676d9b66c2 100644 (file)
--- a/inc/modules/member/what-transfer.php
+++ b/inc/modules/member/what-transfer.php
@@ -120,10 +120,6 @@ switch ($mode) {
                                        $content['recipient']['nickname'] = '';
                                } // END - if
 
-                               // Translate some data
-                               $content['sender']['gender']    = translateGender($content['sender']['gender']);
-                               $content['recipient']['gender'] = translateGender($content['recipient']['gender']);
-
                                // Prepare variables for testing
                                $TEST_NICK_SENDER = $content['sender']['nickname'];
                                $TEST_NICK_REC    = $content['recipient']['nickname'];
@@ -267,15 +263,12 @@ switch ($mode) {
                        $content['reason'] = '';
 
                        // Transfer maybe already entered valued'
-                       if (isGetRequestParameterSet('ok')) {
+                       if (isPostRequestParameterSet('ok')) {
                                // Get values from form
-                               $content['points'] = bigintval(postRequestParameter('points'));
-                               $content['reason'] = secureString(postRequestParameter('reason'));
+                               $content['points'] = postRequestParameter('points');
+                               $content['reason'] = postRequestParameter('reason');
                        } // END - if
 
-                       // Translate some array elements for template
-                       $content['max_transferable'] = translateComma($content['max_transferable']);
-
                        // Output form
                        loadTemplate('member_transfer_new', false, $content);
                } // END - if
@@ -321,7 +314,7 @@ switch ($mode) {
                                        'stamp'    => generateDateTime($stamp, 3),
                                        'userid'   => $userid,
                                        'reason'   => $reason,
-                                       'points'   => translateComma($points)
+                                       'points'   => $points
                                );
 
                                // Load row template
@@ -375,7 +368,7 @@ KEY (`party_userid`)
                while ($DATA = SQL_FETCHROW($result)) {
                        $DATA[] = 'IN';
                        $DATA = implode("','", $DATA);
-                       $res_temp = SQL_QUERY("INSERT INTO `{?_MYSQL_PREFIX?}_transfers_tmp` (`trans_id`, `party_userid`, `points`, `reason`, `time_trans`, `trans_type`) VALUES ('".$DATA."')", __FILE__, __LINE__);
+                       $res_temp = SQL_QUERY("INSERT INTO `{?_MYSQL_PREFIX?}_transfers_tmp` (`trans_id`, `party_userid`, `points`, `reason`, `time_trans`, `trans_type`) VALUES ('" . $DATA . "')", __FILE__, __LINE__);
                } // END - while
 
                // Free memory
@@ -387,7 +380,7 @@ KEY (`party_userid`)
                while ($DATA = SQL_FETCHROW($result)) {
                        $DATA[] = 'OUT';
                        $DATA = implode("','", $DATA);
-                       $res_temp = SQL_QUERY("INSERT INTO `{?_MYSQL_PREFIX?}_transfers_tmp` (`trans_id`, `party_userid`, `points`, `reason`, `time_trans`, `trans_type`) VALUES ('".$DATA."')", __FILE__, __LINE__);
+                       $res_temp = SQL_QUERY("INSERT INTO `{?_MYSQL_PREFIX?}_transfers_tmp` (`trans_id`, `party_userid`, `points`, `reason`, `time_trans`, `trans_type`) VALUES ('" . $DATA . "')", __FILE__, __LINE__);
                } // END - while
 
                // Free memory

diff --git a/inc/modules/member/what-unconfirmed.php b/inc/modules/member/what-unconfirmed.php
index d5a2b824d8c93acf9c8c70b30c59766c6286035c..12ecfd5da861333b2b2eda5a701fd4ddd9f8c860 100644 (file)
--- a/inc/modules/member/what-unconfirmed.php
+++ b/inc/modules/member/what-unconfirmed.php
@@ -8,7 +8,7 @@
  * -------------------------------------------------------------------- *
  * Short description : Unconfirmed mails                                *
  * -------------------------------------------------------------------- *
- * Kurzbeschreibung  : Unbestätigte Mails                              *
+ * Kurzbeschreibung  : Unbestaetigte Mails                              *
  * -------------------------------------------------------------------- *
  * $Revision::                                                        $ *
  * $Date::                                                            $ *
@@ -51,7 +51,7 @@ addMenuDescription('member', __FILE__);
 if ((isGetRequestParameterSet('bonusid')) && (isExtensionActive('bonus'))) {
        // Display bonus mail by loading it's full data
        $result_data = SQL_QUERY_ESC("SELECT
-       `id`, `subject`, `timestamp`, `cat_id`, `points`, `text`, `is_notify`, `data_type`, `time`, `url`
+       `id`, `subject`, `timestamp`, `cat_id` AS `category`, `points`, `text`, `is_notify`, `data_type`, `time`, `url`
 FROM
        `{?_MYSQL_PREFIX?}_bonus`
 WHERE
@@ -64,11 +64,6 @@ LIMIT 1",
 
        // Translate some data
        $content['timestamp']   = generateDateTime($content['timestamp'], 2);
-       $content['category']    = getCategory($content['cat_id']);
-       $content['points']      = translateComma($content['points']);
-       $content['is_notify']   = translateYesNo($content['is_notify']);
-       $content['sender']      = getMessage('USERNAME_ADMIN_SHORT');
-       $content['time']        = createFancyTime($content['time']);
        $content['userid']      = getMemberId();
        $content['user_status'] = getMaskedMessage('MEMBER_MAIL_BONUS_CONFIRMED_UNKNOWN', $content['id']);
 
@@ -88,7 +83,7 @@ LIMIT 1",
 } elseif (isGetRequestParameterSet(('mailid'))) {
        // Display regular member mail by loading its full data
        $result_data = SQL_QUERY_ESC("SELECT
-       s.id, s.subject, p.text, s.timestamp_ordered AS `timestamp`, s.cat_id, pay.price AS points, p.sender, pay.time, p.data_type
+       s.id, s.subject, p.text, s.timestamp_ordered AS `timestamp`, s.cat_id AS `category`, pay.price AS points, p.sender, pay.time, p.data_type
 FROM
        `{?_MYSQL_PREFIX?}_user_stats` AS s
 LEFT JOIN
@@ -108,11 +103,8 @@ LIMIT 1",
        $content = SQL_FETCHARRAY($result_data);
 
        // Translate some data
-       $content['timestamp'] = generateDateTime($content['timestamp'], 2);
-       $content['category']  = getCategory($content['cat_id']);
-       $content['points']    = translateComma($content['points']);
-       $content['time']      = createFancyTime($content['time']);
-       $content['userid']    = getMemberId();
+       $content['timestamp']   = generateDateTime($content['timestamp'], 2);
+       $content['userid']      = getMemberId();
        $content['user_status'] = getMaskedMessage('MEMBER_MAIL_NORMAL_CONFIRMED_UNKNOWN', $content['id']);
 
        // Is ext-user installed?
@@ -219,8 +211,7 @@ LIMIT 1",
                                'subject'   => $subject,
                                'sender'    => $sender,
                                'timestamp' => generateDateTime($timestamp, 2),
-                               'cat'       => getCategory($cat),
-                               'points'    => translateComma($pay),
+                               'points'    => $pay,
                        );
 
                        // Load row template
@@ -259,7 +250,7 @@ LIMIT 1",
        SQL_FREERESULT($result);
 
        // Remember total points
-       $content['total_points'] = translateComma($sum);
+       $content['total_points'] = $sum;
 
        // Remember all generated rows in constant for the template
        $content['rows'] = $OUT;

diff --git a/inc/modules/order.php b/inc/modules/order.php
index 0e0fb4341d77e20deef9288d97a8f94425ddfaea..e70a2b03f15e02aadcdfc3e05186b239111b4b86 100644 (file)
--- a/inc/modules/order.php
+++ b/inc/modules/order.php
@@ -38,7 +38,7 @@
  ************************************************************************/
 
 // Some security stuff...
-$URL = '';
+$url = '';
 if (!defined('__SECURITY')) {
        die();
 } elseif ((!isExtensionActive('order')) && (!isAdmin())) {
@@ -46,14 +46,14 @@ if (!defined('__SECURITY')) {
        return;
 } elseif (!isMember()) {
        // Sorry, no guest access!
-       $URL = 'modules.php?module=index';
+       $url = 'modules.php?module=index';
 } elseif (!isGetRequestParameterSet('order')) {
        // You cannot call this module directly!
-       $URL = 'modules.php?module=login&what=order';
+       $url = 'modules.php?module=login&what=order';
 }
 
 // When URL is empty nothing bad happend here
-if (empty($URL)) {
+if (empty($url)) {
        // Is the auto-send mechanism active or inactive?
        if (getConfig('autosend_active') == 'Y') {
                // Auto-send is active
@@ -124,7 +124,7 @@ if (empty($URL)) {
        }
 } else {
        // Redirect...
-       redirectToUrl($URL);
+       redirectToUrl($url);
 }
 
 // [EOF]

diff --git a/inc/modules/sponsor/settings.php b/inc/modules/sponsor/settings.php
index acdedf406624c3093ee421a1e7d57a3667ba2607..f49a345912321f9c8795c58b7f23422c7f7befe8 100644 (file)
--- a/inc/modules/sponsor/settings.php
+++ b/inc/modules/sponsor/settings.php
@@ -58,7 +58,8 @@ $result = SQL_QUERY_ESC("SELECT
 FROM
        `{?_MYSQL_PREFIX?}_sponsor_data`
 WHERE
-       `id`='%s' AND `password`='%s'
+       `id`=%s AND
+       `password`='%s'
 LIMIT 1",
        array(
                bigintval(getSession('sponsorid')),
@@ -111,9 +112,6 @@ if (SQL_NUMROWS($result) == 1) {
                        $content['receive_warnings_n'] = '';
                        $content['receive_warnings_' . strtolower($content['receive_warnings'])] = ' checked="checked"';
 
-                       // Translate current interval into fancy string
-                       $content['current'] = createFancyTime($content['warning_interval']);
-
                        // Output formular
                        $OUT = loadTemplate('sponsor_settings_form', true, $content);
                }

diff --git a/inc/monthly/monthly_beg.php b/inc/monthly/monthly_beg.php
index 67fecfc51473196d2ae2dc8755c2c2ba55744277..370f3fddcc59c4ac41972157572640b5564dc12f 100644 (file)
--- a/inc/monthly/monthly_beg.php
+++ b/inc/monthly/monthly_beg.php
@@ -90,10 +90,6 @@ LIMIT {?beg_ranks?}", __FILE__, __LINE__);
                        // Add points to user's account directly
                        addPointsDirectly('monthly_beg', $content['userid'], $content['points']);
 
-                       // Translate gender/points
-                       $content['gender'] = translateGender($content['gender']);
-                       $content['points'] = translateComma($content['points']);
-
                        // Load email template and email it away
                        $message = loadEmailTemplate('member_beg', $content, bigintval($content['userid']));
                        sendEmail($content['email'], getMessage('BEG_MONTHLY_RALLYE'), $message);

diff --git a/inc/monthly/monthly_bonus.php b/inc/monthly/monthly_bonus.php
index 43edf8d258407165558537768086692fb9ea92b6..ed3dfaa445d0089e4520d316e137bbb38883e6af 100644 (file)
--- a/inc/monthly/monthly_bonus.php
+++ b/inc/monthly/monthly_bonus.php
@@ -98,10 +98,6 @@ LIMIT {?bonus_ranks?}", __FILE__, __LINE__);
                                // Add points to user's account directly
                                addPointsDirectly('monthly_bonus', $content['userid'], $content['points']);
 
-                               // Translate gender/points
-                               $content['gender'] = translateGender($content['gender']);
-                               $content['points'] = translateComma($content['points']);
-
                                // Load email template and email it away
                                $message = loadEmailTemplate('member_bonus', $content, bigintval($content['userid']));
                                sendEmail($content['email'], getMessage('BONUS_MONTHLY_ONLINE_BONUS'), $message);

diff --git a/inc/pool/pool-user.php b/inc/pool/pool-user.php
index 54e6bd065f01923537ce44be458d0cc9004c96a4..b29d3fb625568476092b8d12ddcc7f1706726cb9 100644 (file)
--- a/inc/pool/pool-user.php
+++ b/inc/pool/pool-user.php
@@ -228,8 +228,11 @@ if (SQL_NUMROWS($result_main) > 0) {
                                                // There are some mails left to send for next round, so we reset the status back to NEW (=still not fully delivered)
                                                $add = '';
                                                if ($GLOBALS['pool_cnt'] <= $DATA['target_send']) $add = ", target_send=target_send-".$GLOBALS['pool_cnt'];
-                                               SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_pool` SET `data_type`='NEW', receivers='%s'".$add." WHERE `id`=%s LIMIT 1",
-                                                       array(implode(';', $dummy), bigintval($DATA['id'])), __FILE__, __LINE__);
+                                               SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_pool` SET `data_type`='NEW', receivers='%s'" . $add . " WHERE `id`=%s LIMIT 1",
+                                                       array(
+                                                               implode(';', $dummy),
+                                                               bigintval($DATA['id'])
+                                                       ), __FILE__, __LINE__);
 
                                                //* DEBUG: */ outputHtml("*EXIT/L:".__LINE__."*<br />");
                                                break;

diff --git a/inc/reset/reset_daily.php b/inc/reset/reset_daily.php
index be14b25c2b6c771e5a22f94472418411b989b992..da40de9122c28a925f81e84aa2b6e7a38c02bcaf 100644 (file)
--- a/inc/reset/reset_daily.php
+++ b/inc/reset/reset_daily.php
@@ -51,14 +51,14 @@ if ((getOutputMode() != 0) || (!isResetModeEnabled())) return;
 // Update user profiles
 if (isExtensionInstalledAndNewer('order', '0.1.1')) {
        // Latest version
-       $result_daily = SQL_QUERY("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET receive_mails=max_mails, mail_orders=0 WHERE receive_mails != max_mails", __FILE__, __LINE__);
+       $result_daily = SQL_QUERY("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `receive_mails`=`max_mails`, `mail_orders`=0 WHERE receive_mails != max_mails", __FILE__, __LINE__);
 } else {
        // Obsolete version
-       $result_daily = SQL_QUERY("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET receive_mails=max_mails WHERE receive_mails != max_mails", __FILE__, __LINE__);
+       $result_daily = SQL_QUERY("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `receive_mails`=`max_mails` WHERE `receive_mails` != `max_mails`", __FILE__, __LINE__);
 }
 
 // Transfer points from locked_points to points
-$result_daily = SQL_QUERY("SELECT userid FROM `{?_MYSQL_PREFIX?}_user_data` WHERE ref_payout=0 AND `status`='CONFIRMED' ORDER BY `userid` ASC", __FILE__, __LINE__);
+$result_daily = SQL_QUERY("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `ref_payout`=0 AND `status`='CONFIRMED' ORDER BY `userid` ASC", __FILE__, __LINE__);
 
 //* DEBUG: */ outputHtml(basename(__FILE__).":payout=0;daily|numRows=".SQL_NUMROWS($result_daily)."<br />");
 if (SQL_NUMROWS($result_daily) > 0) {
@@ -68,8 +68,16 @@ if (SQL_NUMROWS($result_daily) > 0) {
        // Start checking accounts which are on 0 confirmed-to-go mails
        while ($content = SQL_FETCHARRAY($result_daily)) {
                //* DEBUG: */ outputHtml(basename(__FILE__).":userid={$content['userid']}<br />");
-               $result_points = SQL_QUERY_ESC("SELECT `ref_depth`, `locked_points` FROM `{?_MYSQL_PREFIX?}_user_points`
-WHERE `userid`=%s AND `locked_points` != 0.00000 ORDER BY `ref_depth` ASC",
+               $result_points = SQL_QUERY_ESC("SELECT
+       `ref_depth`,
+       `locked_points`
+FROM
+       `{?_MYSQL_PREFIX?}_user_points`
+WHERE
+       `userid`=%s AND
+       `locked_points` != 0.00000
+ORDER BY
+       `ref_depth` ASC",
                        array(bigintval($content['userid'])), __FILE__, __LINE__);
 
                //* DEBUG: */ outputHtml(basename(__FILE__).":payout=0;points|numRows=".SQL_NUMROWS($result_points)."<br />");
@@ -80,10 +88,20 @@ WHERE `userid`=%s AND `locked_points` != 0.00000 ORDER BY `ref_depth` ASC",
                                $content = merge_array($content, $content2);
 
                                //* DEBUG: */ outputHtml(basename(__FILE__).":userid={$content['userid']},depth={$content['ref_depth']},locked={$content['locked_points']}<br />");
-                               addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_points` SET `points`=`points`+%s, `locked_points`=0.00000
-WHERE `userid`=%s AND `ref_depth`=%d
+                               addSql(SQL_QUERY_ESC("UPDATE
+       `{?_MYSQL_PREFIX?}_user_points`
+SET
+       `points`=`points`+%s,
+       `locked_points`=0.00000
+WHERE
+       `userid`=%s AND
+       `ref_depth`=%d
 LIMIT 1",
-                               array($content['locked_points'], bigintval($content['userid']), $content['ref_depth']), __FILE__, __LINE__, false));
+                                       array(
+                                               $content['locked_points'],
+                                               bigintval($content['userid']),
+                                               $content['ref_depth']
+                                       ), __FILE__, __LINE__, false));
 
                                // Update mediadata as well
                                if (isExtensionInstalledAndNewer('mediadata', '0.0.4')) {

diff --git a/templates/de/emails/admin/admin_del_surfbar_urls.tpl b/templates/de/emails/admin/admin_del_surfbar_urls.tpl
index 98ddba136681d6b6acc2ee3ae4b8d2dc36281918..a2e45a6158fd9539bb57312380b20670fca48cf8 100644 (file)
--- a/templates/de/emails/admin/admin_del_surfbar_urls.tpl
+++ b/templates/de/emails/admin/admin_del_surfbar_urls.tpl
@@ -8,9 +8,9 @@ Gebuchte URL: $content[url]
 ------------------------------------------
 Mitglieder-Id: $content[userid]
 ------------------------------------------
-Status: $content[url_status]
+Status: {%pipe,translateSurfbarUrlStatus=$content[url_status]%}
 ------------------------------------------
-Aufrufe gesamt: $content[views_total]
+Aufrufe gesamt: {%pipe,translateComma=$content[url_views_total]%}
 ------------------------------------------
 Angemeldet: $content[url_registered]
 ------------------------------------------

diff --git a/templates/de/emails/admin/admin_sponsor_change_data.tpl b/templates/de/emails/admin/admin_sponsor_change_data.tpl
index 124ef4f9c41489856e51d6d9319f7de2b99f350d..b60c9a2ea66b66e7c5f48fc0e07fafea4b0ec5b5 100644 (file)
--- a/templates/de/emails/admin/admin_sponsor_change_data.tpl
+++ b/templates/de/emails/admin/admin_sponsor_change_data.tpl
@@ -9,7 +9,7 @@ Hier sind alle neuen (und in Klammern alten) Daten:
 {--SPONSOR_ENTER_TAX_IDENT--}: $content[new_data][tax_ident] ($content[tax_ident])
 ------------------------------
 {--GUEST_GENDER--}: $content[new_data][gender] ($content[gender])
-{--SURNAME_FAMILY--}: $content[new_data][surname] $content[new_data][family] ($content[surname] $content[family])
+{--SURNAME_FAMILY--}: $content[new_data][surname] $content[new_data][family] ({%sponsor,surname=$userid%} {%sponsor,family=$userid%})
 {--SPONSOR_EMAIL_STREET_NR1--}: $content[new_data][street_nr1] ($content[street_nr1])
 {--SPONSOR_EMAIL_STREET_NR2--}: $content[new_data][street_nr2] ($content[street_nr2])
 {--SPONSOR_EMAIL_CNTRY_ZIP_CITY--}: $content[new_data][country]-$content[new_data][zip] $content[new_data][city] ($content[country]-$content[zip] $content[city])

diff --git a/templates/de/emails/admin/admin_sponsor_change_email.tpl b/templates/de/emails/admin/admin_sponsor_change_email.tpl
index ed3f50680764cbcd166fb2bfa9240a4b8472f284..a66f57555e5f29891890c30bd015e0c5b1c7d757 100644 (file)
--- a/templates/de/emails/admin/admin_sponsor_change_email.tpl
+++ b/templates/de/emails/admin/admin_sponsor_change_email.tpl
@@ -9,7 +9,7 @@ Hier sind alle neuen (und in Klammern alten) Daten:
 {--SPONSOR_ENTER_TAX_IDENT--}: $content[new_data][tax_ident] ($content[tax_ident])
 ------------------------------
 {--GUEST_GENDER--}: $content[new_data][gender] ($content[gender])
-{--SURNAME_FAMILY--}: $content[new_data][surname] $content[new_data][family] ($content[surname] $content[family])
+{--SURNAME_FAMILY--}: $content[new_data][surname] $content[new_data][family] ({%sponsor,surname=$userid%} {%sponsor,family=$userid%})
 {--SPONSOR_EMAIL_STREET_NR1--}: $content[new_data][street_nr1] ($content[street_nr1])
 {--SPONSOR_EMAIL_STREET_NR2--}: $content[new_data][street_nr2] ($content[street_nr2])
 {--SPONSOR_EMAIL_CNTRY_ZIP_CITY--}: $content[new_data][country]-$content[new_data][zip] $content[new_data][city] ($content[country]-$content[zip] $content[city])

diff --git a/templates/de/emails/admin/admin_sponsor_edit.tpl b/templates/de/emails/admin/admin_sponsor_edit.tpl
index eb2417b5009b8507dbefd534522bb0c4113fe19e..eefa78d06f4f2fec86dc236b97d98ce1df909dfa 100644 (file)
--- a/templates/de/emails/admin/admin_sponsor_edit.tpl
+++ b/templates/de/emails/admin/admin_sponsor_edit.tpl
@@ -1,4 +1,4 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%sponsor,gender,translateGender=$userid%} {%sponsor,surname=$userid%} {%sponsor,family=$userid%},
 
 ------------------------------
 Ihre Sponsor-Id lautet: $content[id]
@@ -12,8 +12,8 @@ Es sind nun folgende Daten gesetzt:
 {--SPONSOR_ENTER_COMPANY_POSITION--}: $content[position]
 {--SPONSOR_ENTER_TAX_IDENT--}: $content[tax_ident]
 ------------------------------
-{--GUEST_GENDER--}: $content[gender]
-{--SURNAME_FAMILY--}: $content[surname] $content[family]
+{--GUEST_GENDER--}: {%sponsor,gender,translateGender=$userid%}
+{--SURNAME_FAMILY--}: {%sponsor,surname=$userid%} {%sponsor,family=$userid%}
 {--SPONSOR_EMAIL_STREET_NR1--}: $content[street_nr1]
 {--SPONSOR_EMAIL_STREET_NR2--}: $content[street_nr2]
 {--SPONSOR_EMAIL_CNTRY_ZIP_CITY--}: $content[country]-$content[zip] $content[city]

diff --git a/templates/de/emails/admin/admin_sponsor_pending.tpl b/templates/de/emails/admin/admin_sponsor_pending.tpl
index 2578303632bb99f367a426eac8996316c59887f5..cc5a08e37db0f1df81cb198626ee7e25cad86dd3 100644 (file)
--- a/templates/de/emails/admin/admin_sponsor_pending.tpl
+++ b/templates/de/emails/admin/admin_sponsor_pending.tpl
@@ -1,22 +1,26 @@
 Hallo Administrator,
 
-soeben hat ein neuer Sponsor seine EMail-Adresse bestätigt. Dies wurde von der IP-Nummer {%server,remote_addr%} aus durchgefuehrt.
+soeben hat ein neuer Sponsor seine EMail-Adresse bestätigt. Dies wurde von der IP-Nummer {%server,remote_addr%} aus durchgeführt.
 
-Bitte setzen Sie sich mit ihm in Verbindung (die EMail-Adresse finden Sie weiter unten) und teilen Sie ihm Ihre
-Kontoverbindung mit!
+Bitte setzen Sie sich mit ihm in Verbindung (die EMail-Adresse finden Sie weiter unten) und teilen Sie ihm Ihre Kontoverbindung mit!
 
-Hier sind nochmals alle seine Daten aus der Anmeldung:
+------------------------------
+Verwendungszweck: SPONSOR: $content[id], {%pipe,translateComma=$content[points]%}
+------------------------------
+Zu überweisender Betrag: {%pipe,translateComma=$content[pay]%} $content[curr]
+------------------------------
 
+Hier sind nochmals alle seine Daten aus der Anmeldung:
 ------------------------------
 Ihre Sponsor-Id lautet: $content[id]
 ------------------------------
 -- Persoenliche Daten:      --
 ------------------------------
-Anrede: $content[gender]
+Anrede: {%pipe,translateGender=$content[gender]%}
 ------------------------------
-Vorname: $content[surname]
+Vorname: {%sponsor,surname=$userid%}
 ------------------------------
-Nachname: $content[family]
+Nachname: {%sponsor,family=$userid%}
 ------------------------------
 -- Firmendaten:             --
 ------------------------------

diff --git a/templates/de/emails/admin/admin_sponsor_reg.tpl b/templates/de/emails/admin/admin_sponsor_reg.tpl
index 83236fdb60b1f5544aa1c780aba0fe39cd79374b..b4e487ad714a5377135d0684710ac33b55824137 100644 (file)
--- a/templates/de/emails/admin/admin_sponsor_reg.tpl
+++ b/templates/de/emails/admin/admin_sponsor_reg.tpl
@@ -11,11 +11,11 @@ Hash-Wert: $content[hash]
 ------------------------------
 Angemeldet am: $content[timestamp]
 ------------------------------
-Anrede: $content[gender]
+Anrede: {%sponsor,gender,translateGender=$userid%}
 ------------------------------
-Vorname: $content[surname]
+Vorname: {%sponsor,surname=$userid%}
 ------------------------------
-Nachname: $content[family]
+Nachname: {%sponsor,family=$userid%}
 ------------------------------
 Verwendeter Browser: {%server,user_agent%}
 ------------------------------

diff --git a/templates/de/emails/admin/admin_surfbar_url_active_deleted.tpl b/templates/de/emails/admin/admin_surfbar_url_active_deleted.tpl
index c45d95b9af34ef2779625782b5df397428763421..52fea255498f8ca39ec25b14563bfcf46b05dbe9 100644 (file)
--- a/templates/de/emails/admin/admin_surfbar_url_active_deleted.tpl
+++ b/templates/de/emails/admin/admin_surfbar_url_active_deleted.tpl
@@ -19,11 +19,11 @@ URL angemeldet: $content[url_registered]
 Framekiller-Test:
 $content[frametester]
 ------------------------------------------
-Gesamteinblendungen: $content[views_total]
+Gesamteinblendungen: {%pipe,translateComma=$content[url_views_total]%}
 ------------------------------------------
-Maximale Einblendungen: $content[views_allowed]
+Maximale Einblendungen: {%pipe,translateComma=$content[url_views_allowed]%}
 ------------------------------------------
-Davon übrig: $content[views_max]
+Davon übrig: {%pipe,translateComma=$content[url_views_max]%}
 ------------------------------------------
 Vergütung/Aufruf: $content[reward] {?POINTS?}
 ------------------------------------------

diff --git a/templates/de/emails/admin/admin_surfbar_url_active_pending.tpl b/templates/de/emails/admin/admin_surfbar_url_active_pending.tpl
index fd1e121d29654bcdbb6b11160b271b1da460f834..8de45873af872949672a4d6825d37ab06c002b5b 100644 (file)
--- a/templates/de/emails/admin/admin_surfbar_url_active_pending.tpl
+++ b/templates/de/emails/admin/admin_surfbar_url_active_pending.tpl
@@ -20,11 +20,11 @@ Zuletzt gesperrt: $content[url_last_locked]
 ------------------------------------------
 Sperrgrund: $content[lock_reason]
 ------------------------------------------
-Gesamteinblendungen: $content[views_total]
+Gesamteinblendungen: {%pipe,translateComma=$content[url_views_total]%}
 ------------------------------------------
-Maximale Einblendungen: $content[views_allowed] (Neu: $content[edit][limit])
+Maximale Einblendungen: {%pipe,translateComma=$content[url_views_allowed]%} (Neu: {%pipe,translateSurfbarLimit=$content[edit][limit]%})
 ------------------------------------------
-Davon übrig: $content[views_max] (Neu: $content[edit][limit])
+Davon übrig: {%pipe,translateComma=$content[url_views_max]%} (Neu: {%pipe,translateSurfbarLimit=$content[edit][limit]%})
 ------------------------------------------
 
 Mit freundlichen Grüßen,

diff --git a/templates/de/emails/admin/admin_surfbar_url_active_stopped.tpl b/templates/de/emails/admin/admin_surfbar_url_active_stopped.tpl
index c6ffff707b3bff40e1c0bb1170f5253f6a75971e..9d381bf1c7fd5753cda8cae762f7b61f6a6f43a5 100644 (file)
--- a/templates/de/emails/admin/admin_surfbar_url_active_stopped.tpl
+++ b/templates/de/emails/admin/admin_surfbar_url_active_stopped.tpl
@@ -20,11 +20,11 @@ Zuletzt gesperrt: $content[url_last_locked]
 ------------------------------------------
 Sperrgrund: $content[lock_reason]
 ------------------------------------------
-Gesamteinblendungen: $content[views_total]
+Gesamteinblendungen: {%pipe,translateComma=$content[url_views_total]%}
 ------------------------------------------
-Maximale Einblendungen: $content[views_allowed]
+Maximale Einblendungen: {%pipe,translateComma=$content[url_views_allowed]%};
 ------------------------------------------
-Davon übrig: $content[views_max]
+Davon übrig: {%pipe,translateComma=$content[url_views_max]%}
 ------------------------------------------
 
 Mit freundlichen Grüßen,

diff --git a/templates/de/emails/admin/admin_surfbar_url_depleted.tpl b/templates/de/emails/admin/admin_surfbar_url_depleted.tpl
index 48aefe3456fe5e3e7b610fd76321dddc44f3fd8f..8592abd6533422320515c245e70d09b4b57a45c2 100644 (file)
--- a/templates/de/emails/admin/admin_surfbar_url_depleted.tpl
+++ b/templates/de/emails/admin/admin_surfbar_url_depleted.tpl
@@ -15,11 +15,11 @@ Mitglieder-Id: $content[userid]
 ------------------------------------------
 URL angemeldet: $content[url_registered]
 ------------------------------------------
-Gesamteinblendungen: $content[views_total]
+Gesamteinblendungen: {%pipe,translateComma=$content[url_views_total]%}
 ------------------------------------------
-Maximale Einblendungen: $content[views_allowed]
+Maximale Einblendungen: {%pipe,translateComma=$content[url_views_allowed]%}
 ------------------------------------------
-Davon übrig: $content[views_max]
+Davon übrig: {%pipe,translateComma=$content[url_views_max]%}
 ------------------------------------------
 Vergütung/Aufruf: $content[reward] {?POINTS?}
 ------------------------------------------

diff --git a/templates/de/emails/admin/admin_surfbar_url_locked_deleted.tpl b/templates/de/emails/admin/admin_surfbar_url_locked_deleted.tpl
index c9b8eadf54b4bf1cb86a88f928edf512522ec0ae..a47d61ea3ec4a75c1a993fbd4d5b957ad6fd615c 100644 (file)
--- a/templates/de/emails/admin/admin_surfbar_url_locked_deleted.tpl
+++ b/templates/de/emails/admin/admin_surfbar_url_locked_deleted.tpl
@@ -23,11 +23,11 @@ Zuletzt gesperrt: $content[url_last_locked]
 ------------------------------------------
 Sperrgrund: $content[lock_reason]
 ------------------------------------------
-Gesamteinblendungen: $content[views_total]
+Gesamteinblendungen: {%pipe,translateComma=$content[url_views_total]%}
 ------------------------------------------
-Maximale Einblendungen: $content[views_allowed]
+Maximale Einblendungen: {%pipe,translateComma=$content[url_views_allowed]%}
 ------------------------------------------
-Davon übrig: $content[views_max]
+Davon übrig: {%pipe,translateComma=$content[url_views_max]%}
 ------------------------------------------
 Vergütung/Aufruf: $content[reward] {?POINTS?}
 ------------------------------------------

diff --git a/templates/de/emails/admin/admin_surfbar_url_locked_pending.tpl b/templates/de/emails/admin/admin_surfbar_url_locked_pending.tpl
index fe91558237d1f37e85c8144c5aa70b1c5f3989f0..1c74f4fde295ac5aefff5b2907e8f9d90edd7dc4 100644 (file)
--- a/templates/de/emails/admin/admin_surfbar_url_locked_pending.tpl
+++ b/templates/de/emails/admin/admin_surfbar_url_locked_pending.tpl
@@ -20,11 +20,11 @@ Zuletzt gesperrt: $content[url_last_locked]
 ------------------------------------------
 Sperrgrund: $content[lock_reason]
 ------------------------------------------
-Gesamteinblendungen: $content[views_total]
+Gesamteinblendungen: {%pipe,translateComma=$content[url_views_total]%}
 ------------------------------------------
-Maximale Einblendungen: $content[views_allowed]
+Maximale Einblendungen: {%pipe,translateComma=$content[url_views_allowed]%}
 ------------------------------------------
-Davon übrig: $content[views_max]
+Davon übrig: {%pipe,translateComma=$content[url_views_max]%}
 ------------------------------------------
 
 Mit freundlichen Grüßen,

diff --git a/templates/de/emails/admin/admin_surfbar_url_migrate.tpl b/templates/de/emails/admin/admin_surfbar_url_migrate.tpl
index 7479943354c86b9afe5bb846233a8ae9643b4c5f..b6f8af23efb9cb6b9afb66a5db6f19e478bdf164 100644 (file)
--- a/templates/de/emails/admin/admin_surfbar_url_migrate.tpl
+++ b/templates/de/emails/admin/admin_surfbar_url_migrate.tpl
@@ -13,7 +13,7 @@ $content[frametester]
 ------------------------------------------
 Mitglieder-Id: $content[userid]
 ------------------------------------------
-Status: $content[url_status]
+Status: {%pipe,translateSurfbarUrlStatus=$content[url_status]%}
 ------------------------------------------
 ID in der Surfbar: $content[insert_id]
 ------------------------------------------

diff --git a/templates/de/emails/admin/admin_surfbar_url_migrated_deleted.tpl b/templates/de/emails/admin/admin_surfbar_url_migrated_deleted.tpl
index ce03b4d33269b181197c2e00788f6630bfae25dd..7c93a02178b40d2ed05bd863c6b0317de1c09f12 100644 (file)
--- a/templates/de/emails/admin/admin_surfbar_url_migrated_deleted.tpl
+++ b/templates/de/emails/admin/admin_surfbar_url_migrated_deleted.tpl
@@ -20,11 +20,11 @@ Zuletzt gesperrt: $content[url_last_locked]
 ------------------------------------------
 Sperrgrund: $content[lock_reason]
 ------------------------------------------
-Gesamteinblendungen: $content[views_total]
+Gesamteinblendungen: {%pipe,translateComma=$content[url_views_total]%}
 ------------------------------------------
-Maximale Einblendungen: $content[views_allowed]
+Maximale Einblendungen: {%pipe,translateComma=$content[url_views_allowed]%}
 ------------------------------------------
-Davon übrig: $content[views_max]
+Davon übrig: {%pipe,translateComma=$content[url_views_max]%}
 ------------------------------------------
 
 Mit freundlichen Grüßen,

diff --git a/templates/de/emails/admin/admin_surfbar_url_migrated_migrated.tpl b/templates/de/emails/admin/admin_surfbar_url_migrated_migrated.tpl
index 1d26684b07f1728cdd5c71b2a4b52f8d1b4451ce..be0dfceb601cfec5e6ae58e23d7f4df5ec45b3dd 100644 (file)
--- a/templates/de/emails/admin/admin_surfbar_url_migrated_migrated.tpl
+++ b/templates/de/emails/admin/admin_surfbar_url_migrated_migrated.tpl
@@ -20,11 +20,11 @@ Zuletzt gesperrt: $content[url_last_locked]
 ------------------------------------------
 Sperrgrund: $content[lock_reason]
 ------------------------------------------
-Gesamteinblendungen: $content[views_total]
+Gesamteinblendungen: {%pipe,translateComma=$content[url_views_total]%}
 ------------------------------------------
-Maximale Einblendungen: $content[views_allowed] (Neu: $content[edit][limit])
+Maximale Einblendungen: {%pipe,translateComma=$content[url_views_allowed]%} (Neu: {%pipe,translateSurfbarLimit=$content[edit][limit]%})
 ------------------------------------------
-Davon übrig: $content[views_max] (Neu: $content[edit][limit])
+Davon übrig: {%pipe,translateComma=$content[url_views_max]%} (Neu: {%pipe,translateSurfbarLimit=$content[edit][limit]%})
 ------------------------------------------
 
 Mit freundlichen Grüßen,

diff --git a/templates/de/emails/admin/admin_surfbar_url_migrated_pending.tpl b/templates/de/emails/admin/admin_surfbar_url_migrated_pending.tpl
index 2eab14288f6626effac18917ba78354d7c634fa3..fc132fec9d9ea93979e64ac392cef098f1ceadce 100644 (file)
--- a/templates/de/emails/admin/admin_surfbar_url_migrated_pending.tpl
+++ b/templates/de/emails/admin/admin_surfbar_url_migrated_pending.tpl
@@ -20,11 +20,11 @@ Zuletzt gesperrt: $content[url_last_locked]
 ------------------------------------------
 Sperrgrund: $content[lock_reason]
 ------------------------------------------
-Gesamteinblendungen: $content[views_total]
+Gesamteinblendungen: {%pipe,translateComma=$content[url_views_total]%}
 ------------------------------------------
-Maximale Einblendungen: $content[views_allowed]
+Maximale Einblendungen: {%pipe,translateComma=$content[url_views_allowed]%}
 ------------------------------------------
-Davon übrig: $content[views_max]
+Davon übrig: {%pipe,translateComma=$content[url_views_max]%}
 ------------------------------------------
 
 Mit freundlichen Grüßen,

diff --git a/templates/de/emails/admin/admin_surfbar_url_pending.tpl b/templates/de/emails/admin/admin_surfbar_url_pending.tpl
index 289be22cc3b1867dce2e9f39af347e44a9fe6ddc..47bb65460cd2c974d65a4b4de9b9540affdac4ef 100644 (file)
--- a/templates/de/emails/admin/admin_surfbar_url_pending.tpl
+++ b/templates/de/emails/admin/admin_surfbar_url_pending.tpl
@@ -15,7 +15,7 @@ Mitglieder-Id: $content[userid]
 ------------------------------------------
 URL angemeldet: $content[url_registered]
 ------------------------------------------
-Status: $content[url_status]
+Status: {%pipe,translateSurfbarUrlStatus=$content[url_status]%}
 ------------------------------------------
 Vergütung/Aufruf: $content[reward] {?POINTS?}
 ------------------------------------------

diff --git a/templates/de/emails/admin/admin_surfbar_url_pending_active.tpl b/templates/de/emails/admin/admin_surfbar_url_pending_active.tpl
index bdc1d94bb69eb659d6600b1ec9bf0290b022c1d4..60e10fbaf82503617b23fdecfb421e1f0c57df50 100644 (file)
--- a/templates/de/emails/admin/admin_surfbar_url_pending_active.tpl
+++ b/templates/de/emails/admin/admin_surfbar_url_pending_active.tpl
@@ -19,11 +19,11 @@ URL angemeldet: $content[url_registered]
 Framekiller-Test:
 $content[frametester]
 ------------------------------------------
-Gesamteinblendungen: $content[views_total]
+Gesamteinblendungen: {%pipe,translateComma=$content[url_views_total]%}
 ------------------------------------------
-Maximale Einblendungen: $content[views_allowed]
+Maximale Einblendungen: {%pipe,translateComma=$content[url_views_allowed]%}
 ------------------------------------------
-Davon übrig: $content[views_max]
+Davon übrig: {%pipe,translateComma=$content[url_views_max]%}
 ------------------------------------------
 Vergütung/Aufruf: $content[reward] {?POINTS?}
 ------------------------------------------

diff --git a/templates/de/emails/admin/admin_surfbar_url_pending_deleted.tpl b/templates/de/emails/admin/admin_surfbar_url_pending_deleted.tpl
index c34989b4c720d22741e50eadd43d308676dfa022..91b40ddef32316445033de6bd67f5c6dc1184828 100644 (file)
--- a/templates/de/emails/admin/admin_surfbar_url_pending_deleted.tpl
+++ b/templates/de/emails/admin/admin_surfbar_url_pending_deleted.tpl
@@ -19,11 +19,11 @@ URL angemeldet: $content[url_registered]
 Framekiller-Test:
 $content[frametester]
 ------------------------------------------
-Gesamteinblendungen: $content[views_total]
+Gesamteinblendungen: {%pipe,translateComma=$content[url_views_total]%}
 ------------------------------------------
-Maximale Einblendungen: $content[views_allowed]
+Maximale Einblendungen: {%pipe,translateComma=$content[url_views_allowed]%}
 ------------------------------------------
-Davon übrig: $content[views_max]
+Davon übrig: {%pipe,translateComma=$content[url_views_max]%}
 ------------------------------------------
 Vergütung/Aufruf: $content[reward] {?POINTS?}
 ------------------------------------------

diff --git a/templates/de/emails/admin/admin_surfbar_url_pending_rejected.tpl b/templates/de/emails/admin/admin_surfbar_url_pending_rejected.tpl
index f760cead5cf6b1660d746ec698301489a3e28776..283ff3d9d44d5fc9fc6a66b20e0fc7629e6a5f85 100644 (file)
--- a/templates/de/emails/admin/admin_surfbar_url_pending_rejected.tpl
+++ b/templates/de/emails/admin/admin_surfbar_url_pending_rejected.tpl
@@ -19,11 +19,11 @@ URL angemeldet: $content[url_registered]
 Framekiller-Test:
 $content[frametester]
 ------------------------------------------
-Gesamteinblendungen: $content[views_total]
+Gesamteinblendungen: {%pipe,translateComma=$content[url_views_total]%}
 ------------------------------------------
-Maximale Einblendungen: $content[views_allowed]
+Maximale Einblendungen: {%pipe,translateComma=$content[url_views_allowed]%}
 ------------------------------------------
-Davon übrig: $content[views_max]
+Davon übrig: {%pipe,translateComma=$content[url_views_max]%}
 ------------------------------------------
 Vergütung/Aufruf: $content[reward] {?POINTS?}
 ------------------------------------------

diff --git a/templates/de/emails/admin/admin_surfbar_url_reg.tpl b/templates/de/emails/admin/admin_surfbar_url_reg.tpl
index 32cc1f6757b273a0c856e5d51d0f9c3d689ee1d4..966571f395e84b2c43fef7ef00b046108c7d5864 100644 (file)
--- a/templates/de/emails/admin/admin_surfbar_url_reg.tpl
+++ b/templates/de/emails/admin/admin_surfbar_url_reg.tpl
@@ -15,7 +15,7 @@ Mitglieder-Id: $content[userid]
 ------------------------------------------
 Anzahl Aufrufe: $content[limit]
 ------------------------------------------
-Status: $content[url_status]
+Status: {%pipe,translateSurfbarUrlStatus=$content[url_status]%}
 ------------------------------------------
 ID in der Surfbar: $content[insert_id]
 ------------------------------------------

diff --git a/templates/de/emails/admin/admin_surfbar_url_rejected.tpl b/templates/de/emails/admin/admin_surfbar_url_rejected.tpl
index 69be42d28c01fba874eb581cac906d1e44bc8de5..8a815490646b6a875b8e258081eea7eef3ce0173 100644 (file)
--- a/templates/de/emails/admin/admin_surfbar_url_rejected.tpl
+++ b/templates/de/emails/admin/admin_surfbar_url_rejected.tpl
@@ -13,7 +13,7 @@ Mitglieder-Id: $content[userid]
 ------------------------------------------
 Angemeldet: $content[url_registered]
 ------------------------------------------
-Status: $content[url_status]
+Status: {%pipe,translateSurfbarUrlStatus=$content[url_status]%}
 ------------------------------------------
 ID in der Surfbar: $content[url_id]
 ------------------------------------------

diff --git a/templates/de/emails/admin/admin_surfbar_url_stopped_continued.tpl b/templates/de/emails/admin/admin_surfbar_url_stopped_continued.tpl
index 74f6dd89d936a1d9d5e6d0165cb0f367a76344dc..36f3cf0bc6a2880268810c826d7820287152c5b5 100644 (file)
--- a/templates/de/emails/admin/admin_surfbar_url_stopped_continued.tpl
+++ b/templates/de/emails/admin/admin_surfbar_url_stopped_continued.tpl
@@ -20,11 +20,11 @@ Zuletzt gesperrt: $content[url_last_locked]
 ------------------------------------------
 Sperrgrund: $content[lock_reason]
 ------------------------------------------
-Gesamteinblendungen: $content[views_total]
+Gesamteinblendungen: {%pipe,translateComma=$content[url_views_total]%}
 ------------------------------------------
-Maximale Einblendungen: $content[views_allowed]
+Maximale Einblendungen: {%pipe,translateComma=$content[url_views_allowed]%}
 ------------------------------------------
-Davon übrig: $content[views_max]
+Davon übrig: {%pipe,translateComma=$content[url_views_max]%}
 ------------------------------------------
 
 Mit freundlichen Grüßen,

diff --git a/templates/de/emails/admin/admin_surfbar_url_stopped_deleted.tpl b/templates/de/emails/admin/admin_surfbar_url_stopped_deleted.tpl
index f6ab6fc6ff528dc97a7345655f1eff2c49499085..f05d6411e10e7e32126bd85825b46ff3530c19ab 100644 (file)
--- a/templates/de/emails/admin/admin_surfbar_url_stopped_deleted.tpl
+++ b/templates/de/emails/admin/admin_surfbar_url_stopped_deleted.tpl
@@ -19,11 +19,11 @@ URL angemeldet: $content[url_registered]
 Framekiller-Test:
 $content[frametester]
 ------------------------------------------
-Gesamteinblendungen: $content[views_total]
+Gesamteinblendungen: {%pipe,translateComma=$content[url_views_total]%}
 ------------------------------------------
-Maximale Einblendungen: $content[views_allowed]
+Maximale Einblendungen: {%pipe,translateComma=$content[url_views_allowed]%}
 ------------------------------------------
-Davon übrig: $content[views_max]
+Davon übrig: {%pipe,translateComma=$content[url_views_max]%}
 ------------------------------------------
 Vergütung/Aufruf: $content[reward] {?POINTS?}
 ------------------------------------------

diff --git a/templates/de/emails/admin/admin_surfbar_url_stopped_pending.tpl b/templates/de/emails/admin/admin_surfbar_url_stopped_pending.tpl
index f149f0e3b6edcf559a77403709adc2a8f4c56e8f..32f83651f07a2182a219d3063018bb70992ad53c 100644 (file)
--- a/templates/de/emails/admin/admin_surfbar_url_stopped_pending.tpl
+++ b/templates/de/emails/admin/admin_surfbar_url_stopped_pending.tpl
@@ -20,11 +20,11 @@ Zuletzt gesperrt: $content[url_last_locked]
 ------------------------------------------
 Sperrgrund: $content[lock_reason]
 ------------------------------------------
-Gesamteinblendungen: $content[views_total]
+Gesamteinblendungen: {%pipe,translateComma=$content[url_views_total]%}
 ------------------------------------------
-Maximale Einblendungen: $content[views_allowed] (Neu: $content[edit][limit])
+Maximale Einblendungen: {%pipe,translateComma=$content[url_views_allowed]%} (Neu: {%pipe,translateSurfbarLimit=$content[edit][limit]%})
 ------------------------------------------
-Davon übrig: $content[views_max] (Neu: $content[edit][limit])
+Davon übrig: {%pipe,translateComma=$content[url_views_max]%} (Neu: {%pipe,translateSurfbarLimit=$content[edit][limit]%})
 ------------------------------------------
 
 Mit freundlichen Grüßen,

diff --git a/templates/de/emails/admin/admin_surfbar_url_unlock.tpl b/templates/de/emails/admin/admin_surfbar_url_unlock.tpl
index 6cef745ddb6566707c0a53917895d92ea458e68c..6110c92bdb19de5210886a2b812a1e8ebacd6e39 100644 (file)
--- a/templates/de/emails/admin/admin_surfbar_url_unlock.tpl
+++ b/templates/de/emails/admin/admin_surfbar_url_unlock.tpl
@@ -9,7 +9,7 @@ Gebuchte URL: $content[url]
 Framekiller-Test:
 $content[frametester]
 ------------------------------------------
-Status: $content[url_status]
+Status: {%pipe,translateSurfbarUrlStatus=$content[url_status]%}
 ------------------------------------------
 Anzahl Aufrufe: $content[limit]
 ------------------------------------------

diff --git a/templates/de/emails/admin/admin_transfer_points.tpl b/templates/de/emails/admin/admin_transfer_points.tpl
index 07686687d8f3fe4e6c9a984eb79bb05fdaac8806..596a78464a4c47800d9360e3d6d25d119a1535bb 100644 (file)
--- a/templates/de/emails/admin/admin_transfer_points.tpl
+++ b/templates/de/emails/admin/admin_transfer_points.tpl
@@ -7,13 +7,13 @@ Hier alle Infos zum Transfer:
 --  Daten des Empfaengers:  --
 ------------------------------
 Mitglieder-Id: $content[recipient][userid]
-Vollst. Name: $content[recipient][gender] $content[recipient][surname] $content[recipient][family]
+Vollst. Name: {%pipe,translateGender=$content[recipient][gender]%} $content[recipient][surname] $content[recipient][family]
 Email-Adresse: $content[recipient][email]
 ------------------------------
 --   Daten des Absenders:   --
 ------------------------------
 Mitglieder-Id: $content[sender][userid]
-Vollst. Name: $content[sender][gender] $content[sender][surname] $content[sender][family]
+Vollst. Name: {%pipe,translateGender=$content[sender][gender]%} $content[sender][surname] $content[sender][family]
 Email-Adresse: $content[sender][email]
 ------------------------------
 IP-Nummer: {%server,remote_addr%}

diff --git a/templates/de/emails/del-user.tpl b/templates/de/emails/del-user.tpl
index 7a881972699e51df3763c8bb076ea2b2b9667ba6..09ddb3578cf80e435413ba00e98c862195f9a6ee 100644 (file)
--- a/templates/de/emails/del-user.tpl
+++ b/templates/de/emails/del-user.tpl
@@ -9,7 +9,7 @@ $content[text]
 Ihre Mitglieder-Id war: $userid
 ------------------------------------
 
-Ihr Guthaben von $content[points] {?POINTS?} sind hiermit verfallen.
+Ihr Guthaben von {%pipe,translateComma=$content[points]%} {?POINTS?} sind hiermit verfallen.
 
 Wir wünschen Ihnen weiterhin noch alles Gute und können Sie vielleicht irgentwann einmal wieder begruessen.
 

diff --git a/templates/de/emails/del_sponsor.tpl b/templates/de/emails/del_sponsor.tpl
index eca2f0f161ea2603c504d9da067c53c2d51fbb39..cc4d16e98a403cfbfcd8caef2674c776ba4ed62e 100644 (file)
--- a/templates/de/emails/del_sponsor.tpl
+++ b/templates/de/emails/del_sponsor.tpl
@@ -1,4 +1,4 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%sponsor,gender,translateGender=$userid%} {%sponsor,surname=$userid%} {%sponsor,family=$userid%},
 
 Einer unserer Administratoren hat soeben Ihren Account gelöscht!
 
@@ -6,7 +6,7 @@ Grund der Loeschung war folgender:
 ------------------------------------
 $content[reason]
 ------------------------------------
-Ihre Sponsor-Id war: $UID
+Ihre Sponsor-Id war: $userid
 ------------------------------------
 
 Wir wünschen Ihnen weiterhin noch alles Gute und können Sie vielleicht irgentwann einmal wieder als Sponsor begruessen.

diff --git a/templates/de/emails/lock_sponsor.tpl b/templates/de/emails/lock_sponsor.tpl
index 13a9204ad91e2f8164135ea36f8bfbed65c749a6..40c9a3ff589a673dd1b8d8a448fc4ed96cc994cd 100644 (file)
--- a/templates/de/emails/lock_sponsor.tpl
+++ b/templates/de/emails/lock_sponsor.tpl
@@ -1,7 +1,7 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%sponsor,gender,translateGender=$userid%} {%sponsor,surname=$userid%} {%sponsor,family=$userid%},
 
 --------------------------
-Ihre Sponsor-Id bei uns: $UID
+Ihre Sponsor-Id bei uns: $userid
 --------------------------
 
 $content[message]

diff --git a/templates/de/emails/member/member_beg.tpl b/templates/de/emails/member/member_beg.tpl
index 6a1737e567490b3c7d084d5161a42d7433c97ae8..a66b7c95ee1d48d667eba1bcc7b6357fab45a6aa 100644 (file)
--- a/templates/de/emails/member/member_beg.tpl
+++ b/templates/de/emails/member/member_beg.tpl
@@ -1,6 +1,6 @@
 Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
-Bei der monatlichen Bettel-Rallye haben Sie soeben Ihre $content[points] {?POINTS?} gewonnen!
+Bei der monatlichen Bettel-Rallye haben Sie soeben Ihre {%pipe,translateComma=$content[points]%} {?POINTS?} gewonnen!
 
 Herzlichen Glückwunsch!
 

diff --git a/templates/de/emails/member/member_bonus.tpl b/templates/de/emails/member/member_bonus.tpl
index 066a635515fce6d13eed83186b2798539db34002..4062427a92ca263c565edcc76ba82867c91d3315 100644 (file)
--- a/templates/de/emails/member/member_bonus.tpl
+++ b/templates/de/emails/member/member_bonus.tpl
@@ -1,6 +1,6 @@
 Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
-Bei der monatlichen Aktiv-Rallye haben Sie soeben Ihre $content[points] {?POINTS?} gewonnen!
+Bei der monatlichen Aktiv-Rallye haben Sie soeben Ihre {%pipe,translateComma=$content[points]%} {?POINTS?} gewonnen!
 
 Herzlichen Glückwunsch!
 

diff --git a/templates/de/emails/member/member_del_surfbar_urls.tpl b/templates/de/emails/member/member_del_surfbar_urls.tpl
index f33c843e0e3480bf7547040903395a6a9016ff7e..6f2a681ce4c7b90c53809bf0f52c87acb704c9a7 100644 (file)
--- a/templates/de/emails/member/member_del_surfbar_urls.tpl
+++ b/templates/de/emails/member/member_del_surfbar_urls.tpl
@@ -8,7 +8,7 @@ Gebuchte URL: $content[url]
 ------------------------------------------
 Ihre Mitglieder-Id: $content[userid]
 ------------------------------------------
-Aufrufe gesamt: $content[views_total]
+Aufrufe gesamt: {%pipe,translateComma=$content[url_views_total]%}
 ------------------------------------------
 Angemeldet: $content[url_registered]
 ------------------------------------------

diff --git a/templates/de/emails/member/member_edit_surfbar_urls.tpl b/templates/de/emails/member/member_edit_surfbar_urls.tpl
index 557b50046b2064945874db96a6637c7d53c736af..ad6ca789a73a88c084360512e3845700e8a0cef5 100644 (file)
--- a/templates/de/emails/member/member_edit_surfbar_urls.tpl
+++ b/templates/de/emails/member/member_edit_surfbar_urls.tpl
@@ -6,7 +6,7 @@ Hier sind alle Daten dazu:
 ------------------------------------------
 Gebuchte URL: $content[url]
 ------------------------------------------
-Aufrufe gesamt: $content[views_total]
+Aufrufe gesamt: {%pipe,translateComma=$content[url_views_total]%}
 ------------------------------------------
 Angemeldet: $content[url_registered]
 ------------------------------------------

diff --git a/templates/de/emails/member/member_mydata_notify.tpl b/templates/de/emails/member/member_mydata_notify.tpl
index 5e69269da0d02a3991c8c2611bf11b0e7d96cc71..70706d9e8ccb1bd4c407073dd07fae3f9d773191 100644 (file)
--- a/templates/de/emails/member/member_mydata_notify.tpl
+++ b/templates/de/emails/member/member_mydata_notify.tpl
@@ -8,7 +8,7 @@ Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,fa
 {--SURNAME--}: {%user,surname=$userid%}
 {--FAMILY--}: {%user,family=$userid%}
 {--STREET_NR--}: {%user,street_nr=$userid%}
-{--COUNTRY--}: $content[country]
+{--COUNTRY--}: {%user,county,determineCountry=$userid%}
 {--ZIP--}: {%user,zip,bigintval=$userid%}
 {--CITY--}: {%user,city=$userid%}
 {--EMAIL--}: {%user,email=$userid%}

diff --git a/templates/de/emails/member/member_surfbar_url_active_pending.tpl b/templates/de/emails/member/member_surfbar_url_active_pending.tpl
index f3ed2bd1e447c084ff6d77a6b8e87ea2f4f4ec42..14fef75ab63ba4b2aa147d94f3c60ba0740c7f2d 100644 (file)
--- a/templates/de/emails/member/member_surfbar_url_active_pending.tpl
+++ b/templates/de/emails/member/member_surfbar_url_active_pending.tpl
@@ -16,7 +16,7 @@ Zuletzt gesperrt: $content[url_last_locked]
 ------------------------------------------
 Sperrgrund: $content[lock_reason]
 ------------------------------------------
-Neue maximale Einblendungen: $content[edit][limit]
+Neue maximale Einblendungen: {%pipe,translateSurfbarLimit=$content[edit][limit]%}
 ------------------------------------------
 
 Mit freundlichen Grüßen,

diff --git a/templates/de/emails/member/member_surfbar_url_confirmed.tpl b/templates/de/emails/member/member_surfbar_url_confirmed.tpl
index 1af3c4f58645cc8ca16744d375ed5749fbbd9659..aa255d7d15fbf15886fdb6238aefb3379e46f636 100644 (file)
--- a/templates/de/emails/member/member_surfbar_url_confirmed.tpl
+++ b/templates/de/emails/member/member_surfbar_url_confirmed.tpl
@@ -8,7 +8,7 @@ Gebuchte URL: $content[url]
 ------------------------------------------
 Ihre Mitglieder-Id: $content[userid]
 ------------------------------------------
-Status: $content[url_status]
+Status: {%pipe,translateSurfbarUrlStatus=$content[url_status]%};
 ------------------------------------------
 ID in der Surfbar: $content[url_id]
 ------------------------------------------

diff --git a/templates/de/emails/member/member_surfbar_url_depleted.tpl b/templates/de/emails/member/member_surfbar_url_depleted.tpl
index 243c4bf9adac329aea784018de125e0595d84d2c..f9a2be126f02abc197a55e23dd12adf207d7b192 100644 (file)
--- a/templates/de/emails/member/member_surfbar_url_depleted.tpl
+++ b/templates/de/emails/member/member_surfbar_url_depleted.tpl
@@ -8,15 +8,15 @@ Gebuchte URL: $content[url]
 ------------------------------------------
 Ihre Mitglieder-Id: $content[userid]
 ------------------------------------------
-Status: $content[url_status]
+Status: {%pipe,translateSurfbarUrlStatus=$content[url_status]%}
 ------------------------------------------
 Datum der Buchung: $content[url_registered]
 ------------------------------------------
-Gesamteinblendungen: $content[views_total]
+Gesamteinblendungen: {%pipe,translateComma=$content[url_views_total]%}
 ------------------------------------------
-Maximale Einblendungen: $content[views_allowed]
+Maximale Einblendungen: {%pipe,translateComma=$content[url_views_allowed]%}
 ------------------------------------------
-Davon übrig: $content[views_max]
+Davon übrig: {%pipe,translateComma=$content[url_views_max]%}
 ------------------------------------------
 Kosten/Aufruf: $content[costs] {?POINTS?}
 ------------------------------------------

diff --git a/templates/de/emails/member/member_surfbar_url_migrate.tpl b/templates/de/emails/member/member_surfbar_url_migrate.tpl
index ccdb5a615e81064c881206f402b1ada1d5ce5525..47b5d210644decb98c13d82143b9a1bde03a1732 100644 (file)
--- a/templates/de/emails/member/member_surfbar_url_migrate.tpl
+++ b/templates/de/emails/member/member_surfbar_url_migrate.tpl
@@ -8,7 +8,7 @@ Gebuchte URL: $content[url]
 ------------------------------------------
 Ihre Mitglieder-Id: $content[userid]
 ------------------------------------------
-Status: $content[url_status]
+Status: {%pipe,translateSurfbarUrlStatus=$content[url_status]%}
 ------------------------------------------
 ID in der Surfbar: $content[insert_id]
 ------------------------------------------

diff --git a/templates/de/emails/member/member_surfbar_url_migrated_migrated.tpl b/templates/de/emails/member/member_surfbar_url_migrated_migrated.tpl
index 6aefb5e2c08b5460bf39973c018701b303bfb6c8..4a07662c56fa1519b6a6d7400144001a1adcdaca 100644 (file)
--- a/templates/de/emails/member/member_surfbar_url_migrated_migrated.tpl
+++ b/templates/de/emails/member/member_surfbar_url_migrated_migrated.tpl
@@ -12,7 +12,7 @@ ID in der Surfbar: $content[url_id]
 ------------------------------------------
 URL angemeldet: $content[url_registered]
 ------------------------------------------
-Neue maximale Einblendungen: $content[edit][limit]
+Neue maximale Einblendungen: {%pipe,translateSurfbarLimit=$content[edit][limit]%}
 ------------------------------------------
 
 Mit freundlichen Grüßen,

diff --git a/templates/de/emails/member/member_surfbar_url_pending.tpl b/templates/de/emails/member/member_surfbar_url_pending.tpl
index 558ad5b39fc499ed3a613540ffffa5fecbf18cc2..0a87664f48d47b2bc04ffc8849e6e5e9f48c6dfb 100644 (file)
--- a/templates/de/emails/member/member_surfbar_url_pending.tpl
+++ b/templates/de/emails/member/member_surfbar_url_pending.tpl
@@ -8,7 +8,7 @@ Gebuchte URL: $content[url]
 ------------------------------------------
 Ihre Mitglieder-Id: $content[userid]
 ------------------------------------------
-Status: $content[url_status]
+Status: {%pipe,translateSurfbarUrlStatus=$content[url_status]%}
 ------------------------------------------
 Datum der Buchung: $content[url_registered]
 ------------------------------------------

diff --git a/templates/de/emails/member/member_surfbar_url_reg.tpl b/templates/de/emails/member/member_surfbar_url_reg.tpl
index 95d26088a25353f9f1a4ed5a79aca733abc99ecc..40b867bcb3f31437f56221fd18e6ddc4e43b5d1c 100644 (file)
--- a/templates/de/emails/member/member_surfbar_url_reg.tpl
+++ b/templates/de/emails/member/member_surfbar_url_reg.tpl
@@ -10,7 +10,7 @@ Ihre Mitglieder-Id: $content[userid]
 ------------------------------------------
 Anzahl Aufrufe: $content[limit]
 ------------------------------------------
-Status: $content[url_status]
+Status: {%pipe,translateSurfbarUrlStatus=$content[url_status]%}
 ------------------------------------------
 ID in der Surfbar: $content[insert_id]
 ------------------------------------------

diff --git a/templates/de/emails/member/member_surfbar_url_rejected.tpl b/templates/de/emails/member/member_surfbar_url_rejected.tpl
index c6d58f5ddd7fc16752adfbd3d18a8c49095efc29..b794eea6a40e39a44bfb9238ef12e10c2188f85b 100644 (file)
--- a/templates/de/emails/member/member_surfbar_url_rejected.tpl
+++ b/templates/de/emails/member/member_surfbar_url_rejected.tpl
@@ -8,7 +8,7 @@ Gebuchte URL: $content[url]
 ------------------------------------------
 Ihre Mitglieder-Id: $content[userid]
 ------------------------------------------
-Status: $content[url_status]
+Status: {%pipe,translateSurfbarUrlStatus=$content[url_status]%}
 ------------------------------------------
 ID in der Surfbar: $content[url_id]
 ------------------------------------------

diff --git a/templates/de/emails/member/member_surfbar_url_stopped_continued.tpl b/templates/de/emails/member/member_surfbar_url_stopped_continued.tpl
index b00ce3798635ec375df36dc0cec29b805de4e06f..9d8e6aeed62ae1fd515c1190087cb441ee36bfd7 100644 (file)
--- a/templates/de/emails/member/member_surfbar_url_stopped_continued.tpl
+++ b/templates/de/emails/member/member_surfbar_url_stopped_continued.tpl
@@ -16,7 +16,7 @@ Zuletzt gesperrt: $content[url_last_locked]
 ------------------------------------------
 Sperrgrund: $content[lock_reason]
 ------------------------------------------
-Neue maximale Einblendungen: $content[edit][limit]
+Neue maximale Einblendungen: {%pipe,translateSurfbarLimit=$content[edit][limit]%}
 ------------------------------------------
 
 Mit freundlichen Grüßen,

diff --git a/templates/de/emails/member/member_surfbar_url_stopped_pending.tpl b/templates/de/emails/member/member_surfbar_url_stopped_pending.tpl
index a8ce779e85de0bfdc6c195b4d6547c262bb103fc..9ee7bc1fcc3bb3e80978cdde888dfae177cedac5 100644 (file)
--- a/templates/de/emails/member/member_surfbar_url_stopped_pending.tpl
+++ b/templates/de/emails/member/member_surfbar_url_stopped_pending.tpl
@@ -16,7 +16,7 @@ Zuletzt gesperrt: $content[url_last_locked]
 ------------------------------------------
 Sperrgrund: $content[lock_reason]
 ------------------------------------------
-Neue maximale Einblendungen: $content[edit][limit]
+Neue maximale Einblendungen: {%pipe,translateSurfbarLimit=$content[edit][limit]%}
 ------------------------------------------
 
 Mit freundlichen Grüßen,

diff --git a/templates/de/emails/member/member_surfbar_url_unlock.tpl b/templates/de/emails/member/member_surfbar_url_unlock.tpl
index ce702754bf479a22e2ef8249ffa02fa92e281182..9aa05ec73460b2fc075c7e80d5d85c208d46b136 100644 (file)
--- a/templates/de/emails/member/member_surfbar_url_unlock.tpl
+++ b/templates/de/emails/member/member_surfbar_url_unlock.tpl
@@ -8,7 +8,7 @@ Gebuchte URL: $content[url]
 ------------------------------------------
 Ihre Mitglieder-Id: $content[userid]
 ------------------------------------------
-Status: $content[url_status]
+Status: {%pipe,translateSurfbarUrlStatus=$content[url_status]%}
 ------------------------------------------
 Anzahl Aufrufe: $content[limit]
 ------------------------------------------

diff --git a/templates/de/emails/member/member_transfer_recipient.tpl b/templates/de/emails/member/member_transfer_recipient.tpl
index 621562246f0866d687e52d1af4fe848d721371b8..2845e5d7edd20bfcd8a1627722da13e8539adf49 100644 (file)
--- a/templates/de/emails/member/member_transfer_recipient.tpl
+++ b/templates/de/emails/member/member_transfer_recipient.tpl
@@ -1,10 +1,10 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,gender,translateGender=$content[recipient][gender]%} {%user,surname=$content[recipient][surname]%} {%user,family=$content[recipient][family]%},
 
 Sie haben soeben eine {?POINTS?}-Überweisung von einem unserer Mitglieder erhalten!
 
 Hier sind nochmals alle Transaktionsdaten:
 ------------------------------
-Ihr Mitglieder-Id ist: $userid
+Ihr Mitglieder-Id ist: $content[recipient][userid]
 ------------------------------
 --   Daten des Absenders:   --
 ------------------------------

diff --git a/templates/de/emails/member/member_transfer_sender.tpl b/templates/de/emails/member/member_transfer_sender.tpl
index 84bb3cc9ee2fdcf7b865fdfe3303cfea563ad17f..20c3c416410607aef1bb9a293e425107f7f228a0 100644 (file)
--- a/templates/de/emails/member/member_transfer_sender.tpl
+++ b/templates/de/emails/member/member_transfer_sender.tpl
@@ -1,10 +1,10 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,gender,translateGender=$content[sender][gender]%} {%user,surname=$content[sender][surname]%} {%user,family=$content[sender][family]%},
 
 Sie haben soeben eine {?POINTS?}-Überweisung an eines unserer Mitglieder abgeschlossen!
 
 Hier sind nochmals alle Transaktionsdaten:
 ------------------------------
-Ihr Mitglieder-Id ist: $userid
+Ihr Mitglieder-Id ist: $content[sender][userid]
 ------------------------------
 --  Daten des Empfaengers:  --
 ------------------------------

diff --git a/templates/de/emails/register-admin.tpl b/templates/de/emails/register-admin.tpl
index ff38e58004b0512f122038e240f682c35865dff8..fad26995d72274bb62f2db43d7c9b47190030036 100644 (file)
--- a/templates/de/emails/register-admin.tpl
+++ b/templates/de/emails/register-admin.tpl
@@ -8,7 +8,7 @@ Anrede: {%user,gender,translateGender=$userid%}
 Vorname: {%user,surname=$userid%}
 Nachname: {%user,family=$userid%}
 Straße und Hausnummer: $content[street]
-Ländercode: $content[country]
+Ländercode: {%user,county,determineCountry=$userid%}
 Postleitzahl: {%user,zip,bigintval=$userid%}
 Wohnort: {%user,city=$userid%}
 Email-Adresse: {%user,email=$userid%}

diff --git a/templates/de/emails/register-member.tpl b/templates/de/emails/register-member.tpl
index 48f6e06c1e4b16cb10e6c4d60b12f032a4026832..6371f9adc4ca61e7b99de256b00ae87c7223b907 100644 (file)
--- a/templates/de/emails/register-member.tpl
+++ b/templates/de/emails/register-member.tpl
@@ -8,7 +8,7 @@ Anrede: {%user,gender,translateGender=$userid%}
 Vorname: {%user,surname=$userid%}
 Nachname: {%user,family=$userid%}
 Straße und Hausnummer: $content[street]
-Ländercode: $content[country]
+Ländercode: {%user,county,determineCountry=$userid%}
 Postleitzahl: {%user,zip,bigintval=$userid%}
 Wohnort: {%user,city=$userid%}
 Email-Adresse: {%user,email=$userid%}

diff --git a/templates/de/emails/sponsor/sponsor_activate.tpl b/templates/de/emails/sponsor/sponsor_activate.tpl
index 68b5c14010a68e96c9fe85de5fd879f23c97a704..12226be3eb68771ab06cf20fe7fd56f2eda71889 100644 (file)
--- a/templates/de/emails/sponsor/sponsor_activate.tpl
+++ b/templates/de/emails/sponsor/sponsor_activate.tpl
@@ -1,4 +1,4 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%sponsor,gender,translateGender=$userid%} {%sponsor,surname=$userid%} {%sponsor,family=$userid%},
 
 Sie (oder ein anderer mit der IP-Nummer {%server,remote_addr%}) haben soeben Ihren Bestätigungslink erneut angefordert.
 

diff --git a/templates/de/emails/sponsor/sponsor_add_points.tpl b/templates/de/emails/sponsor/sponsor_add_points.tpl
index 522cda9e2b2dc41797a8daa53272c11d7c744ac8..9821c77581525aa0c167b0791d5cbb2cd7905136 100644 (file)
--- a/templates/de/emails/sponsor/sponsor_add_points.tpl
+++ b/templates/de/emails/sponsor/sponsor_add_points.tpl
@@ -1,4 +1,4 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%sponsor,gender,translateGender=$userid%} {%sponsor,surname=$userid%} {%sponsor,family=$userid%},
 
 Einer unserer Administratoren hat Ihnen soeben $content[points] {?POINTS?} Ihrem Sponsoren-Account mit der id $content[id] gutgeschrieben!
 

diff --git a/templates/de/emails/sponsor/sponsor_change_data.tpl b/templates/de/emails/sponsor/sponsor_change_data.tpl
index 1cfd3b3f64b6e1679ba655a07a8edbeb8b096ca0..e0222fb18f3bda7d80502a4482a359193f946039 100644 (file)
--- a/templates/de/emails/sponsor/sponsor_change_data.tpl
+++ b/templates/de/emails/sponsor/sponsor_change_data.tpl
@@ -4,15 +4,15 @@ Sie haben heute Ihre Daten geaendert.
 
 Hier sind alle neuen (und in Klammern alten) Daten:
 ------------------------------
-{--SPONSOR_ENTER_COMPANY_TITLE--}: $DATA[company] ($content[company])
-{--SPONSOR_ENTER_COMPANY_POSITION--}: $DATA[position] ($content[position])
-{--SPONSOR_ENTER_TAX_IDENT--}: $DATA[tax_ident] ($content[tax_ident])
-------------------------------
-{--GUEST_GENDER--}: $DATA[gender] ($content[gender])
-{--SURNAME_FAMILY--}: $DATA[surname] $DATA[family] ($content[surname] $content[family])
-{--SPONSOR_EMAIL_STREET_NR1--}: $DATA[street_nr1] ($content[street_nr1])
-{--SPONSOR_EMAIL_STREET_NR2--}: $DATA[street_nr2] ($content[street_nr2])
-{--SPONSOR_EMAIL_CNTRY_ZIP_CITY--}: $DATA[country]-$DATA[zip] $DATA[city] ($content[country]-$content[zip] $content[city])
+{--SPONSOR_ENTER_COMPANY_TITLE--}: $DATA[company] ({%sponsor,company=$userid%})
+{--SPONSOR_ENTER_COMPANY_POSITION--}: $DATA[position] ({%sponsor,position=$userid%})
+{--SPONSOR_ENTER_TAX_IDENT--}: $DATA[tax_ident] ({%sponsor,tax_ident=$userid%})
+------------------------------
+{--GUEST_GENDER--}: $DATA[gender] ({%sponsor,gender,translateGender=$userid%})
+{--SURNAME_FAMILY--}: $DATA[surname] $DATA[family] ({%sponsor,surname=$userid%} {%sponsor,family=$userid%})
+{--SPONSOR_EMAIL_STREET_NR1--}: $DATA[street_nr1] ({%sponsor,street_nr1=$userid%})
+{--SPONSOR_EMAIL_STREET_NR2--}: $DATA[street_nr2] ({%sponsor,street_nr2=$userid%})
+{--SPONSOR_EMAIL_CNTRY_ZIP_CITY--}: $DATA[country]-$DATA[zip] $DATA[city] ({%sponsor,county,determineCountry=$userid%}-{%sponsor,zip,bigintval=$userid%} {%sponsor,city=$userid%})
 ------------------------------
 {--SPONSOR_ENTER_PHONE--}: $DATA[phone] ($content[phone])
 {--SPONSOR_ENTER_FAX--}: $DATA[fax] ($content[fax])

diff --git a/templates/de/emails/sponsor/sponsor_confirm.tpl b/templates/de/emails/sponsor/sponsor_confirm.tpl
index d2c36f411903659023d14150fd6fe87e540b5dce..112316a99969e58a774999e2aeb2476b893aad73 100644 (file)
--- a/templates/de/emails/sponsor/sponsor_confirm.tpl
+++ b/templates/de/emails/sponsor/sponsor_confirm.tpl
@@ -1,4 +1,4 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%sponsor,gender,translateGender=$userid%} {%sponsor,surname=$userid%} {%sponsor,family=$userid%},
 
 Sie (oder ein anderer mit der IP-Nummer {%server,remote_addr%}) haben sich soeben als Sponsor zu unserem {?mt_word?} angemeldet. Sie haben somit den ersten Schritt zu uns getan wofür wir uns sehr bedanken.
 

diff --git a/templates/de/emails/sponsor/sponsor_email.tpl b/templates/de/emails/sponsor/sponsor_email.tpl
index e5610b6fba7c3bf318b4d6c33d4ac9b96995c52e..0535d99cb342f42903ab17770fc8da2c00b04707 100644 (file)
--- a/templates/de/emails/sponsor/sponsor_email.tpl
+++ b/templates/de/emails/sponsor/sponsor_email.tpl
@@ -1,4 +1,4 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%sponsor,gender,translateGender=$userid%} {%sponsor,surname=$userid%} {%sponsor,family=$userid%},
 
 Sie hatten bei uns Ihre EMail-Adresse geändert und den Bestätigungslink erneut angefordert. Hier sind nun alle nötigen Daten dazu.
 

diff --git a/templates/de/emails/sponsor/sponsor_lost.tpl b/templates/de/emails/sponsor/sponsor_lost.tpl
index f55d91f3631c7c04d2cfe4453616ce7ee954718f..d3e246943ad80e3bc4c38094be705eaac4eb9a14 100644 (file)
--- a/templates/de/emails/sponsor/sponsor_lost.tpl
+++ b/templates/de/emails/sponsor/sponsor_lost.tpl
@@ -1,4 +1,4 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%sponsor,gender,translateGender=$userid%} {%sponsor,surname=$userid%} {%sponsor,family=$userid%},
 
 Sie (oder ein anderer mit der IP-Nummer {%server,remote_addr%}) haben soeben ein neues Passwort angefordert.
 

diff --git a/templates/de/emails/sponsor/sponsor_pending.tpl b/templates/de/emails/sponsor/sponsor_pending.tpl
index 07653983eb6ad93ec12b18e9cc096aae3925d88b..b8a8f8eb8f59ca6d54f0e1badaa5b8310e96aca4 100644 (file)
--- a/templates/de/emails/sponsor/sponsor_pending.tpl
+++ b/templates/de/emails/sponsor/sponsor_pending.tpl
@@ -1,13 +1,13 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%sponsor,gender,translateGender=$userid%} {%sponsor,surname=$userid%} {%sponsor,family=$userid%},
 
 Sie haben soeben Ihre EMail-Adresse bestätigt. Dies wurde von der IP-Nummer {%server,remote_addr%} aus durchgefuehrt.
 
 Wir werden uns bald mit Ihnen in Verbindung setzen und Ihnen unsere Kontodaten mitteilen. Zu unserer Sicherheit haben wir diese hier nicht aufgelistet. Bitte notieren Sie sich vorab folgende Daten:
 
 ------------------------------
-Verwendungszweck: SPONSOR: $content[id],$content[points]
+Verwendungszweck: SPONSOR: $content[id], {%pipe,translateComma=$content[points]%}
 ------------------------------
-Zu überweisender Betrag: $content[pay] $content[curr]
+Zu überweisender Betrag: {%pipe,translateComma=$content[pay]%} $content[curr]
 ------------------------------
 
 Hier sind nochmals alle Ihre Daten aus der Anmeldung:
@@ -17,31 +17,31 @@ Ihre Sponsor-Id lautet: $content[id]
 ------------------------------
 -- Persoenliche Daten:      --
 ------------------------------
-Anrede: $content[gender]
+Anrede: {%sponsor,gender,translateGender=$userid%}
 ------------------------------
-Vorname: $content[surname]
+Vorname: {%sponsor,surname=$userid%}
 ------------------------------
-Nachname: $content[family]
+Nachname: {%sponsor,family=$userid%}
 ------------------------------
 -- Firmendaten:             --
 ------------------------------
-Firmenname: $content[company]
+Firmenname: {%sponsor,company=$userid%}
 ------------------------------
-Position: $content[position]
+Position: {%sponsor,position=$userid%}
 ------------------------------
-Ust-Ident-Nr.: $content[tax_ident]
+Ust-Ident-Nr.: {%sponsor,tax_ident=$userid%}
 ------------------------------
 -- Kontaktdaten:            --
 ------------------------------
-Strasse, Zeile 1: $content[street_nr1]
+Strasse, Zeile 1: {%sponsor,street_nr1=$userid%}
 ------------------------------
-Strasse, Zeile 2: $content[street_nr2]
+Strasse, Zeile 2: {%sponsor,street_nr2=$userid%}
 ------------------------------
-Ländercode: $content[country]
+Ländercode: {%sponsor,county,determineCountry=$userid%}
 ------------------------------
-Postleitzahl: $content[zip]
+Postleitzahl: {%sponsor,zip,bigintval=$userid%}
 ------------------------------
-Wohnort: $content[city]
+Wohnort: {%sponsor,city=$userid%}
 ------------------------------
 Telefonnummer: $content[phone]
 ------------------------------

diff --git a/templates/de/emails/sponsor/sponsor_ref_notify.tpl b/templates/de/emails/sponsor/sponsor_ref_notify.tpl
index 7055e7bffbd0485fa9afdda788977553e2340279..0501eae161770a77e9839c984fc421232f219db7 100644 (file)
--- a/templates/de/emails/sponsor/sponsor_ref_notify.tpl
+++ b/templates/de/emails/sponsor/sponsor_ref_notify.tpl
@@ -1,4 +1,4 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%sponsor,gender,translateGender=$userid%} {%sponsor,surname=$userid%} {%sponsor,family=$userid%},
 
 ------------------------------
 Ihre Sponsor-Id lautet: $content[id]

diff --git a/templates/de/emails/sponsor/sponsor_settings.tpl b/templates/de/emails/sponsor/sponsor_settings.tpl
index f0f8c1f9c7618953bbaf41d63da210d32b57d6b3..8bab2cf8d1a21277e66a2e0a64b6228782c00a60 100644 (file)
--- a/templates/de/emails/sponsor/sponsor_settings.tpl
+++ b/templates/de/emails/sponsor/sponsor_settings.tpl
@@ -1,4 +1,4 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%sponsor,gender,translateGender=$userid%} {%sponsor,surname=$userid%} {%sponsor,family=$userid%},
 
 Sie haben heute Ihre Einstellungen geaendert.
 

diff --git a/templates/de/emails/sponsor/sponsor_sub_points.tpl b/templates/de/emails/sponsor/sponsor_sub_points.tpl
index fbadf2f9682a47926ed0d3e57f81ca54e247140a..9f526fd7f66466e71dcb1ceb8dac27f3c0c802be 100644 (file)
--- a/templates/de/emails/sponsor/sponsor_sub_points.tpl
+++ b/templates/de/emails/sponsor/sponsor_sub_points.tpl
@@ -1,4 +1,4 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%sponsor,gender,translateGender=$userid%} {%sponsor,surname=$userid%} {%sponsor,family=$userid%},
 
 Einer unserer Administratoren hat Ihnen soeben $content[points] {?POINTS?} von Ihrem Sponsoren-Account mit der id $content[id] abgezogen!
 

diff --git a/templates/de/emails/sponsor/sponsor_unlock.tpl b/templates/de/emails/sponsor/sponsor_unlock.tpl
index 68b5c14010a68e96c9fe85de5fd879f23c97a704..12226be3eb68771ab06cf20fe7fd56f2eda71889 100644 (file)
--- a/templates/de/emails/sponsor/sponsor_unlock.tpl
+++ b/templates/de/emails/sponsor/sponsor_unlock.tpl
@@ -1,4 +1,4 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%sponsor,gender,translateGender=$userid%} {%sponsor,surname=$userid%} {%sponsor,family=$userid%},
 
 Sie (oder ein anderer mit der IP-Nummer {%server,remote_addr%}) haben soeben Ihren Bestätigungslink erneut angefordert.
 

diff --git a/templates/de/emails/sponsor/sponsor_unlocked.tpl b/templates/de/emails/sponsor/sponsor_unlocked.tpl
index b4df5cdf303bbb0583bbde37896d33938e3770f1..bf5a339c59b0c5f892a596fa63610136d9d2bbce 100644 (file)
--- a/templates/de/emails/sponsor/sponsor_unlocked.tpl
+++ b/templates/de/emails/sponsor/sponsor_unlocked.tpl
@@ -1,4 +1,4 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%sponsor,gender,translateGender=$userid%} {%sponsor,surname=$userid%} {%sponsor,family=$userid%},
 
 ------------------------------
 Ihre Sponsor-Id lautet: $content[sponsor]

diff --git a/templates/de/html/admin/admin_add_network_params.tpl b/templates/de/html/admin/admin_add_network_params.tpl
index 86d6d6feab7715563328140c5f61d4f44cf770e2..3161f4a82e7ef7f4403d37a4d3c516b28b5f1566 100644 (file)
--- a/templates/de/html/admin/admin_add_network_params.tpl
+++ b/templates/de/html/admin/admin_add_network_params.tpl
@@ -3,7 +3,7 @@
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td class="admin_title bottom" colspan="2" align="center">
-                       <strong>{--ADMIN_NETWORK_REQUEST_PARAMS_ADD_TITLE--}</strong>
+                       <strong>{--ADMIN_NETWORK_REQUEST_PARAMETER_ADD_TITLE--}</strong>
                        <div class="tiny">
                                (<a href="$content[network_reflink]" title="$content[network_title]" target="_blank">$content[network_title]</a>)
                        </div>
@@ -13,26 +13,26 @@
                <td align="right" width="250">{--ADMIN_NETWORK_TYPE_SELECT--}:</td>
                <td>
                        <select name="network_type_id" class="admin_select" size="1">
-                               $content[type_options]
+                               {%pipe,generateNetworkTypeOptions,$content[network_id]%}
                        </select>
                </td>
        </tr>
        <tr>
-               <td align="right" width="250">{--ADMIN_NETWORK_REQUEST_PARAMS_KEY--}:</td>
+               <td align="right" width="250">{--ADMIN_NETWORK_REQUEST_PARAMETER_KEY--}:</td>
                <td>
                        <select name="request_param_key" class="admin_select" size="1">
-                               $content[key_options]
+                               {%pipe,generateNetworkRequestKeyOptions%}
                        </select>
                </td>
        </tr>
        <tr>
-               <td align="right" width="250">{--ADMIN_NETWORK_REQUEST_PARAMS_VALUE--}:</td>
+               <td align="right" width="250">{--ADMIN_NETWORK_REQUEST_PARAMETER_VALUE--}:</td>
                <td>
                        <input type="text" name="request_param_value" class="admin_normal" size="10" maxlength="10" />
                </td>
        </tr>
        <tr>
-               <td class="bottom" align="right" width="250">{--ADMIN_NETWORK_REQUEST_PARAMS_DEFAULT--}:</td>
+               <td class="bottom" align="right" width="250">{--ADMIN_NETWORK_REQUEST_PARAMETER_DEFAULT--}:</td>
                <td class="bottom">
                        <input type="text" name="request_param_default" class="admin_normal" size="10" maxlength="255" />
                </td>
@@ -40,7 +40,7 @@
        <tr>
                <td class="admin_footer" colspan="2" align="center">
                        <input type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" name="ok" class="admin_submit" value="{--ADMIN_NETWORK_REQUEST_PARAMS_ADD--}" />
+                       <input type="submit" name="ok" class="admin_submit" value="{--ADMIN_NETWORK_REQUEST_PARAMETER_ADD--}" />
                </td>
        </tr>
 </table>
@@ -48,5 +48,5 @@
 </div>
 
 <div class="admin_note">
-       {--ADMIN_NETWORK_REQUEST_PARAMS_ADD_NOTE--}
+       {--ADMIN_NETWORK_REQUEST_PARAMETER_ADD_NOTE--}
 </div>

diff --git a/templates/de/html/admin/admin_amenu_edit_form.tpl b/templates/de/html/admin/admin_amenu_edit_form.tpl
index a05516d6bd5d8550fd69258d03f40ff0800ceac7..0e32c29198acdd519bf93519956fedd7a241326b 100644 (file)
--- a/templates/de/html/admin/admin_amenu_edit_form.tpl
+++ b/templates/de/html/admin/admin_amenu_edit_form.tpl
@@ -8,7 +8,7 @@
        </tr>
        <tr>
                <td align="center" colspan="2" class="admin_title bottom">
-                       {%message,EDIT_MENU,$content[chk]%}
+                       {%message,EDIT_MENU=$content[chk]%}
                </td>
        </tr>
        $content[rows]

diff --git a/templates/de/html/admin/admin_del_network_params.tpl b/templates/de/html/admin/admin_del_network_params.tpl
index 1c7409675373cbf35c71d665b49a139ca482cd03..4f35e59e952c5022f83023e40d647dbb83a6e00d 100644 (file)
--- a/templates/de/html/admin/admin_del_network_params.tpl
+++ b/templates/de/html/admin/admin_del_network_params.tpl
@@ -4,7 +4,7 @@
        <tr>
                <td align="center" class="admin_title bottom" height="25" colspan="2">
                        <div>
-                               <strong>{--ADMIN_NETWORK_REQUEST_PARAMS_DELETE_TITLE--}</strong>
+                               <strong>{--ADMIN_NETWORK_REQUEST_PARAMETER_DELETE_TITLE--}</strong>
                        </div>
                        <div class="tiny">
                                (<a href="$content[network_data][network_reflink]" title="$content[network_data][network_title]" target="_blank">$content[network_data][network_title]</a>)
@@ -15,13 +15,13 @@
        <tr>
                <td colspan="2" class="admin_footer">
                        <input type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" name="remove" class="admin_submit" value="{--ADMIN_NETWORK_REQUEST_PARAMS_REMOVE--}" />
+                       <input type="submit" name="remove" class="admin_submit" value="{--ADMIN_NETWORK_REQUEST_PARAMETER_REMOVE--}" />
                </td>
        </tr>
 </table>
 </form>
 
 <div class="admin_note">
-       {--ADMIN_NETWORK_REQUEST_PARAMS_LIST_NOTE--}
+       {--ADMIN_NETWORK_REQUEST_PARAMETER_LIST_NOTE--}
 </div>
 </div>

diff --git a/templates/de/html/admin/admin_del_network_params_row.tpl b/templates/de/html/admin/admin_del_network_params_row.tpl
index ccc39d5306b4720f79343a9b688c5ed4c3133a87..04e926527f116286a5e91c102290abe913c9814d 100644 (file)
--- a/templates/de/html/admin/admin_del_network_params_row.tpl
+++ b/templates/de/html/admin/admin_del_network_params_row.tpl
@@ -6,19 +6,19 @@
        </td>
 </tr>
 <tr>
-       <td class="switch_sw$content[sw]" style="padding-left:5px">{--ADMIN_NETWORK_REQUEST_PARAMS_KEY--}:</td>
+       <td class="switch_sw$content[sw]" style="padding-left:5px">{--ADMIN_NETWORK_REQUEST_PARAMETER_KEY--}:</td>
        <td class="switch_sw$content[sw]">
                $content[request_param_key]
        </td>
 </tr>
 <tr>
-       <td class="switch_sw$content[sw]" style="padding-left:5px">{--ADMIN_NETWORK_REQUEST_PARAMS_VALUE--}:</td>
+       <td class="switch_sw$content[sw]" style="padding-left:5px">{--ADMIN_NETWORK_REQUEST_PARAMETER_VALUE--}:</td>
        <td class="switch_sw$content[sw]">
                $content[request_param_value]
        </td>
 </tr>
 <tr>
-       <td class="switch_sw$content[sw] bottom" style="padding-left:5px">{--ADMIN_NETWORK_REQUEST_PARAMS_DEFAULT--}:</td>
+       <td class="switch_sw$content[sw] bottom" style="padding-left:5px">{--ADMIN_NETWORK_REQUEST_PARAMETER_DEFAULT--}:</td>
        <td class="switch_sw$content[sw] bottom">
                $content[request_param_default]
        </td>

diff --git a/templates/de/html/admin/admin_del_sponsor.tpl b/templates/de/html/admin/admin_del_sponsor.tpl
index 4f7a0a295b4177de3ac39b2fbea59cb3b6d12feb..3800d317b507e85ee8509b875f648177742ca36b 100644 (file)
--- a/templates/de/html/admin/admin_del_sponsor.tpl
+++ b/templates/de/html/admin/admin_del_sponsor.tpl
@@ -2,11 +2,11 @@
 <div align="center" class="admin_table dashed">
 
 <div class="admin_title bottom">
-       <div class="admin_done">{%message,ADMIN_HEADER_DEL_SPONSOR,$content[userid]%}</div>
+       <div class="admin_done">{%message,ADMIN_HEADER_DEL_SPONSOR=$content[userid]%}</div>
 </div>
 
 <div>
-       {%message,ADMIN_TEXT_DEL_SPONSOR,$content[userid]%}
+       {%message,ADMIN_TEXT_DEL_SPONSOR=$content[userid]%}
 </div>
 
 <div>

diff --git a/templates/de/html/admin/admin_edit_email_row.tpl b/templates/de/html/admin/admin_edit_email_row.tpl
index 7a307ed837b6d4c09d2f05ccee84bb307e681faf..c29c14b28156590a01e855ad58b1e2572248b80a 100644 (file)
--- a/templates/de/html/admin/admin_edit_email_row.tpl
+++ b/templates/de/html/admin/admin_edit_email_row.tpl
@@ -5,6 +5,6 @@
        </td>
        <td class="switch_sw$content[sw] bottom">
                $content[subject]
-               ({--EMAIL_SENDER--}: $content[userid]; $content[pay]; $content[cat])
+               ({--EMAIL_SENDER--}: $content[userid]; {%pipe,translateComma=$content[pay]%}; $content[cat])
        </td>
 </tr>

diff --git a/templates/de/html/admin/admin_edit_network_params.tpl b/templates/de/html/admin/admin_edit_network_params.tpl
index 715cbef9e73a712ad1f01b3ece7fb22523eee413..b6b4e419074e6d946bb3e7d724d68e42ca7677c8 100644 (file)
--- a/templates/de/html/admin/admin_edit_network_params.tpl
+++ b/templates/de/html/admin/admin_edit_network_params.tpl
@@ -4,7 +4,7 @@
        <tr>
                <td align="center" class="admin_title bottom" height="25" colspan="2">
                        <div>
-                               <strong>{--ADMIN_NETWORK_REQUEST_PARAMS_EDIT_TITLE--}</strong>
+                               <strong>{--ADMIN_NETWORK_REQUEST_PARAMETER_EDIT_TITLE--}</strong>
                        </div>
                        <div class="tiny">
                                (<a href="$content[network_data][network_reflink]" title="$content[network_data][network_title]" target="_blank">$content[network_data][network_title]</a>)
@@ -15,13 +15,13 @@
        <tr>
                <td colspan="2" class="admin_footer">
                        <input type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" name="change" class="admin_submit" value="{--ADMIN_NETWORK_REQUEST_PARAMS_CHANGE--}" />
+                       <input type="submit" name="change" class="admin_submit" value="{--ADMIN_NETWORK_REQUEST_PARAMETER_CHANGE--}" />
                </td>
        </tr>
 </table>
 </form>
 
 <div class="admin_note">
-       {--ADMIN_NETWORK_REQUEST_PARAMS_LIST_NOTE--}
+       {--ADMIN_NETWORK_REQUEST_PARAMETER_LIST_NOTE--}
 </div>
 </div>

diff --git a/templates/de/html/admin/admin_edit_network_params_row.tpl b/templates/de/html/admin/admin_edit_network_params_row.tpl
index 90d3b33a8ff739c83c8d42251a75c59fca13764d..066463928f975e4bf1ea5ec4f598523ea578c4c7 100644 (file)
--- a/templates/de/html/admin/admin_edit_network_params_row.tpl
+++ b/templates/de/html/admin/admin_edit_network_params_row.tpl
@@ -8,7 +8,7 @@
        </td>
 </tr>
 <tr>
-       <td class="switch_sw$content[sw]" style="padding-left:5px">{--ADMIN_NETWORK_REQUEST_PARAMS_KEY--}:</td>
+       <td class="switch_sw$content[sw]" style="padding-left:5px">{--ADMIN_NETWORK_REQUEST_PARAMETER_KEY--}:</td>
        <td class="switch_sw$content[sw]">
                <select name="request_param_key[$content[network_param_id]]" class="admin_select" size="1">
                        $content[key_options]
@@ -16,13 +16,13 @@
        </td>
 </tr>
 <tr>
-       <td class="switch_sw$content[sw]" style="padding-left:5px">{--ADMIN_NETWORK_REQUEST_PARAMS_VALUE--}:</td>
+       <td class="switch_sw$content[sw]" style="padding-left:5px">{--ADMIN_NETWORK_REQUEST_PARAMETER_VALUE--}:</td>
        <td class="switch_sw$content[sw]">
                <input type="text" name="request_param_value[$content[network_param_id]]" class="admin_normal" size="10" maxlength="10" value="$content[request_param_value]" />
        </td>
 </tr>
 <tr>
-       <td class="switch_sw$content[sw] bottom" style="padding-left:5px">{--ADMIN_NETWORK_REQUEST_PARAMS_DEFAULT--}:</td>
+       <td class="switch_sw$content[sw] bottom" style="padding-left:5px">{--ADMIN_NETWORK_REQUEST_PARAMETER_DEFAULT--}:</td>
        <td class="switch_sw$content[sw] bottom">
                <input type="text" name="request_param_default[$content[network_param_id]]" class="admin_normal" size="50" maxlength="255" value="$content[request_param_default]" />
        </td>

diff --git a/templates/de/html/admin/admin_email_archiv_row.tpl b/templates/de/html/admin/admin_email_archiv_row.tpl
index ae865184c1b9bf2852ed67fb91eebcc56da2160d..ad04d22f2fe1541dc385885ccfe162b08d3b0ffc 100644 (file)
--- a/templates/de/html/admin/admin_email_archiv_row.tpl
+++ b/templates/de/html/admin/admin_email_archiv_row.tpl
@@ -15,7 +15,7 @@
 <tr>
        <td colspan="2" align="center" class="switch_sw$content[sw] bottom right">
                {--EMAIL_PAYMENT--}:<br />
-               <strong class="admin_misc">$content[pay]</strong>
+               <strong class="admin_misc">{%pipe,translateComma=$content[pay]%}</strong>
        </td>
        <td align="center" class="switch_sw$content[sw] bottom">
                {--EMAIL_CATEGORY--}:<br />

diff --git a/templates/de/html/admin/admin_extensions.tpl b/templates/de/html/admin/admin_extensions.tpl
index 7813116b3dee561983a5efa303bcc0e5c61e4c5d..447dc68b026e96d33e2fe74f3fd0e63752b05c1b 100644 (file)
--- a/templates/de/html/admin/admin_extensions.tpl
+++ b/templates/de/html/admin/admin_extensions.tpl
@@ -8,10 +8,10 @@
        </tr>
        <tr>
                <td align="center" class="header_column bottom right" width="40"><strong>{--ID_SELECT--}</strong></td>
-               <td align="center" class="header_column bottom right" width="200"><strong>{--ADMIN_EXT_NAME--}</strong></td>
-               <td align="center" class="header_column bottom right" width="90"><strong>{--ADMIN_EXT_CSSFILE--}</strong></td>
-               <td align="center" class="header_column bottom right" width="90"><strong>{--ADMIN_EXT_ACTIVE--}</strong></td>
-               <td align="center" class="header_column bottom" width="90"><strong>{--ADMIN_EXT_VERSION--}</strong></td>
+               <td align="center" class="header_column bottom right" width="200"><strong>{--ADMIN_EXTENSION_NAME--}</strong></td>
+               <td align="center" class="header_column bottom right" width="90"><strong>{--ADMIN_EXTENSION_CSSFILE--}</strong></td>
+               <td align="center" class="header_column bottom right" width="90"><strong>{--ADMIN_EXTENSION_ACTIVE--}</strong></td>
+               <td align="center" class="header_column bottom" width="90"><strong>{--ADMIN_EXTENSION_VERSION--}</strong></td>
        </tr>
        $content
        <tr>

diff --git a/templates/de/html/admin/admin_extensions_delete.tpl b/templates/de/html/admin/admin_extensions_delete.tpl
index f8a66cd1621c81967bf976c70a70eba5ddf18d71..f4ccc71bade298e498d1ee79c016e4d02752f0e7 100644 (file)
--- a/templates/de/html/admin/admin_extensions_delete.tpl
+++ b/templates/de/html/admin/admin_extensions_delete.tpl
@@ -8,8 +8,8 @@
        </tr>
        <tr>
                <td align="center" class="header_column bottom right" width="40"><strong>{--ID_SELECT--}</strong></td>
-               <td align="center" class="header_column bottom right" width="180"><strong>{--ADMIN_EXT_NAME--}</strong></td>
-               <td align="center" class="header_column bottom" width="80"><strong>{--ADMIN_EXT_VERSION--}</strong></td>
+               <td align="center" class="header_column bottom right" width="180"><strong>{--ADMIN_EXTENSION_NAME--}</strong></td>
+               <td align="center" class="header_column bottom" width="80"><strong>{--ADMIN_EXTENSION_VERSION--}</strong></td>
                <td align="center" class="header_column bottom" width="220">&nbsp;</td>
        </tr>
        $content

diff --git a/templates/de/html/admin/admin_extensions_edit.tpl b/templates/de/html/admin/admin_extensions_edit.tpl
index ad2ebcf5cb21ce250d7bde2a805922594f95f155..ff4bb97098672887f834dd8d65e98db758dd7ff1 100644 (file)
--- a/templates/de/html/admin/admin_extensions_edit.tpl
+++ b/templates/de/html/admin/admin_extensions_edit.tpl
@@ -8,9 +8,9 @@
        </tr>
        <tr>
                <td align="center" class="header_column bottom right" width="30"><strong>{--ID_SELECT--}</strong></td>
-               <td align="center" class="header_column bottom right" width="180"><strong>{--ADMIN_EXT_NAME--}</strong></td>
-               <td align="center" class="header_column bottom right" width="80"><strong>{--ADMIN_EXT_CSSFILE--}</strong></td>
-               <td align="center" class="header_column bottom right" width="80"><strong>{--ADMIN_EXT_ACTIVE--}</strong></td>
+               <td align="center" class="header_column bottom right" width="180"><strong>{--ADMIN_EXTENSION_NAME--}</strong></td>
+               <td align="center" class="header_column bottom right" width="80"><strong>{--ADMIN_EXTENSION_CSSFILE--}</strong></td>
+               <td align="center" class="header_column bottom right" width="80"><strong>{--ADMIN_EXTENSION_ACTIVE--}</strong></td>
        </tr>
        $content
        <tr>

diff --git a/templates/de/html/admin/admin_footer.tpl b/templates/de/html/admin/admin_footer.tpl
index 443aea25bea20939a8c394b20c2923ad366fee34..0ea83584ab5871e985bdb7bc28bdb20e8c1d372b 100644 (file)
--- a/templates/de/html/admin/admin_footer.tpl
+++ b/templates/de/html/admin/admin_footer.tpl
@@ -3,7 +3,8 @@
        <ul style="padding:0px;margin:0px">
                <li class="menu_blur bottom"><a href="{%url=modules.php?module=index%}" title="{--ADMIN_BACK_TO_GUEST_MENU--}">{--ADMIN_BACK_TO_GUEST_MENU--}</a></li>
                <li class="menu_blur bottom"><a href="http://forum.mxchange.org" target="_blank" title="{--ADMIN_SUPPORT_FORUM_LINK--}">{--ADMIN_SUPPORT_FORUM_LINK--}</a></li>
-               <li class="menu_blur"><a href="http://bugs.mxchange.org" target="_blank" title="{--ADMIN_SUPPORT_BUGTRACKER_LINK--}">{--ADMIN_SUPPORT_BUGTRACKER_LINK--}</a></li>
+               <li class="menu_blur bottom"><a href="http://bugs.mxchange.org" target="_blank" title="{--ADMIN_SUPPORT_BUGTRACKER_LINK--}">{--ADMIN_SUPPORT_BUGTRACKER_LINK--}</a></li>
+               <li class="menu_blur"><a href="http://wiki.mxchange.org" target="_blank" title="{--ADMIN_SUPPORT_WIKI_LINK--}">{--ADMIN_SUPPORT_WIKI_LINK--}</a></li>
        </ul>
        </div>
 </div>

diff --git a/templates/de/html/admin/admin_gmenu_edit_form.tpl b/templates/de/html/admin/admin_gmenu_edit_form.tpl
index 385138a55f913ce906ba2054f39f3fd62269514f..cf8695f50a0d5ec8dd18e66b9258868a40d8fae7 100644 (file)
--- a/templates/de/html/admin/admin_gmenu_edit_form.tpl
+++ b/templates/de/html/admin/admin_gmenu_edit_form.tpl
@@ -8,7 +8,7 @@
        </tr>
        <tr>
                <td align="center" colspan="2" class="admin_title bottom">
-                       {%message,EDIT_MENU,$content[chk]%}
+                       {%message,EDIT_MENU=$content[chk]%}
                </td>
        </tr>
        $content[rows]

diff --git a/templates/de/html/admin/admin_gmenu_status.tpl b/templates/de/html/admin/admin_gmenu_status.tpl
index 6257467afbb27d6aa3f7caef782564bd9314818e..0bf1495ea29dbe5f3c3674b6ea2e94b40ef46664 100644 (file)
--- a/templates/de/html/admin/admin_gmenu_status.tpl
+++ b/templates/de/html/admin/admin_gmenu_status.tpl
@@ -7,7 +7,7 @@
                                <strong>{--CHANGE_GUEST_MENU--}</strong>
                        </div>
                        <div class="para">
-                               {--CHANGE_MENU_1--}$content[chk]{--CHANGE_MENU_2--}
+                               {%message,CHANGE_MENU=$content[chk]%}
                        </div>
                </td>
        </tr>

diff --git a/templates/de/html/admin/admin_list_beg.tpl b/templates/de/html/admin/admin_list_beg.tpl
index 2b3d6df3000e908a1862d66e6993148368984fe7..5f58825e39afff4f7dddee6e8f0fbb74a6e305be 100644 (file)
--- a/templates/de/html/admin/admin_list_beg.tpl
+++ b/templates/de/html/admin/admin_list_beg.tpl
@@ -39,7 +39,7 @@
        <strong>{--ADMIN_BEG_WINNER_HIGLIGHTED--}</strong>
 
        <div>
-               {%message,ADMIN_BEG_TIMEOUT,$content[autopurge_timeout]%}
+               {%message,ADMIN_BEG_TIMEOUT=$content[autopurge_timeout]%}
        </div>
 </div>
 </div>

diff --git a/templates/de/html/admin/admin_list_bonus.tpl b/templates/de/html/admin/admin_list_bonus.tpl
index b0cb600612b49922d724880cebe6a6c8d464f7ef..1b66d348f4b586012fe964c87a9ccde9cbff942a 100644 (file)
--- a/templates/de/html/admin/admin_list_bonus.tpl
+++ b/templates/de/html/admin/admin_list_bonus.tpl
@@ -40,7 +40,7 @@
                <strong>{--ADMIN_BONUS_WINNER_HIGLIGHTED--}</strong>
        </div>
        <div>
-               {%message,ADMIN_BONUS_TIMEOUT,$content[autopurge_timeout]%}
+               {%message,ADMIN_BONUS_TIMEOUT=$content[autopurge_timeout]%}
        </div>
 </div>
 </div>

diff --git a/templates/de/html/admin/admin_list_links.tpl b/templates/de/html/admin/admin_list_links.tpl
index 6701d558999bdfa8df898415a72ab7516faaf37d..17840cb336c09fbc76c764f1f369c400e86020fb 100644 (file)
--- a/templates/de/html/admin/admin_list_links.tpl
+++ b/templates/de/html/admin/admin_list_links.tpl
@@ -7,7 +7,7 @@
        $content[rows]
        <tr>
                <td colspan="4" height="40" class="admin_title" align="center">
-                       {--MEMBER_TOTAL_LINKS_1--}$content[nums]{--MEMBER_TOTAL_LINKS_2--}<br />
+                       {%message,MEMBER_TOTAL_LINKS=$content[nums]%}<br />
                        <a href="{%url=modules.php?module=admin&amp;what=list_links&amp;userid=$content[userid]&amp;del=all%}" onclick="return confirm('{--ADMIN_REALLY_DELETE_ALL_MAILS--}')">{--ADMIN_DEL_UNCONFIRMED_LINKS--}</a>
                </td>
        </tr>

diff --git a/templates/de/html/admin/admin_list_network_params.tpl b/templates/de/html/admin/admin_list_network_params.tpl
index 87d5490799ae791adda113f30a8530be0c2d6151..d3d94cb8f80bb76603482fe578cb0570d0594172 100644 (file)
--- a/templates/de/html/admin/admin_list_network_params.tpl
+++ b/templates/de/html/admin/admin_list_network_params.tpl
@@ -4,7 +4,7 @@
        <tr>
                <td colspan="5" align="center" class="admin_title bottom">
                        <div>
-                               <strong>{--ADMIN_NETWORK_REQUEST_PARAMS_LIST_TITLE--}</strong>
+                               <strong>{--ADMIN_NETWORK_REQUEST_PARAMETER_LIST_TITLE--}</strong>
                        </div>
                        <div class="tiny">
                                (<a href="$content[network_reflink]" title="$content[network_title]" target="_blank">$content[network_title]</a>)
@@ -14,22 +14,22 @@
        <tr>
                <td align="center" class="header_column bottom right" height="25"><strong>{--ID_SELECT--}</strong></td>
                <td align="center" class="header_column bottom right"><strong>{--ADMIN_NETWORK_TYPES_HANDLE--}</strong></td>
-               <td align="center" class="header_column bottom right"><strong>{--ADMIN_NETWORK_REQUEST_PARAMS_KEY--}</strong></td>
-               <td align="center" class="header_column bottom right"><strong>{--ADMIN_NETWORK_REQUEST_PARAMS_VALUE--}</strong></td>
-               <td align="center" class="header_column bottom"><strong>{--ADMIN_NETWORK_REQUEST_PARAMS_DEFAULT--}</strong></td>
+               <td align="center" class="header_column bottom right"><strong>{--ADMIN_NETWORK_REQUEST_PARAMETER_KEY--}</strong></td>
+               <td align="center" class="header_column bottom right"><strong>{--ADMIN_NETWORK_REQUEST_PARAMETER_VALUE--}</strong></td>
+               <td align="center" class="header_column bottom"><strong>{--ADMIN_NETWORK_REQUEST_PARAMETER_DEFAULT--}</strong></td>
        </tr>
        $content[rows]
        <tr>
                <td colspan="5" class="admin_footer">
                        <input type="reset" class="admin_reset" value="{--UNDO_SELECTIONS--}" />
-                       <input type="submit" name="edit" class="admin_submit" value="{--ADMIN_NETWORK_REQUEST_PARAMS_EDIT--}" />
-                       <input type="submit" name="del" class="admin_delete" value="{--ADMIN_NETWORK_REQUEST_PARAMS_DELETE--}" />
+                       <input type="submit" name="edit" class="admin_submit" value="{--ADMIN_NETWORK_REQUEST_PARAMETER_EDIT--}" />
+                       <input type="submit" name="del" class="admin_delete" value="{--ADMIN_NETWORK_REQUEST_PARAMETER_DELETE--}" />
                </td>
        </tr>
 </table>
 </form>
 
 <div class="admin_note">
-       {--ADMIN_NETWORK_REQUEST_PARAMS_LIST_NOTE--}
+       {--ADMIN_NETWORK_REQUEST_PARAMETER_LIST_NOTE--}
 </div>
 </div>

diff --git a/templates/de/html/admin/admin_list_networks_row.tpl b/templates/de/html/admin/admin_list_networks_row.tpl
index 013a08f3f0892716ecc682816a7f3f227200c2e7..06e29521420eeca4a5e3069275a547c7f2b68a89 100644 (file)
--- a/templates/de/html/admin/admin_list_networks_row.tpl
+++ b/templates/de/html/admin/admin_list_networks_row.tpl
@@ -7,7 +7,7 @@
                [<a
                 href="{%url=modules.php?module=admin&amp;what=list_network_types&amp;network=$content[network_id]%}" title="{--ADMIN_NETWORK_LIST_TYPES_LINK_TITLE--}">T</a>|<a
                 href="{%url=modules.php?module=admin&amp;what=list_network_params&amp;network=$content[network_id]%}" title="{--ADMIN_NETWORK_LIST_PARAMS_LINK_TITLE--}">P</a>|<a
-                href="{%url=modules.php?module=admin&amp;what=list_network_return_codes&amp;network=$content[network_id]%}" title="{--ADMIN_NETWORK_LIST_RETURN_CODES_LINK_TITLE--}">RC</a>|<a
+                href="{%url=modules.php?module=admin&amp;what=list_network_ARRAY_TRANSLATION&amp;network=$content[network_id]%}" title="{--ADMIN_NETWORK_LIST_ARRAY_TRANSLATION_LINK_TITLE--}">RC</a>|<a
                 href="{%url=modules.php?module=admin&amp;what=list_network_error_codes&amp;network=$content[network_id]%}" title="{--ADMIN_NETWORK_LIST_ERROR_CODES_LINK_TITLE--}">EC</a>]
        </td>
        <td class="switch_sw$content[sw] bottom right" align="center">

diff --git a/templates/de/html/admin/admin_list_rallye_noselect.tpl b/templates/de/html/admin/admin_list_rallye_noselect.tpl
index 80ab61592797e03157145d6472e55b5409c8323d..11f5d85d80b1ca4d16cf4c19e14af24e5ec2a60f 100644 (file)
--- a/templates/de/html/admin/admin_list_rallye_noselect.tpl
+++ b/templates/de/html/admin/admin_list_rallye_noselect.tpl
@@ -1,3 +1 @@
-{--RALLYE_NO_RALLYES_SELECTED_1--}
-<a href="{%url=modules.php?module=admin&amp;what=list_rallyes%}">{--RALLYE_NO_RALLYES_SELECTED_2--}</a>
-{--RALLYE_NO_RALLYES_SELECTED_3--}
+<!-- @DEPRECATED //-->

diff --git a/templates/de/html/admin/admin_list_rallye_usr.tpl b/templates/de/html/admin/admin_list_rallye_usr.tpl
index bbe7e1ca8abd66dd3edde91c677da6d98f157da1..b7ae02371c0bbb23898c5032cf39e8db5fcc6077 100644 (file)
--- a/templates/de/html/admin/admin_list_rallye_usr.tpl
+++ b/templates/de/html/admin/admin_list_rallye_usr.tpl
@@ -1,7 +1,7 @@
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
 <tr>
        <td colspan="4" align="center" class="admin_title">
-               <strong>{%message,RALLYE_LIST_USERS,$content[rallye]%}:</strong>
+               <strong>{%message,RALLYE_LIST_USERS=$content[rallye]%}:</strong>
        </td>
 </tr>
 <tr>

diff --git a/templates/de/html/admin/admin_list_refs.tpl b/templates/de/html/admin/admin_list_refs.tpl
index ffb3028375a64854ecf714be17735c9304ba7fc3..d2a02e1d0c9b4835065ae510ec73b2109a56cc7c 100644 (file)
--- a/templates/de/html/admin/admin_list_refs.tpl
+++ b/templates/de/html/admin/admin_list_refs.tpl
@@ -2,7 +2,7 @@
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
 <tr>
        <td colspan="6" class="admin_title">
-               <strong>{--ADMIN_LIST_REFERALS_1--}<u>$content[userid]</u>{--ADMIN_LIST_REFERALS_2--}</strong>
+               <strong>{%message,ADMIN_LIST_REFERALS=$content[userid]%}</strong>
        </td>
 </tr>
 <tr>

diff --git a/templates/de/html/admin/admin_list_refs2.tpl b/templates/de/html/admin/admin_list_refs2.tpl
index 6c6d45fac2d55261da1bfc7554fabbb46ab2345f..66a261c038080c39fc2c37cf5e96d10aa81f4af4 100644 (file)
--- a/templates/de/html/admin/admin_list_refs2.tpl
+++ b/templates/de/html/admin/admin_list_refs2.tpl
@@ -1,7 +1,7 @@
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
 <tr>
        <td class="admin_title bottom">
-               <strong>{--ADMIN_LIST_REFERALS_1--}<u>$content[userid]</u>{--ADMIN_LIST_REFERALS_2--}</strong>
+               <strong>{%message,ADMIN_LIST_REFERALS=$content[userid]%}</strong>
        </td>
 </tr>
 $content[rows]

diff --git a/templates/de/html/admin/admin_list_refs_level.tpl b/templates/de/html/admin/admin_list_refs_level.tpl
index bbb04171f1ab5630505f2670a5251363d59cf6bb..4f0b2e2bd8a9f6ebc46c8b747351ef876aee4cad 100644 (file)
--- a/templates/de/html/admin/admin_list_refs_level.tpl
+++ b/templates/de/html/admin/admin_list_refs_level.tpl
@@ -3,7 +3,7 @@
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
 <tr>
        <td colspan="6" class="admin_title" align="center">
-               <strong>{--ADMIN_LIST_REFERALS_LEVEL_1--}<u>$content[level]</u>{--ADMIN_LIST_REFERALS_LEVEL_2--}</strong><br />
+               <strong>{%message,ADMIN_LIST_REFERALS_LEVEL=$content[level]%}</strong><br />
                $content[info]
        </td>
 </tr>

diff --git a/templates/de/html/admin/admin_list_refs_nodata.tpl b/templates/de/html/admin/admin_list_refs_nodata.tpl
index fcfe5a14d698d552126186659f063f0abd2897a8..b1229a2cec631b0704029b49fac5534a76803031 100644 (file)
--- a/templates/de/html/admin/admin_list_refs_nodata.tpl
+++ b/templates/de/html/admin/admin_list_refs_nodata.tpl
@@ -1,5 +1,5 @@
 <tr>
        <td colspan="6" class="admin_title bottom" height="20">
-               <strong>{%message,ADMIN_LIST_USER_NODATA,$content[refid]%}</strong>
+               <strong>{%message,ADMIN_LIST_USER_NODATA=$content[refid]%}</strong>
        </td>
 </tr>

diff --git a/templates/de/html/admin/admin_list_refs_norefs.tpl b/templates/de/html/admin/admin_list_refs_norefs.tpl
index 6b28682544bd52a9e410269760b811022784e718..adb747d3cbc0bc8c8e2ae83288238932eafcf1bf 100644 (file)
--- a/templates/de/html/admin/admin_list_refs_norefs.tpl
+++ b/templates/de/html/admin/admin_list_refs_norefs.tpl
@@ -1,5 +1,5 @@
 <tr>
        <td colspan="6" class="admin_title bottom" height="20">
-               <strong>{%message,ADMIN_LIST_USER_NOREFS,$content[userid]%}</strong>
+               <strong>{%message,ADMIN_LIST_USER_NOREFS=$content[userid]%}</strong>
        </td>
 </tr>

diff --git a/templates/de/html/admin/admin_list_surfbar_urls_row.tpl b/templates/de/html/admin/admin_list_surfbar_urls_row.tpl
index 25bed4ae70ed6e2abdb263a0fed9644d428ff60d..0f7ac649ab194c1253de5e0f3226c16b34666346 100644 (file)
--- a/templates/de/html/admin/admin_list_surfbar_urls_row.tpl
+++ b/templates/de/html/admin/admin_list_surfbar_urls_row.tpl
@@ -9,10 +9,10 @@
                <a href="$content[url]" target="_blank" title="{--ADMIN_TEST_URL--}">{--ADMIN_TEST_URL--}</a>
        </td>
        <td align="center" class="bottom right switch_sw$content[sw]">
-               <a href="{%url=modules.php?module=admin&amp;what=surfbar_stats&amp;url_id=$content[url_id]%}">$content[views_total]</a>
+               <a href="{%url=modules.php?module=admin&amp;what=surfbar_stats&amp;url_id=$content[url_id]%}">{%pipe,translateComma=$content[url_views_total]%}</a>
        </td>
        <td align="center" class="bottom right switch_sw$content[sw]">
-               $content[url_status]
+               {%pipe,translateSurfbarUrlStatus=$content[url_status]%}
        </td>
        <td align="center" class="bottom right switch_sw$content[sw]">
                $content[url_registered]

diff --git a/templates/de/html/admin/admin_list_theme.tpl b/templates/de/html/admin/admin_list_theme.tpl
index 519116db1307b0b9f743d3cb26076a253a434030..100e523d578921f8be89958fc93822cc80fba169 100644 (file)
--- a/templates/de/html/admin/admin_list_theme.tpl
+++ b/templates/de/html/admin/admin_list_theme.tpl
@@ -6,9 +6,9 @@
 </tr>
 <tr>
        <td align="center" width="5%" class="header_column bottom right">{--ID_SELECT--}</td>
-       <td align="center" width="35%" class="header_column bottom right">{--ADMIN_EXT_DOWNLOAD_LINK--}</td>
+       <td align="center" width="35%" class="header_column bottom right">{--ADMIN_EXTENSION_DOWNLOAD_LINK--}</td>
        <td align="center" width="30%" class="header_column bottom right">{--ADMIN_THEME_FILE_CTIME--}</td>
-       <td align="center" width="15%" class="header_column bottom right">{--ADMIN_EXT_FILE_SIZE--}</td>
+       <td align="center" width="15%" class="header_column bottom right">{--ADMIN_EXTENSION_FILE_SIZE--}</td>
        <td align="center" width="15%" class="header_column bottom">{--THEME_VERSION--}</td>
 </tr>
 $content[rows]
@@ -18,7 +18,7 @@ $content[rows]
                <strong>$content[total]</strong>
        </td>
        <td colspan="3" align="right" class="header_column">
-               {--ADMIN_EXT_TOTAL_FSIZE--}:
+               {--ADMIN_EXTENSION_TOTAL_FSIZE--}:
                <strong>$content[kbytes] {--KBYTES--}</strong>
        </td>
 </tr>

diff --git a/templates/de/html/admin/admin_list_unconfirmed_row_404.tpl b/templates/de/html/admin/admin_list_unconfirmed_row_404.tpl
index cbcd95c7b8d313c50b665cda58cd67df12920833..5e0b6e83952ef39affad02c7a7b5b1ef2bb81639 100644 (file)
--- a/templates/de/html/admin/admin_list_unconfirmed_row_404.tpl
+++ b/templates/de/html/admin/admin_list_unconfirmed_row_404.tpl
@@ -1,5 +1,5 @@
 <tr>
        <td align="center" class="switch_sw$content[sw] bottom" colspan="4">
-               {%message,ADMIN_USER_DATA_NOT_FOUND,$content[userid]%}
+               {%message,ADMIN_USER_DATA_NOT_FOUND=$content[userid]%}
        </td>
 </tr>

diff --git a/templates/de/html/admin/admin_list_wernis_row.tpl b/templates/de/html/admin/admin_list_wernis_row.tpl
index 8132f85e8a2026f688e37b9d71219462b0409604..540543e175ef44302cc4b80c4a57b7a25679b131 100644 (file)
--- a/templates/de/html/admin/admin_list_wernis_row.tpl
+++ b/templates/de/html/admin/admin_list_wernis_row.tpl
@@ -1,10 +1,10 @@
 <tr>
-       <td class="switch_sw$content[sw] wernis_type_$content[raw_type] bottom right">$content[id]</td>
-       <td class="switch_sw$content[sw] wernis_type_$content[raw_type] bottom right">$content[link]</td>
-       <td class="switch_sw$content[sw] wernis_type_$content[raw_type] bottom right">$content[wernis_account]</td>
-       <td class="switch_sw$content[sw] wernis_type_$content[raw_type] bottom right">$content[wernis_amount]</td>
-       <td class="switch_sw$content[sw] wernis_type_$content[raw_type] bottom right">$content[wernis_timestamp]</td>
-       <td class="switch_sw$content[sw] wernis_type_$content[raw_type] bottom right" align="center">$content[wernis_type]</td>
-       <td class="switch_sw$content[sw] wernis_type_$content[raw_type] bottom right" align="center">$content[wernis_api_message]</td>
-       <td class="switch_sw$content[sw] wernis_type_$content[raw_type] bottom" align="center">$content[wernis_api_status]</td>
+       <td class="switch_sw$content[sw] wernis_type_$content[wernis_type] bottom right">$content[id]</td>
+       <td class="switch_sw$content[sw] wernis_type_$content[wernis_type] bottom right">{%pipe,generateUserProfileLink=$content[userid]%}</td>
+       <td class="switch_sw$content[sw] wernis_type_$content[wernis_type] bottom right">$content[wernis_account]</td>
+       <td class="switch_sw$content[sw] wernis_type_$content[wernis_type] bottom right">{%pipe,translateComma=$content[wernis_amount]%}</td>
+       <td class="switch_sw$content[sw] wernis_type_$content[wernis_type] bottom right">$content[wernis_timestamp]</td>
+       <td class="switch_sw$content[sw] wernis_type_$content[wernis_type] bottom right" align="center">{%pipe,WERNIS_TRANSFER_STATUS=$content[wernis_type]%}</td>
+       <td class="switch_sw$content[sw] wernis_type_$content[wernis_type] bottom right" align="center">$content[wernis_api_message]</td>
+       <td class="switch_sw$content[sw] wernis_type_$content[wernis_type] bottom" align="center">$content[wernis_api_status]</td>
 </tr>

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 c9df9ba0b817ade964c3ff853f631207ce9d3e0a..715670ce220edc528c8e86b7c45292bdebf0d761 100644 (file)
--- a/templates/de/html/admin/admin_lock_surfbar_urls_row.tpl
+++ b/templates/de/html/admin/admin_lock_surfbar_urls_row.tpl
@@ -9,7 +9,7 @@
                <a href="$content[url]" target="_blank" title="{--ADMIN_TEST_URL--}">{--ADMIN_TEST_URL--}</a>
        </td>
        <td align="center" class="bottom right switch_sw$content[sw]">
-               $content[url_status]
+               {%pipe,translateSurfbarUrlStatus=$content[url_status]%}
        </td>
        <td align="center" class="bottom right switch_sw$content[sw]">
                $content[url_registered]

diff --git a/templates/de/html/admin/admin_lock_user.tpl b/templates/de/html/admin/admin_lock_user.tpl
index 7a51c8ebb24addf78d43438b50350784d34febf2..0c086e4f7b7e56eb2811b652d554f36b174a8ecc 100644 (file)
--- a/templates/de/html/admin/admin_lock_user.tpl
+++ b/templates/de/html/admin/admin_lock_user.tpl
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=lock_user&amp;userid=$content[userid]%}" method="post">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=lock_user&amp;userid={%pipe,bigintval=$content[userid]%}%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td align="center" class="admin_title bottom">
@@ -11,7 +11,7 @@
        </tr>
        <tr>
                <td align="center">
-                       [&nbsp;<a href="$content[email]">$content[surname] $content[family]</a>&nbsp;]
+                       [&nbsp;<a href="{%user,email,generateEmailLink=$content[userid]%}">{%user,surname=$content[userid]%} {%user,surname=$content[userid]%} ({%user,status,translateUserStatus=$content[userid])</a>&nbsp;]
                </td>
        </tr>
        <tr>

diff --git a/templates/de/html/admin/admin_menu_404_row.tpl b/templates/de/html/admin/admin_menu_404_row.tpl
index 5b12109eb8a0b9f0c4cb4d3819144285d10656f2..8845e432594cc98d712cf6f1d8c97c86da19a5c4 100644 (file)
--- a/templates/de/html/admin/admin_menu_404_row.tpl
+++ b/templates/de/html/admin/admin_menu_404_row.tpl
@@ -1,5 +1,5 @@
 <tr>
-       <td colspan="2" align="center"
-               class="error fatal switch_sw$content[sw]"><strong>{--ENTRY_404_1--}$content[sel]{--ENTRY_404_2--}</strong>
+       <td colspan="2" align="center" class="error fatal switch_sw$content[sw]">
+               <strong>{--ENTRY_404_1--}$content[sel]{--ENTRY_404_2--}</strong>
        </td>
-</tr>
\ No newline at end of file
+</tr>

diff --git a/templates/de/html/admin/admin_mmenu_edit.tpl b/templates/de/html/admin/admin_mmenu_edit.tpl
index cf802a82949ab91ffc13330cda11a082c46e6527..0881cfcac4eb19ff67a3eeb3721de0b1a59df7b4 100644 (file)
--- a/templates/de/html/admin/admin_mmenu_edit.tpl
+++ b/templates/de/html/admin/admin_mmenu_edit.tpl
@@ -8,7 +8,7 @@
        </tr>
        <tr>
                <td align="center" colspan="2" class="admin_title bottom">
-                       {%message,EDIT_MENU,$content[chk]%}
+                       {%message,EDIT_MENU=$content[chk]%}
                </td>
        </tr>
        $content[rows]

diff --git a/templates/de/html/admin/admin_mmenu_status.tpl b/templates/de/html/admin/admin_mmenu_status.tpl
index c04b3108709bd16ff1157d471dbdab5b47a73b6c..edfa9c2ea069ddf55083daa630a2987cac22b2e5 100644 (file)
--- a/templates/de/html/admin/admin_mmenu_status.tpl
+++ b/templates/de/html/admin/admin_mmenu_status.tpl
@@ -5,7 +5,7 @@
                <td align="center" colspan="4" class="admin_title bottom">
                        <strong>{--CHANGE_MEMBER_MENU--}</strong><br />
                        <br />
-                       {--CHANGE_MENU_1--}$content[chk]{--CHANGE_MENU_2--}
+                       {%message,CHANGE_MENU=$content[chk]%}
                </td>
        </tr>
        $content[rows]

diff --git a/templates/de/html/admin/admin_payments_list_row.tpl b/templates/de/html/admin/admin_payments_list_row.tpl
index 8ddc0934f916123420d027a0a5e7a9392020c433..68bb3255e0d6254f7ad88a3adb84e5bf69b4ba41 100644 (file)
--- a/templates/de/html/admin/admin_payments_list_row.tpl
+++ b/templates/de/html/admin/admin_payments_list_row.tpl
@@ -6,7 +6,7 @@
                $content[time] {--_SECONDS--}
        </td>
        <td align="center" class="bottom right switch_sw$content[sw]">
-               $content[pay]
+               {%pipe,translateComma=$content[pay]%}
        </td>
        <td align="center" class="bottom right switch_sw$content[sw]">
                $content[price]

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 901ed2e4fb9b5161a60d968b57afdf699e52e141..75d904c2dc78d57b9d9759de97d874e1522c3492 100644 (file)
--- a/templates/de/html/admin/admin_undelete_surfbar_urls_row.tpl
+++ b/templates/de/html/admin/admin_undelete_surfbar_urls_row.tpl
@@ -8,7 +8,7 @@
                <a href="$content[url]" target="_blank" title="{--ADMIN_TEST_URL--}">{--ADMIN_TEST_URL--}</a>
        </td>
        <td align="center" class="bottom right switch_sw$content[sw]">
-               $content[url_status]
+               {%pipe,translateSurfbarUrlStatus=$content[url_status]%}
        </td>
        <td align="center" class="bottom switch_sw$content[sw]">
                $content[url_registered]

diff --git a/templates/de/html/beg/beg_done.tpl b/templates/de/html/beg/beg_done.tpl
index e91418d964c51a66266820a482009a2c15e9aef2..738d1264abff9275273a09486af2f95d1762103b 100644 (file)
--- a/templates/de/html/beg/beg_done.tpl
+++ b/templates/de/html/beg/beg_done.tpl
@@ -1,9 +1,11 @@
-<table border="0" cellspacing="0" cellpadding="0" width="100%">
-       <tr>
-               <td align="center">
-               <div>{--BEG_UID_STEAL_1--}<strong>$content[userid]</strong>{--BEG_UID_STEAL_2--}<strong>$content[points]</strong>{--BEG_UID_STEAL_3--}</div>
-               <div>{%message,BEG_CLICKS,$content[clicks]%}</div>
-               <div align="right">{--BEG_THANKS_FOR_CLICK--}</div>
-               </td>
-       </tr>
-</table>
+<div>
+       {--BEG_UID_STEAL_1--}<strong>$content[userid]</strong>{--BEG_UID_STEAL_2--}<strong>$content[points]</strong>{--BEG_UID_STEAL_3--}
+</div>
+
+<div>
+       {%message,BEG_CLICKS=$content[clicks]%}
+</div>
+
+<div align="right">
+       {--BEG_THANKS_FOR_CLICK--}
+</div>

diff --git a/templates/de/html/beg/beg_failed.tpl b/templates/de/html/beg/beg_failed.tpl
index 4e1026e71cbd61f281a5ddc121e25d0f36d5dcfa..a5d387f8844cd6645108b48fb67651aaf8c47358 100644 (file)
--- a/templates/de/html/beg/beg_failed.tpl
+++ b/templates/de/html/beg/beg_failed.tpl
@@ -1,9 +1,11 @@
-<table border="0" cellspacing="0" cellpadding="0" width="100%">
-       <tr>
-               <td align="center">
-               <div>{--BEG_SORRY_ANOTHER_WAS_HERE_1--}<strong>$content[userid]</strong>{--BEG_SORRY_ANOTHER_WAS_HERE_2--}<strong>$content[points]</strong>{--BEG_SORRY_ANOTHER_WAS_HERE_3--}</div>
-               <div>{%message,BEG_CLICKS,$content[clicks]%}</div>
-               <div align="right">{--BEG_THANKS_FOR_CLICK_AGAIN--}</div>
-               </td>
-       </tr>
-</table>
+<div>
+       {--BEG_SORRY_ANOTHER_WAS_HERE_1--}<strong>$content[userid]</strong>{--BEG_SORRY_ANOTHER_WAS_HERE_2--}<strong>$content[points]</strong>{--BEG_SORRY_ANOTHER_WAS_HERE_3--}
+</div>
+
+<div>
+       {%message,BEG_CLICKS=$content[clicks]%}
+</div>
+
+<div align="right">
+       {--BEG_THANKS_FOR_CLICK_AGAIN--}
+</div>

diff --git a/templates/de/html/beg/beg_link.tpl b/templates/de/html/beg/beg_link.tpl
index d7fe78f14d077ec36e13a9013447bc58f066cc49..17850721a29aebfb5639b2b2d165788e3bb15813 100644 (file)
--- a/templates/de/html/beg/beg_link.tpl
+++ b/templates/de/html/beg/beg_link.tpl
@@ -15,7 +15,7 @@
                                        </div>
 
                                        <div class="para">
-                                               {%message,BEG_LINK_USERID,$content[userid]%}
+                                               {%message,BEG_LINK_USERID=$content[userid]%}
                                        </div>
                                </td>
                        </tr>

diff --git a/templates/de/html/beg/beg_login.tpl b/templates/de/html/beg/beg_login.tpl
index 2c85a222bbf520d2fccb2b1d7f992d48834b7c2b..93b54de940d54757e568cc0a1adb94a72b002832 100644 (file)
--- a/templates/de/html/beg/beg_login.tpl
+++ b/templates/de/html/beg/beg_login.tpl
@@ -1,9 +1,11 @@
-<table border="0" cellspacing="0" cellpadding="0" width="100%">
-       <tr>
-               <td align="center">
-               <div>{--BEG_SORRY_YOURE_LOGGED_IN_1--}<strong>$content[userid]</strong>{--BEG_SORRY_YOURE_LOGGED_IN_2--}<strong>$content[points]</strong>{--BEG_SORRY_YOURE_LOGGED_IN_3--}</div>
-               <div>{%message,BEG_CLICKS,$content[clicks]%}</div>
-               <div align="right">{--BEG_THANKS_FOR_CLICK_AGAIN--}</div>
-               </td>
-       </tr>
-</table>
+<div>
+       {--BEG_SORRY_YOURE_LOGGED_IN_1--}<strong>$content[userid]</strong>{--BEG_SORRY_YOURE_LOGGED_IN_2--}<strong>$content[points]</strong>{--BEG_SORRY_YOURE_LOGGED_IN_3--}
+</div>
+
+<div>
+       {%message,BEG_CLICKS=$content[clicks]%}
+</div>
+
+<div align="right">
+       {--BEG_THANKS_FOR_CLICK_AGAIN--}
+</div>

diff --git a/templates/de/html/birthday/birthday_msg.tpl b/templates/de/html/birthday/birthday_msg.tpl
index 1674a4dc2505e067a29e21781bfed87974db1932..2f606ca6eb99af44e0dd9ad3fdc33016a6cc934f 100644 (file)
--- a/templates/de/html/birthday/birthday_msg.tpl
+++ b/templates/de/html/birthday/birthday_msg.tpl
@@ -3,12 +3,12 @@
 </div>
 
 <div class="para">
-       Hallo $content[gender] $content[surname] $content[family]!
+       Hallo {%pipe,translateGender=$content[gender]%} $content[surname] $content[family]!
 </div>
 
 <div class="para">
        Wir das Team von <span class="nobr">{?MAIN_TITLE?}</span> w&uuml;schen Ihnen
        alles Gute und Gesundheit zum Geburtstag. Als kleines Geschenk von uns haben
-       wir Ihnen soeben <span class="nobr">$content[points] {?POINTS?}</span> Ihrem
+       wir Ihnen soeben <span class="nobr">{%pipe,translateComma=$content[points]%} {?POINTS?}</span> Ihrem
        Account gutgeschrieben!
 </div>

diff --git a/templates/de/html/doubler/doubler_index.tpl b/templates/de/html/doubler/doubler_index.tpl
index fce4115973bb68eb32ae12bd542cc8441cabfd81..3a2eed4e0c8363bbb79f0796be726017b32533a1 100644 (file)
--- a/templates/de/html/doubler/doubler_index.tpl
+++ b/templates/de/html/doubler/doubler_index.tpl
@@ -51,7 +51,7 @@
                </table>
                </form>
                <br />
-               {%message,DOUBLER_ALREADY_PAYED,$content[total]%}<br />
+               {%message,DOUBLER_ALREADY_PAYED=$content[total]%}<br />
                {--DOUBLER_POINTS_LEFT_1--} <strong>$content[left] {?POINTS?}</strong> {--DOUBLER_POINTS_LEFT_2--}<br />
                {--DOUBLER_USAGE_COUNTER_1--} <strong>{?doubler_counter?}</strong> {--DOUBLER_USAGE_COUNTER_2--}<br />
                <br />

diff --git a/templates/de/html/guest/guest_beg.tpl b/templates/de/html/guest/guest_beg.tpl
index e4c56b657a7b2d4eb5243e424ab48eaa2b9d2f81..a38eb5c8f92b5b52abaf2a558c49b1e15bf3f8a3 100644 (file)
--- a/templates/de/html/guest/guest_beg.tpl
+++ b/templates/de/html/guest/guest_beg.tpl
@@ -10,7 +10,7 @@
                        {--BEG_GUEST_EARN_3--}
                </div>
                <div class="para">
-                       {%message,BEG_GUEST_TIMEOUT,$content[timeout]%}
+                       {%message,BEG_GUEST_TIMEOUT=$content[timeout]%}
                </div>
                <div class="para" align="right">
                        {--BEG_GUEST_HAVE_FUN--}

diff --git a/templates/de/html/guest/guest_doubler.tpl b/templates/de/html/guest/guest_doubler.tpl
index d0a2ef74054c4fd6b54e779c548247296a3e8c8b..ffc804db4a9f2502c05855d08a68ccdf6121b1fe 100644 (file)
--- a/templates/de/html/guest/guest_doubler.tpl
+++ b/templates/de/html/guest/guest_doubler.tpl
@@ -9,7 +9,7 @@
                <td class="doubler_main bottom" style="padding-left: 0px; padding-right: 10px; padding-top: 10px; padding-bottom: 10px">
                        <ul>
                        <li>{--DOUBLER_MINIMUM_IS--} <strong>$content[min] {?POINTS?}</strong> {--DOUBLER_MAXIMUM_IS--} <strong>$content[max] {?POINTS?}</strong></li>
-                       <li>{%message,DOUBLER_ALREADY_PAYED,$content[total]%}</li>
+                       <li>{%message,DOUBLER_ALREADY_PAYED=$content[total]%}</li>
                        <li>{--DOUBLER_POINTS_LEFT_1--} <strong>$content[left] {?POINTS?}</strong> {--DOUBLER_POINTS_LEFT_2--}</li>
                        <li>{--DOUBLER_USAGE_COUNTER_1--} <strong>{?doubler_counter?}</strong> {--DOUBLER_USAGE_COUNTER_2--}</li>
                        <li>$content[payout_time]</li>

diff --git a/templates/de/html/guest/guest_rallye_footer.tpl b/templates/de/html/guest/guest_rallye_footer.tpl
index 9a530dbdfe08c9a5426b772c85443d65a6995eee..4db0a89c0610da23f6e5bb7df24715c848ee1b8a 100644 (file)
--- a/templates/de/html/guest/guest_rallye_footer.tpl
+++ b/templates/de/html/guest/guest_rallye_footer.tpl
@@ -2,8 +2,8 @@
        <td colspan="3" class="guest_title" height="10" style="padding-top: 5px; padding-bottom: 5px">
        <ul>
                <li><div class="guest_note">Es werden nur aktive User gewertet.</div></li>
-               <li><div class="guest_note">$content[min_users]</div></li>
-               <li><div class="guest_note">$content[min_prices]</div></li>
+               <li><div class="guest_note">{%pipe,determineReferalRallyeMinimumUsers=$content[min_users]%}</div></li>
+               <li><div class="guest_note">{%pipe,determineReferalRallyeMinimumPrices=$content[min_prices]%}</div></li>
                <li><div class="guest_note">Der Rechtsweg ist ausgeschlossen.</div></li>
        </ul>
        </td>

diff --git a/templates/de/html/guest/guest_register.tpl b/templates/de/html/guest/guest_register.tpl
index abff4d5c27dbe2c948866c814643b96f44fb3f1d..45013c6ca5f7c9f3154999cbef0ae00674550bd9 100644 (file)
--- a/templates/de/html/guest/guest_register.tpl
+++ b/templates/de/html/guest/guest_register.tpl
@@ -84,7 +84,7 @@
        </tr>
        <tr>
                <td colspan="2" class="guest_title">
-                       {--GUEST_SELECT_LEAST_CATS_1--}{?least_cats?}{--GUEST_SELECT_LEAST_CATS_2--}
+                       {--GUEST_SELECT_LEAST_CATS--}
                </td>
        </tr>
        <tr>

diff --git a/templates/de/html/js/js_surfbar_member_edit.tpl b/templates/de/html/js/js_surfbar_member_edit.tpl
index adeeb9c248dfd330f201e017dc80e8311d538dab..9785b04341d970b4ccd6693b112723b0c3f3c495 100644 (file)
--- a/templates/de/html/js/js_surfbar_member_edit.tpl
+++ b/templates/de/html/js/js_surfbar_member_edit.tpl
@@ -1,6 +1,6 @@
 var limit = document.getElementById('limit');
 var span = document.getElementById('span_limit');
-var old_limit = $content[views_max];
+var old_limit = {%pipe,bigintval=$content[views_max]%};
 
 function FocusLimitedNo () {
        if ((limit.value > 0) && (limit.value != '-')) {
@@ -37,7 +37,7 @@ function ResetForm () {
        return false;
 }
 
-if ($content[limited] == true) {
+if ({%pipe,bigintval=$content[limited]%} == true) {
        FocusLimitedYes();
 } else {
        FocusLimitedNo();

diff --git a/templates/de/html/mailid/mailid_points_done.tpl b/templates/de/html/mailid/mailid_points_done.tpl
index 2110ab014a6a1930b76bcf584dd362a88f8fc047..24d69b2006b54f911f502eddbb3d7c86ea173864 100644 (file)
--- a/templates/de/html/mailid/mailid_points_done.tpl
+++ b/templates/de/html/mailid/mailid_points_done.tpl
@@ -1,8 +1,8 @@
 <table border="0" cellspacing="0" cellpadding="0" class="member_mailidtop">
        <tr>
                <td width="220" align="center">
-                       {%message,THANX_POINTS_ADDED,$content[points]%}<br />
-                       {%message,MAILID_TOTAL_POINTS,$content[total]%}
+                       {%message,THANX_POINTS_ADDED=$content[points]%}<br />
+                       {%message,MAILID_TOTAL_POINTS=$content[total]%}
                </td>
                <td align="center">
                        <table border="0" cellspacing="0" cellpadding="0" class="member_banner dashed">

diff --git a/templates/de/html/mailid/mailid_points_done2.tpl b/templates/de/html/mailid/mailid_points_done2.tpl
index f36e8ba2294c20b086f6b5b9aa03b775ea6847dd..3842ea434dacae6b54919274db9abcdf3d6a04ca 100644 (file)
--- a/templates/de/html/mailid/mailid_points_done2.tpl
+++ b/templates/de/html/mailid/mailid_points_done2.tpl
@@ -2,8 +2,8 @@
        <tr>
                <td width="220" align="center">
                        <div class="tiny">
-                       {%message,THANX_POINTS_ADDED,$content[points]%}<br />
-                       {%message,MAILID_TOTAL_POINTS,$content[total]%}<br />
+                       {%message,THANX_POINTS_ADDED=$content[points]%}<br />
+                       {%message,MAILID_TOTAL_POINTS=$content[total]%}<br />
                        <br />
                        <a href="{%url=show_bonus.php?userid=$content[userid]&amp;t=$content[type]&amp;d=$content[data]%}" target="_blank">{--BONUS_SHOW_TURBO_BONUS--}
                        </div>

diff --git a/templates/de/html/mailid/mailid_points_failed.tpl b/templates/de/html/mailid/mailid_points_failed.tpl
index 7ee383b92597ba20067eba315bf61634546403ef..b63a910d1a9f97894b43170c2d5993a6ddc137eb 100644 (file)
--- a/templates/de/html/mailid/mailid_points_failed.tpl
+++ b/templates/de/html/mailid/mailid_points_failed.tpl
@@ -1,7 +1,7 @@
 <table border="0" cellspacing="0" cellpadding="0" class="member_mailidtop">
        <tr>
                <td width="220" align="center">
-                       {%message,POINTS_NOT_ADDED,$content[points]%}
+                       {%message,POINTS_NOT_ADDED=$content[points]%}
                </td>
                <td align="center">
                        <div class="member_banner dashed">

diff --git a/templates/de/html/mailid/mailid_points_locked.tpl b/templates/de/html/mailid/mailid_points_locked.tpl
index ab0eb18e022b580d84d8a5d4843c50fb055775b2..b36719abb0915ba14ab411c9e918708a7ed9ea6c 100644 (file)
--- a/templates/de/html/mailid/mailid_points_locked.tpl
+++ b/templates/de/html/mailid/mailid_points_locked.tpl
@@ -1,7 +1,7 @@
 <table border="0" cellspacing="0" cellpadding="0" class="member_mailidtop">
        <tr>
                <td width="220" align="center">
-                       {%message,THANX_POINTS_LOCKED,$content[points]%}
+                       {%message,THANX_POINTS_LOCKED=$content[points]%}
                </td>
                <td align="center">
                        <div class="member_banner dashed">

diff --git a/templates/de/html/mailid/mailid_points_locked2.tpl b/templates/de/html/mailid/mailid_points_locked2.tpl
index fb29fdbdeef3b30d2bc3a8da99c80defb3b150cf..684705d7e29615409609bffd85753dcb39468602 100644 (file)
--- a/templates/de/html/mailid/mailid_points_locked2.tpl
+++ b/templates/de/html/mailid/mailid_points_locked2.tpl
@@ -2,7 +2,7 @@
        <tr>
                <td width="220" align="center">
                        <div class="tiny">
-                               {%message,THANX_POINTS_LOCKED,$content[points]%}<br />
+                               {%message,THANX_POINTS_LOCKED=$content[points]%}<br />
                                <br />
                                <a href="{%url=show_bonus.php?userid=$content[userid]&amp;t=$content[type]&amp;d=$content[data]%}" target="_blank">{--BONUS_SHOW_TURBO_BONUS--}
                        </div>

diff --git a/templates/de/html/mediadata.tpl b/templates/de/html/mediadata.tpl
index e9afbbfe67a23cf613e9bc8dc577b2d2e3f31ec4..0cd02fe63e5688e58a278e031ff97590158baf81 100644 (file)
--- a/templates/de/html/mediadata.tpl
+++ b/templates/de/html/mediadata.tpl
@@ -9,7 +9,7 @@
        </tr>
        <tr>
                <td class="bottom medium" colspan="2" align="center">
-                       {--USER_MT_PROJECTED_1--}$content[projected]{--USER_MT_PROJECTED_2--}{?mt_stage?}{--USER_MT_PROJECTED_3--}
+                       $content[projected]
                </td>
        </tr>
        <tr>

diff --git a/templates/de/html/member/member_beg.tpl b/templates/de/html/member/member_beg.tpl
index ec47d6c465e03090d73f33a5a6a979f389ac9dd3..3132773ee64a4020312e9069b7b19aae783dca3d 100644 (file)
--- a/templates/de/html/member/member_beg.tpl
+++ b/templates/de/html/member/member_beg.tpl
@@ -18,7 +18,7 @@
                        {--BEG_MEMBER_EARN_3--}
                </div>
                <div class="para">
-                       {%message,BEG_MEMBER_TIMEOUT,{%config,createFancyTime=beg_timeout%}%}
+                       {%message,BEG_MEMBER_TIMEOUT%}
                </div>
                <div class="para" align="right">
                        {--BEG_MEMBER_HAVE_FUN--}

diff --git a/templates/de/html/member/member_doubler.tpl b/templates/de/html/member/member_doubler.tpl
index 031bcc00fe232131618bae882863b75c8cc52713..6ec5e36517582f103a7dc48bcbc1b592b6f06b25 100644 (file)
--- a/templates/de/html/member/member_doubler.tpl
+++ b/templates/de/html/member/member_doubler.tpl
@@ -28,7 +28,7 @@
        <div class="doubler_main bottom" style="padding-left: 0px; padding-right: 10px; padding-top: 10px; padding-bottom: 10px">
                <ul>
                        <li>{--DOUBLER_MINIMUM_IS--} <strong>{%config,translateComma=doubler_min%} {?POINTS?}</strong> {--DOUBLER_MAXIMUM_IS--} <strong>{%config,translateComma=doubler_max%} {?POINTS?}</strong></li>
-                       <li>{%message,DOUBLER_ALREADY_PAYED,{%config,translateComma=doubler_points%}%}</li>
+                       <li>{%message,MEMBER_DOUBLER_ALREADY_PAYED%}</li>
                        <li>{--DOUBLER_POINTS_LEFT_1--} <strong>$content[left] {?POINTS?}</strong> {--DOUBLER_POINTS_LEFT_2--}</li>
                        <li>{--DOUBLER_USAGE_COUNTER_1--} <strong>{?doubler_counter?}</strong> {--DOUBLER_USAGE_COUNTER_2--}</li>
                        <li>$content[payout_time]</li>

diff --git a/templates/de/html/member/member_mail_bonus_deleted.tpl b/templates/de/html/member/member_mail_bonus_deleted.tpl
index e6493965886f573389bfa357d405a206d126f737..cf04ab36116e33d9311f0f8437325e905d07d40a 100644 (file)
--- a/templates/de/html/member/member_mail_bonus_deleted.tpl
+++ b/templates/de/html/member/member_mail_bonus_deleted.tpl
@@ -1,7 +1,7 @@
 <table border="0" cellspacing="0" cellpadding="0" class="member_table dashed" width="650">
 <tr>
        <td colspan="2" align="center" class="header_column bottom">
-               <strong>{%message,MEMBER_MAIL_BONUS_DETAILS_TITLE,$content[id]%}</strong>
+               <strong>{%message,MEMBER_MAIL_BONUS_DETAILS_TITLE=$content[id]%}</strong>
        </td>
 </tr>
 <tr>
@@ -11,7 +11,7 @@
 <tr>
        <td align="center" class="bottom right"><strong>{--EMAIL_SENDER--}:</strong></td>
        <td align="center" class="bottom">
-               $content[sender]
+               {--USERNAME_ADMIN_SHORT--}
        </td>
 </tr>
 <tr>
@@ -29,7 +29,7 @@
 <tr>
        <td align="center" class="bottom right"><strong>{--EMAIL_CATEGORY--}:</strong></td>
        <td align="center" class="bottom">
-               $content[category]
+               {%pipe,getCategory=$content[category]%}
        </td>
 </tr>
 <tr>
@@ -41,19 +41,19 @@
 <tr>
        <td align="center" class="bottom right"><strong>{--EMAIL_TIME--}:</strong></td>
        <td align="center" class="bottom">
-               $content[time]
+               {%pipe,createFancyTime=$content[time]%}
        </td>
 </tr>
 <tr>
        <td align="center" class="bottom right"><strong>{--EMAIL_IS_NOTIFY--}</strong></td>
        <td align="center" class="bottom">
-               $content[is_notify]
+               {%pipe,translateYesNo=$content[is_notify]%}
        </td>
 </tr>
 <tr>
        <td align="center" class="bottom right"><strong>{--EMAIL_POINTS--}:</strong></td>
        <td align="center" class="bottom" style="padding-right:5px">
-               $content[points] {?POINTS?}
+               {%pipe,translateComma=$content[points]%} {?POINTS?}
        </td>
 </tr>
 <tr>

diff --git a/templates/de/html/member/member_mail_bonus_new.tpl b/templates/de/html/member/member_mail_bonus_new.tpl
index b47f173d3e832cfaedb202c1a3165ed93e787683..f6b78394056c6ce1c2d8602da7ffc7ac07ec6ef5 100644 (file)
--- a/templates/de/html/member/member_mail_bonus_new.tpl
+++ b/templates/de/html/member/member_mail_bonus_new.tpl
@@ -1,7 +1,7 @@
 <table border="0" cellspacing="0" cellpadding="0" class="member_table dashed" width="650">
 <tr>
        <td colspan="2" align="center" class="header_column bottom">
-               <strong>{%message,MEMBER_MAIL_BONUS_DETAILS_TITLE,$content[id]%}</strong>
+               <strong>{%message,MEMBER_MAIL_BONUS_DETAILS_TITLE=$content[id]%}</strong>
        </td>
 </tr>
 <tr>
@@ -11,7 +11,7 @@
 <tr>
        <td align="center" class="bottom right"><strong>{--EMAIL_SENDER--}:</strong></td>
        <td align="center" class="bottom">
-               $content[sender]
+               {--USERNAME_ADMIN_SHORT--}
        </td>
 </tr>
 <tr>
@@ -29,7 +29,7 @@
 <tr>
        <td align="center" class="bottom right"><strong>{--EMAIL_CATEGORY--}:</strong></td>
        <td align="center" class="bottom">
-               $content[category]
+               {%pipe,getCategory=$content[category]%}
        </td>
 </tr>
 <tr>
@@ -41,19 +41,19 @@
 <tr>
        <td align="center" class="bottom right"><strong>{--EMAIL_TIME--}:</strong></td>
        <td align="center" class="bottom">
-               $content[time]
+               {%pipe,createFancyTime=$content[time]%}
        </td>
 </tr>
 <tr>
        <td align="center" class="bottom right"><strong>{--EMAIL_IS_NOTIFY--}</strong></td>
        <td align="center" class="bottom">
-               $content[is_notify]
+               {%pipe,translateYesNo=$content[is_notify]%}
        </td>
 </tr>
 <tr>
        <td align="center" class="bottom right"><strong>{--EMAIL_POINTS--}:</strong></td>
        <td align="center" class="bottom" style="padding-right:5px">
-               $content[points] {?POINTS?}
+               {%pipe,translateComma=$content[points]%} {?POINTS?}
        </td>
 </tr>
 <tr>

diff --git a/templates/de/html/member/member_mail_bonus_queue.tpl b/templates/de/html/member/member_mail_bonus_queue.tpl
index 22d0ca6256b6e9e54cbfb459e92e3186d633676d..3e904c30069315dacf7453aded9ed2749284a4aa 100644 (file)
--- a/templates/de/html/member/member_mail_bonus_queue.tpl
+++ b/templates/de/html/member/member_mail_bonus_queue.tpl
@@ -1,7 +1,7 @@
 <table border="0" cellspacing="0" cellpadding="0" class="member_table dashed" width="650">
 <tr>
        <td colspan="2" align="center" class="header_column bottom">
-               <strong>{%message,MEMBER_MAIL_BONUS_DETAILS_TITLE,$content[id]%}</strong>
+               <strong>{%message,MEMBER_MAIL_BONUS_DETAILS_TITLE=$content[id]%}</strong>
        </td>
 </tr>
 <tr>
@@ -11,7 +11,7 @@
 <tr>
        <td align="center" class="bottom right"><strong>{--EMAIL_SENDER--}:</strong></td>
        <td align="center" class="bottom">
-               $content[sender]
+               {--USERNAME_ADMIN_SHORT--}
        </td>
 </tr>
 <tr>
@@ -29,7 +29,7 @@
 <tr>
        <td align="center" class="bottom right"><strong>{--EMAIL_CATEGORY--}:</strong></td>
        <td align="center" class="bottom">
-               $content[category]
+               {%pipe,getCategory=$content[category]%}
        </td>
 </tr>
 <tr>
@@ -41,19 +41,19 @@
 <tr>
        <td align="center" class="bottom right"><strong>{--EMAIL_TIME--}:</strong></td>
        <td align="center" class="bottom">
-               $content[time]
+               {%pipe,createFancyTime=$content[time]%}
        </td>
 </tr>
 <tr>
        <td align="center" class="bottom right"><strong>{--EMAIL_IS_NOTIFY--}</strong></td>
        <td align="center" class="bottom">
-               $content[is_notify]
+               {%pipe,translateYesNo=$content[is_notify]%}
        </td>
 </tr>
 <tr>
        <td align="center" class="bottom right"><strong>{--EMAIL_POINTS--}:</strong></td>
        <td align="center" class="bottom" style="padding-right:5px">
-               $content[points] {?POINTS?}
+               {%pipe,translateComma=$content[points]%} {?POINTS?}
        </td>
 </tr>
 <tr>

diff --git a/templates/de/html/member/member_mail_bonus_send.tpl b/templates/de/html/member/member_mail_bonus_send.tpl
index 934b2eeb10f21ced2b09e18db550c78118d25f80..9cec0c2b6bcd7dc7b7040914f3e47aecc03ef09e 100644 (file)
--- a/templates/de/html/member/member_mail_bonus_send.tpl
+++ b/templates/de/html/member/member_mail_bonus_send.tpl
@@ -1,7 +1,7 @@
 <table border="0" cellspacing="0" cellpadding="0" class="member_table dashed" width="650">
 <tr>
        <td colspan="2" align="center" class="header_column bottom">
-               <strong>{%message,MEMBER_MAIL_BONUS_DETAILS_TITLE,$content[id]%}</strong>
+               <strong>{%message,MEMBER_MAIL_BONUS_DETAILS_TITLE=$content[id]%}</strong>
        </td>
 </tr>
 <tr>
@@ -13,7 +13,7 @@
 <tr>
        <td align="center" class="bottom right"><strong>{--EMAIL_SENDER--}:</strong></td>
        <td align="center" class="bottom">
-               $content[sender]
+               {--USERNAME_ADMIN_SHORT--}
        </td>
 </tr>
 <tr>
@@ -31,7 +31,7 @@
 <tr>
        <td align="center" class="bottom right"><strong>{--EMAIL_CATEGORY--}:</strong></td>
        <td align="center" class="bottom">
-               $content[category]
+               {%pipe,getCategory=$content[category]%}
        </td>
 </tr>
 <tr>
@@ -43,19 +43,19 @@
 <tr>
        <td align="center" class="bottom right"><strong>{--EMAIL_TIME--}:</strong></td>
        <td align="center" class="bottom">
-               $content[time]
+               {%pipe,createFancyTime=$content[time]%}
        </td>
 </tr>
 <tr>
        <td align="center" class="bottom right"><strong>{--EMAIL_IS_NOTIFY--}</strong></td>
        <td align="center" class="bottom">
-               $content[is_notify]
+               {%pipe,translateYesNo=$content[is_notify]%}
        </td>
 </tr>
 <tr>
        <td align="center" class="bottom right"><strong>{--EMAIL_POINTS--}:</strong></td>
        <td align="center" class="bottom" style="padding-right:5px">
-               $content[points] {?POINTS?}
+               {%pipe,translateComma=$content[points]%} {?POINTS?}
        </td>
 </tr>
 <tr>

diff --git a/templates/de/html/member/member_mail_normal_active.tpl b/templates/de/html/member/member_mail_normal_active.tpl
index d8f79d666f9b750bf794c17e31f0616b64fb020a..a1680f076a36bad2499ff4a79c264ef07a22e002 100644 (file)
--- a/templates/de/html/member/member_mail_normal_active.tpl
+++ b/templates/de/html/member/member_mail_normal_active.tpl
@@ -1,7 +1,7 @@
 <table border="0" cellspacing="0" cellpadding="0" class="member_table dashed" width="650">
 <tr>
        <td colspan="2" align="center" class="header_column bottom">
-               <strong>{--MEMBER_MAIL_NORMAL_DETAILS_TITLE_1--}$content[id]{--MEMBER_MAIL_NORMAL_DETAILS_TITLE_2--}</strong>
+               <strong>{%message,MEMBER_MAIL_NORMAL_DETAILS_TITLE=$content[id]%}</strong>
        </td>
 </tr>
 <tr>
@@ -29,7 +29,7 @@
 <tr>
        <td align="center" class="bottom right"><strong>{--EMAIL_CATEGORY--}:</strong></td>
        <td align="center" class="bottom">
-               $content[category]
+               {%pipe,getCategory=$content[category]%}
        </td>
 </tr>
 <tr>
@@ -41,13 +41,13 @@
 <tr>
        <td align="center" class="bottom right"><strong>{--EMAIL_TIME--}:</strong></td>
        <td align="center" class="bottom">
-               $content[time]
+               {%pipe,createFancyTime=$content[time]%}
        </td>
 </tr>
 <tr>
        <td align="center" class="bottom right"><strong>{--EMAIL_POINTS--}:</strong></td>
        <td align="center" class="bottom" style="padding-right:5px">
-               $content[points] {?POINTS?}
+               {%pipe,translateComma=$content[points]%} {?POINTS?}
        </td>
 </tr>
 <tr>

diff --git a/templates/de/html/member/member_mail_normal_admin.tpl b/templates/de/html/member/member_mail_normal_admin.tpl
index 8f78c83a4708b80c6d7aaaed80062f52758d2eba..8c02241cdecc7bed96b958a8a3b2aeee61fbab0b 100644 (file)
--- a/templates/de/html/member/member_mail_normal_admin.tpl
+++ b/templates/de/html/member/member_mail_normal_admin.tpl
@@ -1,7 +1,7 @@
 <table border="0" cellspacing="0" cellpadding="0" class="member_table dashed" width="650">
 <tr>
        <td colspan="2" align="center" class="header_column bottom">
-               <strong>{--MEMBER_MAIL_NORMAL_DETAILS_TITLE_1--}$content[id]{--MEMBER_MAIL_NORMAL_DETAILS_TITLE_2--}</strong>
+               <strong>{%message,MEMBER_MAIL_NORMAL_DETAILS_TITLE=$content[id]%}</strong>
        </td>
 </tr>
 <tr>
@@ -29,7 +29,7 @@
 <tr>
        <td align="center" class="bottom right"><strong>{--EMAIL_CATEGORY--}:</strong></td>
        <td align="center" class="bottom">
-               $content[category]
+               {%pipe,getCategory=$content[category]%}
        </td>
 </tr>
 <tr>
@@ -41,13 +41,13 @@
 <tr>
        <td align="center" class="bottom right"><strong>{--EMAIL_TIME--}:</strong></td>
        <td align="center" class="bottom">
-               $content[time]
+               {%pipe,createFancyTime=$content[time]%}
        </td>
 </tr>
 <tr>
        <td align="center" class="bottom right"><strong>{--EMAIL_POINTS--}:</strong></td>
        <td align="center" class="bottom" style="padding-right:5px">
-               $content[points] {?POINTS?}
+               {%pipe,translateComma=$content[points]%} {?POINTS?}
        </td>
 </tr>
 <tr>

diff --git a/templates/de/html/member/member_mail_normal_deleted.tpl b/templates/de/html/member/member_mail_normal_deleted.tpl
index e18ea2d51746efd104f6ee22a2e5aadb0c7fb944..e616584ca5e434095bf87262636ada0b22506732 100644 (file)
--- a/templates/de/html/member/member_mail_normal_deleted.tpl
+++ b/templates/de/html/member/member_mail_normal_deleted.tpl
@@ -1,7 +1,7 @@
 <table border="0" cellspacing="0" cellpadding="0" class="member_table dashed" width="650">
 <tr>
        <td colspan="2" align="center" class="header_column bottom">
-               <strong>{--MEMBER_MAIL_NORMAL_DETAILS_TITLE_1--}$content[id]{--MEMBER_MAIL_NORMAL_DETAILS_TITLE_2--}</strong>
+               <strong>{%message,MEMBER_MAIL_NORMAL_DETAILS_TITLE=$content[id]%}</strong>
        </td>
 </tr>
 <tr>
@@ -29,7 +29,7 @@
 <tr>
        <td align="center" class="bottom right"><strong>{--EMAIL_CATEGORY--}:</strong></td>
        <td align="center" class="bottom">
-               $content[category]
+               {%pipe,getCategory=$content[category]%}
        </td>
 </tr>
 <tr>
@@ -41,13 +41,13 @@
 <tr>
        <td align="center" class="bottom right"><strong>{--EMAIL_TIME--}:</strong></td>
        <td align="center" class="bottom">
-               $content[time]
+               {%pipe,createFancyTime=$content[time]%}
        </td>
 </tr>
 <tr>
        <td align="center" class="bottom right"><strong>{--EMAIL_POINTS--}:</strong></td>
        <td align="center" class="bottom" style="padding-right:5px">
-               $content[points] {?POINTS?}
+               {%pipe,translateComma=$content[points]%} {?POINTS?}
        </td>
 </tr>
 <tr>

diff --git a/templates/de/html/member/member_mail_normal_new.tpl b/templates/de/html/member/member_mail_normal_new.tpl
index ac7186d3941f2e385fa82e162ee9b238fdf87d11..e718d54ab94229d0f834ef3991eca4530ede82f5 100644 (file)
--- a/templates/de/html/member/member_mail_normal_new.tpl
+++ b/templates/de/html/member/member_mail_normal_new.tpl
@@ -1,7 +1,7 @@
 <table border="0" cellspacing="0" cellpadding="0" class="member_table dashed" width="650">
 <tr>
        <td colspan="2" align="center" class="header_column bottom">
-               <strong>{--MEMBER_MAIL_NORMAL_DETAILS_TITLE_1--}$content[id]{--MEMBER_MAIL_NORMAL_DETAILS_TITLE_2--}</strong>
+               <strong>{%message,MEMBER_MAIL_NORMAL_DETAILS_TITLE=$content[id]%}</strong>
        </td>
 </tr>
 <tr>
@@ -29,7 +29,7 @@
 <tr>
        <td align="center" class="bottom right"><strong>{--EMAIL_CATEGORY--}:</strong></td>
        <td align="center" class="bottom">
-               $content[category]
+               {%pipe,getCategory=$content[category]%}
        </td>
 </tr>
 <tr>
@@ -41,13 +41,13 @@
 <tr>
        <td align="center" class="bottom right"><strong>{--EMAIL_TIME--}:</strong></td>
        <td align="center" class="bottom">
-               $content[time]
+               {%pipe,createFancyTime=$content[time]%}
        </td>
 </tr>
 <tr>
        <td align="center" class="bottom right"><strong>{--EMAIL_POINTS--}:</strong></td>
        <td align="center" class="bottom" style="padding-right:5px">
-               $content[points] {?POINTS?}
+               {%pipe,translateComma=$content[points]%} {?POINTS?}
        </td>
 </tr>
 <tr>

diff --git a/templates/de/html/member/member_mail_normal_send.tpl b/templates/de/html/member/member_mail_normal_send.tpl
index ffac5cfab2b5432a57b0386643a0382b95ee886f..24d73b78e15972a7d68d84d9fc954c8942fad349 100644 (file)
--- a/templates/de/html/member/member_mail_normal_send.tpl
+++ b/templates/de/html/member/member_mail_normal_send.tpl
@@ -1,7 +1,7 @@
 <table border="0" cellspacing="0" cellpadding="0" class="member_table dashed" width="650">
 <tr>
        <td colspan="2" align="center" class="header_column bottom">
-               <strong>{--MEMBER_MAIL_NORMAL_DETAILS_TITLE_1--}$content[id]{--MEMBER_MAIL_NORMAL_DETAILS_TITLE_2--}</strong>
+               <strong>{%message,MEMBER_MAIL_NORMAL_DETAILS_TITLE=$content[id]%}</strong>
        </td>
 </tr>
 <tr>
@@ -31,7 +31,7 @@
 <tr>
        <td align="center" class="bottom right"><strong>{--EMAIL_CATEGORY--}:</strong></td>
        <td align="center" class="bottom">
-               $content[category]
+               {%pipe,getCategory=$content[category]%}
        </td>
 </tr>
 <tr>
@@ -43,13 +43,13 @@
 <tr>
        <td align="center" class="bottom right"><strong>{--EMAIL_TIME--}:</strong></td>
        <td align="center" class="bottom">
-               $content[time]
+               {%pipe,createFancyTime=$content[time]%}
        </td>
 </tr>
 <tr>
        <td align="center" class="bottom right"><strong>{--EMAIL_POINTS--}:</strong></td>
        <td align="center" class="bottom" style="padding-right:5px">
-               $content[points] {?POINTS?}
+               {%pipe,translateComma=$content[points]%} {?POINTS?}
        </td>
 </tr>
 <tr>

diff --git a/templates/de/html/member/member_mail_normal_temp.tpl b/templates/de/html/member/member_mail_normal_temp.tpl
index 6a80843c476cb03af2bc4c989da5181846d796b8..6ef24548973bef49d5554a79cf8f0f8c29e45615 100644 (file)
--- a/templates/de/html/member/member_mail_normal_temp.tpl
+++ b/templates/de/html/member/member_mail_normal_temp.tpl
@@ -1,7 +1,7 @@
 <table border="0" cellspacing="0" cellpadding="0" class="member_table dashed" width="650">
 <tr>
        <td colspan="2" align="center" class="header_column bottom">
-               <strong>{--MEMBER_MAIL_NORMAL_DETAILS_TITLE_1--}$content[id]{--MEMBER_MAIL_NORMAL_DETAILS_TITLE_2--}</strong>
+               <strong>{%message,MEMBER_MAIL_NORMAL_DETAILS_TITLE=$content[id]%}</strong>
        </td>
 </tr>
 <tr>
@@ -29,7 +29,7 @@
 <tr>
        <td align="center" class="bottom right"><strong>{--EMAIL_CATEGORY--}:</strong></td>
        <td align="center" class="bottom">
-               $content[category]
+               {%pipe,getCategory=$content[category]%}
        </td>
 </tr>
 <tr>
@@ -41,13 +41,13 @@
 <tr>
        <td align="center" class="bottom right"><strong>{--EMAIL_TIME--}:</strong></td>
        <td align="center" class="bottom">
-               $content[time]
+               {%pipe,createFancyTime=$content[time]%}
        </td>
 </tr>
 <tr>
        <td align="center" class="bottom right"><strong>{--EMAIL_POINTS--}:</strong></td>
        <td align="center" class="bottom" style="padding-right:5px">
-               $content[points] {?POINTS?}
+               {%pipe,translateComma=$content[points]%} {?POINTS?}
        </td>
 </tr>
 <tr>

diff --git a/templates/de/html/member/member_mydata_edit.tpl b/templates/de/html/member/member_mydata_edit.tpl
index d1c92387431180d85cb9ef6b87d1aac46118e28b..104a25e5c1e24df41c0f29571742e4aefd9e6ac7 100644 (file)
--- a/templates/de/html/member/member_mydata_edit.tpl
+++ b/templates/de/html/member/member_mydata_edit.tpl
@@ -19,22 +19,22 @@
        <tr>
                <td align="right">{--SURNAME--}, {--FAMILY--}:</td>
                <td>
-                       <input type="text" name="surname" class="member_normal" size="15" maxlength="255" value="$content[surname]" />
-                       <input type="text" name="family" class="member_normal" size="15" maxlength="255" value="$content[family]" />
+                       <input type="text" name="surname" class="member_normal" size="15" maxlength="255" value="{%user,surname=$userid%}" />
+                       <input type="text" name="family" class="member_normal" size="15" maxlength="255" value="{%user,family=$userid%}" />
                </td>
        </tr>
        <tr>
                <td align="right">{--STREET_NR--}:</td>
                <td>
-                       <input type="text" name="street_nr" class="member_normal" size="25" maxlength="255" value="$content[street_nr]" />
+                       <input type="text" name="street_nr" class="member_normal" size="25" maxlength="255" value="{%user,street_nr=$userid%}" />
                </td>
        </tr>
        <tr>
                <td align="right">{--COUNTRY--}, {--ZIP--}, {--CITY--}:</td>
                <td>
-                       $content[country]
-                       <input type="text" name="zip" class="member_normal" size="5" maxlength="10" value="$content[zip]" />
-                       <input type="text" name="city" class="member_normal" size="20" maxlength="255" value="$content[city]" />
+                       {%user,county,determineCountry=$userid%}
+                       <input type="text" name="zip" class="member_normal" size="5" maxlength="10" value="{%user,zip,bigintval=$userid%}" />
+                       <input type="text" name="city" class="member_normal" size="20" maxlength="255" value="{%city,city=$userid%}" />
                </td>
        </tr>
        <tr>

diff --git a/templates/de/html/member/member_mydata_overview.tpl b/templates/de/html/member/member_mydata_overview.tpl
index f85da42bfed62de379c433cf73324971cd6788b7..a24f2c35b7d4eb4d4e4e00b44f3963959027cff6 100644 (file)
--- a/templates/de/html/member/member_mydata_overview.tpl
+++ b/templates/de/html/member/member_mydata_overview.tpl
@@ -11,31 +11,31 @@
        </tr>
        <tr>
                <td align="right">{--GENDER--}:</td>
-               <td><strong>$content[gender]</strong></td>
+               <td><strong>{%user,gender,translateGender=$userid%}</strong></td>
        </tr>
        <tr>
                <td align="right">{--SURNAME--}:</td>
-               <td><strong>$content[surname]</strong></td>
+               <td><strong>{%user,surname=$userid%}</strong></td>
        </tr>
        <tr>
                <td align="right">{--FAMILY--}:</td>
-               <td><strong>$content[family]</strong></td>
+               <td><strong>{%user,family=$userid%}</strong></td>
        </tr>
        <tr>
                <td align="right">{--STREET_NR--}:</td>
-               <td><strong>$content[street_nr]</strong></td>
+               <td><strong>{%user,street_nr=$userid%}</strong></td>
        </tr>
        <tr>
                <td align="right">{--COUNTRY--}:</td>
-               <td><strong>$content[country]</strong></td>
+               <td><strong>{%user,county,determineCountry=$userid%}</strong></td>
        </tr>
        <tr>
                <td align="right">{--ZIP--}:</td>
-               <td><strong>$content[zip]</strong></td>
+               <td><strong>{%user,zip,bigintval=$userid%}</strong></td>
        </tr>
        <tr>
                <td align="right">{--CITY--}:</td>
-               <td><strong>$content[city]</strong></td>
+               <td><strong>{%city,city=$userid%}</strong></td>
        </tr>
        <tr>
                <td align="right">{--EMAIL--}:</td>

diff --git a/templates/de/html/member/member_points.tpl b/templates/de/html/member/member_points.tpl
index f9c255b8f5860d2b3c1c9034d0000098177fc386..eb4cf30446358d45e8ae659e748cc67b2d7c8fe4 100644 (file)
--- a/templates/de/html/member/member_points.tpl
+++ b/templates/de/html/member/member_points.tpl
@@ -14,13 +14,13 @@
        <tr>
                <td class="member_data bottom"><strong>{--POINTS_SUM--}</strong></td>
                <td class="member_data bottom">
-                       <strong>$content[sum] {?POINTS?}</strong>
+                       <strong>{%pipe,translateComma=$content[sum]%} {?POINTS?}</strong>
                </td>
-               <td class="member_data bottom" align="center"><strong>$content[tref]</strong></td>
+               <td class="member_data bottom" align="center"><strong>{%pipe,translateComma=$content[tref]%}</strong></td>
        </tr>
        <tr>
                <td class="member_data">{--POINTS_LOCKED--}</td>
-               <td class="member_data">$content[tlock] {?POINTS?}</td>
+               <td class="member_data">{%pipe,translateComma=$content[tlock]%} {?POINTS?}</td>
                <td class="member_data">-</td>
        </tr>
        $content[special_rows]
@@ -31,7 +31,7 @@
        </tr>
        <tr>
                <td class="member_data">{--RECEIVED_MAILS--}:</td>
-               <td class="member_data">$content[receive]</td>
+               <td class="member_data">{%pipe,translateComma=$content[receive]%}</td>
                <td class="member_data">-</td>
        </tr>
        <tr>
@@ -41,12 +41,12 @@
        </tr>
        <tr>
                <td class="member_data">{--CONFIRMED_MAILS--}:</td>
-               <td class="member_data">$content[confirmed]</td>
+               <td class="member_data">{%pipe,translateComma=$content[confirmed]%}</td>
                <td class="member_data">-</td>
        </tr>
        <tr>
                <td class="member_data">{--SENT_MAILS--}:</td>
-               <td class="member_data">$content[sent]</td>
+               <td class="member_data">{%pipe,translateComma=$content[sent]%}</td>
                <td class="member_data">-</td>
        </tr>
 </table>

diff --git a/templates/de/html/member/member_points_bonus_rows.tpl b/templates/de/html/member/member_points_bonus_rows.tpl
index 9f9fef01893d11d238d22b82d55dca34341d6337..c6ba4a0d0edc0f4200993a31fb4e26c9023b892b 100644 (file)
--- a/templates/de/html/member/member_points_bonus_rows.tpl
+++ b/templates/de/html/member/member_points_bonus_rows.tpl
@@ -10,31 +10,31 @@
 </tr>
 <tr>
        <td class="member_data">{--BONUS_LOGIN_TOTAL--}</td>
-       <td class="member_data">$content[login] {?POINTS?}</td>
+       <td class="member_data">{%user,login_bonus,translateComma=$userid%} {?POINTS?}</td>
        <td class="member_data"></td>
 </tr>
 <tr>
        <td class="member_data">{--BONUS_TURBO_TOTAL--}</td>
-       <td class="member_data">$content[turbo] {?POINTS?}</td>
+       <td class="member_data">{%user,turbo_bonus,translateComma=$userid%} {?POINTS?}</td>
        <td class="member_data">-</td>
 </tr>
 <tr>
        <td class="member_data">{--BONUS_REF_TOTAL--}</td>
-       <td class="member_data">$content[ref] {?POINTS?}</td>
+       <td class="member_data">{%user,bonus_ref,translateComma=$userid%} {?POINTS?}</td>
        <td class="member_data">-</td>
 </tr>
 <tr>
        <td class="member_data">{--BONUS_ORDER_TOTAL--}</td>
-       <td class="member_data">$content[order] {?POINTS?}</td>
+       <td class="member_data">{%user,bonus_order,translateComma=$userid%} {?POINTS?}</td>
        <td class="member_data">-</td>
 </tr>
 <tr>
        <td class="member_data bottom">{--BONUS_STATS_TOTAL--}</td>
-       <td class="member_data bottom">$content[stats] {?POINTS?}</td>
+       <td class="member_data bottom">{%user,bonus_stats,translateComma=$userid%} {?POINTS?}</td>
        <td class="member_data bottom">-</td>
 </tr>
 <tr>
        <td class="member_data"><strong>{--BONUS_TOTAL--}</strong></td>
-       <td class="member_data"><strong>$content[ttotal] {?POINTS?}</strong></td>
+       <td class="member_data"><strong>{%pipe,translateComma=$content[ttotal]%} {?POINTS?}</strong></td>
        <td class="member_data">-</td>
 </tr>

diff --git a/templates/de/html/member/member_points_row.tpl b/templates/de/html/member/member_points_row.tpl
index 4558bc86376ffd838cb3cddbb3cc5dd0314e3361..da1d4f54d87fce1747a71f5a3953bf563dd5a075 100644 (file)
--- a/templates/de/html/member/member_points_row.tpl
+++ b/templates/de/html/member/member_points_row.tpl
@@ -1,5 +1,5 @@
 <tr>
-       <td class="member_data">$content[level] {--REF_LEVEL--} ($content[percents]%)</td>
-       <td class="member_data">$content[points] {?POINTS?}</td>
-       <td class="member_data" align="center">$content[refs]</td>
+       <td class="member_data">$content[level] {--REF_LEVEL--} ({%pipe,translateComma=$content[percents]%}%)</td>
+       <td class="member_data">{%pipe,translateComma=$content[points]%} {?POINTS?}</td>
+       <td class="member_data" align="center">{%pipe,translateComma=$content[counter]%}</td>
 </tr>

diff --git a/templates/de/html/member/member_points_upgrade.tpl b/templates/de/html/member/member_points_upgrade.tpl
index 7e3cf2e27703931565c02c15cc43ee6487a369ca..f2175020478cd0afa0532b9615ce99096a4e133f 100644 (file)
--- a/templates/de/html/member/member_points_upgrade.tpl
+++ b/templates/de/html/member/member_points_upgrade.tpl
@@ -1,5 +1,5 @@
 <tr>
        <td colspan="3" align="center" class="member_data">
-               <strong class="admin_note">{--BONUS_EXTENSION_UPGRADE_1--}<u>v0.2.2</u>{--BONUS_EXTENSION_UPGRADE_2--}</strong>
+               <strong class="admin_note">{--BONUS_EXTENSION_UPGRADE--}</strong>
        </td>
 </tr>

diff --git a/templates/de/html/member/member_pool_row.tpl b/templates/de/html/member/member_pool_row.tpl
index 70e6f26dd9c0d25a89d670fdda8fa9db5071cf1b..785ddb08add31fcdf1e5b033b09ed673c2045b65 100644 (file)
--- a/templates/de/html/member/member_pool_row.tpl
+++ b/templates/de/html/member/member_pool_row.tpl
@@ -15,7 +15,7 @@
 <tr>
        <td align="center" class="switch_mem$content[sw] top right">
                {--EMAIL_PAYMENT--}:<br />
-               <strong>$content[pay]</strong>
+               <strong>{%pipe,translateComma=$content[pay]%}</strong>
        </td>
        <td align="center" class="switch_mem$content[sw] top right">
                {--EMAIL_CATEGORY--}:<br />

diff --git a/templates/de/html/member/member_ref_list_level.tpl b/templates/de/html/member/member_ref_list_level.tpl
index 4a05194226fe8e558018306c83b553b33e188856..417478f2289737162c268b64a1bf47ebc487a75a 100644 (file)
--- a/templates/de/html/member/member_ref_list_level.tpl
+++ b/templates/de/html/member/member_ref_list_level.tpl
@@ -29,7 +29,7 @@
 $content[rows]
 <tr>
        <td align="center" class="member_footer" colspan="6">
-               <span class="member_note">{%message,MEMBER_REFLIST_COUNTER,$content[counter]%}</span>
+               <span class="member_note">{%message,MEMBER_REFLIST_COUNTER=$content[counter]%}</span>
        </td>
 </tr>
 </table>

diff --git a/templates/de/html/member/member_refback_edit.tpl b/templates/de/html/member/member_refback_edit.tpl
index 60fe9c1880213b5c33aeb8ae0b02416efc0fdf55..1d6959067d80fd509eed2abf8ecd770dc1bbcebf 100644 (file)
--- a/templates/de/html/member/member_refback_edit.tpl
+++ b/templates/de/html/member/member_refback_edit.tpl
@@ -8,7 +8,7 @@
 </div>
 <div class="bottom" align="center">
        {--MEMBER_REFBACK_PERCENTS--}:
-       <input type="text" class="member_normal" name="percents" size="6" maxlength="7" value="$content[refback]" />&#37;
+       <input type="text" class="member_normal" name="percents" size="6" maxlength="7" value="{%pipe,translateComma=$content[refback]%}" />&#37;
 </div>
 <div class="member_footer">
        <input type="reset" class="member_reset" value="{--CLEAR_FORM--}" />
@@ -19,5 +19,5 @@
 </div>
 
 <div class="member_note">
-       {--MEMBER_REFBACK_MIN_MAX_NOTE_1--}{%config,translateComma=refback_min_perc%}{--MEMBER_REFBACK_MIN_MAX_NOTE_2--}{%config,translateComma=refback_max_perc%}{--MEMBER_REFBACK_MIN_MAX_NOTE_3--}
+       {--MEMBER_REFBACK_MIN_MAX_NOTE--}
 </div>

diff --git a/templates/de/html/member/member_refback_list_level.tpl b/templates/de/html/member/member_refback_list_level.tpl
index a8a4a5e1e3c711105e09689d3c82ad82af7b52b3..e4f04530c425221a49ccbcce852e697194302f55 100644 (file)
--- a/templates/de/html/member/member_refback_list_level.tpl
+++ b/templates/de/html/member/member_refback_list_level.tpl
@@ -2,7 +2,7 @@
 <table border="0" cellspacing="0" cellpadding="0" class="member_table dashed" width="730">
 <tr>
        <td align="center" class="header_column" colspan="6">
-               <strong>{--MEMBER_REFBACK_LIST_TITLE_1--}$content[level]{--MEMBER_REFBACK_LIST_TITLE_2--}$content[percents]{--MEMBER_REFBACK_LIST_TITLE_3--}</strong>
+               <strong>{--MEMBER_REFBACK_LIST_TITLE_1--}$content[level]{--MEMBER_REFBACK_LIST_TITLE_2--}{%pipe,translateComma=$content[percents]%}{--MEMBER_REFBACK_LIST_TITLE_3--}</strong>
        </td>
 </tr>
 <tr>
@@ -28,7 +28,7 @@
 $content[rows]
 <tr>
        <td align="center" class="member_footer" colspan="6">
-               <span class="member_note">{%message,MEMBER_REFLIST_COUNTER,$content[counter]%}</span>
+               <span class="member_note">{%message,MEMBER_REFLIST_COUNTER={%pipe,translateComma=$content[counter]%}%}</span>
        </td>
 </tr>
 </table>

diff --git a/templates/de/html/member/member_refback_list_row.tpl b/templates/de/html/member/member_refback_list_row.tpl
index 219abce3fe03b9c15b5799f813df60dc16689153..788e885da4b235f103a0b5b9fd76a92855581979 100644 (file)
--- a/templates/de/html/member/member_refback_list_row.tpl
+++ b/templates/de/html/member/member_refback_list_row.tpl
@@ -6,10 +6,10 @@
                $content[level_refid]
        </td>
        <td align="center" class="switch_sw$content[sw] bottom right">
-               $content[refback]%
+               {%pipe,translateComma=$content[refback]%}%
        </td>
        <td align="center" class="switch_sw$content[sw] bottom right">
-               $content[points] {?POINTS?}
+               {%pipe,translateComma=$content[points]%} {?POINTS?}
        </td>
        <td align="center" class="switch_sw$content[sw] bottom right">
                $content[joined]

diff --git a/templates/de/html/member/member_refback_list_row_deleted.tpl b/templates/de/html/member/member_refback_list_row_deleted.tpl
index 9e52de5dbc4e124a0f58cc2a01be966a2115e574..111243b12eff3bbf0574e9d3617fa3926ef99443 100644 (file)
--- a/templates/de/html/member/member_refback_list_row_deleted.tpl
+++ b/templates/de/html/member/member_refback_list_row_deleted.tpl
@@ -6,10 +6,10 @@
                $content[level_refid]
        </td>
        <td align="center" class="switch_sw$content[sw] bottom right">
-               $content[refback]%
+               {%pipe,translateComma=$content[refback]%}%
        </td>
        <td align="center" class="switch_sw$content[sw] bottom right">
-               $content[points] {?POINTS?}
+               {%pipe,translateComma=$content[points]%} {?POINTS?}
        </td>
        <td align="center" class="switch_sw$content[sw] bottom right">
                $content[joined]

diff --git a/templates/de/html/member/member_stats_row.tpl b/templates/de/html/member/member_stats_row.tpl
index d423a9645da1d230f48918665bc9226bf272f826..b0b36f0986b44e6ddd9def541871aa602edc8df8 100644 (file)
--- a/templates/de/html/member/member_stats_row.tpl
+++ b/templates/de/html/member/member_stats_row.tpl
@@ -11,7 +11,7 @@
 <tr>
        <td colspan="2" align="center" class="switch_mem$content[sw] top right">
                {--EMAIL_PAYMENT--}:<br />
-               <strong>$content[pay]</strong>
+               <strong>{%pipe,translateComma=$content[pay]%}</strong>
        </td>
        <td align="center" class="switch_mem$content[sw] top">
                {--EMAIL_CATEGORY--}:<br />

diff --git a/templates/de/html/member/member_surfbar_delete_action_form.tpl b/templates/de/html/member/member_surfbar_delete_action_form.tpl
index 32f7ec8a08168fc374290e537a1ca57e187f5bd7..434b0ceb2d527620597dc119de37bf7eea83c9a2 100644 (file)
--- a/templates/de/html/member/member_surfbar_delete_action_form.tpl
+++ b/templates/de/html/member/member_surfbar_delete_action_form.tpl
@@ -13,11 +13,11 @@
        </div>
 
        <div class="member_input" style="padding-top:5px;padding-bottom:5px">
-               Gesamtaufrufe: <strong>$content[views_total]</strong>
+               Gesamtaufrufe: <strong>{%pipe,translateComma=$content[url_views_total]%}</strong>
        </div>
 
        <div class="member_input" style="padding-top:5px;padding-bottom:5px">
-               Aufrufe begrenzt auf: <strong>$content[views_max]</strong> (0=Unbegrenzt)
+               Aufrufe begrenzt auf: <strong>{%pipe,translateComma=$content[url_views_max]%}</strong> (0=Unbegrenzt)
        </div>
 
        <div class="member_title top" style="padding-top:5px;padding-bottom:5px">

diff --git a/templates/de/html/member/member_surfbar_list_row.tpl b/templates/de/html/member/member_surfbar_list_row.tpl
index d109bd66461ee4ae8dca20dd4499b0941538ba8c..8f5b8211346b71382e1197ab330954ff0119a829 100644 (file)
--- a/templates/de/html/member/member_surfbar_list_row.tpl
+++ b/templates/de/html/member/member_surfbar_list_row.tpl
@@ -3,7 +3,7 @@
                <a href="$content[url]" target="_blank" title="{--MEMBER_TEST_URL--}">{--MEMBER_SURFBAR_TEST_URL--}</a>
        </td>
        <td align="center" class="switch_sw$content[sw] bottom right">
-               $content[url_status]
+               {%pipe,translateSurfbarUrlStatus=$content[url_status]%}
        </td>
        <td align="center" class="switch_sw$content[sw] bottom right">
                $content[url_registered]

diff --git a/templates/de/html/member/member_transfer_new.tpl b/templates/de/html/member/member_transfer_new.tpl
index 91c141206d06c1ddcb0afd26dc6bb5a9e9ac90aa..835ac0f977bb7fb3f08901b81822cd77e0169ae2 100644 (file)
--- a/templates/de/html/member/member_transfer_new.tpl
+++ b/templates/de/html/member/member_transfer_new.tpl
@@ -14,7 +14,7 @@
                        <strong>{--TRANSFER_POINTS_MAXIMUM--}:</strong>
                </td>
                <td class="bottom">
-                       $content[max_transferable] {?POINTS?}
+                       {%pipe,translateComma=$content[max_transferable]%} {?POINTS?}
                </td>
        </tr>
        <tr>
@@ -22,8 +22,7 @@
                        <strong>{--TRANSFER_POINTS_AMOUNT--}:</strong>
                </td>
                <td class="bottom">
-                       <input type="text" name="points" class="member_normal" size="5" maxlength="10" value="$content[points]"$content[to_disabled] />
-                       {?POINTS?}
+                       <input type="text" name="points" class="member_normal" size="5" maxlength="10" value="{%pipe,bigintval=$content[points]%}"$content[to_disabled] /> {?POINTS?}
                </td>
        </tr>
        <tr>
@@ -31,7 +30,7 @@
                        <strong>{--TRANSFER_POINTS_REASON--}:</strong>
                </td>
                <td class="bottom">
-                       <input type="text" name="reason" class="member_normal" size="30" maxlength="255" value="$content[reason]"$content[to_disabled] />
+                       <input type="text" name="reason" class="member_normal" size="30" maxlength="255" value="{%pipe,secureString=$content[reason]%}"$content[to_disabled] />
                </td>
        </tr>
        <tr>

diff --git a/templates/de/html/member/member_transfer_row2.tpl b/templates/de/html/member/member_transfer_row2.tpl
index bd58610b210dd8725d5b904b621a41c3138e6725..c27dc105dba312e86270c54fed0aeb65d943c91e 100644 (file)
--- a/templates/de/html/member/member_transfer_row2.tpl
+++ b/templates/de/html/member/member_transfer_row2.tpl
@@ -12,6 +12,6 @@
     <div class="transfer_row4">$content[reason]</div>
   </td>
   <td class="transfer_row5 switch_sw".$content[sw] bottom">
-    <div class="transfer_row5">$content[points]</div>
+    <div class="transfer_row5">{%pipe,bigintval=$content[points]%}</div>
   </td>
 </tr>

diff --git a/templates/de/html/member/member_unconfirmed_row.tpl b/templates/de/html/member/member_unconfirmed_row.tpl
index ab55e520f8b0f423c9b4e896a1782fe256671470..245dc798a3a42181fa0ea9f36ff762a089f64ac4 100644 (file)
--- a/templates/de/html/member/member_unconfirmed_row.tpl
+++ b/templates/de/html/member/member_unconfirmed_row.tpl
@@ -10,6 +10,6 @@
        </td>
        <td align="center" class="switch_sw$content[sw] bottom right">$content[timestamp]</td>
        <td align="right" class="switch_sw$content[sw] bottom" style="padding-right:5px">
-               $content[points] {?POINTS?}
+               {%pipe,translateComma=$content[points]%} {?POINTS?}
        </td>
 </tr>

diff --git a/templates/de/html/member/member_unconfirmed_table.tpl b/templates/de/html/member/member_unconfirmed_table.tpl
index fe468bf3deff0724228bc4dd471cbbf5f3427583..77af034249e244fc3cbce66f0e84b5051ec4147b 100644 (file)
--- a/templates/de/html/member/member_unconfirmed_table.tpl
+++ b/templates/de/html/member/member_unconfirmed_table.tpl
@@ -12,7 +12,7 @@ $content[rows]
                <strong>{--POINTS_SUM--}:</strong>
        </td>
        <td align="right" class="member_footer" style="padding-right:5px">
-               <strong>$content[total_points] {?POINTS?}</strong>
+               <strong>{%pipe,translateComma=$content[total_points]%} {?POINTS?}</strong>
        </td>
 </tr>
 </table>

diff --git a/templates/de/html/redirect_url.tpl b/templates/de/html/redirect_url.tpl
index 0dd432a8523b6a2dc5ec474e2abf86e1798d7655..b467d810cb61177b9d6e7dad3b005ff5f8629a7c 100644 (file)
--- a/templates/de/html/redirect_url.tpl
+++ b/templates/de/html/redirect_url.tpl
@@ -1,5 +1,8 @@
-<noscript>{--LOAD_URL_ERROR_1--}<a href="$content" rel="external" title="$content">$content</a>{--LOAD_URL_ERROR_2--}</noscript>
-<script type="text/javascript">
+<noscript>
+       {--LOAD_URL_ERROR_1--}<a href="$content" rel="external" title="$content">$content</a>{--LOAD_URL_ERROR_2--}
+</noscript>
+
+<script type="text/javascript" language="JavaScript">
 <!--
 document.location.href = '$content';
 //-->

diff --git a/templates/de/html/select/select_network_box.tpl b/templates/de/html/select/select_network_box.tpl
index 699ad9032dc5d7e9980601a56250ed98e64eb27d..66f71e3f78e475e630fba75be77e03f9f72ec4f3 100644 (file)
--- a/templates/de/html/select/select_network_box.tpl
+++ b/templates/de/html/select/select_network_box.tpl
@@ -6,9 +6,11 @@
        <div class="admin_title bottom">
                <strong>{--ADMIN_NETWORK_SELECT_TITLE--}</strong>
        </div>
+
        <div class="bottom">
                $content[selection_box]
        </div>
+
        <div class="admin_footer">
                <input type="submit" class="admin_submit" value="{--ADMIN_NETWORK_CHOOSE--}" />
        </div>

diff --git a/templates/de/html/show_bonus_msg.tpl b/templates/de/html/show_bonus_msg.tpl
index 83bae482ae3556c43492274aa616317eca74a225..616e23e7c2f935b6ce238d8a9e62e6a329b81280 100644 (file)
--- a/templates/de/html/show_bonus_msg.tpl
+++ b/templates/de/html/show_bonus_msg.tpl
@@ -2,7 +2,7 @@
        {--HELLO--} $content[gender] $content[surname] $content[family]!
 </div>
 <div>
-       {%message,BONUS_SHOW_HEADER_LINE,$content[mailid]%}:
+       {%message,BONUS_SHOW_HEADER_LINE=$content[mailid]%}:
 </div>
 <table border="0" cellspacing="0" cellpadding="0" width="300" class="member_table dashed">
        <tr>

diff --git a/templates/de/html/show_timings.tpl b/templates/de/html/show_timings.tpl
index bb27d71d92f144ee5903872a2a27506bbac5aa4d..e36d026207ef0399fbd6afb0384be2d53e5f5827 100644 (file)
--- a/templates/de/html/show_timings.tpl
+++ b/templates/de/html/show_timings.tpl
@@ -1,13 +1,13 @@
 <div align="center">
 <ul class="show_timings_block">
        <li class="show_timings_column" style="margin-left: 2px"><span class="show_timings_column">
-               {--SHOW_TIMINGS_RUNTIME--}&nbsp;<span class="show_timings_data">$content[runtime]</span>&nbsp;{--SHOW_TIMINGS_SECS--}
+               {--SHOW_TIMINGS_RUNTIME--}&nbsp;<span class="show_timings_data">$content[run_time]</span>&nbsp;{--SHOW_TIMINGS_SECS--}
        </span></li>
        <li class="show_timings_column" style="margin-left: 2px"><span class="show_timings_column">
                {--SHOW_TIMINGS_SQL_QUERIES--}&nbsp;<span class="show_timings_data">{?sql_count?}</span>
        </span></li>
        <li class="show_timings_column" style="margin-left: 2px"><span class="show_timings_column">
-               {--SHOW_TIMINGS_SQL_TIME--}&nbsp;<span class="show_timings_data">$content[timeSQLs] ms</span>
+               {--SHOW_TIMINGS_SQL_TIME--}&nbsp;<span class="show_timings_data">$content[sql_time] ms</span>
        </span></li>
        <li class="show_timings_column" style="margin-right: 2px"><span class="show_timings_column">
                {--SHOW_TIMINGS_NUM_TEMPLATES--}&nbsp;<span class="show_timings_data">{?num_templates?}</span>

diff --git a/templates/de/html/sponsor/sponsor_account_form.tpl b/templates/de/html/sponsor/sponsor_account_form.tpl
index 6eb85e99855b7b69557e50942de3531cda5245a1..98dbe03017606aa4dee8dcd74c7f5f721c11e082 100644 (file)
--- a/templates/de/html/sponsor/sponsor_account_form.tpl
+++ b/templates/de/html/sponsor/sponsor_account_form.tpl
@@ -11,7 +11,7 @@
     {--SPONSOR_ENTER_COMPANY_TITLE--}: 
   </td>
   <td class="bottom">
-    &nbsp;<input type="text" name="company" class="guest_normal" size="20" maxlength="255" value="$content[company]" />
+    &nbsp;<input type="text" name="company" class="guest_normal" size="20" maxlength="255" value="{%sponsor,company=$userid%}" />
   </td>
 </tr>
 <tr>
@@ -19,7 +19,7 @@
     {--SPONSOR_ENTER_COMPANY_POSITION--}:&nbsp;
   </td>
   <td class="bottom">
-    &nbsp;<input type="text" name="position" class="guest_normal" size="20" maxlength="255" value="$content[position]" />
+    &nbsp;<input type="text" name="position" class="guest_normal" size="20" maxlength="255" value="{%sponsor,position=$userid%}" />
   </td>
 </tr>
 <tr>
@@ -27,7 +27,7 @@
     {--SPONSOR_ENTER_TAX_IDENT--}:&nbsp;
   </td>
   <td class="bottom">
-    &nbsp;<input type="text" name="tax_ident" class="guest_normal" size="20" maxlength="255" value="$content[tax_ident]" />
+    &nbsp;<input type="text" name="tax_ident" class="guest_normal" size="20" maxlength="255" value="{%sponsor,tax_ident=$userid%}" />
   </td>
 </tr>
 <tr>
@@ -52,7 +52,7 @@
     {--GUEST_SURNAME--}:&nbsp;
   </td>
   <td class="bottom">
-    &nbsp;<input type="text" name="surname" class="guest_normal" size="20" maxlength="255" value="$content[surname]" />
+    &nbsp;<input type="text" name="surname" class="guest_normal" size="20" maxlength="255" value="{%sponsor,surname=$userid%}" />
   </td>
 </tr>
 <tr>
@@ -60,7 +60,7 @@
     {--GUEST_FAMILY--}:&nbsp;
   </td>
   <td class="bottom">
-    &nbsp;<input type="text" name="family" class="guest_normal" size="20" maxlength="255" value="$content[family]" />
+    &nbsp;<input type="text" name="family" class="guest_normal" size="20" maxlength="255" value="{%sponsor,family=$userid%}" />
   </td>
 </tr>
 <tr>
@@ -73,7 +73,7 @@
     {--SPONSOR_ENTER_STREET_NR1--}:&nbsp;
   </td>
   <td class="bottom">
-    &nbsp;<input type="text" name="street_nr1" class="guest_normal" size="20" maxlength="255" value="$content[street_nr1]" />
+    &nbsp;<input type="text" name="street_nr1" class="guest_normal" size="20" maxlength="255" value="{%sponsor,street_nr1=$userid%}" />
   </td>
 </tr>
 <tr>
@@ -81,7 +81,7 @@
     {--SPONSOR_ENTER_STREET_NR2--}:&nbsp;
   </td>
   <td class="bottom">
-    &nbsp;<input type="text" name="street_nr2" class="guest_normal" size="20" maxlength="255" value="$content[street_nr2]" />
+    &nbsp;<input type="text" name="street_nr2" class="guest_normal" size="20" maxlength="255" value="{%sponsor,street_nr2=$userid%}" />
   </td>
 </tr>
 <tr>
@@ -89,8 +89,8 @@
     {--SPONSOR_ENTER_CNTRY_ZIP_CITY--}:&nbsp;
   </td>
   <td class="bottom">
-    &nbsp;<input type="text" name="country" class="guest_normal" size="2" maxlength="2" value="$content[country]" />-<input type="text" name="zip" class="guest_normal" size="5" maxlength="6" value="$content[zip]" />
-    <input type="text" name="city" class="guest_normal" size="10" maxlength="255" value="$content[city]" />
+    &nbsp;<input type="text" name="country" class="guest_normal" size="2" maxlength="2" value="{%sponsor,county,determineCountry=$userid%}" />-<input type="text" name="zip" class="guest_normal" size="5" maxlength="6" value="{%sponsor,zip,bigintval=$userid%}" />
+    <input type="text" name="city" class="guest_normal" size="10" maxlength="255" value="{%sponsor,city=$userid%}" />
   </td>
 </tr>
 <tr>

diff --git a/templates/de/html/sponsor/sponsor_settings_form.tpl b/templates/de/html/sponsor/sponsor_settings_form.tpl
index d0796a7dabdbeb3cd90c0ce75672bba0de6f4fa2..5f965992e2dbece8860d910a3dd7df1aa16e5a5f 100644 (file)
--- a/templates/de/html/sponsor/sponsor_settings_form.tpl
+++ b/templates/de/html/sponsor/sponsor_settings_form.tpl
@@ -21,7 +21,7 @@
   </td>
   <td class="bottom" align="center">
     <select name="warning_interval" class="guest_select" size="1">
-      <option value="$content[warning_interval]">$content[current]</option>
+      <option value="$content[warning_interval]">{%pipe,createFancyTime=$content[current]%}</option>
       <option value="{--({?ONE_DAY?}*1)--}">1 {--DAYS--}</option>
       <option value="{--({?ONE_DAY?}*3)--}">3 {--DAYS--}</option>
       <option value="{--({?ONE_DAY?}*7)--}">1 {--LIFE_WEEKS--}</option>

diff --git a/templates/de/html/sponsor/sponsor_welcome.tpl b/templates/de/html/sponsor/sponsor_welcome.tpl
index 798ea64dc8b25d268382cc23ceb707219a4a2f8d..b988bb9aaa2f89698fc7b9d99b710790e1007ed3 100644 (file)
--- a/templates/de/html/sponsor/sponsor_welcome.tpl
+++ b/templates/de/html/sponsor/sponsor_welcome.tpl
@@ -1,5 +1,5 @@
 <div class="para">
-Hallo $content[gender] $content[surname] $content[family]!
+Hallo {%sponsor,gender,translateGender=$userid%} {%sponsor,surname=$userid%} {%sponsor,family=$userid%}!
 </div>
 
 <div class="para">

diff --git a/templates/de/html/surfbar/surfbar_frame_top.tpl b/templates/de/html/surfbar/surfbar_frame_top.tpl
index 5b693f81ca1361e14f389ef84c044c4cf5912eab..df7e2321dc5a9a55bc5675ed3da23600c52cb413 100644 (file)
--- a/templates/de/html/surfbar/surfbar_frame_top.tpl
+++ b/templates/de/html/surfbar/surfbar_frame_top.tpl
@@ -1,7 +1,7 @@
 <table border="0" cellspacing="0" cellpadding="0" width="100%" id="surfbar_table">
 <tr>
        <td id="surfbar_td">
-               &raquo;<span id="surfbar_points">$content[xxx],$content[xxx]&nbsp; {?POINTS?}</span> in
+               &raquo;<span id="surfbar_points">$content[xxx]=$content[xxx]&nbsp; {?POINTS?}</span> in
                <span id="surfbar_counter">$content[xxx]</span>&nbsp;<span
                 id="surfbar_counter_word">Sekunden</span>&laquo;&nbsp;&raquo;<span
                 id="surfbar_reload">X</span> von <span