Numerous ext-sponsor fixes and HTML rewrites (sorry for lame description)

diff --git a/.gitattributes b/.gitattributes
index 5f9de8ded5a73fac50025a073fbadf78cd0ea1d3..26103286d660ee44bc57314870cb8b6eeaed740b 100644 (file)
--- 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_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
 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_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
 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 02d154db50f4e57aaee3ab0aa6112006d068dbb4..279a03b18685802f20e40f158589321ca62c84d2 100644 (file)
--- 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-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
 ./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'] = '<a href="{%url=modules.php?module=index&amp;what=impressum&amp;admin=' . $adminId . '%}">' . $login . '</a>';
 ./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'] = '<a href="{%url=modules.php?module=index&amp;what=impressum&amp;admin=' . $adminId . '%}">' . $login . '</a>';

-./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?
 ./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 9511fb33320ad8b7df96d633c7826cb0452332ca..76e16485535833d1f4d84c2c9efecd18d1909414 100644 (file)
--- a/doubler.php
+++ b/doubler.php
@@ -67,7 +67,7 @@ if (isFormSent()) {
        setPostRequestParameter('points', bigintval(postRequestParameter('points')));
 
        // Begin with doubling process
        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
                // 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
                $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');
 
                        // 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('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')) {
                // 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 176ca4a0fd49d377fbfa3f59925b1e0b01a0e290..24cfd05a38ef220dfb410dcafd4249d7dc182b7b 100644 (file)
--- 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
 
        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
                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
                break;
 
        case 'update': // Update an extension

diff --git a/inc/extensions/ext-mydata.php b/inc/extensions/ext-mydata.php
index 5dc3ccf8a9b0d50f9f49ab12807efd3db00369da..7fbd4e1468c504aff5dbcc4b01f029217e66dec5 100644 (file)
--- 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
 
        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
                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
                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;
                                // 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
                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;
        default: // Unknown extension mode
                logDebugMessage(__FILE__, __LINE__, sprintf("Unknown extension mode %s in extension %s detected.", getExtensionMode(), getCurrentExtensionName()));
                break;

-}
+} // END - switch

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

diff --git a/inc/extensions/ext-refback.php b/inc/extensions/ext-refback.php
index f067d642af0efff85c2223e7174f66a56e8b0d04..a31b59fbf655a19223aebf3ff36fc1a713053f2b 100644 (file)
--- 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");
                                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!)
                                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 fb45c086930f335670d830b1d3e40e2ec72c63a9..d13faf9373c91f145ac6c7004fdc020b6521065b 100644 (file)
--- 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
 
        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?}_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
                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?}_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
                break;
 
        case 'update': // Update an extension

diff --git a/inc/install-inc.php b/inc/install-inc.php
index 416c0c39b50c3d71831ec16afc804374e426c982..c65b742c04378a3789eef21f64e64437497b073e 100644 (file)
--- 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()) {
                        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('<div class="install_fatal">');
+                               addToInstallContent('<div class="install_fatal"><ul>');

                                foreach (getFatalArray() as $key => $err) {
                                foreach (getFatalArray() as $key => $err) {

-                                       addToInstallContent('<div class="para"><strong>&middot;</strong> {--FATAL_NO--}' . ($key + 1) . ': ' . $err . '</div>');
+                                       addToInstallContent('<li> {--FATAL_NO--}' . ($key + 1) . ': ' . $err . '</li>');

                                } // END - foreach
                                } // END - foreach

-                               addToInstallContent('</div>');
+                               addToInstallContent('</ol></div>');

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

+

                        $content['mysql_host']   = $GLOBALS['install_mysql']['host'];
                        $content['mysql_dbase']  = $GLOBALS['install_mysql']['dbase'];
                        $content['mysql_prefix'] = $GLOBALS['install_mysql']['prefix'];
                        $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 5d676f899841a17f0ee9306f4d94e0b4669b89f0..45a5b2bae3d7b49a21dcbdd0e5d52c90be92d81e 100644 (file)
--- 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&oumllscht.",
        '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&oumllscht.",

-       '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",
        '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 9a13d4fd2a882f8340230c70d8582d90f44315c1..e46519d769ed1dc4956fc6ac8772fc1218a85416 100644 (file)
--- 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_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. <strong>Spar-Paket</strong>)",
        'SPONSOR_PAYTYPE_CURRENCY' => "W&auml;hrung",
        'SPONSOR_ADD_PAYTYPES_NOTES' => "Hinweise zu den Buchungspaketen",
        'SPONSOR_PAYTYPE_NAME_NOTE' => "Geben Sie eine passende Bezeichnung zum Buchungspaket ein (z.B. <strong>Spar-Paket</strong>)",


