From 27272fdaa3ad8895e6b55ec77658ad5c1f80e89c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Thu, 22 Jul 2010 14:39:01 +0000 Subject: [PATCH] Numerous ext-sponsor fixes and HTML rewrites (sorry for lame description) --- .gitattributes | 2 + DOCS/TODOs.txt | 3 +- doubler.php | 6 +-- inc/extensions/ext-mediadata.php | 4 +- inc/extensions/ext-mydata.php | 8 ++-- inc/extensions/ext-refback.php | 2 +- inc/extensions/ext-sponsor.php | 12 ++--- inc/install-inc.php | 7 +-- inc/language/payout_de.php | 2 +- inc/language/sponsor_de.php | 4 +- inc/libs/register_functions.php | 48 +++++++++---------- inc/libs/sponsor_functions.php | 10 ++-- inc/modules/admin.php | 14 +++--- inc/modules/admin/admin-inc.php | 4 +- inc/modules/admin/what-add_sponsor.php | 4 +- inc/modules/admin/what-config_primera.php | 6 +-- inc/modules/admin/what-edit_sponsor.php | 2 +- inc/modules/admin/what-extensions.php | 16 ++++--- inc/modules/admin/what-list_sponsor.php | 22 ++++----- inc/modules/admin/what-unlock_sponsor.php | 5 +- inc/modules/guest/what-sponsor_infos.php | 6 +-- inc/modules/guest/what-sponsor_login.php | 17 +++++-- inc/modules/guest/what-sponsor_reg.php | 27 ++++++----- inc/modules/member/what-mydata.php | 2 +- inc/modules/member/what-payout.php | 2 +- inc/template-functions.php | 6 +-- templates/de/emails/register-member.tpl | 2 +- .../html/admin/admin_add_sponsor_paytype.tpl | 21 ++++---- .../de/html/admin/admin_config_primera.tpl | 2 +- .../de/html/admin/admin_list_sponsor_row.tpl | 3 +- templates/de/html/admin/admin_login_form.tpl | 2 +- templates/de/html/doubler/doubler_index.tpl | 2 +- .../de/html/guest/guest_sponsor_infos.tpl | 8 ++-- .../guest/guest_sponsor_infos_none_row.tpl | 2 +- .../de/html/guest/guest_sponsor_login.tpl | 4 +- .../de/html/guest/guest_sponsor_payment.tpl | 10 ++++ .../html/guest/guest_sponsor_payment_row.tpl | 4 +- templates/de/html/guest/guest_sponsor_reg.tpl | 32 ++++++------- .../de/html/member/member_payout_form.tpl | 2 +- .../html/menu/menu_guest_advert_sponsor.tpl | 6 +++ 40 files changed, 185 insertions(+), 156 deletions(-) create mode 100644 templates/de/html/guest/guest_sponsor_payment.tpl create mode 100644 templates/de/html/menu/menu_guest_advert_sponsor.tpl diff --git a/.gitattributes b/.gitattributes index 5f9de8ded5..26103286d6 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1481,6 +1481,7 @@ templates/de/html/guest/guest_sponsor_infos_none_row.tpl -text svneol=unset#text templates/de/html/guest/guest_sponsor_login.tpl -text svneol=unset#text/plain templates/de/html/guest/guest_sponsor_lost.tpl -text svneol=unset#text/plain templates/de/html/guest/guest_sponsor_pay_row.tpl -text svneol=unset#text/plain +templates/de/html/guest/guest_sponsor_payment.tpl svneol=native#text/plain templates/de/html/guest/guest_sponsor_payment_row.tpl -text svneol=unset#text/plain templates/de/html/guest/guest_sponsor_reg.tpl -text svneol=unset#text/plain templates/de/html/guest/guest_stats_cats_row.tpl -text svneol=unset#text/plain @@ -1667,6 +1668,7 @@ templates/de/html/menu/menu_guest_advert_end.tpl -text svneol=unset#text/plain templates/de/html/menu/menu_guest_advert_main.tpl -text svneol=unset#text/plain templates/de/html/menu/menu_guest_advert_members.tpl -text svneol=unset#text/plain templates/de/html/menu/menu_guest_advert_online.tpl -text svneol=unset#text/plain +templates/de/html/menu/menu_guest_advert_sponsor.tpl -text svneol=unset#text/plain templates/de/html/menu/menu_member_advert_account.tpl -text svneol=unset#text/plain templates/de/html/menu/menu_member_advert_bank.tpl -text svneol=unset#text/plain templates/de/html/menu/menu_member_advert_end.tpl -text svneol=unset#text/plain diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt index 02d154db50..279a03b186 100644 --- a/DOCS/TODOs.txt +++ b/DOCS/TODOs.txt @@ -117,7 +117,7 @@ ./inc/modules/admin/what-del_email.php:61: // @TODO Unused: cat_id, payment_id ./inc/modules/admin/what-edit_user.php:20: * @TODO Add support for ext-country * ./inc/modules/admin/what-email_stats.php:48:// @TODO Unused at the moment -./inc/modules/admin/what-extensions.php:364: // @TODO Rewrite this to a filter +./inc/modules/admin/what-extensions.php:368: // @TODO Rewrite this to a filter ./inc/modules/admin/what-guest_add.php:131: // @TODO This can be somehow rewritten to a function ./inc/modules/admin/what-guest_add.php:69: // @TODO Cant this be rewritten? ./inc/modules/admin/what-guest_add.php:82: // @TODO This can be somehow rewritten to a function @@ -150,7 +150,6 @@ ./inc/modules/guest/what-mediadata.php:183:// @TODO Rewrite all these if-blocks to filters ./inc/modules/guest/what-mediadata.php:70: // @TODO Find a better formular than this one ./inc/modules/guest/what-rallyes.php:91: // @TODO Reactivate this: $content['admin'] = '' . $login . ''; -./inc/modules/guest/what-sponsor_reg.php:290: // @TODO Swap this HTML code to templates ./inc/modules/guest/what-stats.php:116: // @TODO This can be somehow rewritten ./inc/modules/guest/what-stats.php:76:// @TODO This can be rewritten in a dynamic include ./inc/modules/member/what-beg.php:56:// @TODO Can't this be moved into EL? diff --git a/doubler.php b/doubler.php index 9511fb3332..76e1648553 100644 --- a/doubler.php +++ b/doubler.php @@ -67,7 +67,7 @@ if (isFormSent()) { setPostRequestParameter('points', bigintval(postRequestParameter('points'))); // Begin with doubling process - if ((isPostRequestParameterSet('userid')) && (isPostRequestParameterSet('pass')) && (isPostRequestParameterSet('points'))) { + if ((isPostRequestParameterSet('userid')) && (isPostRequestParameterSet('password')) && (isPostRequestParameterSet('points'))) { // Probe for nickname extension and if a nickname was entered if (isNickNameUsed(postRequestParameter('userid'))) { // Nickname in URL, so load the id @@ -90,7 +90,7 @@ if (isFormSent()) { $probe_points = ((postRequestParameter('points') >= getConfig('doubler_min')) && (postRequestParameter('points') <= getConfig('doubler_max'))); // Check all together - if ((isUserDataValid()) && (getUserData('password') == generateHash(postRequestParameter('pass'), substr(getUserData('password'), 0, -40))) && (getUserData('status') == 'CONFIRMED') && ($probe_points)) { + if ((isUserDataValid()) && (getUserData('password') == generateHash(postRequestParameter('password'), substr(getUserData('password'), 0, -40))) && (getUserData('status') == 'CONFIRMED') && ($probe_points)) { // Nickname resolved to a unique userid or direct userid entered by the member $GLOBALS['local_doubler_userid'] = getUserData('userid'); @@ -162,7 +162,7 @@ if (isFormSent()) { } elseif (!isPostRequestParameterSet('userid')) { // Login not entered $content['message'] = '{--DOUBLER_FORM_404_LOGIN--}'; - } elseif (!isPostRequestParameterSet('pass')) { + } elseif (!isPostRequestParameterSet('password')) { // Password not entered $content['message'] = '{--DOUBLER_FORM_404_PASSWORD--}'; } elseif (!isPostRequestParameterSet('points')) { diff --git a/inc/extensions/ext-mediadata.php b/inc/extensions/ext-mediadata.php index 176ca4a0fd..24cfd05a38 100644 --- a/inc/extensions/ext-mediadata.php +++ b/inc/extensions/ext-mediadata.php @@ -74,12 +74,12 @@ switch (getExtensionMode()) { case 'activate': // Do stuff when admin activates this extension // SQL commands to run - addExtensionSql(''); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='Y', `locked`='N' WHERE `what`='mediadata' LIMIT 1"); break; case 'deactivate': // Do stuff when admin deactivates this extension // SQL commands to run - addExtensionSql(''); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='N', `locked`='Y' WHERE `what`='mediadata' LIMIT 1"); break; case 'update': // Update an extension diff --git a/inc/extensions/ext-mydata.php b/inc/extensions/ext-mydata.php index 5dc3ccf8a9..7fbd4e1468 100644 --- a/inc/extensions/ext-mydata.php +++ b/inc/extensions/ext-mydata.php @@ -61,12 +61,12 @@ switch (getExtensionMode()) { case 'activate': // Do stuff when admin activates this extension // SQL commands to run - addExtensionSql(''); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y', `locked`='N' WHERE `what`='mydata' LIMIT 1"); break; case 'deactivate': // Do stuff when admin deactivates this extension // SQL commands to run - addExtensionSql(''); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='N', `locked`='Y' WHERE `what`='mydata' LIMIT 1"); break; case 'update': // Update an extension @@ -160,7 +160,7 @@ switch (getExtensionMode()) { // Update notes (these will be set as task text!) setExtensionUpdateNotes("Fehlerhinweis bei deaktivierter Erweiterung verbessert."); break; - } + } // END - switch break; case 'modify': // When the extension got modified @@ -175,7 +175,7 @@ switch (getExtensionMode()) { default: // Unknown extension mode logDebugMessage(__FILE__, __LINE__, sprintf("Unknown extension mode %s in extension %s detected.", getExtensionMode(), getCurrentExtensionName())); break; -} +} // END - switch // [EOF] ?> diff --git a/inc/extensions/ext-refback.php b/inc/extensions/ext-refback.php index f067d642af..a31b59fbf6 100644 --- a/inc/extensions/ext-refback.php +++ b/inc/extensions/ext-refback.php @@ -94,7 +94,7 @@ KEY (`refid`) addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD `refback_enabled` ENUM('Y','N') NOT NULL DEFAULT 'Y'"); addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD `refback_min_perc` TINYINT(3) NOT NULL DEFAULT 0"); addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD `refback_max_perc` TINYINT(3) NOT NULL DEFAULT 100"); - addAdminMenuSql('setup','config_refback','Refback','Ändern Sie Einstellungen zum Refback, wie z.B. Minium- und Maximum-Prozente, was die Mitglieder einstellen dürfen.',15); + addAdminMenuSql('setup','config_refback','Refback','Ändern Sie Einstellungen zum Refback, wie z.B. Minimum- und Maximum-Prozente, was die Mitglieder einstellen dürfen.',15); addAdminMenuSql('user','list_refback','Refback auflisten','Refback aller Mitglieder auflisten.',15); // Update notes (these will be set as task text!) diff --git a/inc/extensions/ext-sponsor.php b/inc/extensions/ext-sponsor.php index fb45c08693..d13faf9373 100644 --- a/inc/extensions/ext-sponsor.php +++ b/inc/extensions/ext-sponsor.php @@ -396,18 +396,18 @@ PRIMARY KEY (`id`) case 'activate': // Do stuff when admin activates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='Y', `locked`='N' WHERE `action`='sponsor' LIMIT 4"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='Y', `locked`='N' WHERE `action`='sponsor'"); addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y', `locked`='N' WHERE `what`='sponsor' LIMIT 1"); - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_sponsor_menu` SET active='Y' WHERE active='N'"); - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_sponsor_registry` SET is_active='Y' WHERE is_active='N'"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_sponsor_menu` SET `active`='Y' WHERE active='N'"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_sponsor_registry` SET `is_active`='Y' WHERE `is_active`='N'"); break; case 'deactivate': // Do stuff when admin deactivates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='N', `locked`='Y' WHERE `action`='sponsor' LIMIT 4"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='N', `locked`='Y' WHERE `action`='sponsor'"); addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='N', `locked`='Y' WHERE `what`='sponsor' LIMIT 1"); - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_sponsor_menu` SET active='N' WHERE active='Y'"); - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_sponsor_registry` SET is_active='N' WHERE is_active='Y'"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_sponsor_menu` SET `active`='N' WHERE `active`='Y'"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_sponsor_registry` SET `is_active`='N' WHERE `is_active`='Y'"); break; case 'update': // Update an extension diff --git a/inc/install-inc.php b/inc/install-inc.php index 416c0c39b5..c65b742c04 100644 --- a/inc/install-inc.php +++ b/inc/install-inc.php @@ -101,12 +101,13 @@ if ((!isInstalled()) || (!isAdminRegistered())) { if (empty($GLOBALS['install_mysql']['prefix'])) $GLOBALS['install_mysql']['prefix'] = 'mxchange'; if (empty($GLOBALS['install_mysql']['type'])) $GLOBALS['install_mysql']['type'] = 'MyISAM'; if (ifFatalErrorsDetected()) { - addToInstallContent('
'); + addToInstallContent('
    '); foreach (getFatalArray() as $key => $err) { - addToInstallContent('
    · {--FATAL_NO--}' . ($key + 1) . ': ' . $err . '
    '); + addToInstallContent('
  • {--FATAL_NO--}' . ($key + 1) . ': ' . $err . '
    • '); } // END - foreach - addToInstallContent('
