X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Ftheme_functions.php;h=74894b99564c3dabaf3dcb7dfa47b0220f913540;hp=e4f4426f4d6eff39620a954935f24ba39a70f20b;hb=e5527fd38a6585c8466dc28d013f12d21eb7c07a;hpb=cd7d344ea7007cfa20413acd3e03e50f0ab86d86

diff --git a/inc/libs/theme_functions.php b/inc/libs/theme_functions.php
index e4f4426f4d..74894b9956 100644
--- a/inc/libs/theme_functions.php
+++ b/inc/libs/theme_functions.php
@@ -66,7 +66,7 @@ function generateThemeSelectionBox () {
 	} // END - if
 
 	// Select all themes we want
-	$result = SQL_QUERY('SELECT
+	$result = sqlQuery('SELECT
 	`theme_path`,
 	`theme_name`
 FROM
@@ -76,21 +76,18 @@ ORDER BY
 	`theme_name` ASC', __FUNCTION__, __LINE__);
 
 	// Load all themes
-	while ($row = SQL_FETCHARRAY($result)) {
-		// Construct relative include file name
-		$inc = sprintf("theme/%s/theme.php", secureString($row['theme_path']));
-
+	while ($row = sqlFetchArray($result)) {
 		// Load it's theme.php file if found
-		if (isIncludeReadable($inc)) {
+		if (isThemeReadable($row['theme_path'])) {
 			// And save all data in array
-			loadInclude($inc);
+			loadInclude(sprintf('theme/%s/theme.php', secureString($row['theme_path'])));
 			array_push($themesArray['theme_unix'], $row['theme_path']);
 			array_push($themesArray['theme_name'], $row['theme_name']);
 		} // END - if
 	} // END - while
 
 	// Free the result
-	SQL_FREERESULT($result);
+	sqlFreeResult($result);
 
 	// Construct selection form for the box template
 	// @TODO Can't this be rewritten to an API function?
@@ -134,17 +131,17 @@ function getThemeVersion ($name) {
 		incrementStatsEntry('cache_hits');
 	} elseif (isExtensionInstalledAndNewer('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",
+		$result = sqlQueryEscaped("SELECT `theme_ver` FROM `{?_MYSQL_PREFIX?}_themes` WHERE `theme_path`='%s' LIMIT 1",
 			array($name), __FUNCTION__, __LINE__);
 
 		// Entry found?
-		if (SQL_NUMROWS($result) == 1) {
+		if (sqlNumRows($result) == 1) {
 			// Fetch data
-			list($cver) = SQL_FETCHROW($result);
+			list($cver) = sqlFetchRow($result);
 		} // END - if
 
 		// Free result
-		SQL_FREERESULT($result);
+		sqlFreeResult($result);
 	}
 
 	// Return version
@@ -154,7 +151,7 @@ function getThemeVersion ($name) {
 // Checks whether a theme is found in db
 function ifThemeExists ($name) {
 	// Get theme and is it not nul?
-	return (((isExtensionActive('theme')) || (getModule() == 'admin')) && (getThemeId($name) > 0));
+	return (((isExtensionActive('theme')) || (getModule() == 'admin')) && (isValidId(getThemeId($name))));
 }
 
 // Checks if a theme is active
@@ -177,14 +174,14 @@ function isThemeActive ($name) {
 		incrementStatsEntry('cache_hits');
 	} elseif (isExtensionInstalledAndNewer('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",
+		$result = sqlQueryEscaped("SELECT `theme_active` FROM `{?_MYSQL_PREFIX?}_themes` WHERE `theme_path`='%s' AND `theme_active`='Y' LIMIT 1",
 			array($name), __FUNCTION__, __LINE__);
 
 		// Is the theme active and installed?
-		$active = (SQL_NUMROWS($result) == 1);
+		$active = (sqlNumRows($result) == 1);
 
 		// Free result
-		SQL_FREERESULT($result);
+		sqlFreeResult($result);
 	}
 
 	// Return result
@@ -211,14 +208,14 @@ function getCurrentThemeName () {
 		incrementStatsEntry('cache_hits');
 	} elseif (isExtensionInstalledAndNewer('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",
+		$result = sqlQueryEscaped("SELECT `theme_name` FROM `{?_MYSQL_PREFIX?}_themes` WHERE `theme_path`='%s' AND `theme_active`='Y' LIMIT 1",
 			array($name), __FUNCTION__, __LINE__);
 
 		// Load theme name
-		list($name) = SQL_FETCHROW($result);
+		list($name) = sqlFetchRow($result);
 
 		// Free result
-		SQL_FREERESULT($result);
+		sqlFreeResult($result);
 	}
 
 	// Return name
@@ -250,13 +247,13 @@ function getActualTheme () {
 		} // END - if
 	} elseif ((!isInstalled()) && ((isInstalling()) || (isHtmlOutputMode())) && ((isGetRequestElementSet('theme')) || (isPostRequestElementSet('theme')))) {
 		// Prepare filename for checking
-		$themeFile = sprintf("theme/%s/theme.php", getRequestElement('theme'));
+		$themeFile = sprintf('theme/%s/theme.php', getRequestElement('theme'));
 
 		// Installation mode active
-		if ((isGetRequestElementSet('theme')) && (isIncludeReadable($theme))) {
+		if ((isGetRequestElementSet('theme')) && (isThemeReadable(getRequestElement('theme')))) {
 			// Set cookie from URL data
 			setMailerTheme(getRequestElement('theme'));
-		} elseif (isIncludeReadable(sprintf("theme/%s/theme.php", postRequestElement('theme')))) {
+		} elseif ((isPostRequestElementSet('theme')) && (isThemeReadable(postRequestElement('theme')))) {
 			// Set cookie from posted data
 			setMailerTheme(postRequestElement('theme'));
 		}
@@ -286,17 +283,17 @@ function getThemeId ($name) {
 		incrementStatsEntry('cache_hits');
 	} elseif (isExtensionInstalledAndNewer('cache', '0.1.8')) {
 		// Check if current theme is already imported or not
-		$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_themes` WHERE `theme_path`='%s' LIMIT 1",
+		$result = sqlQueryEscaped("SELECT `id` FROM `{?_MYSQL_PREFIX?}_themes` WHERE `theme_path`='%s' LIMIT 1",
 			array($name), __FUNCTION__, __LINE__);
 
 		// Entry found?
-		if (SQL_NUMROWS($result) == 1) {
+		if (sqlNumRows($result) == 1) {
 			// Fetch data
-			list($id) = SQL_FETCHROW($result);
+			list($id) = sqlFetchRow($result);
 		} // END - if
 
 		// Free result
-		SQL_FREERESULT($result);
+		sqlFreeResult($result);
 	}
 
 	// Return id