XOOPS / XoopsCore25

htdocs/modules/protector/admin/center.php

Spacing +3 added lines, -3 removed lines

@@ -1,11 +1,11 @@
 <?php
 
-require dirname(dirname(dirname(__DIR__))) . '/mainfile.php';
+require dirname(dirname(dirname(__DIR__))).'/mainfile.php';
 defined('XOOPS_TRUST_PATH') || exit('set XOOPS_TRUST_PATH in mainfile.php');
 
 $mydirname = basename(dirname(__DIR__));
 $mydirpath = dirname(__DIR__);
-require $mydirpath . '/mytrustdirname.php'; // set $mytrustdirname
+require $mydirpath.'/mytrustdirname.php'; // set $mytrustdirname
 
 //require XOOPS_TRUST_PATH.'/modules/'.$mytrustdirname.'/admin.php' ;
-require XOOPS_TRUST_PATH . '/modules/' . $mytrustdirname . '/admin/center.php';
+require XOOPS_TRUST_PATH.'/modules/'.$mytrustdirname.'/admin/center.php';

htdocs/modules/protector/admin/prefix_manager.php

Spacing +3 added lines, -3 removed lines

@@ -1,10 +1,10 @@
 <?php
 
-require dirname(dirname(dirname(__DIR__))) . '/mainfile.php';
+require dirname(dirname(dirname(__DIR__))).'/mainfile.php';
 defined('XOOPS_TRUST_PATH') || exit('set XOOPS_TRUST_PATH in mainfile.php');
 
 $mydirname = basename(dirname(__DIR__));
 $mydirpath = dirname(__DIR__);
-require $mydirpath . '/mytrustdirname.php'; // set $mytrustdirname
+require $mydirpath.'/mytrustdirname.php'; // set $mytrustdirname
 
-require XOOPS_TRUST_PATH . '/modules/' . $mytrustdirname . '/admin/prefix_manager.php';
+require XOOPS_TRUST_PATH.'/modules/'.$mytrustdirname.'/admin/prefix_manager.php';

htdocs/modules/protector/admin/advisory.php

Spacing +3 added lines, -3 removed lines

@@ -1,10 +1,10 @@
 <?php
 
-require dirname(dirname(dirname(__DIR__))) . '/mainfile.php';
+require dirname(dirname(dirname(__DIR__))).'/mainfile.php';
 defined('XOOPS_TRUST_PATH') || exit('set XOOPS_TRUST_PATH in mainfile.php');
 
 $mydirname = basename(dirname(__DIR__));
 $mydirpath = dirname(__DIR__);
-require $mydirpath . '/mytrustdirname.php'; // set $mytrustdirname
+require $mydirpath.'/mytrustdirname.php'; // set $mytrustdirname
 
-require XOOPS_TRUST_PATH . '/modules/' . $mytrustdirname . '/admin/advisory.php';
+require XOOPS_TRUST_PATH.'/modules/'.$mytrustdirname.'/admin/advisory.php';

htdocs/modules/protector/onupdate.php

Spacing +2 added lines, -2 removed lines

@@ -4,6 +4,6 @@
 
 $mydirname = basename(__DIR__);
 $mydirpath = __DIR__;
-require $mydirpath . '/mytrustdirname.php'; // set $mytrustdirname
+require $mydirpath.'/mytrustdirname.php'; // set $mytrustdirname
 
-require XOOPS_TRUST_PATH . '/modules/' . $mytrustdirname . '/onupdate.php';
+require XOOPS_TRUST_PATH.'/modules/'.$mytrustdirname.'/onupdate.php';

htdocs/modules/protector/mytrustdirname.php

Spacing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
 
 $mytrustdirname = 'protector';
 
-include_once XOOPS_TRUST_PATH . '/modules/' . $mytrustdirname . '/class/registry.php';
+include_once XOOPS_TRUST_PATH.'/modules/'.$mytrustdirname.'/class/registry.php';
 $registry = ProtectorRegistry::getInstance();
 $registry->setEntry('mydirname', basename(__DIR__));
 $registry->setEntry('mydirpath', __DIR__);

htdocs/modules/protector/xoops_version.php

Spacing +2 added lines, -2 removed lines

@@ -4,6 +4,6 @@
 
 $mydirname = basename(__DIR__);
 $mydirpath = __DIR__;
-require $mydirpath . '/mytrustdirname.php'; // set $mytrustdirname
+require $mydirpath.'/mytrustdirname.php'; // set $mytrustdirname
 
-require XOOPS_TRUST_PATH . '/modules/' . $mytrustdirname . '/xoops_version.php';
+require XOOPS_TRUST_PATH.'/modules/'.$mytrustdirname.'/xoops_version.php';

htdocs/notifications.php

Switch Indentation +151 added lines, -151 removed lines

