X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Ftheme_functions.php;h=ff9e5e3497297cb6348b51c708204abd1b3f3da5;hb=e1d636846bafc8ae71855595a2a2843463025e26;hp=766ca009a9a5db752191a7208ab8497a56535109;hpb=f26aab4a55972825a0d3ef9346c8c8dea8752b7b;p=mailer.git

diff --git a/inc/libs/theme_functions.php b/inc/libs/theme_functions.php
index 766ca009a9..ff9e5e3497 100644
--- a/inc/libs/theme_functions.php
+++ b/inc/libs/theme_functions.php
@@ -38,12 +38,12 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
 	require($INC);
 }
 
 // Create a selection box with installed and activated themes
-function THEME_SELECTION_BOX ($mod, $act, $wht, $result) {
+function generateThemeSelectionBox ($mod, $act, $wht, $result) {
 	// Construction URL
 	$formAction = "{!URL!}/modules.php?module=".$mod;
 	if (!empty($act)) $formAction .= "&action=".$act;
@@ -59,11 +59,11 @@ function THEME_SELECTION_BOX ($mod, $act, $wht, $result) {
 	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)) {
+		if (isIncludeReadable($INC)) {
 			// And save all data in array
-			LOAD_INC($INC);
+			loadInclude($INC);
 			$themesArray['theme_unix'][] = $content['theme_path'];
-			$themesArray['theme_name'][] = $THEME_NAME;
+			$themesArray['theme_name'][] = $GLOBALS['theme_data']['name'];
 		} // END - if
 	} // END - while
 
@@ -71,10 +71,10 @@ function THEME_SELECTION_BOX ($mod, $act, $wht, $result) {
 	array_pk_sort($themesArray, array("theme_name"));
 
 	// Construct selection form for the box template
-	$OUT = "";
+	$OUT = '';
 	foreach ($themesArray['theme_unix'] as $key => $theme) {
 		$OUT .= "  <option value=\"".$theme."\"";
-		if ($theme == GET_CURR_THEME()) $OUT .= " selected=\"selected\"";
+		if ($theme == getCurrentTheme()) $OUT .= ' selected="selected"';
 		$OUT .= ">".$themesArray['theme_name'][$key]."</option>\n";
 	} // END - foreach
 
@@ -90,8 +90,8 @@ function THEME_SELECTION_BOX ($mod, $act, $wht, $result) {
 
 // Get version from name
 function THEME_GET_VERSION ($name) {
-	// Is the extension "theme" installed?
-	if (!EXT_IS_ACTIVE("theme")) {
+	// Is the extension 'theme' installed?
+	if (!EXT_IS_ACTIVE('theme')) {
 		// Then abort here
 		return "!.!";
 	} // END - if
@@ -106,10 +106,10 @@ function THEME_GET_VERSION ($name) {
 
 		// Count up
 		incrementConfigEntry('cache_hits');
-	} elseif (GET_EXT_VERSION("cache") != "0.1.8") {
+	} elseif (GET_EXT_VERSION('cache') != '0.1.8') {
 		// Load version from database
 		$result = SQL_QUERY_ESC("SELECT theme_ver FROM `{!_MYSQL_PREFIX!}_themes` WHERE theme_path='%s' LIMIT 1",
-			array($name), __FUNCTION__, __LINE__);
+		array($name), __FUNCTION__, __LINE__);
 
 		// Entry found?
 		if (SQL_NUMROWS($result) == 1) {
@@ -126,15 +126,15 @@ function THEME_GET_VERSION ($name) {
 }
 
 // Checks wether a theme is found in db
-function THEME_CHECK_EXIST ($name) {
+function ifThemeExists ($name) {
 	// Get theme and is it not nul?
-	return (THEME_GET_ID($name) > 0);
+	return (getThemeId($name) > 0);
 }
 
 // Checks if a theme is active
-function THEME_IS_ACTIVE ($name) {
-	// Is the extension "theme" installed?
-	if (!EXT_IS_ACTIVE("theme")) {
+function isThemeActive ($name) {
+	// Is the extension 'theme' installed?
+	if (!EXT_IS_ACTIVE('theme')) {
 		// Then abort here
 		return false;
 	} // END - if
@@ -145,14 +145,14 @@ function THEME_IS_ACTIVE ($name) {
 	// Is the cache entry there?
 	if (isset($GLOBALS['cache_array']['themes']['theme_active'][$name])) {
 		// Get the version from cache
-		$active = ($GLOBALS['cache_array']['themes']['theme_active'][$name] == "Y");
+		$active = ($GLOBALS['cache_array']['themes']['theme_active'][$name] == 'Y');
 
 		// Count up
 		incrementConfigEntry('cache_hits');
-	} elseif (GET_EXT_VERSION("cache") != "0.1.8") {
+	} elseif (GET_EXT_VERSION('cache') != '0.1.8') {
 		// Check if current theme is already imported or not
 		$result = SQL_QUERY_ESC("SELECT theme_active FROM `{!_MYSQL_PREFIX!}_themes` WHERE theme_path='%s' AND theme_active='Y' LIMIT 1",
-			array($name), __FUNCTION__, __LINE__);
+		array($name), __FUNCTION__, __LINE__);
 
 		// Is the theme active and installed?
 		$active = (SQL_NUMROWS($result) == 1);
@@ -166,15 +166,15 @@ function THEME_IS_ACTIVE ($name) {
 }
 
 // Gets current human-readable theme name
-function GET_CURR_THEME_NAME () {
-	// Is the extension "theme" installed?
-	if (!EXT_IS_ACTIVE("theme")) {
+function getCurrentThemeName () {
+	// Is the extension 'theme' installed?
+	if (!EXT_IS_ACTIVE('theme')) {
 		// Then abort here
 		return "default";
 	} // END - if
 
 	// Get the Uni* name
-	$name = GET_CURR_THEME();
+	$name = getCurrentTheme();
 
 	// Is the cache entry there?
 	if (isset($GLOBALS['cache_array']['themes']['theme_name'][$name])) {
@@ -183,10 +183,10 @@ function GET_CURR_THEME_NAME () {
 
 		// Count up
 		incrementConfigEntry('cache_hits');
-	} elseif (GET_EXT_VERSION("cache") != "0.1.8") {
+	} elseif (GET_EXT_VERSION('cache') != '0.1.8') {
 		// Check if current theme is already imported or not
 		$result = SQL_QUERY_ESC("SELECT theme_name FROM `{!_MYSQL_PREFIX!}_themes` WHERE theme_path='%s' AND theme_active='Y' LIMIT 1",
-			array($name), __FUNCTION__, __LINE__);
+		array($name), __FUNCTION__, __LINE__);
 
 		// Load theme name
 		list($name) = SQL_FETCHROW($result);
@@ -200,7 +200,7 @@ function GET_CURR_THEME_NAME () {
 }
 
 // Initialize variables
-$GLOBALS['curr_theme'] = GET_CURR_THEME();
+$GLOBALS['curr_theme'] = getCurrentTheme();
 
 // Check if new theme is selcted
 if ((REQUEST_ISSET_POST(('new_theme'))) && (REQUEST_POST('new_theme') != $GLOBALS['curr_theme'])) {
@@ -208,7 +208,7 @@ if ((REQUEST_ISSET_POST(('new_theme'))) && (REQUEST_POST('new_theme') != $GLOBAL
 	$newTheme = REQUEST_POST('new_theme');
 
 	// Change to new theme
-	set_session('mxchange_theme', $newTheme);
+	setSession('mxchange_theme', $newTheme);
 
 	// Remove current from array and set new
 	$theme = sprintf("%stheme/%s/theme.php", constant('PATH'), $GLOBALS['curr_theme']);