X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fcountry_functions.php;h=7254ff1022ec98c242822250f3a7eeb7a1655f76;hb=6d08952d672c5a5de7d8522f894a5665599a2a4a;hp=eb185682b2a3b4939a0fc473134d4ba11dae9626;hpb=09f5758c42a33a56bdd461c946ffe759a59c54aa;p=mailer.git

diff --git a/inc/libs/country_functions.php b/inc/libs/country_functions.php
index eb185682b2..7254ff1022 100644
--- a/inc/libs/country_functions.php
+++ b/inc/libs/country_functions.php
@@ -14,12 +14,10 @@
  * $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 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -45,27 +43,55 @@ if (!defined('__SECURITY')) {
 // Generate a human-readable country description with code
 function generateCountryInfo ($id) {
 	// Not found is the default
-	$ret = getMessage('COUNTRY_404');
+	$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 = sqlQueryEscaped("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) {
+	if (sqlNumRows($result) == 1) {
 		// Load entry
-		$content = SQL_FETCHARRAY($result);
+		$content = sqlFetchArray($result);
+		//* DEBUG: */ print($id.'=<pre>'.print_r($content, TRUE).'</pre>');
 
 		// Construct human-readable description
 		$ret = sprintf("%s (%s)", $content['descr'], $content['code']);
 	} // END - if
 
 	// Free the result
-	SQL_FREERESULT($result);
+	sqlFreeResult($result);
 
 	// Return info
 	return $ret;
 }
 
+// Adds a country code selection box
+function addCountryCodeSelectionBox ($countryCode = NULL) {
+	// The admin may see all
+	$whereStatement = "WHERE `is_active`='Y'";
+
+	// Is admin?
+	if (isAdmin()) {
+		// Then display all codes
+		$whereStatement = '';
+	} // END - if
+
+	// Generate the HTML code
+	$OUT  = '<select name="country_code" class="form_select" size="1">';
+	$OUT .= generateOptions('countries', 'id', 'descr', $countryCode, 'code', $whereStatement);
+	$OUT .= '</select>';
+
+	// Return it
+	return $OUT;
+}
+
 // [EOF]
 ?>