From: Roland Häder Date: Fri, 28 May 2010 18:38:10 +0000 (+0000) Subject: Even more rewrites/fixes from EL branch (please report any broken part after you... X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=commitdiff_plain;h=0715fa7aa8e5e70bcf1d957fb09ae655c3896c4e Even more rewrites/fixes from EL branch (please report any broken part after you have updated to this revision) --- diff --git a/birthday_confirm.php b/birthday_confirm.php index 11b24eee01..7b5bffac08 100644 --- 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).")
"); // 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 a08448b0a4..c74f1153f9 100644 --- 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','Experten-Einstellungen! Hier ändern Sie die Einstellungen an den Grunddaten (Stammdaten) des jeweiligen Werbenetzwerks ab. Sie sollten hier generell nichts einstellen und im Forum um Hilfe fragen, wenn Sie selber ein Werbenetzwerk einrichten möchten.',6); addAdminMenuSql('network','list_network_types','Werbearten','Experten-Einstellungen! Hier ändern Sie die Einstellungen zu den Werbearten pro Werbenetzwerken. Sie sollten hier generell nichts einstellen und im Forum um Hilfe fragen, wenn Sie selber ein Werbenetzwerk einrichten möchten.',7); addAdminMenuSql('network','list_network_params','Abfrageparameter','Experten-Einstellungen! Hier stellen Sie die Abfrageparameter (wie sie genannt werden müssen, um das API-Script korrekt aufrufen zu können) ein, pro Werbenetzwerk. Sie sollten hier generell nichts einstellen und im Forum um Hilfe fragen, wenn Sie selber ein Werbenetzwerk einrichten möchten.',8); - addAdminMenuSql('network','list_network_return_codes','Rückgabewerte','Experten-Einstellungen! Hier stellen Sie die Zuweisungen der aus der analysierten API-Antwort Array-Elementen zu den Datenspalten ein. Sie sollten hier generell nichts einstellen und im Forum um Hilfe fragen, wenn Sie selber ein Werbenetzwerk einrichten möchten.',9); - addAdminMenuSql('network','list_network_error_codes','Fehlercodes','Experten-Einstellungen! Hier stellen Sie die Rückgabewerte ein, die im Falle eines Fehlers pro API-Script kommen können. Sie sollten hier generell nichts einstellen und im Forum um Hilfe fragen, wenn Sie selber ein Werbenetzwerk einrichten möchten.',10); + addAdminMenuSql('network','list_network_array_translation','Antwort-Array','Experten-Einstellungen! Hier stellen Sie die Zuweisungen der aus der analysierten API-Antwort Array-Elementen zu den Datenspalten ein. Sie sollten hier generell nichts einstellen und im Forum um Hilfe fragen, wenn Sie selber ein Werbenetzwerk einrichten möchten.',9); + addAdminMenuSql('network','list_network_error_codes','Fehlercodes','Experten-Einstellungen! Hier stellen Sie die Fehlercodes ein, die im Falle eines Fehlers pro API-Script kommen können. Sie sollten hier generell nichts einstellen und im Forum um Hilfe fragen, wenn Sie selber ein Werbenetzwerk einrichten möchten.',10); addAdminMenuSql('network','list_network_error_types','Fehlertypen','Experten-Einstellungen! Hier stellen Sie die Namen von Fehlercodes ein, die Scripte zurückliefern können. Dies sind INTERNE Daten und sollten nur vom Entwicklerteam angepasst werden. Stellen Sie an diesen Einstellungen bitte nichts um. Sie sollten hier generell nichts einstellen und im Forum um Hilfe fragen, wenn Sie selber ein Werbenetzwerk einrichten mö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 54a7bc8401..68d4ea59e1 100644 --- 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ätigungscodes hängt davon ab, ob die PHP-Funktion imagecreatefromjpeg() und das JPEG-Bild vorhanden sind oder nicht."); diff --git a/inc/functions.php b/inc/functions.php index 03376db72e..eec116f9c7 100644 --- 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 19cae426e5..50dbbab0ff 100644 --- 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 {?MAIN_TITLE?}", - 'BEG_LINK_USERID' => "Unser Mitglied %s hat {?POINTS?} gebettelt.", + 'BEG_LINK_USERID' => "Unser Mitglied %s 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ür jeden Klick auf Ihren Bettellink.", - 'BEG_MEMBER_TIMEOUT' => "Die Zeitsperre ist derzeit eingestellt auf %s. Innerhalb dieser Zeit erhalten Sie keine erneute Vergütung.", + 'BEG_MEMBER_TIMEOUT' => "Die Zeitsperre ist derzeit eingestellt auf {%config,createFancyTime=beg_timeout%}. Innerhalb dieser Zeit erhalten Sie keine erneute Vergü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ü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önnen derzeit alle %s {?POINTS?} betteln.", + 'BEG_GUEST_TIMEOUT' => "Sie können derzeit alle %s {?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ätestens am %s noch aktiv waren. Alle anderen Mitglieder erhalten die Vergütung nicht.", + 'ADMIN_BEG_TIMEOUT' => "Es werden nur Mitglieder ausgewertet und hier aufgelistet, die spätestens am %s noch aktiv waren. Alle anderen Mitglieder erhalten die Vergütung nicht.", 'ADMIN_EDIT_BEG_RALLYE_SETTINGS' => "Einstellungen an der Bettel-Rallye", 'ADMIN_BEG_RALLYE_ACTIVE' => "Ist die Bettel-Rallye aktiv? (Mails können optional versendet werden!)", 'ADMIN_BEG_RALLYE_ONLY_ACTIVE' => "Nur aktive Mitglieder nehmen dran?
(Nur in Verbindung mit der Erweiterung autopurge!)
", diff --git a/inc/language/bonus_de.php b/inc/language/bonus_de.php index 22665c1a59..84eaf36674 100644 --- 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ätestens am %s noch aktiv waren. Alle anderen Mitglieder erhalten die Vergütung nicht.", + 'ADMIN_BONUS_TIMEOUT' => "Es werden nur Mitglieder ausgewertet und hier aufgelistet, die spätestens am %s noch aktiv waren. Alle anderen Mitglieder erhalten die Vergütung nicht.", 'ADMIN_BONUS_USERID' => "Mitgliedskonto zum Abbuchen der {?POINTS?}", 'ADMIN_CONFIG_BONUS_TIMEOUT' => "Verweildauer von Aktiv-Bonus-Einträgen", 'ADMIN_BONUS_TURBO_LINES' => "Anzahl angezeigter Aktiv-Bonus-Empfänger in show_bonus.php", @@ -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 %s:", + 'MEMBER_MAIL_BONUS_DETAILS_TITLE' => "Details zur Bonusmail %s:", // Subject lines 'BONUS_RALLYE_DI_NOTIFY' => "HINWEIS: Aktiv-Rallye gestoppt.", diff --git a/inc/language/de.php b/inc/language/de.php index 4c8271b0be..b91dfb6f5a 100644 --- 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 %s 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üs bearbeiten", 'DEL_MENUS' => "Menüs löschen", 'EDIT_ADMIN_MENU' => "Admin-Menüeinträge ändern", - 'EDIT_MENU' => "Es soll/sollen %s Menüeintrag/-einträge geändert werden:", + 'EDIT_MENU' => "Es soll/sollen %s Menüeintrag/-einträge geändert werden:", 'ENTRY_MODIFY' => "Eintrag", 'SUBMIT_CHANGES' => "Änderungen durchführen", 'ENTRY_404_1' => "Eintrag ", @@ -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ür Ihre Anmeldung haben wir Ihnen als Willkommensgutschrift", 'GUEST_REG_POINTS_2' => "{?POINTS?} gutgeschrieben. Sie können bereits jetzt schon Mails an die anderen Mitglieder verschicken - solange Empfä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ändig von unserem System versendet! Wir wünschen Ihnen viel Erfolg mit Ihrer Werbebuchung.", 'MEMBER_NOTIFY_DONE' => "Den weiteren Verlauf dieser Werbebuchung können Sie im Mitgliedsbereich unter Statistiken verfolgen.", 'MEMBER_SUBJ_SEND_DONE' => "Ihre Werbebuchung wurde versandt", - 'GUEST_SELECT_LEAST_CATS_1' => "Bitte wählen Sie mindestens ", - 'GUEST_SELECT_LEAST_CATS_2' => " Kategorien aus. Anderfalls erfolgt keine Anmeldung.", + 'GUEST_SELECT_LEAST_CATS' => "Bitte wählen Sie mindestens {?least_cats?} Kategorien aus. Anderfalls erfolgt keine Anmeldung.", 'MEMBER_POOL_CONTENT' => "Ihre Mails im Sende-Pool", 'MEMBER_STATS_CONTENT' => "Statistiken versandter Mails", 'EMAIL_END_SEND' => "Vollständig versendet", @@ -634,8 +630,7 @@ addMessages(array( 'USER_ID' => "Mitglied", 'UNCONFIRMED_LINKS' => "Unbestätigte Mails", 'ADMIN_MEMBER_LINKS' => "Das Mitglied %s hat alle seine Mails bestätigt.", - 'MEMBER_TOTAL_LINKS_1' => "Es müssen noch ", - 'MEMBER_TOTAL_LINKS_2' => " Mails von diesem Mitglied bestätigt werden.", + 'MEMBER_TOTAL_LINKS' => "Es müssen noch %s Mails von diesem Mitglied bestätigt werden.", 'ADMIN_DEL_UNCONFIRMED_LINKS' => "Alle unbestätigten Mails löschen", 'ADMIN_LINKS_DELETED' => "Links für unbestätigte Mails wurden gelöscht.", 'ADMIN_DEL_LINK_SUBJ' => "Ihr unbestätigen Mails wurden gelöscht.", @@ -711,15 +706,14 @@ addMessages(array( 'GUEST_STATS_INACTIVE' => "Mitgliederstatistik deaktiviert", 'CHANGE_MENUS' => "Ändern", 'CHANGE_MEMBER_MENU' => "Verdecken, anzeigen, deaktivieren, aktivieren des Mitgliedsmenüs", - 'CHANGE_MENU_1' => "Ändern von ", - 'CHANGE_MENU_2' => " Menüeinträgen", + 'CHANGE_MENU' => "Ändern von %s Menüeinträgen", 'IS_VISIBLE' => "Wird angezeigt", 'IS_ACTIVE' => "Aktiviert", 'CHANGE_ENTRIES' => "Änderungen durchfü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 %s wurde in Ihrem {?mt_word?} registriert.", 'ADMIN_EXTENSION_NOT_REGISTERED' => "Erweiterung %s wurde in Ihrem {?mt_word?} nicht 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öße", - 'ADMIN_EXT_FILE_CTIME' => "Erweiterung erstellt am", - 'ADMIN_EXT_FILE_VERSION' => "Version (alt)", - 'ADMIN_EXT_TOTAL_FSIZE' => "Downloadgesamtgrö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 %s oder höher wird benötigt.", - 'ADMIN_EXT_BONUS_404' => "bonus nicht installiert.", - 'ADMIN_EXT_CSSFILE' => "CSS?", - 'ADMIN_EXT_CHANGED' => "Erweiterungen geändert.", - 'ADMIN_EXT_REGISTER_NEXT_LINK' => "Weiter zur Task-Ü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öße", + 'ADMIN_EXTENSION_FILE_CTIME' => "Erweiterung erstellt am", + 'ADMIN_EXTENSION_FILE_VERSION' => "Version (alt)", + 'ADMIN_EXTENSION_TOTAL_FSIZE' => "Downloadgesamtgrö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 %s oder höher wird benötigt.", + 'ADMIN_EXTENSION_BONUS_404' => "bonus nicht installiert.", + 'ADMIN_EXTENSION_CSSFILE' => "CSS?", + 'ADMIN_EXTENSION_CHANGED' => "Es wurden %s Erweiterungen geändert.", + 'ADMIN_EXTENSION_EDITED' => "Es wurden %s Erweiterungen editiert.", + 'ADMIN_EXTENSION_REGISTER_NEXT_LINK' => "Weiter zur Task-Übersicht...", 'ADMIN_DELETE_ENTRIES' => "Lö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ütungen löschen", 'REF_PAYOUT' => "Wie viele Mails müssen die Mitglieder mindestens bestä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 ", - 'BONUS_EXTENSION_UPGRADE_2' => " oder neuer.", + 'BONUS_EXTENSION_UPGRADE' => "Bitte aktualisieren Sie Ihre Bonus-Erweiterung auf Version v0.2.2 oder neuer.", '_ON' => "an", 'CLICK_STATISTICS' => "Mail-Statistik", 'ADMIN_SELECT_DEF_REFID' => "Standart Referal-Id bei Anmeldung über keinen 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ügen", - 'ADMIN_LIST_REFERALS_1' => "Referal-Ü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-Übersicht des Mitgliedes %s in allen Ebenen:", + 'ADMIN_LIST_REFERALS_LEVEL' => "Referals in Ebene %s:", 'ADMIN_LIST_REFERALS_NOTE' => "Änderung: 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öscht.", 'INITIAL_RELEASE' => "Erste Alpha-Version", @@ -1043,13 +1033,13 @@ addMessages(array( 'ADMIN_POINTS_TO_JACKPOT' => "Es wurden %s  {?POINTS?} in den Jackpot gelegt.", 'ADMIN_NO_POINTS_REPAYED' => "Die Mailbuchung hatte keine {?POINTS?} zum zurückbuchen.", 'ADMIN_POINTS_SHREDDED' => "Es wurden %s  {?POINTS?} geschrettert.", - 'EXTENSION_PROBLEM_EXT_INACTIVE' => "Kann nicht fortfahren! Fehler: Erweiterung %s deaktiviert.", - 'ADMIN_EXTENSION_PROBLEM_EXT_INACTIVE' => "Die Erweiterung %s ist derzeit deaktiviert. Hier können Sie diese aktivieren.", - 'EXTENSION_PROBLEM_EXT_NOT_INSTALLED' => "Kann nicht fortfahren! Fehler: Erweiterung %s nicht installiert.", - 'ADMIN_EXTENSION_PROBLEM_EXT_NOT_INSTALLED' => "Die Erweiterung %s ist derzeit nicht installiert. Hier können Sie diese aktivieren.", + 'EXTENSION_PROBLEM_EXTENSION_INACTIVE' => "Kann nicht fortfahren! Fehler: Erweiterung %s deaktiviert.", + 'ADMIN_EXTENSION_PROBLEM_EXTENSION_INACTIVE' => "Die Erweiterung %s ist derzeit deaktiviert. Hier können Sie diese aktivieren.", + 'EXTENSION_PROBLEM_EXTENSION_NOT_INSTALLED' => "Kann nicht fortfahren! Fehler: Erweiterung %s nicht installiert.", + 'ADMIN_EXTENSION_PROBLEM_EXTENSION_NOT_INSTALLED' => "Die Erweiterung %s ist derzeit nicht installiert. Hier können Sie diese aktivieren.", 'EXTENSION_PROBLEM_NOT_INSTALLED' => "Erweiterung %s nicht installiert.", 'EXTENSION_PROBLEM_UNSET_EXT' => "Skriptfehler: Parameter ext nicht gesetzt.", - 'EXTENSION_WARNING_EXT_INACTIVE' => "Die Erweiterung %s ist nicht aktiv. Dies kann zu Störungen führen.
\nBitte aktivieren Sie diese unter Verschiedenes->Erweiterungen.", + 'EXTENSION_WARNING_EXTENSION_INACTIVE' => "Die Erweiterung %s ist nicht aktiv. Dies kann zu Störungen führen.
\nBitte aktivieren Sie diese unter Verschiedenes->Erweiterungen.", 'EXTENSION_WARNING_USER_LIMIT' => "Die Erweiterung user ist nicht aktiv. Die Anzahl Mitglieder pro Seite wurde auf 100 gesetzt. Bitte aktivieren Sie diese unter Verschiedenes->Erweiterungen.", 'ADMIN_PROXY_SETTINGS_INVALID' => "Ihre Proxy-Einstellungen scheinen ungültig zu sein.", 'ADMIN_EDIT_PROXY_SETTINGS' => "Proxy-Einstellungen ändern", @@ -1062,7 +1052,7 @@ addMessages(array( '_UNUSED' => "Im Aufbau", 'ADMIN_DELETED_MAILS_COUNT' => "Es wurden %s Einträge gelöscht.", 'EMAIL_DELETE_COUNT' => "Buchungseinträge gelöscht", - 'MXCHANGE_HAS_DIED' => "{?TITLE?} ist in Script/Funktion %s, Zeile %s mit folgender Meldung abgebrochen: %s", + 'MAILER_HAS_DIED' => "{?TITLE?} ist in Script/Funktion %s, Zeile %s mit folgender Meldung abgebrochen: %s", 'ADMIN_CONFIG_POINTS_TITLE' => "Einstellungen fü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ücksetzen (nö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ändert oder gelöscht werden! Dann erhalten Ihre Mitglieder keine {?POINTS?} gutgeschrieben.", 'ADMIN_ALL_ENTRIES_REMOVED' => "Alle ausgewählten Einträge sind gelöscht.", 'ADMIN_SOME_ENTRIES_NOT_DELETED' => "Es wurden %s von %s ausgewählten Einträge gelöscht.", @@ -1141,7 +1132,7 @@ addMessages(array( 'ADMIN_ACCESS_DENIED' => "Zugriff auf den Adminmenüpunkt %s nicht gestattet.", 'ADMIN_URL_BLACKLIST_DISABLED' => "URL-Sperrliste ist deaktiviert.", 'ADMIN_MENU_IS_EMPTY' => "Das von Ihnen ausgewählte Menü %s ist leer.", - 'ADMIN_EXT_TEXT_FILE_MISSING' => "Die Erweiterung %s hat keinen Beschreibungstext. Bitte melden Sie dies uns im Bug-Tracker.", + 'ADMIN_EXTENSION_TEXT_FILE_MISSING' => "Die Erweiterung %s hat keinen Beschreibungstext. Bitte melden Sie dies uns im Bug-Tracker.", 'GUEST_STATS_NO_CLICKS' => "Keine Klicks in Ihrem {?mt_word?} verzeichnet.", 'ADMIN_EXTENSIONS_REMOVED' => "Es wurden %s Erweiterungen aus Ihrem {?mt_word?} entfernt.", 'ADMIN_WARNING_SQL_PATCHES_MISSING' => "Eine essentielle Erweiterung sql_patches 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 %s bestätigt hatten.", // @TODO Rewrite these two constants - 'MEMBER_MAIL_NORMAL_DETAILS_TITLE_1' => "Details zur Klickmail ", - 'MEMBER_MAIL_NORMAL_DETAILS_TITLE_2' => ":", + 'MEMBER_MAIL_NORMAL_DETAILS_TITLE' => "Details zur Klickmail %s:", '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 ", 'MEMBER_REFLIST_LIST_TITLE_2' => " (", 'MEMBER_REFLIST_LIST_TITLE_3' => "%)", - 'MEMBER_REFLIST_COUNTER' => "In dieser Ebene haben Sie %s Mitglieder geworben.", + 'MEMBER_REFLIST_COUNTER' => "In dieser Ebene haben Sie %s Mitglieder geworben.", 'MEMBER_REFLIST_TITLE' => "Referal-Ü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 df79c37f12..fdfed8e503 100644 --- 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 %s {?POINTS?} ausgezahlt.", + 'MEMBER_DOUBLER_ALREADY_PAYED' => "Es wurden bereits {%config,translateComma=doubler_points%} {?POINTS?} ausgezahlt.", 'DOUBLER_MINIMUM_IS' => "Mindestens", 'DOUBLER_MAXIMUM_IS' => "verdoppeln, maximal", 'DOUBLER_HAVE_FUN' => "Viel Spaß.", diff --git a/inc/language/holiday_de.php b/inc/language/holiday_de.php index f18ed4dc79..bf561b051a 100644 --- 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önnen nicht mehr als %s Tag(e) an Urlaub einstellen.", + 'HOLIDAY_MAX_DAYS' => "Sie können nicht mehr als %s 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ür Ihren Account aktiviert. Sie können sich weiterhin im Mitgliedsbereich aufhalten, kö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 049bf3dc39..50f2bf40c0 100644 --- 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ückverlinkung zu mxchange.org setzen?) rel="external" ist gesetzt. Bitte nicht den Backlink einbauen, und nofollow verwenden! Das schadet allen.", 'WRONG_PAGE' => "Sie oder dieses Script haben eine falsche Seite ausgewählt.", diff --git a/inc/language/mailid_de.php b/inc/language/mailid_de.php index 33fb535f2f..87031681e1 100644 --- a/inc/language/mailid_de.php +++ b/inc/language/mailid_de.php @@ -50,7 +50,7 @@ addMessages(array( 'THANX_POINTS_LOCKED' => "Vielen Dank für die Bestätigung der Mail. Die %s {?POINTS?} werden Ihnen bald gutgeschrieben.", 'POINTS_NOT_ADDED' => "Falscher Bestätigungscode eingegeben! Die %s {?POINTS?} wurden dem Versender wieder gutgeschrieben.", 'ENTER_CODE' => "Code eingeben", - 'MEMBER_TIME_COUNTER' => "Gutschrift der {?POINTS?} erfolgt in %s ...", + 'MEMBER_TIME_COUNTER' => "Gutschrift der {?POINTS?} erfolgt in %s ...", 'SUBMIT_CODE' => "Abschicken", 'MAILID_TOTAL_POINTS' => "Ihr Kontostand beträgt jetzt %s {?POINTS?}.", '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 2215bdf2f8..ccffd66860 100644 --- 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 ", - 'USER_MT_PROJECTED_2' => " werden wir ", - 'USER_MT_PROJECTED_3' => " Mitglieder erreicht haben.", + 'USER_MT_PROJECTED' => "Voraussichtlich: Am %s werden wir {?mt_stage?} Mitglieder erreicht haben.", 'USER_PROJECTION_UNKNOWN' => "unbekanntes Datum", )); diff --git a/inc/language/network_de.php b/inc/language/network_de.php index f6b93063b6..99b0beb208 100644 --- 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 %s wurde nicht hinzugefügt.", 'ADMIN_NETWORK_TYPES_NOTHING_FOUND' => "Es wurden keine Werbart-Handler zum Editieren oder Löschen gefunden.", 'ADMIN_NETWORK_REQUEST_PARAMETER_ALREADY_ADDED' => "Ein API-Parameter %s existiert bereits.", - 'ADMIN_NETWORK_REQUEST_PARAMS_404' => "Es wurden keine API-Parameter zum Werbenetzwerk %s gefunden.", + 'ADMIN_NETWORK_REQUEST_PARAMETER_404' => "Es wurden keine API-Parameter zum Werbenetzwerk %s gefunden.", 'ADMIN_NETWORK_REQUEST_PARAMETER_NOT_ADDED' => "Der API-Parameter %s wurde nicht hinzugefügt.", - 'ADMIN_NETWORK_REQUEST_PARAMS_NOTHING_CHANGED' => "Es wurden keine Änderungen an den API-Parametern ausgeführt.", - 'ADMIN_NETWORK_REQUEST_PARAMS_NOTHING_REMOVED' => "Es wurden keine API-Parameter gelöscht.", + 'ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_CHANGED' => "Es wurden keine Änderungen an den API-Parametern ausgeführt.", + 'ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_REMOVED' => "Es wurden keine API-Parameter gelöscht.", + 'ADMIN_NETWORK_ARRAY_TRANSLATION_404' => "Es wurden keine Übersetzungen zum Antwort-Array zum Werbenetzwerk %s gefunden.", // - Form titles 'ADMIN_NETWORK_ADD_TITLE' => "Neues Werbenetzwerk hinzufügen - Allgemeine Daten", 'ADMIN_NETWORK_EDIT_TITLE' => "Werbenetzwerk editieren - Allgemeine Daten", 'ADMIN_NETWORK_DELETE_TITLE' => "Werbenetzwerk löschen - Allgemeine Daten", - 'ADMIN_NETWORK_SELECT_TITLE' => "Werbenetzwerk auswählen", + 'ADMIN_NETWORK_SELECT_TITLE' => "Bitte wählen Sie ein Werbenetzwerk aus", + 'ADMIN_NETWORK_TYPE_SELECT_TITLE' => "Bitte wählen Sie einen Werbeart-Handler aus", 'ADMIN_NETWORK_TYPES_ADD_TITLE' => "Werbenetzwerk verwalten - Neue Werbeart hinzufü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öschen", - 'ADMIN_NETWORK_REQUEST_PARAMS_ADD_TITLE' => "Werbenetzwerk verwalten - Neuen API-Parameter hinzufü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öschen", + 'ADMIN_NETWORK_REQUEST_PARAMETER_ADD_TITLE' => "Werbenetzwerk verwalten - Neuen API-Parameter hinzufü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öschen", + 'ADMIN_NETWORK_ARRAY_TRANSLATION_ADD_TITLE' => "Werbenetzwerk verwalten - Neuen Rückgabewert hinzufü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ückgabewerten", + 'ADMIN_NETWORK_LIST_ARRAY_TRANSLATION_LINK_TITLE' => "Weiter zu den Ü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öschen", 'ADMIN_NETWORK_REMOVE' => "Daten entfernen", 'ADMIN_NETWORK_CHOOSE' => "Werbenetzwerk auswählen", + 'ADMIN_NETWORK_TYPE_CHOOSE' => "Werbeart-Handler auswählen", 'ADMIN_NETWORK_TYPES_ADD' => "Werbeart hinzufügen", 'ADMIN_NETWORK_TYPES_EDIT' => "Editieren", 'ADMIN_NETWORK_TYPES_DELETE' => "Löschen", 'ADMIN_NETWORK_TYPES_CHANGE' => "Handler ändern", 'ADMIN_NETWORK_TYPES_REMOVE' => "Handler entfernen", - 'ADMIN_NETWORK_REQUEST_PARAMS_ADD' => "API-Parameter hinzufügen", - 'ADMIN_NETWORK_REQUEST_PARAMS_EDIT' => "Editieren", - 'ADMIN_NETWORK_REQUEST_PARAMS_DELETE' => "Löschen", - 'ADMIN_NETWORK_REQUEST_PARAMS_CHANGE' => "API-Parameter ändern", - 'ADMIN_NETWORK_REQUEST_PARAMS_REMOVE' => "API-Parameter entfernen", + 'ADMIN_NETWORK_REQUEST_PARAMETER_ADD' => "API-Parameter hinzufügen", + 'ADMIN_NETWORK_REQUEST_PARAMETER_EDIT' => "Editieren", + 'ADMIN_NETWORK_REQUEST_PARAMETER_DELETE' => "Löschen", + 'ADMIN_NETWORK_REQUEST_PARAMETER_CHANGE' => "API-Parameter ändern", + 'ADMIN_NETWORK_REQUEST_PARAMETER_REMOVE' => "API-Parameter entfernen", + 'ADMIN_NETWORK_ARRAY_TRANSLATION_ADD' => "Rückgabewert hinzufügen", // - Success titles 'ADMIN_NETWORK_ADDED_TITLE' => "Allgemeine Werbenetzwerkdaten hinzugefügt.", 'ADMIN_NETWORK_TYPES_ADDED_TITLE' => "Werbeart-Handler hinzugefügt.", @@ -107,18 +112,19 @@ addMessages(array( 'ADMIN_NETWORK_UPDATED' => "Es wurden %s Einträge in den allgemeinen Daten aktualisiert.", 'ADMIN_NETWORK_REMOVED' => "Es wurden %s Einträge aus den allgemeinen Daten gelöscht.", 'ADMIN_NETWORK_TYPES_UPDATED' => "Es wurden %s Werbeart-Handler aktualisiert.", - 'ADMIN_NETWORK_REQUEST_PARAMS_UPDATED' => "Es wurden %s API-Parameter aktualisiert.", + 'ADMIN_NETWORK_REQUEST_PARAMETER_UPDATED' => "Es wurden %s API-Parameter aktualisiert.", 'ADMIN_NETWORK_TYPES_REMOVED' => "Es wurden %s Werbeart-Handler gelöscht.", - 'ADMIN_NETWORK_REQUEST_PARAMS_REMOVED' => "Es wurden %s API-Parameter gelöscht.", + 'ADMIN_NETWORK_REQUEST_PARAMETER_REMOVED' => "Es wurden %s API-Parameter gelö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öschen und Editieren von Allgemeine Daten sehr vorsichtig. Sie sollten hierzu Rücksprache im Forum halten.", 'ADMIN_NETWORK_TYPES_ADD_NOTE' => "Fügen Sie hier weitere Werbearten dem ausgwählten Werbenetzwerk hinzu. Die Klick- und Banner-URL müssen dabei Platzhalter enthalten, die Sie der Dokumentation und dem Forum entnehmen können. Die API-URL muss nur bis zum Fragezeichen eingegeben werden. Richtig: http://www.some-sponsor.invalid/inteface/script.php, falsch: http://www.some-sponsor.invalid/inteface/script.php?uid=123&pw=xyzxyzxyz", 'ADMIN_NETWORK_TYPES_LIST_NOTE' => "Seien Sie mit dem Löschen und Editieren von Werbeart-Handlern sehr vorsichtig. Sie sollten hierzu Rücksprache im Forum halten. Dokumentation zu den Platzhaltern (%FOO%, %BAR% usw.) finden Sie in der Dokumentation DOCs/de/network/README.txt.", - 'ADMIN_NETWORK_REQUEST_PARAMS_ADD_NOTE' => "Fügen Sie hier weitere API-Parameter dem ausgwä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öschen und Editieren von API-Parameter sehr vorsichtig. Sie sollten hierzu Rücksprache im Forum halten. Dokumentation zu den Abfragenamen (%FOO%, %BAR% usw.) finden Sie in der Dokumentation DOCs/de/network/README.txt.", + 'ADMIN_NETWORK_REQUEST_PARAMETER_ADD_NOTE' => "Fügen Sie hier weitere API-Parameter dem ausgwä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öschen und Editieren von API-Parameter sehr vorsichtig. Sie sollten hierzu Rücksprache im Forum halten. Dokumentation zu den Abfragenamen (%FOO%, %BAR% usw.) finden Sie in der Dokumentation DOCs/de/network/README.txt.", + 'ADMIN_NETWORK_ARRAY_TRANSLATION_ADD_NOTE' => "Fügen Sie hier weitere Array-Element-Übersetzungen zu dem ausgewählten Netzwerk und Werbeart-Handler ein.", // - Other messages - 'ADMIN_NETWORK_REQUEST_PARAMS_LIST_LIMITED_TO_TYPE' => "Es wurden nur die API-Parameter des ausgewählten Werbeart-Handlers angezeigt.", + 'ADMIN_NETWORK_REQUEST_PARAMETER_LIST_LIMITED_TO_TYPE' => "Es wurden nur die API-Parameter des ausgewä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ä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ä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ütung", - 'ADMIN_NETWORK_REQUEST_PARAMS_SIZE' => "Werbemittelgrö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ä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ütung", + 'ADMIN_NETWORK_REQUEST_PARAMETER_SIZE' => "Werbemittelgrösse", + 'ADMIN_NETWORK_REQUEST_PARAMETER_EROTIC' => "Erotik erlaubt", + 'ADMIN_NETWORK_REQUEST_PARAMETER_EXTRA' => "Extra-Parameter", + // - Return code translation + 'ADMIN_NETWORK_ARRAY_TRANSLATION_INDEX' => "Rückgabe-Code auswä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ü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ö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 871d3f83c6..d73ff34175 100644 --- 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ür Referal-Rallye %s", + 'RALLYE_CONFIG_PRICES' => "Preise einrichten für Referal-Rallye %s", 'RALLYE_PRICE_LEVEL' => "Platz eingeben (1, 2, 3, usw.)", 'RALLYE_PRICE_POINTS' => "Preis in {?POINTS?}", 'RALLYE_PRICE_INFOS' => "Preisbeschreibung (Sie können auch nur die Beschreibung eingeben!)", @@ -94,9 +94,7 @@ addMessages(array( 'RALLYE_ASSIGNED_PRICES' => "Bereits eingerichtete Preise", 'RALLYE_ASSIGNED_USERS' => "Teilnehmende Mitglieder", 'RALLYE_LIST_OVERVIEW_TITLE' => "Datenblä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ählt.", + 'RALLYE_NO_RALLYES_SELECTED' => "Sie haben keine Rallyes zum Editieren ausgewä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ählten Referal-Rallye sind noch keine Mitglieder hinzugefügt worden.", -// @TODO Rewrite following two lines to one - 'RALLYE_LIST_USERS' => "Teilnehmende Mitglieder an der Referal-Rallye %s", + 'RALLYE_LIST_USERS' => "Teilnehmende Mitglieder an der Referal-Rallye %s", '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 54a610c4ca..f9d58878c1 100644 --- 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 %s hat in dieser Referal-Ebene keine Refs.", - 'ADMIN_LIST_USER_NODATA' => "Das Mitglied %s wurde bereits gelöscht.", + 'ADMIN_LIST_USER_NOREFS' => "Das Mitglied %s hat in dieser Referal-Ebene keine Refs.", + 'ADMIN_LIST_USER_NODATA' => "Das Mitglied %s wurde bereits gelöscht.", 'ADMIN_CONFIG_REFBACK_TITLE' => "Refback-Einstellungen", 'ADMIN_CONFIG_REFBACK_ENABLED' => "Refback eingeschaltet? (Wenn nein, ist nur die Referal-Übersicht funktionell.)", 'ADMIN_CONFIG_REFBACK_MIN_PERCENTS' => "Minimum erlaubte Refback-Prozente:
(0% ist immer erlaubt!)", @@ -71,9 +71,7 @@ addMessages(array( 'MEMBER_REFBACK_DELETED_SUBMIT' => "Nicht möglich", 'MEMBER_REFBACK_DELETED_TITLE' => "Einstellen von Ref-Back ist für gelöschte Mitglieder nicht möglich.", 'MEMBER_REFBACK_DISABLED' => "Refback ist administrativ deaktiviert. Bitte nutze die Referal-Übersicht links im Menü.", - 'MEMBER_REFBACK_MIN_MAX_NOTE_1' => "Hinweis: Sie können derzeit zwischen ", - 'MEMBER_REFBACK_MIN_MAX_NOTE_2' => " und ", - 'MEMBER_REFBACK_MIN_MAX_NOTE_3' => " Prozent, inklusive, Refback einstellen.", + 'MEMBER_REFBACK_MIN_MAX_NOTE' => "Hinweis: Sie können derzeit zwischen {%config,translateComma=refback_min_perc%} und {%config,translateComma=refback_max_perc%} Prozent, inklusive, Refback einstellen.", // Error messages for members 'MEMBER_REFBACK_ERROR_MESSAGE' => "Fehler beim Einstellen des Ref-Backs. Fehlermeldung:
\n%s", diff --git a/inc/language/sponsor_de.php b/inc/language/sponsor_de.php index cd52172e63..6f7463b76a 100644 --- 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 %s löschen", - 'ADMIN_TEXT_DEL_SPONSOR' => "Möchten Sie den Sponsoren %s mit samt aller seiner Bestellungen unwiederruflich löschen?", + 'ADMIN_HEADER_DEL_SPONSOR' => "Sponsorenaccount %s löschen", + 'ADMIN_TEXT_DEL_SPONSOR' => "Möchten Sie den Sponsoren %s mit samt aller seiner Bestellungen unwiederruflich löschen?", 'ADMIN_SPONSOR_DELETED' => "Sponsorenaccount %s 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 c5ed6c7a0b..124ed34461 100644 --- 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' => '{%config=menu_blur_spacer%}' . getMessage('GUEST_ACTIVE_LINK') . '', + 'menu' => '{%config=menu_blur_spacer%}{--GUEST_ACTIVE_LINK--}', 'what' => 'active' ); diff --git a/inc/libs/admins_functions.php b/inc/libs/admins_functions.php index 3ec0d01886..8bca848b23 100644 --- 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 f3424a46d7..21ef2d6d1b 100644 --- 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 .= " ".$rows['rank'].". ".$rows['userid']." - ".$rows['points']." + {%pipe,translateComma=".$rows['points']."%} \n"; // Switch color @@ -321,7 +318,7 @@ LIMIT 1", if (($bonus === true) && (getRequestParameter('mode') == 'bonus')) { // Output message with added points - $GLOBALS['message'] .= '
' . getMessage('BONUS_LOGIN_BONUS_ADDED') . '
'; + $GLOBALS['message'] .= '
{--BONUS_LOGIN_BONUS_ADDED--}
'; } elseif (isExtensionActive('bonus')) { // No login bonus added! $GLOBALS['message'] .= '
{--BONUS_LOGIN_BONUS_NOT_ADDED--}
'; diff --git a/inc/libs/doubler_functions.php b/inc/libs/doubler_functions.php index 6333ababde..b6eddaf443 100644 --- 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 8630b68128..0ca2f48b04 100644 --- 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
-s and finally compile possible own HTML tags out... - return compileCode(str_replace("\n", "
\n", $text)); + return preCompileCode(str_replace("\n", "
\n", $text)); } // Sends a HTML mail to the user diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php index 8220abf5c1..b33bfea63b 100644 --- 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 8ecfe7373d..ea035521c2 100644 --- 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 6643755e7f..baf88c8796 100644 --- 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 ba5e615897..4e03f7ecba 100644 --- 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 = "\n"; + $OUT = ''; } 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]}
"); - if (($userid == $userid) && ($GLOBALS['cache_array']['refsystem']['level'][$id] == 1)) { + if (($currUserid == $userid) && ($GLOBALS['cache_array']['refsystem']['level'][$id] == 1)) { //* DEBUG: */ print("userid matches!
"); 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 d73f86568f..d4db9cc067 100644 --- 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 6a23cf91bf..5b76d5a1b3 100644 --- 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 ee59586f50..983a46b968 100644 --- 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 b36ceb782a..6716188e18 100644 --- 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("
");
+		print('
');
 		print_r($GLOBALS['surfbar_cache']);
-		print("
");
-		debug_report_bug();
+		print('
'); + 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 ed919e1267..16ea671c73 100644 --- a/inc/libs/task_functions.php +++ b/inc/libs/task_functions.php @@ -208,13 +208,13 @@ function outputAdvancedOverview (&$result_main) { $content['purged_bonus_mails'] = '' . $value . ''; } // 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'] = '{--ADMIN_EXT_BONUS_404--}'; + $content['purged_bonus_mails'] = '{--ADMIN_EXTENSION_BONUS_404--}'; } } else { - $content['purged_bonus_mails'] = '{--ADMIN_EXT_AUTOPURGE_404--}'; - $content['purged_mails'] = '{--ADMIN_EXT_AUTOPURGE_404--}'; + $content['purged_bonus_mails'] = '{--ADMIN_EXTENSION_AUTOPURGE_404--}'; + $content['purged_mails'] = '{--ADMIN_EXTENSION_AUTOPURGE_404--}'; } // @@ -228,9 +228,9 @@ function outputAdvancedOverview (&$result_main) { $content['send_bonus_mails'] = '' . $value . ''; } // 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 af1e552320..ca86a9b5f8 100644 --- 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 9105d95f17..adffe64f90 100644 --- 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 b9a65e462f..4dcba25b0d 100644 --- 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 ed88899d9f..a2d715f7ea 100644 --- 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 7822bf081f..f798980ef6 100644 --- 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 46b470a6be..a6e033567a 100644 --- 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 .= '
{--ADMIN_EXT_ALREADY_REGISTERED--}
'; + $OUT .= '
{--ADMIN_EXTENSION_ALREADY_REGISTERED--}
'; // 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 f3465c2301..5d31043b18 100644 --- 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, '
' . 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-config_payouts.php b/inc/modules/admin/what-config_payouts.php index f9a6ed4a5c..f92bfb20e1 100644 --- 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 d533515a6a..17973ef9d8 100644 --- 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, '
' . getMaskedMessage('ADMIN_MEMBER_404', getRequestParameter('userid')) . '
'); + loadTemplate('admin_settings_saved', false, '
' . getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))) . '
'); } } 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, '
' . getMaskedMessage('ADMIN_MEMBER_404', getRequestParameter('userid')) . '
'); + loadTemplate('admin_settings_saved', false, '
' . getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))) . '
'); } } diff --git a/inc/modules/admin/what-edit_user.php b/inc/modules/admin/what-edit_user.php index 9beed352b6..a9acd58ae1 100644 --- 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, '
' . getMaskedMessage('ADMIN_MEMBER_404', getRequestParameter('userid')) . '
'); + loadTemplate('admin_settings_saved', false, '
' . getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))) . '
'); } // Free the result diff --git a/inc/modules/admin/what-extensions.php b/inc/modules/admin/what-extensions.php index d762d36088..965bc1f8bd 100644 --- 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 4407bc58cc..d4f2fbdddc 100644 --- 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 60b4e041b6..c74ec6ca25 100644 --- 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 65a55abe35..93fcab6108 100644 --- 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 ce118a8891..c5a01a4b29 100644 --- 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 07d001c71e..c337999dbb 100644 --- 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 1d56c3a785..00a5e0b55d 100644 --- 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 3029329263..d6bb58f5f3 100644 --- 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 e1cb35fec6..51d355d999 100644 --- 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 b0bc872446..9ef5489abb 100644 --- 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 1f334602c0..f91f2aedd4 100644 --- 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, '
' . getMaskedMessage('ADMIN_MEMBER_404', getRequestParameter('userid')) . '
'); + loadTemplate('admin_settings_saved', false, '
' . getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))) . '
'); } } // 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, '
' . $message . '
'); } else { - loadTemplate('admin_settings_saved', false, '
' . getMessage('ADMIN_USER_UPDATED') . '
'); + loadTemplate('admin_settings_saved', false, '
{--ADMIN_USER_UPDATED--}
'); } } } else { // Account does not exists! - loadTemplate('admin_settings_saved', false, '
' . getMaskedMessage('ADMIN_MEMBER_404', getRequestParameter('userid')) . '
'); + loadTemplate('admin_settings_saved', false, '
' . getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))) . '
'); } } else { // List all users diff --git a/inc/modules/admin/what-memedit.php b/inc/modules/admin/what-memedit.php index ac894ac23a..3194832be9 100644 --- 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 80b1d4f731..54c22b1519 100644 --- 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 f139aa4de7..8de522a367 100644 --- 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 d2d4a027c8..63a9f4413c 100644 --- 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 6db44f6c43..22c3685833 100644 --- 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 9667e9be6a..4b72569767 100644 --- 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, '
' . 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-surfbar_stats.php b/inc/modules/admin/what-surfbar_stats.php index 54ff5df476..62a5ca2c73 100644 --- 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 33a1ed803a..153d93a3a4 100644 --- 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 a76d8e46e6..04b637aa35 100644 --- 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 616a72f42d..069171dd71 100644 --- 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 e3bdb8d0f3..e4b580499b 100644 --- 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 caa950e645..b3e272c6c5 100644 --- 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 0edbaa79cd..50078e5ade 100644 --- 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 a20b2e9040..a9e1c850c6 100644 --- 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 f1ccf3837a..d0d9fff8bb 100644 --- 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 = "
-
".getMessage('SPONSOR_REGISTER_SOMETHING_MISSING').":

-
-
    \n"; + $OUT = loadTemplate('admin_settings_saved', true, getMessage('SPONSOR_REGISTER_SOMETHING_MISSING'); + $OUT .= '
      '; foreach ($FORM_ERRORS as $error) { - $OUT .= "
    1. ".$error."
      2. \n"; + $OUT .= '
    2. ' . $error . '
      3. '; } // END - foreach - $OUT .= "

    \n"; + $OUT .= '
'; } // END - if $content['form_errors'] = $OUT; diff --git a/inc/modules/guest/what-stats.php b/inc/modules/guest/what-stats.php index c66524f7ca..9fe4fc7148 100644 --- 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 %s detected.", secureString(getRequestParameter('mode')))); + debug_report_bug(sprintf("Unsupported mode %s detected.", secureString(getRequestParameter('mode')))); break; } diff --git a/inc/modules/login.php b/inc/modules/login.php index 7e717d182f..e03e32b547 100644 --- 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 67bc6e3281..b448c2f40f 100644 --- 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 5c9871a969..8d84a59412 100644 --- 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 d16554c595..5d7612c970 100644 --- 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 0574fd7f5a..28a0f11ad1 100644 --- 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 c9bfafc8b1..c360728d6a 100644 --- 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&what=order&code=' . getCode('MORE_RECEIVERS3'); + $url = 'modules.php?module=login&what=order&code=' . getCode('MORE_RECEIVERS3'); } // END - if // Validate URL if (!isUrlValid(postRequestParameter('url'))) { // URL is invalid! - $URL = 'modules.php?module=login&what=order&code=' . getCode('INVALID_URL'); + $url = 'modules.php?module=login&what=order&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&what=order&code=' . getCode('INVALID_TAGS')."&id=".$id; + if (!isPostRequestParameterSet('text')) $url = 'modules.php?module=login&what=order&code=' . getCode('INVALID_TAGS')."&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&what=order&code=' . getCode('NO_MAIL_TYPE'); + $url = 'modules.php?module=login&what=order&code=' . getCode('NO_MAIL_TYPE'); } // END - if } elseif (!isAdmin()) { // He has already sent a mail within a specific time - $URL = 'modules.php?module=login&what=order&code=' . getCode('URL_TLOCK') . '&id=' . $id; + $url = 'modules.php?module=login&what=order&code=' . getCode('URL_TLOCK') . '&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&order=' . $id; + $url = 'modules.php?module=frametester&order=' . $id; } elseif ($content['target_send'] == '0') { // Not enougth receivers found which can receive mails - $URL = 'modules.php?module=login&what=order&code=' . getCode('MORE_RECEIVERS2'); + $url = 'modules.php?module=login&what=order&code=' . getCode('MORE_RECEIVERS2'); } else { // No enougth points left! - $URL = 'modules.php?module=login&what=order&code=' . getCode('MORE_POINTS'); + $url = 'modules.php?module=login&what=order&code=' . getCode('MORE_POINTS'); } } else { // Ordered more mails than he can send in this category - $URL = 'modules.php?module=login&what=order&code=' . getCode('NO_RECS_LEFT'); + $url = 'modules.php?module=login&what=order&code=' . getCode('NO_RECS_LEFT'); } } } elseif (postRequestParameter('receiver') == '0') { // Not enougth receivers selected - $URL = 'modules.php?module=login&what=order&code=' . getCode('MORE_RECEIVERS1'); + $url = 'modules.php?module=login&what=order&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 9f4ffc049b..a55da246a5 100644 --- 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 e26d09807a..52b1964800 100644 --- 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 10f9907e76..70967c9f6a 100644 --- 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 a4c3b1b850..e3446626e3 100644 --- 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 122f0daa22..ba40074cf8 100644 --- 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 d5a2b824d8..12ecfd5da8 100644 --- 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 0e0fb4341d..e70a2b03f1 100644 --- 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 acdedf4066..f49a345912 100644 --- 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 67fecfc514..370f3fddcc 100644 --- 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 43edf8d258..ed3dfaa445 100644 --- 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 54e6bd065f..b29d3fb625 100644 --- 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__."*
"); break; diff --git a/inc/reset/reset_daily.php b/inc/reset/reset_daily.php index be14b25c2b..da40de9122 100644 --- 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)."
"); 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']}
"); - $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)."
"); @@ -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']}
"); - 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 98ddba1366..a2e45a6158 100644 --- 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 124ef4f9c4..b60c9a2ea6 100644 --- 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 ed3f506807..a66f57555e 100644 --- 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 eb2417b500..eefa78d06f 100644 --- 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 2578303632..cc5a08e37d 100644 --- 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 83236fdb60..b4e487ad71 100644 --- 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 c45d95b9af..52fea25549 100644 --- 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 fd1e121d29..8de45873af 100644 --- 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 c6ffff707b..9d381bf1c7 100644 --- 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 48aefe3456..8592abd653 100644 --- 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 c9b8eadf54..a47d61ea3e 100644 --- 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 fe91558237..1c74f4fde2 100644 --- 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 7479943354..b6f8af23ef 100644 --- 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 ce03b4d332..7c93a02178 100644 --- 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 1d26684b07..be0dfceb60 100644 --- 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 2eab14288f..fc132fec9d 100644 --- 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 289be22cc3..47bb65460c 100644 --- 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 bdc1d94bb6..60e10fbaf8 100644 --- 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 c34989b4c7..91b40ddef3 100644 --- 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 f760cead5c..283ff3d9d4 100644 --- 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 32cc1f6757..966571f395 100644 --- 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 69be42d28c..8a81549064 100644 --- 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 74f6dd89d9..36f3cf0bc6 100644 --- 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 f6ab6fc6ff..f05d6411e1 100644 --- 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 f149f0e3b6..32f83651f0 100644 --- 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 6cef745ddb..6110c92bdb 100644 --- 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 07686687d8..596a78464a 100644 --- 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 7a88197269..09ddb3578c 100644 --- 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 eca2f0f161..cc4d16e98a 100644 --- 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 13a9204ad9..40c9a3ff58 100644 --- 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 6a1737e567..a66b7c95ee 100644 --- 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 066a635515..4062427a92 100644 --- 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 f33c843e0e..6f2a681ce4 100644 --- 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 557b50046b..ad6ca789a7 100644 --- 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 5e69269da0..70706d9e8c 100644 --- 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 f3ed2bd1e4..14fef75ab6 100644 --- 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 1af3c4f586..aa255d7d15 100644 --- 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 243c4bf9ad..f9a2be126f 100644 --- 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 ccdb5a615e..47b5d21064 100644 --- 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 6aefb5e2c0..4a07662c56 100644 --- 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 558ad5b39f..0a87664f48 100644 --- 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 95d26088a2..40b867bcb3 100644 --- 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 c6d58f5ddd..b794eea6a4 100644 --- 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 b00ce37986..9d8e6aeed6 100644 --- 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 a8ce779e85..9ee7bc1fcc 100644 --- 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 ce702754bf..9aa05ec734 100644 --- 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 621562246f..2845e5d7ed 100644 --- 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 84bb3cc9ee..20c3c41641 100644 --- 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 ff38e58004..fad26995d7 100644 --- 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 48f6e06c1e..6371f9adc4 100644 --- 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 68b5c14010..12226be3eb 100644 --- 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 522cda9e2b..9821c77581 100644 --- 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 1cfd3b3f64..e0222fb18f 100644 --- 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 d2c36f4119..112316a999 100644 --- 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 e5610b6fba..0535d99cb3 100644 --- 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 f55d91f363..d3e246943a 100644 --- 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 07653983eb..b8a8f8eb8f 100644 --- 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 7055e7bffb..0501eae161 100644 --- 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 f0f8c1f9c7..8bab2cf8d1 100644 --- 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 fbadf2f968..9f526fd7f6 100644 --- 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 68b5c14010..12226be3eb 100644 --- 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 b4df5cdf30..bf5a339c59 100644 --- 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 86d6d6feab..3161f4a82e 100644 --- a/templates/de/html/admin/admin_add_network_params.tpl +++ b/templates/de/html/admin/admin_add_network_params.tpl @@ -3,7 +3,7 @@ - + - + - + @@ -40,7 +40,7 @@
- {--ADMIN_NETWORK_REQUEST_PARAMS_ADD_TITLE--} + {--ADMIN_NETWORK_REQUEST_PARAMETER_ADD_TITLE--}
($content[network_title])
@@ -13,26 +13,26 @@ 		{--ADMIN_NETWORK_TYPE_SELECT--}:
{--ADMIN_NETWORK_REQUEST_PARAMS_KEY--}:{--ADMIN_NETWORK_REQUEST_PARAMETER_KEY--}:
{--ADMIN_NETWORK_REQUEST_PARAMS_VALUE--}:{--ADMIN_NETWORK_REQUEST_PARAMETER_VALUE--}:
{--ADMIN_NETWORK_REQUEST_PARAMS_DEFAULT--}:{--ADMIN_NETWORK_REQUEST_PARAMETER_DEFAULT--}:
- +
@@ -48,5 +48,5 @@
- {--ADMIN_NETWORK_REQUEST_PARAMS_ADD_NOTE--} + {--ADMIN_NETWORK_REQUEST_PARAMETER_ADD_NOTE--}
diff --git a/templates/de/html/admin/admin_amenu_edit_form.tpl b/templates/de/html/admin/admin_amenu_edit_form.tpl index a05516d6bd..0e32c29198 100644 --- a/templates/de/html/admin/admin_amenu_edit_form.tpl +++ b/templates/de/html/admin/admin_amenu_edit_form.tpl @@ -8,7 +8,7 @@ - {%message,EDIT_MENU,$content[chk]%} + {%message,EDIT_MENU=$content[chk]%} $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 1c74096753..4f35e59e95 100644 --- a/templates/de/html/admin/admin_del_network_params.tpl +++ b/templates/de/html/admin/admin_del_network_params.tpl @@ -4,7 +4,7 @@
- {--ADMIN_NETWORK_REQUEST_PARAMS_DELETE_TITLE--} + {--ADMIN_NETWORK_REQUEST_PARAMETER_DELETE_TITLE--}
($content[network_data][network_title]) @@ -15,13 +15,13 @@ - +
- {--ADMIN_NETWORK_REQUEST_PARAMS_LIST_NOTE--} + {--ADMIN_NETWORK_REQUEST_PARAMETER_LIST_NOTE--}
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 ccc39d5306..04e926527f 100644 --- 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 @@ - {--ADMIN_NETWORK_REQUEST_PARAMS_KEY--}: + {--ADMIN_NETWORK_REQUEST_PARAMETER_KEY--}: $content[request_param_key] - {--ADMIN_NETWORK_REQUEST_PARAMS_VALUE--}: + {--ADMIN_NETWORK_REQUEST_PARAMETER_VALUE--}: $content[request_param_value] - {--ADMIN_NETWORK_REQUEST_PARAMS_DEFAULT--}: + {--ADMIN_NETWORK_REQUEST_PARAMETER_DEFAULT--}: $content[request_param_default] diff --git a/templates/de/html/admin/admin_del_sponsor.tpl b/templates/de/html/admin/admin_del_sponsor.tpl index 4f7a0a295b..3800d317b5 100644 --- a/templates/de/html/admin/admin_del_sponsor.tpl +++ b/templates/de/html/admin/admin_del_sponsor.tpl @@ -2,11 +2,11 @@
-
{%message,ADMIN_HEADER_DEL_SPONSOR,$content[userid]%}
+
{%message,ADMIN_HEADER_DEL_SPONSOR=$content[userid]%}
- {%message,ADMIN_TEXT_DEL_SPONSOR,$content[userid]%} + {%message,ADMIN_TEXT_DEL_SPONSOR=$content[userid]%}
diff --git a/templates/de/html/admin/admin_edit_email_row.tpl b/templates/de/html/admin/admin_edit_email_row.tpl index 7a307ed837..c29c14b281 100644 --- a/templates/de/html/admin/admin_edit_email_row.tpl +++ b/templates/de/html/admin/admin_edit_email_row.tpl @@ -5,6 +5,6 @@ $content[subject] - ({--EMAIL_SENDER--}: $content[userid]; $content[pay]; $content[cat]) + ({--EMAIL_SENDER--}: $content[userid]; {%pipe,translateComma=$content[pay]%}; $content[cat]) diff --git a/templates/de/html/admin/admin_edit_network_params.tpl b/templates/de/html/admin/admin_edit_network_params.tpl index 715cbef9e7..b6b4e41907 100644 --- a/templates/de/html/admin/admin_edit_network_params.tpl +++ b/templates/de/html/admin/admin_edit_network_params.tpl @@ -4,7 +4,7 @@
- {--ADMIN_NETWORK_REQUEST_PARAMS_EDIT_TITLE--} + {--ADMIN_NETWORK_REQUEST_PARAMETER_EDIT_TITLE--}
($content[network_data][network_title]) @@ -15,13 +15,13 @@ - +
- {--ADMIN_NETWORK_REQUEST_PARAMS_LIST_NOTE--} + {--ADMIN_NETWORK_REQUEST_PARAMETER_LIST_NOTE--}
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 90d3b33a8f..066463928f 100644 --- 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 @@ - {--ADMIN_NETWORK_REQUEST_PARAMS_KEY--}: + {--ADMIN_NETWORK_REQUEST_PARAMETER_KEY--}: - {--ADMIN_NETWORK_REQUEST_PARAMS_DEFAULT--}: + {--ADMIN_NETWORK_REQUEST_PARAMETER_DEFAULT--}: diff --git a/templates/de/html/admin/admin_email_archiv_row.tpl b/templates/de/html/admin/admin_email_archiv_row.tpl index ae865184c1..ad04d22f2f 100644 --- a/templates/de/html/admin/admin_email_archiv_row.tpl +++ b/templates/de/html/admin/admin_email_archiv_row.tpl @@ -15,7 +15,7 @@ {--EMAIL_PAYMENT--}:
- $content[pay] + {%pipe,translateComma=$content[pay]%} {--EMAIL_CATEGORY--}:
diff --git a/templates/de/html/admin/admin_extensions.tpl b/templates/de/html/admin/admin_extensions.tpl index 7813116b3d..447dc68b02 100644 --- a/templates/de/html/admin/admin_extensions.tpl +++ b/templates/de/html/admin/admin_extensions.tpl @@ -8,10 +8,10 @@ {--ID_SELECT--} - {--ADMIN_EXT_NAME--} - {--ADMIN_EXT_CSSFILE--} - {--ADMIN_EXT_ACTIVE--} - {--ADMIN_EXT_VERSION--} + {--ADMIN_EXTENSION_NAME--} + {--ADMIN_EXTENSION_CSSFILE--} + {--ADMIN_EXTENSION_ACTIVE--} + {--ADMIN_EXTENSION_VERSION--} $content diff --git a/templates/de/html/admin/admin_extensions_delete.tpl b/templates/de/html/admin/admin_extensions_delete.tpl index f8a66cd162..f4ccc71bad 100644 --- a/templates/de/html/admin/admin_extensions_delete.tpl +++ b/templates/de/html/admin/admin_extensions_delete.tpl @@ -8,8 +8,8 @@ {--ID_SELECT--} - {--ADMIN_EXT_NAME--} - {--ADMIN_EXT_VERSION--} + {--ADMIN_EXTENSION_NAME--} + {--ADMIN_EXTENSION_VERSION--}   $content diff --git a/templates/de/html/admin/admin_extensions_edit.tpl b/templates/de/html/admin/admin_extensions_edit.tpl index ad2ebcf5cb..ff4bb97098 100644 --- a/templates/de/html/admin/admin_extensions_edit.tpl +++ b/templates/de/html/admin/admin_extensions_edit.tpl @@ -8,9 +8,9 @@ {--ID_SELECT--} - {--ADMIN_EXT_NAME--} - {--ADMIN_EXT_CSSFILE--} - {--ADMIN_EXT_ACTIVE--} + {--ADMIN_EXTENSION_NAME--} + {--ADMIN_EXTENSION_CSSFILE--} + {--ADMIN_EXTENSION_ACTIVE--} $content diff --git a/templates/de/html/admin/admin_footer.tpl b/templates/de/html/admin/admin_footer.tpl index 443aea25be..0ea83584ab 100644 --- a/templates/de/html/admin/admin_footer.tpl +++ b/templates/de/html/admin/admin_footer.tpl @@ -3,7 +3,8 @@
diff --git a/templates/de/html/admin/admin_gmenu_edit_form.tpl b/templates/de/html/admin/admin_gmenu_edit_form.tpl index 385138a55f..cf8695f50a 100644 --- a/templates/de/html/admin/admin_gmenu_edit_form.tpl +++ b/templates/de/html/admin/admin_gmenu_edit_form.tpl @@ -8,7 +8,7 @@ - {%message,EDIT_MENU,$content[chk]%} + {%message,EDIT_MENU=$content[chk]%} $content[rows] diff --git a/templates/de/html/admin/admin_gmenu_status.tpl b/templates/de/html/admin/admin_gmenu_status.tpl index 6257467afb..0bf1495ea2 100644 --- a/templates/de/html/admin/admin_gmenu_status.tpl +++ b/templates/de/html/admin/admin_gmenu_status.tpl @@ -7,7 +7,7 @@ {--CHANGE_GUEST_MENU--}
- {--CHANGE_MENU_1--}$content[chk]{--CHANGE_MENU_2--} + {%message,CHANGE_MENU=$content[chk]%}
diff --git a/templates/de/html/admin/admin_list_beg.tpl b/templates/de/html/admin/admin_list_beg.tpl index 2b3d6df300..5f58825e39 100644 --- a/templates/de/html/admin/admin_list_beg.tpl +++ b/templates/de/html/admin/admin_list_beg.tpl @@ -39,7 +39,7 @@ {--ADMIN_BEG_WINNER_HIGLIGHTED--}
- {%message,ADMIN_BEG_TIMEOUT,$content[autopurge_timeout]%} + {%message,ADMIN_BEG_TIMEOUT=$content[autopurge_timeout]%}
diff --git a/templates/de/html/admin/admin_list_bonus.tpl b/templates/de/html/admin/admin_list_bonus.tpl index b0cb600612..1b66d348f4 100644 --- a/templates/de/html/admin/admin_list_bonus.tpl +++ b/templates/de/html/admin/admin_list_bonus.tpl @@ -40,7 +40,7 @@ {--ADMIN_BONUS_WINNER_HIGLIGHTED--}
- {%message,ADMIN_BONUS_TIMEOUT,$content[autopurge_timeout]%} + {%message,ADMIN_BONUS_TIMEOUT=$content[autopurge_timeout]%}
diff --git a/templates/de/html/admin/admin_list_links.tpl b/templates/de/html/admin/admin_list_links.tpl index 6701d55899..17840cb336 100644 --- a/templates/de/html/admin/admin_list_links.tpl +++ b/templates/de/html/admin/admin_list_links.tpl @@ -7,7 +7,7 @@ $content[rows] - {--MEMBER_TOTAL_LINKS_1--}$content[nums]{--MEMBER_TOTAL_LINKS_2--}
+ {%message,MEMBER_TOTAL_LINKS=$content[nums]%}
{--ADMIN_DEL_UNCONFIRMED_LINKS--} diff --git a/templates/de/html/admin/admin_list_network_params.tpl b/templates/de/html/admin/admin_list_network_params.tpl index 87d5490799..d3d94cb8f8 100644 --- a/templates/de/html/admin/admin_list_network_params.tpl +++ b/templates/de/html/admin/admin_list_network_params.tpl @@ -4,7 +4,7 @@
- {--ADMIN_NETWORK_REQUEST_PARAMS_LIST_TITLE--} + {--ADMIN_NETWORK_REQUEST_PARAMETER_LIST_TITLE--}
($content[network_title]) @@ -14,22 +14,22 @@ {--ID_SELECT--} {--ADMIN_NETWORK_TYPES_HANDLE--} - {--ADMIN_NETWORK_REQUEST_PARAMS_KEY--} - {--ADMIN_NETWORK_REQUEST_PARAMS_VALUE--} - {--ADMIN_NETWORK_REQUEST_PARAMS_DEFAULT--} + {--ADMIN_NETWORK_REQUEST_PARAMETER_KEY--} + {--ADMIN_NETWORK_REQUEST_PARAMETER_VALUE--} + {--ADMIN_NETWORK_REQUEST_PARAMETER_DEFAULT--} $content[rows] - - + +
- {--ADMIN_NETWORK_REQUEST_PARAMS_LIST_NOTE--} + {--ADMIN_NETWORK_REQUEST_PARAMETER_LIST_NOTE--}
diff --git a/templates/de/html/admin/admin_list_networks_row.tpl b/templates/de/html/admin/admin_list_networks_row.tpl index 013a08f3f0..06e2952142 100644 --- a/templates/de/html/admin/admin_list_networks_row.tpl +++ b/templates/de/html/admin/admin_list_networks_row.tpl @@ -7,7 +7,7 @@ [T|P|RC|RC|EC] diff --git a/templates/de/html/admin/admin_list_rallye_noselect.tpl b/templates/de/html/admin/admin_list_rallye_noselect.tpl index 80ab615927..11f5d85d80 100644 --- 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--} -{--RALLYE_NO_RALLYES_SELECTED_2--} -{--RALLYE_NO_RALLYES_SELECTED_3--} + diff --git a/templates/de/html/admin/admin_list_rallye_usr.tpl b/templates/de/html/admin/admin_list_rallye_usr.tpl index bbe7e1ca8a..b7ae02371c 100644 --- a/templates/de/html/admin/admin_list_rallye_usr.tpl +++ b/templates/de/html/admin/admin_list_rallye_usr.tpl @@ -1,7 +1,7 @@ diff --git a/templates/de/html/admin/admin_list_refs.tpl b/templates/de/html/admin/admin_list_refs.tpl index ffb3028375..d2a02e1d0c 100644 --- a/templates/de/html/admin/admin_list_refs.tpl +++ b/templates/de/html/admin/admin_list_refs.tpl @@ -2,7 +2,7 @@
- {%message,RALLYE_LIST_USERS,$content[rallye]%}: + {%message,RALLYE_LIST_USERS=$content[rallye]%}:
diff --git a/templates/de/html/admin/admin_list_refs2.tpl b/templates/de/html/admin/admin_list_refs2.tpl index 6c6d45fac2..66a261c038 100644 --- a/templates/de/html/admin/admin_list_refs2.tpl +++ b/templates/de/html/admin/admin_list_refs2.tpl @@ -1,7 +1,7 @@
- {--ADMIN_LIST_REFERALS_1--}$content[userid]{--ADMIN_LIST_REFERALS_2--} + {%message,ADMIN_LIST_REFERALS=$content[userid]%}
$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 bbb04171f1..4f0b2e2bd8 100644 --- a/templates/de/html/admin/admin_list_refs_level.tpl +++ b/templates/de/html/admin/admin_list_refs_level.tpl @@ -3,7 +3,7 @@
- {--ADMIN_LIST_REFERALS_1--}$content[userid]{--ADMIN_LIST_REFERALS_2--} + {%message,ADMIN_LIST_REFERALS=$content[userid]%}
diff --git a/templates/de/html/admin/admin_list_refs_nodata.tpl b/templates/de/html/admin/admin_list_refs_nodata.tpl index fcfe5a14d6..b1229a2cec 100644 --- a/templates/de/html/admin/admin_list_refs_nodata.tpl +++ b/templates/de/html/admin/admin_list_refs_nodata.tpl @@ -1,5 +1,5 @@ diff --git a/templates/de/html/admin/admin_list_refs_norefs.tpl b/templates/de/html/admin/admin_list_refs_norefs.tpl index 6b28682544..adb747d3cb 100644 --- a/templates/de/html/admin/admin_list_refs_norefs.tpl +++ b/templates/de/html/admin/admin_list_refs_norefs.tpl @@ -1,5 +1,5 @@ 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 25bed4ae70..0f7ac649ab 100644 --- 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 @@ {--ADMIN_TEST_URL--} - + - + $content[rows] @@ -18,7 +18,7 @@ $content[rows] $content[total] 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 cbcd95c7b8..5e0b6e8395 100644 --- 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 @@ diff --git a/templates/de/html/admin/admin_list_wernis_row.tpl b/templates/de/html/admin/admin_list_wernis_row.tpl index 8132f85e8a..540543e175 100644 --- a/templates/de/html/admin/admin_list_wernis_row.tpl +++ b/templates/de/html/admin/admin_list_wernis_row.tpl @@ -1,10 +1,10 @@ - - - - - - - - + + + + + + + + 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 c9df9ba0b8..715670ce22 100644 --- 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 @@ {--ADMIN_TEST_URL--}
- {--ADMIN_LIST_REFERALS_LEVEL_1--}$content[level]{--ADMIN_LIST_REFERALS_LEVEL_2--}
+ {%message,ADMIN_LIST_REFERALS_LEVEL=$content[level]%}
$content[info]
- {%message,ADMIN_LIST_USER_NODATA,$content[refid]%} + {%message,ADMIN_LIST_USER_NODATA=$content[refid]%}
- {%message,ADMIN_LIST_USER_NOREFS,$content[userid]%} + {%message,ADMIN_LIST_USER_NOREFS=$content[userid]%}
- $content[views_total] + {%pipe,translateComma=$content[url_views_total]%} - $content[url_status] + {%pipe,translateSurfbarUrlStatus=$content[url_status]%} $content[url_registered] diff --git a/templates/de/html/admin/admin_list_theme.tpl b/templates/de/html/admin/admin_list_theme.tpl index 519116db13..100e523d57 100644 --- a/templates/de/html/admin/admin_list_theme.tpl +++ b/templates/de/html/admin/admin_list_theme.tpl @@ -6,9 +6,9 @@
{--ID_SELECT--}{--ADMIN_EXT_DOWNLOAD_LINK--}{--ADMIN_EXTENSION_DOWNLOAD_LINK--} {--ADMIN_THEME_FILE_CTIME--}{--ADMIN_EXT_FILE_SIZE--}{--ADMIN_EXTENSION_FILE_SIZE--} {--THEME_VERSION--}
- {--ADMIN_EXT_TOTAL_FSIZE--}: + {--ADMIN_EXTENSION_TOTAL_FSIZE--}: $content[kbytes] {--KBYTES--}
- {%message,ADMIN_USER_DATA_NOT_FOUND,$content[userid]%} + {%message,ADMIN_USER_DATA_NOT_FOUND=$content[userid]%}
$content[id]$content[link]$content[wernis_account]$content[wernis_amount]$content[wernis_timestamp]$content[wernis_type]$content[wernis_api_message]$content[wernis_api_status]$content[id]{%pipe,generateUserProfileLink=$content[userid]%}$content[wernis_account]{%pipe,translateComma=$content[wernis_amount]%}$content[wernis_timestamp]{%pipe,WERNIS_TRANSFER_STATUS=$content[wernis_type]%}$content[wernis_api_message]$content[wernis_api_status]
- $content[url_status] + {%pipe,translateSurfbarUrlStatus=$content[url_status]%} $content[url_registered] diff --git a/templates/de/html/admin/admin_lock_user.tpl b/templates/de/html/admin/admin_lock_user.tpl index 7a51c8ebb2..0c086e4f7b 100644 --- a/templates/de/html/admin/admin_lock_user.tpl +++ b/templates/de/html/admin/admin_lock_user.tpl @@ -1,5 +1,5 @@
-
+ diff --git a/templates/de/html/admin/admin_menu_404_row.tpl b/templates/de/html/admin/admin_menu_404_row.tpl index 5b12109eb8..8845e43259 100644 --- a/templates/de/html/admin/admin_menu_404_row.tpl +++ b/templates/de/html/admin/admin_menu_404_row.tpl @@ -1,5 +1,5 @@ - - \ No newline at end of file + diff --git a/templates/de/html/admin/admin_mmenu_edit.tpl b/templates/de/html/admin/admin_mmenu_edit.tpl index cf802a8294..0881cfcac4 100644 --- a/templates/de/html/admin/admin_mmenu_edit.tpl +++ b/templates/de/html/admin/admin_mmenu_edit.tpl @@ -8,7 +8,7 @@ $content[rows] diff --git a/templates/de/html/admin/admin_mmenu_status.tpl b/templates/de/html/admin/admin_mmenu_status.tpl index c04b310870..edfa9c2ea0 100644 --- a/templates/de/html/admin/admin_mmenu_status.tpl +++ b/templates/de/html/admin/admin_mmenu_status.tpl @@ -5,7 +5,7 @@ $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 8ddc0934f9..68bb3255e0 100644 --- 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--} diff --git a/templates/de/html/beg/beg_login.tpl b/templates/de/html/beg/beg_login.tpl index 2c85a222bb..93b54de940 100644 --- a/templates/de/html/beg/beg_login.tpl +++ b/templates/de/html/beg/beg_login.tpl @@ -1,9 +1,11 @@ -
@@ -11,7 +11,7 @@
- [ $content[surname] $content[family] ] + [ {%user,surname=$content[userid]%} {%user,surname=$content[userid]%} ({%user,status,translateUserStatus=$content[userid]) ]
{--ENTRY_404_1--}$content[sel]{--ENTRY_404_2--} + + {--ENTRY_404_1--}$content[sel]{--ENTRY_404_2--}
- {%message,EDIT_MENU,$content[chk]%} + {%message,EDIT_MENU=$content[chk]%}
{--CHANGE_MEMBER_MENU--}

- {--CHANGE_MENU_1--}$content[chk]{--CHANGE_MENU_2--} + {%message,CHANGE_MENU=$content[chk]%}
- $content[pay] + {%pipe,translateComma=$content[pay]%} $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 901ed2e4fb..75d904c2dc 100644 --- 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 @@ {--ADMIN_TEST_URL--} - $content[url_status] + {%pipe,translateSurfbarUrlStatus=$content[url_status]%} $content[url_registered] diff --git a/templates/de/html/beg/beg_done.tpl b/templates/de/html/beg/beg_done.tpl index e91418d964..738d1264ab 100644 --- a/templates/de/html/beg/beg_done.tpl +++ b/templates/de/html/beg/beg_done.tpl @@ -1,9 +1,11 @@ - - - - -
-
{--BEG_UID_STEAL_1--}$content[userid]{--BEG_UID_STEAL_2--}$content[points]{--BEG_UID_STEAL_3--}
-
{%message,BEG_CLICKS,$content[clicks]%}
-
{--BEG_THANKS_FOR_CLICK--}
-
+
+ {--BEG_UID_STEAL_1--}$content[userid]{--BEG_UID_STEAL_2--}$content[points]{--BEG_UID_STEAL_3--} +
+ +
+ {%message,BEG_CLICKS=$content[clicks]%} +
+ +
+ {--BEG_THANKS_FOR_CLICK--} +
diff --git a/templates/de/html/beg/beg_failed.tpl b/templates/de/html/beg/beg_failed.tpl index 4e1026e71c..a5d387f884 100644 --- a/templates/de/html/beg/beg_failed.tpl +++ b/templates/de/html/beg/beg_failed.tpl @@ -1,9 +1,11 @@ - - - - -
-
{--BEG_SORRY_ANOTHER_WAS_HERE_1--}$content[userid]{--BEG_SORRY_ANOTHER_WAS_HERE_2--}$content[points]{--BEG_SORRY_ANOTHER_WAS_HERE_3--}
-
{%message,BEG_CLICKS,$content[clicks]%}
-
{--BEG_THANKS_FOR_CLICK_AGAIN--}
-
+
+ {--BEG_SORRY_ANOTHER_WAS_HERE_1--}$content[userid]{--BEG_SORRY_ANOTHER_WAS_HERE_2--}$content[points]{--BEG_SORRY_ANOTHER_WAS_HERE_3--} +
+ +
+ {%message,BEG_CLICKS=$content[clicks]%} +
+ +
+ {--BEG_THANKS_FOR_CLICK_AGAIN--} +
diff --git a/templates/de/html/beg/beg_link.tpl b/templates/de/html/beg/beg_link.tpl index d7fe78f14d..17850721a2 100644 --- a/templates/de/html/beg/beg_link.tpl +++ b/templates/de/html/beg/beg_link.tpl @@ -15,7 +15,7 @@
- {%message,BEG_LINK_USERID,$content[userid]%} + {%message,BEG_LINK_USERID=$content[userid]%}
- - - -
-
{--BEG_SORRY_YOURE_LOGGED_IN_1--}$content[userid]{--BEG_SORRY_YOURE_LOGGED_IN_2--}$content[points]{--BEG_SORRY_YOURE_LOGGED_IN_3--}
-
{%message,BEG_CLICKS,$content[clicks]%}
-
{--BEG_THANKS_FOR_CLICK_AGAIN--}
-
+
+ {--BEG_SORRY_YOURE_LOGGED_IN_1--}$content[userid]{--BEG_SORRY_YOURE_LOGGED_IN_2--}$content[points]{--BEG_SORRY_YOURE_LOGGED_IN_3--} +
+ +
+ {%message,BEG_CLICKS=$content[clicks]%} +
+ +
+ {--BEG_THANKS_FOR_CLICK_AGAIN--} +
diff --git a/templates/de/html/birthday/birthday_msg.tpl b/templates/de/html/birthday/birthday_msg.tpl index 1674a4dc25..2f606ca6eb 100644 --- a/templates/de/html/birthday/birthday_msg.tpl +++ b/templates/de/html/birthday/birthday_msg.tpl @@ -3,12 +3,12 @@
- Hallo $content[gender] $content[surname] $content[family]! + Hallo {%pipe,translateGender=$content[gender]%} $content[surname] $content[family]!
Wir das Team von {?MAIN_TITLE?} wüschen Ihnen alles Gute und Gesundheit zum Geburtstag. Als kleines Geschenk von uns haben - wir Ihnen soeben $content[points] {?POINTS?} Ihrem + wir Ihnen soeben {%pipe,translateComma=$content[points]%} {?POINTS?} Ihrem Account gutgeschrieben!
diff --git a/templates/de/html/doubler/doubler_index.tpl b/templates/de/html/doubler/doubler_index.tpl index fce4115973..3a2eed4e0c 100644 --- a/templates/de/html/doubler/doubler_index.tpl +++ b/templates/de/html/doubler/doubler_index.tpl @@ -51,7 +51,7 @@

- {%message,DOUBLER_ALREADY_PAYED,$content[total]%}
+ {%message,DOUBLER_ALREADY_PAYED=$content[total]%}
{--DOUBLER_POINTS_LEFT_1--} $content[left] {?POINTS?} {--DOUBLER_POINTS_LEFT_2--}
{--DOUBLER_USAGE_COUNTER_1--} {?doubler_counter?} {--DOUBLER_USAGE_COUNTER_2--}

diff --git a/templates/de/html/guest/guest_beg.tpl b/templates/de/html/guest/guest_beg.tpl index e4c56b657a..a38eb5c8f9 100644 --- a/templates/de/html/guest/guest_beg.tpl +++ b/templates/de/html/guest/guest_beg.tpl @@ -10,7 +10,7 @@ {--BEG_GUEST_EARN_3--}
- {%message,BEG_GUEST_TIMEOUT,$content[timeout]%} + {%message,BEG_GUEST_TIMEOUT=$content[timeout]%}
{--BEG_GUEST_HAVE_FUN--} diff --git a/templates/de/html/guest/guest_doubler.tpl b/templates/de/html/guest/guest_doubler.tpl index d0a2ef7405..ffc804db4a 100644 --- a/templates/de/html/guest/guest_doubler.tpl +++ b/templates/de/html/guest/guest_doubler.tpl @@ -9,7 +9,7 @@