SQL fixes, rewrites to make better use of EL

diff --git a/inc/modules/admin/what-email_details.php b/inc/modules/admin/what-email_details.php
index f65302b6b028158af81c88de9c636be0d6c61945..83150be3e37d825c1db78dc6b40cdc1825eaab14 100644 (file)
--- a/inc/modules/admin/what-email_details.php
+++ b/inc/modules/admin/what-email_details.php
@@ -101,7 +101,7 @@ $result_bonus = false;
 if ((isExtensionActive('bonus')) && (empty($WHO))) {
        // Check for maximum pages
        $result_bonus = SQL_QUERY("SELECT
-       `id`, `subject`, `text`, `receivers`, `points`, `time`, `data_type`, `timestamp`, `url`, `cat_id`, `target_send`, `mails_sent`, `clicks`
+       `id`, `subject`, `text`, `receivers`, `points`, `time`, `data_type`, `timestamp`, `url`, `cat_id`, `target_send`, `mails_sent`, `clicks`,
        (`mails_sent` - `clicks`) AS `unconfirmed`
 FROM
        `{?_MYSQL_PREFIX?}_bonus`

diff --git a/inc/modules/member/what-points.php b/inc/modules/member/what-points.php
index 32200ad60710b3e80d736768fae3a6092f8c64df..1b6db929f0880570d88f17e881c788da1801d077 100644 (file)
--- a/inc/modules/member/what-points.php
+++ b/inc/modules/member/what-points.php
@@ -125,25 +125,6 @@ SQL_FREERESULT($result_depths);
 // Put rows to constant for the main template
 $content['rows'] = $OUT;
 
-// Initialize variables
-$content['confirmed'] = '---';
-$content['sent']      = '---';
-$content['receive']   = '---';
-
-// Only user >= v0.1.2: Fetch confirmed mails counter
-if (isExtensionInstalledAndNewer('user', '0.1.2')) {
-       $add = '';
-       $content['confirmed'] = getUserData('mails_confirmed');
-
-       if (isExtensionInstalledAndNewer('user', '0.1.4')) {
-               $content['sent']    = getUserData('emails_sent');
-               $content['receive'] = getUserData('emails_received');
-       } // END - if
-} // END - if
-
-// If TLOCK is 0 add 3 zeros for floating
-if ($content['total_locked'] == '0') $content['total_locked'] = '0.00000';
-
 // Remember several values in constants
 $content['total_points']  = ($content['total_points'] - getUserData('used_points'));
 

diff --git a/templates/de/html/admin/admin_email_archiv_row.tpl b/templates/de/html/admin/admin_email_archiv_row.tpl
index a001ddb298bca28efd353809a1271f3a1c005b03..962b67230e721fed43b5a2e8634e557cc0569611 100644 (file)
--- a/templates/de/html/admin/admin_email_archiv_row.tpl
+++ b/templates/de/html/admin/admin_email_archiv_row.tpl
@@ -25,7 +25,7 @@
 <tr>
        <td align="center" class="{%template,ColorSwitch%} bottom right">
                {--EMAIL_RECEIVERS--}:<br />
-               <strong class="admin_misc">$content[sent]</strong> ({--EMAIL_RUIDS--}:
+               <strong class="admin_misc">{%pipe,translateComma=$content[target_send]%}</strong> ({--EMAIL_RUIDS--}:
                <strong class="admin_misc">{%pipe,convertReceivers=$content[receivers]%}</strong>)
        </td>
        <td align="center" class="{%template,ColorSwitch%} bottom right">

diff --git a/templates/de/html/member/member_points.tpl b/templates/de/html/member/member_points.tpl
index bee1864414572a7caff3dff6773556079597124a..7fc5f08ad518fd6aef70557623a8e49b33b131fe 100644 (file)
--- a/templates/de/html/member/member_points.tpl
+++ b/templates/de/html/member/member_points.tpl
@@ -31,7 +31,7 @@
        </tr>
        <tr>
                <td class="member_data">{--RECEIVED_MAILS--}:</td>
-               <td class="member_data">{%pipe,translateComma=$content[receive]%}</td>
+               <td class="member_data">{%user,emails_received,translateComma%}</td>
                <td class="member_data">-</td>
        </tr>
        <tr>
@@ -41,12 +41,12 @@
        </tr>
        <tr>
                <td class="member_data">{--CONFIRMED_MAILS--}:</td>
-               <td class="member_data">{%pipe,translateComma=$content[confirmed]%}</td>
+               <td class="member_data">{%user,mails_confirmed,translateComma%}</td>
                <td class="member_data">-</td>
        </tr>
        <tr>
                <td class="member_data">{--SENT_MAILS--}:</td>
-               <td class="member_data">{%pipe,translateComma=$content[sent]%}</td>
+               <td class="member_data">{%user,emails_sent,translateComma%}</td>
                <td class="member_data">-</td>
        </tr>
 </table>