A lot templates rewritten, TODOs.txt updated, XHTML fixes:
authorRoland Häder <roland@mxchange.org>
Sun, 22 Nov 2009 07:31:42 +0000 (07:31 +0000)
committerRoland Häder <roland@mxchange.org>
Sun, 22 Nov 2009 07:31:42 +0000 (07:31 +0000)
- A lot more configurations are now parsed by FILTER_COMPILE_EXTENSION ()
  (we really need to rename this function)
- The same with user data
- HTML tag 'SMALL' fixed to a div
- Codes 'ID_UNCONFIRMED' and 'ID_LOCKED' renamed to 'STATUS_xxx'
- TODOs.txt updated

43 files changed:
DOCS/TODOs.txt
inc/databases.php
inc/filters.php
inc/functions.php
inc/language/de.php
inc/libs/nickname_functions.php
inc/libs/wernis_functions.php
inc/mails/beg_mails.php
inc/modules/admin/what-config_payouts.php
inc/modules/admin/what-config_wernis.php
inc/modules/member/what-beg.php
inc/modules/member/what-doubler.php
inc/modules/member/what-html_mail.php
inc/modules/member/what-mydata.php
inc/modules/member/what-payout.php
inc/modules/member/what-points.php
inc/modules/member/what-primera.php
inc/modules/member/what-refback.php
inc/modules/member/what-reflinks.php
inc/modules/member/what-transfer.php
inc/modules/member/what-wernis.php
inc/reset/reset_100_bonus.php
inc/reset/reset_birthday.php
templates/de/emails/beg/beg_en_notify.tpl
templates/de/emails/member/member_birthday_confirm.tpl
templates/de/emails/member/member_stats_bonus.tpl
templates/de/html/guest/guest_goto_top.tpl
templates/de/html/member/member_beg.tpl
templates/de/html/member/member_doubler.tpl
templates/de/html/member/member_goto_top.tpl
templates/de/html/member/member_holiday_form.tpl
templates/de/html/member/member_mydata_edit.tpl
templates/de/html/member/member_mydata_locked.tpl
templates/de/html/member/member_points.tpl
templates/de/html/member/member_points_bonus_disabled.tpl
templates/de/html/member/member_points_bonus_rows.tpl
templates/de/html/member/member_points_row.tpl
templates/de/html/member/member_points_upgrade.tpl
templates/de/html/member/member_primera_mode_pay.tpl
templates/de/html/member/member_refback_edit.tpl
templates/de/html/member/member_reflink.tpl
templates/de/html/member/member_wernis_mode_payout.tpl
templates/de/html/member/member_wernis_mode_withdraw.tpl

index b2881bb..7389c07 100644 (file)
@@ -16,7 +16,8 @@
 ./inc/extensions/ext-yoomedia.php:55:// @TODO Only deprecated when 'network' is ready! setExtensionDeprecated('Y');
 ./inc/extensions-functions.php:376:// @TODO Change from ext_id to ext_name (not just even the variable! ;-) )
 ./inc/extensions-functions.php:489:            // @TODO Extension is loaded, what next?
-./inc/filters.php:465:                 // @TODO This whole if-block is very static
+./inc/filters.php:473:                 // @TODO This whole switch-block is very static
+./inc/filters.php:538:                         case 'config': // @TODO FILTER_COMPILE_CONFIG does not handle call-back functions so we handle it here again
 ./inc/functions.php:1033:      // @TODO Do only use $content and deprecate $GLOBALS and $DATA in templates
 ./inc/functions.php:241:       // @TODO Remove this sanity-check if all is fine
 ./inc/functions.php:2431:// @TODO Please describe this function
 ./inc/functions.php:244:       // @TODO Try to rewrite all $DATA to $content
 ./inc/functions.php:2563:              // @TODO Add a little more infos here
 ./inc/functions.php:2586:      // @TODO This cannot be rewritten to app_die(), try to find a solution for this.
-./inc/functions.php:2666:                      // @TODO Rewrite this old lost code to a template
-./inc/functions.php:2755:                      // @TODO Are these convertions still required?
-./inc/functions.php:2773:// @TODO Rewrite this function to use readFromFile() and writeToFile()
-./inc/functions.php:3651:// @TODO Lame description for this function
-./inc/functions.php:3673:                      // @TODO Move this in a filter
-./inc/functions.php:3791:      // @TODO This is still very static, rewrite it somehow
+./inc/functions.php:2665:                      // @TODO Rewrite this old lost code to a template
+./inc/functions.php:2754:                      // @TODO Are these convertions still required?
+./inc/functions.php:2772:// @TODO Rewrite this function to use readFromFile() and writeToFile()
+./inc/functions.php:3650:// @TODO Lame description for this function
+./inc/functions.php:3672:                      // @TODO Move this in a filter
+./inc/functions.php:3790:      // @TODO This is still very static, rewrite it somehow
 ./inc/functions.php:456:       // @TODO Do only use $content, not $DATA or raw variables
 ./inc/functions.php:526:               // @TODO Extension 'msg' does not exist
 ./inc/functions.php:595:// @TODO Rewrite this to an extension 'smtp'
 ./inc/functions.php:998:// @TODO $simple is deprecated
 ./inc/install-functions.php:62:        // @TODO DEACTIVATED: changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', 'OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestElement('omode'), 0);
-./inc/language/de.php:1147:// @TODO Rewrite these two constants
-./inc/language/de.php:1163:// @TODO Rewrite these five constants
-./inc/language/de.php:847:// @TODO Are these constants longer used?
+./inc/language/de.php:1146:// @TODO Rewrite these two constants
+./inc/language/de.php:1162:// @TODO Rewrite these five constants
+./inc/language/de.php:846:// @TODO Are these constants longer used?
 ./inc/language-functions.php:228:      // @TODO These are all valid languages, again hard-coded
 ./inc/language-functions.php:45:// @TODO Rewrite all language constants to this function.
 ./inc/language/holiday_de.php:49:// @TODO Rewrite these two constants to one
 ./inc/modules/guest/what-sponsor_reg.php:286:          // @TODO Swap this HTML code to templates
 ./inc/modules/guest/what-stats.php:115:                // @TODO This can be somehow rewritten
 ./inc/modules/guest/what-stats.php:75:// @TODO This can be rewritten in a dynamic include
-./inc/modules/member/what-beg.php:89:// @TODO No more needed? define('__BEG_UID_TIMEOUT', createFancyTime(getConfig('beg_userid_timeout')));
+./inc/modules/member/what-beg.php:63:// @TODO No more needed? define('__BEG_UID_TIMEOUT', createFancyTime(getConfig('beg_userid_timeout')));
 ./inc/modules/member/what-bonus.php:56:        // @TODO Rewrite this to a filter
 ./inc/modules/member/what-categories.php:128:          // @TODO Rewrite this to use $OUT .= ...
+./inc/modules/member/what-doubler.php:55:// @TODO The '*100' is in the way to get moved into the template
 ./inc/modules/member/what-order.php:443:                       // @TODO Rewrite this to a filter
 ./inc/modules/member/what-payout.php:240:                                      // @TODO Rewrite this to a filter
 ./inc/modules/member/what-points.php:54:// @TODO Should we rewrite this to a filter?
 ./inc/modules/member/what-rallyes.php:90:      // @TODO Reactivate this: $content['admin'] = "<a href=\"{%url=modules.php?module=index&amp;what=impressum&amp;admin=" . $content['admin_id'] . "%}\">" . $content['login'] . "</a>";
-./inc/modules/member/what-reflinks.php:60:// @TODO Move this into a filter
+./inc/modules/member/what-reflinks.php:53:// @TODO Move this into a filter
 ./inc/modules/member/what-stats.php:118:               // @TODO Rewrite in template: clix->clicks
-./inc/modules/member/what-transfer.php:141:                            // @TODO Rewrite this to a filter
-./inc/modules/member/what-transfer.php:231:                            // @TODO Try to rewrite his to $content = SQL_FETCHARRAY(), see some lines above for two different queries
-./inc/modules/member/what-transfer.php:316:                    // @TODO This should be somehow rewritten to $row = SQL_FETCHARRAY(), see switch() block above for SQL queries
-./inc/modules/member/what-transfer.php:322:                            // @TODO Rewrite: tid->trans_id,stamp->time_trans
-./inc/modules/member/what-transfer.php:99:                     // @TODO Rewrite this to a filter
+./inc/modules/member/what-transfer.php:135:                            // @TODO Rewrite this to a filter
+./inc/modules/member/what-transfer.php:225:                            // @TODO Try to rewrite his to $content = SQL_FETCHARRAY(), see some lines above for two different queries
+./inc/modules/member/what-transfer.php:310:                    // @TODO This should be somehow rewritten to $row = SQL_FETCHARRAY(), see switch() block above for SQL queries
+./inc/modules/member/what-transfer.php:316:                            // @TODO Rewrite: tid->trans_id,stamp->time_trans
+./inc/modules/member/what-transfer.php:93:                     // @TODO Rewrite this to a filter
 ./inc/modules/member/what-unconfirmed.php:142: // @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
 ./inc/modules/order.php:75:            // @TODO Unused: 2,4
 ./inc/monthly/monthly_bonus.php:68:    // @TODO Rewrite this to a filter
 ./inc/mysql-manager.php:552:   // @TODO Try to rewrite this to one or more functions
 ./inc/mysql-manager.php:93:// @TODO Can we cache this?
 ./inc/reset/reset_beg.php:50:// @TODO This should be converted in a daily beg rallye
-./inc/reset/reset_birthday.php:92:                     // @TODO 4 is hard-coded here, should we move it out in config?
+./inc/reset/reset_birthday.php:91:                     // @TODO 4 is hard-coded here, should we move it out in config?
 ./inc/wrapper-functions.php:127:// @TODO Implement $compress
 ./inc/wrapper-functions.php:134:// @TODO Implement $decompress
 ./inc/wrapper-functions.php:393:// @TODO Do some more sanity check here
 ./templates/de/html/surfbar/surfbar_frame_top.tpl:23:// @TODO Try to rewrite this JavaScript to js.php?js=surfbar_frame_top (wouldn't be easy)
 ### ### DEPRECATION FOLLOWS: ### ###
 ./inc/modules/admin/admin-inc.php:532:// @DEPRECATED
+./templates/de/html/member/member_mydata_locked.tpl:1:<!-- @DEPRECATED //-->
 ### ### template-warnings.log follows: ### ###
 Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : td in templates/de/html/menu/menu_what_end.tpl, line: 1 in 
 Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : tr in templates/de/html/menu/menu_what_end.tpl, line: 2 in 
