diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/notpage.jpg b/code/ryzom/tools/server/ryzom_ams/www/html/img/notpage.jpg
deleted file mode 100644
index 76c434b6e..000000000
Binary files a/code/ryzom/tools/server/ryzom_ams/www/html/img/notpage.jpg and /dev/null differ
diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/inc/settings.php b/code/ryzom/tools/server/ryzom_ams/www/html/inc/settings.php
index aebfeb186..259ce258f 100644
--- a/code/ryzom/tools/server/ryzom_ams/www/html/inc/settings.php
+++ b/code/ryzom/tools/server/ryzom_ams/www/html/inc/settings.php
@@ -22,11 +22,262 @@ function settings(){
$result['target_id'] = $_SESSION['id'];
$result['current_mail'] = WebUsers::getEmail($_SESSION['id']);
}
-
+ $result['country_array'] = getCountryArray();
return $result;
}else{
//ERROR: not logged in!
header("Location: index.php");
exit;
}
-}
\ No newline at end of file
+}
+
+
+function getCountryArray(){
+
+$countries = array(
+'AA'=>'None Selected',
+'AF'=>'Afghanistan',
+'AL'=>'Albania',
+'DZ'=>'Algeria',
+'AS'=>'American Samoa',
+'AD'=>'Andorra',
+'AO'=>'Angola',
+'AI'=>'Anguilla',
+'AQ'=>'Antarctica',
+'AG'=>'Antigua And Barbuda',
+'AR'=>'Argentina',
+'AM'=>'Armenia',
+'AW'=>'Aruba',
+'AU'=>'Australia',
+'AT'=>'Austria',
+'AZ'=>'Azerbaijan',
+'BS'=>'Bahamas',
+'BH'=>'Bahrain',
+'BD'=>'Bangladesh',
+'BB'=>'Barbados',
+'BY'=>'Belarus',
+'BE'=>'Belgium',
+'BZ'=>'Belize',
+'BJ'=>'Benin',
+'BM'=>'Bermuda',
+'BT'=>'Bhutan',
+'BO'=>'Bolivia',
+'BA'=>'Bosnia And Herzegovina',
+'BW'=>'Botswana',
+'BV'=>'Bouvet Island',
+'BR'=>'Brazil',
+'IO'=>'British Indian Ocean Territory',
+'BN'=>'Brunei',
+'BG'=>'Bulgaria',
+'BF'=>'Burkina Faso',
+'BI'=>'Burundi',
+'KH'=>'Cambodia',
+'CM'=>'Cameroon',
+'CA'=>'Canada',
+'CV'=>'Cape Verde',
+'KY'=>'Cayman Islands',
+'CF'=>'Central African Republic',
+'TD'=>'Chad',
+'CL'=>'Chile',
+'CN'=>'China',
+'CX'=>'Christmas Island',
+'CC'=>'Cocos (Keeling) Islands',
+'CO'=>'Columbia',
+'KM'=>'Comoros',
+'CG'=>'Congo',
+'CK'=>'Cook Islands',
+'CR'=>'Costa Rica',
+'CI'=>'Cote D\'Ivorie (Ivory Coast)',
+'HR'=>'Croatia (Hrvatska)',
+'CU'=>'Cuba',
+'CY'=>'Cyprus',
+'CZ'=>'Czech Republic',
+'CD'=>'Democratic Republic Of Congo (Zaire)',
+'DK'=>'Denmark',
+'DJ'=>'Djibouti',
+'DM'=>'Dominica',
+'DO'=>'Dominican Republic',
+'TP'=>'East Timor',
+'EC'=>'Ecuador',
+'EG'=>'Egypt',
+'SV'=>'El Salvador',
+'GQ'=>'Equatorial Guinea',
+'ER'=>'Eritrea',
+'EE'=>'Estonia',
+'ET'=>'Ethiopia',
+'FK'=>'Falkland Islands (Malvinas)',
+'FO'=>'Faroe Islands',
+'FJ'=>'Fiji',
+'FI'=>'Finland',
+'FR'=>'France',
+'FX'=>'France, Metropolitan',
+'GF'=>'French Guinea',
+'PF'=>'French Polynesia',
+'TF'=>'French Southern Territories',
+'GA'=>'Gabon',
+'GM'=>'Gambia',
+'GE'=>'Georgia',
+'DE'=>'Germany',
+'GH'=>'Ghana',
+'GI'=>'Gibraltar',
+'GR'=>'Greece',
+'GL'=>'Greenland',
+'GD'=>'Grenada',
+'GP'=>'Guadeloupe',
+'GU'=>'Guam',
+'GT'=>'Guatemala',
+'GN'=>'Guinea',
+'GW'=>'Guinea-Bissau',
+'GY'=>'Guyana',
+'HT'=>'Haiti',
+'HM'=>'Heard And McDonald Islands',
+'HN'=>'Honduras',
+'HK'=>'Hong Kong',
+'HU'=>'Hungary',
+'IS'=>'Iceland',
+'IN'=>'India',
+'ID'=>'Indonesia',
+'IR'=>'Iran',
+'IQ'=>'Iraq',
+'IE'=>'Ireland',
+'IL'=>'Israel',
+'IT'=>'Italy',
+'JM'=>'Jamaica',
+'JP'=>'Japan',
+'JO'=>'Jordan',
+'KZ'=>'Kazakhstan',
+'KE'=>'Kenya',
+'KI'=>'Kiribati',
+'KW'=>'Kuwait',
+'KG'=>'Kyrgyzstan',
+'LA'=>'Laos',
+'LV'=>'Latvia',
+'LB'=>'Lebanon',
+'LS'=>'Lesotho',
+'LR'=>'Liberia',
+'LY'=>'Libya',
+'LI'=>'Liechtenstein',
+'LT'=>'Lithuania',
+'LU'=>'Luxembourg',
+'MO'=>'Macau',
+'MK'=>'Macedonia',
+'MG'=>'Madagascar',
+'MW'=>'Malawi',
+'MY'=>'Malaysia',
+'MV'=>'Maldives',
+'ML'=>'Mali',
+'MT'=>'Malta',
+'MH'=>'Marshall Islands',
+'MQ'=>'Martinique',
+'MR'=>'Mauritania',
+'MU'=>'Mauritius',
+'YT'=>'Mayotte',
+'MX'=>'Mexico',
+'FM'=>'Micronesia',
+'MD'=>'Moldova',
+'MC'=>'Monaco',
+'MN'=>'Mongolia',
+'MS'=>'Montserrat',
+'MA'=>'Morocco',
+'MZ'=>'Mozambique',
+'MM'=>'Myanmar (Burma)',
+'NA'=>'Namibia',
+'NR'=>'Nauru',
+'NP'=>'Nepal',
+'NL'=>'Netherlands',
+'AN'=>'Netherlands Antilles',
+'NC'=>'New Caledonia',
+'NZ'=>'New Zealand',
+'NI'=>'Nicaragua',
+'NE'=>'Niger',
+'NG'=>'Nigeria',
+'NU'=>'Niue',
+'NF'=>'Norfolk Island',
+'KP'=>'North Korea',
+'MP'=>'Northern Mariana Islands',
+'NO'=>'Norway',
+'OM'=>'Oman',
+'PK'=>'Pakistan',
+'PW'=>'Palau',
+'PA'=>'Panama',
+'PG'=>'Papua New Guinea',
+'PY'=>'Paraguay',
+'PE'=>'Peru',
+'PH'=>'Philippines',
+'PN'=>'Pitcairn',
+'PL'=>'Poland',
+'PT'=>'Portugal',
+'PR'=>'Puerto Rico',
+'QA'=>'Qatar',
+'RE'=>'Reunion',
+'RO'=>'Romania',
+'RU'=>'Russia',
+'RW'=>'Rwanda',
+'SH'=>'Saint Helena',
+'KN'=>'Saint Kitts And Nevis',
+'LC'=>'Saint Lucia',
+'PM'=>'Saint Pierre And Miquelon',
+'VC'=>'Saint Vincent And The Grenadines',
+'SM'=>'San Marino',
+'ST'=>'Sao Tome And Principe',
+'SA'=>'Saudi Arabia',
+'SN'=>'Senegal',
+'SC'=>'Seychelles',
+'SL'=>'Sierra Leone',
+'SG'=>'Singapore',
+'SK'=>'Slovak Republic',
+'SI'=>'Slovenia',
+'SB'=>'Solomon Islands',
+'SO'=>'Somalia',
+'ZA'=>'South Africa',
+'GS'=>'South Georgia And South Sandwich Islands',
+'KR'=>'South Korea',
+'ES'=>'Spain',
+'LK'=>'Sri Lanka',
+'SD'=>'Sudan',
+'SR'=>'Suriname',
+'SJ'=>'Svalbard And Jan Mayen',
+'SZ'=>'Swaziland',
+'SE'=>'Sweden',
+'CH'=>'Switzerland',
+'SY'=>'Syria',
+'TW'=>'Taiwan',
+'TJ'=>'Tajikistan',
+'TZ'=>'Tanzania',
+'TH'=>'Thailand',
+'TG'=>'Togo',
+'TK'=>'Tokelau',
+'TO'=>'Tonga',
+'TT'=>'Trinidad And Tobago',
+'TN'=>'Tunisia',
+'TR'=>'Turkey',
+'TM'=>'Turkmenistan',
+'TC'=>'Turks And Caicos Islands',
+'TV'=>'Tuvalu',
+'UG'=>'Uganda',
+'UA'=>'Ukraine',
+'AE'=>'United Arab Emirates',
+'UK'=>'United Kingdom',
+'US'=>'United States',
+'UM'=>'United States Minor Outlying Islands',
+'UY'=>'Uruguay',
+'UZ'=>'Uzbekistan',
+'VU'=>'Vanuatu',
+'VA'=>'Vatican City (Holy See)',
+'VE'=>'Venezuela',
+'VN'=>'Vietnam',
+'VG'=>'Virgin Islands (British)',
+'VI'=>'Virgin Islands (US)',
+'WF'=>'Wallis And Futuna Islands',
+'EH'=>'Western Sahara',
+'WS'=>'Western Samoa',
+'YE'=>'Yemen',
+'YU'=>'Yugoslavia',
+'ZM'=>'Zambia',
+'ZW'=>'Zimbabwe'
+);
+
+return $countries;
+
+}
+
diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/sql/install.php b/code/ryzom/tools/server/ryzom_ams/www/html/sql/install.php
index 60ec66676..268d4c8df 100644
--- a/code/ryzom/tools/server/ryzom_ams/www/html/sql/install.php
+++ b/code/ryzom/tools/server/ryzom_ams/www/html/sql/install.php
@@ -43,7 +43,9 @@
`SID` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
`type` VARCHAR( 64 ) NOT NULL ,
`query` VARCHAR( 512 ) NOT NULL
- );
+ );
+
+
";
$dbl->executeWithoutParams($sql);
print "The Lib & Web database were correctly installed!
";
diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/error.tpl b/code/ryzom/tools/server/ryzom_ams/www/html/templates/error.tpl
index a8e3ddd83..375815af3 100644
--- a/code/ryzom/tools/server/ryzom_ams/www/html/templates/error.tpl
+++ b/code/ryzom/tools/server/ryzom_ams/www/html/templates/error.tpl
@@ -72,7 +72,6 @@
{$title404}
-
{$error_message404}
{else if $error_code eq "403"}
{$title403}
diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/settings.tpl b/code/ryzom/tools/server/ryzom_ams/www/html/templates/settings.tpl
index 3ef4e0b50..f9ad610d9 100644
--- a/code/ryzom/tools/server/ryzom_ams/www/html/templates/settings.tpl
+++ b/code/ryzom/tools/server/ryzom_ams/www/html/templates/settings.tpl
@@ -162,257 +162,10 @@
-
@@ -421,17 +174,17 @@