Fixed missed [sw] things in a lot templates, added more EL:

- Fixed a lot broken switch_swX in templates to make use of EL function
  {%template,ColorSwitch%}
- More usage of fixEmptyContentToDashes() e.g. for nicknames
- TODOs.txt updated

diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt
index 5953193f647ed7a7e47379756ef65339b43d44b7..c794be08b072f35c2724119a94a1e39d91e72f5d 100644 (file)
--- a/DOCS/TODOs.txt
+++ b/DOCS/TODOs.txt
@@ -49,8 +49,8 @@
 ./inc/functions.php:178:// @TODO Rewrite this to an extension 'smtp'
 ./inc/functions.php:2244:      // @TODO This is still very static, rewrite it somehow
 ./inc/install-functions.php:63:        // @TODO DEACTIVATED: changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', 'OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestParameter('omode'), 0);
-./inc/language/de.php:1141:// @TODO Rewrite these two constants
-./inc/language/de.php:1156:// @TODO Rewrite these three constants
+./inc/language/de.php:1143:// @TODO Rewrite these two constants
+./inc/language/de.php:1158:// @TODO Rewrite these three constants
 ./inc/language/de.php:309:     // @TODO Following two are unused?
 ./inc/language/de.php:836:// @TODO Are these constants longer used?
 ./inc/language-functions.php:234:      // @TODO These are all valid languages, again hard-coded
@@ -74,9 +74,9 @@
 ./inc/libs/register_functions.php:372: // @TODO Rewrite this to a filter
 ./inc/libs/register_functions.php:379: // @TODO Rewrite this whole if() block to addPointsThroughReferalSystem(). This will also make following if() block obsolete
 ./inc/libs/register_functions.php:380: // @TODO Wether the registration bonus should only be added to user directly or through referal system should be configurable
-./inc/libs/surfbar_functions.php:1534:         // @TODO This can be somehow rewritten
+./inc/libs/surfbar_functions.php:1540:         // @TODO This can be somehow rewritten
 ./inc/libs/surfbar_functions.php:712:// @TODO Can't we use our new expression language instead of this ugly code?
-./inc/libs/surfbar_functions.php:950:  // @TODO Invalid salt should be refused
+./inc/libs/surfbar_functions.php:953:  // @TODO Invalid salt should be refused
 ./inc/libs/task_functions.php:241:             // @TODO These can be rewritten to filter
 ./inc/libs/task_functions.php:53:// @TODO Move all extension-dependent queries into filters
 ./inc/libs/theme_functions.php:95:     // @TODO Can't this be rewritten to an API function?
@@ -185,13 +185,13 @@
 ./inc/reset/reset_beg.php:51:// @TODO This should be converted in a daily beg rallye
 ./inc/reset/reset_birthday.php:91:                     // @TODO 4 is hard-coded here, should we move it out in config?
 ./inc/revision-functions.php:153:// @TODO Please describe this function
-./inc/template-functions.php:1155:     // @TODO This can be easily moved out after the merge from EL branch to this is complete
-./inc/template-functions.php:1188:             // @TODO Add a little more infos here
-./inc/template-functions.php:1473:// @TODO Lame description for this function
-./inc/template-functions.php:1492:                     // @TODO Move this in a filter
+./inc/template-functions.php:1153:     // @TODO This can be easily moved out after the merge from EL branch to this is complete
+./inc/template-functions.php:1186:             // @TODO Add a little more infos here
+./inc/template-functions.php:1474:// @TODO Lame description for this function
+./inc/template-functions.php:1493:                     // @TODO Move this in a filter
 ./inc/template-functions.php:280:      // @TODO Remove this sanity-check if all is fine
-./inc/template-functions.php:595:// @TODO $simple/$constants are deprecated
-./inc/template-functions.php:622:      // @TODO Do only use $content and deprecate $GLOBALS and $DATA in templates
+./inc/template-functions.php:593:// @TODO $simple/$constants are deprecated
+./inc/template-functions.php:620:      // @TODO Do only use $content and deprecate $GLOBALS and $DATA in templates
 ./inc/wrapper-functions.php:127:// @TODO Implement $compress
 ./inc/wrapper-functions.php:134:// @TODO Implement $decompress
 ./inc/wrapper-functions.php:455:// @TODO Do some more sanity check here
