New naming convention applied to many functions, see #118 for details

[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 febd0bdbc4b4da2a2389b6ac61d9876805ba851b..57c5ffe1a1c77b25102802a65c2b95083ceaca11 100644 (file)
--- a/inc/modules/admin/what-theme_edit.php
+++ b/inc/modules/admin/what-theme_edit.php
@@ -50,7 +50,7 @@ ADD_DESCR('admin', __FILE__);
 
 // Check for selected themes
 $SEL = 0;
-if (REQUEST_ISSET_POST('sel')) $SEL = SELECTION_COUNT(REQUEST_POST('sel'));
+if (REQUEST_ISSET_POST('sel')) $SEL = countPostSelection();
 if ($SEL > 0) {
        $OUT = '';
        foreach (REQUEST_POST('sel') as $id => $sel) {
@@ -59,14 +59,14 @@ if ($SEL > 0) {
                if (REQUEST_ISSET_POST(('status'))) {
                        // Change status
                        if (REQUEST_POST('active', $id) == 'Y') {
-                               $sql = "UPDATE `{!_MYSQL_PREFIX!}_themes` SET theme_active='N' WHERE id='".$id."' LIMIT 1";
+                               $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 = getMessage('ADMIN_THEMES_UPDATED');
                } elseif (REQUEST_ISSET_POST('del')) {
                        // Delete themes
-                       $sql = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_themes` WHERE id='".$id."' LIMIT 1";
+                       $sql = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_themes` WHERE `id`='".$id."' LIMIT 1";
                        $OUT = getMessage('ADMIN_THEMES_DELETED');
                }
 
@@ -87,7 +87,7 @@ if ($SEL > 0) {
        $POST['default_theme'] = REQUEST_GET(('default_theme'));
 
        // Set session
-       set_session('mxchange_theme', $POST['default_theme']);
+       setSession('mxchange_theme', $POST['default_theme']);
 
        // Set it in config and current theme as well
        $GLOBALS['curr_theme'] = $POST['default_theme'];
@@ -109,11 +109,11 @@ if (SQL_NUMROWS($result) > 0) {
                $INC = sprintf("theme/%s/theme.php", $content['theme_path']);
 
                // Load theme in test mode
-               LOAD_INC($INC);
+               loadInclude($INC);
 
                // Is the loaded theme name != current theme name?
                $LINK = $content['theme_path'];
-               if ($content['theme_path'] != GET_CURR_THEME()) $LINK = "<a href=\"{!URL!}/modules.php?module=admin&amp;what=theme_edit&amp;default_theme=".$content['theme_path']."\" title=\"{--ADMIN_SET_AS_NEW_THEME--}\">".$content['theme_path']."</a>";
+               if ($content['theme_path'] != getCurrentTheme()) $LINK = "<a href=\"{!URL!}/modules.php?module=admin&amp;what=theme_edit&amp;default_theme=".$content['theme_path']."\" title=\"{--ADMIN_SET_AS_NEW_THEME--}\">".$content['theme_path']."</a>";
 
                // Prepare data for the row template
                $content = array(
@@ -122,8 +122,8 @@ if (SQL_NUMROWS($result) > 0) {
                        'active'    => $content['theme_active'],
                        'link'      => $LINK,
                        'name'      => $content['theme_name'],
-                       'is_act'    => TRANSLATE_YESNO($content['theme_active']),
-                       'email'     => "<a href=\"mailto:".$GLOBALS['theme_data']['email']."?Subject=[Theme:] ".$GLOBALS['theme_data']['name']." (".$content['theme_path'].")"."\">".$GLOBALS['theme_data']['author']."</a>",
+                       'is_act'    => translateYesNo($content['theme_active']),
+                       'email'     => "<a href=\"mailto:".$GLOBALS['theme_data']['email']."?Subject=[Theme:] ".$GLOBALS['theme_data']['name']." (".$content['theme_path'].")'.'\">".$GLOBALS['theme_data']['author']."</a>",
                        'url_link'  => DEREFERER($GLOBALS['theme_data']['url']),
                        'url_title' => $GLOBALS['theme_data']['url'],
                        'ver'       => $content['theme_ver'],