Naming convention: 'cnt' is shortcutting 'count'

diff --git a/inc/modules/admin/what-del_email.php b/inc/modules/admin/what-del_email.php
index 2727c7173e7b01fe04dbd987c5e0ecdad63386cf..d78bcec4d06d8e7dd7d0262321d11eb6ee31cda8 100644 (file)
--- 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 459ea16c3bb665db23eccef1eea5cacb46a0e7a8..b109511d02c8b0acb972af91c03b95ad5be904cc 100644 (file)
--- 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 eb221735788497a5f6da867b016dc99c17a120ad..ab6f753a30538dc3055a6088c942bbe3e5b2188c 100644 (file)
--- 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 73282a156468fcd838905735dc1185a511d636de..fdf5a00c888249d41743b6ec912ee4129a242d97 100644 (file)
--- 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 ec3c17b554ff59b586c2c74cdcd2b17904577389..ebaf99f9741518a9536050f43a40be6ddb0d3eb3 100644 (file)
--- 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 8833f9718554ef51e49c6978675bd9569fbfb7bd..d3b62a449adf2817e1130f5e4382c51ea333c1dd 100644 (file)
--- a/templates/de/html/admin/admin_delete_email_bonus.tpl
+++ b/templates/de/html/admin/admin_delete_email_bonus.tpl
@@ -19,7 +19,7 @@
                        <a href="{%pipe,generateDerefererUrl=$content[url]%}" target="_blank">{--ADMIN_TEST_URL--}</a>
                </td>
                <td class="right" align="center">$content[timestamp]</td>
-               <td align="center">$content[cnt]</td>
+               <td align="center">$content[count]</td>
        </tr>
 </table>
 </div>

diff --git a/templates/de/html/admin/admin_delete_email_notify.tpl b/templates/de/html/admin/admin_delete_email_notify.tpl
index ed9871b72efe6ae931715f1a55e4efeaecc9c82a..3ee8a12d577c3f2dab3a8e120a29ede339b2e052 100644 (file)
--- a/templates/de/html/admin/admin_delete_email_notify.tpl
+++ b/templates/de/html/admin/admin_delete_email_notify.tpl
@@ -17,7 +17,7 @@
                <td class="right" align="center">$content[subject]</td>
                <td class="right" align="center"><a href="{%pipe,generateDerefererUrl=$content[url]%}" target="_blank">{--ADMIN_TEST_URL--}</a></td>
                <td class="right" align="center">$content[timestamp]</td>
-               <td align="center">$content[cnt]</td>
+               <td align="center">$content[count]</td>
        </tr>
 </table>
 </div>

diff --git a/templates/de/html/admin/admin_list_beg_rows.tpl b/templates/de/html/admin/admin_list_beg_rows.tpl
index a6b1c0411dc0ed13f72beec2e3fd03e580d2a827..692cb710200dd10195c1537b664afc5e90b21a57 100644 (file)
--- a/templates/de/html/admin/admin_list_beg_rows.tpl
+++ b/templates/de/html/admin/admin_list_beg_rows.tpl
@@ -1,7 +1,17 @@
 <tr>
-       <td class="{%template,ColorSwitch%} bottom right" align="center">$content[win1]$content[cnt]$content[win2]</td>
-       <td class="{%template,ColorSwitch%} bottom right" align="center">$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]</td>
-       <td class="{%template,ColorSwitch%} bottom right">{%pipe,translateComma=$content[beg_points]%} {?POINTS?}</td>
-       <td class="{%template,ColorSwitch%} bottom">$content[last_online]</td>
+       <td class="{%template,ColorSwitch%} bottom right" align="center">
+               $content[win1]$content[count]$content[win2]
+       </td>
+       <td class="{%template,ColorSwitch%} bottom right" align="center">
+               $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]
+       </td>
+       <td class="{%template,ColorSwitch%} bottom right">
+               {%pipe,translateComma=$content[beg_points]%} {?POINTS?}
+       </td>
+       <td class="{%template,ColorSwitch%} bottom">
+               $content[last_online]
+       </td>
 </tr>

diff --git a/templates/de/html/admin/admin_list_bonus_rows.tpl b/templates/de/html/admin/admin_list_bonus_rows.tpl
index d64e165f42d6fd7b5e8ed397cbaf6011e74ce6e2..ad3634603c4a70b301f915ede68353f6fb6f3aad 100644 (file)
--- a/templates/de/html/admin/admin_list_bonus_rows.tpl
+++ b/templates/de/html/admin/admin_list_bonus_rows.tpl
@@ -1,6 +1,6 @@
 <tr>
        <td class="{%template,ColorSwitch%} bottom right" align="center">
-               $content[win1]$content[cnt]$content[win2]
+               $content[win1]$content[count]$content[win2]
        </td>
        <td class="{%template,ColorSwitch%} bottom right" align="center">
                $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 71951c5a821111d24aeb90227986302d2c4b74dd..9326d04eb51f183fa2bdbb98d7f250bfa135160d 100644 (file)
--- 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]
        </td>
        <td align="center" class="{%template,ColorSwitch%} bottom right">
-               $content[bold_l]$content[cnt]$content[bold_r]
+               $content[bold_l]$content[count]$content[bold_r]
        </td>
        <td align="center" class="{%template,ColorSwitch%} bottom">
                $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 555c1fb9c073a37c20f209fb7d49b3c57d1b7e8a..2f534bb56d278d0d6114edfbcbd0aea671011a97 100644 (file)
--- 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]
        </td>
        <td align="center" class="{%template,ColorSwitch%} bottom right">
-               $content[bold_l]$content[cnt]$content[bold_r]
+               $content[bold_l]$content[count]$content[bold_r]
        </td>
        <td align="center" class="{%template,ColorSwitch%} bottom">
                $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 6f9a7cb40f8eb63b9bb4cf1f4d1e6b7feb08f9d5..042ce584451229aca4b6dd6a2e42d10cb1681403 100644 (file)
--- 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 @@
 <tr>
        <td class="bottom {%template,ColorSwitch%}" width="30" align="right">
-               $content[cnt].
+               $content[count].
        </td>
        <td class="bottom {%template,ColorSwitch%}">
                $content[cat]