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

diff --git a/inc/modules/admin/what-theme_import.php b/inc/modules/admin/what-theme_import.php
index f3c3dd0f97..8fcec416c3 100644
--- a/inc/modules/admin/what-theme_import.php
+++ b/inc/modules/admin/what-theme_import.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Importieren von neuen Themes                     *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -33,50 +38,50 @@
 
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
 	require($INC);
-} elseif (!EXT_IS_ACTIVE("theme")) {
-	addFatalMessage(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "theme");
+} elseif (!EXT_IS_ACTIVE('theme')) {
+	addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('theme'));
 	return;
 }
 
 // Add description as navigation point
-ADD_DESCR("admin", __FILE__);
+ADD_DESCR('admin', __FILE__);
 
 // Switch to testing mode
-$THEME_MODE = "test";
+$GLOBALS['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 (!ifThemeExists(REQUEST_POST('theme'))) {
 		// Import theme
-		$INC = sprintf("theme/%s/theme.php", SQL_ESCAPE($_POST['theme']));
-		if (FILE_READABLE($INC)) {
+		$INC = sprintf("theme/%s/theme.php", SQL_ESCAPE(REQUEST_POST('theme')));
+		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`)
+			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'), $GLOBALS['theme_data']['version'], $GLOBALS['theme_data']['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 = sprintf(getMessage('ADMIN_THEME_IMPORTED'), REQUEST_POST('theme'));
 		} else {
 			// Include file not found!
-			$msg = ADMIN_THEME_INC_404_1.$_POST['theme'].ADMIN_THEME_INC_404_2;
+			$msg = sprintf(getMessage('ADMIN_THEME_INC_404'), REQUEST_POST('theme'));
 		}
 	} else {
 		// Theme already imported
-		$msg = ADMIN_THEME_ALREADY_1.$_POST['theme'].ADMIN_THEME_ALREADY_2;
+		$msg = sprintf(getMessage('ADMIN_THEME_ALREADY_INSTALLED'), REQUEST_POST('theme'));
 	}
 
 	// Output message
-	LOAD_TEMPLATE("admin_settings_saved", false, $msg);
+	LOAD_TEMPLATE('admin_settings_saved', false, $msg);
 } // END - if
 
 // Initialize array
@@ -90,23 +95,23 @@ $THEMES = array(
 );
 
 // Read directory "themes"
-$handle = opendir(PATH."theme/") or mxchange_die("Cannot read themes dir!");
+$handle = opendir(constant('PATH')."theme/") or app_die(__FILE__, __LINE__, "Cannot read themes dir!");
 while ($dir = readdir($handle)) {
 	// Construct absolute theme.php file name
 	$INC = sprintf("theme/%s/theme.php", $dir);
 
 	// Test it...
-	if (($dir != ".") && ($dir != "..") && (FILE_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;
-		$THEMES['theme_name'][]   = $THEME_NAME;
-		$THEMES['theme_author'][] = $THEME_AUTHOR;
-		$THEMES['theme_email'][]  = $THEME_EMAIL;
-		$THEMES['theme_url'][]    = $THEME_URL;
-		$THEMES['theme_ver'][]    = $THEME_VERSION;
+		$THEMES['theme_name'][]   = $GLOBALS['theme_data']['name'];
+		$THEMES['theme_author'][] = $GLOBALS['theme_data']['author'];
+		$THEMES['theme_email'][]  = $GLOBALS['theme_data']['email'];
+		$THEMES['theme_url'][]    = $GLOBALS['theme_data']['url'];
+		$THEMES['theme_ver'][]    = $GLOBALS['theme_data']['version'];
 	} // END - if
 } // END - while
 
@@ -117,13 +122,13 @@ closedir($handle);
 array_pk_sort($THEMES, array("theme_name"));
 
 // Generate output lines for the template
-$OUT = ""; $SW = 2;
+$OUT = ''; $SW = 2;
 foreach ($THEMES['theme_unix'] as $key => $unix) {
 	// Already installed is default
 	$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
@@ -150,7 +155,7 @@ foreach ($THEMES['theme_unix'] as $key => $unix) {
 
 if (empty($OUT)) {
 	// No themes found???
-	$OUT .= LOAD_TEMPLATE("admin_theme_import_none", true, LOAD_TEMPLATE("admin_settings_saved", true, getMessage('ADMIN_NO_THEMES_FOUND')));
+	$OUT .= LOAD_TEMPLATE("admin_theme_import_none", true, LOAD_TEMPLATE('admin_settings_saved', true, getMessage('ADMIN_NO_THEMES_FOUND')));
 } // END - if
 
 // Set the generated list