X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Flibs%2Fyoomedia_functions.php;h=09f057640498342a7889c7524d32aafd98fdabc4;hb=f97a999e0737c0007ae9c3c26dfef49f75a175ac;hp=6cf2f2081319799af776d9b1d33fcaf50ef612ff;hpb=5f8c1a333627cd0145f778a6eebdb251f5bb40b6;p=mailer.git

diff --git a/inc/libs/yoomedia_functions.php b/inc/libs/yoomedia_functions.php
index 6cf2f20813..09f0576404 100644
--- a/inc/libs/yoomedia_functions.php
+++ b/inc/libs/yoomedia_functions.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Spezielle Funktion fuer Yoo!Media-Erweiterung    *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -33,14 +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);
 }
 
 // Test if the extension settings did work
-function YOOMEDIDA_TEST_CONFIG ($data) {
-	global $_CONFIG;
-
+function YOOMEDIA_TEST_CONFIG ($data) {
 	// Is this admin?
 	if (!IS_ADMIN()) {
 		// No admin!
@@ -48,23 +51,23 @@ function YOOMEDIDA_TEST_CONFIG ($data) {
 	} // END - if
 
 	// Transfer config data
-	$_CONFIG = array_merge($_CONFIG, $data);
+	mergeConfig($data);
 
 	// Temporary allow maximum
-	$_CONFIG['yoomedia_tm_max_reload']    = 1000;
-	$_CONFIG['yoomedia_tm_min_wait']      = 0;
-	$_CONFIG['yoomedia_tm_clicks_remain'] = 10;
-	$_CONFIG['yoomedia_tm_min_pay']       = 0;
-	$_CONFIG['yoomedia_erotic_allowed']   = 1;
+	setConfigEntry('yoomedia_tm_max_reload'   , 1000);
+	setConfigEntry('yoomedia_tm_min_wait'     , 0);
+	setConfigEntry('yoomedia_tm_clicks_remain', 10);
+	setConfigEntry('yoomedia_tm_min_pay'      , 0);
+	setConfigEntry('yoomedia_erotic_allowed'  , 1);
 
 	// Query the API with a test request without couting it
 	// If zero reply comes back the data is invalid!
-	$response = YOOMEDIA_QUERY_API("out_textmail.php", true); // TODO Ask Yoo!Media for test script
+	$response = YOOMEDIA_QUERY_API("out_textmail.php", true); // @TODO Ask Yoo!Media for test script
 
 	// Log the response if failed
 	if (count($response) == 0) {
 		// Queries depleted (as we count here!)
-		DEBUG_LOG(__FUNCTION__, __LINE__, " Requested depleted. Maxmimum was: ".$_CONFIG['yoomedia_requests_total']);
+		DEBUG_LOG(__FUNCTION__, __LINE__, " Requested depleted. Maxmimum was: ".getConfig('yoomedia_requests_total'));
 	} elseif (count($response) <= 10) {
 		// Log serialized raw response
 		DEBUG_LOG(__FUNCTION__, __LINE__, " Raw response=".base64_encode(serialize($response)));
@@ -76,24 +79,22 @@ function YOOMEDIDA_TEST_CONFIG ($data) {
 
 // Queries the given Yoo!Media API 2.0 script
 function YOOMEDIA_QUERY_API ($script, $countQuery = true) {
-	global $_CONFIG;
-
 	// Init response array
 	$response = array();
 
 	// Enougth queries left?
-	if (($_CONFIG['yoomedia_requests_remain'] > 0) || (!$countQuery)) {
+	if ((getConfig('yoomedia_requests_remain') > 0) || (!$countQuery)) {
 		// Prepare the low-level request
 		$requestString = sprintf("http://www.yoomedia.de/interface_2.0/%s?id=%s&sid=%s&pw=%s&reload=%s&ma=%s&uebrig=%s&verguetung=%s&erotik=%s",
 			$script,
-			bigintval($_CONFIG['yoomedia_id']),
-			bigintval($_CONFIG['yoomedia_sid']),
-			$_CONFIG['yoomedia_passwd'],
-			bigintval($_CONFIG['yoomedia_tm_max_reload']),
-			bigintval($_CONFIG['yoomedia_tm_min_wait']),
-			bigintval($_CONFIG['yoomedia_tm_clicks_remain']),
-			bigintval($_CONFIG['yoomedia_tm_min_pay']),
-			bigintval($_CONFIG['yoomedia_erotic_allowed'])
+			getConfig(('yoomedia_id')),
+			getConfig(('yoomedia_sid')),
+			getConfig('yoomedia_passwd'),
+			getConfig(('yoomedia_tm_max_reload')),
+			getConfig(('yoomedia_tm_min_wait')),
+			getConfig(('yoomedia_tm_clicks_remain')),
+			getConfig(('yoomedia_tm_min_pay')),
+			getConfig(('yoomedia_erotic_allowed'))
 		);
 
 		// Run the query
@@ -171,15 +172,13 @@ function YOOMEDIA_PARSE_RESPONSE ($response, $type) {
 	return $result;
 }
 
-// Prepares a bonus mail for delivery. Works only if extension "bonus" is active
+// Prepares a bonus mail for delivery. Works only if extension 'bonus' is active
 function YOOMEDIA_PREPARE_MAIL_DELIVERY ($data) {
-	global $_CONFIG;
-
 	// Is this an admin?
 	if (!IS_ADMIN()) {
 		// Abort here
 		return false;
-	} elseif (!EXT_IS_ACTIVE("bonus")) {
+	} elseif (!EXT_IS_ACTIVE('bonus')) {
 		// Abort here
 		return false;
 	}
@@ -194,13 +193,13 @@ function YOOMEDIA_PREPARE_MAIL_DELIVERY ($data) {
 	if ($data['reward'] < 1) $data['reward'] = 1;
 
 	// Add website id
-	$data['sid'] = $_CONFIG['yoomedia_sid'];
+	$data['sid'] = getConfig('yoomedia_sid');
 
 	// Add total receivers
 	$data['all'] = TRANSLATE_COMMA(GET_TOTAL_RECEIVERS());
 
 	// Add categories
-	$data['categories'] = ADD_CATEGORY_OPTIONS("normal");
+	$data['categories'] = ADD_CATEGORY_OPTIONS('normal');
 
 	// Load template
 	LOAD_TEMPLATE("admin_send_yoomedia", false, $data);
@@ -208,13 +207,11 @@ function YOOMEDIA_PREPARE_MAIL_DELIVERY ($data) {
 
 // Adds the mail to the bonus mail pool
 function YOOMEDIA_SEND_BONUS_MAIL ($data, $mode) {
-	global $_CONFIG;
-
 	// Is this an admin?
 	if (!IS_ADMIN()) {
 		// Abort here
 		return false;
-	} elseif (!EXT_IS_ACTIVE("bonus")) {
+	} elseif (!EXT_IS_ACTIVE('bonus')) {
 		// Abort here
 		return false;
 	}
@@ -223,8 +220,8 @@ function YOOMEDIA_SEND_BONUS_MAIL ($data, $mode) {
 	$data['receiver'] = 0;
 
 	// HTML or normal? (normal is default...)
-	$type = "t";
-	if (($mode == "html") && (EXT_IS_ACTIVE("html"))) $type = "h";
+	$type = 't';
+	if (($mode == 'html') && (EXT_IS_ACTIVE('html_mail'))) $type = 'h';
 
 	// Auto-generate URL
 	$data['url'] = sprintf("http://www.yoomedia.de/code/%s-mail.php?id=%s&sid=%s",
@@ -248,8 +245,8 @@ function YOOMEDIA_EXCLUDE_MAIL ($data, $mode) {
 		$mode = YOOMEDIA_CONVERT_MODE($mode);
 
 		// Add the entry
-		$result = SQL_QUERY_ESC("INSERT INTO `"._MYSQL_PREFIX."_yoomedia_reload` (`type`,`y_id`,`y_reload`,`inserted`) VALUES ('%s',%s,%s,'0000-00-00 00:00')",
-			array($mode, bigintval($data['id']), bigintval($data['reload'])), __FILE__, __LINE__);
+		SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_yoomedia_reload` (`type`,`y_id`,`y_reload`,`inserted`) VALUES ('%s',%s,%s,'0000-00-00 00:00')",
+			array($mode, bigintval($data['id']), bigintval($data['reload'])), __FUNCTION__, __LINE__);
 	} // END - if
 }
 
@@ -259,21 +256,19 @@ function YOOMEDIA_UNLIST_MAIL ($data, $mode) {
 	$mode = YOOMEDIA_CONVERT_MODE($mode);
 
 	// Add the entry
-	$result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `"._MYSQL_PREFIX."_yoomedia_reload` WHERE `type`='%s' AND `y_id`=%s LIMIT 1",
-		array($mode, bigintval($data['id'])), __FILE__, __LINE__);
+	SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_yoomedia_reload` WHERE `type`='%s' AND `y_id`=%s LIMIT 1",
+		array($mode, bigintval($data['id'])), __FUNCTION__, __LINE__);
 }
 
 // "Translates" the index number into an assosiative value
 function YOOMEDIA_TRANSLATE_INDEX ($type, $index) {
-	global $yoomediaTranslationTable;
-
 	// Default is the index
 	$return = $index;
 
 	// Is the element there?
-	if (isset($yoomediaTranslationTable[$type][$index])) {
+	if (isset($GLOBALS['translation_tables']['yoomedia'][$type][$index])) {
 		// Use this element
-		$return = $yoomediaTranslationTable[$type][$index];
+		$return = $GLOBALS['translation_tables']['yoomedia'][$type][$index];
 	} else {
 		// Not found!
 		DEBUG_LOG(__FUNCTION__, __LINE__, " type={$type},index={$index} not found.");
@@ -285,15 +280,13 @@ function YOOMEDIA_TRANSLATE_INDEX ($type, $index) {
 
 // "Translate" error code
 function YOOMEDIA_TRANSLATE_ERROR ($errorCode) {
-	global $yoomediaTranslationTable;
-
 	// Default is "failed"
 	$return = "failed";
 
 	// Is the entry there?
-	if (isset($yoomediaTranslationTable['error_codes'][$errorCode])) {
+	if (isset($GLOBALS['translation_tables']['yoomedia']['error_codes'][$errorCode])) {
 		// Entry found!
-		$return = $yoomediaTranslationTable['error_codes'][$errorCode];
+		$return = $GLOBALS['translation_tables']['yoomedia']['error_codes'][$errorCode];
 	} else {
 		// Log missing entries
 		DEBUG_LOG(__FUNCTION__, __LINE__, " errorCode={$errorCode}");
@@ -309,8 +302,8 @@ function YOOMEDIA_CHECK_RELOAD ($id, $reload, $type) {
 	$reloaded = false;
 
 	// Query database
-	$result = SQL_QUERY_ESC("SELECT `id`, UNIX_TIMESTAMP(`inserted`) AS inserted FROM `"._MYSQL_PREFIX."_yoomedia_reload` WHERE `type`='%s' AND `y_id`=%s LIMIT 1",
-		array($type, bigintval($id)), __FILE__, __LINE__);
+	$result = SQL_QUERY_ESC("SELECT `id`, UNIX_TIMESTAMP(`inserted`) AS inserted FROM `{!_MYSQL_PREFIX!}_yoomedia_reload` WHERE `type`='%s' AND `y_id`=%s LIMIT 1",
+		array($type, bigintval($id)), __FUNCTION__, __LINE__);
 
 	// Entry found?
 	if (SQL_NUMROWS($result) == 1) {
@@ -320,8 +313,8 @@ function YOOMEDIA_CHECK_RELOAD ($id, $reload, $type) {
 		// Are we ready to sent again?
 		if (((time() - $time) >= ($reload * 60*60)) && ($time > 0)) {
 			// Remove entry
-			$result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_yoomedia_reload WHERE id=%s LIMIT 1",
-				array($id), __FILE__, __LINE__);
+			SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_yoomedia_reload` WHERE id=%s LIMIT 1",
+				array($id), __FUNCTION__, __LINE__);
 		} else {
 			// Dont' sent again this mail
 			$reloaded = $time;
@@ -343,8 +336,8 @@ function YOOMEDIA_RELOAD_LOCK ($data, $mode) {
 		$mode = YOOMEDIA_CONVERT_MODE($mode);
 
 		// Add the entry
-		$result = SQL_QUERY_ESC("INSERT INTO `"._MYSQL_PREFIX."_yoomedia_reload` (`type`,`y_id`,`y_reload`) VALUES ('%s',%s,%s)",
-			array($mode, bigintval($data['id']), bigintval($data['reload'])), __FILE__, __LINE__);
+		SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_yoomedia_reload` (`type`,`y_id`,`y_reload`) VALUES ('%s',%s,%s)",
+			array($mode, bigintval($data['id']), bigintval($data['reload'])), __FUNCTION__, __LINE__);
 	} // END - if
 }
 
@@ -352,11 +345,11 @@ function YOOMEDIA_RELOAD_LOCK ($data, $mode) {
 function YOOMEDIA_CONVERT_MODE ($mode) {
 	// Convert mode for normal/html
 	switch ($mode) {
-		case "normal":
+		case 'normal':
 			$mode = "textmail";
 			break;
 
-		case "html":
+		case 'html':
 			$mode = "htmlmail";
 			break;
 	} // END - switch