diff --git a/www/control_panel_edit_character.php b/www/control_panel_edit_character.php
index 2af1ddbf..470b6f41 100644
--- a/www/control_panel_edit_character.php
+++ b/www/control_panel_edit_character.php
@@ -53,6 +53,7 @@ $g_allegiances = array(
 	3 => "Ul'dah",
 );
 
+/*
 $g_htmlToDbFieldMapping = array(
 	"characterName" => "name",
 	"characterTribe" => "tribe",
@@ -61,12 +62,12 @@ $g_htmlToDbFieldMapping = array(
 	"characterSkinColor" => "skinColor",
 	"characterHairStyle" => "hairStyle",
 	"characterHairColor" => "hairColor",
-	"characterHairOption" => "hairOption",
+	"characterHairOption" => "hairVariation",
 	"characterEyeColor" => "eyeColor",
 	"characterFaceType" => "faceType",
-	"characterFaceBrow" => "faceBrow",
-	"characterFaceEye" => "faceEye",
-	"characterFaceIris" => "faceIris",
+	"characterFaceBrow" => "faceEyebrows",
+	"characterFaceEye" => "faceEyeShape",
+	"characterFaceIris" => "faceIrisSize",
 	"characterFaceNose" => "faceNose",
 	"characterFaceMouth" => "faceMouth",
 	"characterFaceJaw" => "faceJaw",
@@ -76,7 +77,7 @@ $g_htmlToDbFieldMapping = array(
 	"characterGuardian" => "guardian",
 	"characterBirthMonth" => "birthMonth",
 	"characterBirthDay" => "birthDay",
-	"characterAllegiance" => "allegiance",
+	"characterAllegiance" => "initialTown",
 	"characterWeapon1" => "weapon1",
 	"characterWeapon2" => "weapon2",
 	"characterHeadGear" => "headGear",
@@ -90,6 +91,108 @@ $g_htmlToDbFieldMapping = array(
 	"characterRightFingerGear" => "rightFingerGear",
 	"characterLeftFingerGear" => "leftFingerGear"
 );
+*/
+
+$g_height = array(
+	0 => "Shortest",
+	1 => "Short",
+	2 => "Average",
+	3 => "Tall",
+	4 => "Tallest"
+);
+
+$g_yesno = array(
+	0 => "No",
+	1 => "Yes"
+);
+
+$g_grandcompany = array(
+	0 => "None",
+	/* TODO: Find correct order for 1+ */
+	1 => "Maelstrom", 
+	2 => "Order of the Twin Adder ",
+	3 => "Immortal Flames"
+);
+
+$g_profileMapping = array(
+	"characterName" => "name",
+	"characterCreationDate" => "creationDate",
+	"characterIsLegacy" => "isLegacy",
+	"characterPlayTime" => "playTime",
+/*
+	"characterPositionX" => "positionX",
+	"characterPositionY" => "positionY",
+	"characterPositionZ" => "positionZ",
+	"characterPositionR" => "rotation",
+	"characterCurrentZoneId" => "currentZoneId",
+*/
+	"characterGuardian" => "guardian",
+	"characterBirthDay" => "birthDay",
+	"characterBirthMonth" => "birthMonth",
+	"characterAllegiance" => "initialTown",
+	"characterTribe" => "tribe",
+	"characterGcCurrent" => "gcCurrent",
+	"characterGcLimsaRank" => "gcLimsaRank",
+	"characterGcGridaniaRank" => "gcGridaniaRank",
+	"characterGcUldahRank" => "gcUldahRank",
+/*
+	"characterCurrentTitle" => "currentTitle",
+	"characterRestBonus" => "restBonus",
+*/
+	"characterAchievementPoints" => "achievementPoints",
+);
+
+$g_appearanceMapping = array(
+/*
+	"characterBaseId" => "baseId", // Basic appearance?
+*/
+	"characterSize" => "size",
+	"characterVoice" => "voice",
+	"characterSkinColor" => "skinColor",
+	"characterHairStyle" => "hairStyle",
+	"characterHairColor" => "hairColor",
+	"characterHairHighlightColor" => "hairHighlightColor",
+	"characterHairVariation" => "hairVariation",
+	"characterEyeColor" => "eyeColor",
+	"characterFaceType" => "faceType",
+	"characterFaceBrow" => "faceEyebrows",
+	"characterFaceEye" => "faceEyeShape",
+	"characterFaceIris" => "faceIrisSize",
+	"characterFaceNose" => "faceNose",
+	"characterFaceMouth" => "faceMouth",	
+	"characterFaceFeatures" => "faceFeatures",
+	"characterFaceEars" => "ears",
+	"characterFaceCharacteristics" => "characteristics",
+	"characterFaceCharacteristicsColor" => "characteristicsColor"
+);
+
+$g_chocoboMapping = array(
+	"characterHasChocobo" => "hasChocobo",
+	"characterHasGoobbue" => "hasGoobbue",
+	"characterChocoboAppearance" => "chocoboAppearance",
+	"characterChocoboName" => "chocoboName"
+);
+
+$g_classLevels = array(
+	"characterGla" => "gla",
+	"characterPug" => "pug",
+	"characterMrd" => "mrd",
+	"characterLnc" => "lnc",
+	"characterArc" => "arc",
+	"characterCnj" => "cnj",
+	"characterThm" => "thm",
+	"characterCrp" => "crp",
+	"characterBsm" => "bsm",
+	"characterArm" => "arm",
+	"characterGsm" => "gsm",
+	"characterLtw" => "ltw",
+	"characterWvr" => "wvr",
+	"characterAlc" => "alc",
+	"characterCul" => "cul",
+	"characterMin" => "min",
+	"characterBtn" => "btn",
+	"characterFsh" => "fsh"
+);
 
 function SaveCharacter($databaseConnection, $htmlFieldMapping, $characterId)
 {
@@ -104,7 +207,7 @@ function SaveCharacter($databaseConnection, $htmlFieldMapping, $characterId)
 function GenerateTextField($characterInfo, $htmlFieldMapping, $htmlFieldName, $fieldMaxLength = null)
 {
 	$inputMaxLength = ($fieldMaxLength === null) ? "" : sprintf("maxlength=\"%d\"", $fieldMaxLength);
-	return sprintf("<input id=\"%s\" name=\"%s\" type=\"text\" value=\"%s\" %s />",
+	return sprintf("<input id=\"%s\" name=\"%s\" type=\"text\" value=\"%s\" %s readonly=\"readonly\" />",
 		$htmlFieldName, $htmlFieldName, $characterInfo[$htmlFieldMapping[$htmlFieldName]], $inputMaxLength);
 }
 
@@ -140,6 +243,9 @@ if(isset($_POST["save"]))
 try
 {
 	$g_characterInfo = GetCharacterInfo($g_databaseConnection, $g_userId, $g_characterId);
+	$g_characterAppearance = GetCharacterAppearance($g_databaseConnection, $g_userId, $g_characterId);
+/*	$g_characterChocobo = GetCharacterChocobo($g_databaseConnection, $g_userId, $g_characterId); */
+	$g_characterClassLevels = GetCharacterClassLevels($g_databaseConnection, $g_userId, $g_characterId);
 }
 catch(Exception $e)
 {
@@ -152,14 +258,13 @@ catch(Exception $e)
 <html xmlns="http://www.w3.org/1999/xhtml">
 	<head>
 		<meta charset="UTF-8">
-		<title>Seventh Umbral Server</title>
+		<title>Character Info</title>
 		<link rel="stylesheet" type="text/css" href="css/reset.css" />
 		<link rel="stylesheet" type="text/css" href="css/global.css" />
 		<script type="application/ecmascript">
-		
 			var weaponPresets = <?php echo require_once("presets_weapon.json"); ?>; 
 			var armorPresets = <?php echo require_once("presets_armor.json"); ?>;
-			
+
 			function loadPresetsInSelect(presets, selectName)
 			{
 				var select = document.getElementById(selectName);
@@ -336,9 +441,14 @@ catch(Exception $e)
 		<?php include("header.php"); ?>
 		<?php include("control_panel_header.php"); ?>
 		<div class="edit">
-			<h2>Edit Character (<a href="#" onclick="toggleDisplay('guideDiv');">Help</a>)</h2>
+			<h2>Character Info (<a href="#" onclick="toggleDisplay('guideDiv');">Help</a>)</h2>
 			<div id="guideDiv" style="background-color: white; display: none;">
-				<h3>General Notes</h3>
+				<h3>Character Appearance Notes:</h3>
+				<p style="text-align: left">
+					Any value that is a bare number without any other description before or after it does 
+					not correlate to the values selected in the ingame character creator.
+				</p>
+				<!--
 				<p style="text-align: left">
 					All values here are editable, so change them at your own risk. Just keep in mind that
 					you can always import an appearance from a character creation data file and equip presetted
@@ -352,19 +462,26 @@ catch(Exception $e)
 					located in the "C:\Users\{Username}\Documents\My Games\FINAL FANTASY XIV\user\00000000" folder 
 					and have a '.CMB' extension.
 				</p>
+				-->
 			</div>
 			<br />
 			
 			<form method="post" autocomplete="off">
 				<table class="editForm">
 					<tr>
-						<th colspan="4">General Information</th>
+						<th colspan="4">Profile</th>
 					</tr>
 					<tr>
-						<td colspan="4">Name:</td>
+						<td>Name:</td>
+						<td>Legacy Character:</td>
+						<td>Creation Date:</td>
+						<td>Play Time:</td>
 					</tr>
 					<tr>
-						<td colspan="4"><?php echo GenerateTextField($g_characterInfo, $g_htmlToDbFieldMapping, "characterName", 20); ?></td>
+						<td><?php echo GenerateTextField($g_characterInfo, $g_profileMapping, "characterName", 20); ?></td>
+						<td><?php echo GenerateSelectField($g_characterInfo, $g_profileMapping, $g_yesno, "characterIsLegacy"); ?></td>
+						<td><?php echo GenerateTextField($g_characterInfo, $g_profileMapping, "characterCreationDate", 20); ?></td>
+						<td><?php echo GenerateTextField($g_characterInfo, $g_profileMapping, "characterPlayTime"); ?></td>
 					</tr>
 					<tr>
 						<td>Guardian:</td>
@@ -373,82 +490,163 @@ catch(Exception $e)
 						<td>Allegiance:</td>
 					</tr>
 					<tr>
-						<td><?php echo GenerateSelectField($g_characterInfo, $g_htmlToDbFieldMapping, $g_guardians, "characterGuardian"); ?></td>
-						<td><?php echo GenerateTextField($g_characterInfo, $g_htmlToDbFieldMapping, "characterBirthMonth"); ?></td>
-						<td><?php echo GenerateTextField($g_characterInfo, $g_htmlToDbFieldMapping, "characterBirthDay"); ?></td>
-						<td><?php echo GenerateSelectField($g_characterInfo, $g_htmlToDbFieldMapping, $g_allegiances, "characterAllegiance"); ?></td>
+						<td><?php echo GenerateSelectField($g_characterInfo, $g_profileMapping, $g_guardians, "characterGuardian"); ?></td>
+						<td><?php echo GenerateTextField($g_characterInfo, $g_profileMapping, "characterBirthMonth"); ?></td>
+						<td><?php echo GenerateTextField($g_characterInfo, $g_profileMapping, "characterBirthDay"); ?></td>
+						<td><?php echo GenerateSelectField($g_characterInfo, $g_profileMapping, $g_allegiances, "characterAllegiance"); ?></td>
+					</tr>
+					<tr>
+						<td>Current GC:</td>
+						<td>Maelstrom Rank:</td>
+						<td>Twin Adder Rank:</td>
+						<td>Immortal Flame Rank:</td>
+					</tr>
+					<tr>
+						<td><?php echo GenerateSelectField($g_characterInfo, $g_profileMapping, $g_grandcompany, "characterGcCurrent"); ?></td>
+						<td><?php echo GenerateTextField($g_characterInfo, $g_profileMapping, "characterGcLimsaRank"); ?></td>
+						<td><?php echo GenerateTextField($g_characterInfo, $g_profileMapping, "characterGcGridaniaRank"); ?></td>
+						<td><?php echo GenerateTextField($g_characterInfo, $g_profileMapping, "characterGcUldahRank"); ?></td>
+					</tr>
+					<!--
+					<tr>
+						<td>Chocobo Unlocked:</td>
+						<td>Goobbue Unlocked:</td>
+						<td>Chocobo Appearance:</td>
+						<td>Chocobo Name:</td>
+					</tr>
+					<tr>
+						<td><?php echo GenerateSelectField($g_characterChocobo, $g_chocoboMapping, $g_yesno, "characterHasChocobo"); ?></td>
+						<td><?php echo GenerateSelectField($g_characterChocobo, $g_chocoboMapping, $g_yesno, "characterHasGoobbue"); ?></td>
+						<td><?php echo GenerateTextField($g_characterChocobo, $g_chocoboMapping, "characterChocoboAppearance"); ?></td>
+						<td><?php echo GenerateTextField($g_characterChocobo, $g_chocoboMapping, "characterChocoboName"); ?></td>
+					</tr>
+					-->
+					<tr>
+						<td>GLA:</td>
+						<td>PUG:</td>
+						<td>MRD:</td>
+						<td>LNC:</td>
+					</tr>
+					<tr>
+						<td><?php echo GenerateTextField($g_characterClassLevels, $g_classLevels, "characterGla"); ?></td>
+						<td><?php echo GenerateTextField($g_characterClassLevels, $g_classLevels, "characterPug"); ?></td>
+						<td><?php echo GenerateTextField($g_characterClassLevels, $g_classLevels, "characterMrd"); ?></td>
+						<td><?php echo GenerateTextField($g_characterClassLevels, $g_classLevels, "characterLnc"); ?></td>
+					</tr>
+					<tr>
+						<td>ARC:</td>
+						<td>CNJ:</td>
+						<td>THM:</td>
+					</tr>
+					<tr>
+						<td><?php echo GenerateTextField($g_characterClassLevels, $g_classLevels, "characterArc"); ?></td>
+						<td><?php echo GenerateTextField($g_characterClassLevels, $g_classLevels, "characterCnj"); ?></td>
+						<td><?php echo GenerateTextField($g_characterClassLevels, $g_classLevels, "characterThm"); ?></td>
+					</tr>
+					<tr>
+						<td>CRP:</td>
+						<td>BSM:</td>
+						<td>ARM:</td>
+						<td>GSM:</td>
+					</tr>
+					<tr>
+						<td><?php echo GenerateTextField($g_characterClassLevels, $g_classLevels, "characterCrp"); ?></td>
+						<td><?php echo GenerateTextField($g_characterClassLevels, $g_classLevels, "characterBsm"); ?></td>
+						<td><?php echo GenerateTextField($g_characterClassLevels, $g_classLevels, "characterArm"); ?></td>
+						<td><?php echo GenerateTextField($g_characterClassLevels, $g_classLevels, "characterGsm"); ?></td>
+					</tr>
+					<tr>
+						<td>LTW:</td>
+						<td>WVR:</td>
+						<td>ALC:</td>
+						<td>CUL:</td>
+					</tr>
+					<tr>
+						<td><?php echo GenerateTextField($g_characterClassLevels, $g_classLevels, "characterLtw"); ?></td>
+						<td><?php echo GenerateTextField($g_characterClassLevels, $g_classLevels, "characterWvr"); ?></td>
+						<td><?php echo GenerateTextField($g_characterClassLevels, $g_classLevels, "characterAlc"); ?></td>
+						<td><?php echo GenerateTextField($g_characterClassLevels, $g_classLevels, "characterCul"); ?></td>
+					</tr>
+					<tr>
+						<td>MIN:</td>
+						<td>BTN:</td>
+						<td>FSH:</td>
+					</tr>
+					<tr>
+						<td><?php echo GenerateTextField($g_characterClassLevels, $g_classLevels, "characterMin"); ?></td>
+						<td><?php echo GenerateTextField($g_characterClassLevels, $g_classLevels, "characterBtn"); ?></td>
+						<td><?php echo GenerateTextField($g_characterClassLevels, $g_classLevels, "characterFsh"); ?></td>
 					</tr>
 				</table>
 				<br />
 				<hr />
 				<table class="editForm">
 					<tr>
-						<th colspan="4">Appearance</th>
+						<th colspan="5">Appearance</th>
 					</tr>
 					<tr>
-						<td colspan="4">Tribe:</td>
-					</tr>
-					<tr>
-						<td colspan="4"><?php echo GenerateSelectField($g_characterInfo, $g_htmlToDbFieldMapping, $g_tribes, "characterTribe"); ?></td>
-					</tr>
-					<tr>
-						<td>Size:</td>
+						<td colspan="2">Race/Tribe:</td>
+						<td>Height:</td>
 						<td>Voice:</td>
-						<td>Skin Color:</td>
-						<td>Hair Style:</td>
+						<td>Skin Tone:</td>
 					</tr>
 					<tr>
-						<td><?php echo GenerateTextField($g_characterInfo, $g_htmlToDbFieldMapping, "characterSize"); ?></td>
-						<td><?php echo GenerateTextField($g_characterInfo, $g_htmlToDbFieldMapping, "characterVoice"); ?></td>
-						<td><?php echo GenerateTextField($g_characterInfo, $g_htmlToDbFieldMapping, "characterSkinColor"); ?></td>
-						<td><?php echo GenerateTextField($g_characterInfo, $g_htmlToDbFieldMapping, "characterHairStyle"); ?></td>
+						<td colspan="2"><?php echo GenerateSelectField($g_characterInfo, $g_profileMapping, $g_tribes, "characterTribe"); ?></td>
+						<td><?php echo GenerateSelectField($g_characterAppearance, $g_appearanceMapping, $g_height, "characterSize"); ?></td>
+						<td><?php echo GenerateTextField($g_characterAppearance, $g_appearanceMapping, "characterVoice"); ?></td>
+						<td><?php echo GenerateTextField($g_characterAppearance, $g_appearanceMapping, "characterSkinColor"); ?></td>
 					</tr>
 					<tr>
+						<td>Hairstyle:</td>
+						<td>Variation:</td>
 						<td>Hair Color:</td>
-						<td>Hair Option:</td>
-						<td>Eye Color:</td>
+						<td>Highlights:</td>
+					</tr>
+					<tr>
+						<td><?php echo GenerateTextField($g_characterAppearance, $g_appearanceMapping, "characterHairStyle"); ?></td>
+						<td><?php echo GenerateTextField($g_characterAppearance, $g_appearanceMapping, "characterHairVariation"); ?></td>
+						<td><?php echo GenerateTextField($g_characterAppearance, $g_appearanceMapping, "characterHairColor"); ?></td>
+						<td><?php echo GenerateTextField($g_characterAppearance, $g_appearanceMapping, "characterHairHighlightColor"); ?></td>
+					</tr>
+					<tr>
 						<td>Face Type:</td>
+						<td>Eyebrows:</td>
+						<td>Eye Shape:</td>
+						<td>Iris Size:</td>
 					</tr>
 					<tr>
-						<td><?php echo GenerateTextField($g_characterInfo, $g_htmlToDbFieldMapping, "characterHairColor"); ?></td>
-						<td><?php echo GenerateTextField($g_characterInfo, $g_htmlToDbFieldMapping, "characterHairOption"); ?></td>
-						<td><?php echo GenerateTextField($g_characterInfo, $g_htmlToDbFieldMapping, "characterEyeColor"); ?></td>
-						<td><?php echo GenerateTextField($g_characterInfo, $g_htmlToDbFieldMapping, "characterFaceType"); ?></td>
-					</tr>
-					<tr>
-						<td>Face Brow:</td>
-						<td>Face Eye:</td>
-						<td>Face Iris:</td>
-						<td>Face Nose:</td>
-					</tr>
-					<tr>
-						<td><?php echo GenerateTextField($g_characterInfo, $g_htmlToDbFieldMapping, "characterFaceBrow"); ?></td>
-						<td><?php echo GenerateTextField($g_characterInfo, $g_htmlToDbFieldMapping, "characterFaceEye"); ?></td>
-						<td><?php echo GenerateTextField($g_characterInfo, $g_htmlToDbFieldMapping, "characterFaceIris"); ?></td>
-						<td><?php echo GenerateTextField($g_characterInfo, $g_htmlToDbFieldMapping, "characterFaceNose"); ?></td>
-					</tr>
-					<tr>
+						<td>Eye Color:</td>
+						<td>Nose:</td>
 						<td>Face Mouth:</td>
-						<td>Face Jaw:</td>
-						<td>Face Cheek:</td>
-						<td>Face Option 1:</td>
+						<td>Features:</td>						
 					</tr>
 					<tr>
-						<td><?php echo GenerateTextField($g_characterInfo, $g_htmlToDbFieldMapping, "characterFaceMouth"); ?></td>
-						<td><?php echo GenerateTextField($g_characterInfo, $g_htmlToDbFieldMapping, "characterFaceJaw"); ?></td>
-						<td><?php echo GenerateTextField($g_characterInfo, $g_htmlToDbFieldMapping, "characterFaceCheek"); ?></td>
-						<td><?php echo GenerateTextField($g_characterInfo, $g_htmlToDbFieldMapping, "characterFaceOption1"); ?></td>
+						<td><?php echo GenerateTextField($g_characterAppearance, $g_appearanceMapping, "characterFaceType"); ?></td>
+						<td><?php echo GenerateTextField($g_characterAppearance, $g_appearanceMapping, "characterFaceBrow"); ?></td>
+						<td><?php echo GenerateTextField($g_characterAppearance, $g_appearanceMapping, "characterFaceEye"); ?></td>
+						<td><?php echo GenerateTextField($g_characterAppearance, $g_appearanceMapping, "characterFaceIris"); ?></td>
 					</tr>
 					<tr>
-						<td>Face Option 2:</td>
-						<td></td>
-						<td></td>
+						<td><?php echo GenerateTextField($g_characterAppearance, $g_appearanceMapping, "characterEyeColor"); ?></td>
+						<td><?php echo GenerateTextField($g_characterAppearance, $g_appearanceMapping, "characterFaceNose"); ?></td>
+						<td><?php echo GenerateTextField($g_characterAppearance, $g_appearanceMapping, "characterFaceMouth"); ?></td>
+						<td><?php echo GenerateTextField($g_characterAppearance, $g_appearanceMapping, "characterFaceFeatures"); ?></td>
+					</tr>
+					<tr>						
+						<td>Characteristic:</td>
+						<td>Color:</td>
+						<td>Ears:</td>
+					</tr>
+					<tr>
+						<td><?php echo GenerateTextField($g_characterAppearance, $g_appearanceMapping, "characterFaceCharacteristics"); ?></td>
+						<td><?php echo GenerateTextField($g_characterAppearance, $g_appearanceMapping, "characterFaceCharacteristicsColor"); ?></td>
+						<td><?php echo GenerateTextField($g_characterAppearance, $g_appearanceMapping, "characterFaceEars"); ?></td>
+					</tr>
+					<!--
+					<tr>
 						<td></td>
 					</tr>
 					<tr>
-						<td><?php echo GenerateTextField($g_characterInfo, $g_htmlToDbFieldMapping, "characterFaceOption2"); ?></td>
-						<td></td>
-						<td></td>
 						<td>
 							<script>
 								function onImportAppearanceButtonClick()
@@ -463,9 +661,11 @@ catch(Exception $e)
 							</script>
 						</td>
 					</tr>
+					-->
 				</table>
 				<br />
 				<hr />
+				<!--
 				<table class="editForm">
 					<tr>
 						<th colspan="4">Gear</th>
@@ -535,6 +735,8 @@ catch(Exception $e)
 				</table>
 				<br />
 				<hr />
+				-->
+				<!--
 				<table class="infoForm">
 					<tr>
 						<td>
@@ -543,6 +745,7 @@ catch(Exception $e)
 						</td>
 					</tr>
 				</table>
+				-->
 			</form>
 		</div>
 		<div>
diff --git a/www/database.php b/www/database.php
index 79aabc0b..2ddec593 100644
--- a/www/database.php
+++ b/www/database.php
@@ -341,6 +341,63 @@ function GetCharacterInfo($dataConnection, $userId, $characterId)
 	return $row;
 }
 
+function GetCharacterAppearance($dataConnection, $userId, $characterId)
+{
+	$query = sprintf("SELECT * FROM characters_appearance INNER JOIN characters ON characters_appearance.characterId = characters.id WHERE characters.userId = '%d' AND characters.Id='%d'", 
+		$userId, $characterId);
+	$result = $dataConnection->query($query);
+	if(!$result)
+	{
+			throw new Exception(__FUNCTION__ . " failed: " . $dataConnection->error);
+	}
+	
+	$row = $result->fetch_assoc();
+	if(!$row)
+	{
+			throw new Exception(__FUNCTION__ . " failed: " . $dataConnection->error);
+	}
+	
+	return $row;
+}
+
+function GetCharacterChocobo($dataConnection, $userId, $characterId)
+{
+	$query = sprintf("SELECT * FROM characters_chocobo INNER JOIN characters ON characters_chocobo.characterId = characters.id WHERE characters.userId = '%d' AND characters.Id='%d'", 
+		$userId, $characterId);
+	$result = $dataConnection->query($query);
+	if(!$result)
+	{
+			throw new Exception(__FUNCTION__ . " failed: " . $dataConnection->error);
+	}
+	
+	$row = $result->fetch_assoc();
+	if(!$row)
+	{
+			throw new Exception(__FUNCTION__ . " failed: " . $dataConnection->error);
+	}
+	
+	return $row;
+}
+
+function GetCharacterClassLevels($dataConnection, $userId, $characterId)
+{
+	$query = sprintf("SELECT * FROM characters_class_levels INNER JOIN characters ON characters_class_levels.characterId = characters.id WHERE characters.userId = '%d' AND characters.Id='%d'", 
+		$userId, $characterId);
+	$result = $dataConnection->query($query);
+	if(!$result)
+	{
+			throw new Exception(__FUNCTION__ . " failed: " . $dataConnection->error);
+	}
+	
+	$row = $result->fetch_assoc();
+	if(!$row)
+	{
+			throw new Exception(__FUNCTION__ . " failed: " . $dataConnection->error);
+	}
+	
+	return $row;
+}
+
 function UpdateCharacterInfo($dataConnection, $characterId, $characterInfo)
 {
 	$statement = $dataConnection->prepare("UPDATE ffxiv_characters SET
diff --git a/www/index.php b/www/index.php
deleted file mode 100644
index 2236f73b..00000000
--- a/www/index.php
+++ /dev/null
@@ -1,553 +0,0 @@
-<?php
-
-// Page créé par Shepard [Fabian Pijcke] <Shepard8@laposte.net>
-// Arno Esterhuizen <arno.esterhuizen@gmail.com>
-// et Romain Bourdon <rromain@romainbourdon.com>
-// et Hervé Leclerc <herve.leclerc@alterway.fr>
-//  
-// Mise à jour par Herve Leclerc herve.leclerc@alterway.fr
-// Icônes par Mark James <http://www.famfamfam.com/lab/icons/silk/>
-//------
-//[modif oto] Modifications Dominique Ottello (Otomatic)
-//Suppression des vhosts, le dossier n'étant plus créé à l'installation
-//Affichage des Outils, Projets et Alias sur trois colonnes
-//   - Recodage en utf-8
-//   - Modification des styles : ajout .third .left et .right
-//   - Ajouts d'index dans $langues['en'] et ['fr'] :
-//       'locale' pour set_locale
-//       'docp' url des documentations PHP
-//       'docm' url des documentations MySQL
-//       'doca2.2' url de la documentation Apache 2.2
-//       'doca2.4' url de la documentation Apache 2.4
-//       'server' Server Software
-//   - Classement alphabétique des extensions PHP en fonction de la localisation
-//   - Liens sur les documentations Apache, PHP et MySQL
-//   - Ajout variable $suppress_localhost = true;
-//   - Conformité W3C par ajout de <li>...</li> sur les variables
-//     $aliasContents et $projectContents si vides
-
-//[modif oto] - Pour supprimer niveau localhost dans les url 
-$suppress_localhost = true;
-// avec modification de la ligne
-//$projectContents .= '<li><a href="'.$file.'">'.$file.'</a></li>';
-//Par :
-//$projectContents .= '<li><a href="'.($suppress_localhost ? 'http://' : '').$file.'">'.$file.'</a></li>';
-//-----
-//[modif oto] Ajout $server_dir pour un seul remplacement
-// si déplacement www hors de Wamp et pas d'utilisation des jonctions
-//Par défaut la valeur est "../"
-//$server_dir = "WAMPROOT/";
-$server_dir = "../";
-//Fonctionne à condition d'avoir ServerSignature On et ServerTokens Full dans httpd.conf
-$server_software = $_SERVER['SERVER_SOFTWARE'];
-
-$wampConfFile = $server_dir.'wampmanager.conf';
-//chemin jusqu'aux fichiers alias
-$aliasDir = $server_dir.'alias/';
-
-// on charge le fichier de conf locale
-if (!is_file($wampConfFile))
-    die ('Unable to open WampServer\'s config file, please change path in index.php file');
-$fp = fopen($wampConfFile,'r');
-$wampConfFileContents = fread ($fp, filesize ($wampConfFile));
-fclose ($fp);
-
-
-// on récupère les versions des applis
-preg_match('|phpVersion = (.*)\n|',$wampConfFileContents,$result);
-$phpVersion = str_replace('"','',$result[1]);
-preg_match('|apacheVersion = (.*)\n|',$wampConfFileContents,$result);
-$apacheVersion = str_replace('"','',$result[1]);
-$doca_version = 'doca'.substr($apacheVersion,0,3);
-preg_match('|mysqlVersion = (.*)\n|',$wampConfFileContents,$result);
-$mysqlVersion = str_replace('"','',$result[1]);
-preg_match('|wampserverVersion = (.*)\n|',$wampConfFileContents,$result);
-$wampserverVersion = str_replace('"','',$result[1]);
-
-// répertoires à ignorer dans les projets
-$projectsListIgnore = array ('.','..');
-
-// textes
-$langues = array(
-	'en' => array(
-		'langue' => 'English',
-		'locale' => 'english',
-		'autreLangue' => 'Version Française',
-		'autreLangueLien' => 'fr',
-		'titreHtml' => 'WAMPSERVER Homepage',
-		'titreConf' => 'Server Configuration',
-		'versa' => 'Apache Version :',
-		'doca2.2' => 'httpd.apache.org/docs/2.2/en/',
-		'doca2.4' => 'httpd.apache.org/docs/2.4/en/',
-		'versp' => 'PHP Version :',
-		'server' => 'Server Software:',
-		'docp' => 'www.php.net/manual/en/',
-		'versm' => 'MySQL Version :',
-		'docm' => 'dev.mysql.com/doc/index.html',
-		'phpExt' => 'Loaded Extensions : ',
-		'titrePage' => 'Tools',
-		'txtProjet' => 'Your Projects',
-		'txtNoProjet' => 'No projects yet.<br />To create a new one, just create a directory in \'www\'.',
-		'txtAlias' => 'Your Aliases',
-		'txtNoAlias' => 'No Alias yet.<br />To create a new one, use the WAMPSERVER menu.',
-		'faq' => 'http://www.en.wampserver.com/faq.php'
-	),
-	'fr' => array(
-		'langue' => 'Français',
-		'locale' => 'french',
-		'autreLangue' => 'English Version',
-		'autreLangueLien' => 'en',
-		'titreHtml' => 'Accueil WAMPSERVER',
-		'titreConf' => 'Configuration Serveur',
-		'versa' => 'Version Apache:',
-		'doca2.2' => 'httpd.apache.org/docs/2.2/fr/',
-		'doca2.4' => 'httpd.apache.org/docs/2.4/fr/',
-		'versp' => 'Version de PHP:',
-		'server' => 'Server Software:',
-		'docp' => 'www.php.net/manual/fr/',
-		'versm' => 'Version de MySQL:',
-		'docm' => 'dev.mysql.com/doc/index.html',
-		'phpExt' => 'Extensions Chargées: ',
-		'titrePage' => 'Outils',
-		'txtProjet' => 'Vos Projets',
-		'txtNoProjet' => 'Aucun projet.<br /> Pour en ajouter un nouveau, créez simplement un répertoire dans \'www\'.',
-		'txtAlias' => 'Vos Alias',
-		'txtNoAlias' => 'Aucun alias.<br /> Pour en ajouter un nouveau, utilisez le menu de WAMPSERVER.',
-		'faq' => 'http://www.wampserver.com/faq.php'
-	)
-);
-
-// images
-$pngFolder = <<< EOFILE
-iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAAA3NCSVQICAjb4U/gAAABhlBMVEX//v7//v3///7//fr//fj+/v3//fb+/fT+/Pf//PX+/Pb+/PP+/PL+/PH+/PD+++/+++7++u/9+vL9+vH79+r79+n79uj89tj89Nf889D88sj78sz78sr58N3u7u7u7ev777j67bL67Kv46sHt6uP26cns6d356aP56aD56Jv45pT45pP45ZD45I324av344r344T14J734oT34YD13pD24Hv03af13pP233X025303JL23nX23nHz2pX23Gvn2a7122fz2I3122T12mLz14Xv1JPy1YD12Vz02Fvy1H7v04T011Py03j011b01k7v0n/x0nHz1Ejv0Hnuz3Xx0Gvz00buzofz00Pxz2juz3Hy0TrmznzmzoHy0Djqy2vtymnxzS3xzi/kyG3jyG7wyyXkwJjpwHLiw2Liw2HhwmDdvlXevVPduVThsX7btDrbsj/gq3DbsDzbrT7brDvaqzjapjrbpTraojnboTrbmzrbmjrbl0Tbljrakz3ajzzZjTfZijLZiTJdVmhqAAAAgnRSTlP///////////////////////////////////////8A////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////9XzUpQAAAAlwSFlzAAALEgAACxIB0t1+/AAAAB90RVh0U29mdHdhcmUATWFjcm9tZWRpYSBGaXJld29ya3MgOLVo0ngAAACqSURBVBiVY5BDAwxECGRlpgNBtpoKCMjLM8jnsYKASFJycnJ0tD1QRT6HromhHj8YMOcABYqEzc3d4uO9vIKCIkULgQIlYq5haao8YMBUDBQoZWIBAnFtAwsHD4kyoEA5l5SCkqa+qZ27X7hkBVCgUkhRXcvI2sk3MCpRugooUCOooWNs4+wdGpuQIlMDFKiWNbO0dXTx9AwICVGuBQqkFtQ1wEB9LhGeAwDSdzMEmZfC0wAAAABJRU5ErkJggg==
-EOFILE;
-$pngFolderGo = <<< EOFILE
-iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAJISURBVDjLpZPLS5RhFIef93NmnMIRSynvgRF5KWhRlmWbbotwU9sWLupfCBeBEYhQm2iVq1oF0TKIILIkMgosxBaBkpFDmpo549y+772dFl5bBIG/5eGch9+5KRFhOwrYpmIAk8+OjScr29uV2soTotzXtLOZLiD6q0oBUDjY89nGAJQErU3dD+NKKZDVYpTChr9a5sdvpWUtClCWqBRxZiE/9+o68CQGgJUQr8ujn/dxugyCSpRKkaw/S33n7QQigAfxgKCCitqpp939mwCjAvEapxOIF3xpBlOYJ78wQjxZB2LAa0QsYEm19iUQv29jBihJeltCF0F0AZNbIdXaS7K6ba3hdQey6iBWBS6IbQJMQGzHHqrarm0kCh6vf2AzLxGX5eboc5ZLBe52dZBsvAGRsAUgIi7EFycQl0VcDrEZvFlGXBZshtCGNNa0cXVkjEdXIjBb1kiEiLd4s4jYLOKy9L1+DGLQ3qKtpW7XAdpqj5MLC/Q8uMi98oYtAC2icIj9jdgMYjNYrznf0YsTj/MOjzCbTXO48RR5XaJ35k2yMBCoGIBov2yLSztNPpHCpwKROKHVOPF8X5rCeIv1BuMMK1GOI02nyZsiH769DVcBYXRneuhSJ8I5FCmAsNomrbPsrWzGeocTz1x2ht0VtXxKj/Jl+v1y0dCg/vVMl4daXKg12mtCq9lf0xGcaLnA2Mw7hidfTGhL5+ygROp/v/HQQLB4tPlMzcjk8EftOTk7KHr1hP4T0NKvFp0vqyl5F18YFLse/wPLHlqRZqo3CAAAAABJRU5ErkJggg==
-EOFILE;
-$gifLogo = <<< EOFILE
-iVBORw0KGgoAAAANSUhEUgAAAGAAAABTCAYAAABgdgI7AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ
-bWFnZVJlYWR5ccllPAAAA2RpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdp
-bj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6
-eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEz
-NDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJo
-dHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlw
-dGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEu
-MC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVz
-b3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1N
-Ok9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo1ODg0QkM3NUZBMDhFMDExODkyQ0U2NkE5ODVB
-M0Q2OSIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDoyMEQ2RDU5MDA5M0UxMUUwOUUwRkYwRTg2
-NjQyMzQzQyIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDoyMEQ2RDU4RjA5M0UxMUUwOUUwRkYw
-RTg2NjQyMzQzQyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M1IFdpbmRvd3Mi
-PiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo1ODg0QkM3NUZB
-MDhFMDExODkyQ0U2NkE5ODVBM0Q2OSIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDo1ODg0QkM3
-NUZBMDhFMDExODkyQ0U2NkE5ODVBM0Q2OSIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRG
-PiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Pgv54A4AAA33SURBVHja7F0JmBTVEa7Z
-XXZhuc9FiCIICVf8PIKA3EQIAkbJh5AImARERDFAVKIoikc+TEwCSVDBRBRkvygGScIRjoAhCiyC
-EORQlCMBIiIIy7mw7O6kavp/zNvHTHfPTM+1UN9X3053v+5+XVWvrlfvrc/v99NlSB5kXCZBciHr
-wi/fK8nuy9cYb2Jsx9gGx3UZq8XwTBneJxkPMe5h3MS4lnEzY1HSvtR/bwgGJAdyGW9jHMrYhbFm
-HN4hTLyasT3jD3BuN+MixjcYP7wUVZC8dwQ+/k3G/nEifji4hnEs43rGv4A5lwwDvsm4kvGPjC2T
-PAIzGW9nfJ9xOmPtis6AQYzvMXZPQVv4AOMaxq4VlQEPQN3UpNSFVozLGe+paAwYjiHuSwPPMIfx
-D4yPJNYNjR90Y3w5hvtLGYvx1y0D/dDvOTEI2S8Zj8FWpS0DxAWczZgdwT37GN+Fh/Ix41eMpxnP
-R8iASozVGRsgrugMYagXQV9eZNyB2CEtGfA8YxOXbTcyToN/ftzjfqzAsxsy3sk4hvHrLu4TwXkV
-AeLJdLMBHaD7nUDUy6OMnRjz40B8Hb5g/D3jtxinMJa5uKdlPO1BPBnwtIvnH0Mk/AswIlEg0jyR
-cSDUmxM8yNgonRggkWUvhzZnQYDlIa6JqzqE8aUY3VZJdfyO8T7GK0JcX4DYxIn5tRhHphMDRrow
-mKJ2VoU4P4qspNlcPCcWOyV9GAovbAvjk/CMdFiCvjjBkBD3piQDaiK3YwcFkEwdqjLOY5zB2Azn
-TsCjiVXdCNSHWlzKmGe0mYZ0hB20oDjkjOLBgI4hPtCE5wzCimS9DQ8l3iBpkPlQT7rb+pSLe3um
-AwO6OVz/FG6hDpMZb02gEe6E0aCDqMMNLjy7lGfAjQ7X/24YPfHHxych5SC5qebGufkO90hfK6cy
-A0SVNHVo8y/j+MfxMG4uoArebfbNzubkIbJOWQbUgrGzy+t8Zry/NyUP+hg02A3Db8e0+qnOgCo2
-1yXoOWzkipomkQHNDYkW4h9xcGtrpDIDshyeeQaooA7FNukeK1SFEOhpEaecjy+VGeDks5+DGtIZ
-lsw5gkzDHS1DHxMGiZ6S9EXIsGT0yZfuDPAlavgmiCFpxYAMDGs7NzXVITuRNPN6QmYvwvVwUnQW
-GC3UQLBUw8bNHYJ+RAv3OHg6m1OZAeJmvhtH6ayENEIVB88mFthYkY2wF16WXU1nCbmb5UoZuFwd
-nWTwWgVJVJsfxhCLXTjI+H1KZmWyM8xibBvGRZZvuN9LNeU1A0T/drS5fjgNRp1kc6+1ue5p/ajX
-xCiDHg4HRWmgFZy8tNJ0tgH+KNr7I7zfb3N/ygWHiWZApLmfLMOrKXXos8+Q0DKH4E+YU5xMmnj9
-MifiSuJLn1GSzOM5h8BrkHYsv+3KVMT46/MLd5D9BIoQ/4QRZ+QmcsR4bYRP4aOybIy0GDGVc/+S
-rPVbzWw+diZZM1fyu70LAvyWrFKUErS3E7JD8MwUVHZhZItSmQFHySotzLXJs0itqJoVE+lfb8MA
-xYSOEY5qt+UjUh6jz09I9Vs9h0DvaCqrIBkBnzu0uck4nptEGzjHOL4eaigcHMOoSVkGiFHb7tDG
-nAOW0sS1SSC+LJVaapzr53DPfxkLU90LcqowE3XSyhjWP6HYsqSRgqidBw2PSUrXnSr6/k0eTyLF
-gwGryb7YVezAWOOcLFe9L0HEF6JLynmLcV4YUsvhXs8zvfFgwKcwrHYgXk0745yspBlMVg2/W5AV
-NB9F0H4/4wDGPxnnW4cQChPEXV0VRwZke/nc1xyuq5UnpsTNA2NkZc3OMGG/qKxtjJPIKhUUlSbV
-zTvCtC8Fo54la2HGQuN6NRhjp3mEpREKh7vASe2WUuB7lL+mLV1cuBAVVAeRrnJoJwb4TgpdDCVM
-+gbcVuUaSjJvL0aZmXMS76Wl0f4IDOcnZK0xCxWXvOXC+Ap0h3r1wFW592IG5Pgq0QTqQz9lJ6V2
-oF8lsb5Gai+nu2j3AXTy1gR7QVLnKSsgu7hou4ysKjqKGwN8Ph98xNb8tocxCmKaXJIczDr41k4g
-KYlfk7U24FCcCS+lhbJPhaz7quOifTFily2xvzrTGqj+u8Mb4eWsSkfT6xjR2YjOM6N5m+iyMS6H
-kqisyfjIl6ESGjsERW5BniFb39xGwZUyU1wSn7R+xaLpSaaxC9n7fZr+HNoGqBGgoAs1555nUVdq
-QeN4XNQMqKXz0bxdFsP9PIr7xC4cgN4/CUmMZJ1wNhibB2ZWj6IP82Gj/NETPpsl8Dy9TRuZ+H9l
-z+IL0ncpC8sAHdpTU1rEbKgXSESWoD8RqSeZpryL0gtWIzA7Fb2DmUVLOHZ7jN5hX3l/UDoiZYBi
-Qj6NYgNdmWqwes8KjIhzbhlRGdLUN02Iv5is+qIo1ixnXtDsozm0mRHCcYqKAZbPls2kz2aFWouj
-lltoKDuu2YGR7ko1qU0whqU48WXB3oTI9K0PGq+M9fwJvtFHT7CufyWQbiLvGGBCZ7YPC9jO1gvM
-m7heZz0Bhq1KihF+NzyjBZHbeFn0tpV97lXs9u1hBpQwI8JPG3jGgPL2ISImSOXBc5761tGDZDdl
-0ucFsjYGcSnxGQGp30n7OHZ6i3W9+zDGUwYoJixkpVQ/EIAWRWKgv0NWnc0t5DwV6DXILopvIhjb
-657wOQFBO8rfuY2dtIH0ErtpkdlpzxlAgZxBHuuWvrALORThOofmYEIPBG6N48CQQqiZdcjrrI7M
-w7EKv1cw2V/g2z9kyT9OpzlcjdxDjQsDFHSgZvQis+GGAE2jmj4V7l0BJjQg5xSxUzzwFaLrfZEn
-03zQ8ZmBzIAEqDM8SAfFlQECddlfWswqqX1g3qUE0lNM6VM3q7yaEtrAg+Yk9zuf3qdZgT39KPUZ
-IFCTnZwb2TbIrP9gasdj4mb+pFzyKNsaJ8hC5FpEH7BZmMyR64pAlttbSAgDQqmmR+hW6sR/8wL5
-MFVJ7o9hZFQKkS7y49lu3fhMSLufZf1/7INupjeogLazgS2N0xK2pDBAQR67q9+l6zh66MkBXW0+
-koxTrqamSjXdG25+JTtAuG20i2V0C5O7rNzI60NtqWVgWqAMz8ykYFFehnY+h43DYSb4Opb0T1jd
-7KFj5apUqOIxIDjYM5j4udSQqjMj6lIvJtkw6sgMEvt7hjaxCmjE9jc7QDg//JAMPlOTCb+fptJy
-1ssFrNBKQuQ9KtFdbIHGU29mxVVshY+yRB+kI6zNt7KUX09XUjdqw0/YGvDhDwSqTRIH5f5lgByk
-yv8QkBExiW7n4KDNBWmuwwZdYQNmVieOviu7zFJLu750beA+ExrF5FzFzgCFSRsBlzLoAq+XJt4P
-v/tvZG0ZRsjXPERWNcFsre33yFrEICtFFiX5e64ja7/nOvD1ZceTXWnFDXBkIZTtDO1yF5yTKLK6
-FhJ+jPPjk9z9pzRXSqG4P+PSgeYBumsMGI4P2EjBmadntA/rgXNXk1XFJtavVRK/QwlHERJ7PyJr
-l0WpgOiWLgzQVdBa+HitkQaQ6UB960n5LZVhNyBdIKPgM/iEPXFeRoeUoyzT8hDi1vRB8kuk89tk
-1fxIDZBUJvQja8JGip7WG4k6ubcABK2P96twVBFZanqewO/X8ayzF9l3a044DwK2mILTjKp/u3Cf
-1K5+DnXWFfkjVcQram4MvmMq2kf6bCmHnxVKBYmzvB03y8fXJquGUo0ARZzf4Hgmjn9lqADB97Qc
-Ti+cO2e0WYFkmDpWq9wVrMN5vQ+ibn6I6w/hnJS1tKHwW4l1QA5If/c7WnvVv9NGm8e1fqs6o7tx
-rgDCFtWzw6kggv5XL++P35J9+g84eCWO/WSVESoj+CqkRaRyC66PwPWeWnj6MxBOMWMTiD4Hxzu0
-0HYlzklBrCxtzcfxZqhI2UbypPZhe8DUsRQs86uEd8h1qf1sj5Emx6OM/okATIL9UNeUNA/E8Xwc
-q/ntaJ492o4Bg3CDbKz3mvaymfg9CRwXAjYJkcUUfB5tnzE6oZegr9FGmhraorJOUHCFyirj4xtj
-6Eu1m9rLoTOIdNCQQrVdfiscb0V6W/o3AOeU99YDx+tCjJ4huDYHHmGh5pBcE+2z7RjQhIK7Wp3Q
-ht9gPOgw/m7QDPUdkMpitD+PNpMNBvxD64OS7u44FnV1PAwDul7IMlhtTlH5Xa4IBBF7MhHSJkO+
-GhikPKOzRv+24d7uIfpHmmAUQgOMRLt8g7gRPzucESYYHrlZVS6vh8StAVOULlRqqLHWoYkYHQMQ
-J5iQYeR79XMZFL7mJ7dcqtL6WJUkyqbgNmOCsgn4YyB+HQpOuAgBn0T78yBWUZi+6HAUcdEwbUSr
-7z0b47NDXvBT+W0ll+HvASq/PF/VyTcEgXbBGM8l77b8UsNyOIb7CBi3LzFS+mAkykR6RxjEqSD+
-frTbi1GTB+GajXtEXSwxiBQO8rVvlULff+J4pwfPDpkL6qfpUn1x3OOa362WflaFDvRjpBzR7p1i
-eALrQng4ys2tC6kupWDJ4MoQ3pUfPj/B5w91XSRT3wJ5nHatUPvd26Z/OlQBgaWNud91VM+2U0FK
-7awAd/XNiRZAn++AdBF0rfwfroeRmtiK673gvRCYsko7VjHHGQouVy2G4Sctke/TGN8GTJe53Ola
-6mQJBKYFPvQjSOwm7V3T4CGJMW+KUTGPgostQvVPhyKMrP7l/Hdvnp1a2VAD1C62N1fEZJzCVN65
-5BiMYCZVYPBd/n/CyYXLO2ZdZsClDf8XYACcVJnoRcTY2AAAAABJRU5ErkJggg==
-EOFILE;
-$pngPlugin = <<< EOFILE
-iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsSAAALEgHS3X78AAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAABmklEQVR42mL4//8/AyUYIIDAxK5du1BwXEb3/9D4FjBOzZ/wH10ehkF6AQIIw4B1G7b+D09o/h+X3gXG4YmteA0ACCCsLghPbPkfm9b5PzK5439Sdg9eAwACCEyANMBwaFwTGIMMAOEQIBuGA6Mb/qMbABBAEAOQnIyMo1M74Tgiqf2/b3gVhgEAAQQmQuKa/8ekdYMxyLCgmEYMHJXc9t87FNMAgACCGgBxIkgzyDaQU5FxQGQN2AUBUXX/vULKwdgjsOQ/SC9AAKEEYlB03f+oFJABdSjYP6L6P0guIqkVjt0DisEGAAQQigEgG0AhHxBVi4L9wqvBBiEHtqs/xACAAAIbEBBd/x+Eg2ObwH4FORmGfYCaQRikCUS7B5YBNReBMUgvQABBDADaAtIIwsEx9f/Dk9pQsH9kHTh8XANKMAIRIIDAhF9ELTiQQH4FaQAZCAsskPNhyRpkK7oBAAEEMSC8GsVGkEaYIlBghcU3gbGzL6YBAAEEJnzCgP6EYs/gcjCGKQI5G4Z9QiswDAAIIAZKszNAgAEAHgFgGSNMTwgAAAAASUVORK5CYII=
-EOFILE;
-$pngWrench = <<< EOFILE
-iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAAA3NCSVQICAjb4U/gAAABO1BMVEXu7u7n5+fk5OTi4uLg4ODd3d3X19fV1dXU1NTS0tLPz8+7z+/MzMy6zu65ze65zu7Kysq3zO62zO3IyMjHx8e1yOiyyO2yyOzFxcXExMSyxue0xuexxefDw8OtxeuwxOXCwsLBwcGuxOWsw+q/v7+qweqqwuqrwuq+vr6nv+qmv+m7u7ukvumkvemivOi5ubm4uLicuOebuOeat+e0tLSYtuabtuaatuaXteaZteaatN6Xs+aVs+WTsuaTsuWRsOSrq6uLreKoqKinp6elpaWLqNijo6OFpt2CpNyAo92BotyAo9+dnZ18oNqbm5t4nt57nth7ntp4nt15ndp3nd6ZmZmYmJhym956mtJzm96WlpaVlZVwmNyTk5Nvl9lultuSkpKNjY2Li4uKioqIiIiHh4eGhoZQgtVKfNFdha6iAAAAaXRSTlMA//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////914ivwAAAACXBIWXMAAAsSAAALEgHS3X78AAAAH3RFWHRTb2Z0d2FyZQBNYWNyb21lZGlhIEZpcmV3b3JrcyA4tWjSeAAAAKFJREFUGJVjYIABASc/PwYkIODDxBCNLODEzGiQgCwQxsTlzJCYmAgXiGKVdHFxYEuB8dkTOIS1tRUVocaIWiWI8IiIKKikaoD50kYWrpwmKSkpsRC+lBk3t2NEMgtMu4wpr5aeuHcAjC9vzadjYyjn7w7lK9kK6tqZK4d4wBQECenZW6pHesEdFC9mbK0W7otwsqenqmpMILIn4tIzgpG4ADUpGMOpkOiuAAAAAElFTkSuQmCC
-EOFILE;
-$favicon = <<< EOFILE
-iVBORw0KGgoAAAANSUhEUgAAAB8AAAAfCAYAAAAfrhY5AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ
-bWFnZVJlYWR5ccllPAAAA2RpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdp
-bj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6
-eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEz
-NDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJo
-dHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlw
-dGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEu
-MC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVz
-b3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1N
-Ok9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo1ODg0QkM3NUZBMDhFMDExODkyQ0U2NkE5ODVB
-M0Q2OSIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDoxRkI1ODNGRTA5MDMxMUUwQjAwNEEwODc0
-OTk5N0ZEOCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDoxRkI1ODNGRDA5MDMxMUUwQjAwNEEw
-ODc0OTk5N0ZEOCIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M1IFdpbmRvd3Mi
-PiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo1ODg0QkM3NUZB
-MDhFMDExODkyQ0U2NkE5ODVBM0Q2OSIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDo1ODg0QkM3
-NUZBMDhFMDExODkyQ0U2NkE5ODVBM0Q2OSIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRG
-PiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PiUukzAAAAHHSURBVHja5FfRccIwDLVz
-/W+7QdggbJBM0HQCwg+/LRNwTJDymx9ggmYDsgEZwRuUDVI5ET1XyE5CuIa76k7ABVtPluQnRVZV
-JcYST4woD85/ZRbC5wxUf/sdbZagBehGVAvlNM+GXWYaaIugQ+QDdA1OnLqByyyAzwPo042iqyMx
-BwdKN7jMNODREWKFyonv2KdPPqERoDlPGQMKQ7drPWPjfAy6Inb080/QiK/2Js8JMacBpzWwzGIs
-QFdxhujkFMNtSkj3m1ftjTnxEg0f0XNXAYb1mmatwFPSFM1s4NTwuUp18QU9CiyonWj2rhkHWXAK
-kNeh7gdMQ5wzRdnKcAo9DwZcsRBtqL70qm7Ior3B/5zbI0IKrvv8mxarhXSsXtrY8m5OfjB+F5SN
-BkhKrpi8635uaxAvkO9HpgZSB/v57f2cFpEQzz+UeZ28Yvq+bMXpkb5rSgwLc+Z5Fylwb+y68x4p
-MlNW2CLnPUmnrE/d7F1dOGXJ+Qb0neQqre9ptZiAscTI38ng7YTQ8g6Budlg75pktkxPV9idctss
-1mGYOKciupsxatQB8pJkmkUTpgCvHZ0jDtg+t4/60vAf3tVGBf8WYAC3Rq8Ub3mHyQAAAABJRU5E
-rkJggg==
-EOFILE;
-
-
-//affichage du phpinfo
-if (isset($_GET['phpinfo']))
-{
-	phpinfo();
-	exit();
-}
-
-
-//affichage des images
-if (isset($_GET['img']))
-{
-    switch ($_GET['img'])
-    {
-        case 'pngFolder' :
-        header("Content-type: image/png");
-        echo base64_decode($pngFolder);
-        exit();
-        
-        case 'pngFolderGo' :
-        header("Content-type: image/png");
-        echo base64_decode($pngFolderGo);
-        exit();
-        
-        case 'gifLogo' :
-        header("Content-type: image/gif");
-        echo base64_decode($gifLogo);
-        exit();
-        
-        case 'pngPlugin' :
-        header("Content-type: image/png");
-        echo base64_decode($pngPlugin);
-        exit();
-        
-        case 'pngWrench' :
-        header("Content-type: image/png");
-        echo base64_decode($pngWrench);
-        exit();
-        
-        case 'favicon' :
-        header("Content-type: image/x-icon");
-        echo base64_decode($favicon);
-        exit();
-    }
-}
-
-
-
-// Définition de la langue et des textes 
-
-if (isset ($_GET['lang']))
-{
-  $langue = htmlspecialchars($_GET['lang'],ENT_QUOTES);
-  if ($langue != 'en' && $langue != 'fr' ) {
-		$langue = 'fr';
-  }
-  }
-elseif (isset ($_SERVER['HTTP_ACCEPT_LANGUAGE']) AND preg_match("/^fr/", $_SERVER['HTTP_ACCEPT_LANGUAGE']))
-{
-	$langue = 'fr';
-}
-else
-{
-	$langue = 'en';
-}
-
-//initialisation
-$aliasContents = '';
-
-// récupération des alias
-if (is_dir($aliasDir))
-{
-    $handle=opendir($aliasDir);
-    while (($file = readdir($handle))!==false) 
-    {
-	    if (is_file($aliasDir.$file) && strstr($file, '.conf'))
-	    {		
-		    $msg = '';
-		    $aliasContents .= '<li><a href="'.str_replace('.conf','',$file).'/">'.str_replace('.conf','',$file).'</a></li>';
-	    }
-    }
-    closedir($handle);
-}
-if (empty($aliasContents))
-	$aliasContents = "<li>".$langues[$langue]['txtNoAlias']."</li>\n";
-
-// récupération des projets
-$handle=opendir(".");
-$projectContents = '';
-while (($file = readdir($handle))!==false) 
-{
-	if (is_dir($file) && !in_array($file,$projectsListIgnore)) 
-	{		
-		//[modif oto] Ajout éventuel de http:// pour éviter le niveau localhost dans les url
-		$projectContents .= '<li><a href="'.($suppress_localhost ? 'http://' : '').$file.'">'.$file.'</a></li>';
-	}
-}
-closedir($handle);
-if (empty($projectContents))
-	$projectContents = "<li>".$langues[$langue]['txtNoProjet']."</li>\n";;
-
-
-//initialisation
-$phpExtContents = '';
-
-// récupération des extensions PHP
-$loaded_extensions = get_loaded_extensions();
-// [modif oto] classement alphabétique des extensions
-setlocale(LC_ALL,"{$langues[$langue]['locale']}");
-sort($loaded_extensions,SORT_LOCALE_STRING);
-foreach ($loaded_extensions as $extension)
-	$phpExtContents .= "<li>${extension}</li>";
-
-
-//header('Status: 301 Moved Permanently', false, 301);      
-//header('Location: /aviatechno/index.php');      
-//exit();        
-
-$pageContents = <<< EOPAGE
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
-	"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-
-<html lang="en" xml:lang="en">
-<head>
-	<title>{$langues[$langue]['titreHtml']}</title>
-	<meta http-equiv="Content-Type" content="txt/html; charset=utf-8" />
-
-	<style type="text/css">
-* {
-	margin: 0;
-	padding: 0;
-}
-
-html {
-	background: #ddd;
-}
-body {
-	margin: 1em 10%;
-	padding: 1em 3em;
-	font: 80%/1.4 tahoma, arial, helvetica, lucida sans, sans-serif;
-	border: 1px solid #999;
-	background: #eee;
-	position: relative;
-}
-#head {
-	margin-bottom: 1.8em;
-	margin-top: 1.8em;
-	padding-bottom: 0em;
-	border-bottom: 1px solid #999;
-	letter-spacing: -500em;
-	text-indent: -500em;
-	height: 125px;
-	background: url(index.php?img=gifLogo) 0 0 no-repeat;
-}
-.utility {
-	position: absolute;
-	right: 4em;
-	top: 145px;
-	font-size: 0.85em;
-}
-.utility li {
-	display: inline;
-}
-
-h2 {
-	margin: 0.8em 0 0 0;
-}
-
-ul {
-	list-style: none;
-	margin: 0;
-	padding: 0;
-}
-#head ul li, dl ul li, #foot li {
-	list-style: none;
-	display: inline;
-	margin: 0;
-	padding: 0 0.4em;
-}
-ul.aliases, ul.projects, ul.tools {
-	list-style: none;
-	line-height: 24px;
-}
-ul.aliases a, ul.projects a, ul.tools a {
-	padding-left: 22px;
-	background: url(index.php?img=pngFolder) 0 100% no-repeat;
-}
-ul.tools a {
-	background: url(index.php?img=pngWrench) 0 100% no-repeat;
-}
-ul.aliases a {
-	background: url(index.php?img=pngFolderGo) 0 100% no-repeat;
-}
-
-dl {
-	margin: 0;
-	padding: 0;
-}
-dt {
-	font-weight: bold;
-	text-align: right;
-	width: 11em;
-	clear: both;
-}
-dd {
-	margin: -1.35em 0 0 12em;
-	padding-bottom: 0.4em;
-	overflow: auto;
-}
-dd ul li {
-	float: left;
-	display: block;
-	width: 16.5%;
-	margin: 0;
-	padding: 0 0 0 20px;
-	background: url(index.php?img=pngPlugin) 2px 50% no-repeat;
-	line-height: 1.6;
-}
-a {
-	color: #024378;
-	font-weight: bold;
-	text-decoration: none;
-}
-a:hover {
-	color: #04569A;
-	text-decoration: underline;
-}
-#foot {
-	text-align: center;
-	margin-top: 1.8em;
-	border-top: 1px solid #999;
-	padding-top: 1em;
-	font-size: 0.85em;
-}
-.third {
-  width:32%;
-  float:left;
-}
-.left {float:left;}
-.right {float:right;}
-</style>
-	<link rel="shortcut icon" href="index.php?img=favicon" type="image/ico" />
-</head>
-
-<body>
-	<div id="head">
-		<h1><abbr title="Windows">W</abbr><abbr title="Apache">A</abbr><abbr title="MySQL">M</abbr><abbr title="PHP">P</abbr></h1>
-		<ul>
-			<li>PHP 5</li>
-			<li>Apache 2</li>
-			<li>MySQL 5</li>
-		</ul>
-	</div>
-
-	<ul class="utility">
-		<li>Version ${wampserverVersion}</li>
-		<li><a href="?lang={$langues[$langue]['autreLangueLien']}">{$langues[$langue]['autreLangue']}</a></li>
-	</ul>
-
-	<h2> {$langues[$langue]['titreConf']} </h2>
-
-	<dl class="content">
-		<dt>{$langues[$langue]['versa']}</dt>
-		<dd>${apacheVersion}&nbsp;&nbsp;-&nbsp;<a href='http://{$langues[$langue][$doca_version]}'>Documentation</a></dd>
-		<dt>{$langues[$langue]['versp']}</dt>
-		<dd>${phpVersion}&nbsp;&nbsp;-&nbsp;<a href='http://{$langues[$langue]['docp']}'>Documentation</a></dd>
-		<dt>{$langues[$langue]['server']}</dt>
-		<dd>${server_software}</dd>
-		<dt>{$langues[$langue]['phpExt']}</dt> 
-		<dd>
-			<ul>
-			${phpExtContents}
-			</ul>
-		</dd>
-		<dt>{$langues[$langue]['versm']}</dt>
-		<dd>${mysqlVersion} &nbsp;-&nbsp; <a href='http://{$langues[$langue]['docm']}'>Documentation</a></dd>
-	</dl>
-	<div style="margin-top:5px;border-top:1px solid #999;"></div>
-	<div class="third left">
-	<h2>{$langues[$langue]['titrePage']}</h2>
-	<ul class="tools">
-		<li><a href="?phpinfo=1">phpinfo()</a></li>
-		<li><a href="phpmyadmin/">phpmyadmin</a></li>
-	</ul>
-	</div>
-	<div class="third left">
-	<h2>{$langues[$langue]['txtProjet']}</h2>
-	<ul class="projects">
-	$projectContents
-	</ul>
-	</div>
-	<div class="third right">
-	<h2>{$langues[$langue]['txtAlias']}</h2>
-	<ul class="aliases">
-	${aliasContents}			
-	</ul>
-	</div>
-	<div style="clear:both;"></div>
-	<ul id="foot">
-		<li><a href="http://www.wampserver.com">WampServer</a></li>
-    <li><a href="http://www.wampserver.com/en/donations.php">Donate</a></li>
-		<li><a href="http://www.alterway.fr">Alter Way</a></li>
-	</ul>
-</body>
-</html>
-EOPAGE;
-
-echo $pageContents;
-?>
\ No newline at end of file
diff --git a/www/testmysql.php b/www/testmysql.php
deleted file mode 100644
index fdb5dd88..00000000
--- a/www/testmysql.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php 
-$link = mysql_connect('hostname','dbuser','dbpassword'); 
-if (!$link) { 
-	die('Could not connect to MySQL: ' . mysql_error()); 
-} 
-echo 'Connection OK'; mysql_close($link); 
-?> 
\ No newline at end of file