X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Floader%2Fload-points_data.php;h=4c8dd0701b9b3eef0b765979b1d20a64540de677;hb=d1922ab361b5e104b7c14b28c76d1c47651635ef;hp=659b3fed1c31c108cc9451bb48d53f82f52eb317;hpb=75c607f5f29956eb71599aee3f682753e4d21fef;p=mailer.git

diff --git a/inc/loader/load-points_data.php b/inc/loader/load-points_data.php
index 659b3fed1c..4c8dd0701b 100644
--- a/inc/loader/load-points_data.php
+++ b/inc/loader/load-points_data.php
@@ -10,13 +10,8 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Mehr Cache-Dateien nachladen                     *
  * -------------------------------------------------------------------- *
- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2016 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -38,9 +33,13 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
 	die();
-} elseif (isInstallationPhase()) {
-	// Use this code if you don't want to run this cache loader on installation phase
-	return;
+} elseif (isInstaller()) {
+	// Do not run in installation phase
+	//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Run from installation phase.');
+	return FALSE;
+} elseif (!isExtensionInstalledAndNewer('sql_patches', '0.8.0')) {
+	// Is not installed or recent enough
+	return FALSE;
 }
 
 // Let's start with the admins table...
@@ -48,22 +47,22 @@ if (($GLOBALS['cache_instance']->loadCacheFile('points_data')) && ($GLOBALS['cac
 	// Load cache
 	$GLOBALS['cache_array']['points_data'] = $GLOBALS['cache_instance']->getArrayFromCache();
 
-	// Do we have cache?
+	// Is there cache?
 	if (!isset($GLOBALS['cache_array']['points_data']['subject'])) {
 		// Try to remove the cache file
 		$GLOBALS['cache_instance']->removeCacheFile();
 
 		// Not found, so better abort here
-		debug_report_bug(__FILE__, __LINE__, 'points_data has been generated, but does not contain "subject". Please try to reload to fix this.');
+		reportBug(__FILE__, __LINE__, 'points_data has been generated, but does not contain "subject". Please try to reload to fix this.');
 	} // END - if
 
 	// Init temporary array
 	$pointsData = array();
 
 	// Rewrite all to subject
-	foreach ($GLOBALS['cache_array']['points_data']['subject'] as $key=>$subject) {
+	foreach ($GLOBALS['cache_array']['points_data']['subject'] as $key => $subject) {
 		// Re-add key with subject
-		foreach ($GLOBALS['cache_array']['points_data'] as $key2=>$array) {
+		foreach ($GLOBALS['cache_array']['points_data'] as $key2 => $array) {
 			// Is key2 not 'subject'?
 			if ($key2 != 'subject') {
 				// Then Add it
@@ -75,19 +74,19 @@ if (($GLOBALS['cache_instance']->loadCacheFile('points_data')) && ($GLOBALS['cac
 	// Set the array back and remove temporary
 	$GLOBALS['cache_array']['points_data'] = $pointsData;
 	unset($pointsData);
-} elseif ((isHtmlOutputMode()) && (isExtensionInstalledAndNewer('sql_patches', '0.8.0'))) {
+} elseif (((isHtmlOutputMode()) || (isAjaxOutputMode()) || (isRawOutputMode())) && (isExtensionInstalledAndNewer('sql_patches', '0.8.6'))) {
 	// Create cache file
 	$GLOBALS['cache_instance']->init();
 
 	// Query the database about this
-	$result = SQL_QUERY('SELECT * FROM `{?_MYSQL_PREFIX?}_points_data` ORDER BY `id` ASC', __FILE__, __LINE__);
-	while ($dummy = SQL_FETCHARRAY($result)) {
+	$result = sqlQuery('SELECT * FROM `{?_MYSQL_PREFIX?}_points_data` ORDER BY `id` ASC', __FILE__, __LINE__);
+	while ($data = sqlFetchArray($result)) {
 		// Save row
-		$GLOBALS['cache_instance']->addRow($dummy);
+		$GLOBALS['cache_instance']->addRow($data);
 	} // END - while
 
 	// Free memory
-	SQL_FREERESULT($result);
+	sqlFreeResult($result);
 
 	// Close cache
 	$GLOBALS['cache_instance']->storeExtensionVersion('sql_patches');