X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fadmin%2Fwhat-theme_import.php;h=0ca4421b141cb6bf435d9b55b2cdf2a2d4d2446d;hb=1fe7cf281be6832ba105934537aba5127892c576;hp=ff47824ed7dd058923744ca6658ca384d3c1e733;hpb=4ef4c88fc481335dc0631b223111c15a84cccb51;p=mailer.git
diff --git a/inc/modules/admin/what-theme_import.php b/inc/modules/admin/what-theme_import.php
index ff47824ed7..0ca4421b14 100644
--- a/inc/modules/admin/what-theme_import.php
+++ b/inc/modules/admin/what-theme_import.php
@@ -32,52 +32,52 @@
************************************************************************/
// Some security stuff...
-if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!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";
// Import selected theme if not present
-if (!empty($_POST['theme']))
-{
- $result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_themes WHERE theme_path='%s' LIMIT 1",
- array($_POST['theme']), __FILE__, __LINE__);
- if (SQL_NUMROWS($result) == 0)
- {
+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)
-VALUES ('%s', 'N', '%s')",
- array($_POST['theme'], $THEME_VERSION), __FILE__, __LINE__);
+ 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
+ REBUILD_CACHE("themes", "them");
+
+ // Prepare message
$msg = ADMIN_THEME_IMPORTED_1.$_POST['theme'].ADMIN_THEME_IMPORTED_2;
} else {
// Include file not found!
$msg = ADMIN_THEME_INC_404_1.$_POST['theme'].ADMIN_THEME_INC_404_2;
}
} else {
- // Free memory
- SQL_FREERESULT($result);
-
// Theme already imported
$msg = ADMIN_THEME_ALREADY_1.$_POST['theme'].ADMIN_THEME_ALREADY_2;
}
// Output message
LOAD_TEMPLATE("admin_settings_saved", false, $msg);
- OUTPUT_HTML("
");
-}
+} // END - if
// Initialize array
$THEMES = array(
@@ -93,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;
@@ -119,49 +119,41 @@ array_pk_sort($THEMES, array("theme_name"));
// Generate output lines for the template
$OUT = ""; $SW = 2;
foreach ($THEMES['theme_unix'] as $key => $unix) {
+ // Already installed is default
+ $FOUND = "