Made country select code way more easy to handle by using smarty's foreach loop

--HG--
branch : quitta-gsoc-2013

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;
     }
-}
+}
+
+
+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;
+
+}
+

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! <br />";

code/ryzom/tools/server/ryzom_ams/www/html/templates/error.tpl

@@ -72,7 +72,6 @@
                     <p class="not-found">{$title404}</p>
                     <div class="clear"></div>
                     <div class="content">
-		    <img src="../html/img/notpage.jpg"/><br/>
                     {$error_message404}
                 {else if $error_code eq "403"}
                     <p class="not-found">{$title403}</p>

code/ryzom/tools/server/ryzom_ams/www/html/templates/settings.tpl

@@ -162,257 +162,10 @@
 						<div class="control-group">
 						<label class="control-label">Country</label>
 							<div class="controls">
-								 <select>
-									<option value="AA">None Selected</option>
-									<option value="AF">Afghanistan</option>
-									<option value="AX">Åland Islands</option>
-									<option value="AL">Albania</option>
-									<option value="DZ">Algeria</option>
-									<option value="AS">American Samoa</option>
-									<option value="AD">Andorra</option>
-									<option value="AO">Angola</option>
-									<option value="AI">Anguilla</option>
-									<option value="AQ">Antarctica</option>
-									<option value="AG">Antigua and Barbuda</option>
-									<option value="AR">Argentina</option>
-									<option value="AM">Armenia</option>
-									<option value="AW">Aruba</option>
-									<option value="AU">Australia</option>
-									<option value="AT">Austria</option>
-									<option value="AZ">Azerbaijan</option>
-									<option value="BS">Bahamas</option>
-									<option value="BH">Bahrain</option>
-									<option value="BD">Bangladesh</option>
-									<option value="BB">Barbados</option>
-									<option value="BY">Belarus</option>
-									<option value="BE">Belgium</option>
-									<option value="BZ">Belize</option>
-									<option value="BJ">Benin</option>
-									<option value="BM">Bermuda</option>
-									<option value="BT">Bhutan</option>
-									<option value="BO">Bolivia, Plurinational State of</option>
-									<option value="BQ">Bonaire, Sint Eustatius and Saba</option>
-									<option value="BA">Bosnia and Herzegovina</option>
-									<option value="BW">Botswana</option>
-									<option value="BV">Bouvet Island</option>
-									<option value="BR">Brazil</option>
-									<option value="IO">British Indian Ocean Territory</option>
-									<option value="BN">Brunei Darussalam</option>
-									<option value="BG">Bulgaria</option>
-									<option value="BF">Burkina Faso</option>
-									<option value="BI">Burundi</option>
-									<option value="KH">Cambodia</option>
-									<option value="CM">Cameroon</option>
-									<option value="CA">Canada</option>
-									<option value="CV">Cape Verde</option>
-									<option value="KY">Cayman Islands</option>
-									<option value="CF">Central African Republic</option>
-									<option value="TD">Chad</option>
-									<option value="CL">Chile</option>
-									<option value="CN">China</option>
-									<option value="CX">Christmas Island</option>
-									<option value="CC">Cocos (Keeling) Islands</option>
-									<option value="CO">Colombia</option>
-									<option value="KM">Comoros</option>
-									<option value="CG">Congo</option>
-									<option value="CD">Congo, the Democratic Republic of the</option>
-									<option value="CK">Cook Islands</option>
-									<option value="CR">Costa Rica</option>
-									<option value="CI">Côte d'Ivoire</option>
-									<option value="HR">Croatia</option>
-									<option value="CU">Cuba</option>
-									<option value="CW">Curaçao</option>
-									<option value="CY">Cyprus</option>
-									<option value="CZ">Czech Republic</option>
-									<option value="DK">Denmark</option>
-									<option value="DJ">Djibouti</option>
-									<option value="DM">Dominica</option>
-									<option value="DO">Dominican Republic</option>
-									<option value="EC">Ecuador</option>
-									<option value="EG">Egypt</option>
-									<option value="SV">El Salvador</option>
-									<option value="GQ">Equatorial Guinea</option>
-									<option value="ER">Eritrea</option>
-									<option value="EE">Estonia</option>
-									<option value="ET">Ethiopia</option>
-									<option value="FK">Falkland Islands (Malvinas)</option>
-									<option value="FO">Faroe Islands</option>
-									<option value="FJ">Fiji</option>
-									<option value="FI">Finland</option>
-									<option value="FR">France</option>
-									<option value="GF">French Guiana</option>
-									<option value="PF">French Polynesia</option>
-									<option value="TF">French Southern Territories</option>
-									<option value="GA">Gabon</option>
-									<option value="GM">Gambia</option>
-									<option value="GE">Georgia</option>
-									<option value="DE">Germany</option>
-									<option value="GH">Ghana</option>
-									<option value="GI">Gibraltar</option>
-									<option value="GR">Greece</option>
-									<option value="GL">Greenland</option>
-									<option value="GD">Grenada</option>
-									<option value="GP">Guadeloupe</option>
-									<option value="GU">Guam</option>
-									<option value="GT">Guatemala</option>
-									<option value="GG">Guernsey</option>
-									<option value="GN">Guinea</option>
-									<option value="GW">Guinea-Bissau</option>
-									<option value="GY">Guyana</option>
-									<option value="HT">Haiti</option>
-									<option value="HM">Heard Island and McDonald Islands</option>
-									<option value="VA">Holy See (Vatican City State)</option>
-									<option value="HN">Honduras</option>
-									<option value="HK">Hong Kong</option>
-									<option value="HU">Hungary</option>
-									<option value="IS">Iceland</option>
-									<option value="IN">India</option>
-									<option value="ID">Indonesia</option>
-									<option value="IR">Iran, Islamic Republic of</option>
-									<option value="IQ">Iraq</option>
-									<option value="IE">Ireland</option>
-									<option value="IM">Isle of Man</option>
-									<option value="IL">Israel</option>
-									<option value="IT">Italy</option>
-									<option value="JM">Jamaica</option>
-									<option value="JP">Japan</option>
-									<option value="JE">Jersey</option>
-									<option value="JO">Jordan</option>
-									<option value="KZ">Kazakhstan</option>
-									<option value="KE">Kenya</option>
-									<option value="KI">Kiribati</option>
-									<option value="KP">Korea, Democratic People's Republic of</option>
-									<option value="KR">Korea, Republic of</option>
-									<option value="KW">Kuwait</option>
-									<option value="KG">Kyrgyzstan</option>
-									<option value="LA">Lao People's Democratic Republic</option>
-									<option value="LV">Latvia</option>
-									<option value="LB">Lebanon</option>
-									<option value="LS">Lesotho</option>
-									<option value="LR">Liberia</option>
-									<option value="LY">Libya</option>
-									<option value="LI">Liechtenstein</option>
-									<option value="LT">Lithuania</option>
-									<option value="LU">Luxembourg</option>
-									<option value="MO">Macao</option>
-									<option value="MK">Macedonia, the former Yugoslav Republic of</option>
-									<option value="MG">Madagascar</option>
-									<option value="MW">Malawi</option>
-									<option value="MY">Malaysia</option>
-									<option value="MV">Maldives</option>
-									<option value="ML">Mali</option>
-									<option value="MT">Malta</option>
-									<option value="MH">Marshall Islands</option>
-									<option value="MQ">Martinique</option>
-									<option value="MR">Mauritania</option>
-									<option value="MU">Mauritius</option>
-									<option value="YT">Mayotte</option>
-									<option value="MX">Mexico</option>
-									<option value="FM">Micronesia, Federated States of</option>
-									<option value="MD">Moldova, Republic of</option>
-									<option value="MC">Monaco</option>
-									<option value="MN">Mongolia</option>
-									<option value="ME">Montenegro</option>
-									<option value="MS">Montserrat</option>
-									<option value="MA">Morocco</option>
-									<option value="MZ">Mozambique</option>
-									<option value="MM">Myanmar</option>
-									<option value="NA">Namibia</option>
-									<option value="NR">Nauru</option>
-									<option value="NP">Nepal</option>
-									<option value="NL">Netherlands</option>
-									<option value="NC">New Caledonia</option>
-									<option value="NZ">New Zealand</option>
-									<option value="NI">Nicaragua</option>
-									<option value="NE">Niger</option>
-									<option value="NG">Nigeria</option>
-									<option value="NU">Niue</option>
-									<option value="NF">Norfolk Island</option>
-									<option value="MP">Northern Mariana Islands</option>
-									<option value="NO">Norway</option>
-									<option value="OM">Oman</option>
-									<option value="PK">Pakistan</option>
-									<option value="PW">Palau</option>
-									<option value="PS">Palestinian Territory, Occupied</option>
-									<option value="PA">Panama</option>
-									<option value="PG">Papua New Guinea</option>
-									<option value="PY">Paraguay</option>
-									<option value="PE">Peru</option>
-									<option value="PH">Philippines</option>
-									<option value="PN">Pitcairn</option>
-									<option value="PL">Poland</option>
-									<option value="PT">Portugal</option>
-									<option value="PR">Puerto Rico</option>
-									<option value="QA">Qatar</option>
-									<option value="RE">Réunion</option>
-									<option value="RO">Romania</option>
-									<option value="RU">Russian Federation</option>
-									<option value="RW">Rwanda</option>
-									<option value="BL">Saint Barthélemy</option>
-									<option value="SH">Saint Helena, Ascension and Tristan da Cunha</option>
-									<option value="KN">Saint Kitts and Nevis</option>
-									<option value="LC">Saint Lucia</option>
-									<option value="MF">Saint Martin (French part)</option>
-									<option value="PM">Saint Pierre and Miquelon</option>
-									<option value="VC">Saint Vincent and the Grenadines</option>
-									<option value="WS">Samoa</option>
-									<option value="SM">San Marino</option>
-									<option value="ST">Sao Tome and Principe</option>
-									<option value="SA">Saudi Arabia</option>
-									<option value="SN">Senegal</option>
-									<option value="RS">Serbia</option>
-									<option value="SC">Seychelles</option>
-									<option value="SL">Sierra Leone</option>
-									<option value="SG">Singapore</option>
-									<option value="SX">Sint Maarten (Dutch part)</option>
-									<option value="SK">Slovakia</option>
-									<option value="SI">Slovenia</option>
-									<option value="SB">Solomon Islands</option>
-									<option value="SO">Somalia</option>
-									<option value="ZA">South Africa</option>
-									<option value="GS">South Georgia and the South Sandwich Islands</option>
-									<option value="SS">South Sudan</option>
-									<option value="ES">Spain</option>
-									<option value="LK">Sri Lanka</option>
-									<option value="SD">Sudan</option>
-									<option value="SR">Suriname</option>
-									<option value="SJ">Svalbard and Jan Mayen</option>
-									<option value="SZ">Swaziland</option>
-									<option value="SE">Sweden</option>
-									<option value="CH">Switzerland</option>
-									<option value="SY">Syrian Arab Republic</option>
-									<option value="TW">Taiwan, Province of China</option>
-									<option value="TJ">Tajikistan</option>
-									<option value="TZ">Tanzania, United Republic of</option>
-									<option value="TH">Thailand</option>
-									<option value="TL">Timor-Leste</option>
-									<option value="TG">Togo</option>
-									<option value="TK">Tokelau</option>
-									<option value="TO">Tonga</option>
-									<option value="TT">Trinidad and Tobago</option>
-									<option value="TN">Tunisia</option>
-									<option value="TR">Turkey</option>
-									<option value="TM">Turkmenistan</option>
-									<option value="TC">Turks and Caicos Islands</option>
-									<option value="TV">Tuvalu</option>
-									<option value="UG">Uganda</option>
-									<option value="UA">Ukraine</option>
-									<option value="AE">United Arab Emirates</option>
-									<option value="GB">United Kingdom</option>
-									<option value="US">United States</option>
-									<option value="UM">United States Minor Outlying Islands</option>
-									<option value="UY">Uruguay</option>
-									<option value="UZ">Uzbekistan</option>
-									<option value="VU">Vanuatu</option>
-									<option value="VE">Venezuela, Bolivarian Republic of</option>
-									<option value="VN">Viet Nam</option>
-									<option value="VG">Virgin Islands, British</option>
-									<option value="VI">Virgin Islands, U.S.</option>
-									<option value="WF">Wallis and Futuna</option>
-									<option value="EH">Western Sahara</option>
-									<option value="YE">Yemen</option>
-									<option value="ZM">Zambia</option>
-									<option value="ZW">Zimbabwe</option>
+								 <select name="Country">
+									{foreach from=$country_array key=k item=v}
+										<option value="{$k}" {if isset($Country) and $Country eq $k}selected="selected"{/if}>{$v}</option>
+									{/foreach}
 								</select>	
 							</div>
 						</div>