@@ -227,7 +227,6 @@
 ./templates/de/html/guest/guest_stats_member.tpl:21:   @TODO We have to fix these counters.
 ./templates/de/html/member/member_unconfirmed_table_nopoints.tpl:11:           <!-- @TODO Nothing to say here? //-->
 ./templates/de/html/surfbar/surfbar_frame_textlinks.tpl:5:             <!-- @TODO These are static lines and should be replaced by a filter (see ext-sponsor) //-->
-./templates/de/html/surfbar/surfbar_frame_top.tpl:32:// @TODO Try to rewrite this JavaScript to js.php?js=surfbar_frame_top (wouldn't be easy)
 ### ### DEPRECATION FOLLOWS: ### ###
 ./inc/modules/admin/admin-inc.php:439:// @DEPRECATED
 ### ### template-warnings.log follows: ### ###

diff --git a/inc/modules/admin/what-adminedit.php b/inc/modules/admin/what-adminedit.php
index b4eb53902fe8d191ccd8eac27443d15b6e4cc457..8e6b10bc6e62010fc5f06b9a34b0a81e11dadbef 100644 (file)
--- a/inc/modules/admin/what-adminedit.php
+++ b/inc/modules/admin/what-adminedit.php
@@ -231,7 +231,7 @@ WHERE ".$AND." AND `id`=%s LIMIT 1",
                $content['sub'] = $SUB;
 
                // Init variables
-               $OUT = ''; $SW  = 2; $cnt = '0';
+               $OUT = ''; $cnt = '0';
 
                // Process all entries
                while ($data = SQL_FETCHARRAY($result)) {
@@ -251,18 +251,11 @@ WHERE ".$AND." AND `id`=%s LIMIT 1",
                                $data['navi'] = '<a href="{%url=modules.php?module=admin&amp;what=adminedit&amp;sub=' . $content['sub'] . '&amp;act=' . $data['action'] . '&amp;w=' . $data['what'] . '&amp;tid=' . ($data['sort']-1) . '&amp;fid=' . $data['sort'] . '%}">{--HIGHER--}</a>/<a href="{%url=modules.php?module=admin&amp;what=adminedit&amp;sub=' . $content['sub'] . '&amp;act=' . $data['action'] . '&amp;w=' . $data['what'] . '&amp;tid=' . ($data['sort']+1) . '&amp;fid=' . $data['sort'] . '%}">{--LOWER--}</a>';
                        }
 
-                       // Fix empty elements for constant (fixes display bugs in Firefox)
-                       if (empty($data['action'])) $data['action'] = '&nbsp;';
-                       if (empty($data['what']))   $data['what']   = '&nbsp;';
-                       if (empty($data['title']))  $data['title']  = '&nbsp;';
-
                        // Add more data to $data
-                       $data['sw']   = $SW;
                        $data['mode'] = 'admin';
 
                        // Load row template and switch colors
                        $OUT .= loadTemplate('admin_menu_overview_row', true, $data);
-                       $SW = 3 - $SW;
                } // END - switch
 
                // Remember all rows

diff --git a/templates/de/emails/member/member_transfer_recipient.tpl b/templates/de/emails/member/member_transfer_recipient.tpl
index 2845e5d7edd20bfcd8a1627722da13e8539adf49..e2cddb8bd6049a326553c419a74c106fee771c86 100644 (file)
--- a/templates/de/emails/member/member_transfer_recipient.tpl
+++ b/templates/de/emails/member/member_transfer_recipient.tpl
@@ -8,7 +8,7 @@ Ihr Mitglieder-Id ist: $content[recipient][userid]
 ------------------------------
 --   Daten des Absenders:   --
 ------------------------------
-Mitglieder-Id: $content[sender][userid] ($content[sender][nickname])
+Mitglieder-Id: $content[sender][userid] ({%pipe,fixEmptyContentToDashes=$content[sender][nickname]%})
 ------------------------------
 Verwendungszweck: $content[reason]
 ------------------------------

