New (template) wrapper function fixEmptyContentToDashes() introduced, EL rewrites:
authorRoland Häder <roland@mxchange.org>
Mon, 28 Jun 2010 21:38:03 +0000 (21:38 +0000)
committerRoland Häder <roland@mxchange.org>
Mon, 28 Jun 2010 21:38:03 +0000 (21:38 +0000)
- New (template) wrapper function fixEmptyContentToDashes() introduced, this
  function should help template writers to deal with empty content. If an empty
  string is detected, it got converted into three dashes. This may fix some
  issues with empty div and/or td tags.
- Even more rewrites to make use of EL
- TODOs.txt updated

155 files changed:
DOCS/TODOs.txt
inc/autopurge/purge-general.php
inc/autopurge/purge-inact.php
inc/autopurge/purge-mails.php
inc/autopurge/purge-tsks.php
inc/autopurge/purge-unconfirmed.php
inc/databases.php
inc/extensions-functions.php
inc/functions.php
inc/language/autopurge_de.php
inc/language/de.php
inc/language/holiday_de.php
inc/language/mods_de.php
inc/language/nickname_de.php
inc/language/order_de.php
inc/language/payout_de.php
inc/language/rallye_de.php
inc/language/register_de.php
inc/language/repair_de.php
inc/language/sponsor_de.php
inc/language/support_de.php
inc/language/top10_de.php
inc/language/transfer_de.php
inc/libs/bonus_functions.php
inc/libs/doubler_functions.php
inc/libs/holiday_functions.php
inc/libs/network_functions.php
inc/libs/rallye_functions.php
inc/libs/refback_functions.php
inc/libs/register_functions.php
inc/libs/sponsor_functions.php
inc/libs/surfbar_functions.php
inc/libs/transfer_functions.php
inc/libs/wernis_functions.php
inc/modules/admin/admin-inc.php
inc/modules/admin/overview-inc.php
inc/modules/admin/what-add_points.php
inc/modules/admin/what-config_admins.php
inc/modules/admin/what-config_email.php
inc/modules/admin/what-config_mods.php
inc/modules/admin/what-config_rallye_prices.php
inc/modules/admin/what-config_rewrite.php
inc/modules/admin/what-del_holiday.php
inc/modules/admin/what-edit_sponsor.php
inc/modules/admin/what-list_cats.php
inc/modules/admin/what-list_holiday.php
inc/modules/admin/what-list_links.php
inc/modules/admin/what-list_payouts.php
inc/modules/admin/what-list_primera.php
inc/modules/admin/what-list_rallyes.php
inc/modules/admin/what-list_sponsor.php
inc/modules/admin/what-list_surfbar_urls.php
inc/modules/admin/what-list_task.php
inc/modules/admin/what-list_user.php
inc/modules/admin/what-list_wernis.php
inc/modules/admin/what-lock_sponsor.php
inc/modules/admin/what-lock_user.php
inc/modules/admin/what-payments.php
inc/modules/admin/what-repair_cats.php
inc/modules/admin/what-stats_mods.php
inc/modules/admin/what-sub_points.php
inc/modules/admin/what-unlock_sponsor.php
inc/modules/admin/what-usr_online.php
inc/modules/guest/what-confirm.php
inc/modules/guest/what-sponsor_login.php
inc/modules/guest/what-sponsor_reg.php
inc/modules/guest/what-top10.php
inc/modules/member/what-categories.php
inc/modules/member/what-holiday.php
inc/modules/member/what-order.php
inc/modules/member/what-payout.php
inc/modules/member/what-points.php
inc/modules/member/what-refback.php
inc/modules/member/what-reflist.php
inc/modules/member/what-support.php
inc/modules/member/what-surfbar_list.php
inc/modules/member/what-transfer.php
inc/modules/member/what-unconfirmed.php
inc/modules/order.php
inc/mysql-manager.php
inc/pool/pool-user.php
inc/reset/reset_holiday.php
inc/wrapper-functions.php
templates/de/emails/done-admin.tpl
templates/de/emails/done-member.tpl
templates/de/emails/order-admin.tpl
templates/de/emails/order-member.tpl
templates/de/html/admin/admin_add_max.tpl
templates/de/html/admin/admin_config_admins_del_row.tpl
templates/de/html/admin/admin_config_admins_row.tpl
templates/de/html/admin/admin_config_cats.tpl
templates/de/html/admin/admin_config_email.tpl
templates/de/html/admin/admin_config_email_del_row.tpl
templates/de/html/admin/admin_config_email_edit_row.tpl
templates/de/html/admin/admin_config_email_row.tpl
templates/de/html/admin/admin_config_holiday.tpl
templates/de/html/admin/admin_config_nickname.tpl
templates/de/html/admin/admin_config_order.tpl
templates/de/html/admin/admin_config_rallye_del_row.tpl
templates/de/html/admin/admin_config_rallye_edit_row.tpl
templates/de/html/admin/admin_config_rallye_prices_row.tpl
templates/de/html/admin/admin_config_register2.tpl
templates/de/html/admin/admin_config_rewrite_rows.tpl
templates/de/html/admin/admin_config_top10.tpl
templates/de/html/admin/admin_del_cats.tpl
templates/de/html/admin/admin_del_network_params_row.tpl
templates/de/html/admin/admin_del_network_types_row.tpl
templates/de/html/admin/admin_edit_cats.tpl
templates/de/html/admin/admin_edit_email.tpl
templates/de/html/admin/admin_list_cats_404.tpl
templates/de/html/admin/admin_list_holiday.tpl
templates/de/html/admin/admin_list_holiday_row.tpl
templates/de/html/admin/admin_list_mods.tpl
templates/de/html/admin/admin_list_mods_row.tpl
templates/de/html/admin/admin_list_online_row.tpl
templates/de/html/admin/admin_list_payouts_row.tpl
templates/de/html/admin/admin_list_primera_row.tpl
templates/de/html/admin/admin_list_rallyes_row.tpl
templates/de/html/admin/admin_list_rallyes_row2.tpl
templates/de/html/admin/admin_list_surfbar_urls_row.tpl
templates/de/html/admin/admin_list_task_ext_rows.tpl
templates/de/html/admin/admin_list_task_rows.tpl
templates/de/html/admin/admin_list_user_row.tpl
templates/de/html/admin/admin_list_wernis_row.tpl
templates/de/html/admin/admin_mods_edit.tpl
templates/de/html/admin/admin_mods_stats.tpl
templates/de/html/admin/admin_mods_stats2.tpl
templates/de/html/admin/admin_mods_stats2_row.tpl
templates/de/html/admin/admin_mods_stats_row.tpl
templates/de/html/admin/admin_overview_list_ext_rows.tpl
templates/de/html/admin/admin_overview_list_rows.tpl
templates/de/html/admin/admin_task_holiday.tpl
templates/de/html/admin/admin_user_details.tpl
templates/de/html/guest/guest_rallye_row.tpl
templates/de/html/guest/guest_register.tpl
templates/de/html/guest/guest_stats_member.tpl
templates/de/html/guest/guest_top10_row_earner.tpl
templates/de/html/guest/guest_top10_row_login.tpl
templates/de/html/guest/guest_top10_row_refs.tpl
templates/de/html/member/member_mail_bonus_deleted.tpl
templates/de/html/member/member_mail_bonus_new.tpl
templates/de/html/member/member_mail_bonus_queue.tpl
templates/de/html/member/member_mail_bonus_send.tpl
templates/de/html/member/member_mail_normal_active.tpl
templates/de/html/member/member_mail_normal_admin.tpl
templates/de/html/member/member_mail_normal_deleted.tpl
templates/de/html/member/member_mail_normal_new.tpl
templates/de/html/member/member_mail_normal_send.tpl
templates/de/html/member/member_mail_normal_temp.tpl
templates/de/html/member/member_payout_row.tpl
templates/de/html/member/member_ref_list_level.tpl
templates/de/html/member/member_ref_list_row.tpl
templates/de/html/member/member_refback_list_row.tpl
templates/de/html/member/member_surfbar_list_row.tpl
templates/de/html/member/member_wernis_mode_list_row.tpl

index c6424c7..7b865d6 100644 (file)
 ./inc/extensions/ext-yoomedia.php:123:         // @TODO Can this be moved into a database table?
 ./inc/extensions/ext-yoomedia.php:56:// @TODO Only deprecated when 'ext-network' is ready! setExtensionDeprecated('Y');
 ./inc/extensions-functions.php:143:    // @TODO Do we still need this? setExtensionUpdateNotes('');
-./inc/extensions-functions.php:422:// @TODO Change from ext_id to ext_name (not just even the variable! ;-) )
-./inc/extensions-functions.php:538:            // @TODO Extension is loaded, what next?
-./inc/functions.php:1072:// @TODO $simple/$constants are deprecated
-./inc/functions.php:1099:      // @TODO Do only use $content and deprecate $GLOBALS and $DATA in templates
-./inc/functions.php:2379:      // @TODO This can be easily moved out after the merge from EL branch to this is complete
-./inc/functions.php:2528:              // @TODO Add a little more infos here
-./inc/functions.php:2612:                      // @TODO Move this SQL code into a function, let's say 'getTimestampFromPoolId($id) ?
-./inc/functions.php:2635:                      // @TODO Rewrite this old lost code to a template
+./inc/extensions-functions.php:428:// @TODO Change from ext_id to ext_name (not just even the variable! ;-) )
+./inc/extensions-functions.php:544:            // @TODO Extension is loaded, what next?
+./inc/functions.php:1065:// @TODO $simple/$constants are deprecated
+./inc/functions.php:1092:      // @TODO Do only use $content and deprecate $GLOBALS and $DATA in templates
+./inc/functions.php:2372:      // @TODO This can be easily moved out after the merge from EL branch to this is complete
+./inc/functions.php:2521:              // @TODO Add a little more infos here
+./inc/functions.php:2605:                      // @TODO Move this SQL code into a function, let's say 'getTimestampFromPoolId($id) ?
+./inc/functions.php:2628:                      // @TODO Rewrite this old lost code to a template
 ./inc/functions.php:266:       // @TODO Remove this sanity-check if all is fine
 ./inc/functions.php:269:       // @TODO Try to rewrite all $DATA to $content
-./inc/functions.php:2725:                      // @TODO Are these convertions still required?
-./inc/functions.php:2743:// @TODO Rewrite this function to use readFromFile() and writeToFile()
-./inc/functions.php:3619:// @TODO Lame description for this function
-./inc/functions.php:3638:                      // @TODO Move this in a filter
-./inc/functions.php:3762:      // @TODO This is still very static, rewrite it somehow
-./inc/functions.php:476:       // @TODO Do only use $content, not $DATA or raw variables
-./inc/functions.php:549:               // @TODO Extension 'msg' does not exist
-./inc/functions.php:612:// @TODO Rewrite this to an extension 'smtp'
+./inc/functions.php:2718:                      // @TODO Are these convertions still required?
+./inc/functions.php:2736:// @TODO Rewrite this function to use readFromFile() and writeToFile()
+./inc/functions.php:3620:// @TODO Lame description for this function
+./inc/functions.php:3639:                      // @TODO Move this in a filter
+./inc/functions.php:3763:      // @TODO This is still very static, rewrite it somehow
+./inc/functions.php:542:               // @TODO Extension 'msg' does not exist
+./inc/functions.php:605:// @TODO Rewrite this to an extension 'smtp'
 ./inc/install-functions.php:63:        // @TODO DEACTIVATED: changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', 'OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestParameter('omode'), 0);
 ./inc/language/de.php:1143:// @TODO Rewrite these two constants
 ./inc/language/de.php:1158:// @TODO Rewrite these three constants
 ./inc/libs/doubler_functions.php:46:// @TODO Lame description
 ./inc/libs/doubler_functions.php:94:                   // @TODO Can't this be moved into EL?
 ./inc/libs/mailid_functions.php:49:            // @TODO Rewrite this to a dynamic include or so
-./inc/libs/rallye_functions.php:708:// @TODO This function does not load min_users, min_prices, please encapsulate loading rallye data with e.g. getRallyeDataFromId()
-./inc/libs/rallye_functions.php:779:   $EXPIRE = 3; // @TODO The hard-coded value...
-./inc/libs/rallye_functions.php:865:// @TODO Please document this function
-./inc/libs/rallye_functions.php:921:           // Load count @TODO Can't we rewrite this to our API?
+./inc/libs/rallye_functions.php:703:// @TODO This function does not load min_users, min_prices, please encapsulate loading rallye data with e.g. getRallyeDataFromId()
+./inc/libs/rallye_functions.php:773:   $EXPIRE = 3; // @TODO The hard-coded value...
+./inc/libs/rallye_functions.php:859:// @TODO Please document this function
+./inc/libs/rallye_functions.php:915:           // Load count @TODO Can't we rewrite this to our API?
 ./inc/libs/refback_functions.php:61:           // @TODO Try to rewrite the following unset()
 ./inc/libs/register_functions.php:299: // @TODO Rewrite these all to a single filter
 ./inc/libs/register_functions.php:375: // @TODO Rewrite this to a filter
 ./inc/libs/register_functions.php:382: // @TODO Rewrite this whole if() block to addPointsThroughReferalSystem(). This will also make following if() block obsolete
 ./inc/libs/register_functions.php:383: // @TODO Wether the registration bonus should only be added to user directly or through referal system should be configurable
-./inc/libs/surfbar_functions.php:1547:         // @TODO This can be somehow rewritten
-./inc/libs/surfbar_functions.php:719:// @TODO Can't we use our new expression language instead of this ugly code?
-./inc/libs/surfbar_functions.php:963:  // @TODO Invalid salt should be refused
-./inc/libs/task_functions.php:245:             // @TODO These can be rewritten to filter
+./inc/libs/surfbar_functions.php:1541:         // @TODO This can be somehow rewritten
+./inc/libs/surfbar_functions.php:713:// @TODO Can't we use our new expression language instead of this ugly code?
+./inc/libs/surfbar_functions.php:957:  // @TODO Invalid salt should be refused
+./inc/libs/task_functions.php:241:             // @TODO These can be rewritten to filter
 ./inc/libs/task_functions.php:53:// @TODO Move all extension-dependent queries into filters
 ./inc/libs/theme_functions.php:95:     // @TODO Can't this be rewritten to an API function?
 ./inc/libs/user_functions.php:146:     // @TODO These two constants are no longer used, maybe we reactivate this code?
 ./inc/modules/admin/admin-inc.php:325:                                 // @TODO Rewrite this to $content = SQL_FETCHARRAY()
 ./inc/modules/admin/admin-inc.php:331:                                                 // @TODO ACL is 'allow'... hmmm
 ./inc/modules/admin/admin-inc.php:431:// @TODO Try to rewrite this to adminAddMenuSelectionBox()
-./inc/modules/admin/overview-inc.php:167:                              // @TODO Rewrite this to a filter
-./inc/modules/admin/overview-inc.php:281:                              // @TODO Rewrite this to something with include files and/or filter
-./inc/modules/admin/overview-inc.php:319:                                              // @TODO This may also be rewritten to include files
-./inc/modules/admin/overview-inc.php:321:                                                      default: // @TODO Unknown support mode
-./inc/modules/admin/overview-inc.php:442:                      // @TODO Try to move this in includes
+./inc/modules/admin/overview-inc.php:164:                              // @TODO Rewrite this to a filter
+./inc/modules/admin/overview-inc.php:278:                              // @TODO Rewrite this to something with include files and/or filter
+./inc/modules/admin/overview-inc.php:316:                                              // @TODO This may also be rewritten to include files
+./inc/modules/admin/overview-inc.php:318:                                                      default: // @TODO Unknown support mode
+./inc/modules/admin/overview-inc.php:439:                      // @TODO Try to move this in includes
 ./inc/modules/admin/overview-inc.php:45:// @TODO This function does also check for uncompleted tasks
 ./inc/modules/admin/what-add_guestnl_cat.php:49:       // @TODO Check if category does already exist
 ./inc/modules/admin/what-add_surfbar_url.php:57:       // @TODO Find all convertSelectionsToTimestamp() calls and rewrite postRequestParameter() calls to $postData
 ./inc/modules/admin/what-adminedit.php:58:     // @TODO Kill all constants in this file
 ./inc/modules/admin/what-admins_mails.php:61:                          // @TODO Can this be rewritten to an API function?
 ./inc/modules/admin/what-bonus.php:48:// @TODO Unused at the moment
-./inc/modules/admin/what-config_admins.php:146:        // @TODO Rewrite this to filter 'run_sqls'
+./inc/modules/admin/what-config_admins.php:132:        // @TODO Rewrite this to filter 'run_sqls'
 ./inc/modules/admin/what-config_mods.php:57:                   // @TODO This can be moved into mysql-function.php, see checkModulePermissions() function
 ./inc/modules/admin/what-config_points.php:113:                        // @TODO Rewrite this to a filter
-./inc/modules/admin/what-config_rallye_prices.php:212:                         // @TODO Rewritings: level->price_level, infos->info in template
-./inc/modules/admin/what-config_rallye_prices.php:229:                 // @TODO Rewrite these two constants
+./inc/modules/admin/what-config_rallye_prices.php:207:                 // @TODO Rewrite these two constants
 ./inc/modules/admin/what-config_register.php:78:       // @TODO Move this HTML code into a template
 ./inc/modules/admin/what-del_email.php:60:             // @TODO Unused: $price = getPaymentPoints($content['payment_id'], 'price');
 ./inc/modules/admin/what-del_email.php:61:             // @TODO Unused: cat_id, payment_id
 ./inc/modules/admin/what-holiday_list.php:48:// @TODO Unused at the moment
 ./inc/modules/admin/what-list_autopurge.php:49:// @TODO Rewrite those lines to filter
 ./inc/modules/admin/what-list_bonus.php:135:           // @TODO Can't this be moved into our expression language?
-./inc/modules/admin/what-list_cats.php:56:             // @TODO No longer needed? define('__CATS_BASE'   , '<a href="{%url=modules.php?module=admin&amp;userid=');
+./inc/modules/admin/what-list_cats.php:56:             // @TODO No longer needed? define('__CATEGORIES_BASE'   , '<a href="{%url=modules.php?module=admin&amp;userid=');
 ./inc/modules/admin/what-list_cats.php:71:                             // @TODO Rewrite this to countSum.....() function
 ./inc/modules/admin/what-list_links.php:57:            // @TODO Try to rewrite this to a filter
 ./inc/modules/admin/what-list_links.php:89:                            // @TODO Find a way to rewrite this. See some lines above for different queries
 ./inc/modules/admin/what-list_task.php:192:                            // @TODO Rewrite this to $OUT .= ..., true, ...
 ./inc/modules/admin/what-list_task.php:196:                            // @TODO Rewrite this to $OUT .= ..., true, ...
 ./inc/modules/admin/what-list_unconfirmed.php:100:             // @TODO Rewrite this to $content = SQL_FETCHARRAY(), look some lines above for two differrent queries
-./inc/modules/admin/what-list_unconfirmed.php:77:      // @TODO This constant might be unused? define('__LIST_UNCON_TITLE', getMessage('LIST_UNCONFIRMED_BONUS_LINKS'));
+./inc/modules/admin/what-list_unconfirmed.php:77:      // @TODO This constant might be unused? define('__LIST_UNCON_TITLE', '{--LIST_UNCONFIRMED_BONUS_LINKS--}');
 ./inc/modules/admin/what-list_unconfirmed.php:88:      // @TODO "Please do not call me directly." Should be rewritten to a nice selection depending on ext-bonus
-./inc/modules/admin/what-list_user.php:156:            // @TODO Rewrite these to filters
-./inc/modules/admin/what-list_user.php:268:            // @TODO Rewrite this into a filter
-./inc/modules/admin/what-list_user.php:314:                    // @TODO Rewrite this into a filter
+./inc/modules/admin/what-list_user.php:151:            // @TODO Rewrite these to filters
+./inc/modules/admin/what-list_user.php:257:            // @TODO Rewrite this into a filter
+./inc/modules/admin/what-list_user.php:301:                    // @TODO Rewrite this into a filter
 ./inc/modules/admin/what-list_user.php:59:// @TODO Rewrite these if-blocks in a filter
 ./inc/modules/admin/what-logs.php:69:                  // @TODO Fix content-type here
 ./inc/modules/admin/what-logs.php:72:                  // @TODO Fix content-type here
 ./inc/modules/admin/what-mem_add.php:126:                              // @TODO This can be somehow rewritten to a function
 ./inc/modules/admin/what-mem_add.php:65:               // @TODO Cant this be rewritten?
 ./inc/modules/admin/what-mem_add.php:81:               // @TODO This can be somehow rewritten to a function
-./inc/modules/admin/what-payments.php:152:                     // @TODO Rewritings: title->mail_title, pay->payment in template
+./inc/modules/admin/what-payments.php:152:                     // @TODO Rewritings: title->mail_title in template
 ./inc/modules/admin/what-refbanner.php:145:                    // @TODO Rewritings: alt->alternate,cnt->counter,clx->clicks in template
 ./inc/modules/admin/what-unlock_emails.php:89:                                 // @TODO Rewrite these if-blocks to a filter
 ./inc/modules/admin/what-usage.php:88: // @TODO This code is double, see loadTemplate() and loadEmailTemplate() in functions.php
 ./inc/modules/admin/what-usr_online.php:51:    // @TODO Add a filter for sponsor
-./inc/modules/guest/what-beg.php:60:// @TODO No more needed? define('__BEG_UID_TIMEOUT', createFancyTime(getConfig('beg_userid_timeout')));
+./inc/modules/guest/what-beg.php:53:// @TODO No more needed? define('__BEG_UID_TIMEOUT', createFancyTime(getConfig('beg_userid_timeout')));
 ./inc/modules/guest/what-confirm.php:120:                                      // @TODO Try to rewrite the following unset()
 ./inc/modules/guest/what-login.php:114:        // @TODO Move this HTML code into a template
 ./inc/modules/guest/what-mediadata.php:183:// @TODO Rewrite all these if-blocks to filters
 ./inc/modules/member/what-categories.php:129:          // @TODO Rewrite this to use $OUT .= ...
 ./inc/modules/member/what-order.php:457:                       // @TODO Rewrite this to a filter
 ./inc/modules/member/what-order.php:65:// @TODO Rewrite this to a filter
-./inc/modules/member/what-payout.php:222:                                      // @TODO Rewrite this to a filter
+./inc/modules/member/what-payout.php:218:                                      // @TODO Rewrite this to a filter
 ./inc/modules/member/what-points.php:55:// @TODO Should we rewrite this to a filter?
 ./inc/modules/member/what-rallyes.php:91:      // @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-refback.php:128:                     // @TODO UNUSED: $refRow['status']      = translateUserStatus($refRow['status']);
 ./inc/mysql-manager.php:1627:                  // @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
 ./inc/mysql-manager.php:1727:  // @TODO Rewrite this to a filter
 ./inc/mysql-manager.php:2107:                  // @TODO Rewrite this to a filter
-./inc/mysql-manager.php:2148:// @TODO Fix inconsistency between last_module and getWhat()
+./inc/mysql-manager.php:2151:// @TODO Fix inconsistency between last_module and getWhat()
 ./inc/mysql-manager.php:229:                   // @TODO Nothing helped???
 ./inc/mysql-manager.php:264:                   // @TODO Rewrite this to a filter
 ./inc/mysql-manager.php:589:   // @TODO Try to rewrite this to one or more functions
 ./inc/mysql-manager.php:94:// @TODO Can we cache this?
 ./inc/reset/reset_beg.php:51:// @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/revision-functions.php:153:// @TODO Please describe this function
 ./inc/wrapper-functions.php:127:// @TODO Implement $compress
 ./inc/wrapper-functions.php:134:// @TODO Implement $decompress
index ef93434..a0c3159 100644 (file)
@@ -149,7 +149,7 @@ ORDER BY
        // Add points from deleted accounts to jackpot, but here just add to notify mail
        if ($admin_points > 0) {
                // Send mail to admin
-               sendAdminNotification(getMessage('AUTOPURGE_ADMIN_SUBJECT'), 'admin_autopurge_points', translateComma($admin_points));
+               sendAdminNotification('{--ADMIN_AUTOPURGE_SUBJECT--}', 'admin_autopurge_points', translateComma($admin_points));
        } // END - if
 
        // Run all SQLs here
index a6fc4fc..aa74f85 100644 (file)
@@ -119,7 +119,7 @@ ORDER BY
                $useridsContent = str_replace(', ', "\n", substr($useridsContent, 0, -2));
 
                // Send mail notification to admin
-               sendAdminNotification(getMessage('AUTOPURGE_ADMIN_INACTIVE_SUBJECT'), 'admin_autopurge_inactive', $useridsContent);
+               sendAdminNotification('{--ADMIN_AUTOPURGE_INACTIVE_SUBJECT--}', 'admin_autopurge_inactive', $useridsContent);
        } // END - if
 
        // Free memory
@@ -161,7 +161,7 @@ ORDER BY
 
                // Send mail notification to admin
                if (getConfig('ap_in_notify') == 'Y') {
-                       sendAdminNotification(getMessage('AUTOPURGE_ADMIN_DELETE_SUBJECT'), 'admin_autopurge_delete', $useridsContent);
+                       sendAdminNotification('{--ADMIN_AUTOPURGE_DELETE_SUBJECT--}', 'admin_autopurge_delete', $useridsContent);
                } // END - if
        } // END - if
 
index 79fbe43..765c775 100644 (file)
@@ -132,7 +132,7 @@ SQL_FREERESULT($result_mails);
 // Do we have deleted mails and the admin want's to receive a notification
 if (($deletedStats > 0) && (getConfig('ap_dm_notify') == 'Y')) {
        // Send out email to admin
-       sendAdminNotification(getMessage('AUTOPURGE_ADMIN_DEL_MAILS_SUBJECT'), 'admin_autopurge_del_mails', $deletedStats);
+       sendAdminNotification('{--ADMIN_AUTOPURGE_DEL_MAILS_SUBJECT--}', 'admin_autopurge_del_mails', $deletedStats);
 } // END - if
 
 //
index ddef951..3e1c97b 100644 (file)
@@ -64,7 +64,7 @@ WHERE
        // Do we need to send a notification?
        if (($deletedTasks > 0) && (getConfig('ap_tasks_notify') == 'Y')) {
                // Send out email to admin
-               sendAdminNotification(getMessage('AUTOPURGE_ADMIN_TASKS_SUBJECT'), 'admin_autopurge_tsks', $deletedTasks);
+               sendAdminNotification('{--ADMIN_AUTOPURGE_TASKS_SUBJECT--}', 'admin_autopurge_tsks', $deletedTasks);
        } // END - if
 } // END - if
 
index e6276a9..c8f587e 100644 (file)
@@ -84,7 +84,7 @@ ORDER BY
 
                // Send mail notification to admin
                if (getConfig('ap_un_notify') == 'Y') {
-                       sendAdminNotification(getMessage('AUTOPURGE_ADMIN_UNCONFIRMED_SUBJECT'), 'admin_autopurge_unconfirmed', $userids);
+                       sendAdminNotification('{--ADMIN_AUTOPURGE_UNCONFIRMED_SUBJECT--}', 'admin_autopurge_unconfirmed', $userids);
                } // END - if
        } // END - if
 
index 5f383d2..82f7ebb 100644 (file)
@@ -55,7 +55,7 @@ addCode('LOGOUT_FAILED'      , 0x009);
 addCode('URL_TLOCK'          , 0x00a);
 addCode('URL_FOUND'          , 0x00b);
 addCode('OVERLENGTH'         , 0x00c);
