More EL code

diff --git a/inc/modules/admin/what-list_beg.php b/inc/modules/admin/what-list_beg.php
index b8b5d4b9f4cbcb6b2d7d89754a7b55f9362a0479..f3dae48c9970474a21f9b5d54b8f503ec8bf00dd 100644 (file)
--- a/inc/modules/admin/what-list_beg.php
+++ b/inc/modules/admin/what-list_beg.php
@@ -63,7 +63,8 @@ if (isBegRallyeEnabled()) {
        } // END - if
 
        // Check if at least one is in the active rallye
-       $result = SQL_QUERY("SELECT `userid`,`gender`,`surname`,`family`,`email`,`beg_points`,`last_online`
+       $result = SQL_QUERY("SELECT
+       `userid`,`email`,`beg_points`,`last_online`
 FROM
        `{?_MYSQL_PREFIX?}_user_data`
 WHERE
@@ -90,20 +91,19 @@ ORDER BY
                        } // END - if
 
                        // Prepare content
-                       $content = array(
+                       $row = array(
                                'userid'      => $content['userid'],
                                'email'       => generateEmailLink($content['email'], 'user_data'),
-                               'gender'      => $content['gender'],
-                               'turbo'       => $content['beg_points'],
-                               'last_online' => generateDateTime($content['last_online'], 2),
+                               'last_online' => generateDateTime($content['last_online'], '2'),
                                'win1'        => $WIN1,
                                'win2'        => $WIN2,
                                'count'       => $count,
                        );
 
                        // Load template and add it
-                       $OUT .= loadTemplate('admin_list_beg_rows', true, $content);
-                       $count++; $total += $content['beg_points'];
+                       $OUT .= loadTemplate('admin_list_beg_rows', true, $row);
+                       $count++;
+                       $total += $content['beg_points'];
                } // END - while
 
                $content['rows']  = $OUT;

diff --git a/inc/modules/admin/what-list_bonus.php b/inc/modules/admin/what-list_bonus.php
index 9f339426f8a787832a3c4ccc8de1c20687181fa5..b692cba7b37e98335bcaa8ec909fbd43b67838e5 100644 (file)
--- a/inc/modules/admin/what-list_bonus.php
+++ b/inc/modules/admin/what-list_bonus.php
@@ -78,9 +78,6 @@ if (isBonusRallyeActive()) {
        $result = SQL_QUERY("SELECT
        `userid`,
        `email`,
-       `gender`,
-       `surname`,
-       `family`,
        " . $USE . " AS `points`,
        `last_online`
 FROM

diff --git a/templates/de/html/admin/admin_contct_user_form.tpl b/templates/de/html/admin/admin_contct_user_form.tpl
index 6ff39698b2b0bb12ece1afb63159276f8d8af894..882a37541126a0abe3c92076b40a97e9d7d98b61 100644 (file)
--- a/templates/de/html/admin/admin_contct_user_form.tpl
+++ b/templates/de/html/admin/admin_contct_user_form.tpl
@@ -3,7 +3,7 @@
        <tr>
                <td align="center" class="table_header bottom">
                        <strong>{--ADMIN_CONTACT_USER--}:<br />
-                       $content[surname] $content[family] &lt;<a href="mailto:$content[email]">$content[email]</a>&gt;</strong>
+                       {%user,surname=$content[userid]%} {%user,family=$content[userid]%} &lt;<a href="mailto:$content[email]">$content[email]</a>&gt;</strong>
                </td>
        </tr>
        <tr>

diff --git a/templates/de/html/admin/admin_edit_user.tpl b/templates/de/html/admin/admin_edit_user.tpl
index 60d0a12ae82317ccf094e31ff1ed7bdd5871a9ab..a3ac1df7965b5dc9e295ad404731b585f5f8cf06 100644 (file)
--- a/templates/de/html/admin/admin_edit_user.tpl
+++ b/templates/de/html/admin/admin_edit_user.tpl
@@ -15,13 +15,13 @@
        <tr>
                <td align="right">{--SURNAME--}:</td>
                <td>
-                       <input type="text" class="form_field" name="surname" size="15" maxlength="255" value="$content[surname]" />
+                       <input type="text" class="form_field" name="surname" size="15" maxlength="255" value="{%user,surname=$content[userid]%}" />
                </td>
        </tr>
        <tr>
                <td align="right">{--FAMILY--}:</td>
                <td>
-                       <input type="text" class="form_field" name="family" size="15" maxlength="255" value="$content[family]" />
+                       <input type="text" class="form_field" name="family" size="15" maxlength="255" value="{%user,family=$content[userid]%}" />
                </td>
        </tr>
        <tr>

diff --git a/templates/de/html/admin/admin_list_autopurge_row.tpl b/templates/de/html/admin/admin_list_autopurge_row.tpl
index 58164702a8f2718bf4ac18d2cf880bb6ac5faff5..62a3ebc227e381c0c4b67f5845e756c2399c33b6 100644 (file)
--- a/templates/de/html/admin/admin_list_autopurge_row.tpl
+++ b/templates/de/html/admin/admin_list_autopurge_row.tpl
@@ -1,8 +1,8 @@
 <tr>
        <td align="center" class="{%template,ColorSwitch%} bottom right">{%pipe,generateUserProfileLink=$content[userid]%}</td>
-       <td align="center" class="{%template,ColorSwitch%} bottom right">{%pipe,translateGender=$content[gender]%}</td>
-       <td align="center" class="{%template,ColorSwitch%} bottom right">$content[surname]</td>
-       <td align="center" class="{%template,ColorSwitch%} bottom right">$content[family]</td>
+       <td align="center" class="{%template,ColorSwitch%} bottom right">{%user,gender,translateGender=$content[userid]%}</td>
+       <td align="center" class="{%template,ColorSwitch%} bottom right">{%user,surname=$content[userid]%}</td>
+       <td align="center" class="{%template,ColorSwitch%} bottom right">{%user,family=$content[userid]%}</td>
        <td align="center" class="{%template,ColorSwitch%} bottom right">$content[email]</td>
        <td align="center" class="{%template,ColorSwitch%} bottom right">$content[joined]</td>
        <td align="center" class="{%template,ColorSwitch%} bottom right">$content[last_online]</td>

diff --git a/templates/de/html/admin/admin_list_beg_rows.tpl b/templates/de/html/admin/admin_list_beg_rows.tpl
index 692cb710200dd10195c1537b664afc5e90b21a57..a69ec87bd547d68244e666a50a7a0a540f96ea66 100644 (file)
--- a/templates/de/html/admin/admin_list_beg_rows.tpl
+++ b/templates/de/html/admin/admin_list_beg_rows.tpl
@@ -6,10 +6,10 @@
                $content[win1]{%pipe,generateUserProfileLink=$content[userid]%}$content[win2]
        </td>
        <td class="{%template,ColorSwitch%} bottom right">
-               $content[win1]<a href="$content[email]">{%pipe,translateGender=$content[gender]%} $content[surname] $content[family]</a>$content[win2]
+               $content[win1]<a href="$content[email]">{%user,gender,translateGender=$content[userid]%} {%user,surname=$content[userid]%} {%user,family=$content[userid]%}</a>$content[win2]
        </td>
        <td class="{%template,ColorSwitch%} bottom right">
-               {%pipe,translateComma=$content[beg_points]%} {?POINTS?}
+               {%user,beg_points,translateComma=$content[userid]%} {?POINTS?}
        </td>
        <td class="{%template,ColorSwitch%} bottom">
                $content[last_online]

diff --git a/templates/de/html/admin/admin_list_bonus_rows.tpl b/templates/de/html/admin/admin_list_bonus_rows.tpl
index ad3634603c4a70b301f915ede68353f6fb6f3aad..25adb72ba726b5ab1128081f312306af0eda6811 100644 (file)
--- a/templates/de/html/admin/admin_list_bonus_rows.tpl
+++ b/templates/de/html/admin/admin_list_bonus_rows.tpl
@@ -6,7 +6,7 @@
                $content[win1]{%pipe,generateUserProfileLink=$content[userid]%}$content[win2]
        </td>
        <td class="{%template,ColorSwitch%} bottom right">
-               $content[win1]<a href="$content[email]">{%pipe,translateGender=$content[gender]%} $content[surname] $content[family]</a>$content[win2]
+               $content[win1]<a href="$content[email]">{%user,gender,translateGender=$content[userid]%} {%user,surname=$content[userid]%} {%user,family=$content[userid]%}</a>$content[win2]
        </td>
        <td class="{%template,ColorSwitch%} bottom right">
                {%pipe,translateComma=$content[points]%} {?POINTS?}

diff --git a/templates/de/html/admin/admin_list_holiday_row.tpl b/templates/de/html/admin/admin_list_holiday_row.tpl
index f2f2ccef01fedeb1b4045c7d7bb69dcb73bf5b28..2945811982ee1bd3621ac74477a432e3bc8de1fc 100644 (file)
--- a/templates/de/html/admin/admin_list_holiday_row.tpl
+++ b/templates/de/html/admin/admin_list_holiday_row.tpl
@@ -15,7 +15,7 @@
                <pre>{%pipe,fixEmptyContentToDashes=$content[comments]%}</pre>
        </td>
        <td class="{%template,ColorSwitch%} bottom right" align="center">
-               {%pipe,translateUserStatus=$content[status]%}
+               {%user,status,translateUserStatus=$content[userid]%}
        </td>
        <td class="{%template,ColorSwitch%} bottom" align="center">
                $content[last_online]

diff --git a/templates/de/html/admin/admin_list_refs_row.tpl b/templates/de/html/admin/admin_list_refs_row.tpl
index 36fe1fa2e3d3326c316f261c45f1b540164064bd..da67d45d53c8ba8343021d2a19ca3fb19ee634be 100644 (file)
--- a/templates/de/html/admin/admin_list_refs_row.tpl
+++ b/templates/de/html/admin/admin_list_refs_row.tpl
@@ -1,8 +1,8 @@
 <tr>
        <td align="right" class="bottom right {%template,ColorSwitch%}" valign="top">{%pipe,generateUserProfileLink=$content[userid]%}</td>
        <td align="center" class="bottom right {%template,ColorSwitch%}">$content[refs_link]</td>
-       <td class="bottom right {%template,ColorSwitch%}">{%pipe,translateGender=$content[gender]%} $content[surname] $content[family]</td>
+       <td class="bottom right {%template,ColorSwitch%}">{%user,gender,translateGender=$content[userid]%} {%user,surname=$content[userid]%} {%user,family=$content[userid]%}</td>
        <td class="bottom right {%template,ColorSwitch%}">$content[email]</td>
-       <td align="center" class="bottom right {%template,ColorSwitch%}">{%pipe,translateUserStatus=$content[status]%}</td>
+       <td align="center" class="bottom right {%template,ColorSwitch%}">{%user,status,translateUserStatus=$content[userid]%}</td>
        <td class="bottom {%template,ColorSwitch%}">$content[registered]</td>
 </tr>

diff --git a/templates/de/html/admin/admin_list_unconfirmed_row.tpl b/templates/de/html/admin/admin_list_unconfirmed_row.tpl
index 3d0dccf51a250f5273a7199b417eae31b9e30c3d..bfa1b1246534ed88d8b9faf7ee3f09371b165884 100644 (file)
--- a/templates/de/html/admin/admin_list_unconfirmed_row.tpl
+++ b/templates/de/html/admin/admin_list_unconfirmed_row.tpl
@@ -4,5 +4,5 @@
                <a href="{%url=mailid.php?userid=$content[userid]&amp;$content[link]=$content[id]%}" target="_blank">{--CLICK_NOW--}</a>
        </td>
        <td class="{%template,ColorSwitch%} bottom right">$content[email]</td>
-       <td align="center" class="{%template,ColorSwitch%} bottom">{%pipe,translateUserStatus=$content[status]%}</td>
+       <td align="center" class="{%template,ColorSwitch%} bottom">{%user,status,translateUserStatus=$content[userid]%}</td>
 </tr>

diff --git a/templates/de/html/member/member_list_beg_row.tpl b/templates/de/html/member/member_list_beg_row.tpl
index e2cc36a4326400f92c31d2cde8fd30e55ef95131..171e50ce48ab4e0c31b641b118ef9029a2a16940 100644 (file)
--- a/templates/de/html/member/member_list_beg_row.tpl
+++ b/templates/de/html/member/member_list_beg_row.tpl
@@ -6,7 +6,7 @@
                $content[userid]
        </td>
        <td align="center" class="{%template,ColorSwitch%} bottom">
-               {%pipe,translateComma=$content[beg_points]%}
+               {%user,beg_points,translateComma=$content[userid]%}
        </td>
        <td align="center" class="{%template,ColorSwitch%} bottom">
                $content[last_online]

diff --git a/templates/de/html/member/member_list_referal_row.tpl b/templates/de/html/member/member_list_referal_row.tpl
index ca2ba88be8784458be62f1c97160fb00fec40fc3..b825ffcf8d22d38044734b49598f4850048f68f4 100644 (file)
--- a/templates/de/html/member/member_list_referal_row.tpl
+++ b/templates/de/html/member/member_list_referal_row.tpl
@@ -3,7 +3,7 @@
                $content[refid] ({%user,nickname,fixEmptyContentToDashes=$content[refid]%})
        </td>
        <td align="center" class="{%template,ColorSwitch%} bottom right">
-               {%pipe,translateUserStatus=$content[status]%}
+               {%user,status,translateUserStatus=$content[refid]%}
        </td>
        <td align="center" class="{%template,ColorSwitch%} bottom right">
                {%pipe,getTotalPoints,translateComma=$content[refid]%} {?POINTS?}