diff --git a/templates/de/emails/member/member_transfer_sender.tpl b/templates/de/emails/member/member_transfer_sender.tpl
index 20c3c416410607aef1bb9a293e425107f7f228a0..51065f6719ed1cb29010a765d1d63b8bf208b3b3 100644 (file)
--- a/templates/de/emails/member/member_transfer_sender.tpl
+++ b/templates/de/emails/member/member_transfer_sender.tpl
@@ -8,7 +8,7 @@ Ihr Mitglieder-Id ist: $content[sender][userid]
 ------------------------------
 --  Daten des Empfaengers:  --
 ------------------------------
-Mitglieder-Id: $content[recipient][userid] ($content[recipient][nickname])
+Mitglieder-Id: $content[recipient][userid] ({%pipe,fixEmptyContentToDashes=$content[recipient][nickname]%})
 ------------------------------
 Verwendungszweck: $content[reason]
 ------------------------------

diff --git a/templates/de/html/admin/admin_menu_overview_row.tpl b/templates/de/html/admin/admin_menu_overview_row.tpl
index bb61dc0e46919ef5e5affbadad3dce8bf5df1bba..68e89c22fa33b43d852d59a30ea39d6c7b153238 100644 (file)
--- a/templates/de/html/admin/admin_menu_overview_row.tpl
+++ b/templates/de/html/admin/admin_menu_overview_row.tpl
@@ -3,15 +3,15 @@
                <input type="checkbox" class="admin_normal" title="{--ID_SELECT--} $content[id]" name="sel[$content[id]]" value="1" />
        </td>
        <td class="{%template,ColorSwitch%} bottom right" align="center">
-               <a href="{%url=modules.php?module=admin&amp;what=$content[mode]edit&amp;sub=$content[action]%}">$content[action]</a>
+               <a href="{%url=modules.php?module=admin&amp;what=$content[mode]edit&amp;sub=$content[action]%}">{%pipe,fixEmptyContentToDashes=$content[action]%}</a>
        </td>
        <td class="{%template,ColorSwitch%} bottom right" align="center">
-               $content[what]
+               {%pipe,fixEmptyContentToDashes=$content[what]%}
        </td>
        <td class="{%template,ColorSwitch%} bottom right">
-               &nbsp;&nbsp;$content[title]
+               {%pipe,fixEmptyContentToDashes=$content[title]%}
        </td>
        <td class="{%template,ColorSwitch%} bottom" align="center">
-               &nbsp;&nbsp;$content[navi]
+               $content[navi]
        </td>
 </tr>

diff --git a/templates/de/html/admin/admin_surfbar_stats_row.tpl b/templates/de/html/admin/admin_surfbar_stats_row.tpl
index 0e864ead93757b46abf84ae38da676c1b71879f1..726740a97dafe866a386962ffcb6ef151b4fe08b 100644 (file)
--- a/templates/de/html/admin/admin_surfbar_stats_row.tpl
+++ b/templates/de/html/admin/admin_surfbar_stats_row.tpl
@@ -1,5 +1,5 @@
 <tr>
-       <td align="center" class="switch_$content[sw] bottom right">{%pipe,generateUserProfileLink=$content[stats_userid]%}</td>
-       <td align="center" class="switch_$content[sw] bottom right">{%pipe,translateComma=$content[visited_urls]%}</td>
-       <td align="center" class="switch_$content[sw] bottom">{%pipe,translateComma=$content[total_visits]%}</td>
+       <td align="center" class="{%template,ColorSwitch%} bottom right">{%pipe,generateUserProfileLink=$content[stats_userid]%}</td>
+       <td align="center" class="{%template,ColorSwitch%} bottom right">{%pipe,translateComma=$content[visited_urls]%}</td>
+       <td align="center" class="{%template,ColorSwitch%} bottom">{%pipe,translateComma=$content[total_visits]%}</td>
 </tr>

