X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fcountry_functions.php;h=c5d341e8487ee1d776fcdfc16ff8aac1672fd9b3;hb=f2736bc6457140146890877d992be862a78b259f;hp=ec76f25c1e8430b05b1498dad49d796a248b3828;hpb=fb7120ffa230b62b54895bcf95952e1cf30f8594;p=mailer.git

diff --git a/inc/libs/country_functions.php b/inc/libs/country_functions.php
index ec76f25c1e..c5d341e848 100644
--- a/inc/libs/country_functions.php
+++ b/inc/libs/country_functions.php
@@ -17,7 +17,7 @@
  * 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                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -38,27 +38,26 @@
 
 // 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 = getMessage('COUNTRY_404');
+
 	// Load code and description
-	$result = SQL_QUERY_ESC("SELECT code, descr FROM `{!_MYSQL_PREFIX!}_countries` WHERE id=%s LIMIT 1",
+	$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);
 
 		// 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);
@@ -66,5 +65,6 @@ function COUNTRY_GENERATE_INFO ($id) {
 	// Return info
 	return $ret;
 }
-//
+
+// [EOF]
 ?>