Heavily rewritten API:

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

diff --git a/inc/libs/country_functions.php b/inc/libs/country_functions.php
index 6f31bb5102e47ac9cebdf17eb13c3a5c26b813b4..8b879e251ca93a455269011b018144cc5eafe24d 100644 (file)
--- a/inc/libs/country_functions.php
+++ b/inc/libs/country_functions.php
@@ -37,23 +37,27 @@ if (!defined('__SECURITY')) {
        require($INC);
 }
 
-//
-function COUNTRY_GENERATE_INFO($ID)
-{
+// Generate a human-readable country description with code
+function COUNTRY_GENERATE_INFO ($id) {
+       // 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__);
-       if (SQL_NUMROWS($result) == 1)
-       {
+               array(bigintval($id)), __FILE__, __LINE__);
+
+       // Is there an entry?
+       if (SQL_NUMROWS($result) == 1) {
+               // Load entry
                list($code, $descr) = SQL_FETCHROW($result);
-               SQL_FREERESULT($result);
-               $ret = $descr." (".$code.")";
-       }
-        else
-       {
+
+               // Construct human-readable description
+               $ret = sprintf("%s (%s)", $descr, $code);
+       } else {
                // Not found!
                $ret = COUNTRY_NOT_FOUND;
        }
 
+       // Free the result
+       SQL_FREERESULT($result);
+
        // Return info
        return $ret;
 }