@@ -155,7 +155,7 @@ addMessages(array(
        'ADMIN_SPONSOR_PAYTYPE_ALREADY' => "Buchungspaket <span class=\"data\">%s</span> bereits eingerichtet.",
        'ADMIN_SPONSOR_PAYTYPE_ADDED' => "Buchungspaket <span class=\"data\">%s</span> hinzugef&uuml;gt.",
        'SPONSOR_LIST_PAYMENT_TYPES_TITLE' => "Buchungspakete auflisten, bearbeiten und l&ouml;schen",
        'ADMIN_SPONSOR_PAYTYPE_ALREADY' => "Buchungspaket <span class=\"data\">%s</span> bereits eingerichtet.",
        'ADMIN_SPONSOR_PAYTYPE_ADDED' => "Buchungspaket <span class=\"data\">%s</span> hinzugef&uuml;gt.",
        'SPONSOR_LIST_PAYMENT_TYPES_TITLE' => "Buchungspakete auflisten, bearbeiten und l&ouml;schen",

-       'SPONSOR_PAYTYPE_MIN_COUNT2' => "Minium",
+       'SPONSOR_PAYTYPE_MIN_COUNT2' => "Minimum",

        'ADMIN_SPONSOR_PAYTYPE_EDIT' => "Bearbeiten",
        'ADMIN_SPONSOR_PAYTYPE_DELETE' => "L&ouml;schen",
        'SPONSOR_EDIT_PAY_ENTRIES' => "Buchungspakete editieren",
        'ADMIN_SPONSOR_PAYTYPE_EDIT' => "Bearbeiten",
        'ADMIN_SPONSOR_PAYTYPE_DELETE' => "L&ouml;schen",
        'SPONSOR_EDIT_PAY_ENTRIES' => "Buchungspakete editieren",

diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php
index 36fa9eb37eef60e61b7b7efaa1e5851b64f67c1b..c13b24a1a91c632661c420dd5f84e98e1e044f58 100644 (file)
--- 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(
                // 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(
                );
        } 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 e1d3f99d83f367410c70a90b4961cab226c1f6ab..b4e78c2ae79908e69933c8073766fb723fb3fda3 100644 (file)
--- 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;
        // 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
 //
 function sponsorTranslateUserStatus ($status) {
        // Construct constant name

-       $constantName = sprintf("ACCOUNT_%s", $status);
+       $constantName = sprintf("ACCOUNT_STATUS_%s", $status);

 
        // Is the constant there?
 
        // Is the constant there?

-       if (defined($constantName)) {
+       if (isMessageIdValid($constantName)) {

                // Then use it
                // Then use it

-               $ret = constant($constantName);
+               $ret = getMessage($constantName);

        } else {
                // Not found!
                logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unknown status %s detected.", $status));
        } 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;
 }
        }
        return $ret;
 }

diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index dae1e4cdfeb98ed1d4442679f27722d0033db896..ffb9c69fdd4600155cc6a81133a696839cf54733 100644 (file)
--- 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
        } // 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
                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) {
 
                // Which status do we have?
                switch ($ret) {


@@ -251,7 +251,7 @@ if (!isAdminRegistered()) {
                                destroyAdminSession();
                                break;
 
                                destroyAdminSession();
                                break;
 

-                       case 'pass': // Wrong password
+                       case 'password': // Wrong password

                                setPostRequestParameter('ok', $ret);
                                $ret = '{--WRONG_PASS--} [<a href="{%url=modules.php?module=admin&amp;reset_pass=1%}">{--ADMIN_RESET_PASS--}</a>]';
                                destroyAdminSession();
                                setPostRequestParameter('ok', $ret);
                                $ret = '{--WRONG_PASS--} [<a href="{%url=modules.php?module=admin&amp;reset_pass=1%}">{--ADMIN_RESET_PASS--}</a>]';
                                destroyAdminSession();


@@ -285,13 +285,13 @@ if (!isAdminRegistered()) {
                        if ((!empty($ret)) && (postRequestParameter('ok') == '404')) $loginMessage = $ret;
 
                        // No password entered?
                        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?
 
                        // 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?
 
                        // 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);
 
                        // Load message template
                        $content['login_message'] = loadTemplate('admin_login_msg', true, $loginMessage);


@@ -393,7 +393,7 @@ if (!isAdminRegistered()) {
                        destroyAdminSession();
                        break;
 
                        destroyAdminSession();
                        break;
 

-               case 'pass': // Wrong password
+               case 'password': // Wrong password

                        setPostRequestParameter('ok', $ret);
                        loadTemplate('admin_settings_saved', false, '{--WRONG_PASS--}');
                        destroyAdminSession();
                        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 c457b8489ee19f5f0fae92027b81cfca77074f7e..0b483d1c7ffd716cde5164f32cd0df028af27b83 100644 (file)
--- 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 = 'done';
                        } else {
                                // Set status

-                               $ret = 'pass';
+                               $ret = 'password';

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


@@ -139,7 +139,7 @@ function ifAdminCookiesAreValid ($adminLogin, $passHash) {
                        $ret = 'done';
                } else {
                        // Set status
                        $ret = 'done';
                } else {
                        // Set status

-                       $ret = 'pass';
+                       $ret = 'password';

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

diff --git a/inc/modules/admin/what-add_sponsor.php b/inc/modules/admin/what-add_sponsor.php
index de2d23cd0ce62dcafa87d95074552a5697d63b42..bc1fc7e25a4cddd520513590675fb34f86c01692 100644 (file)
--- 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();
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!isAdmin())) {
        die();

-}
+} // END - if

 
 // Add description as navigation point
 addMenuDescription('admin', __FILE__);
 
 if (isFormSent()) {
        // Save sponsor in database
 
 // 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');
 } 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 32ef9cf40f07b8614ab1f83865939ba01590585f..816f60dfdab9a6fd6bc1dd54c697ec7ab3ae568a 100644 (file)
--- 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?
        mergeConfig(postRequestArray());
 
        // Is the password set?

-       if (isPostRequestParameterSet('pass')) {
+       if (isPostRequestParameterSet('password')) {

                // Then hash and remove it
                // 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. :) )
        } // 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 c6a793cd2e123c7a3e08e579d138c466c363b7ba..88625c21bac22317cb1e70ca0d8f352d1fa3f0c2 100644 (file)
--- 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
                                        convertSelectionsToTimestamp(postRequestArray(), $DATA, $id, $skip);
 
                                        // Save the sponsor

-                                       handlSponsorRequest(postRequestArray());
+                                       handleSponsorRequest(postRequestArray());

 
                                        // Convert some data for the email template
                                        postRequestParameter('gender'          , translateGender(postRequestParameter('gender')));
 
                                        // 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 b3cc40546d28d3bd1f15a9472b7b37eda6fdeeb1..3188fea46e789f9b31ba557dc5632f0cad0b5b02 100644 (file)
--- 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
        // 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?
                // 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 {
                        // 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",
                                $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());
 
                        // 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 b840333adb98a48635f4cefd3587523ecd5cd4c0..86e1357a62eccc108fcb7a4ed00890c5f8c87bab 100644 (file)
--- 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);
        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) {
 
                // 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
                } // 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'))));
        }
                // 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",
 } 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
                $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);
 
                        // 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 55735a498b72eb251c1f7cf689cc0c680dde481b..d91a05ba8d8c5954a08bd3ce5503d04704875075 100644 (file)
--- 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
 
                                } // 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);
                        // 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
 FROM
        `{?_MYSQL_PREFIX?}_sponsor_data`
 WHERE

-       `status`='PENDING'
+       `status`='PENDING' OR `status`='UNCONFIRMED'

 ORDER BY
        `id`", __FILE__, __LINE__);
 
 ORDER BY
        `id`", __FILE__, __LINE__);
 

diff --git a/inc/modules/guest/what-sponsor_infos.php b/inc/modules/guest/what-sponsor_infos.php
index d2060c535716094f6ba30ca52fd7aca5d5486c79..8f38abf6583a3dba4fde45430dd9afca32ddced9 100644 (file)
--- 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!
                } // 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!
        }
 } 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
 }
 
 // Free memory