diff --git a/templates/de/html/admin/admin_surfbar_url_stats_row.tpl b/templates/de/html/admin/admin_surfbar_url_stats_row.tpl
index dc54b15b2b3802cdeb51a7a23eed6996b5d30efe..9548a6346f30f7d876e8016b52905a4bcea362c6 100644 (file)
--- a/templates/de/html/admin/admin_surfbar_url_stats_row.tpl
+++ b/templates/de/html/admin/admin_surfbar_url_stats_row.tpl
@@ -1,5 +1,5 @@
 <tr>
-       <td align="center" class="switch_$content[sw] bottom right">[<strong>{%pipe,generateUserProfileLink=$content[url_userid]%}</strong>]</td>
-       <td align="center" class="switch_$content[sw] bottom right">{%pipe,translateComma=$content[total_visits]%}</td>
-       <td align="center" class="switch_$content[sw] bottom">$content[last_surfed]</td>
+       <td align="center" class="{%template,ColorSwitch%} bottom right">[<strong>{%pipe,generateUserProfileLink=$content[url_userid]%}</strong>]</td>
+       <td align="center" class="{%template,ColorSwitch%} bottom right">{%pipe,translateComma=$content[total_visits]%}</td>
+       <td align="center" class="{%template,ColorSwitch%} bottom">$content[last_surfed]</td>
 </tr>

diff --git a/templates/de/html/guest/guest_cat_row.tpl b/templates/de/html/guest/guest_cat_row.tpl
index 237493a3d8ad15aea00835ddb517ef93d1e25297..a3c1cf8b4f9e58a7e66d5af8a40c3e7b65fe526f 100644 (file)
--- a/templates/de/html/guest/guest_cat_row.tpl
+++ b/templates/de/html/guest/guest_cat_row.tpl
@@ -1,10 +1,10 @@
 <tr>
        <td class="register_right {%template,ColorSwitch%}">$content[cat]</td>
-       <td width="20" class="guest_normal switch_$content[sw]">
+       <td width="20" class="guest_normal {%template,ColorSwitch%}">
                {--YES--}
                <input type="radio" class="guest_normal" name="cat[$content[id]]" value="Y"$content[def_y] />
        </td>
-       <td width="20" class="guest_normal switch_$content[sw]">
+       <td width="20" class="guest_normal {%template,ColorSwitch%}">
                {--NO--}
                <input type="radio" class="guest_normal" name="cat[$content[id]]" value="N"$content[def_n] />
        </td>

diff --git a/templates/de/html/guest/guest_extensions_row.tpl b/templates/de/html/guest/guest_extensions_row.tpl
index 074c172dee2fb7031895d4ca907fa7e212304e4a..77dd256317396916a90391c52ce48a69c9ed954a 100644 (file)
--- a/templates/de/html/guest/guest_extensions_row.tpl
+++ b/templates/de/html/guest/guest_extensions_row.tpl
@@ -1,4 +1,4 @@
-<div class="bottom2 sw_$content[sw]">
+<div class="bottom2 {%template,ColorSwitch%}">
        <div class="bottom2">
                <strong>Erweiterung ext-$content[name]</strong>
        </div>

diff --git a/templates/de/html/member/member_bonus_turbo_row.tpl b/templates/de/html/member/member_bonus_turbo_row.tpl
index 90896422215fabd26696a641ad853e29b69d56ac..bab00e61f702c260b9ee1bf2154c8525826323fe 100644 (file)
--- a/templates/de/html/member/member_bonus_turbo_row.tpl
+++ b/templates/de/html/member/member_bonus_turbo_row.tpl
@@ -1,5 +1,5 @@
 <tr>
-  <td class="bonus_rank_$rows[rank] bottom switch_sw$rows[sw]">{%pipe,translateComma=$rows[rank]%}.</td>
-  <td class="bonus_rank_$rows[rank] bottom switch_sw$rows[sw]" align="center">$rows[userid]</td>
-  <td class="bonus_rank_$rows[rank] bottom switch_sw$rows[sw]" align="center">{%pipe,translateComma=$rows[points]%}</td>
+  <td class="bonus_rank_$content[rank] bottom {%template,ColorSwitch%}">{%pipe,translateComma=$content[rank]%}.</td>
+  <td class="bonus_rank_$content[rank] bottom {%template,ColorSwitch%}" align="center">$content[userid]</td>
+  <td class="bonus_rank_$content[rank] bottom {%template,ColorSwitch%}" align="center">{%pipe,translateComma=$content[points]%}</td>
 </tr>

