X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Ftheme_functions.php;h=4c5c934c98922ae8d90f662c2dd9c319e313af44;hp=ba09b55a20016e60416e1b19006699ba95ed2880;hb=57227d33e870ec5cd271209c4a978a52b45c2dd6;hpb=bf1fe67a7b4d66dcbb0491c330d969bb8adcc577 diff --git a/inc/libs/theme_functions.php b/inc/libs/theme_functions.php index ba09b55a20..4c5c934c98 100644 --- a/inc/libs/theme_functions.php +++ b/inc/libs/theme_functions.php @@ -1,18 +1,23 @@ = "0.1.4")) { - //die("
".print_r($cacheArray['themes'], true)."
"); - // Get theme from cookie - $ret = get_session('mxchange_theme'); - - // Is it valid? - if (THEME_GET_ID($ret) == 0) { - // Fix it to default - $ret = "default"; - } // END - if - } elseif ((!isBooleanConstantAndTrue('mxchange_installed')) && ((isBooleanConstantAndTrue('mxchange_installing')) || ($CSS == true)) && ((!empty($_GET['theme'])) || (!empty($_POST['theme'])))) { - // Prepare FQFN for checking - $theme = sprintf("%stheme/%s/theme.php", PATH, SQL_ESCAPE($_GET['theme'])); - - // Installation mode active - if ((!empty($_GET['theme'])) && (FILE_READABLE($theme))) { - // Set cookie from URL data - set_session("mxchange_theme", SQL_ESCAPE($_GET['theme'])); - } elseif (FILE_READABLE(sprintf("%stheme/%s/theme.php", PATH, SQL_ESCAPE($_POST['theme'])))) { - // Set cookie from posted data - set_session("mxchange_theme", SQL_ESCAPE($_POST['theme'])); - } - - // Set return value - $ret = get_session('mxchange_theme'); - } else { - // Invalid design, reset cookie - set_session("mxchange_theme", $ret); - } - - // Add (maybe) found theme.php file to inclusion list - $theme = sprintf("%stheme/%s/theme.php", PATH, SQL_ESCAPE($ret)); - - // Try to load the requested include file - if (FILE_READABLE($theme)) $INC_POOL[] = $theme; - - // Return theme value - return $ret; -} -} // END - if +// Create a selection box with installed and activated themes or all if admin +function generateThemeSelectionBox () { + // Init variables and fill them if set + $what = getWhat(); + $mod = getModule(); -function THEME_SELECTION_BOX($mod, $act, $wht, $result) { // Construction URL - $FORM = URL."/modules.php?module=".$mod; - if (!empty($act)) $FORM .= "&action=".$act; - if (!empty($wht)) $FORM .= "&what=".$wht; - define('__FORM_VALUE', $FORM); + $formAction = "{%url=modules.php?module=" . $mod; + if (!empty($what)) $formAction .= "&what=" . $what; + $formAction = '%}'; // Initialize array - $THEMES = array( + $themesArray = array( 'theme_unix' => array(), // Unix name from filesystem 'theme_name' => array() // Title ); + // Only activated themes for the user + $add = " WHERE `theme_active`='Y'"; + + // Do we have admin? + if (isAdmin()) $add = ''; + + // Select all themes we want + $result = SQL_QUERY("SELECT + `theme_path`, `theme_name` +FROM + `{?_MYSQL_PREFIX?}_themes` +".$add." +ORDER BY + `theme_name` ASC", __FILE__, __LINE__); + // Load all themes - while(list($theme) = SQL_FETCHROW($result)) { - // Load it's theme.php file - $INC = sprintf("%stheme/%s/theme.php", PATH, SQL_ESCAPE($theme)); - if (FILE_READABLE($INC)) { + while ($content = SQL_FETCHARRAY($result)) { + // Construct relative include file name + $inc = sprintf("theme/%s/theme.php", secureString($content['theme_path'])); + + // Load it's theme.php file if found + if (isIncludeReadable($inc)) { // And save all data in array - require($INC); - $THEMES['theme_unix'][] = $theme; - $THEMES['theme_name'][] = $THEME_NAME; + loadInclude($inc); + $themesArray['theme_unix'][] = $content['theme_path']; + $themesArray['theme_name'][] = $GLOBALS['theme_data']['name']; } // END - if } // END - while - // Sort whole array by title - array_pk_sort($THEMES, array("theme_name")); + // Free the result + SQL_FREERESULT($result); // Construct selection form for the box template - $OUT = ""; - foreach ($THEMES['theme_unix'] as $key => $theme) { - $OUT .= "