X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fadmin%2Fwhat-theme_import.php;h=58ef426283baaa85b6de63eb8dad51d2aa9787b6;hb=e8ca54fe91872ab95a6ffdc4f1268bf18889021d;hp=0e91fc4cf76706253e1c342fc67639700d8fc1a1;hpb=039203d5428c9c6a3bed61fb3a9a16958c6fd44c;p=mailer.git

diff --git a/inc/modules/admin/what-theme_import.php b/inc/modules/admin/what-theme_import.php
index 0e91fc4cf7..58ef426283 100644
--- a/inc/modules/admin/what-theme_import.php
+++ b/inc/modules/admin/what-theme_import.php
@@ -14,10 +14,9 @@
  * $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 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -42,7 +41,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 } // END - if
 
 // Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('admin', __FILE__);
 
 if (!isExtensionActive('theme')) {
 	loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('theme'));
@@ -53,11 +52,11 @@ if (!isExtensionActive('theme')) {
 $GLOBALS['theme_mode'] = 'test';
 
 // Import selected theme if not present
-if (isPostRequestElementSet('theme')) {
+if (isPostRequestParameterSet('theme')) {
 	// Check if theme is there
-	if (!ifThemeExists(postRequestElement('theme'))) {
+	if (!ifThemeExists(postRequestParameter('theme'))) {
 		// Import theme
-		$inc = sprintf("theme/%s/theme.php", SQL_ESCAPE(postRequestElement('theme')));
+		$inc = sprintf("theme/%s/theme.php", SQL_ESCAPE(postRequestParameter('theme')));
 
 		// Is the theme readable?
 		if (isIncludeReadable($inc)) {
@@ -68,23 +67,23 @@ if (isPostRequestElementSet('theme')) {
 			SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_themes` (`theme_path`,`theme_active`,`theme_ver`,`theme_name`)
 VALUES ('%s','N','%s','%s')",
 				array(
-					postRequestElement('theme'),
+					postRequestParameter('theme'),
 					$GLOBALS['theme_data']['version'],
 					$GLOBALS['theme_data']['name']
 				), __FILE__, __LINE__);
 
 			// Destroy cache
-			rebuildCacheFile('themes', 'them');
+			rebuildCache('themes', 'them');
 
 			// Prepare message
-			$message = getMaskedMessage('ADMIN_THEME_IMPORTED', postRequestElement('theme'));
+			$message = getMaskedMessage('ADMIN_THEME_IMPORTED', postRequestParameter('theme'));
 		} else {
 			// Include file not found!
-			$message = getMaskedMessage('ADMIN_THEME_INC_404', postRequestElement('theme'));
+			$message = getMaskedMessage('ADMIN_THEME_INC_404', postRequestParameter('theme'));
 		}
 	} else {
 		// Theme already imported
-		$message = getMaskedMessage('ADMIN_THEME_ALREADY_INSTALLED', postRequestElement('theme'));
+		$message = getMaskedMessage('ADMIN_THEME_ALREADY_INSTALLED', postRequestParameter('theme'));
 	}
 
 	// Output message
@@ -93,12 +92,12 @@ VALUES ('%s','N','%s','%s')",
 
 // Initialize array
 $THEMES = array(
-	'theme_unix'   => array(), // Unix name from filesystem
-	'theme_name'   => array(), // Title
-	'theme_author' => array(), // Theme author's name
-	'theme_email'  => array(), // Author's email address
-	'theme_url'    => array(), // URL were you can download it from
-	'theme_ver'    => array(), // Version number of theme
+	'theme_unix'    => array(), // Unix name from filesystem
+	'theme_name'    => array(), // Title
+	'theme_author'  => array(), // Theme author's name
+	'theme_email'   => array(), // Author's email address
+	'theme_url'     => array(), // URL were you can download it from
+	'theme_version' => array(), // Version number of theme
 );
 
 // Read directory "themes"
@@ -118,51 +117,46 @@ foreach ($includes as $inc) {
 	$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'];
+	$THEMES['theme_version'][]    = $GLOBALS['theme_data']['version'];
 } // END - while
 
 // Sort array by Uni* name
 array_pk_sort($THEMES, array('theme_name'));
 
 // Generate output lines for the template
-$OUT = ''; $SW = 2;
+$OUT = '';
 foreach ($THEMES['theme_unix'] as $key => $unix) {
 	// Already installed is default
-	$formContent = '<div class="admin_note">' . getMaskedMessage('ADMIN_THEME_ALREADY_INSTALLED', $unix) . '</div>';
+	$formContent = '<div class="notice">' . getMaskedMessage('ADMIN_THEME_ALREADY_INSTALLED', $unix) . '</div>';
 
 	// Check if current theme is already imported or not
 	if (!ifThemeExists($unix)) {
 		// Theme not installed
-		$formContent = loadTemplate('admin_theme_import_form', true, $unix);
+		$formContent = loadTemplate('admin_import_theme_form', true, $unix);
 	} // END - if
 
 	// Prepare content
 	$content = array(
-		'sw'      => $SW,
-		'unix'    => $unix,
-		'name'    => $THEMES['theme_name'][$key],
-		'email'   => $THEMES['theme_email'][$key],
-		'author'  => $THEMES['theme_author'][$key],
-		'link'    => generateDerefererUrl($THEMES['theme_url'][$key]),
-		'url'     => $THEMES['theme_url'][$key],
-		'version' => $THEMES['theme_ver'][$key],
-		'form'    => $formContent
+		'unix'          => $unix,
+		'theme_name'    => $THEMES['theme_name'][$key],
+		'theme_email'   => $THEMES['theme_email'][$key],
+		'theme_author'  => $THEMES['theme_author'][$key],
+		'theme_url'     => $THEMES['theme_url'][$key],
+		'theme_version' => $THEMES['theme_version'][$key],
+		'form_content'  => $formContent
 	);
 
 	// Add row template
-	$OUT .= loadTemplate('admin_theme_import_row', true, $content);
-
-	// Switch color
-	$SW = 3 - $SW;
+	$OUT .= loadTemplate('admin_import_theme_row', true, $content);
 } // END - foreach
 
 if (empty($OUT)) {
 	// No themes found???
-	$OUT .= loadTemplate('admin_theme_import_none', true, loadTemplate('admin_settings_saved', true, getMessage('ADMIN_NO_THEMES_FOUND')));
+	$OUT .= loadTemplate('admin_import_theme_none', true, loadTemplate('admin_settings_saved', true, '{--ADMIN_NO_THEMES_FOUND--}'));
 } // END - if
 
 // Load template
-loadTemplate('admin_theme_import', false, $OUT);
+loadTemplate('admin_import_theme', false, $OUT);
 
 // [EOF]
 ?>