index b5dcf2e..50455b0 100644 (file)
@@ -42,41 +42,40 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // System-wide return codes
-addCode('WRONG_PASS'       , 0x001);
-addCode('WRONG_ID'         , 0x002);
-addCode('ID_LOCKED'        , 0x003);
-addCode('ID_UNCONFIRMED'   , 0x004);
-addCode('UNKNOWN_STATUS'   , 0x005);
-addCode('CNTR_FAILED'      , 0x008);
-addCode('LOGOUT_DONE'      , 0x008);
-addCode('LOGOUT_FAILED'    , 0x009);
-addCode('URL_TLOCK'        , 0x00a);
-addCode('URL_FOUND'        , 0x00b);
-addCode('OVERLENGTH'       , 0x00c);
-addCode('SUBJ_URL'         , 0x00d);
-addCode('BLIST_URL'        , 0x00e);
-addCode('NO_RECS_LEFT'     , 0x00f);
-addCode('INVALID_TAGS'     , 0x010);
-addCode('MORE_POINTS'      , 0x011);
-addCode('COOKIES_DISABLED' , 0x012);
-addCode('DATA_INVALID'     , 0x013);
-addCode('POSSIBLE_INVALID' , 0x014);
-addCode('ACCOUNT_LOCKED'   , 0x015);
-addCode('USER_404'         , 0x016);
-addCode('STATS_404'        , 0x017);
-addCode('ALREADY_CONFIRMED', 0x018);
-addCode('ERROR_MAILID'     , 0x019);
-addCode('EXTENSION_PROBLEM', 0x01a);
-addCode('MORE_RECEIVERS1'  , 0x01b);
-addCode('MORE_RECEIVERS2'  , 0x01c);
-addCode('MORE_RECEIVERS3'  , 0x01d);
-addCode('INVALID_URL'      , 0x01e);
-addCode('MENU_NOT_VALID'   , 0x01f);
-addCode('LOGIN_FAILED'     , 0x020);
-addCode('BEG_SAME_AS_OWN'  , 0x021);
-addCode('UNHANDLED_STATUS' , 0x022);
-addCode('MODULE_MEM_ONLY'  , 0x023);
-addCode('ID_GUEST'         , 0x024);
+addCode('WRONG_PASS'        , 0x001);
+addCode('WRONG_ID'          , 0x002);
+addCode('STATUS_LOCKED'     , 0x003);
+addCode('STATUS_UNCONFIRMED', 0x004);
+addCode('UNKNOWN_STATUS'    , 0x005);
+addCode('CNTR_FAILED'       , 0x008);
+addCode('LOGOUT_DONE'       , 0x008);
+addCode('LOGOUT_FAILED'     , 0x009);
+addCode('URL_TLOCK'         , 0x00a);
+addCode('URL_FOUND'         , 0x00b);
+addCode('OVERLENGTH'        , 0x00c);
+addCode('SUBJ_URL'          , 0x00d);
+addCode('BLIST_URL'         , 0x00e);
+addCode('NO_RECS_LEFT'      , 0x00f);
+addCode('INVALID_TAGS'      , 0x010);
+addCode('MORE_POINTS'       , 0x011);
+addCode('COOKIES_DISABLED'  , 0x012);
+addCode('DATA_INVALID'      , 0x013);
+addCode('POSSIBLE_INVALID'  , 0x014);
+addCode('ACCOUNT_LOCKED'    , 0x015);
+addCode('USER_404'          , 0x016);
+addCode('STATS_404'         , 0x017);
+addCode('ALREADY_CONFIRMED' , 0x018);
+addCode('ERROR_MAILID'      , 0x019);
+addCode('EXTENSION_PROBLEM' , 0x01a);
+addCode('MORE_RECEIVERS1'   , 0x01b);
+addCode('MORE_RECEIVERS2'   , 0x01c);
+addCode('MORE_RECEIVERS3'   , 0x01d);
+addCode('INVALID_URL'       , 0x01e);
+addCode('MENU_NOT_VALID'    , 0x01f);
+addCode('LOGIN_FAILED'      , 0x020);
+addCode('BEG_SAME_AS_OWN'   , 0x021);
+addCode('UNHANDLED_STATUS'  , 0x022);
+addCode('MODULE_MEM_ONLY'   , 0x023);
 
 // Server-URL (DO NOT CHANGE THIS OR YOU CANNOT CHECK FOR UPDATES/EXTENSIONS!)
 setConfigEntry('SERVER_URL', 'http://www.mxchange.org');
@@ -111,5 +110,5 @@ setConfigEntry('ENCRYPT_SEPERATOR', ':');
 // Extra title is empty by default
 setExtraTitle('');
 
-//
+// [EOF]
 ?>
