X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Ftheme_functions.php;h=09dee2dd5df886db06016112589d0edebd708c44;hb=b5e396d81912f97a5752b4a4e61ae08f7c1efbd5;hp=2e4b807dbec1170a46dd19965596c411eadc4ee9;hpb=116747e4dba29e9e2e4daa82c45d8bbb302e9378;p=mailer.git
diff --git a/inc/libs/theme_functions.php b/inc/libs/theme_functions.php
index 2e4b807dbe..09dee2dd5d 100644
--- a/inc/libs/theme_functions.php
+++ b/inc/libs/theme_functions.php
@@ -1,10 +1,10 @@
array() // Title
);
+ // Only activated themes for the user
+ $add = " WHERE `theme_active`='Y'";
+
+ // Is there admin?
+ if (isAdmin()) {
+ // Then display all themes
+ $add = '';
+ } // END - if
+
+ // Select all themes we want
+ $result = sqlQuery('SELECT
+ `theme_path`,
+ `theme_name`
+FROM
+ `{?_MYSQL_PREFIX?}_themes`
+' . $add . '
+ORDER BY
+ `theme_name` ASC', __FUNCTION__, __LINE__);
+
// Load all themes
- while ($content = SQL_FETCHARRAY($result)) {
- // Load it's theme.php file
- $INC = sprintf("theme/%s/theme.php", SQL_ESCAPE($content['theme_path']));
- if (INCLUDE_READABLE($INC)) {
+ while ($row = sqlFetchArray($result)) {
+ // Construct relative include file name
+ $inc = sprintf("theme/%s/theme.php", secureString($row['theme_path']));
+
+ // Load it's theme.php file if found
+ if (isIncludeReadable($inc)) {
// And save all data in array
- LOAD_INC($INC);
- $themesArray['theme_unix'][] = $content['theme_path'];
- $themesArray['theme_name'][] = $GLOBALS['theme_data']['name'];
+ loadInclude($inc);
+ array_push($themesArray['theme_unix'], $row['theme_path']);
+ array_push($themesArray['theme_name'], $row['theme_name']);
} // END - if
} // END - while
- // Sort whole array by title
- array_pk_sort($themesArray, array("theme_name"));
+ // Free the result
+ sqlFreeResult($result);
// Construct selection form for the box template
+ // @TODO Can't this be rewritten to an API function?
$OUT = '';
foreach ($themesArray['theme_unix'] as $key => $theme) {
- $OUT .= "