Fixes + asserts

[mailer.git] / inc / modules / admin / what-theme_import.php

diff --git a/inc/modules/admin/what-theme_import.php b/inc/modules/admin/what-theme_import.php
index fd04a906852bc0ab7962e1408d913f10a8abfc65..54fd121edbd476aee5a8a394ba6c798087ee6c51 100644 (file)
--- a/inc/modules/admin/what-theme_import.php
+++ b/inc/modules/admin/what-theme_import.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -37,7 +37,7 @@
 
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!isAdmin())) {
-       die();
+       exit();
 } // END - if
 
 // Add description as navigation point
@@ -51,7 +51,7 @@ if (isPostRequestElementSet('theme')) {
        // Check if theme is there
        if (!ifThemeExists(postRequestElement('theme'))) {
                // Import theme
-               $inc = sprintf("theme/%s/theme.php", SQL_ESCAPE(postRequestElement('theme')));
+               $inc = sprintf("theme/%s/theme.php", sqlEscapeString(postRequestElement('theme')));
 
                // Is the theme readable?
                if (isIncludeReadable($inc)) {
@@ -59,7 +59,7 @@ if (isPostRequestElementSet('theme')) {
                        loadInclude($inc);
 
                        // Register it ith the exchange
-                       SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_themes` (`theme_path`,`theme_active`,`theme_ver`,`theme_name`)
+                       sqlQueryEscaped("INSERT INTO `{?_MYSQL_PREFIX?}_themes` (`theme_path`, `theme_active`, `theme_ver`, `theme_name`)
 VALUES ('%s','N','%s','%s')",
                                array(
                                        postRequestElement('theme'),
@@ -96,7 +96,7 @@ $themes = array(
 );
 
 // Read directory "themes"
-$includes = getArrayFromDirectory('theme/', '', false, true, array('css', 'images'));
+$includes = getArrayFromDirectory('theme/', '', FALSE, TRUE, array('css', 'images'));
 
 // Walk through all entries and add it
 foreach ($includes as $inc) {
@@ -107,12 +107,12 @@ foreach ($includes as $inc) {
        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_version'][]    = $GLOBALS['theme_data']['version'];
+       array_push($themes['theme_unix']   , $dir);
+       array_push($themes['theme_name']   , $GLOBALS['theme_data']['name']);
+       array_push($themes['theme_author'] , $GLOBALS['theme_data']['author']);
+       array_push($themes['theme_email']  , $GLOBALS['theme_data']['email']);
+       array_push($themes['theme_url']    , $GLOBALS['theme_data']['url']);
+       array_push($themes['theme_version'], $GLOBALS['theme_data']['version']);
 } // END - while
 
 // Sort array by Uni* name
@@ -127,7 +127,7 @@ foreach ($themes['theme_unix'] as $key => $unix) {
        // Check if current theme is already imported or not
        if (!ifThemeExists($unix)) {
                // Theme not installed
-               $formContent = loadTemplate('admin_import_theme_form', true, $unix);
+               $formContent = loadTemplate('admin_import_theme_form', TRUE, $unix);
        } // END - if
 
        // Prepare content
@@ -142,16 +142,16 @@ foreach ($themes['theme_unix'] as $key => $unix) {
        );
 
        // Add row template
-       $OUT .= loadTemplate('admin_import_theme_row', true, $content);
+       $OUT .= loadTemplate('admin_import_theme_row', TRUE, $content);
 } // END - foreach
 
 if (empty($OUT)) {
        // No themes found???
-       $OUT .= loadTemplate('admin_import_theme_none', true, displayMessage('{--ADMIN_NO_THEMES_FOUND--}', true));
+       $OUT .= loadTemplate('admin_import_theme_none', TRUE, displayMessage('{--ADMIN_NO_THEMES_FOUND--}', TRUE));
 } // END - if
 
 // Load template
-loadTemplate('admin_import_theme', false, $OUT);
+loadTemplate('admin_import_theme', FALSE, $OUT);
 
 // [EOF]
 ?>