diff --git a/inc/modules/guest/what-sponsor_login.php b/inc/modules/guest/what-sponsor_login.php
index 8bd46e44f8b0f133073ef98b72dc614a1e28ea3a..f93c825652987f2ef015a1e1b8b59fbb6ac2c8db 100644 (file)
--- 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 ...
        }
 } 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?
 
        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')))) &&
                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) {
                        );
 
                        if ($login === true) {

diff --git a/inc/modules/guest/what-sponsor_reg.php b/inc/modules/guest/what-sponsor_reg.php
index ed92a13936e9c45d3fa64a3ef3553f3a85c48d6a..7e8f5c997b3a14fb0a75bd58293329fd25414ac9 100644 (file)
--- 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
        );
 
        // 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);
 
                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!
        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) {
 
        // 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['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'));
 
                                $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 
 FROM
        `{?_MYSQL_PREFIX?}_sponsor_paytypes`
 ORDER BY 

-       pay_name` ASC', __FILE__, __LINE__);
+       `pay_name` ASC', __FILE__, __LINE__);

        if (!SQL_HASZERONUMS($result)) {
                // Load all types...
        if (!SQL_HASZERONUMS($result)) {
                // Load all types...

-               // @TODO Swap this HTML code to templates
-               $OUT = '<table border="0" cellspacing="0" cellpadding="0" width="300" class="left right top">';
+               $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
                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
                } // END - while

-               $OUT .= '</table>';

 
                // Remember the list in table
 
                // Remember the list in table

-               $content['payment_list'] = $OUT;
+               $content['payment_list'] = loadTemplate('guest_sponsor_payment', true, $OUT);

 
                // Init a lot array elements
 
                // 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... :-(
                        $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
 
                                $content[$entry]    = secureString(postRequestParameter($entry));
                        } // END - foreach
 

diff --git a/inc/modules/member/what-mydata.php b/inc/modules/member/what-mydata.php
index 04bd239f2207be300980239eb61bbbab8b5918ee..31b438b6e391d0f89da4247854b2aacba089d1ac 100644 (file)
--- 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 . "'";
                                // 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?
                                } // 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 26ae46ee72716ddb11b0ab73a2c1736c23219205..7acea2cabf7cd184509d5b641537b26f8561685a 100644 (file)
--- 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')),
                                                bigintval(postRequestParameter('account')),
                                                postRequestParameter('bank'),
                                                bigintval(getRequestParameter('payout')),

-                                               postRequestParameter('pass')
+                                               postRequestParameter('password')

                                        ), __FILE__, __LINE__);
 
                                        // Load templates
                                        ), __FILE__, __LINE__);
 
                                        // Load templates

diff --git a/inc/template-functions.php b/inc/template-functions.php
index 1fe104422b7b5b360dae7de3f87fbb9765ce28fe..66867e69630e46f9f0df4bb19af038ec3e130a3a 100644 (file)
--- a/inc/template-functions.php
+++ b/inc/template-functions.php
@@ -1237,12 +1237,12 @@ function generateExtensionInactiveMessage ($ext_name) {
        } // END - if
 
        // Default message
        } // 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
 
        // 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
        } // END - if
 
        // Return prepared message


@@ -1479,7 +1479,7 @@ function sendModeMails ($mod, $modes) {
                                                                $content['message'] = '{--MEMBER_CHANGED_EMAIL--}' . ': ' . postRequestParameter('old_email') . "\n";
                                                                break;
 
                                                                $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;
 
                                                                $content['message'] = '{--MEMBER_CHANGED_PASS--}' . "\n";
                                                                break;
 

diff --git a/templates/de/emails/register-member.tpl b/templates/de/emails/register-member.tpl
index 60dfc8d04384b623d1f73baaedd650ab2bb9cdd4..3bab8d700eb3c9f6e205639cae255aec65804273 100644 (file)
--- 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]
 -----------------------------------------------
 Email-Adresse: {%user,email=$userid%}
 Geburtsdatum: $content[birthday]
 -----------------------------------------------

-Ihr Passwort: $content[pass]
+Ihr Passwort: $content[password]

 -----------------------------------------------
 Geworben von: {%user,refid,bigintval=$userid%}
 -----------------------------------------------
 -----------------------------------------------
 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 64b9d1a787c0e8c244d2dd5598acf7d98a156ee8..e0902ba0090954539021e22ab2391a9e55049073 100644 (file)
--- a/templates/de/html/admin/admin_add_sponsor_paytype.tpl
+++ b/templates/de/html/admin/admin_add_sponsor_paytype.tpl
@@ -30,13 +30,18 @@
 </tr>
 </table>
 </form>
 </tr>
 </table>
 </form>

+</div>

 
 

-  <div class="admin_note tiny">
-    <u><strong>{--SPONSOR_ADD_PAYTYPES_NOTES--}:</strong></u><br />
-    <br />
-    <strong>{--SPONSOR_PAYTYPE_NAME--}:</strong>&nbsp;{--SPONSOR_PAYTYPE_NAME_NOTE--}<br />
-    <strong>{--SPONSOR_PAYTYPE_RATE--}:</strong>&nbsp;{--SPONSOR_PAYTYPE_RATE_NOTE--}<br />
-    <strong>{--SPONSOR_PAYTYPE_MIN_COUNT--}:</strong>&nbsp;{--SPONSOR_PAYTYPE_MIN_COUNT_NOTE--}<br />
-    <strong>{--SPONSOR_PAYTYPE_CURRENCY--}:</strong>&nbsp;{--SPONSOR_PAYTYPE_CURRENCY_NOTE--}<br />
-  </div>
+<div class="admin_note tiny" align="left">
+       <div class="para">
+               <u><strong>{--SPONSOR_ADD_PAYTYPES_NOTES--}:</strong></u>
+       </div>
+       <div class="para">
+               <ul>
+                       <li><strong>{--SPONSOR_PAYTYPE_NAME--}:</strong> {--SPONSOR_PAYTYPE_NAME_NOTE--}</li>
+                       <li><strong>{--SPONSOR_PAYTYPE_RATE--}:</strong> {--SPONSOR_PAYTYPE_RATE_NOTE--}</li>
+                       <li><strong>{--SPONSOR_PAYTYPE_MIN_COUNT--}:</strong> {--SPONSOR_PAYTYPE_MIN_COUNT_NOTE--}</li>
+                       <li><strong>{--SPONSOR_PAYTYPE_CURRENCY--}:</strong> {--SPONSOR_PAYTYPE_CURRENCY_NOTE--}</li>
+               </ul>
+       </div>

 </div>
 </div>

diff --git a/templates/de/html/admin/admin_config_primera.tpl b/templates/de/html/admin/admin_config_primera.tpl
index 8c758fa8e04057a1230de0e4886230df0c9db281..64dace5b097bd93e3ff1e583c3ad252df2934c96 100644 (file)
--- a/templates/de/html/admin/admin_config_primera.tpl
+++ b/templates/de/html/admin/admin_config_primera.tpl
@@ -14,7 +14,7 @@
        </tr>
        <tr>
                <td class="bottom" width="300" align="right">{--ADMIN_PRIMERA_API_MD5--}:</td>
        </tr>
        <tr>
                <td class="bottom" width="300" align="right">{--ADMIN_PRIMERA_API_MD5--}:</td>

-               <td class="bottom" width="270"><input type="password" name="pass"
+               <td class="bottom" width="270"><input type="password" name="password"

                        class="admin_normal" size="20"
                        maxlength="255" /><br />
                </td>
                        class="admin_normal" size="20"
                        maxlength="255" /><br />
                </td>

diff --git a/templates/de/html/admin/admin_list_sponsor_row.tpl b/templates/de/html/admin/admin_list_sponsor_row.tpl
index 7b42c5fa80d788d2406d4efbd72502da43d91403..e24484b3acc3c8b6d577eb8718c91548e5263191 100644 (file)
--- a/templates/de/html/admin/admin_list_sponsor_row.tpl
+++ b/templates/de/html/admin/admin_list_sponsor_row.tpl
@@ -11,7 +11,8 @@
     <a href="$content[email]">{%pipe,translateGender=$content[gender]%} $content[surname] $content[family]</a>
   </td>
   <td align="center" class="{%template,ColorSwitch%} bottom" width="160">
     <a href="$content[email]">{%pipe,translateGender=$content[gender]%} $content[surname] $content[family]</a>
   </td>
   <td align="center" class="{%template,ColorSwitch%} bottom" width="160">

-    [<strong><a href="{%url=modules.php?module=admin&amp;what=edit_sponsor&amp;id=$content[id]&amp;mode=add_points%}" title="{--ADMIN_SPONSOR_ADD_POINTS_LINK_TITLE--}">{%pipe,translateComma=$content[points]%}</a></strong>]
+    <a href="{%url=modules.php?module=admin&amp;what=edit_sponsor&amp;id=$content[id]&amp;mode=add_points%}"
+     title="{--ADMIN_SPONSOR_ADD_POINTS_LINK_TITLE--}">{%pipe,translateComma=$content[points]%}</a> {?POINTS?}

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

diff --git a/templates/de/html/admin/admin_login_form.tpl b/templates/de/html/admin/admin_login_form.tpl
index 8dbe4289279a65a881b3529329576b29e0288bca..ec3fdf9ebf2b056c32bf3d8a50862b87b54d53fa 100644 (file)
--- a/templates/de/html/admin/admin_login_form.tpl
+++ b/templates/de/html/admin/admin_login_form.tpl
@@ -26,7 +26,7 @@
                        </div>
                </td>
                <td class="bottom">
                        </div>
                </td>
                <td class="bottom">

-                       <input type="password" name="pass" tabindex="2" size="20" maxlength="100" class="admin_normal" />
+                       <input type="password" name="password" tabindex="2" size="20" maxlength="100" class="admin_normal" />

                </td>
        </tr>
        $content[pass_message]
                </td>
        </tr>
        $content[pass_message]

diff --git a/templates/de/html/doubler/doubler_index.tpl b/templates/de/html/doubler/doubler_index.tpl
index 29d9c6daac06b08df7b3d2dde0958323d155a257..5db20a6abd48eca9c4d9f3adfa15d357f959832e 100644 (file)
--- a/templates/de/html/doubler/doubler_index.tpl
+++ b/templates/de/html/doubler/doubler_index.tpl
@@ -31,7 +31,7 @@
                                        {--GUEST_ENTER_PASSWORD--}:
                                </td>
                                <td>
                                        {--GUEST_ENTER_PASSWORD--}:
                                </td>
                                <td>

-                                       <input type="password" name="pass" class="guest_normal" size="10" maxlength="255" />
+                                       <input type="password" name="password" class="guest_normal" size="10" maxlength="255" />

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

diff --git a/templates/de/html/guest/guest_sponsor_infos.tpl b/templates/de/html/guest/guest_sponsor_infos.tpl
index 827a37515075425d377ba8d2e11a5e2d0942fed2..95ef6a181a2d36743649ff53aaf7e0caaf8416bf 100644 (file)
--- a/templates/de/html/guest/guest_sponsor_infos.tpl
+++ b/templates/de/html/guest/guest_sponsor_infos.tpl
@@ -2,16 +2,16 @@
 <table border="0" cellspacing="0" cellpadding="0" class="guest_table dashed" width="550">
 <tr>
   <td class="guest_title bottom">
 <table border="0" cellspacing="0" cellpadding="0" class="guest_table dashed" width="550">
 <tr>
   <td class="guest_title bottom">

-    <div class="big para">
+    <div class="big">

       {--GUEST_SPONSOR_WANT_BECOME_HEADER--}
     </div>
       {--GUEST_SPONSOR_WANT_BECOME_HEADER--}
     </div>

-    <div class="para">
+    <div>

       {--GUEST_SPONSOR_INFOS_PRICING_HEADER--}
     </div>
   </td>
 </tr>
 <tr>
       {--GUEST_SPONSOR_INFOS_PRICING_HEADER--}
     </div>
   </td>
 </tr>
 <tr>

-  <td align="center" class="bottom" style="padding-top:15px; padding-bottom: 15px">
+  <td align="center" style="padding-top:8px; padding-bottom: 4px">

     <div>
       {--GUEST_SPONSOR_PRICING_HEADER--}
     </div>
     <div>
       {--GUEST_SPONSOR_PRICING_HEADER--}
     </div>


@@ -28,7 +28,7 @@ $content[paytypes]
   </td>
 </tr>
 <tr>
   </td>
 </tr>
 <tr>

-  <td align="center" style="padding-top: 15px; padding-bottom: 15px">
+  <td align="center" style="padding-top: 4px; padding-bottom: 8px">

     <table border="0" cellspacing="0" cellpadding="0" class="guest_table dashed" width="450">
     <tr>
       <td colspan="2" align="center" class="guest_title bottom">
     <table border="0" cellspacing="0" cellpadding="0" class="guest_table dashed" width="450">
     <tr>
       <td colspan="2" align="center" class="guest_title bottom">

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 8bb3c588aad2e43f4a8bdc4222ec09f53c2fcb09..8750e0f14dd1dd543000680430a46b746a696e6d 100644 (file)
--- 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 @@
 <tr>
 <tr>

-  <td colspan="2">
+  <td colspan="2" class="bottom">

     $content
   </td>
 </tr>
     $content
   </td>
 </tr>

diff --git a/templates/de/html/guest/guest_sponsor_login.tpl b/templates/de/html/guest/guest_sponsor_login.tpl
index a9c615a761c6eda8aa6d4258a24755ff09b35f17..d7b6baadcbba5714848c20c0fc4de4b691dca021 100644 (file)
--- 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--}:
   </td>
   <td>
     {--SPONSOR_ENTER_ID--}:
   </td>
   <td>

-    <input type="text" name="sponsorid" class="guest_normal" size="5" maxlength="20" />
+    <input type="text" name="sponsor_id" class="guest_normal" size="5" maxlength="20" />

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


@@ -20,7 +20,7 @@
     {--SPONSOR_ENTER_PASSWORD--}:
   </td>
   <td class="bottom">
     {--SPONSOR_ENTER_PASSWORD--}:
   </td>
   <td class="bottom">

-    <input type="password" name="pass" class="guest_normal" size="10" maxlength="255" />
+    <input type="password" name="password" class="guest_normal" size="10" maxlength="255" />

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

diff --git a/templates/de/html/guest/guest_sponsor_payment.tpl b/templates/de/html/guest/guest_sponsor_payment.tpl
new file mode 100644 (file)
index 0000000..f8c65a1
--- /dev/null
+++ b/templates/de/html/guest/guest_sponsor_payment.tpl
@@ -0,0 +1,10 @@
+<div align="center">
+<table border="0" cellspacing="0" cellpadding="0" class="guest_table dashed" width="350">
+$content
+<tr>
+       <td colspan="2" class="guest_footer" align="center">
+               {--GUEST_SPONSOR_PRICING_FOOTER--}
+       </td>
+</tr>
+</table>
+</div>

diff --git a/templates/de/html/guest/guest_sponsor_payment_row.tpl b/templates/de/html/guest/guest_sponsor_payment_row.tpl
index a15cc4f23775950d1ce9e7c927c7f5f4e8a187ac..0d01504540d57543f272c149e79880e1802713b5 100644 (file)
--- a/templates/de/html/guest/guest_sponsor_payment_row.tpl
+++ b/templates/de/html/guest/guest_sponsor_payment_row.tpl
@@ -2,6 +2,8 @@
   <td class="bottom {%template,ColorSwitch%}" height="50" style="padding-left: 2px; padding-right: 2px">
     <input type="radio" name="pay_type" class="guest_normal" value="$content[id]" />
     $content[pay_name]
   <td class="bottom {%template,ColorSwitch%}" height="50" style="padding-left: 2px; padding-right: 2px">
     <input type="radio" name="pay_type" class="guest_normal" value="$content[id]" />
     $content[pay_name]

-    <div align="right">($content[pay_min_count] $content[pay_currency] = $content[res] {?POINTS?})</div>
+    <div align="right">
+       ($content[pay_min_count] $content[pay_currency] = $content[res] {?POINTS?})
+    </div>

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

diff --git a/templates/de/html/guest/guest_sponsor_reg.tpl b/templates/de/html/guest/guest_sponsor_reg.tpl
index 7d473369444a4806cac45f3680b75424811c337d..e783c4e9acdc3f3e3bb1e373dc3c85241024158c 100644 (file)
--- a/templates/de/html/guest/guest_sponsor_reg.tpl
+++ b/templates/de/html/guest/guest_sponsor_reg.tpl
@@ -40,10 +40,10 @@
   </td>
 </tr>
 <tr>
   </td>
 </tr>
 <tr>

-  <td align="right" valign="top">
+  <td class="bottom" align="right" valign="top">

     {--SPONSOR_ENTER_TAX_IDENT--}:
   </td>
     {--SPONSOR_ENTER_TAX_IDENT--}:
   </td>

-  <td>
+  <td class="bottom">

     <input type="text" name="tax_ident" class="guest_normal" size="20" maxlength="255" value="$content[tax_ident]" />
   </td>
 </tr>
     <input type="text" name="tax_ident" class="guest_normal" size="20" maxlength="255" value="$content[tax_ident]" />
   </td>
 </tr>


@@ -73,10 +73,10 @@
   </td>
 </tr>
 <tr>
   </td>
 </tr>
 <tr>

-  <td align="right">
+  <td class="bottom" align="right">

     {--GUEST_FAMILY--}:
   </td>
     {--GUEST_FAMILY--}:
   </td>

-  <td>
+  <td class="bottom">

     <input type="text" name="family" class="guest_normal" size="20" maxlength="255" value="$content[family]" />
   </td>
 </tr>
     <input type="text" name="family" class="guest_normal" size="20" maxlength="255" value="$content[family]" />
   </td>
 </tr>


@@ -143,10 +143,10 @@
   </td>
 </tr>
 <tr>
   </td>
 </tr>
 <tr>

-  <td align="right" valign="top">
+  <td class="bottom" align="right" valign="top">

     {--SPONSOR_ENTER_URL--}:
   </td>
     {--SPONSOR_ENTER_URL--}:
   </td>

-  <td>
+  <td class="bottom">

     <input type="text" name="url" class="guest_normal" size="20" maxlength="255" value="$content[url]" />
   </td>
 </tr>
     <input type="text" name="url" class="guest_normal" size="20" maxlength="255" value="$content[url]" />
   </td>
 </tr>


@@ -156,10 +156,10 @@
   </td>
 </tr>
 <tr>
   </td>
 </tr>
 <tr>

-  <td align="right" valign="top">
+  <td class="bottom" align="right" valign="top">

     {--SPONSOR_ENTER_PASSWORDS--}:
   </td>
     {--SPONSOR_ENTER_PASSWORDS--}:
   </td>

-  <td>
+  <td class="bottom">

     <input type="password" name="pass1" class="guest_normal" size="10" maxlength="255" />
     <input type="password" name="pass2" class="guest_normal" size="10" maxlength="255" />
   </td>
     <input type="password" name="pass1" class="guest_normal" size="10" maxlength="255" />
     <input type="password" name="pass2" class="guest_normal" size="10" maxlength="255" />
   </td>


@@ -170,10 +170,10 @@
   </td>
 </tr>
 <tr>
   </td>
 </tr>
 <tr>

-  <td align="right" valign="top">
+  <td class="bottom" align="right" valign="top">

     {--SPONSOR_REFID_WAS--}:
   </td>
     {--SPONSOR_REFID_WAS--}:
   </td>

-  <td>
+  <td class="bottom">

     <strong>{%pipe,determineReferalId%}</strong>
   </td>
 </tr>
     <strong>{%pipe,determineReferalId%}</strong>
   </td>
 </tr>


@@ -194,10 +194,10 @@
   </td>
 </tr>
 <tr>
   </td>
 </tr>
 <tr>

-  <td align="right">
+  <td class="bottom" align="right">

     {--SPONSOR_WARNING_INTERVAL--}:
   </td>
     {--SPONSOR_WARNING_INTERVAL--}:
   </td>

-  <td>
+  <td class="bottom">

     <select name="warning_interval" class="guest_select" size="1">
       <option value="0">{--SELECT_NONE--}</option>
       <option value="{--({?ONE_DAY?}*1)--}">1 {--DAYS--}</option>
     <select name="warning_interval" class="guest_select" size="1">
       <option value="0">{--SELECT_NONE--}</option>
       <option value="{--({?ONE_DAY?}*1)--}">1 {--DAYS--}</option>


@@ -215,10 +215,8 @@
   </td>
 </tr>
 <tr>
   </td>
 </tr>
 <tr>

-  <td align="right" valign="top">
+  <td class="bottom" align="center" valign="top" colspan="2">

     {--SPONSOR_SELECT_PAYMENT--}:
     {--SPONSOR_SELECT_PAYMENT--}:

-  </td>
-  <td>

     $content[payment_list]
   </td>
 </tr>
     $content[payment_list]
   </td>
 </tr>


@@ -228,10 +226,10 @@
   </td>
 </tr>
 <tr>
   </td>
 </tr>
 <tr>

-  <td align="center" valign="top">
+  <td class="bottom" align="center" valign="top">

     <input type="checkbox" name="terms" class="guest_normal" value="1" />
   </td>
     <input type="checkbox" name="terms" class="guest_normal" value="1" />
   </td>

-  <td>
+  <td class="bottom">

     {--SPONSOR_ACCEPT_TERMS--}
   </td>
 </tr>
     {--SPONSOR_ACCEPT_TERMS--}
   </td>
 </tr>

diff --git a/templates/de/html/member/member_payout_form.tpl b/templates/de/html/member/member_payout_form.tpl
index 24f745fc7f444a1430bd71a379e03a3af988e2dd..8af20888f7b52572cdef6943963d6c8111773769 100644 (file)
--- a/templates/de/html/member/member_payout_form.tpl
+++ b/templates/de/html/member/member_payout_form.tpl
@@ -34,7 +34,7 @@
        <tr>
                <td height="25" align="right">{--MEMBER_PAYOUT_OPTIONAL_PASSWORD--}:</td>
                <td>
        <tr>
                <td height="25" align="right">{--MEMBER_PAYOUT_OPTIONAL_PASSWORD--}:</td>
                <td>

-                       <input type="password" name="pass" class="member_normal" ize="10" maxlength="255" />
+                       <input type="password" name="password" class="member_normal" ize="10" maxlength="255" />

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

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 (file)
index 0000000..355d158
--- /dev/null
+++ b/templates/de/html/menu/menu_guest_advert_sponsor.tpl
@@ -0,0 +1,6 @@
+<tr>
+       <td class="menu_advert">
+               <!-- Fuegen Sie hier Ihre Werbung ein! //-->
+               <a href="{%url=modules.php??module=index&amp;what=impressum%}" target="_blank">Hier k&ouml;nnte Ihre Werbung stehen!</a>
+       </td>
+</tr>