Some rewrites

diff --git a/inc/modules/admin/what-list_beg.php b/inc/modules/admin/what-list_beg.php
index 051cb49c62e3653f19686f972adb15e6ae746f1c..b3d19ef974405dd29b3e2aa5198f859c9e5a89a5 100644 (file)
--- a/inc/modules/admin/what-list_beg.php
+++ b/inc/modules/admin/what-list_beg.php
@@ -75,27 +75,27 @@ ORDER BY beg_points DESC, last_online DESC, userid",
                while ($content = SQL_FETCHARRAY($result)) {
                        // Init variables
                        $WIN1 = ''; $WIN2 = '';
                while ($content = SQL_FETCHARRAY($result)) {
                        // Init variables
                        $WIN1 = ''; $WIN2 = '';

+
+                       // Maybe he can win his active beg?

                        if ($cnt <= getConfig('beg_ranks')) {
                        if ($cnt <= getConfig('beg_ranks')) {

-                               // Maybe he can win his active beg?
-                               $WIN1 = "<strong>";
-                               $WIN2 = "</strong>";
+                               // Mark him
+                               $WIN1 = '<strong>';
+                               $WIN2 = '</strong>';

                        } // END - if
 
                        // Prepare content
                        } // END - if
 
                        // Prepare content

-                       // @TODO Rewrite templates so s/family will be replaced by surname/family
-                       // @TODO to shorten this block. Please also do so with userid->userid

                        $content = array(
                        $content = array(

-                               'userid'    => $content['userid'],
-                               'email'  => generateEmailLink($content['email'], 'user_data'),
-                               'gender' => translateGender($content['gender']),
-                               'surname'  => $content['surname'],
-                               'family'  => $content['family'],
-                               'turbo'  => translateComma($content['beg_points']),
-                               'last_online'   => generateDateTime($content['last_online'], 2),
-                               'sw'     => $SW,
-                               'win1'   => $WIN1,
-                               'win2'   => $WIN2,
-                               'cnt'    => $cnt,
+                               'userid'      => $content['userid'],
+                               'email'       => generateEmailLink($content['email'], 'user_data'),
+                               'gender'      => translateGender($content['gender']),
+                               'surname'     => $content['surname'],
+                               'family'      => $content['family'],
+                               'turbo'       => translateComma($content['beg_points']),
+                               'last_online' => generateDateTime($content['last_online'], 2),
+                               'sw'          => $SW,
+                               'win1'        => $WIN1,
+                               'win2'        => $WIN2,
+                               'cnt'         => $cnt,

                        );
 
                        // Load template and add it
                        );
 
                        // Load template and add it

diff --git a/inc/modules/admin/what-list_rallyes.php b/inc/modules/admin/what-list_rallyes.php
index 1ddccd1cac9dd9c42f6a889a211099d6085e49ca..9469dcc38fb5f8822ecdd6a43087e77930580dfa 100644 (file)
--- a/inc/modules/admin/what-list_rallyes.php
+++ b/inc/modules/admin/what-list_rallyes.php
@@ -327,7 +327,7 @@ ORDER BY
                        $row = array(
                                'select'     => "<input type=\"checkbox\" name=\"sel[".$data['id']."]\" class=\"admin_normal\" value=\"1\" />",
                                'admin_id'   => $data['admin_id'],
                        $row = array(
                                'select'     => "<input type=\"checkbox\" name=\"sel[".$data['id']."]\" class=\"admin_normal\" value=\"1\" />",
                                'admin_id'   => $data['admin_id'],

-                               'email_link' => generateEmailLink($data['admin_id']),
+                               'admin_link' => generateAdminLink($data['admin_id']),

                                'login'      => $data['login'],
                                'id'         => $data['id'],
                                'sw'         => $SW,
                                'login'      => $data['login'],
                                'id'         => $data['id'],
                                'sw'         => $SW,

diff --git a/templates/de/html/admin/admin_list_rallyes_row.tpl b/templates/de/html/admin/admin_list_rallyes_row.tpl
index 29b49bebab9c8a928c1f7bb037289537b1780ddd..c633998d7d9c8c41e3a220a03ed5d8c2e3a71a1f 100644 (file)
--- a/templates/de/html/admin/admin_list_rallyes_row.tpl
+++ b/templates/de/html/admin/admin_list_rallyes_row.tpl
@@ -1,54 +1,70 @@
 <tr>
 <tr>

-       <td align="center" class="switch_sw$content[sw] bottom2 right2"
-               rowspan="5">$content[select]</td>
-       <td align="center" class="switch_sw$content[sw] bottom2 right2"><strong>{--RALLYE_TITLE--}:</strong><br />
-       $content[title]</td>
-       <td align="center" class="switch_sw$content[sw] bottom2 right2"><strong>{--RALLYE_DESCR2--}:</strong><br />
-       $content[descr]</td>
-       <td align="center" class="switch_sw$content[sw] bottom2 right2"><strong>{--RALLYE_ADMIN_ID--}:</strong><br />
-       <a href="$content[email_link]">$content[login]</a></td>
-       <td align="center" class="switch_sw$content[sw] bottom2 right2"><strong>{--RALLYE_TSTART--}:</strong><br />
-       $content[start_date]</td>
-       <td align="center" class="switch_sw$content[sw] bottom2"><strong>{--RALLYE_TEND--}:</strong><br />
-       $content[end_date]</td>
+       <td align="center" class="switch_sw$content[sw] bottom2 right2" rowspan="5">$content[select]</td>
+       <td align="center" class="switch_sw$content[sw] bottom2 right2">
+               <strong>{--RALLYE_TITLE--}:</strong><br />
+               $content[title]
+       </td>
+       <td align="center" class="switch_sw$content[sw] bottom2 right2">
+               <strong>{--RALLYE_DESCR2--}:</strong><br />
+               $content[descr]
+       </td>
+       <td align="center" class="switch_sw$content[sw] bottom2 right2">
+               <strong>{--RALLYE_ADMIN_ID--}:</strong><br />
+               $content[admin_link]
+       </td>
+       <td align="center" class="switch_sw$content[sw] bottom2 right2">
+               <strong>{--RALLYE_TSTART--}:</strong><br />
+               $content[start_date]
+       </td>
+       <td align="center" class="switch_sw$content[sw] bottom2">
+               <strong>{--RALLYE_TEND--}:</strong><br />
+               $content[end_date]
+       </td>

 </tr>
 <tr>
 </tr>
 <tr>

-       <td align="center" class="switch_sw$content[sw] bottom2 right2"><strong>{--RALLYE_TEMPLATE2--}:</strong><br />
-       $content[template]</td>
-       <td align="center" class="switch_sw$content[sw] bottom2 right2"><strong>{--RALLYE_AUTO_ADD--}:</strong><br />
-       <a
-               href="{?URL?}/modules.php?module=admin&amp;what=list_rallyes&amp;rallye=$content[id]&amp;auto=$content[auto]"
-               title="$content[auto_title]">$content[auto_lnk]</a></td>
-       <td align="center" class="switch_sw$content[sw] bottom2 right2"><strong>{--RALLYE_ACTIVE--}:</strong><br />
-       <a
-               href="{?URL?}/modules.php?module=admin&amp;what=list_rallyes&amp;rallye=$content[id]&amp;activate=$content[active]"
-               title="$content[active_title]">$content[active_lnk]</a></td>
-       <td align="center" class="switch_sw$content[sw] bottom2 right2"><strong>{--RALLYE_NOTIFY--}:</strong><br />
-       <a
-               href="{?URL?}/modules.php?module=admin&amp;what=list_rallyes&amp;rallye=$content[id]&amp;notify=$content[notify]"
-               title="$content[notify_title]">$content[notify_lnk]</a></td>
-       <td align="center" class="switch_sw$content[sw] bottom2"><strong>{--RALLYE_NOTIFIED--}:</strong><br />
-       $content[notified]</td>
+       <td align="center" class="switch_sw$content[sw] bottom2 right2">
+               <strong>{--RALLYE_TEMPLATE2--}:</strong><br />
+               $content[template]
+       </td>
+       <td align="center" class="switch_sw$content[sw] bottom2 right2">
+               <strong>{--RALLYE_AUTO_ADD--}:</strong><br />
+               <a href="{?URL?}/modules.php?module=admin&amp;what=list_rallyes&amp;rallye=$content[id]&amp;auto=$content[auto]" title="$content[auto_title]">$content[auto_lnk]</a>
+       </td>
+       <td align="center" class="switch_sw$content[sw] bottom2 right2">
+               <strong>{--RALLYE_ACTIVE--}:</strong><br />
+               <a href="{?URL?}/modules.php?module=admin&amp;what=list_rallyes&amp;rallye=$content[id]&amp;activate=$content[active]" title="$content[active_title]">$content[active_lnk]</a>
+       </td>
+       <td align="center" class="switch_sw$content[sw] bottom2 right2">
+               <strong>{--RALLYE_NOTIFY--}:</strong><br />
+               <a ref="{?URL?}/modules.php?module=admin&amp;what=list_rallyes&amp;rallye=$content[id]&amp;notify=$content[notify]" title="$content[notify_title]">$content[notify_lnk]</a>
+       </td>
+       <td align="center" class="switch_sw$content[sw] bottom2">
+               <strong>{--RALLYE_NOTIFIED--}:</strong><br />
+               $content[notified]
+       </td>

 </tr>
 <tr>
 </tr>
 <tr>

-       <td align="center" class="switch_sw$content[sw] bottom2 right2"
-               colspan="3"><strong>{--RALLYE_ASSIGNED_PRICES--}:</strong><br />
-       <a
-               href="{?URL?}/modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye=$content[id]">$content[prices_cnt]</a>
+       <td align="center" class="switch_sw$content[sw] bottom2 right2" colspan="3">
+               <strong>{--RALLYE_ASSIGNED_PRICES--}:</strong><br />
+               <a href="{?URL?}/modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye=$content[id]">$content[prices_cnt]</a>

        </td>
        <td align="center" class="switch_sw$content[sw] bottom2" colspan="2">
        </td>
        <td align="center" class="switch_sw$content[sw] bottom2" colspan="2">

-       <strong>{--RALLYE_ASSIGNED_USERS--}:</strong><br />
-       $content[joined]</td>
+               <strong>{--RALLYE_ASSIGNED_USERS--}:</strong><br />
+               $content[joined]
+       </td>

 </tr>
 <tr>
        <td align="center" class="admin_title bottom2" colspan="5" height="35">
 </tr>
 <tr>
        <td align="center" class="admin_title bottom2" colspan="5" height="35">

-       <strong>{--RALLYE_LIMITATIONS--}:</strong></td>
+               <strong>{--RALLYE_LIMITATIONS--}:</strong>
+       </td>

 </tr>
 <tr>
 </tr>
 <tr>

-       <td align="center" class="switch_sw$content[sw] bottom2 right2"
-               colspan="3"><strong>{--RALLYE_MIN_USERS_MINI--}:</strong><br />
-       $content[min_users]</td>
+       <td align="center" class="switch_sw$content[sw] bottom2 right2" colspan="3">
+               <strong>{--RALLYE_MIN_USERS_MINI--}:</strong><br />
+               $content[min_users]
+       </td>

        <td align="center" class="switch_sw$content[sw] bottom2" colspan="2">
        <td align="center" class="switch_sw$content[sw] bottom2" colspan="2">

-       <strong>{--RALLYE_MIN_PRICES_MINI--}:</strong><br />
-       $content[min_prices]</td>
+               <strong>{--RALLYE_MIN_PRICES_MINI--}:</strong><br />
+               $content[min_prices]
+       </td>

 </tr>
 </tr>