diff --git a/templates/de/html/member/member_pool_row.tpl b/templates/de/html/member/member_pool_row.tpl
index 053c2ee469864d06f02e1c3e3862323abef1d23f..cb032fd9d9db325e22d4cbf1c80b7aa336c8c4ce 100644 (file)
--- a/templates/de/html/member/member_pool_row.tpl
+++ b/templates/de/html/member/member_pool_row.tpl
@@ -1,41 +1,41 @@
 <tr>
-       <td class="switch_mem$content[sw] top right" width="30%" align="center">
+       <td class="{%template,ColorSwitch%} top right" width="30%" align="center">
                {--EMAIL_ID--}:<br />
                <strong>$content[id]</strong>
        </td>
-       <td class="switch_mem$content[sw] top right" width="40%" align="center">
+       <td class="{%template,ColorSwitch%} top right" width="40%" align="center">
                {--EMAIL_SUBJECT--}:<br />
                <strong>$content[subject]</strong>
        </td>
-       <td class="switch_mem$content[sw] top" width="30%" align="center">
+       <td class="{%template,ColorSwitch%} top" width="30%" align="center">
                {--EMAIL_TIMESTAMP--}:<br />
                <strong>$content[timestamp]</strong>
        </td>
 </tr>
 <tr>
-       <td align="center" class="switch_mem$content[sw] top right">
+       <td align="center" class="{%template,ColorSwitch%} top right">
                {--EMAIL_PAYMENT--}:<br />
                <strong>{%pipe,translateComma=$content[payment_id]%}</strong>
        </td>
-       <td align="center" class="switch_mem$content[sw] top right">
+       <td align="center" class="{%template,ColorSwitch%} top right">
                {--EMAIL_CATEGORY--}:<br />
                <strong>{%pipe,getCategory=$content[cat_id]%}</strong>
        </td>
-       <td align="center" class="switch_mem$content[sw] top">
+       <td align="center" class="{%template,ColorSwitch%} top">
                {--EMAIL_URL--}:<br />
                <strong><a href="{%pipe,generateDerefererUrl=$content[url]%}" target="_blank">{--MEMBER_TEST_URL--}</a></strong>
        </td>
 </tr>
 <tr>
-       <td align="center" class="switch_mem$content[sw] top right">
+       <td align="center" class="{%template,ColorSwitch%} top right">
                {--EMAIL_RECEIVERS--}:<br />
                <strong>$content[target_send]</strong>
        </td>
-       <td align="center" class="switch_mem$content[sw] top right">
+       <td align="center" class="{%template,ColorSwitch%} top right">
                {--EMAIL_TYPE--}:<br />
                <strong>{%pipe,translatePoolType=$content[data_type]%}</strong>
        </td>
-       <td align="center" class="switch_mem$content[sw] top">
+       <td align="center" class="{%template,ColorSwitch%} top">
                {--EMAIL_ZIP--}:<br />
                <strong>{%pipe,fixEmptyContentToDashes=$content[zip]%}</strong>
        </td>

diff --git a/templates/de/html/member/member_stats_row.tpl b/templates/de/html/member/member_stats_row.tpl
index e370f26cefa2d8a838744481c48f198c12c3845b..060b281d1d66b660031d3910fff2bfb571df9e59 100644 (file)
--- a/templates/de/html/member/member_stats_row.tpl
+++ b/templates/de/html/member/member_stats_row.tpl
@@ -1,43 +1,43 @@
 <tr>
-       <td class="switch_mem$content[sw] top right" width="46%" colspan="2" align="center">
+       <td class="{%template,ColorSwitch%} top right" width="46%" colspan="2" align="center">
                {--EMAIL_SUBJECT--}:<br />
                <strong>$content[subject]</strong>
        </td>
