More EL used, this has fixed double calls of translateComma() in various places
authorRoland Häder <roland@mxchange.org>
Mon, 13 Sep 2010 23:25:06 +0000 (23:25 +0000)
committerRoland Häder <roland@mxchange.org>
Mon, 13 Sep 2010 23:25:06 +0000 (23:25 +0000)
47 files changed:
inc/autopurge/purge-general.php
inc/extensions/ext-order.php
inc/language/wernis_de.php
inc/libs/surfbar_functions.php
inc/modules/admin/admin-inc.php
inc/modules/admin/what-config_points.php
inc/modules/admin/what-del_email.php
inc/modules/admin/what-del_transfer.php
inc/modules/admin/what-list_beg.php
inc/modules/admin/what-list_bonus.php
inc/modules/admin/what-list_user.php
inc/modules/admin/what-send_bonus.php
inc/modules/guest/what-mediadata.php
inc/modules/member/what-order.php
inc/modules/member/what-payout.php
inc/modules/member/what-surfbar_list.php
inc/modules/member/what-transfer.php
inc/modules/member/what-wernis.php
inc/mysql-manager.php
templates/de/emails/admin/admin_autopurge_points.tpl
templates/de/emails/admin/admin_refback.tpl
templates/de/emails/confirm-member.tpl
templates/de/emails/confirm-referral.tpl
templates/de/emails/member/member_refback.tpl
templates/de/html/admin/admin_cache_stats.tpl
templates/de/html/admin/admin_delete_reflevel_row.tpl
templates/de/html/admin/admin_list_bank_package_row.tpl
templates/de/html/admin/admin_list_beg.tpl
templates/de/html/admin/admin_list_bonus.tpl
templates/de/html/admin/admin_list_reflevel_row.tpl
templates/de/html/admin/admin_list_user_row.tpl
templates/de/html/admin/admin_send_bonus_form.tpl
templates/de/html/admin/admin_user_details.tpl
templates/de/html/doubler/doubler_index.tpl
templates/de/html/guest/guest_doubler.tpl
templates/de/html/member/member_doubler.tpl
templates/de/html/member/member_holiday_form.tpl
templates/de/html/member/member_order_points.tpl
templates/de/html/member/member_points_row.tpl
templates/de/html/member/member_refback_list_row.tpl
templates/de/html/member/member_refback_list_row_deleted.tpl
templates/de/html/member/member_stats_row.tpl
templates/de/html/member/member_surfbar_start_dynamic.tpl
templates/de/html/member/member_transfer_list.tpl
templates/de/html/member/member_transfer_row.tpl
templates/de/html/member/member_wernis_mode_payout.tpl
templates/de/html/member/member_wernis_mode_withdraw.tpl

index fb30bb9..f5249b9 100644 (file)
@@ -144,12 +144,12 @@ 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('{--ADMIN_AUTOPURGE_SUBJECT--}', 'admin_autopurge_points', translateComma($admin_points));
+               sendAdminNotification('{--ADMIN_AUTOPURGE_SUBJECT--}', 'admin_autopurge_points', $admin_points);
        } // END - if
 
        // Run all SQLs here
        runFilterChain('run_sqls');
 } // END - if
 
-//
+// [EOF]
 ?>
