X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Flibs%2Fcountry_functions.php;h=a001eef4658d86c5273e481dce3e7586324b5fdf;hb=c3b4eaf29946349ff058691db2dcb615a5379bb2;hp=fa6694c3dc7533ab8e37c0d188ae8ceb0b7992da;hpb=cca98f57dff720b174d21d071cee8303462485d7;p=mailer.git

diff --git a/inc/libs/country_functions.php b/inc/libs/country_functions.php
index fa6694c3dc..a001eef465 100644
--- a/inc/libs/country_functions.php
+++ b/inc/libs/country_functions.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 04/30/2005 *
- * ===============                              Last change: 04/30/2005 *
+ * Mailer v0.2.1-FINAL                                Start: 04/30/2005 *
+ * ===================                          Last change: 04/30/2005 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : country_functions.php                            *
@@ -10,9 +10,13 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Funktionen fuer den Newsletter an die Gaeste     *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -33,27 +37,27 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
-	require($INC);
-}
+	die();
+} // END - if
 
 // Generate a human-readable country description with code
-function COUNTRY_GENERATE_INFO ($id) {
+function generateCountryInfo ($id) {
+	// Not found is the default
+	$ret = '{--COUNTRY_CODE_404--}';
+
 	// Load code and description
-	$result = SQL_QUERY_ESC("SELECT code, descr FROM `{!MYSQL_PREFIX!}_countries` WHERE id=%s LIMIT 1",
-		array(bigintval($id)), __FILE__, __LINE__);
+	$result = SQL_QUERY_ESC("SELECT `code`, `descr` FROM `{?_MYSQL_PREFIX?}_countries` WHERE `id`=%s LIMIT 1",
+		array(bigintval($id)), __FUNCTION__, __LINE__);
 
 	// Is there an entry?
 	if (SQL_NUMROWS($result) == 1) {
 		// Load entry
-		list($code, $descr) = SQL_FETCHROW($result);
+		$content = SQL_FETCHARRAY($result);
+		//* DEBUG: */ print($id.'=<pre>'.print_r($content, true).'</pre>');
 
 		// Construct human-readable description
-		$ret = sprintf("%s (%s)", $descr, $code);
-	} else {
-		// Not found!
-		$ret = COUNTRY_NOT_FOUND;
-	}
+		$ret = sprintf("%s (%s)", $content['descr'], $content['code']);
+	} // END - if
 
 	// Free the result
 	SQL_FREERESULT($result);
@@ -61,5 +65,6 @@ function COUNTRY_GENERATE_INFO ($id) {
 	// Return info
 	return $ret;
 }
-//
+
+// [EOF]
 ?>