'); + addToInstallContent('
'); } // END - if + $content['mysql_host'] = $GLOBALS['install_mysql']['host']; $content['mysql_dbase'] = $GLOBALS['install_mysql']['dbase']; $content['mysql_prefix'] = $GLOBALS['install_mysql']['prefix']; diff --git a/inc/language/payout_de.php b/inc/language/payout_de.php index 5d676f8998..45a5b2bae3 100644 --- a/inc/language/payout_de.php +++ b/inc/language/payout_de.php @@ -63,7 +63,7 @@ addMessages(array( 'ADMIN_PAYOUT_NO_MEMBER_REQUESTS' => "Keine Auszahlungsanfragen von Ihren Mitgliedern erhalten.", 'ADMIN_PAYOUT_ENTRIES_CHANGED' => "Einträge wurden geändert.", 'ADMIN_PAYOUT_ENTRIES_DELETED' => "Einträge wurden gelölscht.", - 'ADMIN_PAYOUT_MIN_POINTS' => "Minium {?POINTS?}-Guthaben", + 'ADMIN_PAYOUT_MIN_POINTS' => "Minimum {?POINTS?}-Guthaben", 'ADMIN_PAYOUT_MIN_POINTS2' => "Min. {?POINTS?}", 'ADMIN_PAYOUT_YOUR_ACCOUNT' => "Ihre Account-Id", 'ADMIN_PAYOUT_YOUR_PASSWORD' => "Passwort", diff --git a/inc/language/sponsor_de.php b/inc/language/sponsor_de.php index 9a13d4fd2a..e46519d769 100644 --- a/inc/language/sponsor_de.php +++ b/inc/language/sponsor_de.php @@ -145,7 +145,7 @@ addMessages(array( 'SPONSOR_PAYTYPE_NAME_HINT' => "(max. 255 Zeichen)", 'SPONSOR_PAYTYPE_RATE' => "Umrechnungsrate", 'SPONSOR_PAYTYPE_RATE_HINT' => "(z.B. 1 € = x {?POINTS?})", - 'SPONSOR_PAYTYPE_MIN_COUNT' => "Bestellmenge", + 'SPONSOR_PAYTYPE_MIN_COUNT' => "Minimum Bestellmenge", 'SPONSOR_PAYTYPE_CURRENCY' => "Währung", 'SPONSOR_ADD_PAYTYPES_NOTES' => "Hinweise zu den Buchungspaketen", 'SPONSOR_PAYTYPE_NAME_NOTE' => "Geben Sie eine passende Bezeichnung zum Buchungspaket ein (z.B. Spar-Paket)", @@ -155,7 +155,7 @@ addMessages(array( 'ADMIN_SPONSOR_PAYTYPE_ALREADY' => "Buchungspaket %s bereits eingerichtet.", 'ADMIN_SPONSOR_PAYTYPE_ADDED' => "Buchungspaket %s hinzugefügt.", 'SPONSOR_LIST_PAYMENT_TYPES_TITLE' => "Buchungspakete auflisten, bearbeiten und löschen", - 'SPONSOR_PAYTYPE_MIN_COUNT2' => "Minium", + 'SPONSOR_PAYTYPE_MIN_COUNT2' => "Minimum", 'ADMIN_SPONSOR_PAYTYPE_EDIT' => "Bearbeiten", 'ADMIN_SPONSOR_PAYTYPE_DELETE' => "Löschen", 'SPONSOR_EDIT_PAY_ENTRIES' => "Buchungspakete editieren", diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php index 36fa9eb37e..c13b24a1a9 100644 --- a/inc/libs/register_functions.php +++ b/inc/libs/register_functions.php @@ -388,34 +388,34 @@ function doRegistration () { // Prepare data array for the email template // Start with the gender... $content = array( - 'hash' => $hash, - 'userid' => $userid, - 'gender' => SQL_ESCAPE(postRequestParameter('gender')), - 'surname' => SQL_ESCAPE(postRequestParameter('surname')), - 'family' => SQL_ESCAPE(postRequestParameter('family')), - 'email' => SQL_ESCAPE(postRequestParameter('email')), - 'street' => SQL_ESCAPE(postRequestParameter('street_nr')), - 'city' => SQL_ESCAPE(postRequestParameter('city')), - 'zip' => bigintval(postRequestParameter('zip')), - 'country' => $countryData, - 'refid' => SQL_ESCAPE(postRequestParameter('refid')), - 'pass' => SQL_ESCAPE(postRequestParameter('pass1')), + 'hash' => $hash, + 'userid' => $userid, + 'gender' => SQL_ESCAPE(postRequestParameter('gender')), + 'surname' => SQL_ESCAPE(postRequestParameter('surname')), + 'family' => SQL_ESCAPE(postRequestParameter('family')), + 'email' => SQL_ESCAPE(postRequestParameter('email')), + 'street' => SQL_ESCAPE(postRequestParameter('street_nr')), + 'city' => SQL_ESCAPE(postRequestParameter('city')), + 'zip' => bigintval(postRequestParameter('zip')), + 'country' => $countryData, + 'refid' => SQL_ESCAPE(postRequestParameter('refid')), + 'password' => SQL_ESCAPE(postRequestParameter('pass1')), ); } else { // No ZIP code entered $content = array( - 'hash' => $hash, - 'userid' => $userid, - 'gender' => SQL_ESCAPE(postRequestParameter('gender')), - 'surname' => SQL_ESCAPE(postRequestParameter('surname')), - 'family' => SQL_ESCAPE(postRequestParameter('family')), - 'email' => SQL_ESCAPE(postRequestParameter('email')), - 'street' => SQL_ESCAPE(postRequestParameter('street_nr')), - 'city' => SQL_ESCAPE(postRequestParameter('city')), - 'zip' => '', - 'country' => $countryData, - 'refid' => SQL_ESCAPE(postRequestParameter('refid')), - 'pass' => SQL_ESCAPE(postRequestParameter('pass1')), + 'hash' => $hash, + 'userid' => $userid, + 'gender' => SQL_ESCAPE(postRequestParameter('gender')), + 'surname' => SQL_ESCAPE(postRequestParameter('surname')), + 'family' => SQL_ESCAPE(postRequestParameter('family')), + 'email' => SQL_ESCAPE(postRequestParameter('email')), + 'street' => SQL_ESCAPE(postRequestParameter('street_nr')), + 'city' => SQL_ESCAPE(postRequestParameter('city')), + 'zip' => '', + 'country' => $countryData, + 'refid' => SQL_ESCAPE(postRequestParameter('refid')), + 'password' => SQL_ESCAPE(postRequestParameter('pass1')), ); } diff --git a/inc/libs/sponsor_functions.php b/inc/libs/sponsor_functions.php index e1d3f99d83..b4e78c2ae7 100644 --- a/inc/libs/sponsor_functions.php +++ b/inc/libs/sponsor_functions.php @@ -43,7 +43,7 @@ if (!defined('__SECURITY')) { } // -function handlSponsorRequest (&$postData, $update=false, $messageArray=array(), $RET_STATUS=false) { +function handleSponsorRequest ($postData, $update=false, $messageArray=array(), $RET_STATUS=false) { // Init a lot variables $SAVE = true; $UPDATE = false; @@ -216,16 +216,16 @@ function handlSponsorRequest (&$postData, $update=false, $messageArray=array(), // function sponsorTranslateUserStatus ($status) { // Construct constant name - $constantName = sprintf("ACCOUNT_%s", $status); + $constantName = sprintf("ACCOUNT_STATUS_%s", $status); // Is the constant there? - if (defined($constantName)) { + if (isMessageIdValid($constantName)) { // Then use it - $ret = constant($constantName); + $ret = getMessage($constantName); } else { // Not found! logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unknown status %s detected.", $status)); - $ret = getMaskedMessage('UNKNOWN_STATUS', $status); + $ret = getMaskedMessage('ACCOUNT_STATUS_UNKNOWN_STATUS', $status); } return $ret; } diff --git a/inc/modules/admin.php b/inc/modules/admin.php index dae1e4cdfe..ffb9c69fdd 100644 --- a/inc/modules/admin.php +++ b/inc/modules/admin.php @@ -217,13 +217,13 @@ if (!isAdminRegistered()) { } // END - if // Check if the admin has submitted data or not - if ((isFormSent()) && ((!isPostRequestParameterSet('login')) || (!isPostRequestParameterSet('pass')) || (strlen(postRequestParameter('pass')) < 4))) { + if ((isFormSent()) && ((!isPostRequestParameterSet('login')) || (!isPostRequestParameterSet('password')) || (strlen(postRequestParameter('password')) < 4))) { setPostRequestParameter('ok', '***'); } // END - if if ((isFormSent()) && (postRequestParameter('ok') != '***')) { // All required data was entered so we check his account - $ret = ifAdminLoginDataIsValid(postRequestParameter('login'), postRequestParameter('pass')); + $ret = ifAdminLoginDataIsValid(postRequestParameter('login'), postRequestParameter('password')); // Which status do we have? switch ($ret) { @@ -251,7 +251,7 @@ if (!isAdminRegistered()) { destroyAdminSession(); break; - case 'pass': // Wrong password + case 'password': // Wrong password setPostRequestParameter('ok', $ret); $ret = '{--WRONG_PASS--} [{--ADMIN_RESET_PASS--}]'; destroyAdminSession(); @@ -285,13 +285,13 @@ if (!isAdminRegistered()) { if ((!empty($ret)) && (postRequestParameter('ok') == '404')) $loginMessage = $ret; // No password entered? - if (!isPostRequestParameterSet('pass')) $passwdMessage = '{--ADMIN_NO_PASS--}'; + if (!isPostRequestParameterSet('password')) $passwdMessage = '{--ADMIN_NO_PASS--}'; // Or password too short? - if (strlen(postRequestParameter('pass')) < 4) $passwdMessage = '{--ADMIN_SHORT_PASS--}'; + if (strlen(postRequestParameter('password')) < 4) $passwdMessage = '{--ADMIN_SHORT_PASS--}'; // An error comes back from login? - if ((!empty($ret)) && (postRequestParameter('ok') == 'pass')) $passwdMessage = $ret; + if ((!empty($ret)) && (postRequestParameter('ok') == 'password')) $passwdMessage = $ret; // Load message template $content['login_message'] = loadTemplate('admin_login_msg', true, $loginMessage); @@ -393,7 +393,7 @@ if (!isAdminRegistered()) { destroyAdminSession(); break; - case 'pass': // Wrong password + case 'password': // Wrong password setPostRequestParameter('ok', $ret); loadTemplate('admin_settings_saved', false, '{--WRONG_PASS--}'); destroyAdminSession(); diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php index c457b8489e..0b483d1c7f 100644 --- a/inc/modules/admin/admin-inc.php +++ b/inc/modules/admin/admin-inc.php @@ -99,7 +99,7 @@ function ifAdminLoginDataIsValid ($adminLogin, $adminPassword) { $ret = 'done'; } else { // Set status - $ret = 'pass'; + $ret = 'password'; } } // END - if } // END - if @@ -139,7 +139,7 @@ function ifAdminCookiesAreValid ($adminLogin, $passHash) { $ret = 'done'; } else { // Set status - $ret = 'pass'; + $ret = 'password'; } } // END - if diff --git a/inc/modules/admin/what-add_sponsor.php b/inc/modules/admin/what-add_sponsor.php index de2d23cd0c..bc1fc7e25a 100644 --- a/inc/modules/admin/what-add_sponsor.php +++ b/inc/modules/admin/what-add_sponsor.php @@ -40,14 +40,14 @@ // Some security stuff... if ((!defined('__SECURITY')) || (!isAdmin())) { die(); -} +} // END - if // Add description as navigation point addMenuDescription('admin', __FILE__); if (isFormSent()) { // Save sponsor in database - handlSponsorRequest(postRequestArray()); + handleSponsorRequest(postRequestArray()); } else { // Output form loadTemplate('admin_add_sponsor'); diff --git a/inc/modules/admin/what-config_primera.php b/inc/modules/admin/what-config_primera.php index 32ef9cf40f..816f60dfda 100644 --- a/inc/modules/admin/what-config_primera.php +++ b/inc/modules/admin/what-config_primera.php @@ -50,10 +50,10 @@ if (isFormSent()) { mergeConfig(postRequestArray()); // Is the password set? - if (isPostRequestParameterSet('pass')) { + if (isPostRequestParameterSet('password')) { // Then hash and remove it - setPostRequestParameter('primera_api_md5', md5(postRequestParameter('pass'))); - unsetPostRequestParameter('pass'); + setPostRequestParameter('primera_api_md5', md5(postRequestParameter('password'))); + unsetPostRequestParameter('password'); } // END - if // Let's test the API first (hold your horses here, cowboy! Thank you. :) ) diff --git a/inc/modules/admin/what-edit_sponsor.php b/inc/modules/admin/what-edit_sponsor.php index c6a793cd2e..88625c21ba 100644 --- a/inc/modules/admin/what-edit_sponsor.php +++ b/inc/modules/admin/what-edit_sponsor.php @@ -146,7 +146,7 @@ LIMIT 1", convertSelectionsToTimestamp(postRequestArray(), $DATA, $id, $skip); // Save the sponsor - handlSponsorRequest(postRequestArray()); + handleSponsorRequest(postRequestArray()); // Convert some data for the email template postRequestParameter('gender' , translateGender(postRequestParameter('gender'))); diff --git a/inc/modules/admin/what-extensions.php b/inc/modules/admin/what-extensions.php index b3cc40546d..3188fea46e 100644 --- a/inc/modules/admin/what-extensions.php +++ b/inc/modules/admin/what-extensions.php @@ -56,22 +56,26 @@ if (isGetRequestParameterSet('reg_ext')) { // The id comes from task management and it is - of course - *not* the extension's name! } elseif ((isFormSent('change')) && (ifPostContainsSelections()) && (!isDemoModeActive())) { // De-/activate extensions - foreach (postRequestParameter('sel') as $taskId => $active) { + foreach (postRequestParameter('sel') as $taskId => $ext_active) { // Shall we keep the extension always active? - if ((isset($GLOBALS['cache_array']['always_active'][getExtensionName($taskId)])) && ($GLOBALS['cache_array']['always_active'][getExtensionName($taskId)] == 'Y') && ($active == 'Y')) { + if ((isset($GLOBALS['cache_array']['always_active'][getExtensionName($taskId)])) && ($GLOBALS['cache_array']['always_active'][getExtensionName($taskId)] == 'Y') && ($ext_active == 'Y')) { // Keep this extension active! loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_EXTENSION_ALWAYS_ACTIVE', getExtensionName($taskId))); } else { - // De/activate extension - $active = 'N'; setExtensionMode('deactivate'); - if ($active != 'Y') { + // Deactivation is default + $active = 'N'; + setExtensionMode('deactivate'); + + // Is the extension deactivated? + if ($ext_active != 'Y') { + // Then we can activate it $active = 'Y'; setExtensionMode('activate'); } // END - if // Update database SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_extensions` SET `ext_active`='%s' WHERE `id`=%s AND `ext_active`='%s' LIMIT 1", - array($active, bigintval($taskId), $active), __FILE__, __LINE__); + array($active, bigintval($taskId), $ext_active), __FILE__, __LINE__); // Run embeded SQL commands doExtensionSqls($taskId, getExtensionMode()); diff --git a/inc/modules/admin/what-list_sponsor.php b/inc/modules/admin/what-list_sponsor.php index b840333adb..86e1357a62 100644 --- a/inc/modules/admin/what-list_sponsor.php +++ b/inc/modules/admin/what-list_sponsor.php @@ -61,11 +61,10 @@ WHERE if (SQL_NUMROWS($result) == 1) { // Load sponsor details $content = SQL_FETCHARRAY($result); - SQL_FREERESULT($result); // Check if an entry is empty foreach ($content as $k => $v) { - if (empty($v)) $content[$k] = '---'; + if ((empty($v)) && ($v != 0)) $content[$k] = '---'; } // END - foreach // Prepare all data for the template @@ -86,6 +85,9 @@ WHERE // Sponsor not found loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_SPONSOR_404', bigintval(getRequestParameter('id')))); } + + // Free result + SQL_FREERESULT($result); } elseif (isGetRequestParameterSet('refid')) { // Search for sponsor $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_sponsor_data` WHERE `id`='%s' LIMIT 1", @@ -134,18 +136,10 @@ ORDER BY $OUT = ''; while ($content = SQL_FETCHARRAY($result_main)) { // Transfer data to array - $content = array( - 'id' => $content['id'], - 'gender' => $content['gender'], - 'surname' => $content['surname'], - 'family' => $content['family'], - 'email' => generateEmailLink($content['email'], 'sponsor_data'), - 'status' => $content['status'], - 'sponsor_created' => generateDateTime($content['sponsor_created'], 2), - 'last_online' => generateDateTime($content['last_online'], 2), - 'points' => ($content['points_amount'] - $content['points_used']), - 'remote_addr' => $content['remote_addr'], - ); + $content['email'] = generateEmailLink($content['email'], 'sponsor_data'); + $content['sponsor_created'] = generateDateTime($content['sponsor_created'], 2); + $content['last_online'] = generateDateTime($content['last_online'], 2); + $content['points'] = ($content['points_amount'] - $content['points_used']); // Load row template $OUT .= loadTemplate('admin_list_sponsor_row', true, $content); diff --git a/inc/modules/admin/what-unlock_sponsor.php b/inc/modules/admin/what-unlock_sponsor.php index 55735a498b..d91a05ba8d 100644 --- a/inc/modules/admin/what-unlock_sponsor.php +++ b/inc/modules/admin/what-unlock_sponsor.php @@ -173,9 +173,6 @@ LIMIT 1", } // END - if } // END - if - // Transfer data to array - $content['points'] = translateComma($content['points_amount']); - // So let's send the email away $message = loadEmailTemplate('sponsor_unlocked', $content); sendEmail($content['email'], '{--SPONSOR_UNLOCKED_SUBJECT--}', $message); @@ -192,7 +189,7 @@ $result = SQL_QUERY("SELECT FROM `{?_MYSQL_PREFIX?}_sponsor_data` WHERE - `status`='PENDING' + `status`='PENDING' OR `status`='UNCONFIRMED' ORDER BY `id`", __FILE__, __LINE__); diff --git a/inc/modules/guest/what-sponsor_infos.php b/inc/modules/guest/what-sponsor_infos.php index d2060c5357..8f38abf658 100644 --- a/inc/modules/guest/what-sponsor_infos.php +++ b/inc/modules/guest/what-sponsor_infos.php @@ -92,12 +92,12 @@ if (!SQL_HASZERONUMS($result_act)) { } // END - while } else { // No pay types setuped so far! - $OUT_PAY = loadTemplate('guest_sponsor_infos_none_row', loadTemplate('admin_settings_saved', true, '{--SPONSOR_NO_ACTIONS_ACTIVATED--}')); + $OUT_PAY = loadTemplate('guest_sponsor_infos_none_row', false, loadTemplate('admin_settings_saved', true, '{--SPONSOR_NO_ACTIONS_ACTIVATED--}')); } } else { // No actions activated so far! - $OUT_ACT = loadTemplate('guest_sponsor_infos_none_row', loadTemplate('admin_settings_saved', true, '{--SPONSOR_NO_ACTIONS_ACTIVATED--}')); - $OUT_PAY = loadTemplate('guest_sponsor_infos_none_row', loadTemplate('admin_settings_saved', true, '{--SPONSOR_NO_ACTIONS_ACTIVATED--}')); + $OUT_ACT = loadTemplate('guest_sponsor_infos_none_row', true, loadTemplate('admin_settings_saved', true, '{--SPONSOR_NO_ACTIONS_ACTIVATED--}')); + $OUT_PAY = loadTemplate('guest_sponsor_infos_none_row', true, loadTemplate('admin_settings_saved', true, '{--SPONSOR_NO_ACTIONS_ACTIVATED--}')); } // Free memory diff --git a/inc/modules/guest/what-sponsor_login.php b/inc/modules/guest/what-sponsor_login.php index 8bd46e44f8..f93c825652 100644 --- a/inc/modules/guest/what-sponsor_login.php +++ b/inc/modules/guest/what-sponsor_login.php @@ -240,9 +240,18 @@ LIMIT 1", } } elseif (isFormSent()) { // Check status and login data ... - $result = SQL_QUERY_ESC("SELECT status FROM `{?_MYSQL_PREFIX?}_sponsor_data` -WHERE `id`='%s' AND password='%s' LIMIT 1", - array(bigintval(postRequestParameter('sponsor_id')), md5(postRequestParameter('pass'))), __FILE__, __LINE__); + $result = SQL_QUERY_ESC("SELECT + `status` +FROM + `{?_MYSQL_PREFIX?}_sponsor_data` +WHERE + `id`=%s AND + `password`='%s' +LIMIT 1", + array( + bigintval(postRequestParameter('sponsor_id')), + md5(postRequestParameter('password')) + ), __FILE__, __LINE__); if (SQL_NUMROWS($result) == 1) { // Okay, first login data check passed, now has he/she an approved (CONFIRMED) account? @@ -250,7 +259,7 @@ WHERE `id`='%s' AND password='%s' LIMIT 1", if ($status == 'CONFIRMED') { // Is confirmed so both is fine and we can continue with login procedure $login = ((setSession('sponsor_id' , bigintval(postRequestParameter('sponsor_id')))) && - (setSession('sponsorpass', md5(postRequestParameter('pass')) )) + (setSession('sponsorpass', md5(postRequestParameter('password')) )) ); if ($login === true) { diff --git a/inc/modules/guest/what-sponsor_reg.php b/inc/modules/guest/what-sponsor_reg.php index ed92a13936..7e8f5c997b 100644 --- a/inc/modules/guest/what-sponsor_reg.php +++ b/inc/modules/guest/what-sponsor_reg.php @@ -207,9 +207,13 @@ if ((isFormSent()) && (count($FORM_ERRORS) == 0)) { ); // Calulate points - $result = SQL_QUERY_ESC("SELECT (`pay_rate` * `pay_min_count`) AS points, `pay_min_count` AS pay, `pay_currency` AS curr -FROM `{?_MYSQL_PREFIX?}_sponsor_paytypes` -WHERE `id`='%s' LIMIT 1", + $result = SQL_QUERY_ESC("SELECT + (`pay_rate` * `pay_min_count`) AS points, `pay_min_count` AS pay, `pay_currency` AS curr +FROM + `{?_MYSQL_PREFIX?}_sponsor_paytypes` +WHERE + `id`=%s +LIMIT 1", array(postRequestParameter('pay_type')), __FILE__, __LINE__); list($points, $pay, $curr) = SQL_FETCHROW($result); @@ -223,7 +227,7 @@ WHERE `id`='%s' LIMIT 1", postRequestParameter('last_curr' , $curr); // Register sponsor but never ever update here! - $STATUS = handlSponsorRequest(postRequestArray(), true, $messageArray, true); + $STATUS = handleSponsorRequest(postRequestArray(), true, $messageArray, true); // Check the status of the registration process switch ($STATUS) { @@ -241,7 +245,6 @@ WHERE `id`='%s' LIMIT 1", $content['email'] = secureString(postRequestParameter('email')); $content['surname'] = secureString(postRequestParameter('surname')); $content['family'] = secureString(postRequestParameter('family')); - $content['gender'] = translateGender(postRequestParameter('gender')); $content['timestamp'] = generateDateTime(time(), 0); $content['password'] = secureString(postRequestParameter('pass1')); @@ -284,32 +287,30 @@ WHERE `id`='%s' LIMIT 1", FROM `{?_MYSQL_PREFIX?}_sponsor_paytypes` ORDER BY - pay_name` ASC', __FILE__, __LINE__); + `pay_name` ASC', __FILE__, __LINE__); if (!SQL_HASZERONUMS($result)) { // Load all types... - // @TODO Swap this HTML code to templates - $OUT = ''; + $OUT = ''; while ($content = SQL_FETCHARRAY($result)) { // Prepare content for output $content['res'] = translateComma($content['pay_rate'] * $content['pay_min_count']); // Load row template and switch color - $OUT .= loadTemplate('guest_sponsor_payment_row', false, $content); + $OUT .= loadTemplate('guest_sponsor_payment_row', true, $content); } // END - while - $OUT .= '
'; // Remember the list in table - $content['payment_list'] = $OUT; + $content['payment_list'] = loadTemplate('guest_sponsor_payment', true, $OUT); // Init a lot array elements - foreach (array('company','position','tax_ident','gender_m','gender_f','gender_c','surname','family','street_nr1','street_nr2','country','zip','city','phone','fix','cell','email','url','receive_warnings_y','receive_warnings_n','form_errors','refid') as $entry) { + foreach (array('company','position','tax_ident','gender_m','gender_f','gender_c','surname','family','street_nr1','street_nr2','country','zip','city','phone','fax','cell','email','url','receive_warnings_y','receive_warnings_n','form_errors','refid') as $entry) { $content[$entry] = ''; } // END - foreach // Check for invalid entries if (count($FORM_ERRORS) > 0) { // Some found... :-( - foreach (array('company','position','tax_ident','surname','family','street_nr1','street_nr2','country','zip','city','phone','fix','cell','email','url') as $entry) { + foreach (array('company','position','tax_ident','surname','family','street_nr1','street_nr2','country','zip','city','phone','fax','cell','email','url') as $entry) { $content[$entry] = secureString(postRequestParameter($entry)); } // END - foreach diff --git a/inc/modules/member/what-mydata.php b/inc/modules/member/what-mydata.php index 04bd239f22..31b438b6e3 100644 --- a/inc/modules/member/what-mydata.php +++ b/inc/modules/member/what-mydata.php @@ -213,7 +213,7 @@ LIMIT 1", // Did the user changed the password? if ($hash != $content['password']) { $AND = ", `password`='" . $hash . "'"; - $mode = 'pass'; + $mode = 'password'; } // END - if // Or did he changed his password? diff --git a/inc/modules/member/what-payout.php b/inc/modules/member/what-payout.php index 26ae46ee72..7acea2cabf 100644 --- a/inc/modules/member/what-payout.php +++ b/inc/modules/member/what-payout.php @@ -185,7 +185,7 @@ VALUES (%s,%s,%s,'%s',%s, UNIX_TIMESTAMP(), 'NEW','%s')", bigintval(postRequestParameter('account')), postRequestParameter('bank'), bigintval(getRequestParameter('payout')), - postRequestParameter('pass') + postRequestParameter('password') ), __FILE__, __LINE__); // Load templates diff --git a/inc/template-functions.php b/inc/template-functions.php index 1fe104422b..66867e6963 100644 --- a/inc/template-functions.php +++ b/inc/template-functions.php @@ -1237,12 +1237,12 @@ function generateExtensionInactiveMessage ($ext_name) { } // END - if // Default message - $message = getMaskedMessage('EXTENSION_PROBLEM_EXT_INACTIVE', $ext_name); + $message = getMaskedMessage('EXTENSION_PROBLEM_EXTENSION_INACTIVE', $ext_name); // Is an admin logged in? if (isAdmin()) { // Then output admin message - $message = getMaskedMessage('ADMIN_EXTENSION_PROBLEM_EXT_INACTIVE', $ext_name); + $message = getMaskedMessage('ADMIN_EXTENSION_PROBLEM_EXTENSION_INACTIVE', $ext_name); } // END - if // Return prepared message @@ -1479,7 +1479,7 @@ function sendModeMails ($mod, $modes) { $content['message'] = '{--MEMBER_CHANGED_EMAIL--}' . ': ' . postRequestParameter('old_email') . "\n"; break; - case 'pass': // Password was changed + case 'password': // Password was changed $content['message'] = '{--MEMBER_CHANGED_PASS--}' . "\n"; break; diff --git a/templates/de/emails/register-member.tpl b/templates/de/emails/register-member.tpl index 60dfc8d043..3bab8d700e 100644 --- a/templates/de/emails/register-member.tpl +++ b/templates/de/emails/register-member.tpl @@ -14,7 +14,7 @@ Wohnort: {%user,city=$userid%} Email-Adresse: {%user,email=$userid%} Geburtsdatum: $content[birthday] ----------------------------------------------- -Ihr Passwort: $content[pass] +Ihr Passwort: $content[password] ----------------------------------------------- Geworben von: {%user,refid,bigintval=$userid%} ----------------------------------------------- diff --git a/templates/de/html/admin/admin_add_sponsor_paytype.tpl b/templates/de/html/admin/admin_add_sponsor_paytype.tpl index 64b9d1a787..e0902ba009 100644 --- a/templates/de/html/admin/admin_add_sponsor_paytype.tpl +++ b/templates/de/html/admin/admin_add_sponsor_paytype.tpl @@ -30,13 +30,18 @@ + -
- {--SPONSOR_ADD_PAYTYPES_NOTES--}:
-
- {--SPONSOR_PAYTYPE_NAME--}: {--SPONSOR_PAYTYPE_NAME_NOTE--}
- {--SPONSOR_PAYTYPE_RATE--}: {--SPONSOR_PAYTYPE_RATE_NOTE--}
- {--SPONSOR_PAYTYPE_MIN_COUNT--}: {--SPONSOR_PAYTYPE_MIN_COUNT_NOTE--}
- {--SPONSOR_PAYTYPE_CURRENCY--}: {--SPONSOR_PAYTYPE_CURRENCY_NOTE--}
-
+
+
+ {--SPONSOR_ADD_PAYTYPES_NOTES--}: +
+
+
    +
  • {--SPONSOR_PAYTYPE_NAME--}: {--SPONSOR_PAYTYPE_NAME_NOTE--}
    • +
  • {--SPONSOR_PAYTYPE_RATE--}: {--SPONSOR_PAYTYPE_RATE_NOTE--}
    • +
  • {--SPONSOR_PAYTYPE_MIN_COUNT--}: {--SPONSOR_PAYTYPE_MIN_COUNT_NOTE--}
    • +
  • {--SPONSOR_PAYTYPE_CURRENCY--}: {--SPONSOR_PAYTYPE_CURRENCY_NOTE--}
    • +
