A lot fixes to templates and missing functions added, more rewrites

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

diff --git a/inc/modules/admin/what-theme_edit.php b/inc/modules/admin/what-theme_edit.php
index ef64b514125890f7c0043e4dd49a124d9dcb5ece..30aa9d12e2a19179d3268d66be0b663aed2887e1 100644 (file)
--- a/inc/modules/admin/what-theme_edit.php
+++ b/inc/modules/admin/what-theme_edit.php
@@ -36,7 +36,7 @@ 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(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "theme"));
+       addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "theme");
        return;
 }
 
@@ -45,24 +45,24 @@ ADD_DESCR("admin", __FILE__);
 
 // Check for selected themes
 $SEL = 0;
-if (!empty($_POST['sel'])) $SEL = SELECTION_COUNT($_POST['sel']);
+if (REQUEST_ISSET_POST(('sel'))) $SEL = SELECTION_COUNT(REQUEST_POST('sel'));
 if ($SEL > 0) {
        $OUT = "";
-       foreach ($_POST['sel'] as $id => $sel) {
+       foreach (REQUEST_POST('sel') as $id => $sel) {
                $SQL = "";
                // Shall I de-/activate or delete themes?
-               if (isset($_POST['status'])) {
+               if (REQUEST_ISSET_POST(('status'))) {
                        // Change status
-                       if ($_POST['active'][$id] == "Y") {
-                               $SQL = "UPDATE `"._MYSQL_PREFIX."_themes` SET theme_active='N' WHERE id='".$id."' LIMIT 1";
+                       if (REQUEST_POST('active', $id) == "Y") {
+                               $SQL = "UPDATE `{!_MYSQL_PREFIX!}_themes` SET theme_active='N' WHERE id='".$id."' LIMIT 1";
                        } else {
-                               $SQL = "UPDATE `"._MYSQL_PREFIX."_themes` SET theme_active='Y' WHERE id='".$id."' LIMIT 1";
+                               $SQL = "UPDATE `{!_MYSQL_PREFIX!}_themes` SET theme_active='Y' WHERE id='".$id."' LIMIT 1";
                        }
-                       $OUT = ADMIN_THEMES_UPDATED;
-               } elseif (isset($_POST['del'])) {
+                       $OUT = getMessage('ADMIN_THEMES_UPDATED');
+               } elseif (REQUEST_ISSET_POST(('del'))) {
                        // Delete themes
-                       $SQL = "DELETE LOW_PRIORITY FROM `"._MYSQL_PREFIX."_themes` WHERE id='".$id."' LIMIT 1";
-                       $OUT = ADMIN_THEMES_DELETED;
+                       $SQL = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_themes` WHERE id='".$id."' LIMIT 1";
+                       $OUT = getMessage('ADMIN_THEMES_DELETED');
                }
 
                // Run SQL command?
@@ -72,22 +72,21 @@ if ($SEL > 0) {
 
                        // Rebuild cache
                        REBUILD_CACHE("themes", "them");
-               }
+               } // END - if
        }
 
        // Output generated?
-       if (empty($OUT)) ADMIN_THEME_NO_OUTPUT;
-} elseif (!empty($_GET['default_theme'])) {
+       if (empty($OUT)) $OUT = getMessage('ADMIN_THEME_NO_OUTPUT');
+} elseif (REQUEST_ISSET_GET(('default_theme'))) {
        // Escape string from input
-       $POST['default_theme'] = SQL_ESCAPE($_GET['default_theme']);
+       $POST['default_theme'] = REQUEST_GET(('default_theme'));
 
        // Set session
        set_session('mxchange_theme', $POST['default_theme']);
 
        // Set it in config and current theme as well
-       global $currTheme;
-       $currTheme = $POST['default_theme'];
-       $_CONFIG['default_theme'] = $POST['default_theme'];
+       $GLOBALS['curr_theme'] = $POST['default_theme'];
+       setConfigEntry('default_theme', $POST['default_theme']);
 
        // Save theme
        ADMIN_SAVE_SETTINGS($POST);
@@ -98,15 +97,20 @@ $THEME_MODE = "test";
 
 // Generate output lines for the template
 $OUT = ""; $SW = 2;
-$result = SQL_QUERY("SELECT id, theme_path, theme_active, theme_ver, theme_name FROM `"._MYSQL_PREFIX."_themes` ORDER BY theme_path", __FILE__, __LINE__);
+$result = SQL_QUERY("SELECT id, theme_path, theme_active, theme_ver, theme_name FROM `{!_MYSQL_PREFIX!}_themes` ORDER BY theme_path", __FILE__, __LINE__);
 if (SQL_NUMROWS($result) > 0) {
-       while(list($id, $unix, $active, $ver, $name) = SQL_FETCHROW($result)) {
+       while (list($id, $unix, $active, $ver, $name) = SQL_FETCHROW($result)) {
+               // Construct IFN
+               $INC = sprintf("theme/%s/theme.php",
+                       $unix
+               );
+
                // Load theme in test mode
-               require(PATH."theme/".$unix."/theme.php");
+               LOAD_INC($INC);
 
                // Is the loaded theme name != current theme name?
                $LINK = $unix;
-               if ($unix != GET_CURR_THEME()) $LINK = "<A href=\"".URL."/modules.php?module=admin&amp;what=theme_edit&amp;default_theme=".$unix."\" title=\"".ADMIN_SET_AS_NEW_THEME."\">".$unix."</A>";
+               if ($unix != GET_CURR_THEME()) $LINK = "<a href=\"{!URL!}/modules.php?module=admin&amp;what=theme_edit&amp;default_theme=".$unix."\" title=\"{--ADMIN_SET_AS_NEW_THEME--}\">".$unix."</a>";
 
                // Prepare data for the row template
                $content = array(
@@ -116,7 +120,7 @@ if (SQL_NUMROWS($result) > 0) {
                        'link'      => $LINK,
                        'name'      => $name,
                        'is_act'    => TRANSLATE_YESNO($active),
-                       'email'     => "<A href=\"mailto:".$THEME_EMAIL."?Subject=[Theme:] ".$THEME_NAME." (".$unix.")"."\">".$THEME_AUTHOR."</A>",
+                       'email'     => "<a href=\"mailto:".$THEME_EMAIL."?Subject=[Theme:] ".$THEME_NAME." (".$unix.")"."\">".$THEME_AUTHOR."</a>",
                        'url_link'  => DEREFERER($THEME_URL),
                        'url_title' => $THEME_URL,
                        'ver'       => $ver,
@@ -131,11 +135,11 @@ if (SQL_NUMROWS($result) > 0) {
        SQL_FREERESULT($result);
 } else {
                // No themes found???
-       $OUT .= "<TR>
-  <TD colspan=\"7\" class=\"bottom2\" height=\"60\">
-    ".LOAD_TEMPLATE("admin_settings_saved", true, ADMIN_NO_THEMES_FOUND)."
-  </TD>
-</TR>\n";
+       $OUT .= "<tr>
+  <td colspan=\"7\" class=\"bottom2\" height=\"60\">
+    ".LOAD_TEMPLATE("admin_settings_saved", true, getMessage('ADMIN_NO_THEMES_FOUND'))."
+  </td>
+</tr>\n";
 }
 
 define('__THEME_LIST', $OUT);