X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-theme_import.php;h=0e91fc4cf76706253e1c342fc67639700d8fc1a1;hb=96dfdd6b8e6a56d6594c3525e5fd2a066697a6de;hp=b5a13b47db55ef8498ac815690cdd63b11b64856;hpb=e4518f335533c2c6e9367d566315d2e0eec3de9a;p=mailer.git

diff --git a/inc/modules/admin/what-theme_import.php b/inc/modules/admin/what-theme_import.php
index b5a13b47db..0e91fc4cf7 100644
--- a/inc/modules/admin/what-theme_import.php
+++ b/inc/modules/admin/what-theme_import.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 02/12/2004 *
- * ================                             Last change: 11/12/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 02/12/2004 *
+ * ===================                          Last change: 11/12/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-theme_import.php                            *
@@ -17,7 +17,7 @@
  * 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                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -37,57 +37,58 @@
  ************************************************************************/
 
 // Some security stuff...
-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__, generateExtensionInactiveNotInstalledMessage('theme'));
-	return;
-}
+if ((!defined('__SECURITY')) || (!isAdmin())) {
+	die();
+} // END - if
 
 // Add description as navigation point
-ADD_DESCR('admin', __FILE__);
+addMenuDescription('admin', __FILE__);
+
+if (!isExtensionActive('theme')) {
+	loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('theme'));
+	return;
+} // END - if
 
 // Switch to testing mode
 $GLOBALS['theme_mode'] = 'test';
 
 // Import selected theme if not present
-if (REQUEST_ISSET_POST('theme')) {
+if (isPostRequestElementSet('theme')) {
 	// Check if theme is there
-	if (!ifThemeExists(REQUEST_POST('theme'))) {
+	if (!ifThemeExists(postRequestElement('theme'))) {
 		// Import theme
-		$INC = sprintf("theme/%s/theme.php", SQL_ESCAPE(REQUEST_POST('theme')));
+		$inc = sprintf("theme/%s/theme.php", SQL_ESCAPE(postRequestElement('theme')));
 
 		// Is the theme readable?
-		if (isIncludeReadable($INC)) {
+		if (isIncludeReadable($inc)) {
 			// Load the theme header file
-			loadInclude($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(
-					REQUEST_POST('theme'),
+					postRequestElement('theme'),
 					$GLOBALS['theme_data']['version'],
 					$GLOBALS['theme_data']['name']
 				), __FILE__, __LINE__);
 
 			// Destroy cache
-			rebuildCacheFiles('themes', 'them');
+			rebuildCacheFile('themes', 'them');
 
 			// Prepare message
-			$message = sprintf(getMessage('ADMIN_THEME_IMPORTED'), REQUEST_POST('theme'));
+			$message = getMaskedMessage('ADMIN_THEME_IMPORTED', postRequestElement('theme'));
 		} else {
 			// Include file not found!
-			$message = sprintf(getMessage('ADMIN_THEME_INC_404'), REQUEST_POST('theme'));
+			$message = getMaskedMessage('ADMIN_THEME_INC_404', postRequestElement('theme'));
 		}
 	} else {
 		// Theme already imported
-		$message = sprintf(getMessage('ADMIN_THEME_ALREADY_INSTALLED'), REQUEST_POST('theme'));
+		$message = getMaskedMessage('ADMIN_THEME_ALREADY_INSTALLED', postRequestElement('theme'));
 	}
 
 	// Output message
-	LOAD_TEMPLATE('admin_settings_saved', false, $message);
+	loadTemplate('admin_settings_saved', false, $message);
 } // END - if
 
 // Initialize array
@@ -101,29 +102,25 @@ $THEMES = array(
 );
 
 // Read directory "themes"
-$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 ((!isDirectory($dir)) && (isIncludeReadable($INC))) {
-		// Found a valid directory so let's load it's theme.php file
-		loadInclude($INC);
-
-		// Add found theme to array
-		$THEMES['theme_unix'][]   = $dir;
-		$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
+$includes = getArrayFromDirectory('theme/', '', false, true, array('css', 'images'));
+
+// Walk through all entries and add it
+foreach ($includes as $inc) {
+	// Get directory from it
+	$dir = basename(dirname($inc));
+
+	// Load include file
+	loadInclude($inc);
+
+	// Add found theme to array
+	$THEMES['theme_unix'][]   = $dir;
+	$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 - while
 
-// Close directory
-closedir($handle);
-
 // Sort array by Uni* name
 array_pk_sort($THEMES, array('theme_name'));
 
@@ -131,12 +128,12 @@ array_pk_sort($THEMES, array('theme_name'));
 $OUT = ''; $SW = 2;
 foreach ($THEMES['theme_unix'] as $key => $unix) {
 	// Already installed is default
-	$formContent = '<div class="admin_note">' . sprintf(getMessage('ADMIN_THEME_ALREADY_INSTALLED'), $unix) . '</div>';
+	$formContent = '<div class="admin_note">' . getMaskedMessage('ADMIN_THEME_ALREADY_INSTALLED', $unix) . '</div>';
 
 	// Check if current theme is already imported or not
 	if (!ifThemeExists($unix)) {
 		// Theme not installed
-		$formContent = LOAD_TEMPLATE('admin_theme_import_form', true, $unix);
+		$formContent = loadTemplate('admin_theme_import_form', true, $unix);
 	} // END - if
 
 	// Prepare content
@@ -146,14 +143,14 @@ foreach ($THEMES['theme_unix'] as $key => $unix) {
 		'name'    => $THEMES['theme_name'][$key],
 		'email'   => $THEMES['theme_email'][$key],
 		'author'  => $THEMES['theme_author'][$key],
-		'link'    => DEREFERER($THEMES['theme_url'][$key]),
+		'link'    => generateDerefererUrl($THEMES['theme_url'][$key]),
 		'url'     => $THEMES['theme_url'][$key],
 		'version' => $THEMES['theme_ver'][$key],
 		'form'    => $formContent
 	);
 
 	// Add row template
-	$OUT .= LOAD_TEMPLATE('admin_theme_import_row', true, $content);
+	$OUT .= loadTemplate('admin_theme_import_row', true, $content);
 
 	// Switch color
 	$SW = 3 - $SW;
@@ -161,14 +158,11 @@ 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 .= loadTemplate('admin_theme_import_none', true, loadTemplate('admin_settings_saved', true, getMessage('ADMIN_NO_THEMES_FOUND')));
 } // END - if
 
-// Set the generated list
-define('__THEME_LIST', $OUT);
-
 // Load template
-LOAD_TEMPLATE('admin_theme_import');
+loadTemplate('admin_theme_import', false, $OUT);
 
-//
+// [EOF]
 ?>