X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-theme_import.php;h=94f4551670e0ba437200547d961221fee9990f5b;hb=2142149f3f72f1a2476f95a87937c044d63bbaf2;hp=ff47824ed7dd058923744ca6658ca384d3c1e733;hpb=628bbf35373f935235394c05ea009825ef01822b;p=mailer.git

diff --git a/inc/modules/admin/what-theme_import.php b/inc/modules/admin/what-theme_import.php
index ff47824ed7..94f4551670 100644
--- a/inc/modules/admin/what-theme_import.php
+++ b/inc/modules/admin/what-theme_import.php
@@ -32,25 +32,21 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!is_admin()))
-{
+if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
 	require($INC);
 }
 
 // Add description as navigation point
-ADD_DESCR("admin", basename(__FILE__));
+ADD_DESCR("admin", __FILE__);
 
 // Switch to testing mode
 $THEME_MODE = "test";
 
 // Import selected theme if not present
-if (!empty($_POST['theme']))
-{
-	$result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_themes WHERE theme_path='%s' LIMIT 1",
-	 array($_POST['theme']), __FILE__, __LINE__);
-	if (SQL_NUMROWS($result) == 0)
-	{
+if (!empty($_POST['theme'])) {
+	// Check if theme is there
+	if (!THEME_CHECK_EXIST($_POST['theme'])) {
 		// Import theme
 		$file = sprintf("%stheme/%s/theme.php", PATH, SQL_ESCAPE($_POST['theme']));
 		if (FILE_READABLE($file)) {
@@ -58,18 +54,20 @@ if (!empty($_POST['theme']))
 			include($file);
 
 			// Register it ith the exchange
-			$result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_themes (theme_path, theme_active, theme_ver)
-VALUES ('%s', 'N', '%s')",
- array($_POST['theme'], $THEME_VERSION), __FILE__, __LINE__);
+			$result = 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__);
+
+			// Destroy cache
+			REBUILD_CACHE("themes", "them");
+
+			// Prepare message
 			$msg = ADMIN_THEME_IMPORTED_1.$_POST['theme'].ADMIN_THEME_IMPORTED_2;
 		} else {
 			// Include file not found!
 			$msg = ADMIN_THEME_INC_404_1.$_POST['theme'].ADMIN_THEME_INC_404_2;
 		}
 	} else {
-		// Free memory
-		SQL_FREERESULT($result);
-
 		// Theme already imported
 		$msg = ADMIN_THEME_ALREADY_1.$_POST['theme'].ADMIN_THEME_ALREADY_2;
 	}
@@ -77,7 +75,7 @@ VALUES ('%s', 'N', '%s')",
 	// Output message
 	LOAD_TEMPLATE("admin_settings_saved", false, $msg);
 	OUTPUT_HTML("<br />");
-}
+} // END - if
 
 // Initialize array
 $THEMES = array(
@@ -120,12 +118,7 @@ array_pk_sort($THEMES, array("theme_name"));
 $OUT = ""; $SW = 2;
 foreach ($THEMES['theme_unix'] as $key => $unix) {
 	// Check if current theme is already imported or not
-	$result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_themes WHERE theme_path='%s' LIMIT 1",
-	 array($unix), __FILE__, __LINE__);
-	if (SQL_NUMROWS($result) == 1) {
-		// Free memory
-		SQL_FREERESULT($result);
-
+	if (THEME_CHECK_EXIST($unix)) {
 		// Already installed
 		$FOUND = "<FONT class=\"admin_note\">".ADMIN_THEME_ALREADY_INSTALLED."</FONT>";
 	} else {
@@ -151,17 +144,19 @@ foreach ($THEMES['theme_unix'] as $key => $unix) {
     ".$FOUND."
   </TD>
 </TR>\n";
+
+	// Switch color
 	$SW = 3 - $SW;
 }
 
 if (empty($OUT)) {
- 	// No themes found???
+	// No themes found???
 	$OUT .= "<TR>
   <TD colspan=\"6\" class=\"bottom2\" height=\"80\">
     ".LOAD_TEMPLATE("admin_settings_saved", true, ADMIN_NO_THEMES_FOUND)."
   </TD>
 </TR>\n";
-}
+} // END - if
 define('__THEME_LIST', $OUT);
 
 // Load template