More improved SQL queries

[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 027223f087bbf2c91a1c0676ffb7c814f1b00ef3..41ac3d296f58f8cb838ba2603bffb83e004f1b04 100644 (file)
--- a/inc/modules/admin/what-theme_import.php
+++ b/inc/modules/admin/what-theme_import.php
@@ -32,13 +32,16 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((!defined('__SECURITY')) || (!is_admin())) {
+if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
+} elseif (!EXT_IS_ACTIVE("theme")) {
+       addFatalMessage(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "theme"));
+       return;
 }
 
 // Add description as navigation point
-ADD_DESCR("admin", basename(__FILE__));
+ADD_DESCR("admin", __FILE__);
 
 // Switch to testing mode
 $THEME_MODE = "test";
@@ -48,14 +51,14 @@ if (!empty($_POST['theme'])) {
        // Check if theme is there
        if (!THEME_CHECK_EXIST($_POST['theme'])) {
                // Import theme
-               $file = sprintf("%stheme/%s/theme.php", PATH, SQL_ESCAPE($_POST['theme']));
-               if (FILE_READABLE($file)) {
+               $INC = sprintf("theme/%s/theme.php", SQL_ESCAPE($_POST['theme']));
+               if (FILE_READABLE($INC)) {
                        // Load the theme header file
-                       include($file);
+                       LOAD_INC($INC);
 
                        // Register it ith the exchange
-                       $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_themes (theme_path, theme_active, theme_ver, theme_name)
-VALUES ('%s', 'N', '%s', '%s')",
+                       SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_themes` (`theme_path`, `theme_active`, `theme_ver`, `theme_name`)
+VALUES ('%s','N','%s','%s')",
                                array($_POST['theme'], $THEME_VERSION, $THEME_NAME), __FILE__, __LINE__);
 
                        // Destroy cache
@@ -74,7 +77,6 @@ VALUES ('%s', 'N', '%s', '%s')",
 
        // Output message
        LOAD_TEMPLATE("admin_settings_saved", false, $msg);
-       OUTPUT_HTML("<br />");
 } // END - if
 
 // Initialize array
@@ -91,12 +93,12 @@ $THEMES = array(
 $handle = opendir(PATH."theme/") or mxchange_die("Cannot read themes dir!");
 while ($dir = readdir($handle)) {
        // Construct absolute theme.php file name
-       $theme = sprintf("%stheme/%s/theme.php", PATH, $dir);
+       $INC = sprintf("theme/%s/theme.php", $dir);
 
        // Test it...
-       if (($dir != ".") && ($dir != "..") && (FILE_READABLE($theme))) {
+       if (($dir != ".") && ($dir != "..") && (FILE_READABLE($INC))) {
                // Found a valid directory so let's load it's theme.php file
-               include($theme);
+               LOAD_INC($INC);
 
                // Add found theme to array
                $THEMES['theme_unix'][]   = $dir;
@@ -120,30 +122,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\">
-  <INPUT type=\"submit\" name=\"ok\" class=\"admin_submit\" value=\"".ADMIN_INSTALL_THEME."\">
-  <INPUT type=\"hidden\" name=\"theme\" value=\"".$unix."\">
-</FORM>";
+               $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>";
        }
 
        // 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;
@@ -151,11 +153,11 @@ foreach ($THEMES['theme_unix'] as $key => $unix) {
 
 if (empty($OUT)) {
        // No themes found???
-       $OUT .= "<TR>
-  <TD colspan=\"6\" class=\"bottom2\" height=\"80\">
-    ".LOAD_TEMPLATE("admin_settings_saved", true, ADMIN_NO_THEMES_FOUND)."
-  </TD>
-</TR>\n";
+       $OUT .= "<tr>
+  <td colspan=\"6\" class=\"bottom2\" height=\"80\">
+    ".LOAD_TEMPLATE("admin_settings_saved", true, getMessage('ADMIN_NO_THEMES_FOUND'))."
+  </td>
+</tr>\n";
 } // END - if
 define('__THEME_LIST', $OUT);