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

diff --git a/inc/libs/country_functions.php b/inc/libs/country_functions.php
index ec76f25c1e..f6874279e0 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                            *
@@ -14,10 +14,9 @@
  * $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                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -38,27 +37,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 = '{--COUNTRY_CODE_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 +64,6 @@ function COUNTRY_GENERATE_INFO ($id) {
 	// Return info
 	return $ret;
 }
-//
+
+// [EOF]
 ?>