+
diff --git a/templates/de/html/admin/admin_config_primera.tpl b/templates/de/html/admin/admin_config_primera.tpl index 8c758fa8e0..64dace5b09 100644 --- a/templates/de/html/admin/admin_config_primera.tpl +++ b/templates/de/html/admin/admin_config_primera.tpl @@ -14,7 +14,7 @@ {--ADMIN_PRIMERA_API_MD5--}: -
diff --git a/templates/de/html/admin/admin_list_sponsor_row.tpl b/templates/de/html/admin/admin_list_sponsor_row.tpl index 7b42c5fa80..e24484b3ac 100644 --- a/templates/de/html/admin/admin_list_sponsor_row.tpl +++ b/templates/de/html/admin/admin_list_sponsor_row.tpl @@ -11,7 +11,8 @@ {%pipe,translateGender=$content[gender]%} $content[surname] $content[family] - [{%pipe,translateComma=$content[points]%}] + {%pipe,translateComma=$content[points]%} {?POINTS?} diff --git a/templates/de/html/admin/admin_login_form.tpl b/templates/de/html/admin/admin_login_form.tpl index 8dbe428927..ec3fdf9ebf 100644 --- a/templates/de/html/admin/admin_login_form.tpl +++ b/templates/de/html/admin/admin_login_form.tpl @@ -26,7 +26,7 @@ - + $content[pass_message] diff --git a/templates/de/html/doubler/doubler_index.tpl b/templates/de/html/doubler/doubler_index.tpl index 29d9c6daac..5db20a6abd 100644 --- a/templates/de/html/doubler/doubler_index.tpl +++ b/templates/de/html/doubler/doubler_index.tpl @@ -31,7 +31,7 @@ {--GUEST_ENTER_PASSWORD--}: - + diff --git a/templates/de/html/guest/guest_sponsor_infos.tpl b/templates/de/html/guest/guest_sponsor_infos.tpl index 827a375150..95ef6a181a 100644 --- a/templates/de/html/guest/guest_sponsor_infos.tpl +++ b/templates/de/html/guest/guest_sponsor_infos.tpl @@ -2,16 +2,16 @@ - - diff --git a/templates/de/html/guest/guest_sponsor_reg.tpl b/templates/de/html/guest/guest_sponsor_reg.tpl index 7d47336944..e783c4e9ac 100644 --- a/templates/de/html/guest/guest_sponsor_reg.tpl +++ b/templates/de/html/guest/guest_sponsor_reg.tpl @@ -40,10 +40,10 @@ - - @@ -73,10 +73,10 @@ - - @@ -143,10 +143,10 @@ - - @@ -156,10 +156,10 @@ - - @@ -170,10 +170,10 @@ - - @@ -194,10 +194,10 @@ - - - - @@ -228,10 +226,10 @@ - - diff --git a/templates/de/html/member/member_payout_form.tpl b/templates/de/html/member/member_payout_form.tpl index 24f745fc7f..8af20888f7 100644 --- a/templates/de/html/member/member_payout_form.tpl +++ b/templates/de/html/member/member_payout_form.tpl @@ -34,7 +34,7 @@ diff --git a/templates/de/html/menu/menu_guest_advert_sponsor.tpl b/templates/de/html/menu/menu_guest_advert_sponsor.tpl new file mode 100644 index 0000000000..355d158e96 --- /dev/null +++ b/templates/de/html/menu/menu_guest_advert_sponsor.tpl @@ -0,0 +1,6 @@ + + + -- 2.39.5
-
+
{--GUEST_SPONSOR_WANT_BECOME_HEADER--}
-
+
{--GUEST_SPONSOR_INFOS_PRICING_HEADER--}
+
{--GUEST_SPONSOR_PRICING_HEADER--}
@@ -28,7 +28,7 @@ $content[paytypes]
+ - diff --git a/templates/de/html/guest/guest_sponsor_login.tpl b/templates/de/html/guest/guest_sponsor_login.tpl index a9c615a761..d7b6baadcb 100644 --- a/templates/de/html/guest/guest_sponsor_login.tpl +++ b/templates/de/html/guest/guest_sponsor_login.tpl @@ -12,7 +12,7 @@ {--SPONSOR_ENTER_ID--}: @@ -20,7 +20,7 @@ {--SPONSOR_ENTER_PASSWORD--}: diff --git a/templates/de/html/guest/guest_sponsor_payment.tpl b/templates/de/html/guest/guest_sponsor_payment.tpl new file mode 100644 index 0000000000..f8c65a1f3f --- /dev/null +++ b/templates/de/html/guest/guest_sponsor_payment.tpl @@ -0,0 +1,10 @@ +
+
diff --git a/templates/de/html/guest/guest_sponsor_infos_none_row.tpl b/templates/de/html/guest/guest_sponsor_infos_none_row.tpl index 8bb3c588aa..8750e0f14d 100644 --- a/templates/de/html/guest/guest_sponsor_infos_none_row.tpl +++ b/templates/de/html/guest/guest_sponsor_infos_none_row.tpl @@ -1,5 +1,5 @@
+ $content
- +
- +
+$content + + + +
+ {--GUEST_SPONSOR_PRICING_FOOTER--} +
+ diff --git a/templates/de/html/guest/guest_sponsor_payment_row.tpl b/templates/de/html/guest/guest_sponsor_payment_row.tpl index a15cc4f237..0d01504540 100644 --- a/templates/de/html/guest/guest_sponsor_payment_row.tpl +++ b/templates/de/html/guest/guest_sponsor_payment_row.tpl @@ -2,6 +2,8 @@ 		$content[pay_name] -
($content[pay_min_count] $content[pay_currency] = $content[res] {?POINTS?})
+
+ ($content[pay_min_count] $content[pay_currency] = $content[res] {?POINTS?}) +
+ {--SPONSOR_ENTER_TAX_IDENT--}: +
+ {--GUEST_FAMILY--}: +
+ {--SPONSOR_ENTER_URL--}: +
+ {--SPONSOR_ENTER_PASSWORDS--}: +
+ {--SPONSOR_REFID_WAS--}: + {%pipe,determineReferalId%}
+ {--SPONSOR_WARNING_INTERVAL--}: +
+ {--SPONSOR_SELECT_PAYMENT--}: - $content[payment_list]
+ + {--SPONSOR_ACCEPT_TERMS--}
{--MEMBER_PAYOUT_OPTIONAL_PASSWORD--}: - +
+ + Hier könnte Ihre Werbung stehen! +