Renamed ifSqlHasZeroNums() to ifSqlHasZeroNumRows() and improved some queries.

[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 760181af57b5c2f93fade5f700d3ddcdcbf5e517..e1e60490fe0c846ca50d7c47b8c3ef4a07537380 100644 (file)
--- a/inc/modules/admin/what-theme_edit.php
+++ b/inc/modules/admin/what-theme_edit.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2015 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -66,10 +66,10 @@ if (ifPostContainsSelections()) {
                // Run SQL command?
                if (!empty($sql)) {
                        // Run it
-                       $result = SQL_QUERY_ESC($sql, array(bigintval($id)), __FILE__, __LINE__);
+                       $result = sqlQueryEscaped($sql, array(bigintval($id)), __FILE__, __LINE__);
 
                        // Rebuild cache
-                       rebuildCache('themes', 'them');
+                       rebuildCache('themes', 'themes');
                } // END - if
        } // END - foreach
 
@@ -80,7 +80,7 @@ if (ifPostContainsSelections()) {
        $postData['default_theme'] = getRequestElement('default_theme');
 
        // Set session
-       setTheme($postData['default_theme']);
+       setMailerTheme($postData['default_theme']);
 
        // Set it in config and current theme as well
        setConfigEntry('default_theme', $postData['default_theme']);
@@ -90,12 +90,12 @@ if (ifPostContainsSelections()) {
 }
 
 // Init rows
-$OUT = ''; 
+$OUT = '';
 
 // Switch to testing mode
 $GLOBALS['theme_mode'] = 'test';
 
-$result = SQL_QUERY("SELECT
+$result = sqlQuery("SELECT
        `id`,
        `theme_path`,
        `theme_active`,
@@ -106,43 +106,46 @@ FROM
 ORDER BY
        `theme_path` ASC", __FILE__, __LINE__);
 
-if (!SQL_HASZERONUMS($result)) {
-       while ($content = SQL_FETCHARRAY($result)) {
-               // Construct IFN
-               $inc = sprintf("theme/%s/theme.php", $content['theme_path']);
-
-               // Load theme in test mode
-               loadInclude($inc);
-
-               // Copy data from theme to content
-               $content['theme_url'] = $GLOBALS['theme_data']['url'];
-
-               // Is the loaded theme name != current theme name?
-               $content['link'] = $content['theme_path'];
-               if ($content['theme_path'] != getCurrentTheme()) {
-                       $content['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>';
-               } // END - if
-
-               // Prepare data for the row template
-               $content['email'] = '<a href="mailto:' . $GLOBALS['theme_data']['email'] . '?Subject=[Theme:] ' . $GLOBALS['theme_data']['name'] . ' (' . $content['theme_path'] . ')\>' . $GLOBALS['theme_data']['author'] . '</a>';
-
-               // Load row template and switch color
-               $OUT .= loadTemplate('admin_edit_theme_row', true, $content);
+if (!ifSqlHasZeroNumRows($result)) {
+       while ($content = sqlFetchArray($result)) {
+               // Is the theme readable?
+               if (isThemeReadable($content['theme_path'])) {
+                       // Load theme in test mode
+                       loadInclude(sprintf('theme/%s/theme.php', $content['theme_path']));
+
+                       // Copy data from theme to content
+                       $content['theme_url'] = $GLOBALS['theme_data']['url'];
+
+                       // Is the loaded theme name != current theme name?
+                       $content['link'] = $content['theme_path'];
+                       if ($content['theme_path'] != getCurrentTheme()) {
+                               $content['link'] = '<a href="{%url=modules.php?module=admin&amp;what=theme_edit&amp;default_theme=' . $content['theme_path'] . '%}" title="{--ADMIN_SET_AS_DEFAULT_THEME--}">' . $content['theme_path'] . '</a>';
+                       } // END - if
+
+                       // Prepare data for the row template
+                       $content['email'] = '<a href="mailto:' . $GLOBALS['theme_data']['email'] . '?Subject=[Theme:] ' . $GLOBALS['theme_data']['name'] . ' (' . $content['theme_path'] . ')\>' . $GLOBALS['theme_data']['author'] . '</a>';
+
+                       // Load row template and switch color
+                       $OUT .= loadTemplate('admin_edit_theme_row', TRUE, $content);
+               } else {
+                       // Not readable
+                       $OUT .= loadTemplate('admin_edit_theme_row_404', TRUE, $content);
+               }
        } // END - while
 
        // Free memory
-       SQL_FREERESULT($result);
+       sqlFreeResult($result);
 } else {
        // No themes found???
        $OUT .= '<tr>
   <td colspan="7" class="bottom" height="60">
-    ' . displayMessage('{--ADMIN_NO_THEMES_FOUND--}', true) . '
+    ' . displayMessage('{--ADMIN_NO_THEMES_FOUND--}', TRUE) . '
   </td>
 </tr>';
 }
 
 // Load template
-loadTemplate('admin_edit_theme', false, $OUT);
+loadTemplate('admin_edit_theme', FALSE, $OUT);
 
 // [EOF]
 ?>