index 1b20ecc..8cc35e4 100644 (file)
@@ -411,7 +411,7 @@ function FILTER_COMPILE_CONFIG ($code, $compiled = false) {
                                                $GLOBALS['compile_config'][$matches[1][$key]] = "\".getConfig('" . $matches[1][$key] . "').\"";
                                        } elseif (isConfigEntrySet('default_' . strtoupper($matches[1][$key]))) {
                                                // Use default value
-                                               $GLOBALS['compile_config'][$matches[1][$key]] = "\".getConfig('" . 'DEFAULT_' . strtoupper($matches[1][$key]) . "').\"";
+                                               $GLOBALS['compile_config'][$matches[1][$key]] = "\" . getConfig('" . 'DEFAULT_' . strtoupper($matches[1][$key]) . "') . \"";
                                        } elseif (isMessageIdValid('DEFAULT_' . strtoupper($matches[1][$key]))) {
                                                // No config, try the language system
                                                $GLOBALS['compile_config'][$matches[1][$key]] = "\" . getMessage('". 'DEFAULT_' . strtoupper($matches[1][$key]) . "') . \"";
@@ -458,83 +458,107 @@ function FILTER_COMPILE_EXTENSION ($code) {
        if ((count($matches) > 0) && (count($matches[3]) > 0)) {
                // Replace all matches
                foreach ($matches[2] as $key => $cmd) {
-                       // Init replacer variable
+                       // Init replacer/call-back variable
                        $replacer = '';
+                       $callback = '';
+                       $extraFunction = '';
+
+                       // Extract command and call-back
+                       $cmdArray = explode(',', $cmd);
+                       $cmd = $cmdArray[0];
+                       if (isset($cmdArray[1])) $callback = $cmdArray[1];
+                       if (isset($cmdArray[2])) $extraFunction = $cmdArray[2];
 
                        // Is the extension installed or code provided?
-                       // @TODO This whole if-block is very static
-                       if ($cmd == 'code') {
-                               // Code asked for
-                               $code = str_replace($matches[0][$key], "\" . getCode('" . $matches[4][$key] . "') . \"", $code);
-                       } elseif (substr($cmd, 0, 3) == 'url') {
-                               // Do we have JS-mode?
-                               if (substr($cmd, -2, 2) == 'js') $outputMode = 1;
-
-                               // Handle an URL here
-                               $replacer = "\" . encodeUrl(\"" . $matches[4][$key] . "\", " . $outputMode . ") . \"";
-
-                               // Replace it
-                               $code = str_replace($matches[0][$key], $replacer, $code);
-                       } elseif (substr($cmd, 0, 6) == 'server') {
-                               // Get data from $_SERVER by their respective functions
-                               $serverCmd = explode(',', $cmd);
-                               $serverCmd = $serverCmd[1];
-
-                               // This will make 'foo_bar' to detectFooBar()
-                               $functionName = "'detect' . implode('', array_map('ucfirst', explode('_', '" . $serverCmd . "')))";
-
-                               // Replace it
-                               $code = str_replace($matches[0][$key], "\" . call_user_func(" . $functionName . ") . \"", $code);
-                       } elseif (substr($cmd, 0, 4) == 'user') {
-                               // Extract user command
-                               $userCmdArray = explode(',', $cmd);
-                               $userCmd = $userCmdArray[1];
-
-                               // Use current userid by default
-                               $functionName = 'getMemberId()';
-
-                               // User-related data, so is there a userid?
-                               if (!empty($matches[4][$key])) {
-                                       // Do we have a userid or $userid?
-                                       if ($matches[4][$key] == '$userid') {
-                                               // Use dynamic call
-                                               $functionName = "getFetchedUserData('userid', \$userid, '" . $userCmd . "')";
-                                       } elseif ($matches[4][$key] > 0) {
-                                               // User data found
-                                               $functionName = "getFetchedUserData('userid', " . $matches[4][$key] . ", " . $userCmd . "')";
+                       // @TODO This whole switch-block is very static
+                       switch ($cmd) {
+                               case 'code': // Code asked for
+                                       $code = str_replace($matches[0][$key], "\" . getCode('" . $matches[4][$key] . "') . \"", $code);
+                                       break;
+
+                               case 'url':
+                                       // Do we have JS-mode?
+                                       if (substr($cmd, -2, 2) == 'js') $outputMode = 1;
+
+                                       // Handle an URL here
+                                       $replacer = "\" . encodeUrl(\"" . $matches[4][$key] . "\", " . $outputMode . ") . \"";
+
+                                       // Replace it
+                                       $code = str_replace($matches[0][$key], $replacer, $code);
+                                       break;
+
+                               case 'server':
+                                       // This will make 'foo_bar' to detectFooBar()
+                                       $functionName = "'detect' . implode('', array_map('ucfirst', explode('_', '" . $callback . "')))";
+
+                                       // Replace it
+                                       $code = str_replace($matches[0][$key], "\" . call_user_func(" . $functionName . ") . \"", $code);
+                                       break;
+
+                               case 'user':
+                                       // Use current userid by default
+                                       $functionName = 'getMemberId()';
+
+                                       // User-related data, so is there a userid?
+                                       if (!empty($matches[4][$key])) {
+                                               // Do we have a userid or $userid?
+                                               if ($matches[4][$key] == '$userid') {
+                                                       // Use dynamic call
+                                                       $functionName = "getFetchedUserData('userid', \$userid, '" . $callback . "')";
+                                               } elseif ($matches[4][$key] > 0) {
+                                                       // User data found
+                                                       $functionName = "getFetchedUserData('userid', " . $matches[4][$key] . ", " . $callback . "')";
+                                               } // END - if
+                                       } elseif ((!empty($callback)) && (isMember())) {
+                                               // "Call-back" alias column for current logged in user's data
+                                               $functionName = "getUserData('" . $callback . "')";
+                                       }
+
+                                       // Do we have another function to run (e.g. translations)
+                                       if (!empty($extraFunction)) {
+                                               // Surround the original function call with it
+                                               $functionName = $extraFunction . '(' . $functionName . ')';
                                        } // END - if
-                               } // END - if
 
-                               // Do we have another function to run (e.g. translations)
-                               if (isset($userCmdArray[2])) {
-                                       // Surround the original function call with it
-                                       $functionName = $userCmdArray[2] . '(' . $functionName . ')';
-                               } // END - if
+                                       // Now replace the code
+                                       $code = str_replace($matches[0][$key], "\" . " . $functionName . " . \"", $code);
+                                       break;
 
-                               // Now replace the code
-                               $code = str_replace($matches[0][$key], "\" . " . $functionName . " . \"", $code);
-                       } elseif (substr($cmd, 0, 3) == 'ext') {
-                               // Get the extension command
-                               $extCmd = explode(',', $cmd);
-                               $extCmd = $extCmd[1];
+                               case 'ext':
+                                       // Construct call-back function name
+                                       $functionName = 'getExtension' . ucfirst(strtolower($callback));
 
-                               // Construct call-back function name
-                               $functionName = 'getExtension' . ucfirst(strtolower($extCmd));
+                                       // Construct call of the function
+                                       $replacer = "\" . call_user_func_array('" . $functionName . "', array('" . $matches[4][$key] . "', true)) . \"";
 
-                               // Construct call of the function
-                               $replacer = "\" . call_user_func_array('" . $functionName . "', array('" . $matches[4][$key] . "', true)) . \"";
+                                       // Replace it and insert parameter for GET request
+                                       $code = str_replace($matches[0][$key], sprintf("&amp;ext=%s&amp;rev=\" . getConfig('CURR_SVN_REVISION') . \"", $replacer), $code);
+                                       break;
 
-                               // Replace it and insert parameter for GET request
-                               $code = str_replace($matches[0][$key], sprintf("&amp;ext=%s&amp;rev=\" . getConfig('CURR_SVN_REVISION') . \"", $replacer), $code);
-                       } else {
-                               // Unknown command detected
-                               debug_report_bug('Unknown command ' . $cmd . ' detected.');
-                       }
+                               case 'config': // @TODO FILTER_COMPILE_CONFIG does not handle call-back functions so we handle it here again
+                                       // Read configuration
+                                       $configValue = getConfig($matches[4][$key]);
+
+                                       // Do we have a call-back?
+                                       if (!empty($callback)) {
+                                               // Parse it through this function
+                                               $configValue = call_user_func_array($callback, array($configValue));
+                                       } // END - if
+
+                                       // Replace the config entry
+                                       $code = str_replace($matches[0][$key], $configValue, $code);
+                                       break;
+
+                               default:
+                                       // Unsupported command detected
+                                       debug_report_bug('Command=' . $cmd . ', callback=' . $callback . ', extra=' . $extraFunction . ' is unsupported.');
+                                       break;
+                       } // END - switch
                } // END - foreach
        } // END - if
 
        // Do we have non-HTML mode?
-       if ((getOutputMode() != '0') || ($outputMode != '0')) $code = html_entity_decode($code);
+       if ((getOutputMode() != '0') || ($outputMode != '0')) $code = decodeEntities($code);
 
        // Return compiled code
        //* DEBUG: */ die('<pre>'.htmlentities($code).'</pre>');
index 9376897..8b57a86 100644 (file)
@@ -2597,34 +2597,33 @@ function getMessageFromErrorCode ($code) {
        $message = '';
        switch ($code) {
                case '': break;
-               case getCode('LOGOUT_DONE')      : $message = getMessage('LOGOUT_DONE'); break;
-               case getCode('LOGOUT_FAILED')    : $message = "<span class=\"guest_failed\">{--LOGOUT_FAILED--}</span>"; break;
-               case getCode('DATA_INVALID')     : $message = getMessage('MAIL_DATA_INVALID'); break;
-               case getCode('POSSIBLE_INVALID') : $message = getMessage('MAIL_POSSIBLE_INVALID'); break;
-               case getCode('ACCOUNT_LOCKED')   : $message = getMessage('MEMBER_ACCOUNT_LOCKED_UNC'); break;
-               case getCode('USER_404')         : $message = getMessage('USER_404'); break;
-               case getCode('STATS_404')        : $message = getMessage('MAIL_STATS_404'); break;
-               case getCode('ALREADY_CONFIRMED'): $message = getMessage('MAIL_ALREADY_CONFIRMED'); break;
-               case getCode('WRONG_PASS')       : $message = getMessage('LOGIN_WRONG_PASS'); break;
-               case getCode('WRONG_ID')         : $message = getMessage('LOGIN_WRONG_ID'); break;
-               case getCode('ID_LOCKED')        : $message = getMessage('LOGIN_ID_LOCKED'); break;
-               case getCode('ID_UNCONFIRMED')   : $message = getMessage('LOGIN_ID_UNCONFIRMED'); break;
-               case getCode('ID_GUEST')         : $message = getMessage('LOGIN_ID_GUEST'); break;
-               case getCode('COOKIES_DISABLED') : $message = getMessage('LOGIN_COOKIES_DISABLED'); break;
-               case getCode('BEG_SAME_AS_OWN')  : $message = getMessage('BEG_SAME_UID_AS_OWN'); break;
-               case getCode('LOGIN_FAILED')     : $message = getMessage('LOGIN_FAILED_GENERAL'); break;
-               case getCode('MODULE_MEM_ONLY')  : $message = sprintf(getMessage('MODULE_MEM_ONLY'), getRequestElement('mod')); break;
-               case getCode('OVERLENGTH')       : $message = getMessage('MEMBER_TEXT_OVERLENGTH'); break;
-               case getCode('URL_FOUND')        : $message = getMessage('MEMBER_TEXT_CONTAINS_URL'); break;
-               case getCode('SUBJ_URL')         : $message = getMessage('MEMBER_SUBJ_CONTAINS_URL'); break;
-               case getCode('BLIST_URL')        : $message = "{--MEMBER_URL_BLACK_LISTED--}<br />\n{--MEMBER_BLIST_TIME--}: ".generateDateTime(getRequestElement('blist'), 0); break;
-               case getCode('NO_RECS_LEFT')     : $message = getMessage('MEMBER_SELECTED_MORE_RECS'); break;
-               case getCode('INVALID_TAGS')     : $message = getMessage('MEMBER_HTML_INVALID_TAGS'); break;
-               case getCode('MORE_POINTS')      : $message = getMessage('MEMBER_MORE_POINTS_NEEDED'); break;
-               case getCode('MORE_RECEIVERS1')  : $message = getMessage('MEMBER_ENTER_MORE_RECEIVERS'); break;
-               case getCode('MORE_RECEIVERS2')  : $message = getMessage('MEMBER_NO_MORE_RECEIVERS_FOUND'); break;
-               case getCode('MORE_RECEIVERS3')  : $message = sprintf(getMessage('MEMBER_ENTER_MORE_MIN_RECEIVERS'), getConfig('order_min')); break;
-               case getCode('INVALID_URL')      : $message = getMessage('MEMBER_ENTER_INVALID_URL'); break;
+               case getCode('LOGOUT_DONE')       : $message = getMessage('LOGOUT_DONE'); break;
+               case getCode('LOGOUT_FAILED')     : $message = '<span class="guest_failed">{--LOGOUT_FAILED--}</span>'; break;
+               case getCode('DATA_INVALID')      : $message = getMessage('MAIL_DATA_INVALID'); break;
+               case getCode('POSSIBLE_INVALID')  : $message = getMessage('MAIL_POSSIBLE_INVALID'); break;
+               case getCode('ACCOUNT_LOCKED')    : $message = getMessage('MEMBER_ACCOUNT_LOCKED_UNC'); break;
+               case getCode('USER_404')          : $message = getMessage('USER_404'); break;
+               case getCode('STATS_404')         : $message = getMessage('MAIL_STATS_404'); break;
+               case getCode('ALREADY_CONFIRMED') : $message = getMessage('MAIL_ALREADY_CONFIRMED'); break;
+               case getCode('WRONG_PASS')        : $message = getMessage('LOGIN_WRONG_PASS'); break;
+               case getCode('WRONG_ID')          : $message = getMessage('LOGIN_WRONG_ID'); break;
+               case getCode('STATUS_LOCKED')     : $message = getMessage('LOGIN_STATUS_LOCKED'); break;
+               case getCode('STATUS_UNCONFIRMED'): $message = getMessage('LOGIN_STATUS_UNCONFIRMED'); break;
+               case getCode('COOKIES_DISABLED')  : $message = getMessage('LOGIN_COOKIES_DISABLED'); break;
+               case getCode('BEG_SAME_AS_OWN')   : $message = getMessage('BEG_SAME_UID_AS_OWN'); break;
+               case getCode('LOGIN_FAILED')      : $message = getMessage('LOGIN_FAILED_GENERAL'); break;
+               case getCode('MODULE_MEM_ONLY')   : $message = sprintf(getMessage('MODULE_MEM_ONLY'), getRequestElement('mod')); break;
+               case getCode('OVERLENGTH')        : $message = getMessage('MEMBER_TEXT_OVERLENGTH'); break;
+               case getCode('URL_FOUND')         : $message = getMessage('MEMBER_TEXT_CONTAINS_URL'); break;
+               case getCode('SUBJ_URL')          : $message = getMessage('MEMBER_SUBJ_CONTAINS_URL'); break;
+               case getCode('BLIST_URL')         : $message = "{--MEMBER_URL_BLACK_LISTED--}<br />\n{--MEMBER_BLIST_TIME--}: ".generateDateTime(getRequestElement('blist'), 0); break;
+               case getCode('NO_RECS_LEFT')      : $message = getMessage('MEMBER_SELECTED_MORE_RECS'); break;
+               case getCode('INVALID_TAGS')      : $message = getMessage('MEMBER_HTML_INVALID_TAGS'); break;
+               case getCode('MORE_POINTS')       : $message = getMessage('MEMBER_MORE_POINTS_NEEDED'); break;
+               case getCode('MORE_RECEIVERS1')   : $message = getMessage('MEMBER_ENTER_MORE_RECEIVERS'); break;
+               case getCode('MORE_RECEIVERS2')   : $message = getMessage('MEMBER_NO_MORE_RECEIVERS_FOUND'); break;
+               case getCode('MORE_RECEIVERS3')   : $message = sprintf(getMessage('MEMBER_ENTER_MORE_MIN_RECEIVERS'), getConfig('order_min')); break;
+               case getCode('INVALID_URL')       : $message = getMessage('MEMBER_ENTER_INVALID_URL'); break;
 
                case getCode('ERROR_MAILID'):
                        if (isExtensionActive('mailid', true)) {
index bdee727..ea24dda 100644 (file)
@@ -305,9 +305,8 @@ addMessages(array(
        'LOGIN_UNKNOWN_CODE' => "Unbekannter R&uuml;ckgabewert.",
        'LOGIN_WRONG_PASS' => "Falsches Passwort eingegben.",
        'LOGIN_WRONG_ID' => "Es wurde kein Account unter Ihren eingegebenen Logindaten gefunden.",
-       'LOGIN_ID_LOCKED' => "Ihr Account wurde gesperrt.",
-       'LOGIN_ID_UNCONFIRMED' => "Bitte best&auml;tigen Sie erst Ihre Email-Adresse! Haben Sie den Best&auml;tigungslink verloren? Links im Men&uuml; unter &quot;Best&auml;tigungslink&quot; k&ouml;nnen Sie ihn erneut anfordern.",
-       'LOGIN_ID_GUEST' => "Es ist etwas beim Anmelden schief gelaufen. Dies sollte nicht vorkommen. status=guest",
+       'LOGIN_STATUS_LOCKED' => "Ihr Account wurde gesperrt.",
+       'LOGIN_STATUS_UNCONFIRMED' => "Bitte best&auml;tigen Sie erst Ihre Email-Adresse! Haben Sie den Best&auml;tigungslink verloren? Links im Men&uuml; unter &quot;Best&auml;tigungslink&quot; k&ouml;nnen Sie ihn erneut anfordern.",
        'LOGIN_COOKIES_DISABLED' => "Sie haben in Ihrem Browser entweder die Cookies ausgeschaltet, oder die Sicherheitsstufe ist zu hoch eingestellt.",
        'GUEST_REG_POINTS_1' => "F&uuml;r Ihre Anmeldung haben wir Ihnen als Willkommensgutschrift",
        'GUEST_REG_POINTS_2' => "{?POINTS?} gutgeschrieben. Sie k&ouml;nnen bereits jetzt schon Mails an die anderen Mitglieder verschicken - solange Empf&auml;nger auch erreichbar sind.",
index a75b9d7..9dab316 100644 (file)
@@ -79,7 +79,7 @@ function getNickname ($userid) {
                $result = false;
 
                // Nickname or userid used?
-               if (''.round($userid).'' === ''.$userid.'') {
+               if ('' . round($userid) . '' === '' . $userid . '') {
                        // Userid given, so try to load user data
                        if (fetchUserData($userid)) {
                                // Load nickname from database
index d983247..6e37a97 100644 (file)
@@ -398,15 +398,12 @@ function WERNIS_ADD_FEES_TO_ARRAY (&$array) {
        } // END - if
 
        // Add both factors
-       $array['payout_factor']        = translateComma(getConfig('wernis_payout_factor'));
        $array['withdraw_factor']      = translateComma(getConfig('wernis_withdraw_factor'));
 
        // Add all fees
-       $array['payout_fee_percent']   = translateComma(getConfig('wernis_payout_fee_percent'));
        $array['withdraw_fee_percent'] = translateComma(getConfig('wernis_withdraw_fee_percent'));
-       $array['payout_fee_fix']       = translateComma(getConfig('wernis_payout_fee_fix'));
        $array['withdraw_fee_fix']     = translateComma(getConfig('wernis_withdraw_fee_fix'));
 }
 
-//
+// [EOF]
 ?>
index 9bf3915..f29ca38 100644 (file)
@@ -80,11 +80,6 @@ if (!empty($sql)) {
        // The SQL command needs to be finisched here (only confirmed accounts!)
        $sql .= ") AND `status`='CONFIRMED' ORDER BY `last_online` ASC";
 
-       // Prepare data for the template
-       $content['min_points'] = translateComma(getConfig('beg_points'));
-       $content['max_points'] = translateComma(getConfig('beg_points_max'));
-       $content['max_winner'] = round(getConfig('beg_ranks'));
-
        // No IP locking setuped by default
        $content['ip_locker'] = getMessage('BEG_NO_LIMITATION');
 
index 461184e..5f8cef9 100644 (file)
@@ -245,7 +245,7 @@ if ((SQL_NUMROWS($result_mem) > 0) && ($display)) {
 // Free result
 SQL_FREERESULT($result_mem);
 
-// Add new paypout type
+// Add new payout type
 if ($display === true) loadTemplate('admin_payout_add_new');
 
 // [EOF]
index db31390..f7f0d0a 100644 (file)
@@ -39,7 +39,7 @@
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!isAdmin())) {
        die();
-}
+} // END - if
 
 // Add description as navigation point
 addMenuDescription('admin', __FILE__);
index 8e0ca10..940e272 100644 (file)
@@ -51,45 +51,19 @@ if ((!isExtensionActive('beg')) && (!isAdmin())) {
        return;
 } // END - if
 
-// Get userid
-$userid = getMemberId();
-
-if (isExtensionActive('nickname')) {
-       // Load nickname
-       $data = 'nickname';
+// Prepare constants
+if ((isExtensionActive('nickname')) && (getUserData('nickname') != '')) {
+       // Get nickname
+       $content['userid'] = getUserData('nickname');
 } else {
-       // Load userid
-       $data = 'userid';
+       // Get userid
+       $content['userid'] = getMemberId();
 }
 
-// Run SQL command
-$result = SQL_QUERY_ESC("SELECT
-       `".$data."`, `beg_clicks`
-FROM
-       `{?_MYSQL_PREFIX?}_user_data`
-WHERE
-       `userid`=%s
-LIMIT 1", array($userid), __FILE__, __LINE__);
-
-list($userid, $clicks) = SQL_FETCHROW($result);
-
-// Free result
-SQL_FREERESULT($result);
-
-// Set user id when no nickname was found
-$nickname = true;
-if (empty($userid)) { $userid = getMemberId(); $nickname = false; }
-
-// Prepare constants
-$content['userid'] = $userid;
-$content['clicks'] = $clicks;
-$content['points'] = translateComma(getConfig('beg_points'));
-$content['points_max'] = translateComma(getConfig('beg_points_max'));
-$content['timeout'] = createFancyTime(getConfig('beg_timeout'));
 // @TODO No more needed? define('__BEG_UID_TIMEOUT', createFancyTime(getConfig('beg_userid_timeout')));
 
 // Load template
-loadTemplate('member_' . substr(basename(__FILE__), 5, -4), false, $content);
+loadTemplate('member_beg', false, $content);
 
 // [EOF]
 ?>
index 9477d54..2d99333 100644 (file)
@@ -52,11 +52,9 @@ if ((!isExtensionActive('doubler')) && (!isAdmin())) {
 } // END - if
 
 // Percent values etc.
+// @TODO The '*100' is in the way to get moved into the template
 $content['charge'] = translateComma(getConfig('doubler_charge') * 100);
 $content['ref']    = translateComma(getConfig('doubler_ref') * 100);
-$content['total']  = translateComma(getConfig('doubler_points'));
-$content['min']    = translateComma(getConfig('doubler_min'));
-$content['max']    = translateComma(getConfig('doubler_max'));
 
 // Default refid is the userid
 $content['userid'] = getMemberId();
index f5ef2e4..25fff7a 100644 (file)
@@ -58,12 +58,6 @@ if (isFormSent()) {
                array(postRequestElement('html'), getMemberId()), __FILE__, __LINE__);
        loadTemplate('admin_settings_saved', false, getMessage('MEMBER_SETTINGS_SAVED'));
 } else {
-       // Load template for changing settings
-       if (!fetchUserData(getMemberId())) {
-               // Something really bad happened
-               debug_report_bug('No user account ' . getMemberId() . ' found.');
-       } // END - if
-
        // Prepare it
        $content['html_y'] = '';
        $content['html_n'] = '';
index 061743c..3390b85 100644 (file)
@@ -67,12 +67,6 @@ if (isPostRequestElementSet('notify')) $mode = 'notify'; // Switch off notificat
 
 switch ($mode) {
        case 'show': // Show his data
-               // Get user data
-               if (!fetchUserData(getMemberId())) {
-                       // Something really bad happended
-                       debug_report_bug('No user account ' . getMemberId() . ' found.');
-               } // END - if
-
                // Get line
                $content = merge_array($content, getUserDataArray());
 
@@ -83,7 +77,7 @@ switch ($mode) {
                // How far is last change on his profile away from now?
                if ((($content['last_update'] + getConfig('profile_lock')) > time()) && (!isAdmin()) && (getConfig('profile_lock') > 0)) {
                        // You cannot change your account
-                       $content['change'] = loadTemplate('admin_settings_saved', true, "<div class=\"member_failed\">".sprintf(getMessage('MEMBER_PROFILE_LOCKED'), generateDateTime($content['last_update'] + getConfig('profile_lock'), 0))."</div>");
+                       $content['change'] = loadTemplate('admin_settings_saved', true, '<div class="member_failed">' . sprintf(getMessage('MEMBER_PROFILE_LOCKED'), generateDateTime($content['last_update'] + getConfig('profile_lock'), 0)) . '</div>');
                } else {
                        // He is allowed to change his profile
                        $content['change'] = loadTemplate('member_mydata_button', true);
@@ -140,7 +134,7 @@ LIMIT 1",
                        $content['update_check'] = sprintf(getMessage('MEMBER_PROFILE_LOCKED'), generateDateTime($content['update_check'] + getConfig('profile_lock'), 0));
 
                        // You cannot change your account
-                       loadTemplate('member_mydata_locked', false, $content);
+                       loadTemplate('admin_settings_saved', false, $content['update_check']);
                } else {
                        // He is allowed to change his profile
                        foreach (array('gender_m','gender_f','gender_c') as $entry) {
@@ -195,12 +189,6 @@ LIMIT 1",
                break;
 
        case 'save': // Save entered data
-               // Load old email / password
-               if (!fetchUserData(getMemberId())) {
-                       // Something really bad happened
-                       debug_report_bug('No user account ' . getMemberId() . ' found.');
-               } // END - if
-
                // Get line
                $content = merge_array($content, getUserDataArray());
 
@@ -210,8 +198,9 @@ LIMIT 1",
                // How far is last change on his profile away from now?
                if (($content['update_check'] > time()) && (!isAdmin()) && (getConfig('profile_lock') > 0)) {
                        $content['update_check'] = generateDateTime($content['update_check'] + getConfig('profile_lock'), 0);
+
                        // You cannot change your account
-                       loadTemplate('member_mydata_locked', false, $content);
+                       loadTemplate('admin_settings_saved', false, $content['update_check']);
                } elseif ((!isEmailValid(postRequestElement('email'))) && (!isAdmin())) {
                        // Invalid email address!
                        loadTemplate('admin_settings_saved', false, getMessage('INVALID_EMAIL_ADDRESS_ENTERED'));
index ba12785..00e3bc4 100644 (file)
@@ -120,7 +120,7 @@ ORDER BY
                        while ($content = SQL_FETCHARRAY($result_payouts)) {
                                // Translate status
                                $content['status'] = getMessage('PAYOUT_MEMBER_STATUS_'.strtoupper($content['status']).'');
-                               $content['status'] = "<div class=\"member_failed\">".$content['status']."</div>";
+                               $content['status'] = '<div class="member_failed">' . $content['status'] . '</div>';
 
                                // Nothing entered must be secured in member/what-payputs.php !
                                if ($content['allow'] == 'Y') {
index 996b9dc..5234568 100644 (file)
@@ -114,12 +114,6 @@ SQL_FREERESULT($result_depths);
 // Put rows to constant for the main template
 $content['rows'] = $OUT;
 
-// Fetch user account
-if (!fetchUserData(getMemberId())) {
-       // Something really bad happened
-       debug_report_bug('User account ' . getMemberId() . ' not found.');
-} // END - if
-
 // Initialize variables
 $CONFIRMED = '---'; $SENT = '---'; $RECEIVED = '---';
 
@@ -145,7 +139,6 @@ if (isExtensionInstalledAndNewer('user', '0.1.2')) {
 if ($TLOCK == '0') $TLOCK = '0.00000';
 
 // Remember several values in constants
-$content['used']  = translateComma(getUserData('used_points'));
 $content['sum']   = translateComma($totalPoints - getUserData('used_points'));
 $content['tref']  = $TREF;
 $content['tlock'] = translateComma($TLOCK);
@@ -198,7 +191,6 @@ if ((isExtensionInstalledAndNewer('bonus', '0.2.2')) && (isExtensionActive('bonu
 
 // Remeber values for the final template
 $content['receive']   = $RECEIVED;
-$content['pay']       = getUserData('ref_payout');
 $content['confirmed'] = $CONFIRMED;
 $content['sent']      = $SENT;
 
index 2a1322d..63f4d1e 100644 (file)
@@ -69,12 +69,6 @@ if (!isGetRequestElementSet('mode')) {
        // Get referal id
        $content['refid'] = getConfig(('primera_refid'));
 
-       // Are there some entries?
-       if (fetchUserData(getMemberId())) {
-               // Fetch id
-               $content['primera_nickname'] = getUserData('primera_nickname');
-       } // END - if
-
        // Is there an id?
        if ((!empty($content['primera_nickname'])) && (!isGetRequestElementSet('mode'))) {
                // Then use an other "mode"
@@ -129,17 +123,7 @@ if (getRequestElement('mode') == 'pay') {
        }
 
        // Add points to content array
-       $content['points']     = $points;
-       $content['min_points'] = translateComma(getConfig('primera_min_payout'));
-
-       // Get Primera id
-       $content['primera_nickname'] = '';
-
-       // Do we have a user account? (should be!)
-       if (fetchUserData(getMemberId())) {
-               // Fetch id
-               $content['primera_nickname'] = getUserData('primera_nickname');
-       } // END - if
+       $content['points'] = $points;
 } else {
        // Invalid mode!
        loadTemplate('admin_settings_saved', false, sprintf(getMessage('PRIMERA_MEMBER_MODE_INVALID'), getRequestElement('mode')));
index 9d1525d..c42e21d 100644 (file)
@@ -95,8 +95,6 @@ if ((isPostRequestElementSet('edit')) && (isPostRequestElementSet('id'))) {
 
                // Translate comma
                $content['refback'] = translateComma($content['refback']);
-               $content['min']     = translateComma(getConfig('refback_min_perc').".0");
-               $content['max']     = translateComma(getConfig('refback_max_perc').".0");
 
                // Load form for editing
                loadTemplate('member_refback_edit', false, $content);
index 7a02cde..6bc1bce 100644 (file)
@@ -46,14 +46,7 @@ if (!defined('__SECURITY')) {
 // Add description as navigation point
 addMenuDescription('member', __FILE__);
 
-// Load current referal clicks
-if (!fetchUserData(getMemberId())) {
-       // Something really bad happened
-       debug_report_bug('No user account ' . getMemberId() . ' found.');
-} // END - if
-
 // Prepare some data
-$content['ref_clicks']       = getUserData('ref_clicks');
 $content['userid']           = getMemberId();
 $content['nickname_content'] = '';
 
index 993a122..b228e82 100644 (file)
@@ -51,12 +51,6 @@ if ((!isExtensionActive('transfer')) && (!isAdmin())) {
        return;
 } // END - if
 
-// Load data
-if (!fetchUserData(getMemberId())) {
-       // Something really bad happened
-       debug_report_bug('No user account ' . getMemberId() . ' found.');
-} // END - if
-
 // Check for mode in GET
 $mode = '';
 if (isGetRequestElementSet('mode')) $mode = getRequestElement('mode');
index 1409dcc..657312b 100644 (file)
@@ -68,12 +68,6 @@ if ((!isGetRequestElementSet('mode')) || (getRequestElement('mode') == 'choose')
        $content['refid']    = getConfig(('wernis_refid'));
        $content['wernis_userid'] = '0';
 
-       // Are there some entries?
-       if (fetchUserData(getMemberId())) {
-               // Fetch id
-               $content['wernis_userid'] = getUserData('wernis_userid');
-       } // END - if
-
        // Is there an id?
        if ((!empty($content['wernis_userid'])) && (!isGetRequestElementSet('mode'))) {
                // Then use an other "mode"
@@ -150,36 +144,22 @@ if ((!isGetRequestElementSet('mode')) || (getRequestElement('mode') == 'choose')
 
        // Add points to content array
        $content['points']     = translateComma($points);
-       $content['min_points'] = translateComma(getConfig('wernis_min_payout'));
-
-       // Add fees to array
-       WERNIS_ADD_FEES_TO_ARRAY($content);
 
-       // Init WDS66 userid
-       $content['wernis_userid'] = '';
-
-       // Are there some entries?
-       if (fetchUserData(getMemberId())) {
-               // Fetch id
-               $content['wernis_userid'] = getUserData('wernis_userid');
-       } // END - if
+       // Get WDS66 username
+       $content['wernis_userid'] = getUserData('wernis_userid');
 } elseif ((getRequestElement('mode') == 'withdraw') && (getConfig('wernis_withdraw_active') == 'Y')) {
        // Get total points for just displaying them
        $points = countSumTotalData(getMemberId(), 'user_points', 'points') - countSumTotalData(getMemberId(), 'user_data', 'used_points');
 
        // Prepare data for the template
        $content['points']        = translateComma($points);
-       $content['min_points']    = translateComma(getConfig('wernis_min_withdraw'));
        $content['wernis_userid'] = '';
 
        // Add fees to array
        WERNIS_ADD_FEES_TO_ARRAY($content);
 
-       // Get WDS66 id
-       if (fetchUserData(getMemberId())) {
-               // Fetch id
-               $content['wernis_userid'] = getUserData('wernis_userid');
-       } // END - if
+       // Fetch id
+       $content['wernis_userid'] = getUserData('wernis_userid');
 } else {
        // Invalid mode!
        loadTemplate('admin_settings_saved', false, sprintf(getMessage('WERNIS_MEMBER_MODE_INVALID'), getRequestElement('mode')));
index 6bfb16c..f2509c8 100644 (file)
@@ -60,9 +60,6 @@ ORDER BY
        `userid` ASC", __FILE__, __LINE__);
 
 if (SQL_NUMROWS($result_bonus) > 0) {
-       // Remember stats bonus in constant
-       $content['points'] = translateComma(getConfig('bonus_stats'));
-
        // We found some mail orders...
        while ($content = merge_array($content, SQL_FETCHARRAY($result_bonus))) {
                // Add points
index 9836603..fb4feb0 100644 (file)
@@ -86,7 +86,6 @@ if (SQL_NUMROWS($result_birthday) > 0) {
                if (getConfig('birthday_points') > 0) {
                        // Add more entries to the array
                        $content['age']    = $age;
-                       $content['points'] = translateComma(getConfig('birthday_points'));
                        $content['check']  = '';
 
                        // @TODO 4 is hard-coded here, should we move it out in config?
index 668c29d..81539ec 100644 (file)
@@ -10,11 +10,11 @@ Soeben haben wir von {?MAIN_TITLE?} eine Bettel-Rallye gestartet.
 
 Hier alle Infos zur Bettel-Rallye:
 ------------------------------
-Minimale {?POINTS?} pro erfolgreichem Betteln: $content[min_points]
+Minimale {?POINTS?} pro erfolgreichem Betteln: {%config,translateComma=beg_points%}
 ------------------------------
-Maximale {?POINTS?} pro erfolgreichem Betteln: $content[min_points]
+Maximale {?POINTS?} pro erfolgreichem Betteln: {%config,translateComma=beg_points_max%}
 ------------------------------
-Maximale Gewinner dieser Bettel-Rallye: $content[max_winner]
+Maximale Gewinner dieser Bettel-Rallye: {%config,round=beg_ranks%}
 ------------------------------
 IP-Sperre: $content[ip_locker]
 ------------------------------
index a485184..1419146 100644 (file)
@@ -2,7 +2,7 @@ Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,fa
 
 Wir das Team von {?MAIN_TITLE?} w&uuml;nschen Ihnen alles Gute und Gesundheit zu Ihrem $content[age]. Geburtstag!
 
-Wenn Sie den folgenden Link anklicken, erhalten Sie $content[points] {?POINTS?} Ihrem Account sofort gutgeschrieben!
+Wenn Sie den folgenden Link anklicken, erhalten Sie {%config,translateComma=birthday_points%} {?POINTS?} Ihrem Account sofort gutgeschrieben!
 
 ----------------------------------------------------------------------
 {?URL?}/birthday_confirm.php?userid=$userid&check=$content[check]
index d0898ba..577e9fa 100644 (file)
@@ -1,6 +1,6 @@
 Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
-Sie haben soeben $content[points] {?POINTS?} auf Ihr Aktiv-Konto gutgeschrieben bekommen, da die folgende Werbebuchung 100% Klickrate erreicht hat:
+Sie haben soeben {%config,translateComma=bonus_stats%} {?POINTS?} auf Ihr Aktiv-Konto gutgeschrieben bekommen, da die folgende Werbebuchung 100% Klickrate erreicht hat:
 
 ------------------------------
 Ihre Mitglied-Id lautet: $userid
index 8dc07a9..9e3a236 100644 (file)
@@ -1,4 +1,5 @@
 <tr>
-       <td height="1%" align="center" class="guest_advert"><SMALL><a
-               href="#TOP">{--TOP--}</a></SMALL></td>
+       <td height="1%" align="center" class="guest_advert">
+               <div class="tiny"><a href="#TOP">{--TOP--}</a></div>
+       </td>
 </tr>
index 3821087..a3a6813 100644 (file)
@@ -8,14 +8,14 @@
        <tr>
                <td align="center" class="beg_msg" height="60">
                {--BEG_MEMBER_CLICKS_TOTAL--}:<br />
-               <strong>$content[clicks]</strong></td>
+               <strong>{%user,beg_clicks,translateComma%}</strong></td>
        </tr>
        <tr>
                <td align="left" class="beg_msg">
-               <P>{--BEG_MEMBER_EARN_1--} <strong>$content[points]
-               {?POINTS?}</strong> {--BEG_MEMBER_EARN_2--} <strong>$content[points_max]
+               <P>{--BEG_MEMBER_EARN_1--} <strong>{%config,translateComma=beg_points%}
+               {?POINTS?}</strong> {--BEG_MEMBER_EARN_2--} <strong>{%config,translateComma=beg_points_max%}
                {?POINTS?}</strong> {--BEG_MEMBER_EARN_3--}</P>
-               <P>{--BEG_MEMBER_TIMEOUT_1--} <strong>$content[timeout]</strong>
+               <P>{--BEG_MEMBER_TIMEOUT_1--} <strong>{%config,createFancyTime=beg_timeout%}</strong>
                {--BEG_MEMBER_TIMEOUT_2--}</P>
                <P align="right">{--BEG_MEMBER_HAVE_FUN--}</P>
                </td>
index bdda049..36bddd3 100644 (file)
@@ -27,8 +27,8 @@
        </div>
        <div class="doubler_main bottom" style="padding-left: 0px; padding-right: 10px; padding-top: 10px; padding-bottom: 10px">
                <ul>
-                       <li>{--DOUBLER_MINIMUM_IS--} <strong>$content[min] {?POINTS?}</strong> {--DOUBLER_MAXIMUM_IS--} <strong>$content[max] {?POINTS?}</strong></li>
-                       <li>{--DOUBLER_ALREADY_PAYED_1--} <strong>$content[total] {?POINTS?}</strong> {--DOUBLER_ALREADY_PAYED_2--}</li>
+                       <li>{--DOUBLER_MINIMUM_IS--} <strong>{%config,translateComma=doubler_min%} {?POINTS?}</strong> {--DOUBLER_MAXIMUM_IS--} <strong>{%config,translateComma=doubler_max%} {?POINTS?}</strong></li>
+                       <li>{--DOUBLER_ALREADY_PAYED_1--} <strong>{%config,translateComma=doubler_points%} {?POINTS?}</strong> {--DOUBLER_ALREADY_PAYED_2--}</li>
                        <li>{--DOUBLER_POINTS_LEFT_1--} <strong>$content[left] {?POINTS?}</strong> {--DOUBLER_POINTS_LEFT_2--}</li>
                        <li>{--DOUBLER_USAGE_COUNTER_1--} <strong>{?doubler_counter?}</strong> {--DOUBLER_USAGE_COUNTER_2--}</li>
                        <li>$content[payout_time]</li>
index 8dc07a9..9e3a236 100644 (file)
@@ -1,4 +1,5 @@
 <tr>
-       <td height="1%" align="center" class="guest_advert"><SMALL><a
-               href="#TOP">{--TOP--}</a></SMALL></td>
+       <td height="1%" align="center" class="guest_advert">
+               <div class="tiny"><a href="#TOP">{--TOP--}</a></div>
+       </td>
 </tr>
index 4aabcde..c396c1a 100644 (file)
@@ -24,7 +24,8 @@
                </td>
        </tr>
        <tr>
-               <td colspan="2" align="center">{--HOLIDAY_COMMENTS--}:<br />
+               <td colspan="2" align="center">
+                       {--HOLIDAY_COMMENTS--}:<br />
                        <textarea name="comments" class="member_normal" cols="50" rows="6"></textarea>
                </td>
        </tr>
index 0362a22..77ca7ce 100644 (file)
+<div align="center">
 <form accept-charset="utf-8" action="{%url=modules.php?module=login&amp;what=mydata%}" method="post">
-<table border="0" cellspacing="0" cellpadding="0" width="530" class="member_main dashed" align="center">
+<table border="0" cellspacing="0" cellpadding="0" class="member_table dashed">
        <tr>
-               <td colspan="5" height="7" class="seperator">&nbsp;</td>
-       </tr>
-       <tr>
-               <td width="10" rowspan="25">&nbsp;</td>
-               <td width="225" align="right">{--YOUR_LOGIN--}:</td>
-               <td width="10" class="seperator">&nbsp;</td>
-               <td width="225"><strong>$content[userid]</strong></td>
-               <td width="10" rowspan="25">&nbsp;</td>
-       </tr>
-       <tr>
-               <td colspan="3" height="3" class="seperator">&nbsp;</td>
+               <td class="member_header bottom" colspan="2">
+                       <strong>{--YOUR_LOGIN--}: $content[userid]</strong>
+               </td>
        </tr>
        <tr>
                <td align="right">{--GENDER--}:</td>
-               <td width="10" class="seperator">&nbsp;</td>
-               <td><select name="gender" size="1" class="member_select">
-                       <option value="M"$content[gender_m]>{--GENDER_M--}</option>
-                       <option value="F"$content[gender_f]>{--GENDER_F--}</option>
-                       <option value="C"$content[gender_c]>{--GENDER_C--}</option>
-               </select></td>
-       </tr>
-       <tr>
-               <td colspan="3" height="3" class="seperator">&nbsp;</td>
+               <td>
+                       <select name="gender" size="1" class="member_select">
+                               <option value="M"$content[gender_m]>{--GENDER_M--}</option>
+                               <option value="F"$content[gender_f]>{--GENDER_F--}</option>
+                               <option value="C"$content[gender_c]>{--GENDER_C--}</option>
+                       </select>
+               </td>
        </tr>
        <tr>
                <td align="right">{--SURNAME--}, {--FAMILY_NAME--}:</td>
-               <td width="10" class="seperator">&nbsp;</td>
                <td>
                        <input type="text" name="surname" class="member_normal" size="15" maxlength="255" value="$content[surname]" />
                        <input type="text" name="family" class="member_normal" size="15" maxlength="255" value="$content[family]" />
                </td>
        </tr>
        <tr>
-               <td colspan="3" height="3" class="seperator">&nbsp;</td>
-       </tr>
-       <tr>
                <td align="right">{--STREET_NR--}:</td>
-               <td width="10" class="seperator">&nbsp;</td>
                <td>
                        <input type="text" name="street_nr" class="member_normal" size="25" maxlength="255" value="$content[street_nr]" />
                </td>
        </tr>
        <tr>
-               <td colspan="3" height="3" class="seperator">&nbsp;</td>
-       </tr>
-       <tr>
                <td align="right">{--COUNTRY--}, {--ZIP--}, {--CITY--}:</td>
-               <td width="10" class="seperator">&nbsp;</td>
-               <td>$content[country]&nbsp; <input type="text" name="zip"
-                       class="member_normal" size="5" maxlength="10" value="$content[zip]" />&nbsp;
-               <input type="text" name="city" class="member_normal" size="20"
-                       maxlength="255" value="$content[city]" /></td>
-       </tr>
-       <tr>
-               <td colspan="3" height="3" class="seperator">&nbsp;</td>
+               <td>
+                       $content[country]
+                       <input type="text" name="zip" class="member_normal" size="5" maxlength="10" value="$content[zip]" />
+                       <input type="text" name="city" class="member_normal" size="20" maxlength="255" value="$content[city]" />
+               </td>
        </tr>
        <tr>
                <td align="right">{--EMAIL_ADDRESS--}:</td>
-               <td width="10" class="seperator">&nbsp;</td>
-               <td><input type="text" name="email" class="member_normal"
-                       size="30" maxlength="255" value="$content[email]" /></td>
-       </tr>
-       <tr>
-               <td colspan="3" height="3" class="seperator">&nbsp;</td>
-       </tr>
-       <tr>
-               <td align="right">{--BIRTHDAY--}:</td>
-               <td width="10" class="seperator">&nbsp;</td>
-               <td>$content[dob]</td>
-       </tr>
-       <tr>
-               <td colspan="3" height="3" class="seperator">&nbsp;</td>
-       </tr>
-       <tr>
-               <td align="center" colspan="3">$content[max_receive_list]</td>
-       </tr>
-       <tr>
-               <td colspan="3" height="7" class="seperator">&nbsp;</td>
-       </tr>
-       <tr>
-               <td colspan="3" height="3" class="seperator member_note_bg">&nbsp;</td>
+               <td>
+                       <input type="text" name="email" class="member_normal" size="30" maxlength="255" value="$content[email]" />
+               </td>
        </tr>
        <tr>
-               <td colspan="3" align="center" class="member_note_bg"><span
-                       class="member_note">{--MYDATA_NOTE--}</span></td>
+               <td class="bottom" align="right">{--BIRTHDAY--}:</td>
+               <td class="bottom">$content[dob]</td>
        </tr>
        <tr>
-               <td colspan="3" height="3" class="seperator member_note_bg">&nbsp;</td>
+               <td class="bottom" align="center" colspan="2">$content[max_receive_list]</td>
        </tr>
        <tr>
-               <td colspan="3" height="7" class="seperator">&nbsp;</td>
+               <td class="bottom" colspan="2" align="center">
+                       <span class="member_note">{--MYDATA_NOTE--}</span>
+               </td>
        </tr>
        <tr>
                <td align="right">{--PASS_1--}:</td>
-               <td width="10" class="seperator">&nbsp;</td>
-               <td><input type="password" name="pass1" class="member_normal"
-                       size="25" maxlength="255"></td>
-       </tr>
-       <tr>
-               <td colspan="3" height="3" class="seperator">&nbsp;</td>
-       </tr>
-       <tr>
-               <td align="right">{--PASS_2--}:</td>
-               <td width="10" class="seperator">&nbsp;</td>
-               <td><input type="password" name="pass2" class="member_normal"
-                       size="25" maxlength="255"></td>
-       </tr>
-       <tr>
-               <td colspan="3" height="7" class="seperator">&nbsp;</td>
+               <td>
+                       <input type="password" name="pass1" class="member_normal" size="10" maxlength="255" />
+               </td>
        </tr>
        <tr>
-               <td colspan="3" align="center"><input type="reset"
-                       class="member_reset" value="{--CLEAR_FORM--}" />&nbsp;<input
-                       type="submit" name="save" class="member_submit"
-                       value="{--SAVE_CHANGES--}" /></td>
+               <td class="bottom" align="right">{--PASS_2--}:</td>
+               <td class="bottom">
+                       <input type="password" name="pass2" class="member_normal" size="10" maxlength="255" />
+               </td>
        </tr>
        <tr>
-               <td colspan="5" height="7" class="seperator">&nbsp;</td>
+               <td colspan="2" class="member_footer" align="center">
+                       <input type="reset" class="member_reset" value="{--CLEAR_FORM--}" />
+                       <input type="submit" name="save" class="member_submit" value="{--SAVE_CHANGES--}" />
+               </td>
        </tr>
 </table>
 </form>
+</div>
index b42a053..11f5d85 100644 (file)
@@ -1,11 +1 @@
-<table border="0" cellspacing="0" cellpadding="0" width="480" class="member_main dashed" align="center">
-       <tr>
-               <td height="7" class="seperator">&nbsp;</td>
-       </tr>
-       <tr>
-               <td align="center">$content[update_check]</td>
-       </tr>
-       <tr>
-               <td height="7" class="seperator">&nbsp;</td>
-       </tr>
-</table>
\ No newline at end of file
+<!-- @DEPRECATED //-->
index 4c48d7b..1b5c20b 100644 (file)
@@ -1,99 +1,53 @@
-<table border="0" cellspacing="0" cellpadding="0" class="member_main dashed" align="center">
+<div align="center">
+<table border="0" cellspacing="0" cellpadding="0" class="member_table dashed">
        <tr>
-               <td colspan="7" height="3" class="seperator">&nbsp;</td>
-       </tr>
-       <tr>
-               <td width="10" rowspan="$content[rowspan]"></td>
-               <td align="center" width="238" class="member_header"><strong>{--REF_LEVEL--}</strong></td>
-               <td width="2" class="member_header"></td>
-               <td align="center" width="228" class="member_header"><strong>{?POINTS?}</strong></td>
-               <td width="2" class="member_header"></td>
-               <td align="center" width="100" class="member_header"><strong>{--REFERALS--}</strong></td>
-               <td width="10" rowspan="$content[rowspan]"></td>
+               <td align="center" class="member_header bottom"><strong>{--REF_LEVEL--}</strong></td>
+               <td align="center" class="member_header bottom"><strong>{?POINTS?}</strong></td>
+               <td align="center" class="member_header bottom"><strong>{--REFERALS--}</strong></td>
        </tr>
        $content[rows]
        <tr>
-               <td colspan="5" height="5" class="seperator">&nbsp;</td>
-       </tr>
-       <tr>
-               <td class="member_data">&nbsp;&nbsp;{--POINTS_USED--}</td>
-               <td width="2" class="seperator">&nbsp;</td>
-               <td class="member_data">&nbsp;&nbsp;$content[used] {?POINTS?}</td>
-               <td width="2" class="seperator">&nbsp;</td>
-               <td class="member_data">&nbsp;</td>
+               <td class="member_data bottom">&nbsp;{--POINTS_USED--}</td>
+               <td class="member_data bottom">&nbsp;{%user,used_points,translateComma%} {?POINTS?}</td>
+               <td class="member_data bottom">&nbsp;</td>
        </tr>
        <tr>
-               <td colspan="5" height="1" class="seperator">&nbsp;</td>
-       </tr>
-       <tr>
-               <td class="member_data">&nbsp;&nbsp;<strong>{--POINTS_SUM--}</strong></td>
-               <td width="2" class="seperator">&nbsp;</td>
-               <td class="member_data">
-                       &nbsp;&nbsp;<strong>$content[sum] {?POINTS?}</strong>
+               <td class="member_data bottom">&nbsp;<strong>{--POINTS_SUM--}</strong></td>
+               <td class="member_data bottom">
+                       &nbsp;<strong>$content[sum] {?POINTS?}</strong>
                </td>
-               <td width="2" class="seperator">&nbsp;</td>
-               <td class="member_data">&nbsp;&nbsp;<strong>$content[tref]</strong></td>
-       </tr>
-       <tr>
-               <td colspan="5" height="5" class="seperator">&nbsp;</td>
+               <td class="member_data bottom" align="center"><strong>$content[tref]</strong></td>
        </tr>
        <tr>
-               <td class="member_data">&nbsp;&nbsp;{--POINTS_LOCKED--}</td>
-               <td width="2" class="seperator">&nbsp;</td>
-               <td class="member_data">&nbsp;&nbsp;$content[tlock] {?POINTS?}</td>
-               <td width="2" class="seperator">&nbsp;</td>
+               <td class="member_data">&nbsp;{--POINTS_LOCKED--}</td>
+               <td class="member_data">&nbsp;$content[tlock] {?POINTS?}</td>
                <td class="member_data">&nbsp;</td>
        </tr>
        $content[special_rows]
        <tr>
-               <td colspan="5" height="2" class="seperator">&nbsp;</td>
-       </tr>
-       <tr>
-               <td colspan="5" class="member_header">
+               <td colspan="3" class="member_header bottom top">
                        <div align="center"><strong>{--CLICK_STATISTICS--}</strong></div>
                </td>
        </tr>
        <tr>
-               <td colspan="5" height="2" class="seperator">&nbsp;</td>
-       </tr>
-       <tr>
-               <td class="member_data">&nbsp;&nbsp;{--RECEIVED_MAILS--}:</td>
-               <td width="2" class="seperator">&nbsp;</td>
-               <td class="member_data">&nbsp;&nbsp;$content[receive]</td>
-               <td width="2" class="seperator">&nbsp;</td>
+               <td class="member_data">&nbsp;{--RECEIVED_MAILS--}:</td>
+               <td class="member_data">&nbsp;$content[receive]</td>
                <td class="member_data">&nbsp;</td>
        </tr>
        <tr>
-               <td colspan="5" height="1" class="seperator">&nbsp;</td>
-       </tr>
-       <tr>
-               <td class="member_data">&nbsp;&nbsp;{--UNCONFIRMED_LOCKED--}:</td>
-               <td width="2" class="seperator">&nbsp;</td>
-               <td class="member_data">&nbsp;&nbsp;$content[pay]</td>
-               <td width="2" class="seperator">&nbsp;</td>
+               <td class="member_data">&nbsp;{--UNCONFIRMED_LOCKED--}:</td>
+               <td class="member_data">&nbsp;{%user,ref_payout%}</td>
                <td class="member_data">&nbsp;</td>
        </tr>
        <tr>
-               <td colspan="5" height="1" class="seperator">&nbsp;</td>
-       </tr>
-       <tr>
-               <td class="member_data">&nbsp;&nbsp;{--CONFIRMED_MAILS--}:</td>
-               <td width="2" class="seperator">&nbsp;</td>
-               <td class="member_data">&nbsp;&nbsp;$content[confirmed]</td>
-               <td width="2" class="seperator">&nbsp;</td>
+               <td class="member_data">&nbsp;{--CONFIRMED_MAILS--}:</td>
+               <td class="member_data">&nbsp;$content[confirmed]</td>
                <td class="member_data">&nbsp;</td>
        </tr>
        <tr>
-               <td colspan="5" height="1" class="seperator">&nbsp;</td>
-       </tr>
-       <tr>
-               <td class="member_data">&nbsp;&nbsp;{--SENT_MAILS--}:</td>
-               <td width="2" class="seperator">&nbsp;</td>
-               <td class="member_data">&nbsp;&nbsp;$content[sent]</td>
-               <td width="2" class="seperator">&nbsp;</td>
+               <td class="member_data">&nbsp;{--SENT_MAILS--}:</td>
+               <td class="member_data">&nbsp;$content[sent]</td>
                <td class="member_data">&nbsp;</td>
        </tr>
-       <tr>
-               <td colspan="7" height="3" class="seperator">&nbsp;</td>
-       </tr>
 </table>
+</div>
index 67a25a7..59effa6 100644 (file)
@@ -1,8 +1,5 @@
 <tr>
-       <td colspan="5" height="2" class="seperator">&nbsp;</td>
-</tr>
-<tr>
-       <td colspan="7" align="center" class="member_header">
+       <td colspan="3" align="center" class="member_header">
                <strong>{--BONUS_POINTS_DISABLED--}</strong>
        </td>
 </tr>
index c5a4d61..ca0af4b 100644 (file)
@@ -1,76 +1,40 @@
 <tr>
-       <td colspan="3" height="2" class="seperator">&nbsp;</td>
-</tr>
-<tr>
-       <td colspan="5" align="center" class="member_header"><strong>{--BONUS_POINTS_TITLE--}</strong>
+       <td colspan="5" align="center" class="member_header bottom top">
+               <strong>{--BONUS_POINTS_TITLE--}</strong>
        </td>
 </tr>
 <tr>
-       <td colspan="3" height="2" class="seperator">&nbsp;</td>
-</tr>
-<tr>
-       <td colspan="5" class="member_data">
-       <div align="center" class="member_note">{--BONUS_LOGIN_TURBO_NOTE--}</div>
+       <td colspan="5" class="member_data bottom">
+               <div align="center" class="member_note">{--BONUS_LOGIN_TURBO_NOTE--}</div>
        </td>
 </tr>
 <tr>
-       <td colspan="3" height="5" class="seperator">&nbsp;</td>
-</tr>
-<tr>
-       <td class="member_data">&nbsp;&nbsp;{--BONUS_LOGIN_TOTAL--}</td>
-       <td width="2" class="seperator">&nbsp;</td>
-       <td class="member_data">&nbsp;&nbsp;$content[login] {?POINTS?}</td>
-       <td width="2" class="seperator">&nbsp;</td>
+       <td class="member_data">&nbsp;{--BONUS_LOGIN_TOTAL--}</td>
+       <td class="member_data">&nbsp;$content[login] {?POINTS?}</td>
        <td class="member_data">&nbsp;</td>
 </tr>
 <tr>
-       <td colspan="3" height="1" class="seperator">&nbsp;</td>
-</tr>
-<tr>
-       <td class="member_data">&nbsp;&nbsp;{--BONUS_TURBO_TOTAL--}</td>
-       <td width="2" class="seperator">&nbsp;</td>
-       <td class="member_data">&nbsp;&nbsp;$content[turbo] {?POINTS?}</td>
-       <td width="2" class="seperator">&nbsp;</td>
+       <td class="member_data">&nbsp;{--BONUS_TURBO_TOTAL--}</td>
+       <td class="member_data">&nbsp;$content[turbo] {?POINTS?}</td>
        <td class="member_data">&nbsp;</td>
 </tr>
 <tr>
-       <td colspan="3" height="1" class="seperator">&nbsp;</td>
-</tr>
-<tr>
-       <td class="member_data">&nbsp;&nbsp;{--BONUS_REF_TOTAL--}</td>
-       <td width="2" class="seperator">&nbsp;</td>
-       <td class="member_data">&nbsp;&nbsp;$content[ref] {?POINTS?}</td>
-       <td width="2" class="seperator">&nbsp;</td>
-       <td class="member_data">&nbsp;</td>
-</tr>
-<tr>
-       <td colspan="3" height="1" class="seperator">&nbsp;</td>
-</tr>
-<tr>
-       <td class="member_data">&nbsp;&nbsp;{--BONUS_ORDER_TOTAL--}</td>
-       <td width="2" class="seperator">&nbsp;</td>
-       <td class="member_data">&nbsp;&nbsp;$content[order] {?POINTS?}</td>
-       <td width="2" class="seperator">&nbsp;</td>
+       <td class="member_data">&nbsp;{--BONUS_REF_TOTAL--}</td>
+       <td class="member_data">&nbsp;$content[ref] {?POINTS?}</td>
        <td class="member_data">&nbsp;</td>
 </tr>
 <tr>
-       <td colspan="3" height="1" class="seperator">&nbsp;</td>
-</tr>
-<tr>
-       <td class="member_data">&nbsp;&nbsp;{--BONUS_STATS_TOTAL--}</td>
-       <td width="2" class="seperator">&nbsp;</td>
-       <td class="member_data">&nbsp;&nbsp;$content[stats] {?POINTS?}</td>
-       <td width="2" class="seperator">&nbsp;</td>
+       <td class="member_data">&nbsp;{--BONUS_ORDER_TOTAL--}</td>
+       <td class="member_data">&nbsp;$content[order] {?POINTS?}</td>
        <td class="member_data">&nbsp;</td>
 </tr>
 <tr>
-       <td colspan="3" height="5" class="seperator">&nbsp;</td>
+       <td class="member_data bottom">&nbsp;{--BONUS_STATS_TOTAL--}</td>
+       <td class="member_data bottom">&nbsp;$content[stats] {?POINTS?}</td>
+       <td class="member_data bottom">&nbsp;</td>
 </tr>
 <tr>
-       <td class="member_data">&nbsp;&nbsp;<strong>{--BONUS_TOTAL--}</strong></td>
-       <td width="2" class="seperator">&nbsp;</td>
-       <td class="member_data">&nbsp;&nbsp;<strong>$content[ttotal]
-       {?POINTS?}</strong></td>
-       <td width="2" class="seperator">&nbsp;</td>
+       <td class="member_data">&nbsp;<strong>{--BONUS_TOTAL--}</strong></td>
+       <td class="member_data">&nbsp;<strong>$content[ttotal] {?POINTS?}</strong></td>
        <td class="member_data">&nbsp;</td>
 </tr>
index 7c88d0f..b0d4eb0 100644 (file)
@@ -1,10 +1,5 @@
 <tr>
-       <td colspan="3" height="1" class="seperator">&nbsp;</td>
-</tr>
-<tr>
-       <td class="member_data">&nbsp;&nbsp;$content[level] {--REF_LEVEL--} ($content[percents]%)</td>
-       <td width="2" class="seperator">&nbsp;</td>
-       <td class="member_data">&nbsp;&nbsp;$content[points] {?POINTS?}</td>
-       <td width="2" class="seperator">&nbsp;</td>
-       <td class="member_data">&nbsp;&nbsp;$content[refs]</td>
+       <td class="member_data">&nbsp;$content[level] {--REF_LEVEL--} ($content[percents]%)</td>
+       <td class="member_data">&nbsp;$content[points] {?POINTS?}</td>
+       <td class="member_data" align="center">$content[refs]</td>
 </tr>
index fd32c4e..7e3cf2e 100644 (file)
@@ -1,10 +1,5 @@
 <tr>
-       <td colspan="5" height="5" class="seperator">&nbsp;</td>
-</tr>
-<tr>
-       <td colspan="7" align="center" class="member_data">
-               <strong class="admin_note">{--BONUS_EXTENSION_UPGRADE_1--}
-               <u>v0.2.2</u>
-               {--BONUS_EXTENSION_UPGRADE_2--}</strong>
+       <td colspan="3" align="center" class="member_data">
+               <strong class="admin_note">{--BONUS_EXTENSION_UPGRADE_1--}<u>v0.2.2</u>{--BONUS_EXTENSION_UPGRADE_2--}</strong>
        </td>
 </tr>
index f59e489..5093d08 100644 (file)
        <tr>
                <td width="315" class="bottom" height="25" align="right">{--PRIMERA_MEMBER_PAYOUT_MIN_POINTS--}</td>
                <td width="10" class="seperator bottom">&nbsp;</td>
-               <td width="115" class="bottom"><strong>$content[min_points]</strong> Primera</td>
-       </tr>
-       <tr>
-               <td colspan="3" height="3" class="seperator">&nbsp;</td>
+               <td width="115" class="bottom"><strong>{%config,translateComma=primera_min_payout%}</strong> Primera</td>
        </tr>
        <tr>
                <td width="315" height="35" align="right">{--PRIMERA_MEMBER_NICKNAME--}</td>
                <td width="10" class="seperator">&nbsp;</td>
-               <td width="115"><input type="text" name="primera_nickname" size="10" maxlength="255" value="$content[primera_nickname]" /></td>
+               <td width="115"><input type="text" name="primera_nickname" size="10" maxlength="255" value="{%user,primera_nickname%}" /></td>
        </tr>
        <tr>
                <td width="315" height="35" align="right">{--PRIMERA_MEMBER_PASSWORD--}</td>
@@ -34,9 +31,6 @@
                <td width="115"><input type="text" name="amount" size="10" maxlength="255" /></td>
        </tr>
        <tr>
-               <td colspan="3" height="3" class="seperator bottom">&nbsp;</td>
-       </tr>
-       <tr>
                <td colspan="3" align="center" class="member_footer">
                        <input type="reset" class="member_reset" value="{--CLEAR_FORM--}" />
                        <input type="submit" name="ok" class="member_submit" value="{--PRIMERA_MEMBER_PAYOUT_SUBMIT--}" />
index 67acd79..2b4e1b3 100644 (file)
@@ -1,29 +1,23 @@
+<div align="center">
 <form accept-charset="utf-8" action="{%url=modules.php?module=login&amp;what=refback%}" method="post">
 <input type="hidden" name="id" value="$content[id]" />
-<table border="0" cellspacing="0" cellpadding="0" class="member_table dashed" width="400">
-<tr>
-       <td align="center" class="member_header bottom" colspan="2">
-               <strong>{--MEMBER_REFBACK_EDIT_TITLE--}</strong><br />
-               <span class="member_note">{--MEMBER_REFBACK_REFID--}: $content[refid]</span>
-       </td>
-</tr>
-<tr>
-       <td width="60%" align="right" style="padding-right:5px">
-               {--MEMBER_REFBACK_PERCENTS--}:
-       </td>
-       <td width="40%">
-               <input type="text" class="member_normal" name="percents" size="6" maxlength="7" value="$content[refback]" /> %
-       </td>
-</tr>
-<tr>
-       <td align="center" class="member_footer" colspan="2">
-               <input type="reset" class="member_reset" value="{--CLEAR_FORM--}" />
-               <input type="submit" class="member_submit" name="edit" value="{--MEMBER_REFBACK_EDIT_SUBMIT--}" />
-       </td>
-</tr>
-</table>
+<div class="member_table dashed">
+<div class="member_header bottom">
+       <strong>{--MEMBER_REFBACK_EDIT_TITLE--}</strong><br />
+       <span class="member_note">{--MEMBER_REFBACK_REFID--}: $content[refid]</span>
+</div>
+<div class="bottom" align="center">
+       {--MEMBER_REFBACK_PERCENTS--}:
+       <input type="text" class="member_normal" name="percents" size="6" maxlength="7" value="$content[refback]" />%
+</div>
+<div class="member_footer">
+       <input type="reset" class="member_reset" value="{--CLEAR_FORM--}" />
+       <input type="submit" class="member_submit" name="edit" value="{--MEMBER_REFBACK_EDIT_SUBMIT--}" />
+</div>
+</div>
 </form>
+</div>
 
 <div class="member_note">
-       {--MEMBER_REFBACK_MIN_MAX_NOTE_1--}$content[min]{--MEMBER_REFBACK_MIN_MAX_NOTE_2--}$content[max]{--MEMBER_REFBACK_MIN_MAX_NOTE_3--}
+       {--MEMBER_REFBACK_MIN_MAX_NOTE_1--}{%config,translateComma=refback_min_perc%}{--MEMBER_REFBACK_MIN_MAX_NOTE_2--}{%config,translateComma=refback_max_perc%}{--MEMBER_REFBACK_MIN_MAX_NOTE_3--}
 </div>
index a582d3d..d63d90a 100644 (file)
@@ -6,7 +6,7 @@
 </div>
 $content[nickname_content]
 <div style="padding-top:5px">
-       {--YOUR_REFCLICKS--}: <strong>$content[ref_clicks]</strong> {--CLICKS--}
+       {--YOUR_REFCLICKS--}: <strong>{%user,ref_clicks,translateComma%}</strong> {--CLICKS--}
 </div>
 <div>
        $content[refbanner_content]
index bd27fee..2818a23 100644 (file)
@@ -12,7 +12,7 @@
        <tr>
                <td width="315" class="bottom" height="25" align="right">{--WERNIS_MEMBER_PAYOUT_MIN_POINTS--}</td>
                <td width="10" class="seperator bottom">&nbsp;</td>
-               <td width="115" class="bottom"><strong>$content[min_points]</strong> Wernis</td>
+               <td width="115" class="bottom"><strong>{%config,translateComma=wernis_min_payout%}</strong> Wernis</td>
        </tr>
        <tr>
                <td colspan="3" height="3" class="seperator">&nbsp;</td>
@@ -49,9 +49,9 @@
 </form>
 
 <div class="member_note">
-       Die Umrechnung von {?POINTS?} in Wernis enspricht derzeit <strong>$content[payout_factor]:1</strong>.
+       Die Umrechnung von {?POINTS?} in Wernis enspricht derzeit <strong>{%config,translateComma=wernis_payout_factor%}:1</strong>.
        Das auszahlungsf&auml;hige {?POINTS?}-Guthaben ist entweder um eine
-       prozentuale Geb&uuml;hr von <strong>$content[payout_fee_percent]%</strong>
-       oder um einen fixen Betrag von <strong>$content[payout_fee_fix] {?POINTS?}</strong>
+       prozentuale Geb&uuml;hr von <strong>{%config,translateComma=wernis_payout_fee_percent%}%</strong>
+       oder um einen fixen Betrag von <strong>{%config,translateComma=wernis_payout_fee_fix%} {?POINTS?}</strong>
        bereits reduziert.
 </div>
index 3f9e66b..bf92071 100644 (file)
@@ -13,7 +13,7 @@
        <tr>
                <td width="315" class="bottom" height="25" align="right">{--WERNIS_MEMBER_WITHDRAW_MIN_POINTS--}</td>
                <td width="10" class="seperator bottom">&nbsp;</td>
-               <td width="115" class="bottom"><strong>$content[min_points]</strong> Wernis</td>
+               <td width="115" class="bottom"><strong>{%config,translateComma=wernis_min_withdraw%}</strong> Wernis</td>
        </tr>
        <tr>
                <td colspan="3" height="3" class="seperator">&nbsp;</td>
@@ -43,9 +43,8 @@
                </td>
        </tr>
 </table>
-<br />
-<strong class="member_note">{--WERNIS_MEMBER_WITHDRAW_NOTE--}</strong>
 </form>
 
 <div class="member_note">
+       <strong class="member_note">{--WERNIS_MEMBER_WITHDRAW_NOTE--}</strong>
 </div>