-addCode('SUBJ_URL'           , 0x00d);
+addCode('SUBJECT_URL'        , 0x00d);
 addCode('BLIST_URL'          , 0x00e);
 addCode('NO_RECS_LEFT'       , 0x00f);
 addCode('INVALID_TAGS'       , 0x010);
index 2aab347..9c5771d 100644 (file)
@@ -921,7 +921,7 @@ function doDeactivateExtension($ext_name) {
 
                // Notify the admin
                sendAdminNotification(
-                       getMessage('ADMIN_SUBJECT_EXTENSION_DEACTIVATED'),
+                       '{--ADMIN_EXTENSION_DEACTIVATED_SUBJECT--}',
                        'admin_ext_deactivated',
                        array('ext_name' => $ext_name)
                );
@@ -944,7 +944,7 @@ function isExtensionOlder ($ext_name, $ext_ver) {
 // Creates a new task for updated extension
 function createExtensionUpdateTask ($adminId, $ext_name, $ext_ver, $notes) {
        // Create subject line
-       $subject = '[UPDATE-' . $ext_name . '-' . $ext_ver . ':] {--ADMIN_UPDATE_EXTENSION_SUBJ--}';
+       $subject = '[UPDATE-' . $ext_name . '-' . $ext_ver . ':] {--ADMIN_UPDATE_EXTENSION_SUBJECT--}';
 
        // Get task id
        $taskId = determineTaskIdBySubject($subject);
@@ -1005,7 +1005,7 @@ function createNewExtensionTask ($ext_name) {
 // Creates a task for automatically deactivated (deprecated) extension
 function createExtensionDeactivationTask ($ext_name) {
        // Create subject line
-       $subject = sprintf("[%s:] %s", $ext_name, '{--TASK_SUBJ_EXTENSION_DEACTIVATED--}');
+       $subject = sprintf("[%s:] %s", $ext_name, '{--ADMIN_TASK_EXTENSION_DEACTIVATED_SUBJECT--}');
 
        // Get task id
        $taskId = determineTaskIdBySubject($subject);
index 79edbc7..a7630ce 100644 (file)
@@ -2538,7 +2538,7 @@ function debug_report_bug ($F, $L, $message = '', $sendEmail = true) {
                );
 
                // Send email to webmaster
-               sendAdminNotification(getMessage('DEBUG_REPORT_BUG_SUBJECT'), 'admin_report_bug', $content);
+               sendAdminNotification('{--DEBUG_REPORT_BUG_SUBJECT--}', 'admin_report_bug', $content);
        } // END - if
 
        // And abort here
@@ -2572,7 +2572,7 @@ function getMessageFromErrorCode ($code) {
                case getCode('MODULE_MEMBER_ONLY') : $message = getMaskedMessage('MODULE_MEMBER_ONLY', getRequestParameter('mod')); break;
                case getCode('OVERLENGTH')         : $message = '{--MEMBER_TEXT_OVERLENGTH--}'; break;
                case getCode('URL_FOUND')          : $message = '{--MEMBER_TEXT_CONTAINS_URL--}'; break;
-               case getCode('SUBJ_URL')           : $message = '{--MEMBER_SUBJ_CONTAINS_URL--}'; break;
+               case getCode('SUBJECT_URL')        : $message = '{--MEMBER_SUBJECT_CONTAINS_URL--}'; break;
                case getCode('BLIST_URL')          : $message = '{--MEMBER_URL_BLACK_LISTED--}<br />{--MEMBER_BLIST_TIME--}: ' . generateDateTime(getRequestParameter('blist'), 0); break;
                case getCode('NO_RECS_LEFT')       : $message = '{--MEMBER_SELECTED_MORE_RECS--}'; break;
                case getCode('INVALID_TAGS')       : $message = '{--MEMBER_HTML_INVALID_TAGS--}'; break;
index 9769379..1b27a79 100644 (file)
@@ -47,13 +47,13 @@ addMessages(array(
        'AUTOPURGE_MEMBER_SUBJECT' => "{?POINTS?}-Gutschrift bei Auto-Loeschung",
        'AUTOPURGE_MEMBER_INACTIVE_SUBJECT' => "Inaktivitaet --> Account wird bald gel&ouml;scht.",
        'AUTOPURGE_MEMBER_UNCONFIRMED_SUBJECT' => "L&ouml;schung --> EMail-Adresse nicht best&auml;tigt.",
-       'AUTOPURGE_ADMIN_SUBJECT' => "[Auto-Purge:] Best&auml;tigungslinks",
-       'AUTOPURGE_ADMIN_INACTIVE_SUBJECT' => "Inaktive Mitglieder benachrichtigt",
-       'AUTOPURGE_ADMIN_DELETE_SUBJECT' => "[Auto-Purge:] Inaktiven Mitgliedern",
-       'AUTOPURGE_ADMIN_UNCONFIRMED_SUBJECT' => "[Auto-Purge:] Unbest&auml;tigten Accounts",
-       'AUTOPURGE_ADMIN_TASKS_SUBJECT' => "[Auto-Purge:] Zu l&ouml;schen marktierte Aufgaben",
-       'AUTOPURGE_ADMIN_TURBO_SUBJECT' => "[Auto-Purge:] Veraltete Bonus-Eintraege",
-       'AUTOPURGE_ADMIN_DEL_MAILS_SUBJECT' => "[Auto-Purge:] Mailbuchungen bereits gel. Mitglieder",
+       'ADMIN_AUTOPURGE_SUBJECT' => "[Auto-Purge:] Best&auml;tigungslinks",
+       'ADMIN_AUTOPURGE_INACTIVE_SUBJECT' => "Inaktive Mitglieder benachrichtigt",
+       'ADMIN_AUTOPURGE_DELETE_SUBJECT' => "[Auto-Purge:] Inaktiven Mitgliedern",
+       'ADMIN_AUTOPURGE_UNCONFIRMED_SUBJECT' => "[Auto-Purge:] Unbest&auml;tigten Accounts",
+       'ADMIN_AUTOPURGE_TASKS_SUBJECT' => "[Auto-Purge:] Zu l&ouml;schen marktierte Aufgaben",
+       'ADMIN_AUTOPURGE_TURBO_SUBJECT' => "[Auto-Purge:] Veraltete Bonus-Eintraege",
+       'ADMIN_AUTOPURGE_DEL_MAILS_SUBJECT' => "[Auto-Purge:] Mailbuchungen bereits gel. Mitglieder",
 
        'ADMIN_AUTOPURGE_CONFIGURATION' => "Konfiguration der automatischen L&ouml;schungen",
        'ADMIN_AUTOPURGE_INACTIVE' => "Sollten inaktive Accounts erkannt und gel&ouml;scht werden?",
index 220016b..eafdcb0 100644 (file)
@@ -194,21 +194,21 @@ addMessages(array(
        'CATEGORY_ALREADY_EXISTS' => "Kategorie existiert bereits.",
        'EDIT_DEL_CATEGORIES' => "Aufgelistete Kategorien bearbeiten / l&ouml;schen",
        'CATNAME' => "Kategoriebezeichnung:",
-       'EDIT_CATS' => "Kategorien bearbeiten",
-       'DEL_CATS' => "Kategorien l&ouml;schen",
+       'EDIT_CATEGORIES' => "Kategorien bearbeiten",
+       'DEL_CATEGORIES' => "Kategorien l&ouml;schen",
        'NO_CATEGORIES_VISIBLE' => "Derzeit sind keine Kategorien anzeigbar.",
-       'MAX_RECEIVE' => "Wie viel Mails sollen Ihre Mitglieder maximal empfangen k&ouml;nnen? F&uuml;gen Sie bitte mehrere Werte hinzu, damit sich die Mitglieder dies individuell einstellen k&ouml;nnen.",
-       'ADD_MAX_RECEIVE' => "Hinzuf&uuml;gen",
+       'ADMIN_MAX_RECEIVE' => "Wie viel Mails sollen Ihre Mitglieder maximal empfangen k&ouml;nnen? F&uuml;gen Sie bitte mehrere Werte hinzu, damit sich die Mitglieder dies individuell einstellen k&ouml;nnen.",
+       'ADMIN_ADD_MAX_RECEIVE' => "Hinzuf&uuml;gen",
        'SAVE_SETTINGS' => "Einstellungen speichern",
-       'ENTER_MAX_VALUE' => "Neuen Maximal-Wert (0 bis 9999)",
-       'ENTER_MAX_COMMENT' => "Optionaler Hinweis (erscheint in Klammern hinter dem Wert!)",
-       'MAX_VALUE_SAVED' => "Maximal-Wert gespeichert",
-       'MAX_VALUE_ALREADY' => "Maximal-Wert existiert bereits.",
-       'EDIT_DEL_MAX_VALUES' => "Maximal-Werte bearbeiten / l&ouml;schen",
-       'MAX_VALUE' => "Maximal zu empfangene Mails",
-       'MAX_COMMENT' => "Hinweis zum Maximal-Wert",
-       'EDIT_MAX_V' => "Bearbeiten",
-       'DEL_MAX_V' => "L&ouml;schen",
+       'ADMIN_ENTER_MAX_VALUE' => "Neuen Maximal-Wert (0 bis 9999)",
+       'ADMIN_ENTER_MAX_COMMENT' => "Optionaler Hinweis (erscheint in Klammern hinter dem Wert!)",
+       'ADMIN_MAX_VALUE_SAVED' => "Maximal-Wert gespeichert",
+       'ADMIN_MAX_VALUE_ALREADY' => "Maximal-Wert existiert bereits.",
+       'ADMIN_EDIT_DEL_MAX_VALUES' => "Maximal-Werte bearbeiten / l&ouml;schen",
+       'ADMIN_MAX_VALUE' => "Maximal zu empfangene Mails",
+       'ADMIN_MAX_COMMENT' => "Hinweis zum Maximal-Wert",
+       'ADMIN_EDIT_MAX_VALUE' => "Bearbeiten",
+       'ADMIN_DEL_MAX_VALUE' => "L&ouml;schen",
        'NO_MAX_VALUES' => "Derzeit klappt die Anmeldung nicht, da Sie keine maximal zu empfangenen Mails einstellen k&ouml;nnen.",
        'MAX_PER_DAY' => "Maximale Mitgliedermails/Tag",
        'PER_DAY' => "Mails",
@@ -235,7 +235,7 @@ addMessages(array(
        'POINTS_REGISTER' => "Willkommensgutschrift",
        'POINTS_REF' => "Einmalige Referal-Gutschrift",
        'EDIT_REGFORM_SETTINGS' => "Einstellungen am Anmeldeformular",
-       'LEAST_CATS' => "Mindestens auszuw&auml;hlende Kategorieanzahl",
+       'LEAST_CATEGORIES' => "Mindestens auszuw&auml;hlende Kategorieanzahl",
        'CATS_LEAST' => "Bitte w&auml;hlen Sie mehr Kategorien aus! Minimum ist: <span class=\"data\">{?least_cats?}</span>",
        'EMAIL_ALREADY_DB' => "Sie haben sich bereits mit dieser Email-Adresse angemeldet, oder jemand anderes verwendet Ihre. Doppelte Anmeldungen sind bei uns verboten.",
        'REJECT_DOUBLE_EMAIL' => "Doppelt angemeldete Email-Adressen ablehnen?",
@@ -264,10 +264,10 @@ addMessages(array(
        'GUEST_BIRTHDAY' => "Geburtsdatum",
        'GUEST_REF' => "Geworben von",
        'GUEST_YOUR_REFLINK' => "Hier ist Ihr pers&ouml;nlicher Referal-Link, mit dem Sie bereits jetzt schon neue Mitglieder werben k&ouml;nnen:",
-       'GUEST_SUBJECT_CONFIRM_LINK' => "Ihr Best&auml;tigungslink",
+       'GUEST_CONFIRM_LINK_SUBJECT' => "Ihr Best&auml;tigungslink",
        'ADMIN_GUEST_REGISTERED_WITH_US' => "Ein Gast hat sich soeben bei uns angemeldet.",
        'ADMIN_GUEST_PERSONA_DATA' => "Hier sind zur &Uuml;berpr&uuml;fung nochmals seine pers&ouml;nlichen Daten",
-       'ADMIN_SUBJECT_NEW_ACCOUNT' => "Neue Anmeldung zu Ihrem {?mt_word?}",
+       'ADMIN_NEW_ACCOUNT_SUBJECT' => "Neue Anmeldung zu Ihrem {?mt_word?}",
        'REGISTRATION_DONE' => "Vielen Dank f&uuml;r die Anmeldung. Ein Best&auml;tigungslink ist zur angemeldeten EMail-Adresse unterwegs.",
        'GUEST_404_WHAT' => "Das angegeben Men&uuml;modul <span class=\"data\">%s</span> existiert leider nicht, oder dieses Script hat einen Fehler gemacht.",
        'GUEST_LOCKED_ACTION' => "Aktionsmodul <span class=\"data\">%s</span> wurde gesperrt.",
@@ -348,10 +348,10 @@ addMessages(array(
        'MEMBER_UID' => "Seine Login-Id lautet",
        'LOGOUT_DONE' => "Ausloggen abgeschlossen.",
        'LOGOUT_FAILED' => "Ausloggen fehlgeschlagen.",
-       'MEMBER_NO_CATS' => "Es wurden bis jetzt noch keine Kategorien eingerichtet.",
+       'MEMBER_NO_CATEGORIES' => "Es wurden bis jetzt noch keine Kategorien eingerichtet.",
        'SELECT_CAT' => "Mails aus Kategorie empfangen?",
-       'MEMBER_CATS_SAVED' => "Kategorien gespeichert.",
-       'MEMBER_CATS_NOT_SAVED' => "Kategorien wurden <u>nicht</u> ge&auml;ndert.",
+       'MEMBER_CATEGORIES_SAVED' => "Kategorien gespeichert.",
+       'MEMBER_CATEGORIES_NOT_SAVED' => "Kategorien wurden <u>nicht</u> ge&auml;ndert.",
        'YOUR_PERSONAL_REFLINK' => "Ihr pers&ouml;nlicher Ref-Link zum Werben neuer Mitglieder lautet",
        'YOUR_REFCLICKS' => "Klicks auf Ihren Referal-Link",
        'CLICKS' => "Klicks",
@@ -407,7 +407,7 @@ addMessages(array(
        'UNKNOWN_CODE' => "Es ist w&auml;hrend der Ausf&uuml;hrung ein unbekannter Fehler-Code <span class=\"data\">%s</span> enstanden, f&uuml;r den Sie vermutlich nicht verantwortlich sind. Bitte informieren Sie uns &uuml;ber diese Meldung.",
        'MEMBER_TEXT_CONTAINS_URL' => "Ihr Werbetext enth&auml;lt eine URL, dies ist in unserem {?mt_word?} nicht zul&auml;ssig. Bitte entfernen Sie diese aus Ihrem Text und versuchen Sie es erneut.",
        'MEMBER_TEXT_OVERLENGTH' => "Ihr Text hat die maximale Textl&auml;nge &uuml;berschritten. Bitte fassen Sie ihn etwas k&uuml;rzer.",
-       'MEMBER_SUBJ_CONTAINS_URL' => "Ihre eingegebe Betreffzeile enth&auml;lt eine URL,  dies ist in unserem {?mt_word?} nicht zul&auml;ssig. Bitte entfernen Sie diese aus Ihrer Betreffzeile und versuchen Sie es erneut.",
+       'MEMBER_SUBJECT_CONTAINS_URL' => "Ihre eingegebe Betreffzeile enth&auml;lt eine URL,  dies ist in unserem {?mt_word?} nicht zul&auml;ssig. Bitte entfernen Sie diese aus Ihrer Betreffzeile und versuchen Sie es erneut.",
        'MEMBER_URL_BLACK_LISTED' => "Ihre eingegebene URL wurde in unsere Ausschlussliste aufgenommen.",
        'MEMBER_BLIST_TIME' => "Datum der Sperrung war",
        'MEMBER_SELECTED_MORE_RECS' => "Sie haben f&uuml;r diese Kategorie zu viele Empf&auml;nger eingegeben.",
@@ -461,7 +461,7 @@ addMessages(array(
        'ADMIN_EDIT_EMAIL' => "Mailbuchung bearbeiten",
        'ADMIN_CHANGE_EMAIL' => "&Auml;nderungen speichern",
        'EDIT_URL' => "URL bearbeiten",
-       'EMAIL_EDIT_SUBJ' => "Betreff bearbeiten",
+       'EMAIL_EDIT_SUBJECT' => "Betreff bearbeiten",
        'EMAIL_EDIT_TEXT' => "Werbetext bearbeiten",
        'ADMIN_UNLOCK_EMAILS' => "Neue Mailbuchungen freischalten",
        'EMAIL_ACCEPT' => "Annehmen",
@@ -473,11 +473,11 @@ addMessages(array(
        'ADMIN_URLS_BLOCKED' => "URLs wurden in die Black-List aufgenommen.",
        'ADMIN_SENDING_DONE' => "Eine gebuchte Mail wurde soeben vollst&auml;ndig ausgesendet. Das werbende Mitglied wurde dar&uuml;ber in Kenntnis gesetzt.",
        'ADMIN_NOTIFY_DONE' => "Sollte diese Buchung nicht Ihren AGBs entsprechen, loggen Sie sich bitte in den Admin-Bereich ein und aendern die Mail.",
-       'ADMIN_SUBJ_SEND_DONE' => "Vollst&auml;ndig: Aussendung einer Werbebbuchung.",
+       'ADMIN_SEND_DONE_SUBJECT' => "Vollst&auml;ndig: Aussendung einer Werbebbuchung.",
        'MEMBER_SENDING_DONE' => "Ihre gebuchte Mail wurde soeben vollst&auml;ndig von unserem System versendet! Wir w&uuml;nschen Ihnen viel Erfolg mit Ihrer Werbebuchung.",
        'MEMBER_NOTIFY_DONE' => "Den weiteren Verlauf dieser Werbebuchung k&ouml;nnen Sie im Mitgliedsbereich unter Statistiken verfolgen.",
-       'MEMBER_SUBJ_SEND_DONE' => "Ihre Werbebuchung wurde versandt",
-       'GUEST_SELECT_LEAST_CATS' => "Bitte w&auml;hlen Sie mindestens <span class=\"data\">{?least_cats?}</span> Kategorien aus. Anderfalls erfolgt keine Anmeldung.",
+       'MEMBER_SEND_DONE_SUBJECT' => "Ihre Werbebuchung wurde versandt",
+       'GUEST_SELECT_LEAST_CATEGORIES' => "Bitte w&auml;hlen Sie mindestens <span class=\"data\">{?least_cats?}</span> Kategorien aus. Anderfalls erfolgt keine Anmeldung.",
        'MEMBER_POOL_CONTENT' => "Ihre Mails im Sende-Pool",
        'MEMBER_STATS_CONTENT' => "Statistiken versandter Mails",
        'EMAIL_END_SEND' => "Vollst&auml;ndig versendet",
@@ -521,14 +521,14 @@ addMessages(array(
        'ADMIN_EDIT_USER' => "&Auml;ndern",
        'ADMIN_ALL_REFS' => "Alle Refs auflisten",
        'BIRTHDAY2' => "Geburtstag",
-       'TOTAL_CATS' => "Ausgew&auml;hlte Kategorien",
+       'TOTAL_CATEGORIES' => "Ausgew&auml;hlte Kategorien",
        'ADMIN_GOTO_USERLIST' => "Dieser Men&uuml;punkt kann nicht direkt aufgerufen werden. Bitte rufen Sie stattdessen <em><u>User auflisten</u></em> auf.",
        'ADMIN_USER_UPDATED' => "Das Mitgliedsaccount wurde aktualisiert.",
        'ADMIN_LOCKED_YOUR_ACCOUNT' => "Ihr Account wurde von einem unserer Administratoren gesperrt! Bitte halten Sie sich an unsere AGBs.",
        'REASON_LOCKED' => "Grund der Sperrung war",
        'MEMBER_PLEASE_RESPECT' => "Sollten Sie damit nicht einverstanden sein, so melden Sie sich bitte bei uns. Wir kommen dann in Kontakt mit Ihnen.",
-       'ADMIN_LOCKED_SUBJ' => "Ihr Account wurde gesperrt.",
-       'ADMIN_UNLOCKED_SUBJ' => "Ihr Account wurde wieder freigegeben.",
+       'ADMIN_LOCKED_SUBJECT' => "Ihr Account wurde gesperrt.",
+       'ADMIN_UNLOCKED_SUBJECT' => "Ihr Account wurde wieder freigegeben.",
        'REASON_UNLOCKED' => "Nachricht vom Admin",
        'ADMIN_WELCOME_BACK' => "Bitte beachten Sie beim naechsten Mal auf unsere AGBs, damit Ihnen diese Unangenehmlichkeiten erspart bleiben.",
        'ADMIN_DEL_ACCOUNT' => "Loeschung Ihres Accounts.",
@@ -536,7 +536,7 @@ addMessages(array(
        'REASON_DELETE' => "Grund der L&ouml;schung war folgender",
        'ADMIN_BYE_BYE' => "Wir w&uuml;nschen Ihnen weiterhin noch alles Gute und k&ouml;nnen Sie vielleicht irgentwann einmal wieder begruessen.",
        'ADMIN_ALL_CONFIRMED_EMAIL' => "Alle Ihre Mitglieder haben ihre Email-Adresse best&auml;tigt! Keine Neuanmeldungen vorhanden.",
-       'GUEST_CONFIRM_SUBJ' => "Bitte Ihre Email-Adresse best&auml;tigen.",
+       'GUEST_CONFIRM_SUBJECT' => "Bitte Ihre Email-Adresse best&auml;tigen.",
        'MEMBER_ORDER_ACCEPTED' => "Ihre Mailbuchung wurde freigeschaltet",
        'MEMBER_ORDER_REJECTED' => "Ihre Mailbuchung wurde abgelehnt",
        'THANX_REFERAL_ONE_SUBJECT' => "Vielen Dank f&uuml;r die Referal-Werbung.",
@@ -553,7 +553,7 @@ addMessages(array(
        'ADMIN_SELECT_USER' => "Mitglied ausw&auml;hlen",
        'ENTER_POINTS_ADD' => "{?POINTS?} zum Aufbuchen",
        'ENTER_ADD_REASON' => "Grund der Aufbuchung",
-       'ADMIN_ADD_SUBJ' => "{?POINTS?}-Gutschrift durch unsere Admins.",
+       'ADMIN_ADD_SUBJECT' => "{?POINTS?}-Gutschrift durch unsere Admins.",
        'ADMIN_POINTS_ADDED' => "{?POINTS?} wurden gutgeschrieben. Das Mitglied hat eine Mail erhalten.",
        'MAILS_PER_DAY' => "Mitglieder-Mails / Tag",
        'GUEST_CONFIRMED_DONE' => "Danke f&uuml;r die Best&auml;tigung Ihrer Email-Adresse! Es ist eine Mail mit den Login-Daten zu Ihnen unterwegs.",
@@ -581,12 +581,12 @@ addMessages(array(
        'EDIT_CATEGORIES' => "Kategorien &auml;ndern",
        'CATEGORY_ID' => "Kategorie-Id",
        'CAT_DESCRIPTION' => "Kategoriebeschreibung",
-       'CHANGE_CATS' => "&Auml;ndern",
+       'CHANGE_CATEGORIES' => "&Auml;ndern",
        'SORT_KEY' => "Sortierung",
        'CATEGORIES_SAVED' => "Kategorien gespeichert...",
        'CATEGORIES_DELETED' => "Kategorien gel&ouml;scht...",
        'DELETE_CATEGORIES' => "Kategorien l&ouml;schen",
-       'REMOVE_CATS' => "L&ouml;schen",
+       'REMOVE_CATEGORIES' => "L&ouml;schen",
        'EDIT_MRECEIVE' => "Maximal-Werte editieren",
        'DELETE_MRECEIVE' => "Maximal-Werte l&ouml;schen",
        'MRECEIVE_ID' => "Max-Wert id",
@@ -622,15 +622,15 @@ addMessages(array(
        'KBYTES' => "KBytes",
        'DEFAULT_SUBJECT_LINE' => "Klick-Mail von {?MAIN_TITLE?}",
        'MEBER_UPDATE_PWD_WRONG' => "Sie haben das falsche Passwort eingegeben! Bitte nochmal versuchen.",
-       'ADMIN_MEMBER_NO_CATS_1' => "Das Mitglied <u>",
-       'ADMIN_MEMBER_NO_CATS_2' => "</u> hat keine Kategorien ausgew&auml;hlt.",
+       'ADMIN_MEMBER_NO_CATEGORIES_1' => "Das Mitglied <u>",
+       'ADMIN_MEMBER_NO_CATEGORIES_2' => "</u> hat keine Kategorien ausgew&auml;hlt.",
        'USER_ID' => "Mitglied",
        'UNCONFIRMED_LINKS' => "Unbest&auml;tigte Mails",
        'ADMIN_MEMBER_LINKS' => "Das Mitglied <span class=\"data\">%s</span> hat alle seine Mails best&auml;tigt.",
        'MEMBER_TOTAL_LINKS' => "Es m&uuml;ssen noch <span class=\"data\">%s</span> Mails von diesem Mitglied best&auml;tigt werden.",
        'ADMIN_DEL_UNCONFIRMED_LINKS' => "Alle unbest&auml;tigten Mails l&ouml;schen",
        'ADMIN_LINKS_DELETED' => "Links f&uuml;r unbest&auml;tigte Mails wurden gel&ouml;scht.",
-       'ADMIN_DEL_LINK_SUBJ' => "Ihr unbest&auml;tigen Mails wurden gel&ouml;scht.",
+       'ADMIN_DEL_LINK_SUBJECT' => "Ihr unbest&auml;tigen Mails wurden gel&ouml;scht.",
        'MEMBER_LINKS_LEFT' => "Sie haben <span class=\"data\">%s</span> unbest&auml;tigte Mails. Bitte best&auml;tigen Sie diese zuerst. Wenn Sie weniger als <span class=\"data\">{?unconfirmed?}</span> Mails im Account haben, k&ouml;nnen Sie auch wieder buchen.",
        'TODAY' => "Heute",
        'MEMBER_PROFILE_LOCKED' => "Sie k&ouml;nnen Ihren Account erst am <span class=\"data\">%s</span> wieder &auml;ndern.",
@@ -690,7 +690,7 @@ addMessages(array(
        'LOAD_URL_ERROR_2' => "\">Bitte klicken Sie hier</a>, um zur URL zu kommen.<br />\n<br />\nDanke.",
        'GUEST_STATS' => "Statistiken unseres {?mt_word2?}",
        'GUEST_STATS_MONTHLY' => "Mitgliederverteilung auf Kalendermonate",
-       'GUEST_STATS_CATS' => "Mitgliederverteilung auf Mail-Kategorien",
+       'GUEST_STATS_CATEGORIES' => "Mitgliederverteilung auf Mail-Kategorien",
        'GUEST_STATS_MALES' => "Angemeldete M&auml;nner",
        'GUEST_STATS_FEMALES' => "Angemeldete Frauen",
        'GUEST_STATS_TONLINE' => "Heute Online gewesen",
@@ -707,7 +707,7 @@ addMessages(array(
        'BASE_URL_NOTE' => "Ohne abschliessendem /.",
        'ADMIN_WRONG_CALL' => "Falscher Aufruf einer Aktion oder des Scriptes. Bitte navigieren Sie links weiter.",
        'ADMIN_IS_SYSTEM_TASK' => "System-Task",
-       'ADMIN_NEW_EXTENSION_SUBJ' => "Neue Erweiterung gefunden",
+       'ADMIN_NEW_EXTENSION_SUBJECT' => "Neue Erweiterung gefunden",
        'ADMIN_TASK_SUBJECT' => "Aufgabenbetreff",
        'ADMIN_TASK_TEXT' => "Aufgabentext",
        'ADMIN_REGISTER_EXTENSION' => "Registrieren",
@@ -754,7 +754,7 @@ addMessages(array(
        'REQUEST_CONFIRM_LINK' => "Erneut anfordern",
        'LOGIN_ID_CONFIRMED' => "Sie haben bereits Ihre E-Mail Adresse best&auml;tigt.",
        'CONFIRM_LINK_SENT' => "Der Best&auml;tigungslink wurde an Ihre E-Mail Adresse ausgesandt.",
-       'REQUEST_CONFIRM_LINK_SUBJ' => "Anforderung Ihres Best&auml;tigunglinkes",
+       'REQUEST_CONFIRM_LINK_SUBJECT' => "Anforderung Ihres Best&auml;tigunglinkes",
        'EMAIL_404' => "Unter der angegebenen E-Mail Adresse konnten wir keinen Account finden! Bitte versuchen Sie es erneut.",
        'SELECT_NONE' => "Keine/s/r",
        'ADMIN_SETUP_STATS_TITLE' => "Einstellungen an den Gast-Statistiken",
@@ -767,7 +767,7 @@ addMessages(array(
        'DELETE_PAYMENT' => "Verg&uuml;tungen l&ouml;schen",
        'REF_PAYOUT' => "Wie viele Mails m&uuml;ssen die Mitglieder mindestens best&auml;tigen, um den Willkommensbonus, einmaliger Referal-Bonus usw. gutgeschrieben zu bekommen?",
        'ADMIN_EXTENSION_UPDATED' => "Erweiterung aktualisiert.",
-       'ADMIN_UPDATE_EXTENSION_SUBJ' => "Erweiterung-Update installiert",
+       'ADMIN_UPDATE_EXTENSION_SUBJECT' => "Erweiterung-Update installiert",
        'MEMBER_ORDER_PAGE1_INTRO' => "Mailbuchung - Schritt 1 von 4: PLZ eingeben",
        'MEMBER_ORDER_PAGE2_INTRO' => "Mailbuchung - Schritt 2 von 4: Daten eingeben",
        'MEMBER_ORDER_PAGE3_INTRO' => "Mailbuchung - Schritt 3 von 4: Frame-Killer Test und Absenden",
@@ -920,7 +920,7 @@ addMessages(array(
        '_OR' => "oder",
        'GUEST_NEW_PASSWORD_SEND' => "Neues Passwort ist zu Ihrem Postfach unterwegs.",
        'UNDER_CONSTRUCTION' => "Funktion noch im Aufbau.",
-       'ADMIN_SUB_SUBJ' => "{?POINTS?}-Abzug durch unsere Admins",
+       'ADMIN_SUB_SUBJECT' => "{?POINTS?}-Abzug durch unsere Admins",
        'ADMIN_POINTS_SUBTRACTED' => "{?POINTS?} wurden erfolgreich abgezogen.",
        'ADMIN_ALL_POINTS_SUBTRACTED' => "Allen Mitgliedern wurden {?POINTS?} abgezogen.",
        'ADMIN_SUB_POINTS_FROM_USER' => "Abzug von {?POINTS?} eines Mitgliedes",
@@ -1020,7 +1020,7 @@ addMessages(array(
        'ADMIN_CONFIG_MAILID_REDIRECT_INDEX' => "Auf Hauptseite weiterleiten.",
        'ADMIN_CONFIG_MAILID_REDIRECT_REJECT' => "Auf Ablehnungsseite umleiten.",
        'REASON_DIRECT_PAYMENT' => "Direkte Gutschrift (siehe evtl. vorangegangene Mail)",
-       'SUBJECT_DIRECT_PAYMENT' => "Direkte {?POINTS?}-Gutschrift durch das System",
+       'DIRECT_PAYMENT_SUBJECT' => "Direkte {?POINTS?}-Gutschrift durch das System",
        'ADMIN_LOGOUT_SQL_PATCHES_DONE' => "Sie wurden automatisch ausgeloggt, da Sie die Erweiterung <strong>sql_patches</strong> installiert haben und dabei das Passort-Hashing ge&auml;ndert/verbessert wurde. Bitte erneut einloggen.",
        'ADMIN_LOGOUT_SQL_PATCHES_REMOVE' => "Sie wurden automatisch ausgeloggt, da Sie die Erweiterung <strong>sql_patches</strong> entfernt haben. Bitte klicken Sie weiter, um jetzt das Passwort neu zu setzen.",
        'ADMIN_POINTS_REPAYED' => "Es wurden dem Mitglied <span class=\"data\">%s {?POINTS?}</span> zur&uuml;ckgeschrieben.",
@@ -1071,7 +1071,7 @@ addMessages(array(
 
        'ADMIN_RESET_PASS' => "Ihr Administratorkennwort zur&uuml;cksetzen?",
        'ADMIN_NO_LOGIN_WITH_EMAIL' => "Kein Administrator-Account mit der angegebenen Email-Adresse gefunden.",
-       'ADMIN_RESET_PASS_LINK_SUBJ' => "Zur&uuml;cksetzung Ihres Admin-Passwortes",
+       'ADMIN_RESET_PASS_LINK_SUBJECT' => "Zur&uuml;cksetzung Ihres Admin-Passwortes",
        'ADMIN_RESET_LINK_SENT' => "Der Reset-Link wurde soeben an Ihre eingegebene Email-Adresse ausgesendet.",
        'ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED' => "Validierung Ihrer Logindaten fehlgeschlagen. Haben Sie auch den Link aus der Mail angeklickt und Ihren Loginnamen eingegeben?",
        'ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED2' => "Validierung Ihrer Logindaten fehlgeschlagen. Es liegt ein Bug im Script vor. Bitte im <a href=\"http://bugs.mxchange.org\" target=\"_blank\" title=\"Direktlink zum Bug-Tracker\">Bug-Tracker</a> den Fehler melden.",
@@ -1119,8 +1119,8 @@ addMessages(array(
        'EXTENSION' => "Erweiterung",
        'MOD_REWRITE_ERROR' => "Sie m&uuml;ssen mod_rewrite in Apache aktiviert haben um die Erweiterung rewrite nutzen zu k&ouml;nnen.",
        'ADMIN_BUILD_STATUS_HANDLER' => "Status-Handler",
-       'TASK_SUBJ_EXTENSION_DEACTIVATED' => "Erweiterung deaktiviert",
-       'ADMIN_SUBJECT_EXTENSION_DEACTIVATED' => "Automatische Deaktivierung einer Erweiterung",
+       'ADMIN_TASK_EXTENSION_DEACTIVATED_SUBJECT' => "Erweiterung deaktiviert",
+       'ADMIN_EXTENSION_DEACTIVATED_SUBJECT' => "Automatische Deaktivierung einer Erweiterung",
        'FATAL_EXTENSION_LOADED' => "Erweiterung <span class=\"data\">%s</span> bereits geladen.",
        'ADMIN_ACCESS_DENIED' => "Zugriff auf den Adminmen&uuml;punkt <span class=\"data\">%s</span> nicht gestattet.",
        'ADMIN_URL_BLACKLIST_DISABLED' => "URL-Sperrliste ist deaktiviert.",
index bf561b0..405d784 100644 (file)
@@ -52,18 +52,18 @@ addMessages(array(
        'HOLIDAY_COMMENTS' => "Sonstige Hinweise an uns",
        'HOLIDAY_NOTES' => "Sobald Sie das Formular abgeschickt haben, wird die Urlaubsschaltung f&uuml;r Ihren Account aktiviert. Sie k&ouml;nnen sich weiterhin im Mitgliedsbereich aufhalten, k&ouml;nnen aber keine Mails mehr empfangen und auch selber keine mehr buchen.",
        'ADMIN_TASK_IS_HOLIDAY_REQUEST' => "Urlaubsanfrage",
-       'HOLIDAY_ADMIN_NOTHING_FOUND' => "Niemand hat Urlaub beantragt.",
-       'HOLIDAY_ADMIN_TSTART' => "Anfang",
-       'HOLIDAY_ADMIN_TEND' => "Ende",
-       'HOLIDAY_ADMIN_COMMENTS' => "Kommentar",
-       'HOLIDAY_ADMIN_STOP_CHECKED' => "Ausgew. Urlaub beenden",
-       'HOLIDAY_ADMIN_DELETE_NOTE' => "Bitte beachten Sie, dass beim vorzeitigen Beenden des Urlaubes der Account-Status nicht ge&auml;ndert wird. Ist also das Account noch gesperrt, m&uuml;ssen Sie es seperat freischalten.",
+       'ADMIN_HOLIDAY_NOTHING_FOUND' => "Niemand hat Urlaub beantragt.",
+       'ADMIN_HOLIDAY_TSTART' => "Anfang",
+       'ADMIN_HOLIDAY_TEND' => "Ende",
+       'ADMIN_HOLIDAY_COMMENTS' => "Kommentar",
+       'ADMIN_HOLIDAY_STOP_CHECKED' => "Ausgew. Urlaub beenden",
+       'ADMIN_HOLIDAY_DELETE_NOTE' => "Bitte beachten Sie, dass beim vorzeitigen Beenden des Urlaubes der Account-Status nicht ge&auml;ndert wird. Ist also das Account noch gesperrt, m&uuml;ssen Sie es seperat freischalten.",
        'HOLIDAY_NO_DIRECT_CALL' => "Bite rufen Sie dieses Script &uuml;ber Auflisten auf.",
-       'HOLIDAY_ADMIN_DEL_LINK' => "Urlaub beenden",
-       'HOLIDAY_ADMIN_SINGLE_DELETED' => "Urlaub eines Mitgliedes beendet.",
-       'HOLIDAY_ADMIN_MULTI_DEL' => "Urlaub von <span class=\"data\">%s</span> Mitglied(-ern) beendet.",
-       'HOLIDAY_ADMIN_CONFIG_HEADER' => "Einstellungen an der Urlaubsschaltung",
-       'HOLIDAY_ADMIN_MAX_HOLIDAY' => "Maximale beantragbare Urlaubszeit",
+       'ADMIN_HOLIDAY_DEL_LINK' => "Urlaub beenden",
+       'ADMIN_HOLIDAY_SINGLE_DELETED' => "Urlaub eines Mitgliedes beendet.",
+       'ADMIN_HOLIDAY_MULTI_DEL' => "Urlaub von <span class=\"data\">%s</span> Mitglied(-ern) beendet.",
+       'ADMIN_HOLIDAY_CONFIG_HEADER' => "Einstellungen an der Urlaubsschaltung",
+       'ADMIN_HOLIDAY_MAX_HOLIDAY' => "Maximale beantragbare Urlaubszeit",
        'HOLIDAY_IS_ACTIVATED_NOW' => "Ihre Urlaubsschaltung wurde jetzt aktiviert. Sie k&ouml;nnen keine Mails mehr buchen.",
        'HOLIDAY_MEMBER_DEACTIVATE_TITLE' => "Bestehende Urlaubsschaltung deaktivieren",
        'HOLIDAY_DEACTIVATE_NOTES' => "M&ouml;chten Sie diese Urlaubsschaltung wieder deaktivieren? Es ist eine weitere Mail dann an uns unterwegs.",
@@ -74,21 +74,21 @@ addMessages(array(
        'HOLIDAY_MEMBER_TLOCK' => "Urlaubsschaltung eingerichtet",
        'HOLIDAY_MEMBER_LOCKED' => "Sie k&ouml;nnen derzeit Ihre Urlaubsschaltung nicht wieder deaktivieren, da Sie diese erst vor Kurzem aktiviert haben.",
        'HOLIDAY_MEMBER_ORDER' => "Sie k&ouml;nnen derzeit Ihre Urlaubsschaltung nicht ver&auml;ndern, da Ihre letzte Mailbuchung zu kurz her ist! Letzte Buchung: <span class=\"data\">%s</span>",
-       'HOLIDAY_ADMIN_SINGLE_404' => "Urlaubsschaltung nicht mehr vorhanden, oder veralteter Link.",
-       'HOLIDAY_ADMIN_LOCKED' => "Dauer bis Urlaubsschaltung aufgehoben werden kann",
-       'HOLIDAY_ADMIN_MODE' => "Zeitpunkt der Abarbeitung der Urlaubsschaltungen",
-       'HOLIDAY_ADMIN_MODE_RESET' => "Am t&auml;glichen Reset um 00:00 Uhr",
-       'HOLIDAY_ADMIN_MODE_DIRECT' => "Sofort nach Beantragung pr&uuml;fen",
+       'ADMIN_HOLIDAY_SINGLE_404' => "Urlaubsschaltung nicht mehr vorhanden, oder veralteter Link.",
+       'ADMIN_HOLIDAY_LOCKED' => "Dauer bis Urlaubsschaltung aufgehoben werden kann",
+       'ADMIN_HOLIDAY_MODE' => "Zeitpunkt der Abarbeitung der Urlaubsschaltungen",
+       'ADMIN_HOLIDAY_MODE_RESET' => "Am t&auml;glichen Reset um 00:00 Uhr",
+       'ADMIN_HOLIDAY_MODE_DIRECT' => "Sofort nach Beantragung pr&uuml;fen",
        'HOLIDAY_MEMBER_NOT_STOPPED_404' => "Beim Beenden Ihres Urlaubes ist ein unerwarteter Fehler aufgetreten: Mitglieder-Id <span class=\"data\">%s</span> nicht gefunden.",
 
        // Subject lines
        'HOLIDAY_MEMBER_SUBJECT' => "[HINWEIS:] Ihre Urlaubsanfrage",
-       'HOLIDAY_ADMIN_SUBJECT' => "Urlaubsanfrage in Ihrem {?mt_word?}",
-       'HOLIDAY_MEMBER_UNLOCK_SUBJ' => "[HINWEIS:] Beendigung Ihres Urlaubes",
-       'HOLIDAY_ADMIN_UNLOCK_SUBJ' => "Automatische Urlaubsbeendigung",
-       'HOLIDAY_ADMIN_DEAC_SUBJ' => "Deaktivierung einer Urlaubsschaltung",
-       'HOLIDAY_ADMIN_REMOVED_SUBJ' => "[HINWEIS:] Ihr Urlaub wurde beendet",
-       'HOLIDAY_MEMBER_ACTIVATED_SUBJ' => "[HINWEIS:] Ihre Urlaubsschaltung ist aktiviert",
+       'ADMIN_HOLIDAY_SUBJECT' => "Urlaubsanfrage in Ihrem {?mt_word?}",
+       'HOLIDAY_MEMBER_UNLOCK_SUBJECT' => "[HINWEIS:] Beendigung Ihres Urlaubes",
+       'ADMIN_HOLIDAY_UNLOCK_SUBJECT' => "Automatische Urlaubsbeendigung",
+       'ADMIN_HOLIDAY_DEAC_SUBJECT' => "Deaktivierung einer Urlaubsschaltung",
+       'ADMIN_HOLIDAY_REMOVED_SUBJECT' => "[HINWEIS:] Ihr Urlaub wurde beendet",
+       'HOLIDAY_MEMBER_ACTIVATED_SUBJECT' => "[HINWEIS:] Ihre Urlaubsschaltung ist aktiviert",
 ));
 
 // [EOF]
index 12ad25c..8c68987 100644 (file)
@@ -44,18 +44,18 @@ if (!defined('__SECURITY')) {
 
 // Language definitions
 addMessages(array(
-       'MODS_NAME' => "Modulname",
-       'MODS_TITLE' => "Modultitel",
-       'MODS_IS_LOCKED' => "Gesperrt",
-       'MODS_IS_HIDDEN' => "Verdeckt",
-       'MODS_IS_ADMIN' => "Nur Admin",
-       'MODS_IS_MEMBER' => "Nur Mitglied",
-       'MODS_CLICKS' => "Klicks",
-       'MODS_EDIT' => "Module &auml;ndern",
-       'MODS_ADMIN_EDIT_NOTE' => "Klicken Sie auf den Modulnamen, um Statistiken zu den verkn&uuml;pften Men&uuml;punkten zu erhalten.",
-       'MODS_NOTHING_SELECTED' => "Bitte mindestens ein Modul ausw&auml;hlen.",
-       'MODS_CHANGED' => "Module wurden ge&auml;ndert.",
-       'MODS_WHAT_ACTION' => "Men&uuml;punkt (Hauptmen&uuml;)",
+       'ADMIN_MODS_NAME' => "Modulname",
+       'ADMIN_MODS_TITLE' => "Modultitel",
+       'ADMIN_MODS_IS_LOCKED' => "Gesperrt",
+       'ADMIN_MODS_IS_HIDDEN' => "Verdeckt",
+       'ADMIN_MODS_IS_ADMIN' => "Nur Admin",
+       'ADMIN_MODS_IS_MEMBER' => "Nur Mitglied",
+       'ADMIN_MODS_CLICKS' => "Klicks",
+       'ADMIN_MODS_EDIT' => "Module &auml;ndern",
+       'ADMIN_MODS_EDIT_NOTE' => "Klicken Sie auf den Modulnamen, um Statistiken zu den verkn&uuml;pften Men&uuml;punkten zu erhalten.",
+       'ADMIN_MODS_NOTHING_SELECTED' => "Bitte mindestens ein Modul ausw&auml;hlen.",
+       'ADMIN_MODS_CHANGED' => "Module wurden ge&auml;ndert.",
+       'ADMIN_MODS_WHAT_ACTION' => "Men&uuml;punkt (Hauptmen&uuml;)",
        'ADMIN_MODS_STATS_FOOTER' => "Hier soll ein Hinweis hinkommen.",
 ));
 
index 7d1ecf1..7dbb2f7 100644 (file)
@@ -56,7 +56,7 @@ addMessages(array(
        'NICKNAME_YOUR_REFLINK' => "Ihr Nickname-Reflink",
        'NO_NICKNAME_SET' => "Sie haben noch keinen Nickname eingerichtet! Damit k&ouml;nnen Sie sich alternativ zur Mitglieder-Id einloggen.",
        'PLEASE_CLICK_NICKNAME_FORM' => "Hier k&ouml;nnen Sie sich nun einen einrichten...",
-       'NICKNAME_ADMIN_CONFIG_HEADER' => "Einstellungen am Nicknamen",
+       'ADMIN_NICKNAME_CONFIG_HEADER' => "Einstellungen am Nicknamen",
        'ADMIN_NICKNAME_MIN_LENGTH' => "Minimale L&auml;nge",
        'ADMIN_NICKNAME_PATTERN' => "Pattern f&uuml;r isInString()-Befehl",
        'ADMIN_NICKNAME_LANG_CHARS' => "Zeichenfolge f&uuml;r Sprachdatei",
index f399574..01da57a 100644 (file)
@@ -56,7 +56,7 @@ addMessages(array(
        'ADMIN_OPTION_MAX_TEXT_LENGTH' => "Maximale L&auml;nge des Werbetextes",
        'ADMIN_OPTION_MAX_UNCONFIRMED_MAILS' => "Maximale Anzahl unbest. Mails (Mailbuchung)",
        'ADMIN_OPTION_CHECK_EMAIL_TEXT' => "Sind URLs im Werbetext erlaubt?",
-       'ADMIN_OPTION_CHECK_EMAIL_SUBJ' => "Sind URLs in der Betreffzeile erlaubt?",
+       'ADMIN_OPTION_CHECK_EMAIL_SUBJECT' => "Sind URLs in der Betreffzeile erlaubt?",
        'ADMIN_OPTION_URL_BLACKLIST' => "Black-Liste f&uuml;r gebuchte URLs aktivieren?",
 
        'MEMBER_ORDER_ALLOWED_RECEIVE' => "Sie k&ouml;nnen heute noch <span class=\"data\">%s</span> von <span class=\"data\">%s</span> Mailbuchungen aufgeben.",
@@ -85,9 +85,9 @@ addMessages(array(
        'MEMBER_AUTOSEND_ACTIVE' => "Der Auto-Versand ist in unserem {?mt_word?} derzeit aktiviert. Ihr Mailbuchung wurde aktiviert und wird bald automatisch versant.",
 
 // Repay deleted mails constants
-       'ADMIN_CFG_REPAY_POINTS_REPAY' => "Dem Mitglied wieder gutschreiben",
-       'ADMIN_CFG_REPAY_POINTS_JACKPOT' => "In den Jackpot legen",
-       'ADMIN_CFG_REPAY_POINTS_SHRED' => "Nicht gutschreiben (verf&auml;llt dann)",
+       'ADMIN_CONFIG_REPAY_POINTS_REPAY' => "Dem Mitglied wieder gutschreiben",
+       'ADMIN_CONFIG_REPAY_POINTS_JACKPOT' => "In den Jackpot legen",
+       'ADMIN_CONFIG_REPAY_POINTS_SHRED' => "Nicht gutschreiben (verf&auml;llt dann)",
        'ADMIN_REPAY_ON_DELETE_MODE' => "Wenn Sie eine Mailbuchung l&ouml;schen, wie sollen die ausgegebenen {?POINTS?} gehandhabt werden?",
 
        'ADMIN_TASK_IS_MEMBER_ORDER' => "Mailbuchung vom Mitglied",
index 6c45204..b887ef1 100644 (file)
@@ -80,7 +80,7 @@ addMessages(array(
        'ADMIN_PAYOUT_LIST_REQUESTS' => "Jetzt alle Auszahlungsanfragen auflisten.",
        'ADMIN_PAYOUT_TRANSFER_FAILED' => "Transfer nicht abgeschlossen:",
        'ADMIN_PAYOUT_ALLOW_URLS' => "URLs erlauben",
-       'ADMIN_PAYOUY_REQUEST_SUBJ' => "Auszahlungsanfrage eines Mitgliedes",
+       'ADMIN_PAYOUY_REQUEST_SUBJECT' => "Auszahlungsanfrage eines Mitgliedes",
        'ADMIN_LIST_PAYOUTS' => "Alle Auszahlungen nach Mitgliedern auflisten",
        'ADMIN_PAYOUT_DELETE_ALL_REQUESTS' => "Alle Anfragen <strong>*SOFORT*</strong> l&ouml;schen",
        'ADMIN_PAYOUT_OBTAIN_ID_FAILED' => "Konnte id nicht finden! Bitte links im Men&uuml; diese Anfrage aufsuchen.",
@@ -115,7 +115,7 @@ addMessages(array(
        'MEMBER_PAYOUT_TARGET_ACCOUNT' => "An Accountnummer",
        'MEMBER_PAYOUT_TARGET_BANK' => "Bankleitzahl (od. Klamm)",
        'MEMBER_PAYOUT_MEMBER_NOTE' => "Accountnummer kann Ihre Kontonummer bei der Bank, Klamm-Id oder Ihre id bei der Empf&auml;nger-Webseite sein. Bitte beachten Sie weitere Hinweise dieses {?mt_word2?}.",
-       'MEMBER_PAYOUT_REQUEST_SUBJ' => "Ihre Auszahlungsanfrage an uns",
+       'MEMBER_PAYOUT_REQUEST_SUBJECT' => "Ihre Auszahlungsanfrage an uns",
        'MEMBER_PAYOUT_REQUEST_SENT' => "Auszahlungsanfrage wurde versendet ...",
        'MEMBER_PAYOUT_TARGET_ACCOUNT2' => "Ziel-Account",
        'MEMBER_PAYOUT_TARGET_BANK2' => "Ziel-Bank",
index d73ff34..458a458 100644 (file)
@@ -118,13 +118,13 @@ addMessages(array(
        'RALLYE_EXPIRE_ONE_DAY' => "Rallye endet in weniger als 24 Stunden.",
        'RALLYE_HAS_EXPIRED' => "Diese Referal-Rallye ist beendet.",
        'RALLYE_ADMIN_EXPIRED' => "Rallye beendet",
-       'RALLYE_ADMIN_EXPIRED_SUBJ' => "Rallye beendet: %s",
-       'RALLYE_MEMBER_EXPIRED_SUBJ' => "REF-RALLYE BEENDET: %s. Platz",
+       'RALLYE_ADMIN_EXPIRED_SUBJECT' => "Rallye beendet: %s",
+       'RALLYE_MEMBER_EXPIRED_SUBJECT' => "REF-RALLYE BEENDET: %s. Platz",
        'RALLYE_YOU_CAN_WIN' => "Was Sie gewinnen k&ouml;nnen",
        'RALLYE_OUR_WINNERS_ARE' => "Unsere Gewinner sind dieses Mal",
        'RALLYE_PRICE_IS' => "Hat gewonnen",
        'RALLYE_HAPPY_WINNERS' => "Wir gratulieren allen Gewinnern.",
-       'RALLYE_ADMIN_PURGED_SUBJ' => "[HINWEIS:] Referal-Rallye '%s' entfernt",
+       'RALLYE_ADMIN_PURGED_SUBJECT' => "[HINWEIS:] Referal-Rallye '%s' entfernt",
        'RALLYE_ADMIN_EXPIRED_TEXT' => "Eine Referal-Rallye ist beendet worden. Bitte kontrollieren Sie diese und f&uuml;hren Sie ggf. weitere Schritte durch.",
        'RALLYE_ADMIN_PURGED_TEXT' => "Eine oder mehr Referal-Rallye(s) ist/sind gel&ouml;scht worden.",
        'RALLYE_EDIT_RALLYES' => "Rallye-Grunddaten &auml;ndern",
index af5406d..0a919ff 100644 (file)
@@ -57,8 +57,8 @@ addMessages(array(
        'REGISTER_ZIP_REQUIRED' => "Bitte geben Sie die Postleitzahl ein.",
        'REGISTER_CITY_REQUIRED' => "Bitte geben Sie den Wohnort ein.",
        'CNTRY' => "L&auml;ndercode",
-       'ADMIN_CFG_REGISTER_DEFAULT' => "Standart-Vorauswahl in der Kategorienliste einstellen auf Ja/Nein",
-       'ADMIN_CFG_REGISTER_DISPLAY_REFID' => "Soll die Ref-Id angezeigt werden? <div class=\"admin_note\">(Nein = id wird editierbar!)</div>",
+       'ADMIN_CONFIG_REGISTER_DEFAULT' => "Standart-Vorauswahl in der Kategorienliste einstellen auf Ja/Nein",
+       'ADMIN_CONFIG_REGISTER_DISPLAY_REFID' => "Soll die Ref-Id angezeigt werden? <div class=\"admin_note\">(Nein = id wird editierbar!)</div>",
 ));
 
 // [EOF]
index 3ce8e63..315438b 100644 (file)
@@ -44,7 +44,7 @@ if (!defined('__SECURITY')) {
 
 // Language definitions
 addMessages(array(
-       'ADMIN_REPAIR_CATS_NOTHING' => "Keine Kategorien gefunden! Vermutlich sind keine Mitglieder registriert?",
+       'ADMIN_REPAIR_CATEGORIES_NOTHING' => "Keine Kategorien gefunden! Vermutlich sind keine Mitglieder registriert?",
        'ADMIN_REPAIR_ENTRIES_FIXED' => "Es wurden <span class=\"data\">%s</span> Eintr&auml;ge repariert.",
        'ADMIN_REPAIR_NOTHING_FIXED' => "Es wurden keine Eintr&auml;ge repariert.",
        'ADMIN_REPAIR_LANGUAGE_TO_MUCH' => "Es sind mehr als 100 nicht existierende Elemente in der Zielsprachdatei gefunden worden.",
index 485566a..8655089 100644 (file)
@@ -201,24 +201,24 @@ addMessages(array(
        'ADMIN_LIST_SPONSOR_ORDERS' => "Bestellungen bearbeiten",
 
 // Subject lines
-       'SPONSOR_UNLOCKED_SUBJ' => "HINWEIS: Freischaltung Ihres Sponsorenaccounts",
-       'ADMIN_SPONSOR_ADD_POINTS_SUBJ' => "HINWEIS: Gutschrift durch den Admin.",
-       'ADMIN_SPONSOR_SUB_POINTS_SUBJ' => "HINWEIS: Abzug durch den Admin.",
-       'SPONSOR_SUBJECT_LOCKED' => "HINWEIS: Sperrung Ihres Sponsorenaccounts.",
-       'SPONSOR_SUBJECT_UNLOCKED' => "HINWEIS: Freigabe Ihres Sponsorenaccounts.",
+       'SPONSOR_UNLOCKED_SUBJECT' => "HINWEIS: Freischaltung Ihres Sponsorenaccounts",
+       'ADMIN_SPONSOR_ADD_POINTS_SUBJECT' => "HINWEIS: Gutschrift durch den Admin.",
+       'ADMIN_SPONSOR_SUB_POINTS_SUBJECT' => "HINWEIS: Abzug durch den Admin.",
+       'SPONSOR_LOCKED_SUBJECT' => "HINWEIS: Sperrung Ihres Sponsorenaccounts.",
+       'SPONSOR_UNLOCKED_SUBJECT' => "HINWEIS: Freigabe Ihres Sponsorenaccounts.",
        'ADMIN_SPONSOR_EDIT_SUBJECT' => "HINWEIS: Sponsorenaccount ge&auml;ndert durch Admin.",
        'ADMIN_SPONSOR_DEL_SUBJECT' => "HINWEIS: Sponsorenaccount geloescht durch Admin.",
-       'SPONSOR_PLEASE_CONFIRM_SUBJ' => "HINWEIS: Bitte best&auml;tigen Sie Ihren Account.",
-       'SPONSOR_ACCOUNT_PENDING_SUBJ' => "HINWEIS: Ihr Account wartet auf Freischaltung.",
+       'SPONSOR_PLEASE_CONFIRM_SUBJECT' => "HINWEIS: Bitte best&auml;tigen Sie Ihren Account.",
+       'SPONSOR_ACCOUNT_PENDING_SUBJECT' => "HINWEIS: Ihr Account wartet auf Freischaltung.",
        'ADMIN_NEW_SPONSOR' => "Neue Anmeldung eines Sponsors",
-       'SPONSOR_ACTIVATION_LINK_SUBJ' => "HINWEIS: Erneute Aussendung Ihres Best&auml;tigunglinkes.",
-       'SPONSOR_LOST_PASSWORD_SUBJ' => "HINWEIS: Ihr neues Passwort",
-       'SPONSOR_ACC_DATA_SUBJ' => "HINWEIS: &Auml;nderung Ihrer Daten",
-       'SPONSOR_ACC_EMAIL_SUBJ' => "HINWEIS: Bitte neue EMail-Adresse best&auml;tigen.",
-       'ADMIN_SPONSOR_ACC_EMAIL_SUBJ' => "Sponsor hat seine EMail-Adresse ge&auml;ndert.",
-       'ADMIN_SPONSOR_ACC_DATA_SUBJ' => "Sponsor hat seine Daten ge&auml;ndert.",
-       'ADMIN_SPONSOR_SETTINGS_SUBJ' => "Sponsor hat seine Einstellungen ge&auml;ndert.",
-       'SPONSOR_SETTINGS_SUBJ' => "HINWEIS: &Auml;nderung Ihrer Einstellungen",
+       'SPONSOR_ACTIVATION_LINK_SUBJECT' => "HINWEIS: Erneute Aussendung Ihres Best&auml;tigunglinkes.",
+       'SPONSOR_LOST_PASSWORD_SUBJECT' => "HINWEIS: Ihr neues Passwort",
+       'SPONSOR_ACC_DATA_SUBJECT' => "HINWEIS: &Auml;nderung Ihrer Daten",
+       'SPONSOR_ACC_EMAIL_SUBJECT' => "HINWEIS: Bitte neue EMail-Adresse best&auml;tigen.",
+       'ADMIN_SPONSOR_ACC_EMAIL_SUBJECT' => "Sponsor hat seine EMail-Adresse ge&auml;ndert.",
+       'ADMIN_SPONSOR_ACC_DATA_SUBJECT' => "Sponsor hat seine Daten ge&auml;ndert.",
+       'ADMIN_SPONSOR_SETTINGS_SUBJECT' => "Sponsor hat seine Einstellungen ge&auml;ndert.",
+       'SPONSOR_SETTINGS_SUBJECT' => "HINWEIS: &Auml;nderung Ihrer Einstellungen",
 
 // Sponsor registration errors
        'SPONSOR_SURNAME_IS_EMPTY' => "Sie haben keinen Vornamen eingegeben.",
index e355a62..f12d609 100644 (file)
@@ -44,12 +44,12 @@ if (!defined('__SECURITY')) {
 
 // Language constans
 addMessages(array(
-       'SUPPORT_SUBJ_ADMIN_ORDER' => "[Support:] Mailbuchung",
-       'SUPPORT_SUBJ_ADMIN_REFLINK' => "[Support:] Referal-Link",
-       'SUPPORT_SUBJ_ADMIN_UNCONFIRMED' => "[Support:] Unbest&auml;tigte Mails",
-       'SUPPORT_SUBJ_MEMBER_ORDER' => "Ihr Anfrage an den Support: Mailbuchung",
-       'SUPPORT_SUBJ_MEMBER_REFLINK' => "Ihr Anfrage an den Support: Referal-Link",
-       'SUPPORT_SUBJ_MEMBER_UNCONFIRMED' => "Ihr Anfrage an den Support: Unbest&auml;tigte Mails",
+       'ADMIN_SUPPORT_ORDER_SUBJECT' => "[Support:] Mailbuchung",
+       'ADMIN_SUPPORT_REFLINK_SUBJECT' => "[Support:] Referal-Link",
+       'ADMIN_SUPPORT_UNCONFIRMED_SUBJECT' => "[Support:] Unbest&auml;tigte Mails",
+       'SUPPORT_MEMBER_ORDER_SUBJECT' => "Ihr Anfrage an den Support: Mailbuchung",
+       'SUPPORT_MEMBER_REFLINK_SUBJECT' => "Ihr Anfrage an den Support: Referal-Link",
+       'SUPPORT_MEMBER_UNCONFIRMED_SUBJECT' => "Ihr Anfrage an den Support: Unbest&auml;tigte Mails",
        'ADMIN_TASK_IS_SUPPORT_MEMBER' => "Mitglieder-Support",
        'ADMIN_UNKNOWN_SUPPORT_MODE' => "Unbekannter Support-Modus <span class=\"data\">%s</span> erkannt.",
        'ADMIN_TASK_SUPPORT_MODE' => "Support-Art",
index 2cf5c74..7d3b6a6 100644 (file)
@@ -44,8 +44,8 @@ if (!defined('__SECURITY')) {
 
 // Language definitions
 addMessages(array(
-       'TOP10_ADMIN_CONFIG_HEADER' => "Einstellungen an TOP-Listen",
-       'TOP10_ADMIN_MAX_TOP10' => "Maximale Pl&auml;tze pro Liste",
+       'ADMIN_TOP10_CONFIG_HEADER' => "Einstellungen an TOP-Listen",
+       'ADMIN_TOP10_MAX_TOP10' => "Maximale Pl&auml;tze pro Liste",
 ));
 
 // [EOF]
index 1afb7c8..a8841ef 100644 (file)
@@ -75,8 +75,8 @@ addMessages(array(
        'TRANSFER_INVALID_RECIPIENT' => "Bitte w&auml;hlen Sie einen Empf&auml;nger aus.",
        'TRANSFER_INVALID_DATA' => "Konnte Absender- und Empf&auml;ngerdaten nicht verifizieren.",
        'TRANSFER_ADMIN_SUBJECT' => "{?POINTS?}-Transfer abgeschlossen",
-       'TRANSFER_MEMBER_RECIPIENT_SUBJ' => "{?POINTS?}-&Uuml;berweisung durch Mitglied",
-       'TRANSFER_MEMBER_SENDER_SUBJ' => "{?POINTS?}-&Uuml;berweisung an Mitglied",
+       'TRANSFER_MEMBER_RECIPIENT_SUBJECT' => "{?POINTS?}-&Uuml;berweisung durch Mitglied",
+       'TRANSFER_MEMBER_SENDER_SUBJECT' => "{?POINTS?}-&Uuml;berweisung an Mitglied",
        'TRANSFER_ADMIN_AUTOPURGE' => "Auto-Loeschung von Transfer-Eintraegen",
        'TRANSFER_COMPLETED' => "&Uuml;berweisung vollst&auml;ndig.",
        'TRANSFER_CONTINUE_OVERVIEW' => "Weiter zur &Uuml;bersichtsseite...",
index d89df55..a240988 100644 (file)
@@ -274,7 +274,7 @@ function purgeExpiredTurboBonus() {
 
        if (SQL_AFFECTEDROWS() > 0) {
                // Send out email to admin
-               sendAdminNotification(getMessage('AUTOPURGE_ADMIN_TURBO_SUBJECT'), 'admin_autopurge_turbo', SQL_AFFECTEDROWS());
+               sendAdminNotification('{--ADMIN_AUTOPURGE_TURBO_SUBJECT--}', 'admin_autopurge_turbo', SQL_AFFECTEDROWS());
        } // END - if
 }
 
index 8a455f6..e24a3ea 100644 (file)
@@ -93,9 +93,13 @@ LIMIT %s",
                        // Rewrite userid/refid only if admin is in
                        // @TODO Can't this be moved into EL?
                        if (isAdmin()) {
+                               // Set empty userid/refid
+                               $content['userid'] = '---';
+                               $content['refid']  = '---';
+
                                // Set links to admin area
-                               if (isValidUserId($content['userid'])) { $content['userid'] = generateUserProfileLink($content['userid']); } else { $content['userid'] = '---'; }
-                               if (isValidUserId($content['refid']))  { $content['refid']  = generateUserProfileLink($content['refid']);  } else { $content['refid']  = '---'; }
+                               if (isValidUserId($content['userid'])) $content['userid'] = generateUserProfileLink($content['userid']);
+                               if (isValidUserId($content['refid']))  $content['refid']  = generateUserProfileLink($content['refid']);
                        } // END - if
 
                        // Prepare data for the row template
index 54064d8..ce20531 100644 (file)
@@ -85,14 +85,14 @@ LIMIT 1",
 
                        // Send mail to user
                        $message = loadEmailTemplate('member_holiday_unlock', $content, $content['userid']);
-                       sendEmail($content['userid'], '{--HOLIDAY_MEMBER_UNLOCK_SUBJ--}', $message);
+                       sendEmail($content['userid'], '{--HOLIDAY_MEMBER_UNLOCK_SUBJECT--}', $message);
 
                        // Remember userid for admin
                        $admin .= $content['userid']."\n";
                } // END - if
 
                // Send mail to admins
-               sendAdminNotification(getMessage('HOLIDAY_ADMIN_UNLOCK_SUBJ'), 'admin_holiday_unlock', $admin);
+               sendAdminNotification('{--ADMIN_HOLIDAY_UNLOCK_SUBJECT--}', 'admin_holiday_unlock', $admin);
 
                // Run all SQLs
                runFilterChain('run_sqls');
index 0950f82..1a1247e 100644 (file)
@@ -711,9 +711,6 @@ function doAdminNetworkProcessHandlenetworktypeForm () {
                                                // Add row template for deleting
                                                $OUT .= loadTemplate('admin_edit_network_types_row', true, $networkTypeData);
                                        } elseif (isFormSent('del')) {
-                                               // Fix empty banner URL
-                                               if (trim($networkTypeData['network_type_banner_url']) == '') $networkTypeData['network_type_banner_url'] = '---';
-
                                                // Add row template for deleting
                                                $OUT .= loadTemplate('admin_del_network_types_row', true, $networkTypeData);
                                        } else {
@@ -787,9 +784,6 @@ function doAdminNetworkProcessHandlerequestparamsForm () {
                                                // Add row template for deleting
                                                $OUT .= loadTemplate('admin_edit_network_params_row', true, $networkRequestData);
                                        } elseif (isFormSent('del')) {
-                                               // Fix empty banner URL
-                                               if (trim($networkRequestData['request_param_default']) == '') $networkRequestData['request_param_default'] = '---';
-
                                                // Get type data
                                                $networkRequestData['network_type_data'] = getNetworkTypeDataById($networkRequestData['network_type_id']);
 
index 3ff1059..1e1139e 100644 (file)
@@ -313,9 +313,6 @@ LIMIT 1",
        $OUT = '';
        $SW = 2;
        for ($idx = '0'; $idx < $prices; $idx++) {
-               if (empty($DATA['userid'][$idx])) $DATA['userid'][$idx] = '---';
-               if (empty($DATA['ref'][$idx])) $DATA['ref'][$idx] = '---';
-
                // Prepare marking of default (maybe current user's) id
                $start = ''; $end = '';
                if (($DATA['userid'][$idx] == $default) && ($default > 0)) {
@@ -331,7 +328,7 @@ LIMIT 1",
                        'end'    => $end,
                        'userid' => $DATA['userid'][$idx],
                        'ref'    => $DATA['ref'][$idx],
-                       'info  => ''
+                       'infos'  => ''
                );
 
                // Load row template and switch color
@@ -530,7 +527,7 @@ function markReferalRallyesAsExpired ($result) {
 
                                // Load template
                                $message = loadEmailTemplate($template, $DATA, $userid);
-                               sendEmail($userid, getMaskedMessage('RALLYE_MEMBER_EXPIRED_SUBJ', $DATA['level']), $message);
+                               sendEmail($userid, getMaskedMessage('RALLYE_MEMBER_EXPIRED_SUBJECT', $DATA['level']), $message);
                        } // END - if
 
                        // Count userid
@@ -549,7 +546,7 @@ function markReferalRallyesAsExpired ($result) {
        }
 
        // Send mail to admin
-       sendAdminNotification(getMaskedMessage('RALLYE_ADMIN_EXPIRED_SUBJ', $title), $templ, $cnt);
+       sendAdminNotification(getMaskedMessage('RALLYE_ADMIN_EXPIRED_SUBJECT', $title), $templ, $cnt);
 
        // Add task (we ignore the task id here)
        createNewTask('{--RALLYE_ADMIN_EXPIRED--}: ' . $title, '{--RALLYE_ADMIN_EXPIRED_TEXT--}', 'RALLYE_EXPIRED');
@@ -694,9 +691,7 @@ LIMIT 1",
                // We only need to check one element in $users, see above while() block
                if (isset($users['userid'][$k])) {
                        $prices['userid'][$k]  = $users['userid'][$k];
-                       if (empty($prices['userid'][$k])) $prices['userid'][$k]  = '---';
-                       $prices['ref'][$k] = $users['ref'][$k];
-                       if (empty($prices['ref'][$k])) $prices['ref'][$k] = '---';
+                       $prices['ref'][$k]     = $users['ref'][$k];
                        $prices['cpoints'][$k] = $users['cpoints'][$k];
                } // END - if
        } // END - foreach
@@ -724,8 +719,7 @@ function addReferalRallyeWinners ($rallye, $default=0) {
                //   active = 0: account is deleted or locked
                $active = countSumTotalData($DATA['userid'][$idx], 'user_data', 'userid', 'userid', true, " AND `status`='CONFIRMED'");
 
-               if (empty($DATA['userid'][$idx])) $DATA['userid'][$idx] = '---';
-               if ((empty($DATA['ref'][$idx])) || ($DATA['ref'][$idx] == '0') || ($active == '0') || ("".round($DATA['cpoints'][$idx])."" == '0') || (empty($DATA['cpoints'][$idx]))) {
+               if ((empty($DATA['ref'][$idx])) || ($DATA['ref'][$idx] == '0') || ($active == '0') || ('' . round($DATA['cpoints'][$idx]) . '' == '0') || (empty($DATA['cpoints'][$idx]))) {
                        // Allow valid and active users with at least one ref to get points
                        $DATA['ref'][$idx]   = '---';
                        $DATA['userid'][$idx]   = '---';
@@ -798,7 +792,7 @@ WHERE
                        $content['now_time']    = generateDateTime(time(), 1);
 
                        // Send mail to admin
-                       sendAdminNotification(getMaskedMessage('RALLYE_ADMIN_PURGED_SUBJ', $content['title']), 'admin_rallye_purged', $content);
+                       sendAdminNotification(getMaskedMessage('RALLYE_ADMIN_PURGED_SUBJECT', $content['title']), 'admin_rallye_purged', $content);
 
                        // Purge whole rallye
                        addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_data` WHERE `id`=%s LIMIT 1",
index 9305e2d..bc50b0a 100644 (file)
@@ -406,7 +406,7 @@ function updateMemberRefbackPercents ($id, $percents) {
        sendEmail($dummy['refid'], '{--MEMBER_REFBACK_SUBJECT--}', $mail);
 
        // Send admin notification
-       sendAdminNotification(getMessage('ADMIN_REFBACK_SUBJECT'), 'admin_refback', $dummy, getMemberId());
+       sendAdminNotification('{--ADMIN_REFBACK_SUBJECT--}', 'admin_refback', $dummy, getMemberId());
 
        // All fine!
        $status['ok'] = true;
index 4da3b60..46bca1b 100644 (file)
@@ -466,11 +466,11 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
 
        // Send mail to user (confirmation link!)
        $email = $content['email'];
-       sendEmail($content['email'], '{--GUEST_SUBJECT_CONFIRM_LINK--}', $messageGuest);
+       sendEmail($content['email'], '{--GUEST_CONFIRM_LINK_SUBJECT--}', $messageGuest);
        $content['email'] = $email;
 
        // Send mail to admin
-       sendAdminNotification(getMessage('ADMIN_SUBJECT_NEW_ACCOUNT'), 'register-admin', $content, $userid);
+       sendAdminNotification('{--ADMIN_NEW_ACCOUNT_SUBJECT--}', 'register-admin', $content, $userid);
 }
 
 // [EOF]
index 80d000c..1039375 100644 (file)
@@ -444,11 +444,11 @@ function saveSponsorData ($postData, $content) {
                        if ($EMAIL === true) {
                                $message = '{--SPONSOR_ACCOUNT_EMAIL_CHANGED--}';
                                $templ   = 'admin_sponsor_change_email';
-                               $subj    = '{--ADMIN_SPONSOR_ACC_EMAIL_SUBJ--}';
+                               $subj    = '{--ADMIN_SPONSOR_ACC_EMAIL_SUBJECT--}';
                        } else {
                                $message = '{--SPONSOR_ACCOUNT_DATA_SAVED--}';
                                $templ   = 'admin_sponsor_change_data';
-                               $subj    = '{--ADMIN_SPONSOR_ACC_DATA_SUBJ--}';
+                               $subj    = '{--ADMIN_SPONSOR_ACC_DATA_SUBJECT--}';
                        }
                        break;
 
@@ -456,7 +456,7 @@ function saveSponsorData ($postData, $content) {
                        // Set message template and subject for admin
                        $message = '{--SPONSOR_SETTINGS_SAVED--}';
                        $templ   = 'admin_sponsor_settings';
-                       $subj    = '{--ADMIN_SPONSOR_SETTINGS_SUBJ--}';
+                       $subj    = '{--ADMIN_SPONSOR_SETTINGS_SUBJECT--}';
                        break;
 
                default: // Unknown sponsor what value!
@@ -491,7 +491,7 @@ function saveSponsorData ($postData, $content) {
                                switch (getWhat()) {
                                        case 'account': // Change account data
                                                $email_msg = loadEmailTemplate('sponsor_change_data', $content);
-                                               sendEmail($content['email'], '{--SPONSOR_ACC_DATA_SUBJ--}', $email_msg);
+                                               sendEmail($content['email'], '{--SPONSOR_ACC_DATA_SUBJECT--}', $email_msg);
 
                                                if ($EMAIL === true) {
                                                        // Add hash code to content array
@@ -499,14 +499,14 @@ function saveSponsorData ($postData, $content) {
 
                                                        // Second mail goes to the new address
                                                        $email_msg = loadEmailTemplate('sponsor_change_email', $content);
-                                                       sendEmail($content['email'], '{--SPONSOR_ACC_EMAIL_SUBJ--}', $email_msg);
+                                                       sendEmail($content['email'], '{--SPONSOR_ACC_EMAIL_SUBJECT--}', $email_msg);
                                                } // END - if
                                                break;
 
                                        case 'settings': // Change settings
                                                // Send email
                                                $email_msg = loadEmailTemplate('sponsor_settings', $content);
-                                               sendEmail($content['email'], '{--SPONSOR_SETTINGS_SUBJ--}', $email_msg);
+                                               sendEmail($content['email'], '{--SPONSOR_SETTINGS_SUBJECT--}', $email_msg);
                                                break;
                                } // END - switch
                        } // END - if
index 71973d3..3939b0e 100644 (file)
@@ -366,12 +366,6 @@ function SURFBAR_MEMBER_DISPLAY_ACTION_FORM ($action, $urlData) {
        // Translate some data if present
        $content = SURFBAR_PREPARE_CONTENT_FOR_TEMPLATE($content);
 
-       // Is the lock reason empty?
-       if (empty($urlData['url_lock_reason'])) {
-               // Fix it to three dashes
-               $urlData['url_lock_reason'] = '---';
-       } // END - if
-
        // Include fields only for action 'edit'
        if ($action == 'edit') {
                // Default is not limited
index 6c509f4..ee6946a 100644 (file)
@@ -78,7 +78,7 @@ function autoPurgeTransfers ($max, $age) {
 
        // Only send email to admin(s) when we have removed entries
        if ($removed > 0) {
-               sendAdminNotification(getMessage('TRANSFER_ADMIN_AUTOPURGE'), 'admin_transfer_ap', $removed);
+               sendAdminNotification('{--TRANSFER_ADMIN_AUTOPURGE--}', 'admin_transfer_ap', $removed);
        } // END - if
 }
 
index 2c3a85d..05c1110 100644 (file)
@@ -313,7 +313,7 @@ function WERNIS_EXECUTE_PAYOUT ($wdsId, $amount) {
 }
 
 // Translate the status IN/OUT
-function WERNIS_TRANSFER_STATUS ($status) {
+function translateWernisTransferStatus ($status) {
        // Default status
        $return = getMaskedMessage('WERNIS_STATUS_UNKNWOWN', $status);
        switch ($status) {
index ed8d5e9..891d19c 100644 (file)
@@ -1133,7 +1133,7 @@ function sendAdminPasswordResetLink ($email) {
        $mailText = loadEmailTemplate('admin_reset_password', $content);
 
        // Send it out
-       sendEmail($email, '{--ADMIN_RESET_PASS_LINK_SUBJ--}', $mailText);
+       sendEmail($email, '{--ADMIN_RESET_PASS_LINK_SUBJECT--}', $mailText);
 
        // Prepare output
        return getMessage('ADMIN_RESET_LINK_SENT');
index 022b93b..d543264 100644 (file)
@@ -430,7 +430,7 @@ LIMIT 1",
                $OUT = ''; $SW = 2;
                while ($content = SQL_FETCHARRAY($result_tasks)) {
                        // Init infos
-                       $content['infos'] = '---';
+                       $content['infos'] = '';
 
                        // Generate assign link
                        $content['assigned_admin'] = generateAdminLink($content['assigned_admin']);
index 7d0921b..003f955 100644 (file)
@@ -74,7 +74,7 @@ if (getRequestParameter('userid') == 'all') {
 
                        // Load email template and send email away
                        $message = loadEmailTemplate('add-points', $content, bigintval($content['userid']));
-                       sendEmail(bigintval($content['userid']), '{--ADMIN_ADD_SUBJ--}', $message);
+                       sendEmail(bigintval($content['userid']), '{--ADMIN_ADD_SUBJECT--}', $message);
                } // END - while
 
                // Free memory
@@ -105,7 +105,7 @@ if (getRequestParameter('userid') == 'all') {
                        // Message laden
                        $message = loadEmailTemplate('add-points', $content, bigintval(getRequestParameter('userid')));
 
-                       sendEmail(bigintval(getRequestParameter('userid')), '{--ADMIN_ADD_SUBJ--}', $message);
+                       sendEmail(bigintval(getRequestParameter('userid')), '{--ADMIN_ADD_SUBJECT--}', $message);
                        loadTemplate('admin_settings_saved', false, '{--ADMIN_POINTS_ADDED--}');
                } else {
                        // Prepare content
index 360ec7b..552a7b8 100644 (file)
@@ -109,30 +109,16 @@ if ((isFormSent('edit')) && (countPostSelection() > 0)) {
        $OUT = ''; $SW = 2;
        foreach (postRequestParameter('sel') as $id => $selected) {
                // Load data for the id
-               $result = SQL_QUERY_ESC("SELECT admin_id, action_menu, what_menu, access_mode FROM `{?_MYSQL_PREFIX?}_admins_acls` WHERE `id`=%s LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT `id`, `admin_id`, `action_menu`, `what_menu`, `access_mode` FROM `{?_MYSQL_PREFIX?}_admins_acls` WHERE `id`=%s LIMIT 1",
                        array(bigintval($id)), __FILE__, __LINE__);
-               list($admin, $action, $what, $mode) = SQL_FETCHROW($result);
+               $content = SQL_FETCHARRAY($result);
                SQL_FREERESULT($result);
 
-               // Prepare variables
-               if (empty($action)) $action = '---';
-               if (empty($what)) $what = '---';
-
                // Get admin mode
-               $mode = '{--ADMINS_' . strtoupper($mode) . '_MODE--}';
+               $content['access_mode'] = '{--ADMINS_' . strtoupper($content['access_mode']) . '_MODE--}';
 
-               // Generate link
-               $admin = generateAdminLink($admin);
-
-               // Prepare data for the row template
-               $content = array(
-                       'sw'     => $SW,
-                       'id'     => $id,
-                       'admin'  => $admin,
-                       'action' => $action,
-                       'what'   => $what,
-                       'mode'   => $mode,
-               );
+               // Add color switch
+               $content['sw'] = $SW;
 
                // Load row template and switch colors
                $OUT .= loadTemplate('admin_config_admins_del_row', true, $content);
@@ -217,22 +203,11 @@ VALUES ('%s','%s','%s','%s')",
                // List ACLs
                $OUT = ''; $SW = 2;
                while ($content = SQL_FETCHARRAY($result_acls)) {
-                       // Prepare variables
-                       if (empty($content['action_menu'])) $content['action_menu'] = '---';
-                       if (empty($content['what_menu']))   $content['what_menu']   = '---';
-
-                       // Get mode
+                       // Generate mode string
                        $content['access_mode'] = '{--ADMINS_' . strtoupper($content['access_mode']) . '_MODE--}';
 
-                       // Prepare data for the row template
-                       $content = array(
-                               'sw'     => $SW,
-                               'id'     => $content['id'],
-                               'admin'  => generateAdminLink($content['admin_id']),
-                               'action' => $content['action_menu'],
-                               'what'   => $content['what_menu'],
-                               'mode'   => $content['access_mode'],
-                       );
+                       // Add color switch
+                       $content['sw'] = $SW;
 
                        // Load row template and switch colors
                        $OUT .= loadTemplate('admin_config_admins_row', true, $content);
index 1383d4e..f72905d 100644 (file)
@@ -56,10 +56,10 @@ if (isPostRequestParameterSet(('add_max'))) {
                // Add this value (including comment)
                SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (value, comment) VALUES ('%s','%s')",
                array(bigintval(postRequestParameter('max')), postRequestParameter('comment')),__FILE__, __LINE__);
-               $content = '{--MAX_VALUE_SAVED--}';
+               $content = '{--ADMIN_MAX_VALUE_SAVED--}';
        } else {
                // Value does alread exists!
-               $content = '<span class="admin_failed">{--MAX_VALUE_ALREADY--}</span>';
+               $content = '<span class="admin_failed">{--ADMIN_MAX_VALUE_ALREADY--}</span>';
        }
 
        // Free memory
@@ -103,18 +103,13 @@ if (isPostRequestParameterSet(('add_max'))) {
        $OUT = ''; $SW = 2;
        foreach (postRequestParameter('sel') as $id => $value) {
                // Load data
-               $result = SQL_QUERY_ESC("SELECT value, comment FROM `{?_MYSQL_PREFIX?}_max_receive` WHERE `id`=%s LIMIT 1",
-               array(bigintval($id)), __FILE__, __LINE__);
-               list($value, $comment) = SQL_FETCHROW($result);
+               $result = SQL_QUERY_ESC("SELECT `id`, `value`, `comment` FROM `{?_MYSQL_PREFIX?}_max_receive` WHERE `id`=%s LIMIT 1",
+                       array(bigintval($id)), __FILE__, __LINE__);
+               $content = SQL_FETCHARRAY($result);
                SQL_FREERESULT($result);
 
-               // Prepare data for the row template
-               $content = array(
-                       'sw'      => $SW,
-                       'id'      => $id,
-                       'value'   => $value,
-                       'comment' => $comment,
-               );
+               // Add color switch
+               $content['sw'] = $SW;
 
                // Load row template and switch color
                $OUT .= loadTemplate('admin_config_email_del_row', true, $content);
@@ -129,18 +124,13 @@ if (isPostRequestParameterSet(('add_max'))) {
        $OUT = ''; $SW = 2;
        foreach (postRequestParameter('sel') as $id => $value) {
                // Load data
-               $result = SQL_QUERY_ESC("SELECT value, comment FROM `{?_MYSQL_PREFIX?}_max_receive` WHERE `id`=%s LIMIT 1",
-               array(bigintval($id)), __FILE__, __LINE__);
-               list($value, $comment) = SQL_FETCHROW($result);
+               $result = SQL_QUERY_ESC("SELECT `id`, `value`, `comment` FROM `{?_MYSQL_PREFIX?}_max_receive` WHERE `id`=%s LIMIT 1",
+                       array(bigintval($id)), __FILE__, __LINE__);
+               $content = SQL_FETCHARRAY($result);
                SQL_FREERESULT($result);
 
-               // Prepare data for the row template
-               $content = array(
-                       'sw'      => $SW,
-                       'id'      => $id,
-                       'value'   => $value,
-                       'comment' => $comment,
-               );
+               // Add color switch
+               $content['sw'] = $SW;
 
                // Load row template and switch color
                $OUT .= loadTemplate('admin_config_email_edit_row', true, $content);
index b4a0a3d..f5e8f3c 100644 (file)
@@ -84,7 +84,7 @@ if (isFormSent('edit')) {
                loadTemplate('admin_mods_edit', false, $OUT);
        } else {
                // Nothing selected
-               loadTemplate('admin_settings_saved', false, '{--MODS_NOTHING_SELECTED--}');
+               loadTemplate('admin_settings_saved', false, '{--ADMIN_MODS_NOTHING_SELECTED--}');
 
                // Remove maybe confusing data
                unsetPostRequestParameter('edit');
@@ -120,7 +120,7 @@ if (isFormSent('edit')) {
        } // END - if
 
        // Entries updated
-       loadTemplate('admin_settings_saved', false, '{--MODS_CHANGED--}');
+       loadTemplate('admin_settings_saved', false, '{--ADMIN_MODS_CHANGED--}');
 }
 
 if (countPostSelection() == 0) {
@@ -135,7 +135,6 @@ ORDER BY
        $OUT = ''; $SW = 2;
        while ($content = SQL_FETCHARRAY($result)) {
                // Reset title to --- if it is NULL
-               if (empty($content['title'])) $content['title'] = '---';
                if (($content['module'] == 'index') || ($content['module'] == 'login')) {
                        // Add link to detail statistics
                        $content['module'] = '<strong><a href="{%url=modules.php?module=admin&amp;what=stats_mods&amp;mod=' . $content['module'] . '%}">' . $content['module'] . '</a></strong>';
index 617b034..c63c04e 100644 (file)
@@ -126,25 +126,21 @@ LIMIT 1",
                        $OUT = ''; $SW = 2;
                        foreach (postRequestParameter('sel') as $id => $sel) {
                                // Load data to selected rallye
-                               $result = SQL_QUERY_ESC("SELECT rallye_id, price_level, points, info FROM `{?_MYSQL_PREFIX?}_rallye_prices` WHERE `id`=%s LIMIT 1",
+                               $result = SQL_QUERY_ESC("SELECT `rallye_id`, `price_level`, `points`, `info` FROM `{?_MYSQL_PREFIX?}_rallye_prices` WHERE `id`=%s LIMIT 1",
                                        array(bigintval($id)), __FILE__, __LINE__);
-                               list($rallye, $level, $points, $infos) = SQL_FETCHROW($result);
+                               $content = SQL_FETCHARRAY($result);
                                SQL_FREERESULT($result);
 
-                               // Prepare data for the row template
-                               $content = array(
-                                       'sw'      => $SW,
-                                       'id'      => $id,
-                                       'rallyes' => generateOptionList('rallye_data', 'id', 'title', $rallye),
-                                       'level'   => $level,
-                                       'points'  => $points,
-                                       'infos'   => $infos,
-                               );
+                               // Add more content
+                               $content['sw']             = $SW;
+                               $content['rallye_content'] = generateOptionList('rallye_data', 'id', 'title', $content['rallye_id']);
 
                                // Load row template and switch color
                                $OUT .= loadTemplate('admin_config_rallye_edit_row', true, $content);
                                $SW = 3 - $SW;
                        } // END - foreach
+
+                       // Remember row content
                        $content['rows'] = $OUT;
 
                        // Prepare data for the main template
@@ -166,19 +162,11 @@ LIMIT 1",
                                // Load data to selected rallye
                                $result = SQL_QUERY_ESC("SELECT `rallye_id`, `price_level`, `points`, `info` FROM `{?_MYSQL_PREFIX?}_rallye_prices` WHERE `id`=%s LIMIT 1",
                                        array(bigintval($id)), __FILE__, __LINE__);
-                               list($rallye, $level, $points, $infos) = SQL_FETCHROW($result);
+                               $content = SQL_FETCHARRAY($result);
                                SQL_FREERESULT($result);
 
-                               if (empty($infos)) $infos = '---';
-
-                               // Prepare data for the row template
-                               $content = array(
-                                       'sw'      => $SW,
-                                       'id'      => $id,
-                                       'level'   => $level,
-                                       'points'  => $points,
-                                       'infos'   => $infos,
-                               );
+                               // Add color switch
+                               $content['sw'] = $SW;
 
                                // Load row template and switch color
                                $OUT .= loadTemplate('admin_config_rallye_del_row', true, $content);
@@ -205,18 +193,8 @@ LIMIT 1",
                        // Load all prices for the selected rallye
                        $OUT = ''; $SW = 2;
                        while ($content = SQL_FETCHARRAY($result)) {
-                               // Fix empty info
-                               if (empty($content['info'])) $content['info'] = '---';
-
-                               // Prepare data for the row template
-                               // @TODO Rewritings: level->price_level, infos->info in template
-                               $content = array(
-                                       'sw'      => $SW,
-                                       'id'      => $content['id'],
-                                       'level'   => $content['price_level'],
-                                       'points'  => $content['points'],
-                                       'infos'   => $content['info'],
-                               );
+                               // Add color switch
+                               $content['sw'] = $SW;
 
                                // Load row template and switch color
                                $OUT .= loadTemplate('admin_config_rallye_prices_row', true, $content);
index f5218da..c684f07 100644 (file)
@@ -64,12 +64,9 @@ if (isFormSent()) {
        adminSaveSettingsFromPostData();
 } else {
        // Load existing modules and generate TR rows for the template
-       $result = SQL_QUERY("SELECT module, title FROM `{?_MYSQL_PREFIX?}_mod_reg` ORDER BY module", __FILE__, __LINE__);
+       $result = SQL_QUERY("SELECT `module`, `title` FROM `{?_MYSQL_PREFIX?}_mod_reg` ORDER BY module", __FILE__, __LINE__);
        $OUT = ''; $SW = 2;
        while ($content = SQL_FETCHARRAY($result)) {
-               // Set title to three dashes when no title is supplied
-               if (empty($content['title'])) $content['title'] = '---';
-
                // Already registered module?
                if (isInString($content['module'], getConfig('rewrite_skip'))) {
                        // Found
index 6361bd3..66004b2 100644 (file)
@@ -87,14 +87,14 @@ LIMIT 1", array(bigintval($id)), __FILE__, __LINE__);
 
                        // Send email to user
                        $message = loadEmailTemplate('member_holiday_removed', $content, $userid);
-                       sendEmail($userid, '{--HOLIDAY_ADMIN_REMOVED_SUBJ--}', $message);
+                       sendEmail($userid, '{--ADMIN_HOLIDAY_REMOVED_SUBJECT--}', $message);
                        $cnt++;
                }
        }
-       loadTemplate('admin_settings_saved', false, getMaskedMessage('HOLIDAY_ADMIN_MULTI_DEL', $cnt));
+       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_HOLIDAY_MULTI_DEL', $cnt));
 } elseif (isGetRequestParameterSet('userid')) {
        // Set default message
-       $message = '{--HOLIDAY_ADMIN_SINGLE_404--}';
+       $message = '{--ADMIN_HOLIDAY_SINGLE_404--}';
 
        // Fetch data
        $result_load = SQL_QUERY_ESC("SELECT
@@ -118,10 +118,10 @@ LIMIT 1", array(bigintval(getRequestParameter('userid'))), __FILE__, __LINE__);
 
                // Send email to user
                $message = loadEmailTemplate('member_holiday_removed', $content, getRequestParameter('userid'));
-               sendEmail(getRequestParameter('userid'), '{--HOLIDAY_ADMIN_REMOVED_SUBJ--}', $message);
+               sendEmail(getRequestParameter('userid'), '{--ADMIN_HOLIDAY_REMOVED_SUBJECT--}', $message);
 
                // Set message
-               $message = '{--HOLIDAY_ADMIN_SINGLE_DELETED--}';
+               $message = '{--ADMIN_HOLIDAY_SINGLE_DELETED--}';
        } // END - if
 
        // Free memory
index 059fce3..7852224 100644 (file)
@@ -101,7 +101,7 @@ LIMIT 1",
 
                                                // Send email
                                                $message = loadEmailTemplate('sponsor_add_points', $content);
-                                               sendEmail($content['email'], '{--ADMIN_SPONSOR_ADD_POINTS_SUBJ--}', $message);
+                                               sendEmail($content['email'], '{--ADMIN_SPONSOR_ADD_POINTS_SUBJECT--}', $message);
                                                $message = '{--ADMIN_SPONSOR_POINTS_ADDED--}';
                                        } else {
                                                // No points entered to add!
@@ -124,7 +124,7 @@ LIMIT 1",
 
                                                // Send email
                                                $message = loadEmailTemplate('sponsor_sub_points', $content);
-                                               sendEmail($content['email'], '{--ADMIN_SPONSOR_SUB_POINTS_SUBJ--}', $message);
+                                               sendEmail($content['email'], '{--ADMIN_SPONSOR_SUB_POINTS_SUBJECT--}', $message);
                                                $message = '{--ADMIN_SPONSOR_POINTS_SUBTRACTED--}';
                                        } else {
                                                // No points entered to add!
index d581889..d8ba7c0 100644 (file)
@@ -53,7 +53,7 @@ if (isGetRequestParameterSet('userid')) {
                $content = getUserDataArray();
 
                // Prepare constants
-               // @TODO No longer needed? define('__CATS_BASE'   , '<a href="{%url=modules.php?module=admin&amp;userid=');
+               // @TODO No longer needed? define('__CATEGORIES_BASE'   , '<a href="{%url=modules.php?module=admin&amp;userid=');
                $content['userid']       = bigintval(getRequestParameter('userid'));
                $content['email']        = '<a href="' . generateEmailLink($content['email'], 'user_data') . '">' . $content['surname'] . ' ' . $content['family'] . '</a>';
 
index d23b431..414c89f 100644 (file)
@@ -61,9 +61,6 @@ if (SQL_NUMROWS($result) > 0) {
        // List all holiday requests
        $OUT = ''; $SW = 2;
        while ($content = SQL_FETCHARRAY($result)) {
-               // Add three dashes to comment when it is empty
-               if (empty($content['comments'])) $content['comments'] = '---';
-
                // Prepare data for the row template
                $content = array(
                        'sw'          => $SW,
@@ -88,7 +85,7 @@ if (SQL_NUMROWS($result) > 0) {
        loadTemplate('admin_list_holiday', false, $OUT);
 } else {
        // No holiday requests found
-       loadTemplate('admin_settings_saved', false, '{--HOLIDAY_ADMIN_NOTHING_FOUND--}');
+       loadTemplate('admin_settings_saved', false, '{--ADMIN_HOLIDAY_NOTHING_FOUND--}');
 }
 
 // [EOF]
index cd560e6..bbdfcd4 100644 (file)
@@ -77,7 +77,7 @@ if (isGetRequestParameterSet('userid')) {
 
                                // Prepare mail and send it away
                                $message = loadEmailTemplate('admin-del_links', $nums, bigintval(getRequestParameter('userid')));
-                               sendEmail(getUserData('email'), '{--ADMIN_DEL_LINK_SUBJ--}', $message);
+                               sendEmail(getUserData('email'), '{--ADMIN_DEL_LINK_SUBJECT--}', $message);
 
                                // Display message
                                loadTemplate('admin_settings_saved', false, '{--ADMIN_LINKS_DELETED--}');
index cd00ee7..23f72e3 100644 (file)
@@ -259,11 +259,7 @@ ORDER BY
 
                                // Admins can addionally test the URL for framekillers
                                $content['target_bank'] = '<a href="' . generateFrametesterUrl($content['url']) . '" target="_blank">{--CLICK_HERE--}</a>';
-                       } else {
-                               // e-currency payout request
-                               if (empty($content['target_account'])) $content['target_account'] = '---';
-                               if (empty($content['target_bank']))    $content['target_bank']    = '---';
-                       }
+                       } // END - if
 
                        // Add/Translate some data
                        $content['sw']               = $SW;
index f7e1189..1d9c037 100644 (file)
@@ -65,7 +65,6 @@ if (SQL_NUMROWS($result) > 0) {
                $content['primera_timestamp'] = generateDateTime($content['primera_timestamp'], 2);
 
                // Fix empty message and status
-               if (empty($content['primera_api_message'])) $content['primera_api_message'] = '---';
                if (empty($content['primera_api_status']))  $content['primera_api_status']  = 'OK';
 
                // Append it and switch colors
index 81cc4ae..509f6d2 100644 (file)
@@ -319,8 +319,6 @@ ORDER BY
 
                        // Alter some variables
                        if (empty($data['login']))    $data['login']     = '???';
-                       if (empty($data['template'])) $data['template']  = '---';
-                       if (empty($data['descr']))    $data['descr']     = '---';
 
                        // Transfer data into array for the template
                        $row = array(
index 9a82dde..b01bb29 100644 (file)
@@ -47,9 +47,15 @@ addMenuDescription('admin', __FILE__);
 
 if (isGetRequestParameterSet('id')) {
        // Show detailed informations to a sponsor
-       $result = SQL_QUERY_ESC("SELECT company, position, gender, surname, family, street_nr1, street_nr2, zip, city, country, phone, fax, cell, email, url, tax_ident, status, sponsor_created, last_online, last_change, receive_warnings, points_amount, points_used, remote_addr, warning_interval, refid, ref_count
-FROM `{?_MYSQL_PREFIX?}_sponsor_data`
-WHERE `id`='%s' LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT
+       `company`, `position`, `gender`, `surname`, `family`, `street_nr1`, `street_nr2`, `zip`, `city`, `country`,
+       `phone`, `fax`, `cell`, `email`, `url`, `tax_ident`,
+       `status`, `sponsor_created`, `last_online`, `last_change`, `receive_warnings`,
+       `points_amount`, `points_used`, `remote_addr`, `warning_interval`, `refid`, `ref_count`
+FROM
+       `{?_MYSQL_PREFIX?}_sponsor_data`
+WHERE
+       `id`=%s LIMIT 1",
        array(bigintval(getRequestParameter('id'))), __FILE__, __LINE__);
 
        if (SQL_NUMROWS($result) == 1) {
index 8c7e949..ed361f7 100644 (file)
@@ -183,7 +183,6 @@ if (SQL_NUMROWS($result) > 0) {
                $content['sw']              = $SW;
                $content['url_registered']  = generateDateTime($content['url_registered'], 2);
                $content['url_last_locked'] = generateDateTime($content['url_last_locked'], 2);
-               if (empty($content['url_lock_reason'])) $content['url_lock_reason'] = '---';
 
                // Load row template
                $OUT .= loadTemplate('admin_list_surfbar_urls_row', true, $content);
index 18749aa..c118741 100644 (file)
@@ -151,7 +151,7 @@ ORDER BY
                $OUT = ''; $SW = 2;
                while ($content = SQL_FETCHARRAY($result_tasks)) {
                        // Init infos
-                       $content['infos'] = '---';
+                       $content['infos'] = '';
 
                        // Generate link
                        $content['assigned_admin'] = generateAdminLink($content['assigned_admin']);
index 0e90bfb..3697eb4 100644 (file)
@@ -123,9 +123,6 @@ LIMIT 1",
                if ($content['refs']  > 0) $content['refs']  = $base . '&amp;what=list_refs&amp;userid=' . $userid . '%}">' . translateComma($content['refs']) . '</a>]';
                if ($content['cats']  > 0) $content['cats']  = $base . '&amp;what=list_cats&amp;userid=' . $userid . '%}">' . translateComma($content['cats']) . '</a>]';
 
-               // Fix empty module
-               if (empty($content['last_module'])) $content['last_module'] = '---';
-
                // Calculate timestamp for birthday
                $stamp = mktime(0, 0, 0, $content['birth_month'], $content['birth_day'], $content['birth_year']);
 
@@ -148,19 +145,11 @@ LIMIT 1",
                $content['total']             = countSumTotalData($userid, 'user_points', 'points');
                $content['locked']            = countSumTotalData($userid, 'user_points', 'locked_points');
                $content['lock_timestamp']    = generateDateTime($content['lock_timestamp'], 2);
-
-               // Is the lock reason not set?
-               if (!isset($content['lock_reason'])) $content['lock_reason'] = '---';
+               $content['nickname']          = '{--EXT_NICKNAME_404--}';
 
                // Nickname inclusion?
                // @TODO Rewrite these to filters
-               if (isExtensionActive('nickname')) {
-                       // Nickname not set or invalid? Then
-                       if ((empty($content['nickname'])) || ($content['nickname'] == $userid)) $content['nickname'] = '---';
-               } else {
-                       // Extension not found
-                       $content['nickname'] = '{--EXT_NICKNAME_404--}';
-               }
+               if (isExtensionInstalled('nickname')) $content['nickname'] = getNickname($content['userid']);
 
                // Clickrate
                $content['click_rate'] = '0';
@@ -286,7 +275,8 @@ LIMIT 1",
                        if ($content['emails_sent'] > 0) $content['emails_sent'] = $base . '&amp;what=email_details&amp;userid=' . $content['userid'] . '%}">' . translateComma($content['emails_sent']) . '</a>]';
 
                        // Add nickname
-                       if ((empty($content['nickname'])) || ($content['nickname'] == $content['userid'])) $content['nickname'] = '---';
+                       $content['nickname'] = '{--EXT_NICKNAME_404--}';
+                       if (isExtensionInstalled('nickname')) $content['nickname'] = getNickname($content['userid']);
 
                        // Calculate total points
                        $content['points'] = countSumTotalData($content['userid'], 'user_points', 'points')  - countSumTotalData($content['userid'], 'user_data', 'used_points');
@@ -307,9 +297,6 @@ LIMIT 1",
                        // If we have at least one referal, make it clickable to referal list
                        if ($content['refs'] > 0) $content['refs'] = $base . '&amp;what=list_refs&amp;userid=' . $content['userid'] . '%}">' . translateComma($content['refs']) . '</a>]';
 
-                       // Is the lock reason not set?
-                       if (!isset($content['lock_reason'])) $content['lock_reason'] = '---';
-
                        // Is the extension 'country' installed?
                        // @TODO Rewrite this into a filter
                        if (isExtensionActive('country')) {
index 9d921bd..e87ab05 100644 (file)
@@ -65,7 +65,6 @@ if (SQL_NUMROWS($result) > 0) {
                $content['wernis_timestamp'] = generateDateTime($content['wernis_timestamp'], 2);
 
                // Fix empty message and status
-               if (empty($content['wernis_api_message'])) $content['wernis_api_message'] = '---';
                if (empty($content['wernis_api_status']))  $content['wernis_api_status']  = 'OK';
 
                // Append it and switch colors
index a59eaf4..b62ee79 100644 (file)
@@ -64,12 +64,12 @@ if (isGetRequestParameterSet('id')) {
                                if ($content['status'] == 'CONFIRMED') {
                                        // Message when sponsor's account got lock
                                        $content['message'] = '{--SPONSOR_ACCOUNT_LOCKED--}';
-                                       $subject = '{--SPONSOR_SUBJECT_LOCKED--}';
+                                       $subject = '{--SPONSOR_LOCKED_SUBJECT--}';
                                        $content['status'] = 'LOCKED';
                                } else {
                                        // Message when sponsor's account got unlock
                                        $content['message'] = '{--SPONSOR_ACCOUNT_UNLOCKED--}';
-                                       $subject = '{--SPONSOR_SUBJECT_UNLOCKED--}';
+                                       $subject = '{--SPONSOR_UNLOCKED_SUBJECT--}';
                                        $content['status'] = 'CONFIRMED';
                                }
 
index 9eb4635..fc2dc12 100644 (file)
@@ -71,7 +71,7 @@ if (isGetRequestParameterSet('userid')) {
                                $message = loadEmailTemplate('lock-user', array('text' => postRequestParameter('reason')), bigintval(getRequestParameter('userid')));
 
                                // Send away...
-                               sendEmail(bigintval(getRequestParameter('userid')), '{--ADMIN_LOCKED_SUBJ--}', $message);
+                               sendEmail(bigintval(getRequestParameter('userid')), '{--ADMIN_LOCKED_SUBJECT--}', $message);
                        } // END - if
 
                        // Prepare message
@@ -103,7 +103,7 @@ LIMIT 1",
                                $message = loadEmailTemplate('unlock-user', array('text' => postRequestParameter('reason')), bigintval(getRequestParameter('userid')));
 
                                // Send away...
-                               sendEmail(bigintval(getRequestParameter('userid')), '{--ADMIN_UNLOCKED_SUBJ--}', $message);
+                               sendEmail(bigintval(getRequestParameter('userid')), '{--ADMIN_UNLOCKED_SUBJECT--}', $message);
                                if (isExtensionActive('rallye')) {
                                        addUserToReferalRallye(getRequestParameter('userid'));
                                } // END - if
index 8de522a..f61bf69 100644 (file)
@@ -52,9 +52,9 @@ if (((!isPostRequestParameterSet(('t_wait'))) || (!isPostRequestParameterSet(('p
 if (isFormSent()) {
        switch (getRequestParameter('do')) {
                case 'add':
-                       addSql("INSERT INTO `{?_MYSQL_PREFIX?}_payments` (time, payment, mail_title, price) VALUES ('".postRequestParameter('t_wait')."','".postRequestParameter('payment')."','".postRequestParameter('title')."','".postRequestParameter('price')."')");
-                       $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_payments` WHERE time='%s' LIMIT 1",
-                       array(postRequestParameter('t_wait')), __FILE__, __LINE__);
+                       addSql("INSERT INTO `{?_MYSQL_PREFIX?}_payments` (`time`, `payment`, `mail_title`, `price`) VALUES ('".postRequestParameter('t_wait')."','".postRequestParameter('payment')."','".postRequestParameter('title')."','".postRequestParameter('price')."')");
+                       $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_payments` WHERE `time`='%s' LIMIT 1",
+                               array(postRequestParameter('t_wait')), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result) == 1) {
                                // Re-init the array here
                                initSqls();
@@ -149,14 +149,14 @@ if (isFormSent()) {
                // List already existing categories for editing
                while ($content = SQL_FETCHARRAY($result)) {
                        // Prepare array for the row template
-                       // @TODO Rewritings: title->mail_title, pay->payment in template
+                       // @TODO Rewritings: title->mail_title in template
                        $content = array(
-                               'sw'    => $SW,
-                               'id'    => $content['id'],
-                               'time'  => $content['time'],
-                               'title' => $content['mail_title'],
-                               'pay'   => translateComma($content['payment']),
-                               'price' => translateComma($content['price'])
+                               'sw'      => $SW,
+                               'id'      => $content['id'],
+                               'time'    => $content['time'],
+                               'title'   => $content['mail_title'],
+                               'payment' => translateComma($content['payment']),
+                               'price'   => translateComma($content['price'])
                        );
 
                        // Load row template and switch colors
index 51e4edd..5e99503 100644 (file)
@@ -71,7 +71,7 @@ if (SQL_NUMROWS($result) > 0) {
        }
 } else {
        // No category selections found, no members registered?
-       $content = '<div class="admin_failed">{--ADMIN_REPAIR_CATS_NOTHING--}</div>';
+       $content = '<div class="admin_failed">{--ADMIN_REPAIR_CATEGORIES_NOTHING--}</div>';
 }
 
 // Load template
index 3520e30..a2e5a68 100644 (file)
@@ -75,8 +75,6 @@ if ((getRequestParameter('mod') == 'index') || (getRequestParameter('mod') == 'l
        $result = SQL_QUERY("SELECT `module`, `title`, `clicks` FROM `{?_MYSQL_PREFIX?}_mod_reg` ORDER BY `clicks` DESC, `module` ASC", __FILE__, __LINE__);
        $OUT = ''; $SW = 2;
        while ($content = SQL_FETCHARRAY($result)) {
-               if (empty($content['title'])) $content['title'] = '---';
-
                if (($content['module'] == 'index') || ($content['module'] == 'login')) {
                        // Add link to detail statistics
                        $content['module'] = '<a href="{%url=modules.php?module=admin&amp;what=stats_mods&amp;mod=' . $content['module'] . '%}">' . $content['module'] . '</a>';
index 06074f5..970de4c 100644 (file)
@@ -67,7 +67,7 @@ if (getRequestParameter('userid') == 'all') {
 
                        // Load message and send it away
                        $message = loadEmailTemplate('sub-points', $content, bigintval($content['userid']));
-                       sendEmail($content['email'], '{--ADMIN_SUB_SUBJ--}', $message);
+                       sendEmail($content['email'], '{--ADMIN_SUB_SUBJECT--}', $message);
                } // END - while
 
                // Free memory
@@ -95,7 +95,7 @@ if (getRequestParameter('userid') == 'all') {
 
                        // Load email and send it away
                        $message = loadEmailTemplate('sub-points', $content, bigintval(getRequestParameter('userid')));
-                       sendEmail($content['email'], '{--ADMIN_SUB_SUBJ--}', $message);
+                       sendEmail($content['email'], '{--ADMIN_SUB_SUBJECT--}', $message);
 
                        // Output message
                        loadTemplate('admin_settings_saved', false, '{--ADMIN_POINTS_SUBTRACTED--}');
index a86a7f8..5ae058b 100644 (file)
@@ -165,7 +165,7 @@ LIMIT 1",
                                        if ($REFERAL['receive_warnings'] == 'Y') {
                                                // Send notification to referal
                                                $REF_MSG = loadEmailTemplate('sponsor_ref_notify', $REFERAL);
-                                               sendEmail($REFERAL['email'], '{--SPONSOR_REF_NOTIFY_SUBJ--}', $REF_MSG);
+                                               sendEmail($REFERAL['email'], '{--SPONSOR_REF_NOTIFY_SUBJECT--}', $REF_MSG);
                                        } // END - if
 
                                        // Free memory
@@ -178,7 +178,7 @@ LIMIT 1",
 
                        // So let's send the email away
                        $message = loadEmailTemplate('sponsor_unlocked', $content);
-                       sendEmail($content['email'], '{--SPONSOR_UNLOCKED_SUBJ--}', $message);
+                       sendEmail($content['email'], '{--SPONSOR_UNLOCKED_SUBJECT--}', $message);
                } // END - foreach
        } else {
                // Nothing selected
index a19cb85..cda7d8e 100644 (file)
@@ -63,10 +63,6 @@ if (isExtensionActive('online')) {
                // List all online users
                $OUT = ''; $SW = 2;
                while ($row = SQL_FETCHARRAY($result)) {
-                       // Fix empty action/what
-                       if (empty($row['action'])) $row['action'] = '---';
-                       if (empty($row['what']))   $row['what']   = '---';
-
                        if ($row['is_admin'] == 'Y') {
                                // Is an administrator
                                $row['userid'] = '{--_IS_ADMIN--}';
index 2c3025c..fcbbddb 100644 (file)
@@ -169,7 +169,7 @@ LIMIT 1",
                                $message = loadEmailTemplate('guest_request_confirm', array('hash' => $content['user_hash']), $content['userid']);
 
                                // Send email
-                               sendEmail(postRequestParameter('email'), '{--REQUEST_CONFIRM_LINK_SUBJ--}', $message);
+                               sendEmail(postRequestParameter('email'), '{--REQUEST_CONFIRM_LINK_SUBJECT--}', $message);
 
                                // And set message
                                $content['message'] = '{--CONFIRM_LINK_SENT--}';
index e4fb6d1..340e211 100644 (file)
@@ -97,10 +97,10 @@ LIMIT 1",
                        if (SQL_AFFECTEDROWS() == 1) {
                                // Prepare mail and send it to the sponsor
                                $message = loadEmailTemplate('sponsor_pending', $data);
-                               sendEmail($data['email'], '{--SPONSOR_ACCOUNT_PENDING_SUBJ--}', $message);
+                               sendEmail($data['email'], '{--SPONSOR_ACCOUNT_PENDING_SUBJECT--}', $message);
 
                                // Send email to admin
-                               sendAdminNotification(getMessage('ADMIN_NEW_SPONSOR'), 'admin_sponsor_pending', $data);
+                               sendAdminNotification('{--ADMIN_NEW_SPONSOR--}', 'admin_sponsor_pending', $data);
 
                                // Sponsor account set to pending
                                loadTemplate('admin_settings_saved', false, '{--SPONSOR_ACCOUNT_IS_PENDING--}');
@@ -170,7 +170,7 @@ WHERE email='%s' AND (`status`='UNCONFIRMED' OR `status`='EMAIL') LIMIT 1",
                                // Confirmed email address
                                $message_sponsor = loadEmailTemplate('sponsor_email', $data);
                        }
-                       sendEmail(postRequestParameter('email'), '{--SPONSOR_ACTIVATION_LINK_SUBJ--}', $message_sponsor);
+                       sendEmail(postRequestParameter('email'), '{--SPONSOR_ACTIVATION_LINK_SUBJECT--}', $message_sponsor);
 
                        // Output message
                        loadTemplate('admin_settings_saved', false, '{--SPONSOR_ACTIVATION_LINK_SENT--}');
@@ -213,7 +213,7 @@ WHERE `email`='%s' AND `id`='%s' AND `status`='CONFIRMED' LIMIT 1",
 
                        // Prepare email and send it to the sponsor
                        $message_sponsor = loadEmailTemplate('sponsor_lost', $DATA);
-                       sendEmail(postRequestParameter('email'), '{--SPONSOR_LOST_PASSWORD_SUBJ--}', $message_sponsor);
+                       sendEmail(postRequestParameter('email'), '{--SPONSOR_LOST_PASSWORD_SUBJECT--}', $message_sponsor);
 
                        // Update password
                        SQL_QUERY_ESC("UPDATE
index d3adcaf..e9f973a 100644 (file)
@@ -247,10 +247,10 @@ WHERE `id`='%s' LIMIT 1",
 
                                // Generate email and send it to the new sponsor
                                $message = loadEmailTemplate('sponsor_confirm', $hash);
-                               sendEmail(postRequestParameter('email'), '{--SPONSOR_PLEASE_CONFIRM_SUBJ--}', $message);
+                               sendEmail(postRequestParameter('email'), '{--SPONSOR_PLEASE_CONFIRM_SUBJECT--}', $message);
 
                                // Send mail to admin
-                               sendAdminNotification(getMessage('ADMIN_NEW_SPONSOR'), 'admin_sponsor_reg', $hash);
+                               sendAdminNotification('{--ADMIN_NEW_SPONSOR--}', 'admin_sponsor_reg', $hash);
 
                                // Output message: DONE
                                $message = $messageArray['added'];
index 44193f3..de8eef8 100644 (file)
@@ -68,7 +68,7 @@ LIMIT {?top10_max?}", __FILE__, __LINE__);
 $OUT = ''; $SW = 2; $cnt = 1;
 while ($content = SQL_FETCHARRAY($result)) {
        // Init nickname
-       $content['nickname'] = '---';
+       $content['nickname'] = '';
 
        // Get nickname
        if (isExtensionActive('nickname')) $content['nickname'] = getNickname($content['userid']);
@@ -136,7 +136,7 @@ LIMIT {?top10_max?}", __FILE__, __LINE__);
 $OUT = ''; $SW = 2; $cnt = 1;
 while ($content = SQL_FETCHARRAY($result)) {
        // Init nickname
-       $content['nickname'] = '---';
+       $content['nickname'] = '';
 
        // Get nickname
        if (isExtensionActive('nickname')) $content['nickname'] = getNickname($content['userid']);
@@ -203,7 +203,7 @@ LIMIT {?top10_max?}", __FILE__, __LINE__);
 $OUT = ''; $SW = 2; $cnt = 1;
 while ($content = SQL_FETCHARRAY($result)) {
        // Init nickname
-       $content['nickname'] = '---';
+       $content['nickname'] = '';
 
        // Get nickname
        if (isExtensionActive('nickname')) $content['nickname'] = getNickname($content['userid']);
index cb0453d..4890aa6 100644 (file)
@@ -108,10 +108,10 @@ if ($cats > 0) {
                // Categories saved?
                if ($cnt > 0) {
                        // Output message
-                       loadTemplate('admin_settings_saved', false, '{--MEMBER_CATS_SAVED--}');
+                       loadTemplate('admin_settings_saved', false, '{--MEMBER_CATEGORIES_SAVED--}');
                } else {
                        // None save
-                       loadTemplate('admin_settings_saved', false, '{--MEMBER_CATS_NOT_SAVED--}');
+                       loadTemplate('admin_settings_saved', false, '{--MEMBER_CATEGORIES_NOT_SAVED--}');
                }
        } else {
                if ($LEAST === true) {
@@ -161,7 +161,7 @@ if ($cats > 0) {
        }
 } else {
        // No cateogries are defined yet
-       loadTemplate('admin_settings_saved', false, '{--MEMBER_NO_CATS--}');
+       loadTemplate('admin_settings_saved', false, '{--MEMBER_NO_CATEGORIES--}');
 }
 
 // Free result
index fc3b735..ef2b99b 100644 (file)
@@ -148,10 +148,10 @@ LIMIT 1",
                sendEmail(getMemberId(), '{--HOLIDAY_MEMBER_SUBJECT--}', $message);
 
                // Send mail to all admins
-               sendAdminNotification(getMessage('HOLIDAY_ADMIN_SUBJECT'), 'admin_holiday_request', $content, getMemberId());
+               sendAdminNotification('{--ADMIN_HOLIDAY_SUBJECT--}', 'admin_holiday_request', $content, getMemberId());
 
                // Create task (we ignore the task id here)
-               createNewTask('{--HOLIDAY_ADMIN_SUBJECT--}', $message, 'HOLIDAY_REQUEST', getMemberId());
+               createNewTask('{--ADMIN_HOLIDAY_SUBJECT--}', $message, 'HOLIDAY_REQUEST', getMemberId());
 
                // Display message
                loadTemplate('admin_settings_saved', false, '{--HOLIDAY_IS_ACTIVATED_NOW--}');
@@ -210,7 +210,7 @@ LIMIT 1",
                                        array(getMemberId()), __FILE__, __LINE__);
 
                                // Send email to admin
-                               sendAdminNotification(getMessage('HOLIDAY_ADMIN_DEAC_SUBJ'), 'admin_holiday_deactivated', $content, getMemberId());
+                               sendAdminNotification('{--ADMIN_HOLIDAY_DEAC_SUBJECT--}', 'admin_holiday_deactivated', $content, getMemberId());
 
                                // Display message to user
                                loadTemplate('admin_settings_saved', false, '{--HOLIDAY_MEMBER_DEACTIVATED_NOW--}');
index b6dcc84..d674429 100644 (file)
@@ -153,7 +153,7 @@ LIMIT 1",
                        setPostRequestParameter('subject', str_replace("\\", '[nl]', substr(postRequestParameter('subject'), 0, 200)));
                        if ((strpos(strtolower(postRequestParameter('subject')), 'http://') > -1) || (strpos(strtolower(postRequestParameter('subject')), "www") > -1)) {
                                // URL in subject found
-                               $url = 'modules.php?module=login&amp;what=order&amp;code=' . getCode('SUBJ_URL');
+                               $url = 'modules.php?module=login&amp;what=order&amp;code=' . getCode('SUBJECT_URL');
                        } // END - if
                } // END - if
 
@@ -694,7 +694,7 @@ LIMIT 1",
                }
        } else {
                // No cateogries are defined yet
-               loadTemplate('admin_settings_saved', false, '<span class="member_failed">{--MEMBER_NO_CATS--}</span>');
+               loadTemplate('admin_settings_saved', false, '<span class="member_failed">{--MEMBER_NO_CATEGORIES--}</span>');
        }
 } elseif ($mmails == '0') {
        // Please set more than 0 mails per day
index f1bf551..1283c94 100644 (file)
@@ -114,11 +114,7 @@ ORDER BY
                                                $content['target_account'] = $content['alt'];
                                        }
                                        $content['target_bank'] = '<a href="' . generateDerefererUrl($content['url']) . '" target="_blank">{--CLICK_HERE--}</a>';
-                               } else {
-                                       // e-currency payout request
-                                       if (empty($content['target_account'])) $content['target_account'] = '---';
-                                       if (empty($content['target_bank']))    $content['target_bank']    = '---';
-                               }
+                               } // END - if
 
                                // Prepare data for the template
                                $content = array(
@@ -151,7 +147,7 @@ ORDER BY
        }
 } else {
        // Chedk if he can get paid by selected type
-       $result = SQL_QUERY_ESC("SELECT type, rate, min_points, allow_url AS allow FROM `{?_MYSQL_PREFIX?}_payout_types` WHERE `id`=%s LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT `type`, `rate`, `min_points`, `allow_url` AS allow FROM `{?_MYSQL_PREFIX?}_payout_types` WHERE `id`=%s LIMIT 1",
                array(bigintval(getRequestParameter('payout'))), __FILE__, __LINE__);
 
        if (SQL_NUMROWS($result) == 1) {
@@ -226,13 +222,13 @@ VALUES (%s,%s,%s,'%s',%s, UNIX_TIMESTAMP(), 'NEW','%s')",
                                }
 
                                // Generate task (we ignore the task id here)
-                               createNewTask('[payout:] {--ADMIN_PAYOUY_REQUEST_SUBJ--}', $message_adm, 'PAYOUT_REQUEST', getMemberId());
+                               createNewTask('[payout:] {--ADMIN_PAYOUY_REQUEST_SUBJECT--}', $message_adm, 'PAYOUT_REQUEST', getMemberId());
 
                                // Send out mails
-                               sendEmail(getMemberId(), '{--MEMBER_PAYOUT_REQUEST_SUBJ--}', $message_mem);
+                               sendEmail(getMemberId(), '{--MEMBER_PAYOUT_REQUEST_SUBJECT--}', $message_mem);
 
                                // To admin(s)
-                               sendAdminNotification(getMessage('ADMIN_PAYOUY_REQUEST_SUBJ'), $admin_tpl, postRequestArray(), getMemberId());
+                               sendAdminNotification('{--ADMIN_PAYOUY_REQUEST_SUBJECT--}', $admin_tpl, postRequestArray(), getMemberId());
 
                                // Load template and output it
                                loadTemplate('admin_settings_saved', false, '{--MEMBER_PAYOUT_REQUEST_SENT--}');
index 6932b6e..2017dfd 100644 (file)
@@ -128,7 +128,7 @@ $content['rows'] = $OUT;
 // Initialize variables
 $content['confirmed'] = '---';
 $content['sent']      = '---';
-$content['receive']  = '---';
+$content['receive']   = '---';
 
 // Only user >= v0.1.2: Fetch confirmed mails counter
 if (isExtensionInstalledAndNewer('user', '0.1.2')) {
@@ -136,17 +136,10 @@ if (isExtensionInstalledAndNewer('user', '0.1.2')) {
        $content['confirmed'] = getUserData('mails_confirmed');
 
        if (isExtensionInstalledAndNewer('user', '0.1.4')) {
-               $content['sent']     = getUserData('emails_sent');
+               $content['sent']    = getUserData('emails_sent');
                $content['receive'] = getUserData('emails_received');
        } // END - if
-
-       // Please update the user extension if you see 3 dashes
-       if (empty($content['sent']))     $content['sent']     = '---';
-       if (empty($content['receive'])) $content['receive'] = '---';
-} else {
-       // Please update!
-       $content['confirmed'] = '---';
-}
+} // END - if
 
 // If TLOCK is 0 add 3 zeros for floating
 if ($content['total_locked'] == '0') $content['total_locked'] = '0.00000';
index 28d898f..3f199c7 100644 (file)
@@ -127,7 +127,6 @@ if (SQL_NUMROWS($result) > 0) {
                        $refRow['sw']          = $SW;
                        // @TODO UNUSED: $refRow['status']      = translateUserStatus($refRow['status']);
                        $refRow['joined']      = generateDateTime($refRow['joined'], '3');
-                       if (empty($refRow['nickname'])) $refRow['nickname'] = '---';
 
                        // Load row template
                        if ($deleted === true) {
index 7797639..0740acb 100644 (file)
@@ -49,11 +49,14 @@ if (!defined('__SECURITY')) {
 addMenuDescription('member', __FILE__);
 
 // Load all referal levels
-$result = SQL_QUERY_ESC("SELECT r.level, r.percents
-FROM `{?_MYSQL_PREFIX?}_refdepths` AS r
-WHERE r.level > 0
-ORDER BY r.level ASC",
-array(getMemberId()), __FILE__, __LINE__);
+$result = SQL_QUERY('SELECT
+       `level`, `percents`
+FROM
+       `{?_MYSQL_PREFIX?}_refdepths`
+WHERE
+       `level` > 0
+ORDER BY
+       `level` ASC', __FILE__, __LINE__);
 
 // Are there some entries? (Shall be!)
 if (SQL_NUMROWS($result) > 0) {
@@ -69,11 +72,7 @@ if (SQL_NUMROWS($result) > 0) {
                foreach (getUserReferalPoints(getMemberId(), $content['level']) as $refRow) {
                        // Add/"translate" more content
                        $refRow['sw']          = $SW;
-                       $refRow['points']      = translateComma($refRow['points']);
-                       $refRow['status']      = translateUserStatus($refRow['status']);
-                       $refRow['unconfirmed'] = translateComma($refRow['unconfirmed']);
                        $refRow['clickrate']   = translateComma($refRow['clickrate'], true, 1);
-                       if (empty($refRow['nickname'])) $refRow['nickname'] = '---';
 
                        // Load row template
                        $rows .= loadTemplate('member_ref_list_row', true, $refRow);
@@ -84,7 +83,7 @@ if (SQL_NUMROWS($result) > 0) {
                } // END - foreach
 
                // Remember the content
-               $content['counter']  = translateComma($counter);
+               $content['counter']  = $counter;
                $content['percents'] = translateComma($content['percents'], true, 1);
                $content['rows']     = $rows;
 
@@ -102,5 +101,5 @@ if (SQL_NUMROWS($result) > 0) {
 // Free result
 SQL_FREERESULT($result);
 
-//
+// [EOF]
 ?>
index a8ceb41..8e0eec5 100644 (file)
@@ -67,18 +67,18 @@ if ((!isFormSent()) || (!isPostRequestParameterSet(('qsummary')))) {
        // Select right subject
        switch (postRequestParameter('qsummary')) {
                case 'ordr':
-                       $subj_a = '{--SUPPORT_SUBJ_ADMIN_ORDER--}';
-                       $subj_m = '{--SUPPORT_SUBJ_MEMBER_ORDER--}';
+                       $subj_a = '{--ADMIN_SUPPORT_ORDER_SUBJECT--}';
+                       $subj_m = '{--SUPPORT_MEMBER_ORDER_SUBJECT--}';
                        break;
 
                case 'reflink':
-                       $subj_a = '{--SUPPORT_SUBJ_ADMIN_REFLINK--}';
-                       $subj_m = '{--SUPPORT_SUBJ_MEMBER_REFLINK--}';
+                       $subj_a = '{--ADMIN_SUPPORT_REFLINK_SUBJECT--}';
+                       $subj_m = '{--SUPPORT_MEMBER_REFLINK_SUBJECT--}';
                        break;
 
                case 'unconfirmed':
-                       $subj_a = '{--SUPPORT_SUBJ_ADMIN_UNCONFIRMED--}';
-                       $subj_m = '{--SUPPORT_SUBJ_MEMBER_UNCONFIRMED--}';
+                       $subj_a = '{--ADMIN_SUPPORT_UNCONFIRMED_SUBJECT--}';
+                       $subj_m = '{--SUPPORT_MEMBER_UNCONFIRMED_SUBJECT--}';
                        break;
        } // END - switch
 
index 14a3ed9..83210ee 100644 (file)
@@ -81,10 +81,6 @@ if ((isFormSent()) && (isPostRequestParameterSet(('action'))) && (isPostRequestP
                $content['url_registered']  = generateDateTime($content['url_registered'], 2);
                $content['url_last_locked'] = generateDateTime($content['url_last_locked'], 2);
                $content['actions']         = SURFBAR_MEMBER_ACTIONS($content['id'], $content['url_status']);
-               if (empty($content['url_lock_reason'])) {
-                       // Fixes some HTML problems with empty cells
-                       $content['url_lock_reason'] = '---';
-               } // END - if
 
                // Load row template
                $OUT .= loadTemplate('member_surfbar_list_row', true, $content);
index ffb4a4c..e0d8f1f 100644 (file)
@@ -161,11 +161,11 @@ switch ($mode) {
 
                                // First send email to recipient
                                $message = loadEmailTemplate('member_transfer_recipient', $content, postRequestParameter('to_userid'));
-                               sendEmail($content['recipient']['email'], '{--TRANSFER_MEMBER_RECIPIENT_SUBJ--}' . ': ' . $SENDER, $message);
+                               sendEmail($content['recipient']['email'], '{--TRANSFER_MEMBER_RECIPIENT_SUBJECT--}' . ': ' . $SENDER, $message);
 
                                // Second send email to sender
                                $message = loadEmailTemplate('member_transfer_sender', $content, getMemberId());
-                               sendEmail($content['sender']['email'], '{--TRANSFER_MEMBER_SENDER_SUBJ--}' . ': ' . $RECIPIENT, $message);
+                               sendEmail($content['sender']['email'], '{--TRANSFER_MEMBER_SENDER_SUBJECT--}' . ': ' . $RECIPIENT, $message);
 
                                // At last send admin mail(s)
                                $adminSubject = sprintf("%s (%s->%s)", '{--TRANSFER_ADMIN_SUBJECT--}', $SENDER, $RECIPIENT);
index 1cd9e9d..a7b7769 100644 (file)
@@ -83,7 +83,7 @@ LIMIT 1",
 } elseif (isGetRequestParameterSet(('mailid'))) {
        // Display regular member mail by loading its full data
        $result_data = SQL_QUERY_ESC("SELECT
-       s.id, s.subject, p.text, s.timestamp_ordered AS `timestamp`, s.cat_id AS `category`, pay.price AS points, p.sender, pay.time, p.data_type
+       s.id, s.subject, p.text, s.timestamp_ordered AS `timestamp`, s.cat_id, pay.price AS points, p.sender, pay.time, p.data_type
 FROM
        `{?_MYSQL_PREFIX?}_user_stats` AS s
 LEFT JOIN
@@ -116,7 +116,7 @@ LIMIT 1",
        } // END - if
 
        // Display it depending on mail (data) type
-       loadTemplate('member_mail_normal_'.strtolower($content['data_type']), false, $content);
+       loadTemplate('member_mail_normal_' . strtolower($content['data_type']), false, $content);
 
        // Free result
        SQL_FREERESULT($result_data);
index 338a653..469590e 100644 (file)
@@ -54,18 +54,18 @@ if (!defined('__SECURITY')) {
 
 // When URL is empty nothing bad happend here
 if (empty($url)) {
+       // Auto-send is inactive
+       $content['admin_autosend']  = '{--ADMIN_AUTOSEND_INACTIVE--}';
+       $content['member_autosend'] = '{--MEMBER_AUTOSEND_INACTIVE--}';
+       $type = 'ADMIN';
+
        // Is the auto-send mechanism active or inactive?
        if (getConfig('autosend_active') == 'Y') {
                // Auto-send is active
                $content['admin_autosend']  = '{--ADMIN_AUTOSEND_ACTIVE--}';
                $content['member_autosend'] = '{--MEMBER_AUTOSEND_ACTIVE--}';
                $type = 'NEW';
-       } else {
-               // Auto-send is inactive
-               $content['admin_autosend']  = '{--ADMIN_AUTOSEND_INACTIVE--}';
-               $content['member_autosend'] = '{--MEMBER_AUTOSEND_INACTIVE--}';
-               $type = 'ADMIN';
-       }
+       } // END - if
 
        // Update sending pool
        SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_pool` SET `data_type`='%s' WHERE `id`=%s AND `sender`=%s AND `data_type`='TEMP' LIMIT 1",
@@ -95,16 +95,12 @@ if (empty($url)) {
                if (getConfig('order_max_full') == 'ORDER') $add = ', mail_orders=mail_orders+1';
                subtractPoints('order', getMemberId(), $usedPoints);
 
-               // Compile content
-               $content['payment']  = getPaymentTitlePrice($content['payment_id']);
-               $content['category'] = getCategory($content['cat_id']);
-
                // Send an email to the user
                $message_mem = loadEmailTemplate('order-member', $content, getMemberId());
                sendEmail(getMemberId(), '{--MEMBER_NEW_QUEUE--}', $message_mem);
 
                // Notify admins about this
-               sendAdminNotification(getMessage('ADMIN_NEW_QUEUE'), 'order-admin', $content, getMemberId());
+               sendAdminNotification('{--ADMIN_NEW_QUEUE--}', 'order-admin', $content, getMemberId());
 
                // Create new task (we ignore the task id here)
                createNewTask(
index 1621110..3597c8a 100644 (file)
@@ -1313,7 +1313,7 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify
                                $message = loadEmailTemplate('add-points', $content, $userid);
 
                                // And sent it away
-                               sendEmail($userid, '{--SUBJECT_DIRECT_PAYMENT--}', $message);
+                               sendEmail($userid, '{--DIRECT_PAYMENT_SUBJECT--}', $message);
                                if (!isGetRequestParameterSet('mid')) loadTemplate('admin_settings_saved', false, '{--ADMIN_POINTS_ADDED--}');
                        }
 
@@ -1875,7 +1875,7 @@ function generateCategoryOptionsList ($mode) {
                } // END - foreach
        } else {
                // No cateogries are defined yet
-               $OUT = '<option class="member_failed">{--MEMBER_NO_CATS--}</option>';
+               $OUT = '<option class="member_failed">{--MEMBER_NO_CATEGORIES--}</option>';
        }
 
        // Return HTML code
index 85388e4..c9bee51 100644 (file)
@@ -174,14 +174,14 @@ if (SQL_NUMROWS($result_main) > 0) {
                                                // Prepare content
                                                $content = array(
                                                        'sender_userid' => $DATA['sender'],
-                                                       'category'      => getCategory($DATA['cat_id']),
+                                                       'cat_id'        => $DATA['cat_id'],
                                                        'text'          => $DATA['text'],
                                                        'url'           => $DATA['url'],
-                                                       'expiration'    => createFancyTime(getPaymentPoints($DATA['payment_id'], "time"))
+                                                       'expiration'    => createFancyTime(getPaymentPoints($DATA['payment_id'], 'time'))
                                                );
 
                                                // Yes we do, so we notify admin and sender about fully sent mail!
-                                               sendAdminNotification(getMessage('ADMIN_SUBJ_SEND_DONE'), 'done-admin', $content, $userid);
+                                               sendAdminNotification('{--ADMIN_SEND_DONE_SUBJECT--}', 'done-admin', $content, $userid);
 
                                                // Get sender's data
                                                if (fetchUserData($DATA['sender'])) {
@@ -189,7 +189,7 @@ if (SQL_NUMROWS($result_main) > 0) {
                                                        $mailText = loadEmailTemplate('done-member', $content, $DATA['sender']);
 
                                                        // Send it also waway
-                                                       sendEmail(getUserData('email'), '{--MEMBER_SUBJ_SEND_DONE--}', $mailText);
+                                                       sendEmail(getUserData('email'), '{--MEMBER_SEND_DONE_SUBJECT--}', $mailText);
                                                } // END - if
 
                                                // Set status to SEND because we completely send it away
@@ -285,7 +285,7 @@ if (SQL_NUMROWS($result_main) > 0) {
                                        addPointsToJackpot($PB);
 
                                        // Send mail out to admin
-                                       sendAdminNotification(getMessage('ADMIN_BACK_JACKPOT') . ' (' . $userid . ')', 'back-admin', $content, 'admin');
+                                       sendAdminNotification('{--ADMIN_BACK_JACKPOT--}' . ' (' . $userid . ')', 'back-admin', $content, 'admin');
                                }
                        } // END - if
                } // END - foreach
index bf8fffc..62afa6a 100644 (file)
@@ -94,7 +94,7 @@ LIMIT 1",
 
                        // Send email to user
                        $message = loadEmailTemplate('member_holiday_activated', $content, $content['userid']);
-                       sendEmail($content['userid'], '{--HOLIDAY_MEMBER_ACTIVATED_SUBJ--}', $message);
+                       sendEmail($content['userid'], '{--HOLIDAY_MEMBER_ACTIVATED_SUBJECT--}', $message);
 
                        // Update account
                        addSql(SQL_QUERY_ESC("UPDATE
index fdd6be7..df22a69 100644 (file)
@@ -1073,5 +1073,17 @@ function encodeEntities ($str) {
        return $str;
 }
 
+// "Fixes" an empty string into three dashes (use for templates)
+function fixEmptyContentToDashes ($str) {
+       // Trim the string
+       $str = trim($str);
+
+       // Is the string empty?
+       if (empty($str)) $str = '---';
+
+       // Return string
+       return $str;
+}
+
 // [EOF]
 ?>
index 06fe0ac..a5dda9e 100644 (file)
@@ -11,7 +11,7 @@ Werber: $content[sender_userid]
 ------------------------------
 Verfallszeit: $content[expiration]
 ------------------------------
-Beworbene Kategorie: $content[category]
+Beworbene Kategorie: {%pipe,getCategory=$content[cat_id]%}
 ------------------------------
 Beworbene URL: $content[url]
 ------------------------------
index 4a507a5..98d2294 100644 (file)
@@ -11,7 +11,7 @@ Werber: $content[sender_userid]
 ----------------
 Verfallszeit: $content[expiration]
 ----------------
-Beworbene Kategorie: $content[category]
+Beworbene Kategorie: {%pipe,getCategory=$content[cat_id]%}
 ----------------
 Beworbene URL: $content[url]
 ----------------
index e960cc6..e1b0827 100644 (file)
@@ -10,8 +10,8 @@ Anrede: {%user,gender,translateGender=$userid%}
 Vorname: {%user,surname=$userid%}
 Nachname: {%user,family=$userid%}
 Email-Adresse: {%user,email=$userid%}
-Gebuchte Kategorie: $content[category]
-Gebuchter Payment-Typ: $content[payment]
+Gebuchte Kategorie: {%pipe,getCategory=$content[cat_id]%}
+Gebuchter Payment-Typ: {%pipe,getPaymentTitlePrice=$content[payment_id]%}
 Betreffzeile in den Mails: $content[subject]
 Gebuchte URL: $content[url]
 ------------------------------------
index 93980bc..8dbf11f 100644 (file)
@@ -4,8 +4,8 @@ Ihre Mailbuchung befindet sich derzeit in Warteschleife und wird bald ausgesende
 
 Hier sind nochmals Ihre Daten aus dem Buchungsformular:
 ------------------------------------------------
-Gebuchte Kategorie: $content[category]
-Gebuchter Payment-Typ: $content[payment]
+Gebuchte Kategorie: {%pipe,getCategory=$content[cat_id]%}
+Gebuchter Payment-Typ: {%pipe,getPaymentTitlePrice=$content[payment_id]%}
 Betreffzeile in den Mails: $content[subject]
 Gebuchte URL: $content[url]
 ------------------------------------------------
index 3c37caa..288d1a4 100644 (file)
@@ -7,16 +7,16 @@
                </td>
        </tr>
        <tr>
-               <td colspan="2" align="center">{--MAX_RECEIVE--}</td>
+               <td colspan="2" align="center">{--ADMIN_MAX_RECEIVE--}</td>
        </tr>
        <tr>
-               <td align="right">{--ENTER_MAX_VALUE--}:</td>
+               <td align="right">{--ADMIN_ENTER_MAX_VALUE--}:</td>
                <td>
                        <input type="text" name="max" class="admin_normal" size="2" maxlength="2" />
                </td>
        </tr>
        <tr>
-               <td class="bottom" align="right">{--ENTER_MAX_COMMENT--}:</td>
+               <td class="bottom" align="right">{--ADMIN_ENTER_MAX_COMMENT--}:</td>
                <td class="bottom">
                        <input type="text" name="comment" class="admin_normal" size="10" maxlength="255" />
                </td>
@@ -24,7 +24,7 @@
        <tr>
                <td class="admin_footer" colspan="2" align="center">
                        <input type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" name="add_max" class="admin_submit" value="{--ADD_MAX_RECEIVE--}" />
+                       <input type="submit" name="add_max" class="admin_submit" value="{--ADMIN_ADD_MAX_RECEIVE--}" />
                </td>
        </tr>
 </table>
index 844f8b7..06aaafa 100644 (file)
@@ -3,15 +3,15 @@
                <input type="hidden" name="sel[$content[id]]" value="1" />
        </td>
        <td class="switch_sw$content[sw] bottom right" align="center">
-               $content[admin]
+               {%pipe,generateAdminLink=$content[admin_id]%}
        </td>
        <td class="switch_sw$content[sw] bottom right" align="center">
-               $content[action]
+               {%pipe,fixEmptyContentToDashes=$content[action_menu]%}
        </td>
        <td class="switch_sw$content[sw] bottom right" align="center">
-               $content[what]
+               {%pipe,fixEmptyContentToDashes=$content[what_menu]%}
        </td>
        <td class="switch_sw$content[sw] bottom" align="center">
-               $content[mode]
+               $content[access_mode]
        </td>
 </tr>
index 0b0b38d..aa0846f 100644 (file)
@@ -3,15 +3,15 @@
                <input type="checkbox" title="{--ID_SELECT--} $content[id]" class="admin_normal" name="sel[$content[id]]" value="1" />
        </td>
        <td class="switch_sw$content[sw] bottom right" align="center">
-               $content[admin]
+               {%pipe,generateAdminLink=$content[admin_id]%}
        </td>
        <td class="switch_sw$content[sw] bottom right" align="center">
-               $content[action]
+               {%pipe,fixEmptyContentToDashes=$content[action_menu]%}
        </td>
        <td class="switch_sw$content[sw] bottom right" align="center">
-               $content[what]
+               {%pipe,fixEmptyContentToDashes=$content[what_menu]%}
        </td>
        <td class="switch_sw$content[sw] bottom" align="center">
-               $content[mode]
+               $content[access_mode]
        </td>
 </tr>
index 1416bdd..096ef44 100644 (file)
@@ -16,8 +16,8 @@
        <tr>
                <td class="admin_footer" colspan="4">
                        <input type="reset" class="admin_reset" value="{--UNDO_SELECTIONS--}" />
-                       <input type="submit" name="edit" class="admin_submit" value="{--EDIT_CATS--}" />
-                       <input type="submit" name="del" class="admin_delete" value="{--DEL_CATS--}" />
+                       <input type="submit" name="edit" class="admin_submit" value="{--EDIT_CATEGORIES--}" />
+                       <input type="submit" name="del" class="admin_delete" value="{--DEL_CATEGORIES--}" />
                </td>
        </tr>
 </table>
index 16f9db2..5b75eab 100644 (file)
@@ -3,20 +3,20 @@
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td align="center" colspan="3" class="admin_title">
-                       <strong>{--EDIT_DEL_MAX_VALUES--}</strong>
+                       <strong>{--ADMIN_EDIT_DEL_MAX_VALUES--}</strong>
                </td>
        </tr>
        <tr>
                <td class="header_column bottom right" width="30" align="center"><strong>{--ID_SELECT--}</strong></td>
-               <td class="header_column bottom right" align="center"><strong>{--MAX_VALUE!}</strong></td>
-               <td class="header_column bottom" align="center"><strong>{--MAX_COMMENT--}</strong></td>
+               <td class="header_column bottom right" align="center"><strong>{--ADMIN_MAX_VALUE--}</strong></td>
+               <td class="header_column bottom" align="center"><strong>{--ADMIN_MAX_COMMENT--}</strong></td>
        </tr>
        $content[rows]
        <tr>
                <td align="center" colspan="3" class="admin_footer">
                        <input type="reset" class="admin_reset" value="{--UNDO_SELECTIONS--}" />
-                       <input type="submit" name="edit" class="admin_submit" value="{--EDIT_MAX_V--}" />
-                       <input type="submit" name="del" class="admin_delete" value="{--DEL_MAX_V--}" />
+                       <input type="submit" name="edit" class="admin_submit" value="{--ADMIN_EDIT_MAX_VALUE--}" />
+                       <input type="submit" name="del" class="admin_delete" value="{--ADMIN_DEL_MAX_VALUE--}" />
                </td>
        </tr>
 </table>
index 87c0ce1..3330987 100644 (file)
@@ -5,7 +5,7 @@
 </tr>
 <tr>
        <td class="switch_sw$content[sw] bottom" align="center">
-               $content[value] ($content[comment])
+               $content[value] ({%pipe,fixEmptyContentToDashes=$content[comment]%})
                <input type="hidden" name="id[$content[id]]" value="1" />
        </td>
 </tr>
index af555e4..5b0843d 100644 (file)
@@ -5,7 +5,7 @@
        </td>
 </tr>
 <tr>
-       <td class="switch_sw$content[sw]" align="right">{--MREC_VALUE!}:&nbsp;</td>
+       <td class="switch_sw$content[sw]" align="right">{--MREC_VALUE--}:&nbsp;</td>
        <td class="switch_sw$content[sw]">
                <input type="text" name="val[$content[id]]" class="admin_normal" value="$content[value]" size="3" maxlength="5" />
        </td>
index ca5315b..61de8d5 100644 (file)
@@ -3,9 +3,9 @@
                <input type="checkbox" class="admin_normal" title="{--ID_SELECT--} $content[id]" name="sel[$content[id]]" value="1" />
        </td>
        <td class="bottom right switch_sw$content[sw]">
-               &nbsp;$content[value]&nbsp;
+               $content[value]
        </td>
        <td class="bottom switch_sw$content[sw]">
-               &nbsp;$content[comment]&nbsp;
+               {%pipe,fixEmptyContentToDashes=$content[comment]%}
        </td>
 </tr>
index 53e17a4..6691f72 100644 (file)
@@ -3,27 +3,27 @@
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td colspan="2" align="center" class="admin_title bottom">
-                       <strong>{--HOLIDAY_ADMIN_CONFIG_HEADER--}</strong>
+                       <strong>{--ADMIN_HOLIDAY_CONFIG_HEADER--}</strong>
                </td>
        </tr>
        <tr>
-               <td width="300" style="padding-left: 5px">{--HOLIDAY_ADMIN_MAX_HOLIDAY--}:</td>
+               <td width="300" style="padding-left: 5px">{--ADMIN_HOLIDAY_MAX_HOLIDAY--}:</td>
                <td width="270">
                        <input type="text" name="holiday_max" class="admin_normal" value="{?holiday_max?}" size="4" maxlength="6" />
                        <div class="tiny">({--DAYS--})</div>
                </td>
        </tr>
        <tr>
-               <td width="300" style="padding-left: 5px">{--HOLIDAY_ADMIN_LOCKED--}:</td>
+               <td width="300" style="padding-left: 5px">{--ADMIN_HOLIDAY_LOCKED--}:</td>
                <td width="270">$content[locked]</td>
        </tr>
        <tr>
-               <td class="bottom" width="300" style="padding-left: 5px">{--HOLIDAY_ADMIN_MODE--}:</td>
+               <td class="bottom" width="300" style="padding-left: 5px">{--ADMIN_HOLIDAY_MODE--}:</td>
                <td class="bottom" width="270">
                        <input type="radio" name="holiday_mode" class="admin_normal" value="RESET"$content[holidy_mode_reset] />
-                       {--HOLIDAY_ADMIN_MODE_RESET--}<br />
+                       {--ADMIN_HOLIDAY_MODE_RESET--}<br />
                        <input type="radio" name="holiday_mode" class="admin_normal" value="DIRECT"$content[holidy_mode_direct] />
-                       {--HOLIDAY_ADMIN_MODE_DIRECT--}
+                       {--ADMIN_HOLIDAY_MODE_DIRECT--}
                </td>
        </tr>
        <tr>
index 9a664e7..4c0ec8c 100644 (file)
@@ -3,7 +3,7 @@
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td colspan="2" align="center" class="admin_title bottom">
-                       <strong>{--NICKNAME_ADMIN_CONFIG_HEADER--}</strong>
+                       <strong>{--ADMIN_NICKNAME_CONFIG_HEADER--}</strong>
                </td>
        </tr>
        <tr>
index 1c851a8..22671b7 100644 (file)
@@ -54,7 +54,7 @@
 
        <tr>
                <td align="right">
-                       {--ADMIN_OPTION_CHECK_EMAIL_SUBJ--}
+                       {--ADMIN_OPTION_CHECK_EMAIL_SUBJECT--}
                </td>
                <td>
                        <input type="radio" name="allow_url_in_subject" value="Y"$content[allow_url_in_subject_y] /> {--YES--}<br />
@@ -76,9 +76,9 @@
                <td class="bottom" align="right">{--ADMIN_REPAY_ON_DELETE_MODE--}</td>
                <td class="bottom">
                        <select name="repay_deleted_mails" class="admin_select" size="1">
-                               <option value="REPAY"$content[repay_deleted_mails_repay]>{--ADMIN_CFG_REPAY_POINTS_REPAY--}</option>
-                               <option value="JACKPOT"$content[repay_deleted_mails_jackpot]>{--ADMIN_CFG_REPAY_POINTS_JACKPOT--}</option>
-                               <option value="SHRED"$content[repay_deleted_mails_shred]>{--ADMIN_CFG_REPAY_POINTS_SHRED--}</option>
+                               <option value="REPAY"$content[repay_deleted_mails_repay]>{--ADMIN_CONFIG_REPAY_POINTS_REPAY--}</option>
+                               <option value="JACKPOT"$content[repay_deleted_mails_jackpot]>{--ADMIN_CONFIG_REPAY_POINTS_JACKPOT--}</option>
+                               <option value="SHRED"$content[repay_deleted_mails_shred]>{--ADMIN_CONFIG_REPAY_POINTS_SHRED--}</option>
                        </select>
                </td>
        </tr>
index 6423f96..c4815e2 100644 (file)
@@ -1,14 +1,14 @@
 <tr>
        <td class="switch_sw$content[sw] bottom right" align="center">
-               $content[id] <input type="hidden" claass="admin_normal" name="sel[$content[id]]" value="1" />
+               $content[rallye_id] <input type="hidden" claass="admin_normal" name="sel[$content[rallye_id]]" value="1" />
        </td>
        <td class="switch_sw$content[sw] bottom right" align="center">
-               $content[level]
+               $content[price_level]
        </td>
        <td class="switch_sw$content[sw] bottom right">
-               &nbsp;$content[points]
+               {%pipe,translateComma=$content[points]%}
        </td>
        <td class="switch_sw$content[sw] bottom">
-               &nbsp;$content[infos]
+               {%pipe,fixEmptyContentToDashes=$content[info]%}
        </td>
 </tr>
index 889095e..c7b7592 100644 (file)
@@ -1,16 +1,16 @@
 <tr>
        <td class="switch_sw$content[sw] bottom right" align="center">
-               <select name="rallye_id[$content[id]]" size="1" class="admin_select">
-                       $content[rallyes]
+               <select name="rallye_id[$content[rallye_id]]" size="1" class="admin_select">
+                       $content[rallye_content]
                </select>
        </td>
        <td class="switch_sw$content[sw] bottom right" align="center">
-               <input type="text" name="level[$content[id]]" class="admin_normal" size="5" maxlength="20" value="$content[level]" />
+               <input type="text" name="level[$content[rallye_id]]" class="admin_normal" size="5" maxlength="20" value="$content[price_level]" />
        </td>
        <td class="switch_sw$content[sw] bottom right">
-               <input type="text" name="points[$content[id]]" class="admin_normal" size="8" maxlength="20" value="$content[points]" />
+               <input type="text" name="points[$content[rallye_id]]" class="admin_normal" size="8" maxlength="20" value="$content[points]" />
        </td>
        <td class="switch_sw$content[sw] bottom">
-               <input type="text" name="infos[$content[id]]" class="admin_normal" size="15" maxlength="255" value="$content[infos]" />
+               <input type="text" name="infos[$content[rallye_id]]" class="admin_normal" size="15" maxlength="255" value="$content[info]" />
        </td>
 </tr>
index 0ac2dc9..94542e7 100644 (file)
@@ -3,12 +3,12 @@
                <input type="checkbox" class="admin_normal" title="{--ID_SELECT--} $content[id]" name="sel[$content[id]]" value="1" />
        </td>
        <td class="switch_sw$content[sw] bottom right" align="center">
-               $content[level]
+               $content[price_level]
        </td>
        <td class="switch_sw$content[sw] bottom right">
-               &nbsp;$content[points]
+               {%pipe,translateComma=$content[points]%}
        </td>
        <td class="switch_sw$content[sw] bottom">
-               &nbsp;$content[infos]
+               {%pipe,fixEmptyContentToDashes=$content[infos]%}
        </td>
 </tr>
index 7ad39b5..cbe34fd 100644 (file)
@@ -7,17 +7,17 @@
                </td>
        </tr>
        <tr>
-               <td align="right" width="250">{--LEAST_CATS--}:</td>
+               <td align="right" width="250">{--LEAST_CATEGORIES--}:</td>
                <td align="center" width="150">
                        <input type="text" name="least_cats" class="admin_normal" size="6" maxlength="6" value="{?least_cats?}" />
                </td>
        </tr>
        <tr>
-               <td align="right" width="250">{--ADMIN_CFG_REGISTER_DEFAULT--}:</td>
+               <td align="right" width="250">{--ADMIN_CONFIG_REGISTER_DEFAULT--}:</td>
                <td align="center" width="150">$content[register_default]</td>
        </tr>
        <tr>
-               <td align="right">{--ADMIN_CFG_REGISTER_DISPLAY_REFID--}:</td>
+               <td align="right">{--ADMIN_CONFIG_REGISTER_DISPLAY_REFID--}:</td>
                <td align="center">$content[display_refid]</td>
        </tr>
        <tr>
index dc6f8ed..d55eba6 100644 (file)
@@ -1,6 +1,6 @@
 <tr>
        <td class="switch_sw$content[sw] bottom right" align="center">$content[module]</td>
-       <td class="switch_sw$content[sw] bottom right">$content[title]</td>
+       <td class="switch_sw$content[sw] bottom right">{%pipe,fixEmptyContentToDashes=$content[title]%}</td>
        <td class="switch_sw$content[sw] bottom" align="center">
                <input type="radio" name="mod[$content[module]]" class="admin_normal" value="Y"$content[y_default] /> {--YES--}<br />
                <input type="radio" name="mod[$content[module]]" class="admin_normal" value="N"$content[n_default] /> {--NO--}
index 4cddda7..3815a6a 100644 (file)
@@ -3,11 +3,11 @@
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td colspan="2" align="center" class="admin_title bottom">
-                       <strong>{--TOP10_ADMIN_CONFIG_HEADER--}</strong>
+                       <strong>{--ADMIN_TOP10_CONFIG_HEADER--}</strong>
                </td>
        </tr>
        <tr>
-               <td class="bottom" align="right">{--TOP10_ADMIN_MAX_TOP10--}:</td>
+               <td class="bottom" align="right">{--ADMIN_TOP10_MAX_TOP10--}:</td>
                <td class="bottom">
                        <input type="text" name="top10_max" class="admin_normal" value="{?top10_max?}" size="4" maxlength="6" />
                </td>
index c446fa0..f81a07a 100644 (file)
@@ -10,7 +10,7 @@
        <tr>
                <td align="center" class="admin_footer">
                        <input type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" name="ok" class="admin_delete" value="{--REMOVE_CATS--}" />
+                       <input type="submit" name="ok" class="admin_delete" value="{--REMOVE_CATEGORIES--}" />
                </td>
        </tr>
 </table>
index 04e9265..f9a9a94 100644 (file)
@@ -20,6 +20,6 @@
 <tr>
        <td class="switch_sw$content[sw] bottom" style="padding-left:5px">{--ADMIN_NETWORK_REQUEST_PARAMETER_DEFAULT--}:</td>
        <td class="switch_sw$content[sw] bottom">
-               $content[request_param_default]
+               {%pipe,fixEmptyContentToDashes=$content[request_param_default]%}
        </td>
 </tr>
index 3cabf88..c5f5977 100644 (file)
@@ -20,6 +20,6 @@
 <tr>
        <td class="switch_sw$content[sw] bottom" style="padding-left:5px">{--ADMIN_NETWORK_TYPES_BANNER_URL--}:</td>
        <td class="switch_sw$content[sw] bottom">
-               $content[network_type_banner_url]
+               {%pipe,fixEmptyContentToDashes=$content[network_type_banner_url]%}
        </td>
 </tr>
index f02dc4c..56c3b0b 100644 (file)
@@ -10,7 +10,7 @@ $content
 <tr>
        <td align="center" colspan="2" class="admin_footer">
                <input type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />
-               <input type="submit" name="ok" class="admin_submit" value="{--CHANGE_CATS--}" />
+               <input type="submit" name="ok" class="admin_submit" value="{--CHANGE_CATEGORIES--}" />
        </td>
 </tr>
 </table>
index 921c3a3..d331d62 100644 (file)
@@ -16,7 +16,7 @@
        </tr>
        <tr>
                <td align="right" class="top">
-                       <strong>{--EMAIL_EDIT_SUBJ--}:</strong>
+                       <strong>{--EMAIL_EDIT_SUBJECT--}:</strong>
                </td>
                <td class="top">
                        <input type="text" name="subject" class="admin_normal" size="30" maxlength="255" value="$content[subject]" />
index b78420d..d812ec8 100644 (file)
@@ -1,7 +1,7 @@
 <div align="center">
 <div class="admin_table dashed">
        <div class="admin_title bottom">
-               <strong>{--ADMIN_MEMBER_NO_CATS_1--}<a href="{%url=modules.php?module=admin&amp;what=list_user&amp;userid=$content[userid]%}">$content[userid]</a>{--ADMIN_MEMBER_NO_CATS_2--}</strong>
+               <strong>{--ADMIN_MEMBER_NO_CATEGORIES_1--}<a href="{%url=modules.php?module=admin&amp;what=list_user&amp;userid=$content[userid]%}">$content[userid]</a>{--ADMIN_MEMBER_NO_CATEGORIES_2--}</strong>
        </div>
        <div class="admin_title">
                <div>
index 9fa8563..a89f6d0 100644 (file)
@@ -4,9 +4,9 @@
        <tr>
                <td width="10" class="header_column bottom right" align="center"><strong>{--ID_SELECT--}</strong></td>
                <td width="50" class="header_column bottom right" align="center"><strong>{--_UID--}:</strong></td>
-               <td width="80" class="header_column bottom right" align="center"><strong>{--HOLIDAY_ADMIN_TSTART--}:</strong></td>
-               <td width="80" class="header_column bottom right" align="center"><strong>{--HOLIDAY_ADMIN_TEND--}:</strong></td>
-               <td width="100" class="header_column bottom right" align="center"><strong>{--HOLIDAY_ADMIN_COMMENTS--}:</strong></td>
+               <td width="80" class="header_column bottom right" align="center"><strong>{--ADMIN_HOLIDAY_TSTART--}:</strong></td>
+               <td width="80" class="header_column bottom right" align="center"><strong>{--ADMIN_HOLIDAY_TEND--}:</strong></td>
+               <td width="100" class="header_column bottom right" align="center"><strong>{--ADMIN_HOLIDAY_COMMENTS--}:</strong></td>
                <td width="100" class="header_column bottom right" align="center"><strong>{--ACCOUNT_STATUS--}:</strong></td>
                <td width="160" class="header_column bottom" align="center"><strong>{--ADMIN_LAST_ONLINE--}:</strong></td>
        </tr>
@@ -15,7 +15,7 @@
                <td colspan="7" class="admin_footer"><input
                        type="reset" class="admin_reset" value="{--UNDO_SELECTIONS--}" />
                <input type="submit" name="ok" class="admin_delete"
-                       value="{--HOLIDAY_ADMIN_STOP_CHECKED--}" /></td>
+                       value="{--ADMIN_HOLIDAY_STOP_CHECKED--}" /></td>
        </tr>
 </table>
 </form>
index 8603de0..fe8a467 100644 (file)
@@ -12,7 +12,9 @@
                $content[end]
        </td>
        <td class="switch_sw$content[sw] bottom right" align="center">
-               <div class="pre">$content[comments]</div>
+               <div class="pre">
+                       {%pipe,fixEmptyContentToDashes=$content[comments]%}
+               </div>
        </td>
        <td class="switch_sw$content[sw] bottom right" align="center">
                {%pipe,translateUserStatus=$content[status]%}
index fbbf945..8f619b6 100644 (file)
@@ -4,24 +4,24 @@
        <!-- @TODO Shouldn't we add a title here? //-->
        <tr>
                <td align="center" class="header_column bottom right" height="25"><strong>{--ID_SELECT--}</strong></td>
-               <td align="center" class="header_column bottom right"><strong>{--MODS_NAME--}</strong></td>
-               <td align="center" class="header_column bottom right"><strong>{--MODS_TITLE--}</strong></td>
-               <td align="center" class="header_column bottom right"><strong>{--MODS_IS_LOCKED--}</strong></td>
-               <td align="center" class="header_column bottom right"><strong>{--MODS_IS_HIDDEN--}</strong></td>
-               <td align="center" class="header_column bottom right"><strong>{--MODS_IS_ADMIN--}</strong></td>
-               <td align="center" class="header_column bottom"><strong>{--MODS_IS_MEMBER--}</strong></td>
+               <td align="center" class="header_column bottom right"><strong>{--ADMIN_MODS_NAME--}</strong></td>
+               <td align="center" class="header_column bottom right"><strong>{--ADMIN_MODS_TITLE--}</strong></td>
+               <td align="center" class="header_column bottom right"><strong>{--ADMIN_MODS_IS_LOCKED--}</strong></td>
+               <td align="center" class="header_column bottom right"><strong>{--ADMIN_MODS_IS_HIDDEN--}</strong></td>
+               <td align="center" class="header_column bottom right"><strong>{--ADMIN_MODS_IS_ADMIN--}</strong></td>
+               <td align="center" class="header_column bottom"><strong>{--ADMIN_MODS_IS_MEMBER--}</strong></td>
        </tr>
        $content
        <tr>
                <td colspan="7" class="admin_footer">
                        <input type="reset" class="admin_reset" value="{--UNDO_SELECTIONS--}" />
-                       <input type="submit" name="edit" class="admin_submit" value="{--MODS_EDIT--}" />
+                       <input type="submit" name="edit" class="admin_submit" value="{--ADMIN_MODS_EDIT--}" />
                </td>
        </tr>
 </table>
 </form>
 
 <div class="admin_note">
-       {--MODS_ADMIN_EDIT_NOTE--}
+       {--ADMIN_MODS_EDIT_NOTE--}
 </div>
 </div>
index 1b6f952..7ef5f77 100644 (file)
@@ -6,7 +6,7 @@
                $content[module]
        </td>
        <td class="switch_sw$content[sw] bottom right">
-               $content[title]
+               {%pipe,fixEmptyContentToDashes=$content[title]%}
        </td>
        <td class="switch_sw$content[sw] bottom right" align="center">
                {%pipe,translateYesNo=$content[locked]%}
index ff71486..faf5131 100644 (file)
@@ -3,8 +3,8 @@
   <td align="center" width="15%" class="switch_sw$content[sw] bottom right">$content[userid]</td>
   <td align="center" width="10%" class="switch_sw$content[sw] bottom right">$content[ip]</td>
   <td align="center" width="5%" class="switch_sw$content[sw] bottom right">{%pipe,generateUserProfileLink=$content[refid]%}</td>
-  <td align="center" width="10%" class="switch_sw$content[sw] bottom right">$content[module]</td>
-  <td align="center" width="10%" class="switch_sw$content[sw] bottom right">$content[action]</td>
-  <td align="center" width="5%" class="switch_sw$content[sw] bottom right">$content[what]</td>
+  <td align="center" width="10%" class="switch_sw$content[sw] bottom right">{%pipe,fixEmptyContentToDashes=$content[module]%}</td>
+  <td align="center" width="10%" class="switch_sw$content[sw] bottom right">{%pipe,fixEmptyContentToDashes=$content[action]%}</td>
+  <td align="center" width="5%" class="switch_sw$content[sw] bottom right">{%pipe,fixEmptyContentToDashes=$content[what]%}</td>
   <td align="center" width="10%" class="switch_sw$content[sw] bottom">$content[timestamp]</td>
 </tr>
index 141ec93..9fa0745 100644 (file)
@@ -1,8 +1,8 @@
 <tr>
        <td align="center" class="switch_sw$content[sw] bottom right">{%pipe,generateUserProfileLink=$content[userid]%}</td>
        <td align="center" class="switch_sw$content[sw] bottom right">{%pipe,translateComma=$content[payout_total]%} $content[type]</td>
-       <td align="center" class="switch_sw$content[sw] bottom right">$content[target_account]</td>
-       <td align="center" class="switch_sw$content[sw] bottom right">$content[target_bank]</td>
+       <td align="center" class="switch_sw$content[sw] bottom right">{%pipe,fixEmptyContentToDashes=$content[target_account]%}</td>
+       <td align="center" class="switch_sw$content[sw] bottom right">{%pipe,fixEmptyContentToDashes=$content[target_bank]%}</td>
        <td align="center" class="switch_sw$content[sw] bottom right">$content[payout_timestamp]</td>
        <td align="center" class="switch_sw$content[sw] bottom">$content[status]</td>
 </tr>
index d450573..af5f5e3 100644 (file)
@@ -5,6 +5,6 @@
        <td class="switch_sw$content[sw] primera_type_$content[raw_type] bottom right">{%pipe,translateComma=$content[primera_amount]%}</td>
        <td class="switch_sw$content[sw] primera_type_$content[raw_type] bottom right">$content[primera_timestamp]</td>
        <td class="switch_sw$content[sw] primera_type_$content[raw_type] bottom right" align="center">{%pipe,PRIMERA_TRANSFER_STATUS=$content[primera_type]%}</td>
-       <td class="switch_sw$content[sw] primera_type_$content[raw_type] bottom right" align="center">$content[primera_api_message]</td>
+       <td class="switch_sw$content[sw] primera_type_$content[raw_type] bottom right" align="center">{%pipe,fixEmptyContentToDashes=$content[primera_api_message]%}</td>
        <td class="switch_sw$content[sw] primera_type_$content[raw_type] bottom" align="center">$content[primera_api_status]</td>
 </tr>
index c11b7d4..0e5f882 100644 (file)
@@ -6,7 +6,7 @@
        </td>
        <td align="center" class="switch_sw$content[sw] bottom right">
                <strong>{--RALLYE_DESCR2--}:</strong><br />
-               $content[descr]
+               {%pipe,fixEmptyContentToDashes=$content[descr]%}
        </td>
        <td align="center" class="switch_sw$content[sw] bottom right">
                <strong>{--RALLYE_ADMIN_ID--}:</strong><br />
@@ -24,7 +24,7 @@
 <tr>
        <td align="center" class="switch_sw$content[sw] bottom right">
                <strong>{--RALLYE_TEMPLATE2--}:</strong><br />
-               $content[template]
+               {%pipe,fixEmptyContentToDashes=$content[template]%}
        </td>
        <td align="center" class="switch_sw$content[sw] bottom right">
                <strong>{--RALLYE_AUTO_ADD--}:</strong><br />
index 586daa5..2d6f648 100644 (file)
@@ -4,9 +4,12 @@
                href="{%url=modules.php?module=admin&amp;what=list_user&amp;userid=$content[userid]%}">$content[userid]</a>$content[bold_r]
        </td>
        <td align="center" class="switch_sw$content[sw] bottom right">
-       $content[bold_l]$content[old]$content[bold_r]</td>
+               $content[bold_l]$content[old]$content[bold_r]
+       </td>
        <td align="center" class="switch_sw$content[sw] bottom right">
-       $content[bold_l]$content[cnt]$content[bold_r]</td>
+               $content[bold_l]$content[cnt]$content[bold_r]
+       </td>
        <td align="center" class="switch_sw$content[sw] bottom">
-       $content[bold_l]$content[points]$content[bold_r]</td>
+               $content[bold_l]$content[points]$content[bold_r]
+       </td>
 </tr>
index 45020c8..a635ac1 100644 (file)
@@ -21,6 +21,6 @@
                $content[url_last_locked]
        </td>
        <td align="center" class="bottom switch_sw$content[sw]">
-               $content[url_lock_reason]
+               {%pipe,fixEmptyContentToDashes=$content[url_lock_reason]%}
        </td>
 </tr>
index d59653f..1c57fc4 100644 (file)
@@ -9,7 +9,7 @@
                <a title="{--ADMIN_REGISTER_EXTENSION_TITLE--}" href="{%url=modules.php?module=admin&amp;what=extensions&amp;reg_ext=$content[id]%}">{--ADMIN_REGISTER_EXTENSION--}</a>
        </td>
        <td class="switch_sw$content[sw] bottom right" align="center">
-               $content[infos]
+               {%pipe,fixEmptyContentToDashes=$content[infos]%}
        </td>
        <td class="switch_sw$content[sw] bottom right" align="center">
                $content[userid]
index 722a033..e0d1af2 100644 (file)
@@ -9,7 +9,7 @@
                ---
        </td>
        <td class="switch_sw$content[sw] bottom right" align="center">
-               $content[infos]
+               {%pipe,fixEmptyContentToDashes=$content[infos]%}
        </td>
        <td class="switch_sw$content[sw] bottom right" align="center">
                $content[userid]
index 1529a0d..b85ec7b 100644 (file)
@@ -10,7 +10,7 @@
        <td align="center" class="bottom right switch_sw$content[sw]">{%pipe,translateGender=$content[gender]%}</td>
        <td align="center" class="bottom right switch_sw$content[sw]">$content[surname]</td>
        <td align="center" class="bottom right switch_sw$content[sw]">$content[family]</td>
-       <td align="center" class="bottom switch_sw$content[sw]">$content[nickname]</td>
+       <td align="center" class="bottom switch_sw$content[sw]">{%pipe,fixEmptyContentToDashes=$content[nickname]%}</td>
 </tr>
 <tr>
        <td align="center" class="right switch_sw$content[sw]"><strong>{--EMAIL--}:</strong></td>
@@ -48,7 +48,7 @@
        <td align="center" class="switch_sw$content[sw]"><strong>{--_UNUSED--}:</strong></td>
 </tr>
 <tr>
-       <td align="center" class="right switch_sw$content[sw] bottom">$content[lock_reason]</td>
+       <td align="center" class="right switch_sw$content[sw] bottom">{%pipe,fixEmptyContentToDashes=$content[lock_reason]%}</td>
        <td align="center" class="right switch_sw$content[sw] bottom">$content[lock_timestamp]</td>
        <td align="center" class="right switch_sw$content[sw] bottom">---</td>
        <td align="center" class="right switch_sw$content[sw] bottom">---</td>
index 540543e..7f3cdce 100644 (file)
@@ -4,7 +4,7 @@
        <td class="switch_sw$content[sw] wernis_type_$content[wernis_type] bottom right">$content[wernis_account]</td>
        <td class="switch_sw$content[sw] wernis_type_$content[wernis_type] bottom right">{%pipe,translateComma=$content[wernis_amount]%}</td>
        <td class="switch_sw$content[sw] wernis_type_$content[wernis_type] bottom right">$content[wernis_timestamp]</td>
-       <td class="switch_sw$content[sw] wernis_type_$content[wernis_type] bottom right" align="center">{%pipe,WERNIS_TRANSFER_STATUS=$content[wernis_type]%}</td>
-       <td class="switch_sw$content[sw] wernis_type_$content[wernis_type] bottom right" align="center">$content[wernis_api_message]</td>
+       <td class="switch_sw$content[sw] wernis_type_$content[wernis_type] bottom right" align="center">{%pipe,translateWernisTransferStatus=$content[wernis_type]%}</td>
+       <td class="switch_sw$content[sw] wernis_type_$content[wernis_type] bottom right" align="center">{%pipe,fixEmptyContentToDashes=$content[wernis_api_message]%}</td>
        <td class="switch_sw$content[sw] wernis_type_$content[wernis_type] bottom" align="center">$content[wernis_api_status]</td>
 </tr>
index c1ac01c..9e1b021 100644 (file)
@@ -2,12 +2,12 @@
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <!-- @TODO Shouldn't we add a title here? //-->
        <tr>
-               <td align="center" class="header_column bottom right" height="25"><strong>{--MODS_NAME--}</strong></td>
-               <td align="center" class="header_column bottom right"><strong>{--MODS_TITLE--}</strong></td>
-               <td align="center" class="header_column bottom right"><strong>{--MODS_IS_LOCKED--}</strong></td>
-               <td align="center" class="header_column bottom right"><strong>{--MODS_IS_HIDDEN--}</strong></td>
-               <td align="center" class="header_column bottom right"><strong>{--MODS_IS_ADMIN--}</strong></td>
-               <td align="center" class="header_column bottom right"><strong>{--MODS_IS_MEMBER--}</strong></td>
+               <td align="center" class="header_column bottom right" height="25"><strong>{--ADMIN_MODS_NAME--}</strong></td>
+               <td align="center" class="header_column bottom right"><strong>{--ADMIN_MODS_TITLE--}</strong></td>
+               <td align="center" class="header_column bottom right"><strong>{--ADMIN_MODS_IS_LOCKED--}</strong></td>
+               <td align="center" class="header_column bottom right"><strong>{--ADMIN_MODS_IS_HIDDEN--}</strong></td>
+               <td align="center" class="header_column bottom right"><strong>{--ADMIN_MODS_IS_ADMIN--}</strong></td>
+               <td align="center" class="header_column bottom right"><strong>{--ADMIN_MODS_IS_MEMBER--}</strong></td>
        </tr>
        $content
        <tr>
index 6b8562c..188edb1 100644 (file)
@@ -1,11 +1,11 @@
 <table border="0" cellspacing="0" cellpadding="0" width="480"
        class="admin_table dashed">
        <tr>
-               <td align="center" class="admin_title bottom right"><strong>{--MODS_TITLE--}</strong></td>
-               <td align="center" class="admin_title bottom"><strong>{--MODS_CLICKS--}</strong></td>
+               <td align="center" class="admin_title bottom right"><strong>{--ADMIN_MODS_TITLE--}</strong></td>
+               <td align="center" class="admin_title bottom"><strong>{--ADMIN_MODS_CLICKS--}</strong></td>
        </tr>
        $content
        <tr>
-               <td colspan="2" class="admin_footer"><div class="admin_note">{--MODS_ADMIN_EDIT_NOTE--}</div></td>
+               <td colspan="2" class="admin_footer"><div class="admin_note">{--ADMIN_MODS_EDIT_NOTE--}</div></td>
        </tr>
 </table>
index e0d42bb..396118e 100644 (file)
@@ -1,8 +1,8 @@
 <div align="center">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
-               <td align="center" class="admin_title bottom right"><strong>{--MODS_WHAT_ACTION--}</strong></td>
-               <td align="center" class="admin_title bottom"><strong>{--MODS_CLICKS--}</strong></td>
+               <td align="center" class="admin_title bottom right"><strong>{--ADMIN_MODS_WHAT_ACTION--}</strong></td>
+               <td align="center" class="admin_title bottom"><strong>{--ADMIN_MODS_CLICKS--}</strong></td>
        </tr>
        $content
        <tr>
index d1d9477..3ffabc3 100644 (file)
@@ -1,6 +1,6 @@
 <tr>
        <td class="switch_sw$content[sw] bottom right">
-               &nbsp;$content[title] ($content[action])
+               {%pipe,fixEmptyContentToDashes=$content[title]%} ($content[action])
        </td>
        <td class="switch_sw$content[sw] bottom" align="center">
                $content[counter]
index 23b6846..3f9be95 100644 (file)
@@ -1,6 +1,6 @@
 <tr>
        <td class="switch_sw$content[sw] bottom right">
-               &nbsp;$content[title] (<span class="admin_misc">$content[module]</span>)
+               {%pipe,fixEmptyContentToDashes=$content[title]%} (<span class="admin_misc">$content[module]</span>)
        </td>
        <td class="switch_sw$content[sw] bottom" align="center">
                $content[clicks]
index 1ac8472..4286166 100644 (file)
@@ -9,7 +9,7 @@
                <a title="{--ADMIN_REGISTER_EXTENSION_TITLE--}" href="{%url=modules.php?module=admin&amp;what=extensions&amp;reg_ext=$content[id]%}">{--ADMIN_REGISTER_EXTENSION--}</a>
        </td>
        <td class="switch_sw$content[sw] bottom right" align="center">
-               $content[infos]
+               {%pipe,fixEmptyContentToDashes=$content[infos]%}
        </td>
        <td class="switch_sw$content[sw] bottom right" align="center">
                $content[userid]
index b50b5a1..1f4a4fc 100644 (file)
@@ -9,7 +9,7 @@
                ---
        </td>
        <td class="switch_sw$content[sw] bottom right" align="center">
-               $content[infos]
+               {%pipe,fixEmptyContentToDashes=$content[infos]%}
        </td>
        <td class="switch_sw$content[sw] bottom right" align="center">
                $content[userid]
index 57cc966..6090f85 100644 (file)
@@ -1 +1 @@
-<a href="{%url=modules.php?module=admin&amp;what=del_holiday&amp;userid=$content%}">{--HOLIDAY_ADMIN_DEL_LINK--}</a>
+<a href="{%url=modules.php?module=admin&amp;what=del_holiday&amp;userid=$content%}">{--ADMIN_HOLIDAY_DEL_LINK--}</a>
index 0e0b429..537b762 100644 (file)
@@ -84,7 +84,7 @@
                </td>
                <td align="center" class="top right">
                        {--ADMIN_LAST_MODULE--}:<br />
-                       <strong>$content[last_module]</strong>
+                       <strong>{%pipe,fixEmptyContentToDashes=$content[last_module]%}</strong>
                </td>
                <td align="center" class="top right">
                        {--HAS_JOINED--}:<br />
                        <strong>$content[refs]</strong>
                </td>
                <td align="center" class="top">
-                       {--TOTAL_CATS--}:<br />
+                       {--TOTAL_CATEGORIES--}:<br />
                        <strong>$content[cats]</strong>
                </td>
        </tr>
                </td>
                <td align="center" class="top">
                        {--LOCK_REASON--}:<br />
-                       <strong>$content[lock_reason]</strong>
+                       <strong>{%pipe,fixEmptyContentToDashes=$content[lock_reason]%}</strong>
                </td>
        </tr>
        <!--
index 6931ab0..57cc624 100644 (file)
@@ -1,6 +1,6 @@
 <tr>
   <td class="switch_sw$content[sw] bottom">$content[idx].</td>
-  <td align="center" class="switch_sw$content[sw] bottom">$content[start].$content[userid].$content[end]</td>
-  <td align="center" class="switch_sw$content[sw] bottom">$content[start].$content[ref].$content[end]</td>
-  <td align="center" class="switch_sw$content[sw] bottom">$content[start].$content[infos].$content[end]</td>
+  <td align="center" class="switch_sw$content[sw] bottom">$content[start].{%pipe,fixEmptyContentToDashes=$content[userid]%}.$content[end]</td>
+  <td align="center" class="switch_sw$content[sw] bottom">$content[start].{%pipe,fixEmptyContentToDashes=$content[ref]%}.$content[end]</td>
+  <td align="center" class="switch_sw$content[sw] bottom">$content[start].{%pipe,fixEmptyContentToDashes=$content[infos]%}.$content[end]</td>
 </tr>
index 45013c6..5d4b9a3 100644 (file)
@@ -84,7 +84,7 @@
        </tr>
        <tr>
                <td colspan="2" class="guest_title">
-                       {--GUEST_SELECT_LEAST_CATS--}
+                       {--GUEST_SELECT_LEAST_CATEGORIES--}
                </td>
        </tr>
        <tr>
index 1d18571..db20d63 100644 (file)
@@ -37,7 +37,7 @@
        </tr>
        $content[month_rows]
        <tr>
-               <td align="center" class="guest_stats_title bottom" colspan="4"><strong>{--GUEST_STATS_CATS--}</strong></td>
+               <td align="center" class="guest_stats_title bottom" colspan="4"><strong>{--GUEST_STATS_CATEGORIES--}</strong></td>
        </tr>
        $content[cats_rows]
        <tr>
index 701eef7..3a01b18 100644 (file)
@@ -1,6 +1,6 @@
 <tr>
        <td class="top10_row1 switch_sw$content[sw] bottom right" align="center">$content[cnt]</td>
-       <td class="top10_row2 switch_sw$content[sw] bottom right">$content[userid]($content[nickname])</td>
+       <td class="top10_row2 switch_sw$content[sw] bottom right">$content[userid] ({%pipe,fixEmptyContentToDashes=$content[nickname]%})</td>
        <td class="top10_row3 switch_sw$content[sw] bottom right">{%pipe,translateComma=$content[points]%}</td>
        <td class="top10_row5 switch_sw$content[sw] bottom">$content[last_online]</td>
 </tr>
index 9900377..52592ff 100644 (file)
@@ -1,6 +1,6 @@
 <tr>
        <td class="top10_row1 switch_sw$content[sw] bottom right" align="center">$content[cnt]</td>
-       <td class="top10_row2 switch_sw$content[sw] bottom right">$content[userid]($content[nickname])</td>
+       <td class="top10_row2 switch_sw$content[sw] bottom right">$content[userid] ({%pipe,fixEmptyContentToDashes=$content[nickname]%})</td>
        <td class="top10_row3 switch_sw$content[sw] bottom right">{%pipe,translateComma=$content[total_logins]%}</td>
        <td class="top10_row4 switch_sw$content[sw] bottom right">{%pipe,translateComma=$content[points]%}</td>
        <td class="top10_row5 switch_sw$content[sw] bottom">$content[last_online]</td>
index 4792750..80f5059 100644 (file)
@@ -1,6 +1,6 @@
 <tr>
        <td class="top10_row1 switch_sw$content[sw] bottom right" align="center">$content[cnt]</td>
-       <td class="top10_row2 switch_sw$content[sw] bottom right">$content[userid]($content[nickname])</td>
+       <td class="top10_row2 switch_sw$content[sw] bottom right">$content[userid] ({%pipe,fixEmptyContentToDashes=$content[nickname]%})</td>
        <td class="top10_row3 switch_sw$content[sw] bottom right">{%pipe,translateComma=$content[refs]%}</td>
        <td class="top10_row4 switch_sw$content[sw] bottom right">{%pipe,translateComma=$content[points]%}</td>
        <td class="top10_row5 switch_sw$content[sw] bottom">$content[last_online]</td>
index cf04ab3..2971de1 100644 (file)
@@ -29,7 +29,7 @@
 <tr>
        <td align="center" class="bottom right"><strong>{--EMAIL_CATEGORY--}:</strong></td>
        <td align="center" class="bottom">
-               {%pipe,getCategory=$content[category]%}
+               {%pipe,getCategory=$content[cat_id]%}
        </td>
 </tr>
 <tr>
index f6b7839..14291d0 100644 (file)
@@ -29,7 +29,7 @@
 <tr>
        <td align="center" class="bottom right"><strong>{--EMAIL_CATEGORY--}:</strong></td>
        <td align="center" class="bottom">
-               {%pipe,getCategory=$content[category]%}
+               {%pipe,getCategory=$content[cat_id]%}
        </td>
 </tr>
 <tr>
index 3e904c3..ffc99c5 100644 (file)
@@ -29,7 +29,7 @@
 <tr>
        <td align="center" class="bottom right"><strong>{--EMAIL_CATEGORY--}:</strong></td>
        <td align="center" class="bottom">
-               {%pipe,getCategory=$content[category]%}
+               {%pipe,getCategory=$content[cat_id]%}
        </td>
 </tr>
 <tr>
index 9cec0c2..1d717e5 100644 (file)
@@ -31,7 +31,7 @@
 <tr>
        <td align="center" class="bottom right"><strong>{--EMAIL_CATEGORY--}:</strong></td>
        <td align="center" class="bottom">
-               {%pipe,getCategory=$content[category]%}
+               {%pipe,getCategory=$content[cat_id]%}
        </td>
 </tr>
 <tr>
index a1680f0..d83d82b 100644 (file)
@@ -29,7 +29,7 @@
 <tr>
        <td align="center" class="bottom right"><strong>{--EMAIL_CATEGORY--}:</strong></td>
        <td align="center" class="bottom">
-               {%pipe,getCategory=$content[category]%}
+               {%pipe,getCategory=$content[cat_id]%}
        </td>
 </tr>
 <tr>
index 8c02241..bc9e5f6 100644 (file)
@@ -29,7 +29,7 @@
 <tr>
        <td align="center" class="bottom right"><strong>{--EMAIL_CATEGORY--}:</strong></td>
        <td align="center" class="bottom">
-               {%pipe,getCategory=$content[category]%}
+               {%pipe,getCategory=$content[cat_id]%}
        </td>
 </tr>
 <tr>
index e616584..c10affe 100644 (file)
@@ -29,7 +29,7 @@
 <tr>
        <td align="center" class="bottom right"><strong>{--EMAIL_CATEGORY--}:</strong></td>
        <td align="center" class="bottom">
-               {%pipe,getCategory=$content[category]%}
+               {%pipe,getCategory=$content[cat_id]%}
        </td>
 </tr>
 <tr>
index e718d54..c5a7872 100644 (file)
@@ -29,7 +29,7 @@
 <tr>
        <td align="center" class="bottom right"><strong>{--EMAIL_CATEGORY--}:</strong></td>
        <td align="center" class="bottom">
-               {%pipe,getCategory=$content[category]%}
+               {%pipe,getCategory=$content[cat_id]%}
        </td>
 </tr>
 <tr>
index 24d73b7..6b281a2 100644 (file)
@@ -31,7 +31,7 @@
 <tr>
        <td align="center" class="bottom right"><strong>{--EMAIL_CATEGORY--}:</strong></td>
        <td align="center" class="bottom">
-               {%pipe,getCategory=$content[category]%}
+               {%pipe,getCategory=$content[cat_id]%}
        </td>
 </tr>
 <tr>
index 6ef2454..9050f3b 100644 (file)
@@ -29,7 +29,7 @@
 <tr>
        <td align="center" class="bottom right"><strong>{--EMAIL_CATEGORY--}:</strong></td>
        <td align="center" class="bottom">
-               {%pipe,getCategory=$content[category]%}
+               {%pipe,getCategory=$content[cat_id]%}
        </td>
 </tr>
 <tr>
index 948aa1b..ed94ae4 100644 (file)
@@ -1,7 +1,7 @@
 <tr>
        <td align="center" class="switch_sw$content[sw] bottom right">{%pipe,translateComma=$content[payout_total]%} $content[type]</td>
-       <td align="center" class="switch_sw$content[sw] bottom right">$content[target_account]</td>
-       <td align="center" class="switch_sw$content[sw] bottom right">$content[target_bank]</td>
+       <td align="center" class="switch_sw$content[sw] bottom right">{%pipe,fixEmptyContentToDashes=$content[target_account]%}</td>
+       <td align="center" class="switch_sw$content[sw] bottom right">{%pipe,fixEmptyContentToDashes=$content[target_bank]%}</td>
        <td align="center" class="switch_sw$content[sw] bottom right">$content[payout_timestamp]</td>
        <td align="center" class="switch_sw$content[sw] bottom">$content[status]</td>
 </tr>
index 417478f..6995677 100644 (file)
@@ -29,7 +29,7 @@
 $content[rows]
 <tr>
        <td align="center" class="member_footer" colspan="6">
-               <span class="member_note">{%message,MEMBER_REFLIST_COUNTER=$content[counter]%}</span>
+               <span class="member_note">{%message,MEMBER_REFLIST_COUNTER={%pipe,translateComma=$content[counter]%}%}</span>
        </td>
 </tr>
 </table>
index 580e2ba..5b28825 100644 (file)
@@ -1,15 +1,15 @@
 <tr>
        <td align="center" class="switch_sw$content[sw] bottom right">
-               $content[refid] ($content[nickname])
+               $content[refid] ({%pipe,fixEmptyContentToDashes=$content[nickname]%})
        </td>
        <td align="center" class="switch_sw$content[sw] bottom right">
-               $content[status]
+               {%pipe,translateUserStatus=$content[status]%}
        </td>
        <td align="center" class="switch_sw$content[sw] bottom right">
-               $content[points] {?POINTS?}
+               {%pipe,translateComma=$content[points]%} {?POINTS?}
        </td>
        <td align="center" class="switch_sw$content[sw] bottom right">
-               $content[unconfirmed]
+               {%pipe,translateComma=$content[unconfirmed]%}
        </td>
        <td align="center" class="switch_sw$content[sw] bottom right">
                $content[clickrate]&#37;
index 788e885..f222933 100644 (file)
@@ -1,6 +1,6 @@
 <tr>
        <td align="center" class="switch_sw$content[sw] bottom right">
-               $content[refid] ($content[nickname])
+               $content[refid] ({%pipe,fixEmptyContentToDashes=$content[nickname]%})
        </td>
        <td align="center" class="switch_sw$content[sw] bottom right">
                $content[level_refid]
index 3877669..65bf7c5 100644 (file)
@@ -12,7 +12,7 @@
                $content[url_last_locked]
        </td>
        <td align="center" class="switch_sw$content[sw] bottom right">
-               $content[url_lock_reason]
+               {%pipe,fixEmptyContentToDashes=$content[url_lock_reason]%}
        </td>
        <td align="center" class="switch_sw$content[sw] bottom">
                $content[actions]
index 376fc60..7f8dc25 100644 (file)
@@ -2,5 +2,5 @@
        <td align="center" class="switch_sw$content[sw] wernis_type_$content[raw_type] bottom right">{%pipe,translateComma=$content[wernis_amount]%} Wernis</td>
        <td align="center" class="switch_sw$content[sw] wernis_type_$content[raw_type] bottom right">{%pipe,bigintval=$content[wernis_account]%}</td>
        <td align="center" class="switch_sw$content[sw] wernis_type_$content[raw_type] bottom right">$content[wernis_timestamp]</td>
-       <td align="center" class="switch_sw$content[sw] wernis_type_$content[raw_type] bottom">{%pipe,WERNIS_TRANSFER_STATUS=$content[wernis_type]%}</td>
+       <td align="center" class="switch_sw$content[sw] wernis_type_$content[raw_type] bottom">{%pipe,translateWernisTransferStatus=$content[wernis_type]%}</td>
 </tr>