X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-theme_import.php;h=8fcec416c3a9f3d9a51cf28bb8bf0b1e650f1cfe;hp=0817993d288abbe32968de7f99f0f47981c6c344;hb=ccc4a69ce9b17aa8d7b1554a3b2b017db091821b;hpb=f97a999e0737c0007ae9c3c26dfef49f75a175ac

diff --git a/inc/modules/admin/what-theme_import.php b/inc/modules/admin/what-theme_import.php
index 0817993d28..8fcec416c3 100644
--- a/inc/modules/admin/what-theme_import.php
+++ b/inc/modules/admin/what-theme_import.php
@@ -41,7 +41,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(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'theme');
+	addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('theme'));
 	return;
 }
 
@@ -52,19 +52,19 @@ ADD_DESCR('admin', __FILE__);
 $GLOBALS['theme_mode'] = 'test';
 
 // Import selected theme if not present
-if (REQUEST_ISSET_POST(('theme'))) {
+if (REQUEST_ISSET_POST('theme')) {
 	// Check if theme is there
-	if (!THEME_CHECK_EXIST(REQUEST_POST('theme'))) {
+	if (!ifThemeExists(REQUEST_POST('theme'))) {
 		// Import theme
 		$INC = sprintf("theme/%s/theme.php", SQL_ESCAPE(REQUEST_POST('theme')));
-		if (INCLUDE_READABLE($INC)) {
+		if (isIncludeReadable($INC)) {
 			// Load the theme header file
-			LOAD_INC($INC);
+			loadInclude($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(REQUEST_POST('theme'), $GLOBALS['theme_data']['version'], $GLOBALS['theme_data']['name']), __FILE__, __LINE__);
+			array(REQUEST_POST('theme'), $GLOBALS['theme_data']['version'], $GLOBALS['theme_data']['name']), __FILE__, __LINE__);
 
 			// Destroy cache
 			rebuildCacheFiles("themes", "them");
@@ -101,9 +101,9 @@ while ($dir = readdir($handle)) {
 	$INC = sprintf("theme/%s/theme.php", $dir);
 
 	// Test it...
-	if (($dir != ".") && ($dir != "..") && (INCLUDE_READABLE($INC))) {
+	if ((!isDirectory($dir)) && (isIncludeReadable($INC))) {
 		// Found a valid directory so let's load it's theme.php file
-		LOAD_INC($INC);
+		loadInclude($INC);
 
 		// Add found theme to array
 		$THEMES['theme_unix'][]   = $dir;
@@ -128,7 +128,7 @@ foreach ($THEMES['theme_unix'] as $key => $unix) {
 	$FOUND = "<div class=\"admin_note\">{--ADMIN_THEME_ALREADY_INSTALLED--}</div>";
 
 	// Check if current theme is already imported or not
-	if (!THEME_CHECK_EXIST($unix)) {
+	if (!ifThemeExists($unix)) {
 		// Theme not installed
 		$FOUND = LOAD_TEMPLATE("admin_theme_import_form", true, $unix);
 	} // END - if