A lot code rewritten:

[mailer.git] / inc / modules / member / what-themes.php

diff --git a/inc/modules/member/what-themes.php b/inc/modules/member/what-themes.php
index b05034d6c0a72f9085afd79155fdcdcea5aaa1cd..f7381e612ba3d4b036de2d4fa3e20cf64db44b18 100644 (file)
--- a/inc/modules/member/what-themes.php
+++ b/inc/modules/member/what-themes.php
@@ -64,17 +64,17 @@ if (isPostRequestParameterSet('member_theme')) {
        setTheme($newTheme);
 
        // Theme saved!
-       loadTemplate('admin_settings_saved', false, getMessage('MEMBER_THEME_SAVED'));
+       loadTemplate('admin_settings_saved', false, '{--MEMBER_THEME_SAVED--}');
 } // END - if
 
 // Initialize array
 $THEMES = array(
-       'theme_unix'   => array(), // Unix name from filesystem
-       'theme_name'   => array(), // Title
-       'theme_author' => array(), // Theme author's name
-       'theme_email'  => array(), // Author's email address
-       'theme_url'    => array(), // URL were you can download it from
-       'theme_ver'    => array(), // Version number of theme
+       'theme_unix'    => array(), // Unix name from filesystem
+       'theme_name'    => array(), // Title
+       'theme_author'  => array(), // Theme author's name
+       'theme_email'   => array(), // Author's email address
+       'theme_url'     => array(), // URL were you can download it from
+       'theme_version' => array(), // Version number of theme
 );
 
 // Read directory "themes"
@@ -91,12 +91,12 @@ foreach ($includes as $inc) {
                loadInclude($inc);
 
                // Add found theme to array
-               $THEMES['theme_unix'][]   = $dir;
-               $THEMES['theme_name'][]   = $GLOBALS['theme_data']['name'];
-               $THEMES['theme_author'][] = $GLOBALS['theme_data']['author'];
-               $THEMES['theme_email'][]  = $GLOBALS['theme_data']['email'];
-               $THEMES['theme_url'][]    = $GLOBALS['theme_data']['url'];
-               $THEMES['theme_ver'][]    = $GLOBALS['theme_data']['version'];
+               $THEMES['theme_unix'][]    = $dir;
+               $THEMES['theme_name'][]    = $GLOBALS['theme_data']['name'];
+               $THEMES['theme_author'][]  = $GLOBALS['theme_data']['author'];
+               $THEMES['theme_email'][]   = $GLOBALS['theme_data']['email'];
+               $THEMES['theme_url'][]     = $GLOBALS['theme_data']['url'];
+               $THEMES['theme_version'][] = $GLOBALS['theme_data']['version'];
        } // END - if
 } // END - while
 
@@ -107,35 +107,35 @@ unset($GLOBALS['theme_data']);
 array_pk_sort($THEMES, array('theme_name'));
 
 // Generate output lines for the template
-$OUT = ''; $SW = 2;
+$OUT = '';
 foreach ($THEMES['theme_unix'] as $key => $unix) {
        $default = '';
        if (getCurrentTheme() == $unix) $default = ' selected="selected"';
 
        // Add row
+       // @TODO Move this code into a template
        $OUT .= "<tr>
-  <td class=\"switch_sw".$SW." bottom right\" align=\"center\" height=\"30\">
+  <td class=\"{%template,ColorSwitch%} bottom right\" align=\"center\" height=\"30\">
     <input type=\"radio\" name=\"member_theme\" class=\"member_normal\" value=\"".$unix."\"".$default." />
   </td>
-  <td class=\"switch_sw".$SW." bottom right\" align=\"center\">".$THEMES['theme_name'][$key]."</td>
-  <td class=\"switch_sw".$SW." bottom right\" align=\"center\">
+  <td class=\"{%template,ColorSwitch%} bottom right\" align=\"center\">".$THEMES['theme_name'][$key]."</td>
+  <td class=\"{%template,ColorSwitch%} bottom right\" align=\"center\">
     <a href=\"mailto:".$THEMES['theme_email'][$key]."?Subject=[Theme:] ".$THEMES['theme_name'][$key]." (".$unix.")'.'\">".$THEMES['theme_author'][$key]."</a>
   </td>
-  <td class=\"switch_sw".$SW." bottom right\" align=\"center\">
+  <td class=\"{%template,ColorSwitch%} bottom right\" align=\"center\">
     <a href=\"".generateDerefererUrl($THEMES['theme_url'][$key])."\" target=\"_blank\">".$THEMES['theme_url'][$key]."</a>
   </td>
-  <td class=\"switch_sw".$SW." bottom\" align=\"center\">v".$THEMES['theme_ver'][$key]."</td>
+  <td class=\"{%template,ColorSwitch%} bottom\" align=\"center\">v".$THEMES['theme_version'][$key]."</td>
 </tr>\n";
-       $SW = 3 - $SW;
 } // END - foreach
 
 if (empty($OUT)) {
        // No themes found???
-       $OUT = "<tr>
-  <td colspan=\"5\" class=\"bottom\" height=\"80\">
-    ".loadTemplate('admin_settings_saved', true, getMessage('MEMBER_NO_THEMES_FOUND'))."
+       $OUT = '<tr>
+  <td colspan="5" class="bottom" height="80">
+    ' . loadTemplate('admin_settings_saved', true, '{--MEMBER_NO_THEMES_FOUND--}') . '
   </td>
-</tr>\n";
+</tr>';
 } // END - if
 
 // Load template