index 9df9339..68b87ef 100644 (file)
@@ -73,7 +73,7 @@ switch (getExtensionMode()) {
        case 'update': // Update an extension
                switch (getCurrentExtensionVersion()) {
                        case '0.1.0': // SQL queries for v0.1
-                               addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD order_max_full ENUM('ORDER','MAX') NOT NULL DEFAULT 'MAX'");
+                               addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD `order_max_full` ENUM('ORDER','MAX') NOT NULL DEFAULT 'MAX'");
                                addAdminMenuSql('setup','config_order','Mailbuchungsseite','Einstellungen am Mailbuchungsformular.',7);
 
                                // Update notes (these will be set as task text!)
index 2e204f3..1b4e1d6 100644 (file)
@@ -105,7 +105,7 @@ addMessages(array(
        'MEMBER_WERNIS_MODE_CHOOSE2' => "Hier klicken um neue &Uuml;berweisung zu starten...",
        'MEMBER_WERNIS_NO_ACCOUNT' => "Noch kein WDS66-Account? Hier entlang.",
        'MEMBER_WERNIS_API_DATA_MISSING' => "Diese Funktion kann derzeit nicht genutzt werden, da wir sie noch einrichten m&uuml;ssen.",
-       'MEMBER_WERNIS_MIN_PAYOUT' => "Sie haben nicht gen&uuml;gend Wernis zum Auszahlen! Mindestens: <span class=\"data\">%s</span>, Ihr Guthaben: <span class=\"data\">%s</span> Wernis.",
+       'MEMBER_WERNIS_MIN_PAYOUT' => "Sie haben nicht gen&uuml;gend Wernis zum Auszahlen! Mindestens: <span class=\"data\">{%%config,translateComma=wernis_min_payout%%} {?POINTS?}</span>, Ihr Guthaben: <span class=\"data\">{%%pipe,translateComma=%s%%}</span> {?POINTS?}.",
        'MEMBER_WERNIS_WITHDRAW_TITLE' => "Wernis bei {?MAIN_TITLE?} einzahlen:",
        'MEMBER_WERNIS_WITHDRAW_POINTS_ACCOUNT' => "Wernis hier im Account:",
        'MEMBER_WERNIS_WITHDRAW_MIN_POINTS' => "Mindest einzuzahlendes Wernis-Guthaben:",
index bbb6dae..5f14531 100644 (file)
@@ -725,7 +725,7 @@ function translateSurfbarLimit ($limit) {
                $return = '{--MEMBER_SURFBAR_UNLIMITED_VIEWS--}';
        } else {
                // Translate comma
-               $return = translateComma($limit);
+               $return = '{%pipe,translateComma=' . $limit . '%}';
        }
 
        // Return value
@@ -1295,9 +1295,9 @@ function SURFBAR_CHANGE_STATUS ($urlId, $prevStatus, $newStatus, $data=array())
 
        // Prepare content for notification routines
        $data[$urlId]['url_userid']  = $data[$urlId]['url_userid'];
-       $data[$urlId]['frametester'] = generateFrametesterUrl($data[$urlId]['url']);
-       $data[$urlId]['reward']      = translateComma(getConfig('surfbar_static_reward'));
-       $data[$urlId]['costs']       = translateComma(getConfig('surfbar_static_costs'));
+       $data[$urlId]['frametester'] = '{%pipe,generateFrametesterUrl=' . $data[$urlId]['url'] . '%}';
+       $data[$urlId]['reward']      = '{%config,translateComma=surfbar_static_reward%}';
+       $data[$urlId]['costs']       = '{%config,translateComma=surfbar_static_costs%}';
 
        // Do some dirty fixing here:
        if (($data[$urlId]['url_status'] == 'STOPPED') && ($newStatus == 'pending')) {
index f0e647c..543b67f 100644 (file)
@@ -1360,7 +1360,7 @@ function generateUnconfirmedAdminLink ($id, $unconfirmed, $type = 'bid') {
        // Do we have unconfirmed mails?
        if ($unconfirmed > 0) {
                // Add link to list_unconfirmed what-file
-               $OUT = '<a href="{%url=modules.php?module=admin&amp;what=list_unconfirmed&amp;' . $type . '=' . $id . '%}">' . translateComma($unconfirmed) . '</a>';
+               $OUT = '<a href="{%url=modules.php?module=admin&amp;what=list_unconfirmed&amp;' . $type . '=' . $id . '%}">{%pipe,translateComma=' . $unconfirmed . '%}</a>';
        } // END - if
 
        // Return it
index 78d995c..1ec4d82 100644 (file)
@@ -222,9 +222,6 @@ WHERE
 
                        // List already existing categories for editing
                        while ($content = SQL_FETCHARRAY($result)) {
-                               // Prepare data for the row template
-                               $content['percents'] = translateComma($content['percents']);
-
                                // Load row template and switch color
                                $OUT .= loadTemplate('admin_list_reflevel_row', true, $content);
                        } // END - while
index 997c637..1b8996f 100644 (file)
@@ -116,17 +116,17 @@ LIMIT 1",
                                if (getConfig('repay_deleted_mails') == 'REPAY') {
                                        // Repayed
                                        loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_POINTS_REPAYED',
-                                               translateComma($totalPoints)
+                                               '{%pipe,translateComma=' . $totalPoints . '%}'
                                        ));
                                } else {
                                        // To jackpot
                                        loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_POINTS_TO_JACKPOT',
-                                               translateComma($totalPoints)
+                                               '{%pipe,translateComma=' . $totalPoints . '%}'
                                        ));
                                }
                        } else {
                                // Points shredded!
-                               loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_POINTS_SHREDDED', translateComma($totalPoints)));
+                               loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_POINTS_SHREDDED', '{%pipe,translateComma=' . $totalPoints . '%}'));
                        }
 
                        // Remove links from DB
index 7869127..19414fe 100644 (file)
@@ -100,7 +100,7 @@ if (!SQL_HASZERONUMS($result)) {
 $content['rows'] = $OUT;
 
 // Remeber total amount
-$content['total'] = translateComma($total);
+$content['total'] = $total;
 
 // Set title
 $content['title'] = '{--TRANSFER_LIST_ALL--}';
index 38bc8c3..65711bc 100644 (file)
@@ -105,7 +105,7 @@ ORDER BY
                } // END - while
 
                $content['rows']  = $OUT;
-               $content['total'] = translateComma($total);
+               $content['total'] = $total;
 
                // Check if we need to display form or not with manuel withdraw
                if (getConfig('last_month') == getMonth()) {
index 492f1a0..ef9631c 100644 (file)
@@ -117,7 +117,7 @@ ORDER BY
                } // END - while
 
                $content['rows']  = $OUT;
-               $content['total'] = translateComma($total);
+               $content['total'] = $total;
 
                // Check if we need to display form or not with manuel withdraw
                if (getConfig('last_month') == getMonth()) {
index 4502201..8d28ef5 100644 (file)
@@ -118,8 +118,8 @@ LIMIT 1",
                // Add links to the numbers
                if ($content['links'] > 0) $content['links'] = $base . '&amp;what=list_links&amp;userid=' . $userid . '%}">' . $content['links'] . '</a>]';
                if (isValidUserId($content['refid'])) $content['refid'] = $base . '&amp;what=list_user&amp;userid=' . $content['refid'] . '%}">'.$content['refid'] . '</a>]';
-               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>]';
+               if ($content['refs']  > 0) $content['refs']  = $base . '&amp;what=list_refs&amp;userid=' . $userid . '%}">{%pipe,translateComma=' . $content['refs'] . '%}</a>]';
+               if ($content['cats']  > 0) $content['cats']  = $base . '&amp;what=list_cats&amp;userid=' . $userid . '%}">{%pipe,translateComma=' . $content['cats'] . '%}</a>]';
 
                // Calculate timestamp for birthday
                $stamp = mktime(0, 0, 0, $content['birth_month'], $content['birth_day'], $content['birth_year']);
@@ -136,7 +136,7 @@ LIMIT 1",
                // Prepare data for template
                $content['email_link']        = generateEmailLink($content['email'], 'user_data');
                $content['last_online']       = generateDateTime($content['last_online'], 0);
-               if ($content['emails_sent'] > 0) $content['emails_sent'] = $base . '&amp;what=email_details&amp;userid=' . $userid . '%}">' . translateComma($content['emails_sent']) . '</a>]';
+               if ($content['emails_sent'] > 0) $content['emails_sent'] = $base . '&amp;what=email_details&amp;userid=' . $userid . '%}">}{%pipe,translateComma=' . $content['emails_sent'] . '%}</a>]';
                $content['joined']            = generateDateTime($content['joined'], 0);
                $content['last_update']       = generateDateTime($content['last_update'], 0);
                $content['last_profile_sent'] = generateDateTime($content['last_profile_sent'], 0);
@@ -289,7 +289,7 @@ LIMIT 1",
                        $content['locked']         = countSumTotalData($content['userid'], 'user_points', 'locked_points');
 
                        // 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>]';
+                       if ($content['refs'] > 0) $content['refs'] = $base . '&amp;what=list_refs&amp;userid=' . $content['userid'] . '%}">{%pipe,translateComma=' . $content['refs'] . '%}</a>]';
 
                        // Is the extension 'country' installed?
                        // @TODO Rewrite this into a filter
index ff353ba..9ef51ff 100644 (file)
@@ -56,10 +56,10 @@ if (isFormSent()) {
        addNewBonusMail(postRequestArray(), getRequestParameter('mode'));
 } else {
        // Get all available users
-       $content['all'] = translateComma(getTotalReceivers(getRequestParameter('mode')));
+       $content['all'] = getRequestParameter('mode');
 
        // Prepare option lines
-       $content['options_lines'] = generateCategoryOptionsList(getRequestParameter('mode'));
+       $content['options_lines'] = getRequestParameter('mode');
 
        // Store send mode
        $content['mode'] = getRequestParameter('mode');
index 7c40258..56f4582 100644 (file)
@@ -131,7 +131,7 @@ $jackpot = '0';
 if (isExtensionActive('jackpot')) $jackpot = getJackpotPoints();
 
 if (empty($jackpot)) $jackpot = '0';
-$content['jackpot'] = translateComma($jackpot);
+$content['jackpot'] = $jackpot;
 
 // Total referal link clicks, total logins
 $result = SQL_QUERY('SELECT
index d1d18a2..f891d06 100644 (file)
@@ -526,7 +526,7 @@ LIMIT 1",
                                SQL_FREERESULT($result);
 
                                // Output user's points
-                               $content['total'] = translateComma($total);
+                               $content['total'] = $total;
 
                                // Check how many mail orders he has placed today and how many he's allowed to send
                                switch (getConfig('order_max_full')) {
@@ -599,12 +599,11 @@ LIMIT 1",
                                        // Mail type
                                        $content['type_selection'] = '';
                                        foreach ($types as $key => $value) {
-                                               $P = translateComma($types[$key][1]);
                                                if (is_array($value)) {
                                                        // Output option line
                                                        $content['type_selection'] .= '      <option value="' . $types[$key][0] . '"';
                                                        if (($OLD_ORDER) && ($content['payment_id'] == $types[$key][0])) $content['type_selection'] .= ' selected="selected"';
-                                                       $content['type_selection'] .= '>' . $P . ' {--PER_MAIL--} - ' . $types[$key][3] . ' - ' . round($types[$key][2]) . ' {--PAYMENT--}</option>';
+                                                       $content['type_selection'] .= '>{%pipe,translateComma=' . $types[$key][1] . '%} {--PER_MAIL--} - ' . $types[$key][3] . ' - ' . round($types[$key][2]) . ' {--PAYMENT--}</option>';
                                                } // END - if
                                        } // END - foreach
 
index 8136916..43c0ca9 100644 (file)
@@ -146,7 +146,7 @@ ORDER BY
                        // Ok, he can get be paid
                        if ((isFormSent()) && ($points <= $PAY_MAX) && ($points >= $content['min_points'])) {
                                // Remember points in array
-                               setPostRequestParameter('payout_points', translateComma($points));
+                               setPostRequestParameter('payout_points', $points);
                                setPostRequestParameter('type'         , $content['type']);
 
                                // Subtract points from member's account
index 6f892c2..0f1c81e 100644 (file)
@@ -73,7 +73,7 @@ if ((isFormSent()) && (isPostRequestParameterSet('action')) && (isPostRequestPar
                // "Translate"/insert data
                if ($content['views_total'] > 0) {
                        // Include link to stats
-                       $content['views_total'] = '[<a href="{%url=modules.php?module=login&amp;what=surfbar_list%}">' . translateComma($content['views_total']) . '</a>]';
+                       $content['views_total'] = '[<a href="{%url=modules.php?module=login&amp;what=surfbar_list%}">{%pipe,translateComma=' . $content['views_total'] . '%}</a>]';
                } // END - if
                $content['url_registered']  = generateDateTime($content['url_registered'], 2);
                $content['url_last_locked'] = generateDateTime($content['url_last_locked'], 2);
index b080851..4edd967 100644 (file)
@@ -336,7 +336,7 @@ switch ($mode) {
                $content['rows'] = $OUT;
 
                // Remeber total amount
-               $content['total'] = translateComma($totalPoints);
+               $content['total'] = $totalPoints;
 
                // Load final template
                loadTemplate('member_transfer_list', false, $content);
@@ -396,7 +396,6 @@ KEY (`party_userid`)
 
                                // Prepare content for template
                                $content['time']   = generateDateTime($content['time_trans'], 3);
-                               $content['points'] = translateComma($content['points']);
 
                                // Load row template
                                $OUT .= loadTemplate('member_transfer_row', true, $content);
@@ -420,7 +419,7 @@ KEY (`party_userid`)
                $content['rows'] =  $OUT;
 
                // Remeber total amount
-               $content['total'] = translateComma($total);
+               $content['total'] = $total;
 
                // Set title
                $content['title'] = '{--TRANSFER_LIST_ALL--}';
index b62a5aa..108be32 100644 (file)
@@ -122,11 +122,7 @@ if ((!isGetRequestParameterSet('mode')) || (getRequestParameter('mode') == 'choo
        // Is this enougth for a payout?
        if ($points < getConfig('wernis_min_payout')) {
                // No, then abort here
-               loadTemplate('admin_settings_saved', false, sprintf(
-                       getMessage('MEMBER_WERNIS_MIN_PAYOUT'),
-                       translateComma(getConfig('wernis_min_payout')),
-                       translateComma($points)
-               ));
+               loadTemplate('admin_settings_saved', false, '{%message,MEMBER_WERNIS_MIN_PAYOUT=' . $points . '%}');
                return;
        } // END - if
 
@@ -136,9 +132,6 @@ if ((!isGetRequestParameterSet('mode')) || (getRequestParameter('mode') == 'choo
 
        // Add points to content array
        $content['points']     = $points;
-
-       // Get WDS66 username
-       $content['wernis_userid'] = getUserData('wernis_userid');
 } elseif ((getRequestParameter('mode') == 'withdraw') && (getConfig('wernis_withdraw_active') == 'Y')) {
        // Prepare data for the template
        $content['points']        = getTotalPoints(getMemberId());
index 885b670..afd26d2 100644 (file)
@@ -822,7 +822,7 @@ function getPaymentTitlePrice ($pid, $full=false) {
                if ($full === false) {
                        $ret = $data['mail_title'];
                } else {
-                       $ret = $data['mail_title'] . ' / ' . translateComma($data['price']) . ' {?POINTS?}';
+                       $ret = $data['mail_title'] . ' / {%pipe,translateComma=' . $data['price' . '%} {?POINTS?}';
                }
        }
 
index a4ad1b4..fe400ff 100644 (file)
@@ -1,6 +1,6 @@
 Hallo Administrator,
 
-Es wurden soeben $content {?POINTS?} durch die automatische Loeschung von Best&auml;tigungslinks in den Jackpot transferiert!
+Es wurden soeben {%pipe,translateComma=$content%} {?POINTS?} durch die automatische Loeschung von Best&auml;tigungslinks in den Jackpot transferiert!
 
 Mit freundlichen Gr&uuml;&szlig;en,
   Ihr {?MAIN_TITLE?} Script
index ac37176..c0fa399 100644 (file)
@@ -11,7 +11,7 @@ Familienname: {%user,family=$userid%}
 -----------------------------------
 Email-Adresse: {%user,email=$userid%}
 -----------------------------------
-Ref-Back: {%pipe,translateComma=$content[percents]%}%
+Ref-Back: {%pipe,translateComma=$content[percents]%}&#37;
 -----------------------------------
 Bereits erhalten: {%pipe,translateComma=$content[points]%} {?POINTS?}
 -----------------------------------
index 9e68df0..45bb20a 100644 (file)
@@ -7,7 +7,7 @@ Sie k&ouml;nnen sich nun hier einloggen:
 Ihre Login-Id lautet: $userid
 URL zum Login: {?URL?}/login.php
 
-f&uuml;r Ihre Anmeldung werden wir Ihnen als Willkommensgutschrift {%config,translateComma=points_register%} {?POINTS?} gutschreiben, sobald Sie {?ref_payout?} Mails best&auml;tigt haben. Erst dann k&ouml;nnen Sie Mails an die anderen Mitglieder verschicken!
+F&uuml;r Ihre Anmeldung werden wir Ihnen als Willkommensgutschrift {%config,translateComma=points_register%} {?POINTS?} gutschreiben, sobald Sie {?ref_payout?} Mails best&auml;tigt haben. Erst dann k&ouml;nnen Sie Mails an die anderen Mitglieder verschicken!
 
 Wir w&uuml;nschen Ihnen viel Spass und Erfolg beim Mail-Versand!
 
index 8551481..a080198 100644 (file)
@@ -4,7 +4,7 @@ Sie haben heute ein neues Mitglied f&uuml;r {?MAIN_TITLE?} geworben!
 
 Hier sehen Sie genau, in welcher Ebene Sie ihn geworben haben:
 -----------------
-Referal-Ebene (translateComma=$content[percents]%}%): $content[level]
+Referal-Ebene (translateComma=$content[percents]%}&#37;): $content[level]
 {?POINTS?}: {%pipe,translateComma=$content[points]%}
 ID des Mitgliedes: {%user,refid,bigintval=$userid%}
 -----------------
index 9217303..821fcba 100644 (file)
@@ -1,11 +1,11 @@
 Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
-Das Mitglied $content[refid] hat Ihnen soeben {%pipe,translateComma=$content[percents]%}% Ref-Back eingestellt. Sie erhalten also anteilig {?POINTS?} von seinen Referal-Gutschriften die Sie ihm/ihr bringen ebenfalls gutgeschrieben.
+Das Mitglied $content[refid] hat Ihnen soeben {%pipe,translateComma=$content[percents]%}&#37; Ref-Back eingestellt. Sie erhalten also anteilig {?POINTS?} von seinen Referal-Gutschriften die Sie ihm/ihr bringen ebenfalls gutgeschrieben.
 
 ------------------------------
 Ihr Mitglieder-Id ist: $userid
 ------------------------------
-Ref-Back: {%pipe,translateComma=$content[percents]%}%
+Ref-Back: {%pipe,translateComma=$content[percents]%}&#37;
 ------------------------------
 
 Sie haben bereits {%pipe,translateComma=$content[points]%} {?POINTS?} Ref-Back-Verg&uuml;tung an das Mitglied abgegeben.
index 6b07e06..955f180 100644 (file)
@@ -32,7 +32,7 @@
                </td>
                <td width="100" class="table_footer">
                        <div align="right" style="padding-right: 2px">
-                               <strong>{%pipe,translateComma=$content[cache_perc]%}%</strong>
+                               <strong>{%pipe,translateComma=$content[cache_perc]%}&#37;</strong>
                        </div>
                </td>
        </tr>
index 1a4e5cf..30366a7 100644 (file)
@@ -5,7 +5,7 @@
 </tr>
 <tr>
        <td align="center" class="{%template,ColorSwitch%} bottom">
-               {%pipe,translateComma=$content[percents]%}% <span class="tiny">({--ID_SELECT--} $content[id])</span>
+               {%pipe,translateComma=$content[percents]%}&#37; <span class="tiny">({--ID_SELECT--} $content[id])</span>
                <input type="hidden" name="id[$content[id]]" value="1" />
        </td>
 </tr>
index 2f58126..7dab179 100644 (file)
                {%pipe,translateComma=$content[account_fee]%} {?POINTS?}
        </td>
        <td align="center" class="{%template,ColorSwitch%} bottom right">
-               {%pipe,translateComma=$content[interest_plus]%}%
+               {%pipe,translateComma=$content[interest_plus]%}&#37;
        </td>
        <td align="center" class="{%template,ColorSwitch%} bottom right">
-               {%pipe,translateComma=$content[interest_minus]%}%
+               {%pipe,translateComma=$content[interest_minus]%}&#37;
        </td>
        <td align="center" class="{%template,ColorSwitch%} bottom">
                {%pipe,translateComma=$content[package_active]%}
index 1c83d18..8dc4928 100644 (file)
@@ -24,7 +24,7 @@
                        <u>{--MEMBER_BEG_TOTAL--}:</u>
                </td>
                <td class="header_column bottom right">
-                       <u>$content[total] {?POINTS?}</u>
+                       <u>{%pipe,translateComma=$content[total]%} {?POINTS?}</u>
                </td>
                <td class="header_column bottom">
                        &nbsp;
index f11b2a4..4829552 100644 (file)
@@ -24,7 +24,7 @@
                        <u>{--ADMIN_TOTAL_MEMBER_BONUS--}:</u>&nbsp;
                </td>
                <td class="header_column bottom right">
-                       <u>$content[total] {?POINTS?}</u>
+                       <u>{%pipe,translateComma=$content[total]%} {?POINTS?}</u>
                </td>
                <td class="header_column bottom">&nbsp;</td>
        </tr>
index e9cf154..1f24f61 100644 (file)
@@ -6,6 +6,6 @@
                $content[level]
        </td>
        <td align="center" class="bottom {%template,ColorSwitch%}">
-               $content[percents]%
+               {%pipe,translateComma=$content[percents]%}&#37;
        </td>
 </tr>
index ecc921e..571662d 100644 (file)
@@ -36,7 +36,7 @@
 <tr>
        <td align="center" class="right {%template,ColorSwitch%} bottom">{%pipe,getTotalPoints,translateComma=$content[userid]%} {?POINTS?}</td>
        <td align="center" class="right {%template,ColorSwitch%} bottom">$content[emails_sent]</td>
-       <td align="center" class="right {%template,ColorSwitch%} bottom">{%pipe,translateComma=$content[rate]%}%</td>
+       <td align="center" class="right {%template,ColorSwitch%} bottom">{%pipe,translateComma=$content[rate]%}&#37;</td>
        <td align="center" class="right {%template,ColorSwitch%} bottom">{%pipe,translateComma=$content[locked]%} {?POINTS?}</td>
        <td align="center" class="{%template,ColorSwitch%} bottom">$content[refs]</td>
 </tr>
index 40651f5..85406aa 100644 (file)
@@ -7,8 +7,8 @@
                <td>
                        <select name="cat" size="1" class="form_select">
                                <option value="X" disabled="disabled">{--PLEASE_SELECT--}</option>
-                               <option value="0">{--ALL_MEMBERS--} ($content[all])</option>
-                               $content[options_lines]
+                               <option value="0">{--ALL_MEMBERS--} ({%pipe,getTotalReceivers,translateComma=$content[all]%})</option>
+                               {%pipe,generateCategoryOptionsList=$content[options_lines]%}
                        </select>
                </td>
        </tr>
index 4082e56..9710237 100644 (file)
                </td>
                <td align="center" class="top right">
                        {--CLICK_RATE--}:<br />
-                       <strong>{%pipe,translateComma=$content[click_rate]%}%</strong>
+                       <strong>{%pipe,translateComma=$content[click_rate]%}&#37;</strong>
                </td>
                <td align="center" class="top">
                        {--EMAILS_RECEIVED--}:<br />
index 85b98ab..058d47e 100644 (file)
@@ -65,7 +65,7 @@
                <br />
                $content[payout_time]<br />
                <br />
-               {--DOUBLER_POINTS_1--} <strong>{%config,translateComma=doubler_charge%}%</strong>
+               {--DOUBLER_POINTS_1--} <strong>{%config,translateComma=doubler_charge%}&#37;</strong>
                {--DOUBLER_POINTS_2--}<br />
                <br />
                {--DOUBLER_EXAMPLE_1--} <strong>500 {?POINTS?}</strong> &raquo;&raquo;
index b769c1f..d6f9f37 100644 (file)
@@ -14,7 +14,7 @@
                        <li>{--DOUBLER_USAGE_COUNTER--}</li>
                        <li>$content[payout_time]</li>
                        <li><strong>{--DOUBLER_FULL_PAYOUT--}</strong></li>
-                       <li>{--DOUBLER_POINTS_1--} <strong>{%config,translateComma=doubler_charge%}%</strong> {--DOUBLER_POINTS_2--}</li>
+                       <li>{--DOUBLER_POINTS_1--} <strong>{%config,translateComma=doubler_charge%}&#37;</strong> {--DOUBLER_POINTS_2--}</li>
                        <li>{--DOUBLER_EXAMPLE_1--} <strong>500 {?POINTS?}</strong> &raquo;&raquo; {--DOUBLER_EXAMPLE_2--} <strong>1000 {?POINTS?}</strong>{--DOUBLER_EXAMPLE_3--}</li>
                        <li>{--DOUBLER_REFERAL_1--}
                        <li>{--DOUBLER_REFERAL_2--}</li>
index 2edfb85..875990e 100644 (file)
@@ -8,7 +8,7 @@
        </div>
 
        <div>
-               <strong>Tipp:</strong> Nutzen Sie diesen zum Werben unseres {?mt_word2?}, um die <strong>{%config,translateComma=doubler_ref%}%</strong> Referal-Verg&uuml;tung zu erhalten!
+               <strong>Tipp:</strong> Nutzen Sie diesen zum Werben unseres {?mt_word2?}, um die <strong>{%config,translateComma=doubler_ref%}&#37;</strong> Referal-Verg&uuml;tung zu erhalten!
        </div>
 
        <div class="big">{--MEMBER_DOUBLER_ALREADY_PAYOUT--}:</div>
@@ -33,7 +33,7 @@
                        <li>{--DOUBLER_USAGE_COUNTER--}</li>
                        <li>$content[payout_time]</li>
                        <li><strong>{--DOUBLER_FULL_PAYOUT--}</strong></li>
-                       <li>{--DOUBLER_POINTS_1--} <strong>{%config,translateComma=doubler_charge%}%</strong> {--DOUBLER_POINTS_2--}</li>
+                       <li>{--DOUBLER_POINTS_1--} <strong>{%config,translateComma=doubler_charge%}&#37;</strong> {--DOUBLER_POINTS_2--}</li>
                        <li>{--DOUBLER_EXAMPLE_1--} <strong>500 {?POINTS?}</strong> &raquo;&raquo; {--DOUBLER_EXAMPLE_2--} <strong>1000 {?POINTS?}</strong>{--DOUBLER_EXAMPLE_3--}</li>
                        <li>{--DOUBLER_REFERAL_1--}</li>
                        <li>{--DOUBLER_REFERAL_2--}</li>
index 576e80a..8fb2a07 100644 (file)
@@ -20,7 +20,7 @@
        </tr>
        <tr>
                <td colspan="2" align="center">
-                       <span class="notice">{%message,MEMBER_HOLIDAY_MAX_DAYS,{?holiday_max?}%}</span>
+                       <span class="notice">{%message,MEMBER_HOLIDAY_MAX_DAYS,{?holiday_max?}&#37;}</span>
                </td>
        </tr>
        <tr>
index 01b5022..7d1fc9f 100644 (file)
@@ -3,7 +3,7 @@
 <div class="table dashed">
        <div align="center">
                {--MEMBER_POINTS_LEFT--}:
-               <strong>$content[total] {?POINTS?}</strong>
+               <strong>{%pipe,translateComma=$content[total]%} {?POINTS?}</strong>
        </div>
 
        <div align="center">
index c75032a..acd137b 100644 (file)
@@ -1,5 +1,5 @@
 <tr>
-       <td class="member_data">$content[level] {--REFERAL_LEVEL--} ({%pipe,translateComma=$content[percents]%}%)</td>
+       <td class="member_data">$content[level] {--REFERAL_LEVEL--} ({%pipe,translateComma=$content[percents]%}&#37;)</td>
        <td class="member_data">{%pipe,translateComma=$content[points]%} {?POINTS?}</td>
        <td class="member_data" align="center">{%pipe,translateComma=$content[counter]%}</td>
 </tr>
index 1642da7..d74239b 100644 (file)
@@ -6,7 +6,7 @@
                $content[level_refid]
        </td>
        <td align="center" class="{%template,ColorSwitch%} bottom right">
-               {%pipe,translateComma=$content[refback]%}%
+               {%pipe,translateComma=$content[refback]%}&#37;
        </td>
        <td align="center" class="{%template,ColorSwitch%} bottom right">
                {%pipe,translateComma=$content[points]%} {?POINTS?}
index b6c7248..f048643 100644 (file)
@@ -6,7 +6,7 @@
                $content[level_refid]
        </td>
        <td align="center" class="{%template,ColorSwitch%} bottom right">
-               {%pipe,translateComma=$content[refback]%}%
+               {%pipe,translateComma=$content[refback]%}&#37;
        </td>
        <td align="center" class="{%template,ColorSwitch%} bottom right">
                {%pipe,translateComma=$content[points]%} {?POINTS?}
index 1b1c557..671dcd1 100644 (file)
@@ -39,6 +39,6 @@
        </td>
        <td align="center" class="{%template,ColorSwitch%} top">
                {--MEMBER_EMAIL_PERCENT--}:<br />
-               <strong>{%pipe,translateComma=$content[percents]%}%</strong>
+               <strong>{%pipe,translateComma=$content[percents]%}&#37;</strong>
        </td>
 </tr>
index 2da45f7..5df1807 100644 (file)
@@ -29,7 +29,7 @@
                <strong>{%pipe,getMemberId,SURFBAR_GET_TOTAL_USER_URLS,translateComma%}</strong> URLs werden als
                Berechnungsgrundlage verwendet. Sie erhalten allerdings nur einen
                reduzierten Anteil von
-               <strong>{%config,translateComma=surfbar_dynamic_percent%}%</strong>.
+               <strong>{%config,translateComma=surfbar_dynamic_percent%}&#37;</strong>.
        </div>
 
        <div style="padding:5px">
index d8c78c4..61f542b 100644 (file)
@@ -28,7 +28,7 @@
                        $content[balance] ({?POINTS?}):&nbsp;
                </td>
                <td width="80" align="center" class="table_footer">
-                       <strong>$content[total]</strong>
+                       <strong>{%pipe,translateComma=$content[total]%}</strong>
                </td>
        </tr>
 </table>
index 923faaf..c187488 100644 (file)
@@ -12,6 +12,6 @@
     <div class="transfer_row4">$content[reason]</div>
   </td>
   <td class="transfer_row5 {%template,ColorSwitch%} bottom">
-    <div class="transfer_row5">$content[points]</div>
+    <div class="transfer_row5">{%pipe,translateComma=$content[points]%}</div>
   </td>
 </tr>
index ae7a706..6795fa1 100644 (file)
@@ -16,7 +16,7 @@
        </tr>
        <tr>
                <td height="35" align="right">{--MEMBER_WERNIS_WDS66_ID--}</td>
-               <td><input type="text" class="form_field" name="wernis_userid" size="6" maxlength="5" value="$content[wernis_userid]" /></td>
+               <td><input type="text" class="form_field" name="wernis_userid" size="6" maxlength="5" value="{%user,wernis_userid=$userid%}" /></td>
        </tr>
        <tr>
                <td height="35" align="right">{--MEMBER_WERNIS_WDS66_PASSWORD--}</td>
@@ -42,7 +42,7 @@
 <div class="notice">
        Die Umrechnung von {?POINTS?} in Wernis enspricht derzeit <strong>{%config,translateComma=wernis_payout_factor%}:1</strong>.
        Das auszahlungsf&auml;hige {?POINTS?}-Guthaben ist entweder um eine
-       prozentuale Geb&uuml;hr von <strong>{%config,translateComma=wernis_payout_fee_percent%}%</strong>
+       prozentuale Geb&uuml;hr von <strong>{%config,translateComma=wernis_payout_fee_percent%}&#37;</strong>
        oder um einen fixen Betrag von <strong>{%config,translateComma=wernis_payout_fee_fix%} {?POINTS?}</strong>
        bereits reduziert.
 </div>
index 11a816e..8c911f4 100644 (file)
@@ -16,7 +16,7 @@
        </tr>
        <tr>
                <td height="35" align="right">{--MEMBER_WERNIS_WDS66_ID--}</td>
-               <td><input type="text" class="form_field" name="wernis_userid" size="6" maxlength="5" value="$content[wernis_userid]" /></td>
+               <td><input type="text" class="form_field" name="wernis_userid" size="6" maxlength="5" value="{%user,wernis_userid=$userid%}" /></td>
        </tr>
        <tr>
                <td height="35" align="right">{--MEMBER_WERNIS_WDS66_PASSWORD--}</td>