Changed all admin getter, closed internal TODOs:

[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 302558b4da72351b0cae7faed53947024bf8893c..41493b2f66a219a813af45979395d28ac923aeec 100644 (file)
--- a/inc/modules/admin/what-theme_import.php
+++ b/inc/modules/admin/what-theme_import.php
@@ -18,6 +18,7 @@
  * 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 *
@@ -74,7 +75,7 @@ VALUES ('%s','N','%s','%s')",
                                ), __FILE__, __LINE__);
 
                        // Destroy cache
-                       rebuildCacheFile('themes', 'them');
+                       rebuildCache('themes', 'them');
 
                        // Prepare message
                        $message = getMaskedMessage('ADMIN_THEME_IMPORTED', postRequestParameter('theme'));
@@ -98,7 +99,7 @@ $THEMES = array(
        '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_version'    => array(), // Version number of theme
 );
 
 // Read directory "themes"
@@ -118,7 +119,7 @@ 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
@@ -138,15 +139,14 @@ foreach ($THEMES['theme_unix'] as $key => $unix) {
 
        // 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
+               'sw'            => $SW,
+               '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
@@ -158,7 +158,7 @@ foreach ($THEMES['theme_unix'] as $key => $unix) {
 
 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_theme_import_none', true, loadTemplate('admin_settings_saved', true, '{--ADMIN_NO_THEMES_FOUND--}'));
 } // END - if
 
 // Load template