@@ -43,167 +43,167 @@
 }
 
 switch ($op) {
-    case 'cancel':
-        // FIXME: does this always go back to correct location??
-        redirect_header('index.php');
-        break;
+        case 'cancel':
+            // FIXME: does this always go back to correct location??
+            redirect_header('index.php');
+            break;
 
-    case 'list':
-        // Do we allow other users to see our notifications?  Nope, but maybe
-        // see who else is monitoring a particular item (or at least how many)?
-        // Well, maybe admin can see all...
-        // TODO: need to span over multiple pages...???
-        // Get an array of all notifications for the selected user
-        $criteria = new Criteria('not_uid', $uid);
-        $criteria->setSort('not_modid,not_category,not_itemid');
-        /* @var  $notification_handler XoopsNotificationHandler */
-        $notification_handler = xoops_getHandler('notification');
-        $notifications        = $notification_handler->getObjects($criteria);
+        case 'list':
+            // Do we allow other users to see our notifications?  Nope, but maybe
+            // see who else is monitoring a particular item (or at least how many)?
+            // Well, maybe admin can see all...
+            // TODO: need to span over multiple pages...???
+            // Get an array of all notifications for the selected user
+            $criteria = new Criteria('not_uid', $uid);
+            $criteria->setSort('not_modid,not_category,not_itemid');
+            /* @var  $notification_handler XoopsNotificationHandler */
+            $notification_handler = xoops_getHandler('notification');
+            $notifications        = $notification_handler->getObjects($criteria);
 
-        // Generate the info for the template
-        /* @var $module_handler XoopsModuleHandler  */
-        $module_handler = xoops_getHandler('module');
-        include_once $GLOBALS['xoops']->path('include/notification_functions.php');
-        $modules       = array();
-        $prev_modid    = -1;
-        $prev_category = -1;
-        $prev_item     = -1;
-        foreach ($notifications as $n) {
-            $modid = $n->getVar('not_modid');
-            if ($modid != $prev_modid) {
-                $prev_modid      = $modid;
-                $prev_category   = -1;
-                $prev_item       = -1;
-                $module          = $module_handler->get($modid);
-                $modules[$modid] = array(
-                    'id'         => $modid,
-                    'name'       => $module->getVar('name'),
-                    'categories' => array());
-                // TODO: note, we could auto-generate the url from the id
-                // and category info... (except when category has multiple
-                // subscription scripts defined...)
-                // OR, add one more option to xoops_version 'view_from'
-                // which tells us where to redirect... BUT, e.g. forums, it
-                // still wouldn't give us all the required info... e.g. the
-                // topic ID doesn't give us the ID of the forum which is
-                // a required argument...
-                // Get the lookup function, if exists
-                $not_config  = $module->getInfo('notification');
-                $lookup_func = '';
-                if (!empty($not_config['lookup_file'])) {
-                    $lookup_file = $GLOBALS['xoops']->path('modules/' . $module->getVar('dirname') . '/' . $not_config['lookup_file']);
-                    if (file_exists($lookup_file)) {
-                        include_once $lookup_file;
-                        if (!empty($not_config['lookup_func']) && function_exists($not_config['lookup_func'])) {
-                            $lookup_func = $not_config['lookup_func'];
+            // Generate the info for the template
+            /* @var $module_handler XoopsModuleHandler  */
+            $module_handler = xoops_getHandler('module');
+            include_once $GLOBALS['xoops']->path('include/notification_functions.php');
+            $modules       = array();
+            $prev_modid    = -1;
+            $prev_category = -1;
+            $prev_item     = -1;
+            foreach ($notifications as $n) {
+                $modid = $n->getVar('not_modid');
+                if ($modid != $prev_modid) {
+                    $prev_modid      = $modid;
+                    $prev_category   = -1;
+                    $prev_item       = -1;
+                    $module          = $module_handler->get($modid);
+                    $modules[$modid] = array(
+                        'id'         => $modid,
+                        'name'       => $module->getVar('name'),
+                        'categories' => array());
+                    // TODO: note, we could auto-generate the url from the id
+                    // and category info... (except when category has multiple
+                    // subscription scripts defined...)
+                    // OR, add one more option to xoops_version 'view_from'
+                    // which tells us where to redirect... BUT, e.g. forums, it
+                    // still wouldn't give us all the required info... e.g. the
+                    // topic ID doesn't give us the ID of the forum which is
+                    // a required argument...
+                    // Get the lookup function, if exists
+                    $not_config  = $module->getInfo('notification');
+                    $lookup_func = '';
+                    if (!empty($not_config['lookup_file'])) {
+                        $lookup_file = $GLOBALS['xoops']->path('modules/' . $module->getVar('dirname') . '/' . $not_config['lookup_file']);
+                        if (file_exists($lookup_file)) {
+                            include_once $lookup_file;
+                            if (!empty($not_config['lookup_func']) && function_exists($not_config['lookup_func'])) {
+                                $lookup_func = $not_config['lookup_func'];
+                            }
                         }
                     }
                 }
-            }
-            $category = $n->getVar('not_category');
-            if ($category != $prev_category) {
-                $prev_category                            = $category;
-                $prev_item                                = -1;
-                $category_info                            = &notificationCategoryInfo($category, $modid);
-                $modules[$modid]['categories'][$category] = array(
-                    'name'  => $category,
-                    'title' => $category_info['title'],
-                    'items' => array());
-            }
-            $item = $n->getVar('not_itemid');
-            if ($item != $prev_item) {
-                $prev_item = $item;
-                if (!empty($lookup_func)) {
-                    $item_info = $lookup_func($category, $item);
-                } else {
-                    $item_info = array(
-                        'name' => '[' . _NOT_NAMENOTAVAILABLE . ']',
-                        'url'  => '');
+                $category = $n->getVar('not_category');
+                if ($category != $prev_category) {
+                    $prev_category                            = $category;
+                    $prev_item                                = -1;
+                    $category_info                            = &notificationCategoryInfo($category, $modid);
+                    $modules[$modid]['categories'][$category] = array(
+                        'name'  => $category,
+                        'title' => $category_info['title'],
+                        'items' => array());
+                }
+                $item = $n->getVar('not_itemid');
+                if ($item != $prev_item) {
+                    $prev_item = $item;
+                    if (!empty($lookup_func)) {
+                        $item_info = $lookup_func($category, $item);
+                    } else {
+                        $item_info = array(
+                            'name' => '[' . _NOT_NAMENOTAVAILABLE . ']',
+                            'url'  => '');
+                    }
+                    $modules[$modid]['categories'][$category]['items'][$item] = array(
+                        'id'            => $item,
+                        'name'          => $item_info['name'],
+                        'url'           => $item_info['url'],
+                        'notifications' => array());
                 }
-                $modules[$modid]['categories'][$category]['items'][$item] = array(
-                    'id'            => $item,
-                    'name'          => $item_info['name'],
-                    'url'           => $item_info['url'],
-                    'notifications' => array());
+                $event_info                                                                  =& notificationEventInfo($category, $n->getVar('not_event'), $n->getVar('not_modid'));
+                $modules[$modid]['categories'][$category]['items'][$item]['notifications'][] = array(
+                    'id'             => $n->getVar('not_id'),
+                    'module_id'      => $n->getVar('not_modid'),
+                    'category'       => $n->getVar('not_category'),
+                    'category_title' => $category_info['title'],
+                    'item_id'        => $n->getVar('not_itemid'),
+                    'event'          => $n->getVar('not_event'),
+                    'event_title'    => $event_info['title'],
+                    'user_id'        => $n->getVar('not_uid'));
             }
-            $event_info                                                                  =& notificationEventInfo($category, $n->getVar('not_event'), $n->getVar('not_modid'));
-            $modules[$modid]['categories'][$category]['items'][$item]['notifications'][] = array(
-                'id'             => $n->getVar('not_id'),
-                'module_id'      => $n->getVar('not_modid'),
-                'category'       => $n->getVar('not_category'),
-                'category_title' => $category_info['title'],
-                'item_id'        => $n->getVar('not_itemid'),
-                'event'          => $n->getVar('not_event'),
-                'event_title'    => $event_info['title'],
-                'user_id'        => $n->getVar('not_uid'));
-        }
-        $GLOBALS['xoopsOption']['template_main'] = 'system_notification_list.tpl';
-        include $GLOBALS['xoops']->path('header.php');
-        $xoopsTpl->assign('modules', $modules);
-        $user_info = array('uid' => $xoopsUser->getVar('uid'));
-        $xoopsTpl->assign('user', $user_info);
-        $xoopsTpl->assign('lang_cancel', _CANCEL);
-        $xoopsTpl->assign('lang_clear', _NOT_CLEAR);
-        $xoopsTpl->assign('lang_delete', _DELETE);
-        $xoopsTpl->assign('lang_checkall', _NOT_CHECKALL);
-        $xoopsTpl->assign('lang_module', _NOT_MODULE);
-        $xoopsTpl->assign('lang_event', _NOT_EVENT);
-        $xoopsTpl->assign('lang_events', _NOT_EVENTS);
-        $xoopsTpl->assign('lang_category', _NOT_CATEGORY);
-        $xoopsTpl->assign('lang_itemid', _NOT_ITEMID);
-        $xoopsTpl->assign('lang_itemname', _NOT_ITEMNAME);
-        $xoopsTpl->assign('lang_activenotifications', _NOT_ACTIVENOTIFICATIONS);
-        $xoopsTpl->assign('notification_token', $GLOBALS['xoopsSecurity']->createToken());
-        include $GLOBALS['xoops']->path('footer.php');
+            $GLOBALS['xoopsOption']['template_main'] = 'system_notification_list.tpl';
+            include $GLOBALS['xoops']->path('header.php');
+            $xoopsTpl->assign('modules', $modules);
+            $user_info = array('uid' => $xoopsUser->getVar('uid'));
+            $xoopsTpl->assign('user', $user_info);
+            $xoopsTpl->assign('lang_cancel', _CANCEL);
+            $xoopsTpl->assign('lang_clear', _NOT_CLEAR);
+            $xoopsTpl->assign('lang_delete', _DELETE);
+            $xoopsTpl->assign('lang_checkall', _NOT_CHECKALL);
+            $xoopsTpl->assign('lang_module', _NOT_MODULE);
+            $xoopsTpl->assign('lang_event', _NOT_EVENT);
+            $xoopsTpl->assign('lang_events', _NOT_EVENTS);
+            $xoopsTpl->assign('lang_category', _NOT_CATEGORY);
+            $xoopsTpl->assign('lang_itemid', _NOT_ITEMID);
+            $xoopsTpl->assign('lang_itemname', _NOT_ITEMNAME);
+            $xoopsTpl->assign('lang_activenotifications', _NOT_ACTIVENOTIFICATIONS);
+            $xoopsTpl->assign('notification_token', $GLOBALS['xoopsSecurity']->createToken());
+            include $GLOBALS['xoops']->path('footer.php');
 
-        // TODO: another display mode... instead of one notification per line,
-        // show one line per item_id, with checkboxes for the available options...
-        // and an update button to change them...  And still have the delete box
-        // to delete all notification for that item
-        // How about one line per ID, showing category, name, id, and list of
-        // events...
-        // TODO: it would also be useful to provide links to other available
-        // options so we can say switch from new_message to 'bookmark' if we
-        // are receiving too many emails.  OR, if we click on 'change options'
-        // we get a form for that page...
-        // TODO: option to specify one-time??? or other modes??
-        break;
+            // TODO: another display mode... instead of one notification per line,
+            // show one line per item_id, with checkboxes for the available options...
+            // and an update button to change them...  And still have the delete box
+            // to delete all notification for that item
+            // How about one line per ID, showing category, name, id, and list of
+            // events...
+            // TODO: it would also be useful to provide links to other available
+            // options so we can say switch from new_message to 'bookmark' if we
+            // are receiving too many emails.  OR, if we click on 'change options'
+            // we get a form for that page...
+            // TODO: option to specify one-time??? or other modes??
+            break;
 
-    case 'delete_ok':
-        if (empty($_POST['del_not'])) {
-            redirect_header('notifications.php', 2, _NOT_NOTHINGTODELETE);
-        }
-        include $GLOBALS['xoops']->path('header.php');
-        $hidden_vars = array(
-            'uid'       => $uid,
-            'delete_ok' => 1,
-            'del_not'   => $_POST['del_not']);
-        echo '<h4>' . _NOT_DELETINGNOTIFICATIONS . '</h4>';
-        xoops_confirm($hidden_vars, xoops_getenv('PHP_SELF'), _NOT_RUSUREDEL);
-        include $GLOBALS['xoops']->path('footer.php');
-        // FIXME: There is a problem here... in xoops_confirm it treats arrays as
-        // optional radio arguments on the confirmation page... change this or
-        // write new function...
-        break;
+        case 'delete_ok':
+            if (empty($_POST['del_not'])) {
+                redirect_header('notifications.php', 2, _NOT_NOTHINGTODELETE);
+            }
+            include $GLOBALS['xoops']->path('header.php');
+            $hidden_vars = array(
+                'uid'       => $uid,
+                'delete_ok' => 1,
+                'del_not'   => $_POST['del_not']);
+            echo '<h4>' . _NOT_DELETINGNOTIFICATIONS . '</h4>';
+            xoops_confirm($hidden_vars, xoops_getenv('PHP_SELF'), _NOT_RUSUREDEL);
+            include $GLOBALS['xoops']->path('footer.php');
+            // FIXME: There is a problem here... in xoops_confirm it treats arrays as
+            // optional radio arguments on the confirmation page... change this or
+            // write new function...
+            break;
 
-    case 'delete':
-        if (!$GLOBALS['xoopsSecurity']->check()) {
-            redirect_header('notifications.php', 2, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
-        }
-        if (empty($_POST['del_not'])) {
-            redirect_header('notifications.php', 2, _NOT_NOTHINGTODELETE);
-        }
-        $notification_handler = xoops_getHandler('notification');
-        foreach ($_POST['del_not'] as $n_array) {
-            foreach ($n_array as $n) {
-                $notification = $notification_handler->get($n);
-                if ($notification->getVar('not_uid') == $uid) {
-                    $notification_handler->delete($notification);
+        case 'delete':
+            if (!$GLOBALS['xoopsSecurity']->check()) {
+                redirect_header('notifications.php', 2, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
+            }
+            if (empty($_POST['del_not'])) {
+                redirect_header('notifications.php', 2, _NOT_NOTHINGTODELETE);
+            }
+            $notification_handler = xoops_getHandler('notification');
+            foreach ($_POST['del_not'] as $n_array) {
+                foreach ($n_array as $n) {
+                    $notification = $notification_handler->get($n);
+                    if ($notification->getVar('not_uid') == $uid) {
+                        $notification_handler->delete($notification);
+                    }
                 }
             }
-        }
-        redirect_header('notifications.php', 2, _NOT_DELETESUCCESS);
-        break;
-    default:
-        break;
+            redirect_header('notifications.php', 2, _NOT_DELETESUCCESS);
+            break;
+        default:
+            break;
 }

Spacing +5 added lines, -5 removed lines

@@ -16,7 +16,7 @@ 
  */
 
 $xoopsOption['pagetype'] = 'notification';
-include __DIR__ . '/mainfile.php';
+include __DIR__.'/mainfile.php';
 
 if (!is_object($xoopsUser)) {
     redirect_header('index.php', 3, _NOT_NOACCESS);
@@ -91,7 +91,7 @@ 
                 $not_config  = $module->getInfo('notification');
                 $lookup_func = '';
                 if (!empty($not_config['lookup_file'])) {
-                    $lookup_file = $GLOBALS['xoops']->path('modules/' . $module->getVar('dirname') . '/' . $not_config['lookup_file']);
+                    $lookup_file = $GLOBALS['xoops']->path('modules/'.$module->getVar('dirname').'/'.$not_config['lookup_file']);
                     if (file_exists($lookup_file)) {
                         include_once $lookup_file;
                         if (!empty($not_config['lookup_func']) && function_exists($not_config['lookup_func'])) {
@@ -117,7 +117,7 @@ 
                     $item_info = $lookup_func($category, $item);
                 } else {
                     $item_info = array(
-                        'name' => '[' . _NOT_NAMENOTAVAILABLE . ']',
+                        'name' => '['._NOT_NAMENOTAVAILABLE.']',
                         'url'  => '');
                 }
                 $modules[$modid]['categories'][$category]['items'][$item] = array(
@@ -126,7 +126,7 @@ 
                     'url'           => $item_info['url'],
                     'notifications' => array());
             }
-            $event_info                                                                  =& notificationEventInfo($category, $n->getVar('not_event'), $n->getVar('not_modid'));
+            $event_info                                                                  = & notificationEventInfo($category, $n->getVar('not_event'), $n->getVar('not_modid'));
             $modules[$modid]['categories'][$category]['items'][$item]['notifications'][] = array(
                 'id'             => $n->getVar('not_id'),
                 'module_id'      => $n->getVar('not_modid'),
@@ -178,7 +178,7 @@ 
             'uid'       => $uid,
             'delete_ok' => 1,
             'del_not'   => $_POST['del_not']);
-        echo '<h4>' . _NOT_DELETINGNOTIFICATIONS . '</h4>';
+        echo '<h4>'._NOT_DELETINGNOTIFICATIONS.'</h4>';
         xoops_confirm($hidden_vars, xoops_getenv('PHP_SELF'), _NOT_RUSUREDEL);
         include $GLOBALS['xoops']->path('footer.php');
         // FIXME: There is a problem here... in xoops_confirm it treats arrays as

htdocs/language/english/auth.php

Spacing +1 added lines, -1 removed lines

@@ -9,5 +9,5 @@
 define('_AUTH_LDAP_SERVER_NOT_FOUND', "Can't connect to the server");
 define('_AUTH_LDAP_USER_NOT_FOUND', 'Member %s not found in the directory server (%s) in %s');
 define('_AUTH_LDAP_CANT_READ_ENTRY', "Can't read entry %s");
-define('_AUTH_LDAP_XOOPS_USER_NOTFOUND', 'Sorry, no corresponding user information has been found in the XOOPS database for connection: %s <br>' . 'Please verify your user data or set on the automatic provisioning');
+define('_AUTH_LDAP_XOOPS_USER_NOTFOUND', 'Sorry, no corresponding user information has been found in the XOOPS database for connection: %s <br>'.'Please verify your user data or set on the automatic provisioning');
 define('_AUTH_LDAP_START_TLS_FAILED', 'Failed to open a TLS connection');

htdocs/language/english/countries.php

Spacing +252 added lines, -252 removed lines

@@ -8,256 +8,256 @@
  *
  */
 
-define('_COUNTRY_AD','Andorra');
-define('_COUNTRY_AE','United Arab Emirates');
-define('_COUNTRY_AF','Afghanistan');
-define('_COUNTRY_AG','Antigua and Barbuda');
-define('_COUNTRY_AI','Anguilla');
-define('_COUNTRY_AL','Albania');
-define('_COUNTRY_AM','Armenia');
-define('_COUNTRY_AN','Netherlands Antilles');
-define('_COUNTRY_AO','Angola');
-define('_COUNTRY_AQ','Antarctica');
-define('_COUNTRY_AR','Argentina');
-define('_COUNTRY_AS','American Samoa');
-define('_COUNTRY_AT','Austria');
-define('_COUNTRY_AU','Australia');
-define('_COUNTRY_AW','Aruba');
-define('_COUNTRY_AX','Åland Islands');
-define('_COUNTRY_AZ','Azerbaijan');
-define('_COUNTRY_BA','Bosnia and Herzegovina');
-define('_COUNTRY_BB','Barbados');
-define('_COUNTRY_BD','Bangladesh');
-define('_COUNTRY_BE','Belgium');
-define('_COUNTRY_BF','Burkina Faso');
-define('_COUNTRY_BG','Bulgaria');
-define('_COUNTRY_BH','Bahrain');
-define('_COUNTRY_BI','Burundi');
-define('_COUNTRY_BJ','Benin');
-define('_COUNTRY_BL','Saint Barthélemy');
-define('_COUNTRY_BM','Bermuda');
-define('_COUNTRY_BN','Brunei Darussalam');
-define('_COUNTRY_BO','Bolivia');
-define('_COUNTRY_BR','Brazil');
-define('_COUNTRY_BS','Bahamas');
-define('_COUNTRY_BT','Bhutan');
-define('_COUNTRY_BV','Bouvet Island');
-define('_COUNTRY_BW','Botswana');
-define('_COUNTRY_BY','Belarus');
-define('_COUNTRY_BZ','Belize');
-define('_COUNTRY_CA','Canada');
-define('_COUNTRY_CC','Cocos (Keeling) Islands');
-define('_COUNTRY_CD','Congo (Dem. Rep.)');
-define('_COUNTRY_CF','Central African Republic');
-define('_COUNTRY_CG','Congo');
-define('_COUNTRY_CH','Switzerland');
-define('_COUNTRY_CI',"Côte d'Ivoire");
-define('_COUNTRY_CK','Cook Islands');
-define('_COUNTRY_CL','Chile');
-define('_COUNTRY_CM','Cameroon');
-define('_COUNTRY_CN','China');
-define('_COUNTRY_CO','Colombia');
-define('_COUNTRY_CR','Costa Rica');
-define('_COUNTRY_CS','Serbia & Montenegro (former)');   //  Not listed in ISO 3166
-define('_COUNTRY_CU','Cuba');
-define('_COUNTRY_CV','Cape Verde');
-define('_COUNTRY_CX','Christmas Island');
-define('_COUNTRY_CY','Cyprus');
-define('_COUNTRY_CZ','Czech Republic');
-define('_COUNTRY_DE','Germany');
-define('_COUNTRY_DJ','Djibouti');
-define('_COUNTRY_DK','Denmark');
-define('_COUNTRY_DM','Dominica');
-define('_COUNTRY_DO','Dominican Republic');
-define('_COUNTRY_DZ','Algeria');
-define('_COUNTRY_EC','Ecuador');
-define('_COUNTRY_EE','Estonia');
-define('_COUNTRY_EG','Egypt');
-define('_COUNTRY_EH','Western Sahara');
-define('_COUNTRY_ER','Eritrea');
-define('_COUNTRY_ES','Spain');
-define('_COUNTRY_ET','Ethiopia');
-define('_COUNTRY_FI','Finland');
-define('_COUNTRY_FJ','Fiji');
-define('_COUNTRY_FK','Falkland Islands (Malvinas)');
-define('_COUNTRY_FM','Micronesia');
-define('_COUNTRY_FO','Faroe Islands');
-define('_COUNTRY_FR','France');
-define('_COUNTRY_FX','France, Metropolitan');   //  Not listed in ISO 3166
-define('_COUNTRY_GA','Gabon');
-define('_COUNTRY_GB','Great Britain (UK)');
-define('_COUNTRY_GD','Grenada');
-define('_COUNTRY_GE','Georgia');
-define('_COUNTRY_GF','French Guiana');
-define('_COUNTRY_GG','Guernsey');
-define('_COUNTRY_GH','Ghana');
-define('_COUNTRY_GI','Gibraltar');
-define('_COUNTRY_GL','Greenland');
-define('_COUNTRY_GM','Gambia');
-define('_COUNTRY_GN','Guinea');
-define('_COUNTRY_GP','Guadeloupe');
-define('_COUNTRY_GQ','Equatorial Guinea');
-define('_COUNTRY_GR','Greece');
-define('_COUNTRY_GS','S. Georgia and S. Sandwich Isls.');
-define('_COUNTRY_GT','Guatemala');
-define('_COUNTRY_GU','Guam');
-define('_COUNTRY_GW','Guinea-Bissau');
-define('_COUNTRY_GY','Guyana');
-define('_COUNTRY_HK','Hong Kong');
-define('_COUNTRY_HM','Heard and McDonald Islands');
-define('_COUNTRY_HN','Honduras');
-define('_COUNTRY_HR','Croatia');
-define('_COUNTRY_HT','Haiti');
-define('_COUNTRY_HU','Hungary');
-define('_COUNTRY_ID','Indonesia');
-define('_COUNTRY_IE','Ireland');
-define('_COUNTRY_IL','Israel');
-define('_COUNTRY_IM','Isle of Man');
-define('_COUNTRY_IN','India');
-define('_COUNTRY_IO','British Indian Ocean Territory');
-define('_COUNTRY_IQ','Iraq');
-define('_COUNTRY_IR','Iran');
-define('_COUNTRY_IS','Iceland');
-define('_COUNTRY_IT','Italy');
-define('_COUNTRY_JM','Jamaica');
-define('_COUNTRY_JO','Jordan');
-define('_COUNTRY_JP','Japan');
-define('_COUNTRY_KE','Kenya');
-define('_COUNTRY_KG','Kyrgyzstan');
-define('_COUNTRY_KH','Cambodia');
-define('_COUNTRY_KI','Kiribati');
-define('_COUNTRY_KM','Comoros');
-define('_COUNTRY_KN','Saint Kitts and Nevis');
-define('_COUNTRY_KP','Korea (North)');
-define('_COUNTRY_KR','Korea (South)');
-define('_COUNTRY_KW','Kuwait');
-define('_COUNTRY_KY','Cayman Islands');
-define('_COUNTRY_KZ','Kazakhstan');
-define('_COUNTRY_LA','Laos');
-define('_COUNTRY_LB','Lebanon');
-define('_COUNTRY_LC','Saint Lucia');
-define('_COUNTRY_LI','Liechtenstein');
-define('_COUNTRY_LK','Sri Lanka');
-define('_COUNTRY_LR','Liberia');
-define('_COUNTRY_LS','Lesotho');
-define('_COUNTRY_LT','Lithuania');
-define('_COUNTRY_LU','Luxembourg');
-define('_COUNTRY_LV','Latvia');
-define('_COUNTRY_LY','Libya');
-define('_COUNTRY_MA','Morocco');
-define('_COUNTRY_MC','Monaco');
-define('_COUNTRY_MD','Moldova');
-define('_COUNTRY_ME','Montenegro');
-define('_COUNTRY_MF','Saint Martin');
-define('_COUNTRY_MG','Madagascar');
-define('_COUNTRY_MH','Marshall Islands');
-define('_COUNTRY_MK','Macedonia'); //FYROM
-define('_COUNTRY_ML','Mali');
-define('_COUNTRY_MM','Myanmar');
-define('_COUNTRY_MN','Mongolia');
-define('_COUNTRY_MO','Macao');
-define('_COUNTRY_MP','Northern Mariana Islands');
-define('_COUNTRY_MQ','Martinique');
-define('_COUNTRY_MR','Mauritania');
-define('_COUNTRY_MS','Montserrat');
-define('_COUNTRY_MT','Malta');
-define('_COUNTRY_MU','Mauritius');
-define('_COUNTRY_MV','Maldives');
-define('_COUNTRY_MW','Malawi');
-define('_COUNTRY_MX','Mexico');
-define('_COUNTRY_MY','Malaysia');
-define('_COUNTRY_MZ','Mozambique');
-define('_COUNTRY_NA','Namibia');
-define('_COUNTRY_NC','New Caledonia');
-define('_COUNTRY_NE','Niger');
-define('_COUNTRY_NF','Norfolk Island');
-define('_COUNTRY_NG','Nigeria');
-define('_COUNTRY_NI','Nicaragua');
-define('_COUNTRY_NL','Netherlands');
-define('_COUNTRY_NO','Norway');
-define('_COUNTRY_NP','Nepal');
-define('_COUNTRY_NR','Nauru');
-define('_COUNTRY_NT','Neutral Zone');
-define('_COUNTRY_NU','Niue');
-define('_COUNTRY_NZ','New Zealand');
-define('_COUNTRY_OM','Oman');
-define('_COUNTRY_PA','Panama');
-define('_COUNTRY_PE','Peru');
-define('_COUNTRY_PF','French Polynesia');
-define('_COUNTRY_PG','Papua New Guinea');
-define('_COUNTRY_PH','Philippines');
-define('_COUNTRY_PK','Pakistan');
-define('_COUNTRY_PL','Poland');
-define('_COUNTRY_PM','St. Pierre and Miquelon');
-define('_COUNTRY_PN','Pitcairn');
-define('_COUNTRY_PR','Puerto Rico');
-define('_COUNTRY_PS','Palestine Territory (Occupied)');
-define('_COUNTRY_PT','Portugal');
-define('_COUNTRY_PW','Palau');
-define('_COUNTRY_PY','Paraguay');
-define('_COUNTRY_QA','Qatar');
-define('_COUNTRY_RE','Reunion');
-define('_COUNTRY_RO','Romania');
-define('_COUNTRY_RS','Serbia');
-define('_COUNTRY_RU','Russian Federation');
-define('_COUNTRY_RW','Rwanda');
-define('_COUNTRY_SA','Saudi Arabia');
-define('_COUNTRY_SB','Solomon Islands');
-define('_COUNTRY_SC','Seychelles');
-define('_COUNTRY_SD','Sudan');
-define('_COUNTRY_SE','Sweden');
-define('_COUNTRY_SG','Singapore');
-define('_COUNTRY_SH','St. Helena');
-define('_COUNTRY_SI','Slovenia');
-define('_COUNTRY_SJ','Svalbard and Jan Mayen Islands');
-define('_COUNTRY_SK','Slovakia');
-define('_COUNTRY_SL','Sierra Leone');
-define('_COUNTRY_SM','San Marino');
-define('_COUNTRY_SN','Senegal');
-define('_COUNTRY_SO','Somalia');
-define('_COUNTRY_SR','Suriname');
-define('_COUNTRY_ST','Sao Tome and Principe');
-define('_COUNTRY_SU','USSR (former)');  //  Not listed in ISO 3166
-define('_COUNTRY_SV','El Salvador');
-define('_COUNTRY_SY','Syria');
-define('_COUNTRY_SZ','Swaziland');
-define('_COUNTRY_TC','Turks and Caicos Islands');
-define('_COUNTRY_TD','Chad');
-define('_COUNTRY_TF','French Southern Territories');
-define('_COUNTRY_TG','Togo');
-define('_COUNTRY_TH','Thailand');
-define('_COUNTRY_TJ','Tajikistan');
-define('_COUNTRY_TK','Tokelau');
-define('_COUNTRY_TL','Timor-Leste');
-define('_COUNTRY_TM','Turkmenistan');
-define('_COUNTRY_TN','Tunisia');
-define('_COUNTRY_TO','Tonga');
-define('_COUNTRY_TP','East Timor'); //  Not listed in ISO 3166, changed to TL
-define('_COUNTRY_TR','Turkey');
-define('_COUNTRY_TT','Trinidad and Tobago');
-define('_COUNTRY_TV','Tuvalu');
-define('_COUNTRY_TW','Taiwan');
-define('_COUNTRY_TZ','Tanzania');
-define('_COUNTRY_UA','Ukraine');
-define('_COUNTRY_UG','Uganda');
+define('_COUNTRY_AD', 'Andorra');
+define('_COUNTRY_AE', 'United Arab Emirates');
+define('_COUNTRY_AF', 'Afghanistan');
+define('_COUNTRY_AG', 'Antigua and Barbuda');
+define('_COUNTRY_AI', 'Anguilla');
+define('_COUNTRY_AL', 'Albania');
+define('_COUNTRY_AM', 'Armenia');
+define('_COUNTRY_AN', 'Netherlands Antilles');
+define('_COUNTRY_AO', 'Angola');
+define('_COUNTRY_AQ', 'Antarctica');
+define('_COUNTRY_AR', 'Argentina');
+define('_COUNTRY_AS', 'American Samoa');
+define('_COUNTRY_AT', 'Austria');
+define('_COUNTRY_AU', 'Australia');
+define('_COUNTRY_AW', 'Aruba');
+define('_COUNTRY_AX', 'Åland Islands');
+define('_COUNTRY_AZ', 'Azerbaijan');
+define('_COUNTRY_BA', 'Bosnia and Herzegovina');
+define('_COUNTRY_BB', 'Barbados');
+define('_COUNTRY_BD', 'Bangladesh');
+define('_COUNTRY_BE', 'Belgium');
+define('_COUNTRY_BF', 'Burkina Faso');
+define('_COUNTRY_BG', 'Bulgaria');
+define('_COUNTRY_BH', 'Bahrain');
+define('_COUNTRY_BI', 'Burundi');
+define('_COUNTRY_BJ', 'Benin');
+define('_COUNTRY_BL', 'Saint Barthélemy');
+define('_COUNTRY_BM', 'Bermuda');
+define('_COUNTRY_BN', 'Brunei Darussalam');
+define('_COUNTRY_BO', 'Bolivia');
+define('_COUNTRY_BR', 'Brazil');
+define('_COUNTRY_BS', 'Bahamas');
+define('_COUNTRY_BT', 'Bhutan');
+define('_COUNTRY_BV', 'Bouvet Island');
+define('_COUNTRY_BW', 'Botswana');
+define('_COUNTRY_BY', 'Belarus');
+define('_COUNTRY_BZ', 'Belize');
+define('_COUNTRY_CA', 'Canada');
+define('_COUNTRY_CC', 'Cocos (Keeling) Islands');
+define('_COUNTRY_CD', 'Congo (Dem. Rep.)');
+define('_COUNTRY_CF', 'Central African Republic');
+define('_COUNTRY_CG', 'Congo');
+define('_COUNTRY_CH', 'Switzerland');
+define('_COUNTRY_CI', "Côte d'Ivoire");
+define('_COUNTRY_CK', 'Cook Islands');
+define('_COUNTRY_CL', 'Chile');
+define('_COUNTRY_CM', 'Cameroon');
+define('_COUNTRY_CN', 'China');
+define('_COUNTRY_CO', 'Colombia');
+define('_COUNTRY_CR', 'Costa Rica');
+define('_COUNTRY_CS', 'Serbia & Montenegro (former)'); //  Not listed in ISO 3166
+define('_COUNTRY_CU', 'Cuba');
+define('_COUNTRY_CV', 'Cape Verde');
+define('_COUNTRY_CX', 'Christmas Island');
+define('_COUNTRY_CY', 'Cyprus');
+define('_COUNTRY_CZ', 'Czech Republic');
+define('_COUNTRY_DE', 'Germany');
+define('_COUNTRY_DJ', 'Djibouti');
+define('_COUNTRY_DK', 'Denmark');
+define('_COUNTRY_DM', 'Dominica');
+define('_COUNTRY_DO', 'Dominican Republic');
+define('_COUNTRY_DZ', 'Algeria');
+define('_COUNTRY_EC', 'Ecuador');
+define('_COUNTRY_EE', 'Estonia');
+define('_COUNTRY_EG', 'Egypt');
+define('_COUNTRY_EH', 'Western Sahara');
+define('_COUNTRY_ER', 'Eritrea');
+define('_COUNTRY_ES', 'Spain');
+define('_COUNTRY_ET', 'Ethiopia');
+define('_COUNTRY_FI', 'Finland');
+define('_COUNTRY_FJ', 'Fiji');
+define('_COUNTRY_FK', 'Falkland Islands (Malvinas)');
+define('_COUNTRY_FM', 'Micronesia');
+define('_COUNTRY_FO', 'Faroe Islands');
+define('_COUNTRY_FR', 'France');
+define('_COUNTRY_FX', 'France, Metropolitan'); //  Not listed in ISO 3166
+define('_COUNTRY_GA', 'Gabon');
+define('_COUNTRY_GB', 'Great Britain (UK)');
+define('_COUNTRY_GD', 'Grenada');
+define('_COUNTRY_GE', 'Georgia');
+define('_COUNTRY_GF', 'French Guiana');
+define('_COUNTRY_GG', 'Guernsey');
+define('_COUNTRY_GH', 'Ghana');
+define('_COUNTRY_GI', 'Gibraltar');
+define('_COUNTRY_GL', 'Greenland');
+define('_COUNTRY_GM', 'Gambia');
+define('_COUNTRY_GN', 'Guinea');
+define('_COUNTRY_GP', 'Guadeloupe');
+define('_COUNTRY_GQ', 'Equatorial Guinea');
+define('_COUNTRY_GR', 'Greece');
+define('_COUNTRY_GS', 'S. Georgia and S. Sandwich Isls.');
+define('_COUNTRY_GT', 'Guatemala');
+define('_COUNTRY_GU', 'Guam');
+define('_COUNTRY_GW', 'Guinea-Bissau');
+define('_COUNTRY_GY', 'Guyana');
+define('_COUNTRY_HK', 'Hong Kong');
+define('_COUNTRY_HM', 'Heard and McDonald Islands');
+define('_COUNTRY_HN', 'Honduras');
+define('_COUNTRY_HR', 'Croatia');
+define('_COUNTRY_HT', 'Haiti');
+define('_COUNTRY_HU', 'Hungary');
+define('_COUNTRY_ID', 'Indonesia');
+define('_COUNTRY_IE', 'Ireland');
+define('_COUNTRY_IL', 'Israel');
+define('_COUNTRY_IM', 'Isle of Man');
+define('_COUNTRY_IN', 'India');
+define('_COUNTRY_IO', 'British Indian Ocean Territory');
+define('_COUNTRY_IQ', 'Iraq');
+define('_COUNTRY_IR', 'Iran');
+define('_COUNTRY_IS', 'Iceland');
+define('_COUNTRY_IT', 'Italy');
+define('_COUNTRY_JM', 'Jamaica');
+define('_COUNTRY_JO', 'Jordan');
+define('_COUNTRY_JP', 'Japan');
+define('_COUNTRY_KE', 'Kenya');
+define('_COUNTRY_KG', 'Kyrgyzstan');
+define('_COUNTRY_KH', 'Cambodia');
+define('_COUNTRY_KI', 'Kiribati');
+define('_COUNTRY_KM', 'Comoros');
+define('_COUNTRY_KN', 'Saint Kitts and Nevis');
+define('_COUNTRY_KP', 'Korea (North)');
+define('_COUNTRY_KR', 'Korea (South)');
+define('_COUNTRY_KW', 'Kuwait');
+define('_COUNTRY_KY', 'Cayman Islands');
+define('_COUNTRY_KZ', 'Kazakhstan');
+define('_COUNTRY_LA', 'Laos');
+define('_COUNTRY_LB', 'Lebanon');
+define('_COUNTRY_LC', 'Saint Lucia');
+define('_COUNTRY_LI', 'Liechtenstein');
+define('_COUNTRY_LK', 'Sri Lanka');
+define('_COUNTRY_LR', 'Liberia');
+define('_COUNTRY_LS', 'Lesotho');
+define('_COUNTRY_LT', 'Lithuania');
+define('_COUNTRY_LU', 'Luxembourg');
+define('_COUNTRY_LV', 'Latvia');
+define('_COUNTRY_LY', 'Libya');
+define('_COUNTRY_MA', 'Morocco');
+define('_COUNTRY_MC', 'Monaco');
+define('_COUNTRY_MD', 'Moldova');
+define('_COUNTRY_ME', 'Montenegro');
+define('_COUNTRY_MF', 'Saint Martin');
+define('_COUNTRY_MG', 'Madagascar');
+define('_COUNTRY_MH', 'Marshall Islands');
+define('_COUNTRY_MK', 'Macedonia'); //FYROM
+define('_COUNTRY_ML', 'Mali');
+define('_COUNTRY_MM', 'Myanmar');
+define('_COUNTRY_MN', 'Mongolia');
+define('_COUNTRY_MO', 'Macao');
+define('_COUNTRY_MP', 'Northern Mariana Islands');
+define('_COUNTRY_MQ', 'Martinique');
+define('_COUNTRY_MR', 'Mauritania');
+define('_COUNTRY_MS', 'Montserrat');
+define('_COUNTRY_MT', 'Malta');
+define('_COUNTRY_MU', 'Mauritius');
+define('_COUNTRY_MV', 'Maldives');
+define('_COUNTRY_MW', 'Malawi');
+define('_COUNTRY_MX', 'Mexico');
+define('_COUNTRY_MY', 'Malaysia');
+define('_COUNTRY_MZ', 'Mozambique');
+define('_COUNTRY_NA', 'Namibia');
+define('_COUNTRY_NC', 'New Caledonia');
+define('_COUNTRY_NE', 'Niger');
+define('_COUNTRY_NF', 'Norfolk Island');
+define('_COUNTRY_NG', 'Nigeria');
+define('_COUNTRY_NI', 'Nicaragua');
+define('_COUNTRY_NL', 'Netherlands');
+define('_COUNTRY_NO', 'Norway');
+define('_COUNTRY_NP', 'Nepal');
+define('_COUNTRY_NR', 'Nauru');
+define('_COUNTRY_NT', 'Neutral Zone');
+define('_COUNTRY_NU', 'Niue');
+define('_COUNTRY_NZ', 'New Zealand');
+define('_COUNTRY_OM', 'Oman');
+define('_COUNTRY_PA', 'Panama');
+define('_COUNTRY_PE', 'Peru');
+define('_COUNTRY_PF', 'French Polynesia');
+define('_COUNTRY_PG', 'Papua New Guinea');
+define('_COUNTRY_PH', 'Philippines');
+define('_COUNTRY_PK', 'Pakistan');
+define('_COUNTRY_PL', 'Poland');
+define('_COUNTRY_PM', 'St. Pierre and Miquelon');
+define('_COUNTRY_PN', 'Pitcairn');
+define('_COUNTRY_PR', 'Puerto Rico');
+define('_COUNTRY_PS', 'Palestine Territory (Occupied)');
+define('_COUNTRY_PT', 'Portugal');
+define('_COUNTRY_PW', 'Palau');
+define('_COUNTRY_PY', 'Paraguay');
+define('_COUNTRY_QA', 'Qatar');
+define('_COUNTRY_RE', 'Reunion');
+define('_COUNTRY_RO', 'Romania');
+define('_COUNTRY_RS', 'Serbia');
+define('_COUNTRY_RU', 'Russian Federation');
+define('_COUNTRY_RW', 'Rwanda');
+define('_COUNTRY_SA', 'Saudi Arabia');
+define('_COUNTRY_SB', 'Solomon Islands');
+define('_COUNTRY_SC', 'Seychelles');
+define('_COUNTRY_SD', 'Sudan');
+define('_COUNTRY_SE', 'Sweden');
+define('_COUNTRY_SG', 'Singapore');
+define('_COUNTRY_SH', 'St. Helena');
+define('_COUNTRY_SI', 'Slovenia');
+define('_COUNTRY_SJ', 'Svalbard and Jan Mayen Islands');
+define('_COUNTRY_SK', 'Slovakia');
+define('_COUNTRY_SL', 'Sierra Leone');
+define('_COUNTRY_SM', 'San Marino');
+define('_COUNTRY_SN', 'Senegal');
+define('_COUNTRY_SO', 'Somalia');
+define('_COUNTRY_SR', 'Suriname');
+define('_COUNTRY_ST', 'Sao Tome and Principe');
+define('_COUNTRY_SU', 'USSR (former)'); //  Not listed in ISO 3166
+define('_COUNTRY_SV', 'El Salvador');
+define('_COUNTRY_SY', 'Syria');
+define('_COUNTRY_SZ', 'Swaziland');
+define('_COUNTRY_TC', 'Turks and Caicos Islands');
+define('_COUNTRY_TD', 'Chad');
+define('_COUNTRY_TF', 'French Southern Territories');
+define('_COUNTRY_TG', 'Togo');
+define('_COUNTRY_TH', 'Thailand');
+define('_COUNTRY_TJ', 'Tajikistan');
+define('_COUNTRY_TK', 'Tokelau');
+define('_COUNTRY_TL', 'Timor-Leste');
+define('_COUNTRY_TM', 'Turkmenistan');
+define('_COUNTRY_TN', 'Tunisia');
+define('_COUNTRY_TO', 'Tonga');
+define('_COUNTRY_TP', 'East Timor'); //  Not listed in ISO 3166, changed to TL
+define('_COUNTRY_TR', 'Turkey');
+define('_COUNTRY_TT', 'Trinidad and Tobago');
+define('_COUNTRY_TV', 'Tuvalu');
+define('_COUNTRY_TW', 'Taiwan');
+define('_COUNTRY_TZ', 'Tanzania');
+define('_COUNTRY_UA', 'Ukraine');
+define('_COUNTRY_UG', 'Uganda');
 //define('_COUNTRY_UK','United Kingdom'); //  Not listed in ISO 3166
-define('_COUNTRY_UM','US Minor Outlying Islands');
-define('_COUNTRY_US','United States');
-define('_COUNTRY_UY','Uruguay');
-define('_COUNTRY_UZ','Uzbekistan');
-define('_COUNTRY_VA','Vatican City State (Holy See)');
-define('_COUNTRY_VC','Saint Vincent and the Grenadines');
-define('_COUNTRY_VE','Venezuela');
-define('_COUNTRY_VG','Virgin Islands (British)');
-define('_COUNTRY_VI','Virgin Islands (US)');
-define('_COUNTRY_VN','Viet Nam');
-define('_COUNTRY_VU','Vanuatu');
-define('_COUNTRY_WF','Wallis and Futuna Islands');
-define('_COUNTRY_WS','Samoa');
-define('_COUNTRY_YE','Yemen');
-define('_COUNTRY_YT','Mayotte');
-define('_COUNTRY_YU','Yugoslavia (former)');    //  Not listed in ISO 3166
-define('_COUNTRY_ZA','South Africa');
-define('_COUNTRY_ZM','Zambia');
-define('_COUNTRY_ZR','Zaire');  //  Not listed in ISO 3166
-define('_COUNTRY_ZW','Zimbabwe');
+define('_COUNTRY_UM', 'US Minor Outlying Islands');
+define('_COUNTRY_US', 'United States');
+define('_COUNTRY_UY', 'Uruguay');
+define('_COUNTRY_UZ', 'Uzbekistan');
+define('_COUNTRY_VA', 'Vatican City State (Holy See)');
+define('_COUNTRY_VC', 'Saint Vincent and the Grenadines');
+define('_COUNTRY_VE', 'Venezuela');
+define('_COUNTRY_VG', 'Virgin Islands (British)');
+define('_COUNTRY_VI', 'Virgin Islands (US)');
+define('_COUNTRY_VN', 'Viet Nam');
+define('_COUNTRY_VU', 'Vanuatu');
+define('_COUNTRY_WF', 'Wallis and Futuna Islands');
+define('_COUNTRY_WS', 'Samoa');
+define('_COUNTRY_YE', 'Yemen');
+define('_COUNTRY_YT', 'Mayotte');
+define('_COUNTRY_YU', 'Yugoslavia (former)'); //  Not listed in ISO 3166
+define('_COUNTRY_ZA', 'South Africa');
+define('_COUNTRY_ZM', 'Zambia');
+define('_COUNTRY_ZR', 'Zaire'); //  Not listed in ISO 3166
+define('_COUNTRY_ZW', 'Zimbabwe');