@@ -421,17 +174,17 @@
 							<label class="control-label">Gender</label>
 							<div class="controls">							
 								<label class="radio">
-								      <div id="uniform-optionsRadios2" class="radio"><span class="{if isset($Gender) and $Gender eq 0}checked{/if}"><input style="opacity: 0;" name="optionsRadios" id="optionsRadios2" value="option2" {if isset($Gender) and $Gender eq 0}checked=""{/if} type="radio"></span></div>
+								      <div id="uniform-optionsRadios2" class="radio"><span class="{if isset($Gender) and $Gender eq 0}checked{/if}"><input style="opacity: 0;" name="Gender" id="optionsRadios0" value="0" {if isset($Gender) and $Gender eq 0}checked=""{/if} type="radio"></span></div>
 								      Secret
 								</label>
 								<div style="clear:both"></div>
 								<label class="radio">
-									<div id="uniform-optionsRadios1" class="radio"><span class="{if isset($Gender) and $Gender eq 1}checked{/if}"><input style="opacity: 0;" name="optionsRadios" id="optionsRadios1" value="option1" {if isset($Gender) and $Gender eq 1}checked=""{/if} type="radio"></span></div>
+									<div id="uniform-optionsRadios1" class="radio"><span class="{if isset($Gender) and $Gender eq 1}checked{/if}"><input style="opacity: 0;" name="Gender" id="optionsRadios1" value="1" {if isset($Gender) and $Gender eq 1}checked=""{/if} type="radio"></span></div>
 									Male
 								</label>
 								<div style="clear:both"></div>
 								<label class="radio">
-								      <div id="uniform-optionsRadios2" class="radio"><span class="{if isset($Gender) and $Gender eq 2}checked{/if}"><input style="opacity: 0;" name="optionsRadios" id="optionsRadios2" value="option2" {if isset($Gender) and $Gender eq 2}checked=""{/if} type="radio"></span></div>
+								      <div id="uniform-optionsRadios2" class="radio"><span class="{if isset($Gender) and $Gender eq 2}checked{/if}"><input style="opacity: 0;" name="Gender" id="optionsRadios2" value="2" {if isset($Gender) and $Gender eq 2}checked=""{/if} type="radio"></span></div>
 								      Female
 								</label>
 							</div>