From 17c1d13dde4b9725bb9dc55c49838ff9aa751dc0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 15 Jul 2011 11:40:05 +0000 Subject: [PATCH] Naming convention: 'cnt' is shortcutting 'count' --- inc/modules/admin/what-del_email.php | 8 ++++---- inc/modules/admin/what-list_beg.php | 2 +- inc/modules/admin/what-list_bonus.php | 2 +- inc/modules/admin/what-list_cats.php | 4 ++-- inc/modules/admin/what-list_rallyes.php | 2 +- .../html/admin/admin_delete_email_bonus.tpl | 2 +- .../html/admin/admin_delete_email_notify.tpl | 2 +- .../de/html/admin/admin_list_beg_rows.tpl | 20 ++++++++++++++----- .../de/html/admin/admin_list_bonus_rows.tpl | 2 +- .../html/admin/admin_list_rallye_usr_row.tpl | 2 +- .../de/html/admin/admin_list_rallyes_row2.tpl | 2 +- .../html/admin/admin_list_user_cats_row.tpl | 2 +- 12 files changed, 30 insertions(+), 20 deletions(-) diff --git a/inc/modules/admin/what-del_email.php b/inc/modules/admin/what-del_email.php index 2727c7173e..d78bcec4d0 100644 --- a/inc/modules/admin/what-del_email.php +++ b/inc/modules/admin/what-del_email.php @@ -182,8 +182,8 @@ LIMIT 1", $count += SQL_AFFECTEDROWS(); // Prepare data for the template - $content['timestamp'] = generateDateTime($content['timestamp'], 0); - $content['cnt'] = $count; + $content['timestamp'] = generateDateTime($content['timestamp'], '0'); + $content['count'] = $count; // Load template loadTemplate('admin_delete_email_bonus', false, $content); @@ -216,8 +216,8 @@ LIMIT 1", $count += SQL_AFFECTEDROWS(); // Prepare data for the template - $content['timestamp'] = generateDateTime($content['timestamp'], 0); - $content['cnt'] = $count; + $content['timestamp'] = generateDateTime($content['timestamp'], '0'); + $content['count'] = $count; // Load template loadTemplate('admin_delete_email_notify', false, $content); diff --git a/inc/modules/admin/what-list_beg.php b/inc/modules/admin/what-list_beg.php index 459ea16c3b..b109511d02 100644 --- a/inc/modules/admin/what-list_beg.php +++ b/inc/modules/admin/what-list_beg.php @@ -98,7 +98,7 @@ ORDER BY 'last_online' => generateDateTime($content['last_online'], 2), 'win1' => $WIN1, 'win2' => $WIN2, - 'cnt' => $count, + 'count' => $count, ); // Load template and add it diff --git a/inc/modules/admin/what-list_bonus.php b/inc/modules/admin/what-list_bonus.php index eb22173578..ab6f753a30 100644 --- a/inc/modules/admin/what-list_bonus.php +++ b/inc/modules/admin/what-list_bonus.php @@ -110,7 +110,7 @@ ORDER BY $content['last_online'] = generateDateTime($content['last_online'], 2); $content['win1'] = $WIN1; $content['win2'] = $WIN2; - $content['cnt'] = $count; + $content['count'] = $count; // Load template and add it $OUT .= loadTemplate('admin_list_bonus_rows', true, $content); diff --git a/inc/modules/admin/what-list_cats.php b/inc/modules/admin/what-list_cats.php index 73282a1564..fdf5a00c88 100644 --- a/inc/modules/admin/what-list_cats.php +++ b/inc/modules/admin/what-list_cats.php @@ -76,8 +76,8 @@ if (isGetRequestParameterSet('userid')) { } // END - if // Add more elements - $content['cnt'] = $count; - $content['sel'] = $selection; + $content['count'] = $count; + $content['sel'] = $selection; // Load row template and count up $OUT .= loadTemplate('admin_list_user_cats_row', true, $content); diff --git a/inc/modules/admin/what-list_rallyes.php b/inc/modules/admin/what-list_rallyes.php index ec3c17b554..ebaf99f974 100644 --- a/inc/modules/admin/what-list_rallyes.php +++ b/inc/modules/admin/what-list_rallyes.php @@ -264,7 +264,7 @@ ORDER BY 'bold_l' => $bl , 'bold_r' => $br , 'refs' => $row['refs'], - 'cnt' => $count, + 'count' => $count, 'opoints' => ($points - $row['curr_points']), ); diff --git a/templates/de/html/admin/admin_delete_email_bonus.tpl b/templates/de/html/admin/admin_delete_email_bonus.tpl index 8833f97185..d3b62a449a 100644 --- a/templates/de/html/admin/admin_delete_email_bonus.tpl +++ b/templates/de/html/admin/admin_delete_email_bonus.tpl @@ -19,7 +19,7 @@ {--ADMIN_TEST_URL--} $content[timestamp] - $content[cnt] + $content[count] diff --git a/templates/de/html/admin/admin_delete_email_notify.tpl b/templates/de/html/admin/admin_delete_email_notify.tpl index ed9871b72e..3ee8a12d57 100644 --- a/templates/de/html/admin/admin_delete_email_notify.tpl +++ b/templates/de/html/admin/admin_delete_email_notify.tpl @@ -17,7 +17,7 @@ $content[subject] {--ADMIN_TEST_URL--} $content[timestamp] - $content[cnt] + $content[count] diff --git a/templates/de/html/admin/admin_list_beg_rows.tpl b/templates/de/html/admin/admin_list_beg_rows.tpl index a6b1c0411d..692cb71020 100644 --- a/templates/de/html/admin/admin_list_beg_rows.tpl +++ b/templates/de/html/admin/admin_list_beg_rows.tpl @@ -1,7 +1,17 @@ - $content[win1]$content[cnt]$content[win2] - $content[win1]{%pipe,generateUserProfileLink=$content[userid]%}$content[win2] - $content[win1]{%pipe,translateGender=$content[gender]%} $content[surname] $content[family]$content[win2] - {%pipe,translateComma=$content[beg_points]%} {?POINTS?} - $content[last_online] + + $content[win1]$content[count]$content[win2] + + + $content[win1]{%pipe,generateUserProfileLink=$content[userid]%}$content[win2] + + + $content[win1]{%pipe,translateGender=$content[gender]%} $content[surname] $content[family]$content[win2] + + + {%pipe,translateComma=$content[beg_points]%} {?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 d64e165f42..ad3634603c 100644 --- a/templates/de/html/admin/admin_list_bonus_rows.tpl +++ b/templates/de/html/admin/admin_list_bonus_rows.tpl @@ -1,6 +1,6 @@ - $content[win1]$content[cnt]$content[win2] + $content[win1]$content[count]$content[win2] $content[win1]{%pipe,generateUserProfileLink=$content[userid]%}$content[win2] diff --git a/templates/de/html/admin/admin_list_rallye_usr_row.tpl b/templates/de/html/admin/admin_list_rallye_usr_row.tpl index 71951c5a82..9326d04eb5 100644 --- a/templates/de/html/admin/admin_list_rallye_usr_row.tpl +++ b/templates/de/html/admin/admin_list_rallye_usr_row.tpl @@ -6,7 +6,7 @@ $content[bold_l]$content[refs]$content[bold_r] - $content[bold_l]$content[cnt]$content[bold_r] + $content[bold_l]$content[count]$content[bold_r] $content[bold_l]{%pipe,translateComma=$content[opoints]%}$content[bold_r] diff --git a/templates/de/html/admin/admin_list_rallyes_row2.tpl b/templates/de/html/admin/admin_list_rallyes_row2.tpl index 555c1fb9c0..2f534bb56d 100644 --- a/templates/de/html/admin/admin_list_rallyes_row2.tpl +++ b/templates/de/html/admin/admin_list_rallyes_row2.tpl @@ -6,7 +6,7 @@ $content[bold_l]$content[old]$content[bold_r] - $content[bold_l]$content[cnt]$content[bold_r] + $content[bold_l]$content[count]$content[bold_r] $content[bold_l]$content[points]$content[bold_r] diff --git a/templates/de/html/admin/admin_list_user_cats_row.tpl b/templates/de/html/admin/admin_list_user_cats_row.tpl index 6f9a7cb40f..042ce58445 100644 --- a/templates/de/html/admin/admin_list_user_cats_row.tpl +++ b/templates/de/html/admin/admin_list_user_cats_row.tpl @@ -1,6 +1,6 @@ - $content[cnt]. + $content[count]. $content[cat] -- 2.39.5