Failed SQL queries are now also reported in bug mails, SQL queries improved (more...

[mailer.git] / inc / libs / country_functions.php

diff --git a/inc/libs/country_functions.php b/inc/libs/country_functions.php
index d8cd7d7781528482380878a66c896039cd898be2..eb185682b2a3b4939a0fc473134d4ba11dae9626 100644 (file)
--- 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                            *
@@ -17,7 +17,8 @@
  * 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 +39,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 +66,6 @@ function COUNTRY_GENERATE_INFO ($id) {
        // Return info
        return $ret;
 }
-//
+
+// [EOF]
 ?>