X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-theme_import.php;h=6ab037893fcb586e8c916b7a79ad48bc39fee351;hp=d8ab90b5c82cd0871ac3e16754cf609c56638bb9;hb=5deec33be1baf2135eefc2bbb0d1b63c6cbd2f9a;hpb=5bdeaf8b452206598b6c6cd4f941145b11a0eccc
diff --git a/inc/modules/admin/what-theme_import.php b/inc/modules/admin/what-theme_import.php
index d8ab90b5c8..6ab037893f 100644
--- 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")) {
- addFatalMessage(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "theme"));
+ addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "theme");
return;
}
@@ -47,37 +47,36 @@ ADD_DESCR("admin", __FILE__);
$THEME_MODE = "test";
// Import selected theme if not present
-if (!empty($_POST['theme'])) {
+if (REQUEST_ISSET_POST(('theme'))) {
// Check if theme is there
- if (!THEME_CHECK_EXIST($_POST['theme'])) {
+ if (!THEME_CHECK_EXIST(REQUEST_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(REQUEST_POST('theme')));
+ if (INCLUDE_READABLE($INC)) {
// Load the theme header file
- require($file);
+ LOAD_INC($INC);
// Register it ith the exchange
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__);
+ array(REQUEST_POST('theme'), $THEME_VERSION, $THEME_NAME), __FILE__, __LINE__);
// Destroy cache
- REBUILD_CACHE("themes", "them");
+ rebuildCacheFiles("themes", "them");
// Prepare message
- $msg = ADMIN_THEME_IMPORTED_1.$_POST['theme'].ADMIN_THEME_IMPORTED_2;
+ $msg = ADMIN_THEME_IMPORTED_1.REQUEST_POST('theme').ADMIN_THEME_IMPORTED_2;
} else {
// Include file not found!
- $msg = ADMIN_THEME_INC_404_1.$_POST['theme'].ADMIN_THEME_INC_404_2;
+ $msg = ADMIN_THEME_INC_404_1.REQUEST_POST('theme').ADMIN_THEME_INC_404_2;
}
} else {
// Theme already imported
- $msg = ADMIN_THEME_ALREADY_1.$_POST['theme'].ADMIN_THEME_ALREADY_2;
+ $msg = ADMIN_THEME_ALREADY_1.REQUEST_POST('theme').ADMIN_THEME_ALREADY_2;
}
// Output message
LOAD_TEMPLATE("admin_settings_saved", false, $msg);
- OUTPUT_HTML("
");
} // END - if
// Initialize array
@@ -91,15 +90,15 @@ $THEMES = array(
);
// Read directory "themes"
-$handle = opendir(PATH."theme/") or mxchange_die("Cannot read themes dir!");
+$handle = opendir(constant('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 != "..") && (INCLUDE_READABLE($INC))) {
// Found a valid directory so let's load it's theme.php file
- require($theme);
+ LOAD_INC($INC);
// Add found theme to array
$THEMES['theme_unix'][] = $dir;
@@ -120,46 +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 = "