-       <td class="switch_mem$content[sw] top" width="54%" align="center">
+       <td class="{%template,ColorSwitch%} top" width="54%" align="center">
                {--EMAIL_TIMESTAMP--}:<br />
                <strong>$content[timestamp_ordered]</strong>
        </td>
 </tr>
 <tr>
-       <td colspan="2" align="center" class="switch_mem$content[sw] top right">
+       <td colspan="2" align="center" class="{%template,ColorSwitch%} top right">
                {--EMAIL_PAYMENT--}:<br />
                <strong>{%pipe,getPaymentTitlePrice,translateComma=$content[payment_id]%}</strong>
        </td>
-       <td align="center" class="switch_mem$content[sw] top">
+       <td align="center" class="{%template,ColorSwitch%} top">
                {--EMAIL_CATEGORY--}:<br />
                <strong>{%pipe,getCategory=$content[cat_id]%}</strong>
        </td>
 </tr>
 <tr>
-       <td colspan="2" align="center" class="switch_mem$content[sw] top right">
+       <td colspan="2" align="center" class="{%template,ColorSwitch%} top right">
                {--EMAIL_URL--}:<br />
                <strong><a href="{%pipe,generateDerefererUrl=$content[url]%}" target="_blank">{--MEMBER_TEST_URL--}</a></strong>
        </td>
-       <td align="center" class="switch_mem$content[sw] top">
+       <td align="center" class="{%template,ColorSwitch%} top">
                {--EMAIL_END_SEND--}:<br />
                <strong>$content[timestamp_sent]</strong>
        </td>
 </tr>
 <tr>
-       <td align="center" class="switch_mem$content[sw] top right" width="30%">
+       <td align="center" class="{%template,ColorSwitch%} top right" width="30%">
                {--EMAIL_RECEIVERS--}:<br />
                <strong>{%pipe,translateComma=$content[max_rec]%}</strong>
        </td>
-       <td align="center" class="switch_mem$content[sw] top right" width="16%">
+       <td align="center" class="{%template,ColorSwitch%} top right" width="16%">
                {--EMAIL_CONFIRMED--}:<br />
                <strong>{%pipe,translateComma=$content[clicks]%}</strong>
        </td>
-       <td align="center" class="switch_mem$content[sw] top">
+       <td align="center" class="{%template,ColorSwitch%} top">
                {--EMAIL_PERCENT--}:<br />
                <strong>{%pipe,translateComma=$content[percents]%}%</strong>
        </td>

diff --git a/templates/de/html/member/member_transfer_row2.tpl b/templates/de/html/member/member_transfer_row2.tpl
index c27dc105dba312e86270c54fed0aeb65d943c91e..edc7686c11c182ca88420f2634f72826686cec54 100644 (file)
--- a/templates/de/html/member/member_transfer_row2.tpl
+++ b/templates/de/html/member/member_transfer_row2.tpl
@@ -1,17 +1,17 @@
 <tr>
-  <td class="transfer_row1 switch_sw".$content[sw] bottom right">
+  <td class="transfer_row1 {%template,ColorSwitch%} bottom right">
     <div class="transfer_row1">$content[trans_id]</div>
   </td>
-  <td class="transfer_row2 switch_sw".$content[sw] bottom right">
+  <td class="transfer_row2 {%template,ColorSwitch%} bottom right">
     <div class="transfer_row2">$content[stamp]</div>
   </td>
-  <td class="transfer_row3 switch_sw".$content[sw] bottom right">
+  <td class="transfer_row3 {%template,ColorSwitch%} bottom right">
     <div class="transfer_row3">$content[userid]</div>
   </td>
-  <td class="transfer_row4 switch_sw".$content[sw] bottom right">
+  <td class="transfer_row4 {%template,ColorSwitch%} bottom right">
     <div class="transfer_row4">$content[reason]</div>
   </td>
-  <td class="transfer_row5 switch_sw".$content[sw] bottom">
+  <td class="transfer_row5 {%template,ColorSwitch%} bottom">
     <div class="transfer_row5">{%pipe,bigintval=$content[points]%}</div>
   </td>
 </tr>