From 2e468b3c7df35a8e5f57c82e94aea3ce481de099 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 29 Jul 2011 01:43:24 +0000 Subject: [PATCH] More EL code --- inc/modules/admin/what-list_beg.php | 14 +++++++------- inc/modules/admin/what-list_bonus.php | 3 --- templates/de/html/admin/admin_contct_user_form.tpl | 2 +- templates/de/html/admin/admin_edit_user.tpl | 4 ++-- .../de/html/admin/admin_list_autopurge_row.tpl | 6 +++--- templates/de/html/admin/admin_list_beg_rows.tpl | 4 ++-- templates/de/html/admin/admin_list_bonus_rows.tpl | 2 +- templates/de/html/admin/admin_list_holiday_row.tpl | 2 +- templates/de/html/admin/admin_list_refs_row.tpl | 4 ++-- .../de/html/admin/admin_list_unconfirmed_row.tpl | 2 +- templates/de/html/member/member_list_beg_row.tpl | 2 +- .../de/html/member/member_list_referal_row.tpl | 2 +- 12 files changed, 22 insertions(+), 25 deletions(-) diff --git a/inc/modules/admin/what-list_beg.php b/inc/modules/admin/what-list_beg.php index b8b5d4b9f4..f3dae48c99 100644 --- 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 9f339426f8..b692cba7b3 100644 --- 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 6ff39698b2..882a375411 100644 --- a/templates/de/html/admin/admin_contct_user_form.tpl +++ b/templates/de/html/admin/admin_contct_user_form.tpl @@ -3,7 +3,7 @@ {--ADMIN_CONTACT_USER--}:
- $content[surname] $content[family] <$content[email]> + {%user,surname=$content[userid]%} {%user,family=$content[userid]%} <$content[email]> diff --git a/templates/de/html/admin/admin_edit_user.tpl b/templates/de/html/admin/admin_edit_user.tpl index 60d0a12ae8..a3ac1df796 100644 --- a/templates/de/html/admin/admin_edit_user.tpl +++ b/templates/de/html/admin/admin_edit_user.tpl @@ -15,13 +15,13 @@ {--SURNAME--}: - + {--FAMILY--}: - + diff --git a/templates/de/html/admin/admin_list_autopurge_row.tpl b/templates/de/html/admin/admin_list_autopurge_row.tpl index 58164702a8..62a3ebc227 100644 --- a/templates/de/html/admin/admin_list_autopurge_row.tpl +++ b/templates/de/html/admin/admin_list_autopurge_row.tpl @@ -1,8 +1,8 @@ {%pipe,generateUserProfileLink=$content[userid]%} - {%pipe,translateGender=$content[gender]%} - $content[surname] - $content[family] + {%user,gender,translateGender=$content[userid]%} + {%user,surname=$content[userid]%} + {%user,family=$content[userid]%} $content[email] $content[joined] $content[last_online] diff --git a/templates/de/html/admin/admin_list_beg_rows.tpl b/templates/de/html/admin/admin_list_beg_rows.tpl index 692cb71020..a69ec87bd5 100644 --- 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] - $content[win1]{%pipe,translateGender=$content[gender]%} $content[surname] $content[family]$content[win2] + $content[win1]{%user,gender,translateGender=$content[userid]%} {%user,surname=$content[userid]%} {%user,family=$content[userid]%}$content[win2] - {%pipe,translateComma=$content[beg_points]%} {?POINTS?} + {%user,beg_points,translateComma=$content[userid]%} {?POINTS?} $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 ad3634603c..25adb72ba7 100644 --- 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] - $content[win1]{%pipe,translateGender=$content[gender]%} $content[surname] $content[family]$content[win2] + $content[win1]{%user,gender,translateGender=$content[userid]%} {%user,surname=$content[userid]%} {%user,family=$content[userid]%}$content[win2] {%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 f2f2ccef01..2945811982 100644 --- a/templates/de/html/admin/admin_list_holiday_row.tpl +++ b/templates/de/html/admin/admin_list_holiday_row.tpl @@ -15,7 +15,7 @@ 
{%pipe,fixEmptyContentToDashes=$content[comments]%}
- {%pipe,translateUserStatus=$content[status]%} + {%user,status,translateUserStatus=$content[userid]%} $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 36fe1fa2e3..da67d45d53 100644 --- a/templates/de/html/admin/admin_list_refs_row.tpl +++ b/templates/de/html/admin/admin_list_refs_row.tpl @@ -1,8 +1,8 @@ {%pipe,generateUserProfileLink=$content[userid]%} $content[refs_link] - {%pipe,translateGender=$content[gender]%} $content[surname] $content[family] + {%user,gender,translateGender=$content[userid]%} {%user,surname=$content[userid]%} {%user,family=$content[userid]%} $content[email] - {%pipe,translateUserStatus=$content[status]%} + {%user,status,translateUserStatus=$content[userid]%} $content[registered] diff --git a/templates/de/html/admin/admin_list_unconfirmed_row.tpl b/templates/de/html/admin/admin_list_unconfirmed_row.tpl index 3d0dccf51a..bfa1b12465 100644 --- a/templates/de/html/admin/admin_list_unconfirmed_row.tpl +++ b/templates/de/html/admin/admin_list_unconfirmed_row.tpl @@ -4,5 +4,5 @@ {--CLICK_NOW--} $content[email] - {%pipe,translateUserStatus=$content[status]%} + {%user,status,translateUserStatus=$content[userid]%} diff --git a/templates/de/html/member/member_list_beg_row.tpl b/templates/de/html/member/member_list_beg_row.tpl index e2cc36a432..171e50ce48 100644 --- 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] - {%pipe,translateComma=$content[beg_points]%} + {%user,beg_points,translateComma=$content[userid]%} $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 ca2ba88be8..b825ffcf8d 100644 --- 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]%}) - {%pipe,translateUserStatus=$content[status]%} + {%user,status,translateUserStatus=$content[refid]%} {%pipe,getTotalPoints,translateComma=$content[refid]%} {?POINTS?} -- 2.39.5