More HTML tags ported to XHTML (all lower-case), bug #33 resolved

[mailer.git] / inc / modules / admin / what-theme_import.php

diff --git a/inc/modules/admin/what-theme_import.php b/inc/modules/admin/what-theme_import.php
index 1df771d2cf23af205d636907cdb0e6ebd9d81c72..fd9fd24cc4fd821efa19c1041f741f225793d908 100644 (file)
--- a/inc/modules/admin/what-theme_import.php
+++ b/inc/modules/admin/what-theme_import.php
@@ -36,7 +36,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 } elseif (!EXT_IS_ACTIVE("theme")) {
-       ADD_FATAL(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "theme"));
+       addFatalMessage(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "theme"));
        return;
 }
 
@@ -54,7 +54,7 @@ if (!empty($_POST['theme'])) {
                $file = sprintf("%stheme/%s/theme.php", PATH, SQL_ESCAPE($_POST['theme']));
                if (FILE_READABLE($file)) {
                        // Load the theme header file
-                       include($file);
+                       require($file);
 
                        // Register it ith the exchange
                        SQL_QUERY_ESC("INSERT INTO `"._MYSQL_PREFIX."_themes` (`theme_path`, `theme_active`, `theme_ver`, `theme_name`)
@@ -99,7 +99,7 @@ while ($dir = readdir($handle)) {
        // Test it...
        if (($dir != ".") && ($dir != "..") && (FILE_READABLE($theme))) {
                // Found a valid directory so let's load it's theme.php file
-               include($theme);
+               require($theme);
 
                // Add found theme to array
                $THEMES['theme_unix'][]   = $dir;
@@ -123,30 +123,30 @@ foreach ($THEMES['theme_unix'] as $key => $unix) {
        // Check if current theme is already imported or not
        if (THEME_CHECK_EXIST($unix)) {
                // Already installed
-               $FOUND = "<FONT class=\"admin_note\">".ADMIN_THEME_ALREADY_INSTALLED."</FONT>";
+               $FOUND = "<div class=\"admin_note\">".ADMIN_THEME_ALREADY_INSTALLED."</div>";
        } else {
                // Theme not installed
-               $FOUND = "<FORM action=\"".URL."/modules.php?module=admin&amp;what=theme_import\" method=\"POST\">
+               $FOUND = "<form action=\"".URL."/modules.php?module=admin&amp;what=theme_import\" method=\"POST\">
   <INPUT type=\"submit\" name=\"ok\" class=\"admin_submit\" value=\"".ADMIN_INSTALL_THEME."\">
   <INPUT type=\"hidden\" name=\"theme\" value=\"".$unix."\">
-</FORM>";
+</form>";
        }
 
        // Add row
-       $OUT .= "<TR>
-  <TD class=\"switch_sw".$SW." bottom2 right2\" align=\"center\" height=\"30\">".$unix."</TD>
-  <TD class=\"switch_sw".$SW." bottom2 right2\" align=\"center\">".$THEMES['theme_name'][$key]."</TD>
-  <TD class=\"switch_sw".$SW." bottom2 right2\" 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." bottom2 right2\" align=\"center\">
-    <A href=\"".DEREFERER($THEMES['theme_url'][$key])."\" target=\"_blank\">".$THEMES['theme_url'][$key]."</A>
-  </TD>
-  <TD class=\"switch_sw".$SW." bottom2 right2\" align=\"center\">v".$THEMES['theme_ver'][$key]."</TD>
-  <TD class=\"switch_sw".$SW." bottom2\" align=\"center\">
+       $OUT .= "<tr>
+  <td class=\"switch_sw".$SW." bottom2 right2\" align=\"center\" height=\"30\">".$unix."</td>
+  <td class=\"switch_sw".$SW." bottom2 right2\" align=\"center\">".$THEMES['theme_name'][$key]."</td>
+  <td class=\"switch_sw".$SW." bottom2 right2\" 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." bottom2 right2\" align=\"center\">
+    <a href=\"".DEREFERER($THEMES['theme_url'][$key])."\" target=\"_blank\">".$THEMES['theme_url'][$key]."</a>
+  </td>
+  <td class=\"switch_sw".$SW." bottom2 right2\" align=\"center\">v".$THEMES['theme_ver'][$key]."</td>
+  <td class=\"switch_sw".$SW." bottom2\" align=\"center\">
     ".$FOUND."
-  </TD>
-</TR>\n";
+  </td>
+</tr>\n";
 
        // Switch color
        $SW = 3 - $SW;
@@ -154,11 +154,11 @@ foreach ($THEMES['theme_unix'] as $key => $unix) {
 
 if (empty($OUT)) {
        // No themes found???
-       $OUT .= "<TR>
-  <TD colspan=\"6\" class=\"bottom2\" height=\"80\">
+       $OUT .= "<tr>
+  <td colspan=\"6\" class=\"bottom2\" height=\"80\">
     ".LOAD_TEMPLATE("admin_settings_saved", true, ADMIN_NO_THEMES_FOUND)."
-  </TD>
-</TR>\n";
+  </td>
+</tr>\n";
 } // END - if
 define('__THEME_LIST', $OUT);