commit 872acdbc01476bca4f840e4dd478c3031075c784
Author: Némunaire <nemunaire@gmail.com>
Date:   Sat Jul 30 00:14:52 2011 +0200

    First commit, current version 0.2

diff --git a/.onyx b/.onyx
new file mode 100644
index 0000000..c02a158
--- /dev/null
+++ b/.onyx
@@ -0,0 +1 @@
+./onyx2/load.php
\ No newline at end of file
diff --git a/.project b/.project
new file mode 100644
index 0000000..fc740d3
--- /dev/null
+++ b/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>pa4home</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.aptana.ide.core.unifiedBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.aptana.projects.webnature</nature>
+	</natures>
+</projectDescription>
diff --git a/ajax.php b/ajax.php
new file mode 100644
index 0000000..2368273
--- /dev/null
+++ b/ajax.php
@@ -0,0 +1,210 @@
+<?php
+//Définition de la constante anti-hacking
+define("INDEX", 1);
+
+ob_start();
+
+//Inclusion de l'API Onyx
+require_once(trim(file_get_contents('./.onyx')));
+require_once(ONYX.'include/functions.php');
+$SESS = new Session();
+//sleep(1);
+$json = array("ping" => time(), "statut" => !empty($SESS->values["connecte"]));
+
+if ($json["statut"])
+	$json["username"] = $SESS->values["username"];
+
+//Création du fichier XML
+$xml = new DOMDocument('1.0', 'UTF-8');
+$xml->formatOutput = true;
+$xml_root = $xml->createElement("root");
+
+$demande = gpc('d');
+$value = intval(gpc('i'));
+if ($demande == "connecte")
+{
+	$nom = strtolower(gpc("name", "post"));
+	$mdp = hash("sha512", $nom.'♂♫↨'.gpc("mdp", "post"));
+
+	$bdd = new BDD();
+	$bdd->escape($nom);
+	$bdd->query("UPDATE users SET last_ip = '".$_SERVER["REMOTE_ADDR"]."', last_visite = ".time()." WHERE pseudo = '$nom' AND password = '$mdp';");
+	$affected = $bdd->affected();
+	if ($affected)
+		$user = $bdd->unique_query("SELECT * FROM users WHERE pseudo = '$nom' AND password = '$mdp';");
+	$bdd->deconnexion();
+
+	if ($affected != 0)
+	{
+		$json["statut"] = 1;
+		$SESS->values["connecte"] = true;
+		$SESS->values["username"] = $nom;
+		$SESS->values["id_user"] = $user["id"];
+		$SESS->put();
+	}
+	else
+	{
+		$json["statut"] = 0;
+		$SESS->values["connecte"] = false;
+		$SESS->values["username"] = "";
+		$SESS->values["id_user"] = 0;
+		$SESS->put();
+	}
+}
+elseif ($demande == "logout")
+{
+	$SESS->values["connecte"] = false;
+	$SESS->values["username"] = "";
+	$SESS->close();
+}
+elseif ($demande == "accueil")
+{
+	$dir = opendir(APPSDIR);
+	while (($app = readdir($dir)) !== false)
+	{
+		if (is_dir(APPSDIR.$app) && is_file(APPSDIR.$app.'/property.xml'))
+		{
+			$applicationXML = new DOMDocument();
+			$applicationXML->load(APPSDIR.$app.'/property.xml');
+
+			if ($applicationXML->documentElement->getAttribute('active') && $applicationXML->getElementsByTagName('application'))
+			{
+				//Vérification de sécurités
+				if (!acces_application($app, $applicationXML))
+					continue;
+
+				$xml_appli = $xml->createElement("application");
+				$xml_appli->appendChild($xml->createElement("dir", $app));
+				foreach($applicationXML->getElementsByTagName('property') as $property)
+				{
+					$xml_appli->appendChild($xml->createElement($property->getAttribute('value'), $property->textContent));
+				}
+				$xml_root->appendChild($xml_appli);
+			}
+		}
+	}
+	closedir($dir);
+}
+elseif ($demande == "property" && $app = gpc('a'))
+{
+	if (empty($app) || ereg('/', $app) || !is_file(APPSDIR.$app.'/property.xml'))
+		send404($xml_root);
+	else
+	{
+		$appXML = new DOMDocument();
+		$appXML->load(APPSDIR.$app.'/property.xml');
+
+		if ($appXML->documentElement->getAttribute('active') && $appXML->getElementsByTagName('application'))
+		{
+			//Vérification de sécurités
+			if (!acces_application($app, $appXML))
+				continue;
+
+			$xml_appli = $xml->createElement("property");
+			foreach($appXML->getElementsByTagName('property') as $property)
+			{
+				$xml_appli->appendChild($xml->createElement($property->getAttribute('value'), $property->textContent));
+			}
+			$xml_appli->appendChild($xml->createElement("dir", $app));
+			$xml_root->appendChild($xml_appli);
+		}
+	}
+}
+elseif ($demande == "display" && $app = gpc('a'))
+{
+	if (empty($app) || ereg('/', $app) || !is_file(APPSDIR.$app.'/property.xml'))
+		send404($xml_root);
+	else
+	{
+		$appXML = new DOMDocument();
+		$appXML->load(APPSDIR.$app.'/property.xml');
+
+		if ($appXML->documentElement->getAttribute('active') && $appXML->getElementsByTagName('application'))
+		{
+			//Vérification de sécurités
+			if (!acces_application($app, $appXML))
+				continue;
+
+			require(APPSDIR.$app.'/main.php');
+
+			$xml_root->appendChild($xml->createElement("dir", $app));
+
+			$xml_appli = $xml->createElement("display");
+			foreach($appXML->getElementsByTagName('display') as $contenu)
+			{
+				if ($contenu->getAttribute('value') == "css")
+				{
+					$xml_css = $xml->createElement($contenu->getAttribute('value'), $contenu->textContent);
+					if ($contenu->getAttribute('media'))
+						$xml_css->setAttribute("media", $contenu->getAttribute('media'));
+					$xml_appli->appendChild($xml_css);
+				}
+				else
+					$xml_appli->appendChild($xml->createElement($contenu->getAttribute('value'), $contenu->textContent));
+			}
+			$xml_root->appendChild($xml_appli);
+
+			$xml_appli = $xml->createElement("property");
+			foreach($appXML->getElementsByTagName('property') as $property)
+			{
+				$xml_appli->appendChild($xml->createElement($property->getAttribute('value'), $property->textContent));
+			}
+
+			if ($appXML->getElementsByTagName('menu'))
+			{
+				$menu = array();
+				foreach($appXML->getElementsByTagName('menu') as $item)
+					$menu[] = array("text" => $item->getAttribute('text'), "eventClick" => $item->getAttribute('eventClick'));
+				
+				$xml_appli->appendChild($xml->createElement("menu", json_encode($menu)));
+			}
+			$xml_root->appendChild($xml_appli);
+		}
+	}
+}
+elseif ($demande == "action" && $app = gpc('a'))
+{
+	if (empty($app) || ereg('/', $app) || !is_file(APPSDIR.$app.'/property.xml'))
+		send404($xml_root);
+	else
+	{
+		$appXML = new DOMDocument();
+		$appXML->load(APPSDIR.$app.'/property.xml');
+
+		if ($appXML->documentElement->getAttribute('active') && $appXML->getElementsByTagName('application'))
+			require(APPSDIR.$app.'/main.php');
+	}
+}
+elseif ($demande == "page" && $page = gpc('p'))
+{
+	if (empty($page) || ereg('/', $page) || !is_file(PAGESDIR.$page.'.xml'))
+		send404($xml_root);
+	else
+	{
+		$pageXML = new DOMDocument();
+		$pageXML->load(PAGESDIR.$page.'.xml');
+
+		if ($pageXML->documentElement->getAttribute('active') && $pageXML->getElementsByTagName('page'))
+		{
+			//Vérification de sécurité
+			if (!acces_application($page, $pageXML))
+				send403($xml_root);
+			else
+			{
+				foreach($pageXML->getElementsByTagName('display') as $contenu)
+				{
+					$xml_root->appendChild($xml->createElement($contenu->getAttribute('value'), $contenu->textContent));
+				}
+			}
+		}
+	}
+}
+
+header("X-JSON: ".json_encode($json));
+$sortie = ob_get_contents();
+ob_end_clean();
+if (!empty($sortie))
+	$xml_root->appendChild($xml->createElement("sortie", $sortie));
+$xml->appendChild($xml_root);
+print $xml->saveXML();
+?>
\ No newline at end of file
diff --git a/applications/GSM/app.js b/applications/GSM/app.js
new file mode 100644
index 0000000..5031b9c
--- /dev/null
+++ b/applications/GSM/app.js
@@ -0,0 +1,1072 @@
+var GSM_origin_liste = false;
+var GSM_liste = false;
+var GSM_liste_CDA = false; //CDs année
+var GSM_liste_CDC = false; //CDs chanteur
+var GSM_liste_CDD = false; //CDs décénies
+var GSM_lastSort = -1;
+var GSM_delay = null;
+var nbParPage = 50;
+
+//On charge la liste des porte-clés
+function GSM_loadList()
+{
+	GSM_origin_liste = false;
+	GSM_liste = false;
+	GSM_liste_CDA = false;
+	GSM_liste_CDC = false;
+	GSM_liste_CDD = false;
+	GSM_lastSort = -1;
+	$('nbpc').innerHTML = '<img src="applications/GSM/loader.gif" alt="Chargement en cours ...">';
+	new Ajax.Request(
+ 		'ajax.php',
+ 			{
+				method: 'get',
+				parameters: {d: "action", a: "GSM", p: "liste"},
+				onSuccess: GSM_parseList,
+				onFailure: function() { printEtat(3); }
+			}
+		);
+}
+function GSM_loadSelectedList()
+{
+	//TODO: ne charger que les listes dont l'état est false
+	GSM_loadList();
+}
+GSM_loadList();
+
+//Une fois la liste reçue, on la parse
+function GSM_parseList(transport, json)
+{
+	$('nbpc').innerHTML = json.nombre;
+
+	var liste = transport.responseXML.documentElement.getElementsByTagName("liste")[0].getElementsByTagName("chanson");
+	GSM_origin_liste = new Array();
+	
+	for (var i = 0; i < liste.length; i++)
+	{
+		var elt = liste[i];
+		GSM_origin_liste.push([elt.getAttribute("id"), elt.getAttribute("titre"), elt.getAttribute("chanteur"), elt.getAttribute("CD_annee"), elt.getAttribute("CD_interprete"), elt.getAttribute("CD_decenie")]);
+	}
+	
+	var liste = transport.responseXML.documentElement.getElementsByTagName("liste")[0].getElementsByTagName("cdannee");
+	GSM_liste_CDA = new Array();
+	for (var i = 0; i < liste.length; i++)
+	{
+		var elt = liste[i];
+		GSM_liste_CDA[elt.getAttribute("id")] = elt.getAttribute("nom");
+	}
+
+	var liste = transport.responseXML.documentElement.getElementsByTagName("liste")[0].getElementsByTagName("cdchant");
+	GSM_liste_CDC = new Array();
+	for (var i = 0; i < liste.length; i++)
+	{
+		var elt = liste[i];
+		GSM_liste_CDC[elt.getAttribute("id")] = elt.getAttribute("nom");
+	}
+
+	var liste = transport.responseXML.documentElement.getElementsByTagName("liste")[0].getElementsByTagName("cddece");
+	GSM_liste_CDD = new Array();
+	for (var i = 0; i < liste.length; i++)
+	{
+		var elt = liste[i];
+		GSM_liste_CDD[elt.getAttribute("id")] = elt.getAttribute("nom");
+	}
+}
+
+function GSM_add()
+{
+	window.scrollTo(0,0);
+	$('contenu').innerHTML = "";
+	titre = document.createElement("h2");
+	titre.innerHTML = "Ajout d'un album à la base de données";
+	$('contenu').appendChild(titre);
+
+	GSM_addAlbum();
+}
+
+function GSM_edit()
+{
+	window.scrollTo(0,0);
+	$('contenu').innerHTML = "";
+	titre = document.createElement("h2");
+	titre.innerHTML = "Liste des albums";
+	$('contenu').appendChild(titre);
+
+	GSM_viewliste(0, 0, 0);
+}
+
+function GSM_listAlbums()
+{
+	window.scrollTo(0,0);
+	$('contenu').innerHTML = "";
+	titre = document.createElement("h2");
+	titre.innerHTML = "Liste des albums";
+	$('contenu').appendChild(titre);
+
+	GSM_viewalbums(false);
+}
+
+function GSM_listTitres()
+{
+	window.scrollTo(0,0);
+	$('contenu').innerHTML = "";
+	titre = document.createElement("h2");
+	titre.innerHTML = "Liste des titres";
+	$('contenu').appendChild(titre);
+	
+	GSM_liste = false;
+
+	GSM_viewliste(0, 0, 0);
+}
+
+function GSM_addAlbum()
+{
+	var formulaire = document.createElement("form");
+	formulaire.id = "addAlbms";
+	formulaire.onsubmit = function() { newAlbum(); return false; }
+		var inpt = document.createElement("input");
+		inpt.type = "radio";
+		inpt.name = "cd";
+		inpt.id = "cda";
+		inpt.value = "1";
+		inpt.onclick = function() { GSM_addAlbum_chColor(1); };
+		formulaire.appendChild(inpt);
+		var lbl = document.createElement("label");
+		lbl.htmlFor = "cda";
+		lbl.innerHTML = "Ajouter un album d'année";
+		formulaire.appendChild(lbl);
+		formulaire.appendChild(document.createElement("br"));
+		var inpt = document.createElement("input");
+		inpt.type = "radio";
+		inpt.name = "cd";
+		inpt.id = "cdc";
+		inpt.value = "1";
+		inpt.onclick = function() { GSM_addAlbum_chColor(2); };
+		formulaire.appendChild(inpt);
+		var lbl = document.createElement("label");
+		lbl.htmlFor = "cdc";
+		lbl.innerHTML = "Ajouter un album d'un interprête";
+		formulaire.appendChild(lbl);
+		formulaire.appendChild(document.createElement("br"));
+		var inpt = document.createElement("input");
+		inpt.type = "radio";
+		inpt.name = "cd";
+		inpt.id = "cdd";
+		inpt.value = "1";
+		inpt.onclick = function() { GSM_addAlbum_chColor(3); };
+		formulaire.appendChild(inpt);
+		var lbl = document.createElement("label");
+		lbl.htmlFor = "cdd";
+		lbl.innerHTML = "Ajouter d'une compilation";
+		formulaire.appendChild(lbl);
+		formulaire.appendChild(document.createElement("br"));
+		formulaire.appendChild(document.createElement("br"));
+		var cntr = document.createElement("div");
+			var lbl = document.createElement("label");
+			lbl.htmlFor = "nom";
+			lbl.innerHTML = "Nom :";
+			cntr.appendChild(lbl);
+			var inpt = document.createElement("input");
+			inpt.type = "text";
+			inpt.name = "nom";
+			inpt.id = "nom";
+			cntr.appendChild(inpt);
+			cntr.appendChild(document.createElement("br"));
+			var lbl = document.createElement("label");
+			lbl.htmlFor = "color";
+			lbl.innerHTML = "Couleur :";
+			cntr.appendChild(lbl);
+			var inpt = document.createElement("input");
+			inpt.type = "color";
+			inpt.name = "color";
+			inpt.id = "color";
+			inpt.onchange = function() { $("testColor").style.backgroundColor = $('color').value; };
+			cntr.appendChild(inpt);
+			var test = document.createElement("div");
+			test.id = "testColor";
+			cntr.appendChild(test);
+			cntr.appendChild(document.createElement("br"));
+			var lbl = document.createElement("label");
+			lbl.htmlFor = "ccf";
+			lbl.innerHTML = "Copier la couleur depuis :";
+			cntr.appendChild(lbl);
+			var inpt = document.createElement("select");
+			inpt.name = "ccf";
+			inpt.id = "ccf";
+			cntr.appendChild(inpt);
+			cntr.appendChild(document.createElement("br"));
+			cntr.appendChild(document.createElement("br"));
+			var inpt = document.createElement("input");
+			inpt.type = "submit";
+			inpt.value = "Valider";
+			cntr.appendChild(inpt);
+		formulaire.appendChild(cntr);
+	$('contenu').appendChild(formulaire);
+}
+
+function GSM_addAlbum_chColor(type)
+{
+	var liste;
+	if (type == 1)
+		liste = GSM_liste_CDA;
+	else if (type == 2)
+		liste = GSM_liste_CDC;
+	else
+		liste = GSM_liste_CDD;
+	
+	$("ccf").innerHTML = '<option value="0"> </option>';
+	
+	for (var i in liste)
+	{
+		if (Math.floor(i) == i)
+		{
+			var opt = document.createElement("option");
+			opt.value = i;
+			opt.innerHTML = liste[i];
+			$("ccf").appendChild(opt);
+		}
+	}
+	
+	if ($("ccf").innerHTML != "")
+		$("ccf").onchange = function(event) { if (this.value > 0) GSM_addAlbum_loadColor(this, type); };
+}
+
+function GSM_addAlbum_loadColor(elt, type)
+{
+	new Ajax.Request(
+ 		'ajax.php',
+ 			{
+				method: 'get',
+				parameters: {d: "action", a: "GSM", p: "color", type: type, id: elt.value},
+				onSuccess: function(transport, json)
+					{
+						$('color').value = transport.responseXML.documentElement.getElementsByTagName("color")[0].firstChild.textContent;
+						$("testColor").style.backgroundColor = $('color').value; 
+					}
+			});
+}
+
+function newAlbum()
+{
+	var type;
+	if ($('cda').checked == 1)
+		type = 1;
+	else if ($('cdc').checked == 1)
+		type = 2;
+	else if ($('cdd').checked == 1)
+		type = 3;
+	else
+	{
+		alert("Vous n'avez pas sélectionné de type !");
+		return;
+	}
+
+	var nom = $('nom').value;
+	if (nom)
+	{
+		//On ajoute l'album
+		new Ajax.Request(
+			'ajax.php?d=action&a=GSM&p=add',
+				{
+				method: 'post',
+				parameters: {type: type, title: nom, color: $('color').value},
+				onSuccess: function(transport, json)
+					{
+						if (json.statut != 1)
+						{
+							firstLoad();
+							alert("Vous avez été déconnecté. L'album' n'a pas été ajouté.");
+						}
+						else
+						{
+							if (transport.responseXML.documentElement.getElementsByTagName("id")[0])
+							{
+								if (type == 1)
+									GSM_liste_CDA = false;
+								else if (type == 2)
+									GSM_liste_CDC = false;
+								else
+									GSM_liste_CDD = false;
+								
+								//On recharge la liste d'album
+								GSM_loadSelectedList();
+	
+								$('contenu').innerHTML = "";
+								titre = document.createElement("h2");
+								titre.style.color = "#FF8800";
+								titre.innerHTML = 'Chargement en cours ... <img src="applications/GSM/loader.gif" alt="Veuilez patienter">';
+								$('contenu').appendChild(titre);
+								
+								//On passe à l'écran de modification du nouvel album
+								GSM_viewalbum(type, transport.responseXML.documentElement.getElementsByTagName("id")[0].textContent, 0);
+							}
+							else
+								alert("L'ajout de l'album ne s'est pas passé correctement.")
+						}
+					},
+				onFailure: function() { printEtat(3); }
+			}
+		);
+	}
+	else
+		alert("Vous n'avez pas précisé de nom pour ce nouvel album.");
+}
+
+function GSM_addForm(type, idAlbum, modif, page)
+{
+	//Si le formulaire existe déjà, on ne fait que remplacer son contenu
+	var formulaire;
+	if ($('ajout'))
+	{
+		formulaire = $('ajout');
+		formulaire.innerHTML = "";
+	}
+	else
+	{
+		formulaire = document.createElement("form");
+		formulaire.id = "ajout";
+		$('contenu').appendChild(formulaire);
+	}
+
+	formulaire.onsubmit = function() { checkAndAdd(type, idAlbum, modif, page); return false; }
+		var th = document.createElement("h3");
+		if (modif)
+			th.innerHTML = "Modification d'un titre";
+		else
+			th.innerHTML = "Ajout d'un titre à l'album";
+		
+		var lab_nom = document.createElement("label");
+		lab_nom.innerHTML = "Titre :";
+		lab_nom.forHTML = "titrechan";
+		var inp_nom = document.createElement("input");
+		if(modif)
+			inp_nom.value = GSM_liste[modif-1][1];
+		inp_nom.type = "text";
+		inp_nom.maxLength = "250";
+		inp_nom.id = "titrechan";
+
+		var lab_carac = document.createElement("label");
+		lab_carac.innerHTML = "Interpréte :";
+		lab_carac.setAttribute("for", "auteur");
+		var inp_carac = document.createElement("input");
+		if(modif)
+			inp_carac.value = GSM_liste[modif-1][2];
+		inp_carac.type = "text";
+		inp_carac.maxLength = "250";
+		inp_carac.id = "auteur";
+
+		var auteur_propos = document.createElement("div");
+		auteur_propos.id = "auteur_propositions";
+		auteur_propos.className = "autocomplete";
+
+		var inp_submit = document.createElement("input");
+		inp_submit.type = "submit";
+		if (modif)
+			inp_submit.value = "Modifier";
+		else
+			inp_submit.value = "Ajouter";
+		inp_submit.style.marginLeft = "165px";
+
+		formulaire.appendChild(th);
+		formulaire.appendChild(lab_nom);
+		formulaire.appendChild(inp_nom);
+		formulaire.appendChild(document.createElement("br"));
+		formulaire.appendChild(lab_carac);
+		formulaire.appendChild(inp_carac);
+		formulaire.appendChild(auteur_propos);
+		formulaire.appendChild(document.createElement("br"));
+		formulaire.appendChild(document.createElement("br"));
+		formulaire.appendChild(inp_submit);
+		if (modif)
+		{
+			var inp_del = document.createElement("input");
+			inp_del.type = "button";
+			inp_del.value = "Supprimer";
+			inp_del.onclick = function() { GSM_del(type, idAlbum, modif, page); };
+			inp_del.style.marginLeft = "15px";
+			formulaire.appendChild(inp_del);
+		}
+	if (modif)
+		$('titrechan').focus();
+
+    new Ajax.Autocompleter(
+        "auteur",
+        "auteur_propositions",
+        "applications/GSM/auteurs.php",
+        {
+            paramName: 'auteur',
+            minChars: 1
+        });
+}
+
+function GSM_checkChange(e)
+{
+	if (this.value == "add")
+	{
+		if (this.id == "discAuteur")
+			id_name = "new_auteur";
+		else if (this.id == "discDece")
+			id_name = "new_decenie";
+		else if (this.id == "discAnnee")
+			id_name = "new_annee";
+
+		document.getElementById(id_name).style.display = "inline";
+		if (document.getElementById(id_name).value == "")
+			document.getElementById(id_name).value = "Nom du nouvel l'album";
+		document.getElementById(id_name).focus();
+		document.getElementById(id_name).select();
+	}
+	else if (this.id == "discAuteur")
+		document.getElementById("new_auteur").style.display = "none";
+	else if (this.id == "discDece")
+		document.getElementById("new_decenie").style.display = "none";
+	else if (this.id == "discAnnee")
+		document.getElementById("new_annee").style.display = "none";
+}
+
+function GSM_del(type, idAlbum, modif, page)
+{
+	$('titrechan').disabled = true;
+	$('auteur').disabled = true;
+
+	new Ajax.Request(
+		'ajax.php?d=action&a=GSM&p=del',
+			{
+			method: 'post',
+			parameters: {id: GSM_rech.getElementsByTagName("chanson")[modif-1].getAttribute("id")},
+			onSuccess: function(transport, json)
+				{
+					if (json.statut != 1)
+					{
+						firstLoad();
+						alert("Vous avez été déconnecté. La chanson n'a pas été enregistrée");
+					}
+					else
+					{
+						setTimeout('$("confirm").innerHTML = "Chanson supprimée avec succès !";', 234);
+						setTimeout("$('confirm').innerHTML = '';", 3500);
+						
+						$('nbpc').innerHTML = json.nombre;
+						
+						if (type)
+							GSM_viewalbum(type, idAlbum, page);
+						else
+							GSM_viewalbum(type, idAlbum, page);
+						
+						if (modif)
+							window.scrollTo(0,0);
+					}
+				},
+			onFailure: function() { printEtat(3); }
+		}
+	);
+
+	//On réinitialise les variables de liste pour aller rechercher les listes
+	GSM_liste = false;
+	GSM_pagination = false;
+	$('contenu').innerHTML = "<h2 class=\"vp\">Veuillez patienter suppression de la chanson en cours ...</h2>";
+}
+
+function checkAndAdd(type, idAlbum, modif, page)
+{
+	var modifURI;
+	if(modif)
+		modifURI = "&id=" + GSM_liste[modif-1][0];
+	else
+		modifURI = "";
+
+	if ($('titrechan').value == "")
+	{
+		$('titrechan').className = "erreur";
+		alert('Vous n\'avez pas indiqué le titre de la chanson !');
+	}
+	else if ($('auteur').value == "")
+	{
+		$('auteur').className = "erreur";
+		alert('Vous n\'avez pas indiqué l\'auteur de la chanson !');
+	}
+	else
+	{
+		$('titrechan').disabled = true;
+		$('auteur').disabled = true;
+
+		new Ajax.Request(
+	 		'ajax.php?d=action&a=GSM' + modifURI,
+	 			{
+					method: 'post',
+					parameters: {titre: $('titrechan').value, auteur: $('auteur').value, type: type, alb: idAlbum},
+					onSuccess: function(transport, json)
+						{
+							if (json.statut != 1)
+							{
+								firstLoad();
+								alert("Vous avez été déconnecté. La chanson n'a pas été enregistrée");
+							}
+							else
+							{
+								if(modif)
+								{
+									setTimeout('$("confirm").innerHTML = "Chanson modifiée avec succès !";', 234);
+									setTimeout("$('confirm').innerHTML = '';", 3500);
+									
+									GSM_liste[modif-1][1] = $('titrechan').value;
+									GSM_liste[modif-1][2] = $('auteur').value;
+								}
+								else
+								{
+									GSM_origin_liste.push([transport.responseXML.documentElement.getElementsByTagName("id")[0].textContent, $('titrechan').value, $('auteur').value, (type==1?idAlbum:0), (type==2?idAlbum:0), (type==3?idAlbum:0)]);
+									$('titrechan').value = "";
+									$('auteur').value = "";
+								
+									$('titrechan').disabled = false;
+									$('auteur').disabled = false;
+								
+									$('nbpc').innerHTML = json.nombre;
+
+									setTimeout('$("confirm").innerHTML = "Chanson ajoutée avec succès !";', 234);
+									setTimeout("$('confirm').innerHTML = '';", 3500);
+								}
+								
+								if (type)
+									GSM_viewalbum(type, idAlbum, page);
+								else
+									//TODO à tester ça marche pas
+									GSM_viewliste(null, null, page);
+								
+								if (modif)
+									window.scrollTo(0,0);
+								else
+									$('titrechan').focus();
+							}
+						},
+					onFailure: function() { printEtat(3); }
+				}
+			);
+	}
+}
+
+function GSM_viewalbums()
+{
+	if (GSM_origin_liste == false)
+		setTimeout(GSM_viewalbums, 200);
+	else
+	{
+		var tableau = document.createElement("div");
+		tableau.className = "table cols2 stats";
+		tableau.id = "statsA";
+			var tableau_head = document.createElement("div");
+			tableau_head.className = "head";
+				var head_th =  document.createElement("span");
+				head_th.innerHTML = "CD années";
+				tableau_head.appendChild(head_th);
+				var head_th =  document.createElement("span");
+				head_th.innerHTML = "Nombre";
+				tableau_head.appendChild(head_th);
+			tableau.appendChild(tableau_head);
+			var tableau_bodyA = document.createElement("div");
+				tableau_bodyA.className = "body";
+				tableau_bodyA.innerHTML = '<div class="lign elt0 foot">Chargement de la liste ... <img src="applications/GSM/loader.gif" alt="Veuillez patienter"></div>';
+			tableau.appendChild(tableau_bodyA);
+		$('contenu').appendChild(tableau);
+		
+		var tableau = document.createElement("div");
+		tableau.className = "table cols2 stats";
+		tableau.id = "statsC";
+			var tableau_head = document.createElement("div");
+			tableau_head.className = "head";
+				var head_th =  document.createElement("span");
+				head_th.innerHTML = "CD chanteurs";
+				tableau_head.appendChild(head_th);
+				var head_th =  document.createElement("span");
+				head_th.innerHTML = "Nombre";
+				tableau_head.appendChild(head_th);
+			tableau.appendChild(tableau_head);
+			var tableau_bodyC = document.createElement("div");
+				tableau_bodyC.className = "body";
+				tableau_bodyC.innerHTML = '<div class="lign elt0 foot">Chargement de la liste ... <img src="applications/GSM/loader.gif" alt="Veuillez patienter"></div>';
+			tableau.appendChild(tableau_bodyC);
+		$('contenu').appendChild(tableau);
+		
+		var tableau = document.createElement("div");
+		tableau.className = "table cols2 stats";
+		tableau.id = "statsD";
+			var tableau_head = document.createElement("div");
+			tableau_head.className = "head";
+				var head_th =  document.createElement("span");
+				head_th.innerHTML = "CD décénies";
+				tableau_head.appendChild(head_th);
+				var head_th =  document.createElement("span");
+				head_th.innerHTML = "Nombre";
+				tableau_head.appendChild(head_th);
+			tableau.appendChild(tableau_head);
+			var tableau_bodyD = document.createElement("div");
+				tableau_bodyD.className = "body";
+				tableau_bodyD.innerHTML = '<div class="lign elt0 foot">Chargement de la liste ... <img src="applications/GSM/loader.gif" alt="Veuillez patienter"></div>';
+			tableau.appendChild(tableau_bodyD);
+		$('contenu').appendChild(tableau);
+
+
+		new Ajax.Request(
+ 		'ajax.php',
+ 			{
+				method: 'get',
+				parameters: {d: "action", a: "GSM", p: "stats"},
+				onSuccess: function(transport, json)
+					{
+						var annees = transport.responseXML.documentElement.getElementsByTagName("annee");
+						var chanteurs = transport.responseXML.documentElement.getElementsByTagName("interprete");
+						var decenies = transport.responseXML.documentElement.getElementsByTagName("decenie");
+
+						tableau_bodyA.innerHTML = "";
+						for (var i = 0; i < annees.length; i++)
+						{
+							if (annees[i].getAttribute("id") != "")
+							{
+								var lign = document.createElement("div");
+								lign.className = "elt" + (i%2);
+								GSM_addStatLign(lign, 1, annees[i].getAttribute("id"));
+									var col = document.createElement("span");
+									col.innerHTML = GSM_liste_CDA[annees[i].getAttribute("id")];
+									lign.appendChild(col);
+									var col = document.createElement("span");
+									col.innerHTML = annees[i].getAttribute("nbTitles");
+									lign.appendChild(col);
+								tableau_bodyA.appendChild(lign);
+							}
+						}
+						if (annees.length == 0)
+							tableau_bodyA.innerHTML = '<div class="lign elt0 foot">Aucun CD</div>';
+						else
+							lign.className += " foot";
+
+						tableau_bodyC.innerHTML = "";
+						for (var i = 0; i < chanteurs.length; i++)
+						{
+							if (chanteurs[i].getAttribute("id") != "")
+							{
+								var lign = document.createElement("div");
+								lign.className = "elt" + (i%2);
+								GSM_addStatLign(lign, 2, chanteurs[i].getAttribute("id"));
+									var col = document.createElement("span");
+									col.innerHTML = GSM_liste_CDC[chanteurs[i].getAttribute("id")];
+									lign.appendChild(col);
+									var col = document.createElement("span");
+									col.innerHTML = chanteurs[i].getAttribute("nbTitles");
+									lign.appendChild(col);
+								tableau_bodyC.appendChild(lign);
+							}
+						}
+						if (chanteurs.length == 0)
+							tableau_bodyC.innerHTML = '<div class="lign elt0 foot">Aucun CD</div>';
+						else
+							lign.className += " foot";
+						
+						tableau_bodyD.innerHTML = "";
+						for (var i = 0; i < decenies.length; i++)
+						{
+							if (decenies[i].getAttribute("id") != "")
+							{
+								var lign = document.createElement("div");
+								lign.className = "elt" + (i%2);
+								GSM_addStatLign(lign, 3, decenies[i].getAttribute("id"));
+									var col = document.createElement("span");
+									col.innerHTML = GSM_liste_CDD[decenies[i].getAttribute("id")];
+									lign.appendChild(col);
+									var col = document.createElement("span");
+									col.innerHTML = decenies[i].getAttribute("nbTitles");
+									lign.appendChild(col);
+								tableau_bodyD.appendChild(lign);
+							}
+						}
+						if (decenies.length == 0)
+							tableau_bodyD.innerHTML = '<div class="lign elt0 foot">Aucun CD</div>';
+						else
+							lign.className += " foot";
+					},
+				onFailure: function() { printEtat(3); }
+			}
+		);
+	}
+}
+
+function GSM_addStatLign(lign, type, id)
+{
+	lign.onclick = function() { window.scrollTo(0,0); GSM_viewalbum(type, id, 0) };
+}
+
+function GSM_viewalbum(type, id, page)
+{
+	$('contenu').innerHTML = "";
+	var confirmation = document.createElement("h2");
+	confirmation.style.color = "teal";
+	confirmation.id = "confirm";
+	
+	var titre = document.createElement("h2");
+	if (type == 2)
+	{
+		titre.innerHTML = "Liste des titres de " + GSM_liste_CDC[id];
+		$('contenu').appendChild(titre);
+		$('contenu').appendChild(confirmation);
+		GSM_delay_viewalbum(2, id, page);
+	}
+	else if (type == 3)
+	{
+		titre.innerHTML = "Liste des titres de " + GSM_liste_CDD[id];
+		$('contenu').appendChild(titre);
+		$('contenu').appendChild(confirmation);
+		GSM_delay_viewalbum(3, id, page);
+	}
+	else
+	{
+		titre.innerHTML = "Liste des titres de " + GSM_liste_CDA[id];
+		$('contenu').appendChild(titre);
+		$('contenu').appendChild(confirmation);
+		GSM_delay_viewalbum(1, id, page);
+	}
+}
+
+function GSM_delay_viewalbum(type, id, page)
+{
+	if (GSM_origin_liste == false)
+		GSM_delay = setTimeout(GSM_delay_viewalbum, 200, type, id, page);
+	else
+	{		
+		GSM_liste = new Array();
+		for (var i = 0; i < GSM_origin_liste.length; i++)
+		{
+			if (GSM_origin_liste[i][type+2] == id)
+				GSM_liste.push(GSM_origin_liste[i]);
+		}
+		if (GSM_liste == false)
+			GSM_liste[0] = 2;
+		
+		GSM_lastSort = -1;
+	
+		GSM_viewliste(type, id, page);
+		
+		GSM_addForm(type, id, false, 0);
+	}
+}
+
+function GSM_viewliste(type, idAlbum, page)
+{
+	var pagination = document.createElement("div");
+	pagination.className = "pagination top";
+	pagination.id = "pagination1";
+	$('contenu').appendChild(pagination);
+
+	var tableau = document.createElement("div");
+	tableau.className = "table cols3";
+	tableau.id = "list";
+		var tableau_head = document.createElement("div");
+		tableau_head.className = "head";
+			var head_th =  document.createElement("span");
+			head_th.innerHTML = "Titre";
+			head_th.onclick = function() { GSM_showliste(1, 0, type, idAlbum); }
+			tableau_head.appendChild(head_th);
+			var head_th =  document.createElement("span");
+			head_th.innerHTML = "Chanteur";
+			head_th.onclick = function() { GSM_showliste(2, 0, type, idAlbum); }
+			tableau_head.appendChild(head_th);
+			var head_th =  document.createElement("span");
+			head_th.innerHTML = "CDs";
+			head_th.style.cursor = "auto";
+			tableau_head.appendChild(head_th);
+		tableau.appendChild(tableau_head);
+		var tableau_body = document.createElement("div");
+			tableau_body.className = "body";
+			tableau_body.id = "bodyList";
+			tableau_body.innerHTML = '<div class="lign elt0 foot">Chargement de la liste en cours ... <img src="applications/GSM/loader.gif" alt="Veuillez patienter"></div>';
+		tableau.appendChild(tableau_body);
+	$('contenu').appendChild(tableau);
+
+	
+	var pagination = document.createElement("div");
+	pagination.className = "pagination bottom";
+	pagination.id = "pagination2";
+	$('contenu').appendChild(pagination);
+
+	GSM_showliste(-1, page, type, idAlbum);
+}
+
+function GSM_showliste(tri, page, type, idAlbum)
+{
+	if (GSM_origin_liste == false)
+		setTimeout(GSM_showliste, 200, tri, page, type, idAlbum);
+	else
+	{
+		if (GSM_liste == false)
+			GSM_liste = GSM_origin_liste;
+
+		//On tente un tri
+		if (GSM_lastSort != tri)
+		{
+			$('bodyList').innerHTML = '<div class="lign elt0 foot">Tri de la liste en cours ...</div>';
+			GSM_liste = GSM_liste.sort(function(a,b){return a[tri].localeCompare(b[tri]);});
+			GSM_lastSort = tri;
+		}
+
+		nbPages = Math.ceil(GSM_liste.length / nbParPage);
+		$('pagination1').innerHTML = "";
+		$('pagination2').innerHTML = "";
+
+		if (nbPages < 3)
+		{
+			var lnkP = document.createElement("a");
+			lnkP.href = "javascript:GSM_printliste(" + GSM_lastSort + ", " + type + ", " + idAlbum + ");";
+			lnkP.innerHTML = "Imprimer la pochette";
+			$('pagination1').appendChild(lnkP);
+			var lnkP = document.createElement("a");
+			lnkP.href = "javascript:GSM_printliste(" + GSM_lastSort + ", " + type + ", " + idAlbum + ");";
+			lnkP.innerHTML = "Imprimer la pochette";
+			$('pagination2').appendChild(lnkP);
+		}
+
+		for (var i = 0; i < 4 && i < nbPages; i++)
+			GSM_addLinkPagination(i, type, idAlbum);
+		if (page > 5 && i < nbPages)
+		{
+			$('pagination1').innerHTML += "...";
+			$('pagination2').innerHTML += "...";
+		}
+		for (var i = (page < 6?4:page - 2); (i < page + 3 && i < nbPages); i++)
+			GSM_addLinkPagination(i, type, idAlbum);
+		if (page <= 5 && i < nbPages)
+		{
+			$('pagination1').innerHTML += "...";
+			$('pagination2').innerHTML += "...";
+			for (var i = Math.ceil(nbPages/2) - 2; i < nbPages/2 + 2; i++)
+				GSM_addLinkPagination(i, type, idAlbum);
+		}
+		if (page + 3 < nbPages - 4)
+		{
+			$('pagination1').innerHTML += "...";
+			$('pagination2').innerHTML += "...";
+		}
+		for (var i = (page + 3 >= nbPages - 4?page + 3:nbPages - 4); (i < nbPages); i++)
+			GSM_addLinkPagination(i, type, idAlbum);
+
+		start = page * nbParPage;
+		$('bodyList').innerHTML = "";
+		
+		if (GSM_liste[0] != 2)
+		{
+			for (var i = 0; i < nbParPage && i + start < GSM_liste.length; i++)
+			{
+				var lign = document.createElement("div");
+				lign.className = "elt" + (i%2);
+				
+				GSM_addLinkCD(lign, i + start, idAlbum, type, page);
+					var col = document.createElement("span");
+					col.innerHTML = GSM_liste[i + start][1];
+					lign.appendChild(col);
+					var col = document.createElement("span");
+					col.innerHTML = GSM_liste[i + start][2];
+					lign.appendChild(col);
+					var col = document.createElement("span");
+					if (GSM_liste[i + start][3] != 0)
+						col.innerHTML += GSM_liste_CDA[GSM_liste[i + start][3]] + "<br>";
+					if (GSM_liste[i + start][4] != 0)
+						col.innerHTML += GSM_liste_CDC[GSM_liste[i + start][4]] + "<br>";
+					if (GSM_liste[i + start][5] != 0)
+						col.innerHTML += GSM_liste_CDD[GSM_liste[i + start][5]];
+					lign.appendChild(col);
+				$('bodyList').appendChild(lign);
+			}
+		}
+		else
+		{
+			var lign = document.createElement("div");
+			lign.className = "elt0";
+			lign.innerHTML = "Il n'y a aucun titre enregistré dans cet album.";
+			$('bodyList').appendChild(lign);
+		}
+		lign.className += " foot";
+	}
+}
+function GSM_addLinkPagination(page, type, idAlbum)
+{
+	var lnkP = document.createElement("a");
+	lnkP.href = "javascript:GSM_showliste(" + GSM_lastSort + ", " + page + ", " + type + ", " + idAlbum + ");";
+	lnkP.innerHTML = page+1;
+	$('pagination1').appendChild(lnkP);
+	var lnkP = document.createElement("a");
+	lnkP.href = "javascript:GSM_showliste(" + GSM_lastSort + ", " + page + ", " + type + ", " + idAlbum + ");";
+	lnkP.innerHTML = page+1;
+	$('pagination2').appendChild(lnkP);
+}
+
+function GSM_printliste(tri, type, idAlbum)
+{
+	if (GSM_origin_liste == false)
+		setTimeout(GSM_printliste, 200, tri, type, idAlbum);
+	else
+	{
+		$('contenu').innerHTML = "";
+		
+		var listeT;
+		if (type == 2)
+			listeT = GSM_liste_CDC;
+		else if (type == 3)
+			listeT = GSM_liste_CDD;
+		else
+			listeT = GSM_liste_CDA;
+		
+		var patt1 = listeT[idAlbum].match(/cd ?([0-9]+)/i).toString();
+		var trueTitleL1 = listeT[idAlbum];
+		trueTitleL1 = trueTitleL1.substr(0, trueTitleL1.length - patt1.indexOf(','));
+		if (type == 1)
+			trueTitleL1 = "Année " + trueTitleL1;
+
+		var trueTitleL2;
+		if (patt1)
+			trueTitleL2 = "CD " + patt1.substr(patt1.indexOf(',')+1);
+		else
+			trueTitleL2 = "";
+		
+		var trueTitle = trueTitleL1 + " &ndash; " + trueTitleL2;
+				
+		var front = document.createElement("div");
+		front.className = "front";
+		var titleP = document.createElement("div");
+		titleP.className = "title";
+		titleP.innerHTML = trueTitleL1;
+		front.appendChild(titleP);
+		var cd = document.createElement("div");
+		cd.className = "cd";
+		cd.innerHTML = trueTitleL2;
+		if (trueTitleL2)
+			cd.style.marginTop = "70px";
+		front.appendChild(cd);
+		$('contenu').appendChild(front);
+		
+		new Ajax.Request(
+ 		'ajax.php',
+ 			{
+				method: 'get',
+				parameters: {d: "action", a: "GSM", p: "color", type: type, id: idAlbum},
+				onSuccess: function(transport, json)
+					{
+						var colors = transport.responseXML.documentElement.getElementsByTagName("color");
+						if (colors.length == 2)
+						{
+							titleP.style.color = colors[1].firstChild.textContent;
+							cd.style.color = colors[0].firstChild.textContent;
+						}
+						else if (colors.length == 1)
+						{
+							titleP.style.color = colors[0].firstChild.textContent;
+							cd.style.color = colors[0].firstChild.textContent;
+						}
+					}
+			});
+		
+		var sp = document.createElement("div");
+		sp.className = "sp";
+		$('contenu').appendChild(sp);
+		
+		var back = document.createElement("div");
+		back.className = "back";
+		var backL = document.createElement("div");
+		backL.className = "left";
+		var title = document.createElement("div");
+		title.className = "title";
+		title.innerHTML = trueTitleL1 + " " + trueTitleL2;
+		backL.appendChild(title);
+		back.appendChild(backL);
+		var backR = document.createElement("div");
+		backR.className = "right";
+		var title = document.createElement("div");
+		title.className = "title";
+		title.innerHTML = trueTitleL1 + " " + trueTitleL2;
+		backR.appendChild(title);
+		back.appendChild(backR);
+		
+		var backC = document.createElement("div");
+		backC.className = "center";
+		var title = document.createElement("div");
+		title.className = "title";
+		title.innerHTML = trueTitleL1 + " &ndash; " + trueTitleL2;
+		backC.appendChild(title);
+		
+		var listeC = document.createElement("ol");
+		backC.appendChild(listeC);
+		
+		back.appendChild(backC);
+		$('contenu').appendChild(back);
+		
+		if (GSM_liste == false)
+			GSM_liste = GSM_origin_liste;
+
+		//On tente un tri
+		if (GSM_lastSort != tri)
+		{
+			GSM_liste = GSM_liste.sort(function(a,b){return a[tri].localeCompare(b[tri]);});
+			GSM_lastSort = tri;
+		}
+
+		if (GSM_liste[0] != 2)
+		{
+			for (var i = 0; i < GSM_liste.length; i++)
+			{
+				var lign = document.createElement("li");
+				lign.className = "elt" + (i%2);
+				lign.innerHTML = GSM_liste[i + start][1]
+				var col = document.createElement("span");
+				col.className = "author";
+				col.innerHTML = GSM_liste[i + start][2];
+				lign.appendChild(col);
+				GSM_addLinkOrder(lign, i + start, tri, type, idAlbum);
+				listeC.appendChild(lign);
+			}
+			
+			//On ajuste automatiquement la taille de la police
+			listeC.style.fontSize = Math.floor(4000/(GSM_liste.length*1.35))/10 + "px";
+			listeC.style.marginTop = ((400 - listeC.clientHeight) / 2) + "px";
+		}
+		else
+		{
+			var lign = document.createElement("div");
+			lign.className = "elt0";
+			lign.innerHTML = "Il n'y a aucun titre enregistré dans cet album.";
+			$('bodyList').appendChild(lign);
+		}
+		lign.className += " foot";
+	}
+}
+
+function GSM_addLinkCD(elt, idTitle, idAlbum, type, page)
+{
+	elt.onclick = function() {
+		GSM_addForm(type, idAlbum, idTitle+1, page);
+	}
+}
+
+function GSM_addLinkOrder(elt, id, tri, type, idAlbum)
+{
+	elt.onclick = function() {
+		GSM_chOrder(id, tri, type, idAlbum);
+	}
+}
+function GSM_chOrder(id, tri, type, idAlbum)
+{
+	var num = prompt("Quel est le numéro de cette chanson : ", id+1);
+	if (num > 0 && num <= GSM_liste.length)
+	{
+		if (num != id)
+		{
+			var tmp = GSM_liste[num-1];
+			GSM_liste[num-1] = GSM_liste[id];
+			GSM_liste[id] = tmp;
+			
+			GSM_printliste(tri, type, idAlbum);
+		}
+	}
+	else
+		alert("Ce nombre n'est pas valide !\nLe numéro de la chanson doit être compris entre 1 et " + GSM_liste.length);
+}
+
+function GSM_apropos()
+{
+	aproposApp("GSM", "contenu");
+}
\ No newline at end of file
diff --git a/applications/GSM/auteurs.php b/applications/GSM/auteurs.php
new file mode 100644
index 0000000..7b6aae7
--- /dev/null
+++ b/applications/GSM/auteurs.php
@@ -0,0 +1,28 @@
+<?php
+//Définition de la constante anti-hacking
+define("INDEX", 1);
+
+ob_start();
+//Inclusion de l'API Onyx
+require_once(trim(file_get_contents('../../.onyx')));
+require_once(ONYX.'include/functions.php');
+$SESS = new Session();
+ob_end_clean();
+
+$nom = gpc('auteur', 'post');
+
+$bdd = new BDD();
+$bdd->escape($nom);
+$chanteurs = $bdd->query("SELECT chanteur FROM gsm WHERE chanteur LIKE '$nom%' GROUP BY chanteur;");
+$bdd->deconnexion();
+
+if (!empty($chanteurs) && !empty($nom))
+{
+	print "<ul>\n";
+	foreach ($chanteurs as $chanteur)
+	{
+		print '    <li>'.$chanteur["chanteur"]."</li>\n";
+	}
+	print "</ul>";
+}
+?>
\ No newline at end of file
diff --git a/applications/GSM/loader.gif b/applications/GSM/loader.gif
new file mode 100644
index 0000000..6e44c0e
Binary files /dev/null and b/applications/GSM/loader.gif differ
diff --git a/applications/GSM/main.css b/applications/GSM/main.css
new file mode 100644
index 0000000..0ba0740
--- /dev/null
+++ b/applications/GSM/main.css
@@ -0,0 +1,99 @@
+.front
+{
+    border: solid 1px black;
+    display: table-cell;
+    height: 11.5cm;
+    text-align: center;
+    vertical-align: middle;
+    width: 11.5cm;
+}
+
+.front .title, .front .cd
+{
+    font-size: 60px;
+    font-family: sans-serif;
+    font-weight: bolder;
+    text-transform: uppercase;
+}
+
+.sp
+{
+    margin: 1cm 0; 
+}
+
+.back
+{
+    border: solid 1px black;
+    display: table;
+    height: 11.1cm;
+    width: 14.4cm;
+}
+
+.back .title
+{
+    font-variant: small-caps
+}
+
+.back .center .title
+{
+    font-size: 14px;
+    font-weight: bolder;
+}
+
+.back .left, .back .right
+{
+    display: block;
+    height: 11.1cm;
+    text-align: left;
+    vertical-align: top;
+    width: 0.7cm;
+}
+.back .left
+{
+    border-right: dashed 1px gray;
+    float: left;
+}
+.back .right
+{
+    border-left: dashed 1px gray;
+    float: right;
+}
+.back .left .title, .back .right .title
+{
+    font-size: 13pt;
+    font-weight: bolder;
+    margin-top: 5.5cm;
+    margin-left: -5.15cm;
+    position: absolute;
+}
+
+.back .left .title
+{
+    -webkit-transform: rotate(-90deg); 
+    -moz-transform: rotate(-90deg);
+    text-align: center;
+    width: 11.1cm;
+}
+.back .right .title
+{
+    -webkit-transform: rotate(90deg); 
+    -moz-transform: rotate(90deg);
+    text-align: center;
+    width: 11cm;
+}
+
+.back .center
+{
+    text-align: center;
+}
+
+.back ol
+{
+    text-align: left;
+}
+
+.back .author
+{
+    float: right;
+    width: 50%;
+}
\ No newline at end of file
diff --git a/applications/GSM/print.css b/applications/GSM/print.css
new file mode 100644
index 0000000..ce1dcd3
--- /dev/null
+++ b/applications/GSM/print.css
@@ -0,0 +1,24 @@
+body
+{
+    font-family: serif;
+    font-size: 10px;
+    margin: auto;
+    width: 18cm;
+}
+
+h1 {
+	display: none;
+}
+#GSM_menu {
+	display: none;
+}
+
+.back .center
+{
+    overflow:hidden;
+    height: 11.1cm;
+}
+.back .center ol
+{
+	-webkit-margin-before: 0.5em;
+}
diff --git a/applications/GSM/style.css b/applications/GSM/style.css
new file mode 100644
index 0000000..a2cbb4b
--- /dev/null
+++ b/applications/GSM/style.css
@@ -0,0 +1,331 @@
+html {
+	height: 100%;
+}
+
+body {
+    background: -webkit-gradient(
+		linear,
+		left top,
+		left bottom,
+		color-stop(0.31, #ffbe86),
+		color-stop(0.66, #ffebdb),
+		color-stop(1.00, #ffbe86)
+    );
+    background: -moz-linear-gradient(
+		center bottom,
+		#ffbe86 31%,
+		#ffebdb 66%,
+		#ffbe86 100%
+    );
+
+    font-family: serif;
+	margin-bottom: 10px;
+	min-height: 80%;
+}
+
+a:link, a:visited {
+	text-decoration: none;
+	color:#000000;
+}
+
+h1 {
+	text-align: center;
+	margin-left: 250px;
+}
+
+.pagination a:link, .pagination a:visited {
+	text-decoration: none;
+	color:#FFFFFF;
+}
+
+.pagination a:hover, a:hover {
+	text-decoration: underline;
+}
+
+.news {
+    background: -webkit-gradient(
+		linear,
+	    left top,
+	    right bottom,
+		color-stop(0.31, #ffa2a1),
+		color-stop(0.66, #ffdcdb)
+    );
+    background: -moz-linear-gradient(
+		right bottom,
+		#ffa2a1 31%,
+		#ffdcdb 66%
+    );
+
+    border: 2px solid #ff6062;
+    border-radius: 17px;
+    box-shadow: 3px 4px 5px #444466;
+
+    height: 127px;
+    margin: auto;
+    padding: 20px;
+    text-align: left;
+    width: 75%;
+}
+
+.vp {
+	color: orange;
+}
+
+#GSM_menu {
+    background: -webkit-gradient(
+	linear,
+	left top,
+	left bottom,
+	color-stop(0.31, #ffa2a1),
+	color-stop(0.90, #ffd3d3)
+    );
+    background: -moz-linear-gradient(
+	center bottom,
+	#ffa2a1 31%,
+	#ffd3d3 90%
+    );
+
+    border-right: 2px dotted white;
+    color:#FFFFFF;
+    font-weight: bold;
+    height: 100%;
+    left: 0px;
+    list-style: none;
+    margin: 0;
+    -webkit-padding-start: 0;
+    position: fixed;
+    text-align: center;
+    top: 0px;
+    width: 250px;
+}
+
+#GSM_menu h2 {
+	margin-left: 69px;
+}
+
+#GSM_menu li {
+    margin-bottom: 40px;
+    text-align: center;
+    width: 250px;
+}
+#GSM_menu li[onclick] {
+    cursor: pointer;
+}
+#GSM_menu li[onclick]:hover {
+    text-decoration: underline;
+}
+
+label {
+	font-weight: bold;
+}
+label:hover {
+	text-decoration: underline;
+}
+
+form {
+    background: -webkit-gradient(
+		linear,
+		left top,
+		left bottom,
+		color-stop(0.31, #cc6d1d),
+		color-stop(0.95, #ff8f26)
+    );
+    background: -moz-linear-gradient(
+		center bottom,
+		#cc6d1d 31%,
+		#ff8f26 95%
+    );
+    border: 1px solid #ff9b42;
+    border-radius: 25px;
+    box-shadow: 2px 2px 5px #553333;
+}
+
+form#addAlbms {
+    margin: auto;
+    padding: 13px;
+    text-align: left;
+	width: 345px;
+}
+form#addAlbms div {
+	text-align: center;
+}
+form#addAlbms div#testColor {
+	background-color: black;
+	border: solid 1px black;
+	display: inline-block;
+	height: 1em;
+	margin-left: 5px;
+	margin-bottom: -4px;
+	width: 2em;
+}
+
+form#ajout {
+    height: 182px;
+    margin: 10px auto;
+    padding: 13px;
+    text-align: left;
+	width: 642px;
+}
+form#ajout input[type=text] {
+	width: 444px;
+}
+form#ajout select {
+	margin-right: 10px;
+}
+
+form#ajout label {
+    float: left;
+    display: block;
+    font-weight: bold;
+    margin: 10px 7px 10px 0;
+    text-align: right;
+    width: 110px;
+}
+form#ajout label:hover {
+    text-decoration: underline;
+}
+
+input[type=text], select {
+    margin: 10px 0;
+    transition: background 0.75s;
+    -moz-transition: background 0.75s;
+    -webkit-transition: background 0.75s;
+    -o-transition: background 0.75s;
+}
+input, select {
+	background: #FF6600;
+    border: #CA2A20 solid 1px;
+    border-radius: 3px;
+    margin-top: 5px;
+}
+input:hover, input:focus, select:hover, select:focus {
+    background: #CC6600;
+}
+
+input.erreur, select.erreur {
+	background: #CC0000;
+}
+
+div#GSM_menu {
+	background: url(backmenu.png);
+	color:#FFFFFF;
+	top: 0px;
+	font-weight: bold;
+	height: 1200px;
+	padding-top: 30px;
+	position: fixed;
+	text-align: center;
+	left: 0px;
+	width: 250px;
+}
+
+div#GSM_menu h2 {
+	margin-bottom: 40px;
+}
+
+div#contenu {
+	margin-left: 250px;
+	text-align: center;
+}
+
+.table {
+    border: 1px solid black;
+    border-radius: 10px;
+    box-shadow: 3px 3px 5px #666666;
+	margin: auto;
+}
+.table .body div {
+    transition: background 500ms;
+    -moz-transition: background 500ms;
+    -webkit-transition: background 500ms;
+    -o-transition: background 500ms;
+}
+.table .body div.elt0 {
+	background: #ec7d60;
+}
+.table .body div.elt1 {
+	background: #f68063;
+}
+.table .body div:hover {
+	background: #fa8022;
+}
+.table.cols2 div span {
+	display: inline-block;
+    width: 40%;
+}
+.table.cols3 div span {
+	display: inline-block;
+    width: 40%;
+}
+.table.cols3 div span+span+span {
+    width: 20%;
+}
+.table div.lign {
+	display: inline-block;
+    width: 100%;
+}
+
+.table .head {
+	background: #f26340;
+    border-bottom: 1px solid black;
+    border-radius: 10px 10px 0 0;
+    font-weight: bolder;
+    display: block;
+    text-align: center;
+    width: 100%;
+}
+.table .foot { border-radius: 0 0 10px 10px; }
+
+.table.stats {
+    float: left;
+	margin: 0 1%;
+    width: 31%;
+}
+.table#list {
+    width: 83%;
+}
+.table#list .head {
+	cursor: pointer;
+}
+.table .body div {
+	cursor: pointer;
+}
+
+.pagination {
+	background: #f26340;
+    border: 1px solid black;
+    color: white;
+    margin: auto;
+    width: 442px;
+}
+.pagination.top {
+    border-radius: 10px 10px 0 0;
+    border-bottom: none;
+}
+.pagination.bottom {
+    border-top: none;
+    border-radius: 0 0 10px 10px;
+    box-shadow: 0px 2px 7px #666666;
+}
+.pagination a {
+	cursor: pointer;
+	padding: 0 5px;
+}
+
+.front, .back
+{
+	background: white;
+}
+.back .center
+{
+    overflow:auto;
+}
+.back ol li:hover
+{
+	background-color: teal;
+}
+
+div.autocomplete {
+	margin-top: 20px;
+	margin-left: 6px;
+}
\ No newline at end of file
diff --git a/applications/GSPC/app.js b/applications/GSPC/app.js
new file mode 100644
index 0000000..353228e
--- /dev/null
+++ b/applications/GSPC/app.js
@@ -0,0 +1,537 @@
+var GSPC_origin_liste = false;
+var GSPC_liste = false;
+var GSPC_lastSort = -1;
+var GSPC_delay = null;
+var nbParPage = 50;
+
+//On charge la liste des porte-clés
+function GSPC_loadList()
+{
+	GSPC_origin_liste = false;
+	GSPC_liste = false;
+	GSPC_lastSort = -1;
+	$('nbpc').innerHTML = '<img src="applications/GSPC/loader.gif" alt="Chargement en cours ...">';
+	new Ajax.Request(
+ 		'ajax.php',
+ 			{
+				method: 'get',
+				parameters: {d: "action", a: "GSPC", p: "liste"},
+				onSuccess: GSPC_parseList,
+				onFailure: function() { printEtat(3); }
+			}
+		);
+}
+GSPC_loadList();
+
+//Une fois la liste reçue, on la parse
+function GSPC_parseList(transport, json)
+{
+	$('nbpc').innerHTML = json.nombre;
+	
+	var liste = transport.responseXML.documentElement.getElementsByTagName("liste")[0].getElementsByTagName("porteclef");
+	GSPC_origin_liste = new Array();
+	
+	for (var i = 0; i < liste.length; i++)
+	{
+		var elt = liste[i];
+		GSPC_origin_liste.push([elt.getAttribute("id"), elt.getAttribute("nom"), elt.getAttribute("caracteristique"), elt.getAttribute("ligne"), elt.getAttribute("special")])
+	}
+}
+
+//Met en place le formulaire d'ajout de porte-clé
+function GSPC_add()
+{
+	if (GSPC_delay)
+		clearTimeout(GSPC_delay);
+	
+	$('contenu').innerHTML = "";
+	var titre = document.createElement("h2");
+	titre.innerHTML = "Ajout d'un porte-clef à la base de données";
+	$('contenu').appendChild(titre);
+
+	GSPC_addScreen(false);
+}
+
+//Affiche la liste des porte-clés
+function GSPC_list()
+{
+	if (GSPC_delay)
+		clearTimeout(GSPC_delay);
+
+	window.scrollTo(0,0);
+	
+	$('contenu').innerHTML = "";
+	var titre = document.createElement("h2");
+	titre.innerHTML = "Liste des porte-clefs";
+	$('contenu').appendChild(titre);
+
+	GSPC_liste = false;
+	GSPC_lastSort = -1;
+
+	GSPC_viewliste();
+}
+
+//Affiche la page de statistiques
+function GSPC_stats()
+{
+	if (GSPC_delay)
+		clearTimeout(GSPC_delay);
+
+	window.scrollTo(0,0);
+	
+	$('contenu').innerHTML = "";
+	var titre = document.createElement("h2");
+	titre.innerHTML = "Statistiques";
+	$('contenu').appendChild(titre);
+
+	var tableau = document.createElement("div");
+	tableau.className = "table cols2";
+	tableau.id = "stats";
+		var tableau_head = document.createElement("div");
+		tableau_head.className = "head";
+			var head_th =  document.createElement("span");
+			head_th.innerHTML = "Ligne";
+			tableau_head.appendChild(head_th);
+			var head_th =  document.createElement("span");
+			head_th.innerHTML = "Nombre";
+			tableau_head.appendChild(head_th);
+		tableau.appendChild(tableau_head);
+		var tableau_body = document.createElement("div");
+			tableau_body.className = "body";
+			tableau_body.innerHTML = '<div class="lign elt0 foot">Téléchargement des statistiques en cours ... <img src="applications/GSPC/loader.gif" alt="Veuillez patienter"></div>';
+		tableau.appendChild(tableau_body);
+	$('contenu').appendChild(tableau);
+
+	new Ajax.Request(
+ 		'ajax.php',
+ 			{
+				method: 'get',
+				parameters: {d: "action", a: "GSPC", p: "stats"},
+				onSuccess: function(transport, json)
+					{
+						var stats = transport.responseXML.documentElement.getElementsByTagName("statistiques")[0];
+						var nbPC = stats.getElementsByTagName("ligne").length;
+
+						tableau_body.innerHTML = "";
+
+						for (var i = 0; i < nbPC; i++)
+						{
+							if (stats.getElementsByTagName("ligne")[i].getAttribute("nom") != "")
+							{
+								var lign = document.createElement("div");
+								lign.className = "elt" + (i%2);
+								GSPC_addStatLign(lign, stats.getElementsByTagName("ligne")[i].getAttribute("nom"));
+									var col = document.createElement("span");
+									col.innerHTML = stats.getElementsByTagName("ligne")[i].getAttribute("nom");
+									lign.appendChild(col);
+									var col = document.createElement("span");
+									col.innerHTML = stats.getElementsByTagName("ligne")[i].getAttribute("nombre");
+									lign.appendChild(col);
+								tableau_body.appendChild(lign);
+							}
+						}
+						lign.className += " foot";
+					},
+				onFailure: function() { printEtat(3); }
+			}
+		);
+}
+
+function GSPC_addStatLign(lign, ligne)
+{
+	lign.onclick = function() { window.scrollTo(0,0); GSPC_viewligne(ligne) };
+}
+
+function GSPC_viewligne(ligne)
+{
+	$('contenu').innerHTML = "";
+	var titre = document.createElement("h2");
+	titre.innerHTML = "Liste des porte-clefs de la ligne " + ligne;
+	$('contenu').appendChild(titre);
+	
+	GSPC_delay_viewligne(ligne);
+}
+
+function GSPC_delay_viewligne(ligne)
+{
+	if (GSPC_origin_liste == false)
+		GSPC_delay = setTimeout(GSPC_delay_viewligne, 200, ligne);
+	else
+	{
+		GSPC_liste = new Array();
+		for (var i = 0; i < GSPC_origin_liste.length; i++)
+		{
+			if (GSPC_origin_liste[i][3] == ligne)
+				GSPC_liste.push(GSPC_origin_liste[i]);
+		}
+		GSPC_lastSort = -1;
+	
+		GSPC_viewliste();
+	}
+}
+
+function GSPC_addScreen(modif)
+{
+    formulaire = document.createElement("form");
+    formulaire.id = "add"
+    formulaire.onsubmit = function(){ checkAndAdd(modif); return false; }
+      lab_nom = document.createElement("label");
+      lab_nom.innerHTML = "Nom/marque :";
+      lab_nom.setAttribute("for", "nompc");
+      inp_nom = document.createElement("input");
+      if(modif)
+	  	inp_nom.value = GSPC_liste[modif-1][1];
+      inp_nom.type = "text";
+      inp_nom.size = "34";
+      inp_nom.maxLength = "250";
+      inp_nom.id = "nompc";
+
+      lab_carac = document.createElement("label");
+      lab_carac.innerHTML = "Caractéristiques :";
+      lab_carac.setAttribute("for", "caracpc");
+      inp_carac = document.createElement("input");
+      if(modif)
+	  	inp_carac.value = GSPC_liste[modif-1][2];
+      inp_carac.type = "text";
+      inp_carac.size = "34";
+      inp_carac.maxLength = "250";
+      inp_carac.id = "caracpc";
+
+      lab_lign = document.createElement("label");
+      lab_lign.innerHTML = "Ligne :";
+      lab_lign.setAttribute("for", "lignepc");
+      inp_lign = document.createElement("input");
+      if(modif)
+		inp_lign.value = GSPC_liste[modif-1][3];
+      inp_lign.type = "text";
+      inp_lign.size = "10";
+      inp_lign.maxLength = "3";
+      inp_lign.id = "lignepc";
+
+      lab_quan = document.createElement("label");
+      lab_quan.innerHTML = "Quantité :";
+      lab_quan.setAttribute("for", "quantitepc");
+      sel_quan = document.createElement("select");
+      sel_quan.id = "quantitepc";
+        sel_quan_1 = document.createElement("option");
+        sel_quan_1.value = "1";
+        sel_quan_1.innerHTML = "Simple";
+        sel_quan_2 = document.createElement("option");
+        sel_quan_2.value = "2";
+        sel_quan_2.innerHTML = "Double";
+        sel_quan_3 = document.createElement("option");
+        sel_quan_3.value = "3";
+        sel_quan_3.innerHTML = "Triple";
+        sel_quan_4 = document.createElement("option");
+        sel_quan_4.value = "4";
+        sel_quan_4.innerHTML = "Quadruple";
+
+      inp_submit = document.createElement("input");
+      inp_submit.type = "submit";
+      if (modif)
+	  	inp_submit.value = "Modifier";
+      else
+	  	inp_submit.value = "Ajouter";
+      inp_submit.style.marginLeft = "165px";
+
+      formulaire.appendChild(lab_nom);
+      formulaire.appendChild(inp_nom);
+      formulaire.appendChild(document.createElement("br"));
+      formulaire.appendChild(lab_carac);
+      formulaire.appendChild(inp_carac);
+      formulaire.appendChild(document.createElement("br"));
+      formulaire.appendChild(lab_lign);
+      formulaire.appendChild(inp_lign);
+      formulaire.appendChild(document.createElement("br"));
+      formulaire.appendChild(lab_quan);
+        sel_quan.appendChild(sel_quan_1);
+        sel_quan.appendChild(sel_quan_2);
+        sel_quan.appendChild(sel_quan_3);
+        sel_quan.appendChild(sel_quan_4);
+      formulaire.appendChild(sel_quan);
+      formulaire.appendChild(document.createElement("br"));
+      if(modif)
+	  	sel_quan.value = GSPC_liste[modif-1][4];
+      formulaire.appendChild(document.createElement("br"));
+      formulaire.appendChild(inp_submit);
+      if (modif)
+      {
+		  inp_del = document.createElement("input");
+		  inp_del.type = "button";
+		  inp_del.value = "Supprimer";
+		  inp_del.onclick = function() { GSPC_del(modif); };
+		  inp_del.style.marginLeft = "15px";
+		  formulaire.appendChild(inp_del);
+      }
+    $('contenu').appendChild(formulaire);
+    $('nompc').focus();
+    
+    confirmation = document.createElement("h3");
+    confirmation.style.color = "teal";
+    confirmation.id = "confirm";
+    $('contenu').appendChild(confirmation);
+}
+
+function GSPC_del(modif)
+{
+	$('nompc').disabled = true;
+	$('caracpc').disabled = true;
+	$('lignepc').disabled = true;
+	$('quantitepc').disabled = true;
+
+	var ligne = GSPC_liste[modif-1][3];
+
+	new Ajax.Request(
+		'ajax.php?d=action&a=GSPC&p=del',
+			{
+			method: 'post',
+			parameters: {id: GSPC_liste[modif-1][0]},
+			onSuccess: function(transport, json)
+				{
+					if (json.statut != 1)
+					{
+						firstLoad();
+						alert("Vous avez été déconnecté. Le porte-clef n'a pas été enregistré");
+					}
+					else
+					{
+						$('contenu').innerHTML = "";
+						confirmation = document.createElement("h2");
+						confirmation.style.color = "teal";
+						confirmation.innerHTML = "Porte-clef supprimé avec succès !";
+						$('contenu').appendChild(confirmation);
+						$('nbpc').innerHTML = json.nombre;
+
+						GSPC_loadList();
+						GSPC_delay_viewligne(ligne);
+					}
+				},
+			onFailure: function() { printEtat(3); }
+		}
+	);
+
+	$('contenu').innerHTML = "<h2 class=\"vp\">Veuillez patienter suppression du porte-clef en cours ...</h2>";
+}
+
+function checkAndAdd(modif)
+{
+	if(modif)
+		modif = "&id=" + GSPC_liste[modif-1][0];
+	else
+		modif = "";
+
+	if ($('nompc').value == "")
+	{
+		$('nompc').className = "erreur";
+		alert('Veuillez indiquer une marque ou un nom !');
+		$('nompc').focus();
+	}
+	else if ($('lignepc').value == "")
+	{
+		$('lignepc').className = "erreur";
+		alert('Veuillez indiquer une ligne !');
+		$('lignepc').focus();
+	}
+	else
+	{
+		$('nompc').disabled = true;
+		$('caracpc').disabled = true;
+		$('lignepc').disabled = true;
+		$('quantitepc').disabled = true;
+
+		new Ajax.Request(
+	 		'ajax.php?d=action&a=GSPC' + modif,
+	 			{
+					method: 'post',
+					parameters: {nom: $('nompc').value, caracteristique: $('caracpc').value, ligne: $('lignepc').value, quantite: $('quantitepc').value},
+					onSuccess: function(transport, json)
+						{
+							if (json.statut != 1)
+							{
+								firstLoad();
+								alert("Vous avez été déconnecté. Le porte-clef n'a pas été enregistré");
+							}
+							else
+							{
+								GSPC_loadList();
+								
+								if(modif)
+								{
+									$('contenu').innerHTML = "";
+									confirmation = document.createElement("h2");
+									confirmation.style.color = "teal";
+									confirmation.innerHTML = "Porte-clef modifié avec succès !";
+									$('contenu').appendChild(confirmation);
+									$('nbpc').innerHTML = json.nombre;
+									
+									GSPC_delay_viewligne(lign);
+								}
+								else
+								{
+									$('nompc').value = "";
+									$('nompc').className = "";
+									$('caracpc').value = "";
+									$('lignepc').className = "";
+									$('quantitepc').value = 1;
+
+									$('nompc').disabled = false;
+									$('caracpc').disabled = false;
+									$('lignepc').disabled = false;
+									$('quantitepc').disabled = false;
+
+									$('nbpc').innerHTML = json.nombre;
+
+									$('confirm').innerHTML = "Porte-clef ajouté avec succès !";
+									setTimeout("$('confirm').innerHTML = '';", 3500);
+
+									$('nompc').focus();
+								}
+							}
+						},
+					onFailure: function() { printEtat(3); }
+				}
+			);
+
+		if(modif)
+		{
+			lign = $('lignepc').value;
+			$('contenu').innerHTML = "<h2 class=\"vp\">Veuillez patienter, modification du porte-clef en cours ...</h2>";
+		}
+	}
+}
+
+function GSPC_viewliste()
+{
+	var pagination = document.createElement("div");
+	pagination.className = "pagination top";
+	pagination.id = "pagination1";
+	$('contenu').appendChild(pagination);
+
+	var tableau = document.createElement("div");
+	tableau.className = "table cols3";
+	tableau.id = "list";
+		var tableau_head = document.createElement("div");
+		tableau_head.className = "head";
+			var head_th =  document.createElement("span");
+			head_th.innerHTML = "Nom/Marque";
+			head_th.onclick = function(){ GSPC_showliste(1, 0); }
+			tableau_head.appendChild(head_th);
+			var head_th =  document.createElement("span");
+			head_th.innerHTML = "Caractéristique";
+			head_th.onclick = function(){ GSPC_showliste(2, 0); }
+			tableau_head.appendChild(head_th);
+			var head_th =  document.createElement("span");
+			head_th.innerHTML = "Ligne";
+			head_th.onclick = function(){ GSPC_showliste(3, 0); }
+			tableau_head.appendChild(head_th);
+		tableau.appendChild(tableau_head);
+		var tableau_body = document.createElement("div");
+			tableau_body.className = "body";
+			tableau_body.id = "bodyList";
+			tableau_body.innerHTML = '<div class="lign elt0 foot">Chargement de la liste en cours ... <img src="applications/GSPC/loader.gif" alt="Veuillez patienter"></div>';
+		tableau.appendChild(tableau_body);
+	$('contenu').appendChild(tableau);
+	
+	var pagination = document.createElement("div");
+	pagination.className = "pagination bottom";
+	pagination.id = "pagination2";
+	$('contenu').appendChild(pagination);
+
+	GSPC_showliste(-1, 0);
+}
+
+function GSPC_showliste(tri, page)
+{
+	if (GSPC_origin_liste == false)
+		setTimeout(GSPC_showliste, 200, tri);
+	else
+	{
+		if (GSPC_liste == false)
+			GSPC_liste = GSPC_origin_liste;
+
+		//On tente un tri
+		if (GSPC_lastSort != tri)
+		{
+			$('bodyList').innerHTML = '<div class="lign elt0 foot">Tri de la liste en cours ...</div>';
+			GSPC_liste = GSPC_liste.sort(function(a,b){return a[tri].localeCompare(b[tri]);});
+			GSPC_lastSort = tri;
+		}
+
+		nbPages = Math.ceil(GSPC_liste.length / nbParPage);
+		$('pagination1').innerHTML = "";
+		$('pagination2').innerHTML = "";
+		for (var i = 0; i < 4 && i < nbPages; i++)
+			GSPC_addLinkPagination(i);
+		if (page > 5 && i < nbPages)
+		{
+			$('pagination1').innerHTML += "...";
+			$('pagination2').innerHTML += "...";
+		}
+		for (var i = (page < 6?4:page - 2); (i < page + 3 && i < nbPages); i++)
+			GSPC_addLinkPagination(i);
+		if (page <= 5 && i < nbPages)
+		{
+			$('pagination1').innerHTML += "...";
+			$('pagination2').innerHTML += "...";
+			for (var i = Math.ceil(nbPages/2) - 2; i < nbPages/2 + 2; i++)
+				GSPC_addLinkPagination(i);
+		}
+		if (page + 3 < nbPages - 4)
+		{
+			$('pagination1').innerHTML += "...";
+			$('pagination2').innerHTML += "...";
+		}
+		for (var i = (page + 3 >= nbPages - 4?page + 3:nbPages - 4); (i < nbPages); i++)
+			GSPC_addLinkPagination(i);
+
+		start = page * nbParPage;
+		$('bodyList').innerHTML = "";
+		
+		for (var i = 0; i < nbParPage && i + start < GSPC_liste.length; i++)
+		{
+			var lign = document.createElement("div");
+			lign.className = "elt" + (i%2);
+			GSPC_addLinkPC(lign, i + start);
+				var col = document.createElement("span");
+				col.innerHTML = GSPC_liste[i + start][1];
+				lign.appendChild(col);
+				var col = document.createElement("span");
+				col.innerHTML = GSPC_liste[i + start][2];
+				lign.appendChild(col);
+				var col = document.createElement("span");
+				col.innerHTML = GSPC_liste[i + start][3];
+				lign.appendChild(col);
+			$('bodyList').appendChild(lign);
+		}
+		lign.className += " foot"
+	}
+}
+
+function GSPC_addLinkPagination(page)
+{
+	var lnkP = document.createElement("a");
+	lnkP.href = "javascript:GSPC_showliste(" + GSPC_lastSort + ", " + page + ");";
+	lnkP.innerHTML = page+1;
+	$('pagination1').appendChild(lnkP);
+	var lnkP = document.createElement("a");
+	lnkP.href = "javascript:GSPC_showliste(" + GSPC_lastSort + ", " + page + ");";
+	lnkP.innerHTML = page+1;
+	$('pagination2').appendChild(lnkP);
+}
+
+function GSPC_addLinkPC(elt, idPC)
+{
+	elt.onclick = function() {
+		$('contenu').innerHTML = "";
+		var titre = document.createElement("h2");
+		titre.innerHTML = "Modification d'un porte-clef";
+		$('contenu').appendChild(titre);
+
+		GSPC_addScreen(idPC+1);
+	}
+}
+
+function GSPC_apropos()
+{
+	aproposApp("GSPC", "contenu");
+}
\ No newline at end of file
diff --git a/applications/GSPC/loader.gif b/applications/GSPC/loader.gif
new file mode 100644
index 0000000..e0b75a6
Binary files /dev/null and b/applications/GSPC/loader.gif differ
diff --git a/applications/GSPC/loader1.gif b/applications/GSPC/loader1.gif
new file mode 100644
index 0000000..74d53e0
Binary files /dev/null and b/applications/GSPC/loader1.gif differ
diff --git a/applications/GSPC/style.css b/applications/GSPC/style.css
new file mode 100644
index 0000000..9d2fa6a
--- /dev/null
+++ b/applications/GSPC/style.css
@@ -0,0 +1,280 @@
+html {
+	height: 100%;
+}
+
+body {
+    background: -webkit-gradient(
+		linear,
+		left top,
+		left bottom,
+		color-stop(0.31, #9eeaff),
+		color-stop(0.66, #e4f9ff),
+		color-stop(1.00, #9eeaff)
+    );
+    background: -moz-linear-gradient(
+		center bottom,
+		#9eeaff 31%,
+		#e4f9ff 66%,
+		#9eeaff 100%
+    );
+
+    font-family: serif;
+	min-height: 80%;
+}
+
+a:link, a:visited {
+    text-decoration: none;
+    color:#000000;
+}
+
+h1 {
+    text-align: center;
+    margin-left: 250px;
+}
+
+#GSPC_menu a:link, #GSPC_menu a:visited, .pagination a:link, .pagination a:visited {
+    text-decoration: none;
+    color:#FFFFFF;
+}
+
+#GSPC_menu a:hover, .pagination a:hover, a:hover {
+    text-decoration: underline;
+}
+
+.news {
+    background: -webkit-gradient(
+		linear,
+	    left top,
+	    right bottom,
+		color-stop(0.31, #93b4ff),
+		color-stop(0.66, #c5ceff)
+    );
+    background: -moz-linear-gradient(
+		right bottom,
+		#93b4ff 31%,
+		#c5ceff 66%
+    );
+
+    border: 2px solid #5290ff;
+    border-radius: 17px;
+    box-shadow: 3px 4px 5px #444466;
+
+    height: 127px;
+    margin: auto;
+    padding: 20px;
+    text-align: left;
+    width: 75%;
+}
+
+.vp {
+    color: orange;
+}
+
+#GSPC_menu {
+    background: -webkit-gradient(
+	linear,
+	left top,
+	left bottom,
+	color-stop(0.31, #5290ff),
+	color-stop(0.90, #a3c4ff)
+    );
+    background: -moz-linear-gradient(
+	center bottom,
+	#5290ff 31%,
+	#a3c4ff 90%
+    );
+
+    border-right: 2px dotted white;
+    color:#FFFFFF;
+    font-weight: bold;
+    height: 100%;
+    left: 0px;
+    list-style: none;
+    margin: 0;
+    -webkit-padding-start: 0;
+    position: fixed;
+    text-align: center;
+    top: 0px;
+    width: 250px;
+}
+
+#GSPC_menu h2 {
+	margin-left: 69px;
+}
+
+#GSPC_menu li {
+    margin-bottom: 40px;
+    text-align: center;
+    width: 250px;
+}
+#GSPC_menu li[onclick] {
+    cursor: pointer;
+}
+#GSPC_menu li[onclick]:hover {
+    text-decoration: underline;
+}
+
+span#nompc img {
+	margin-top: 3px;
+}
+
+div#contenu {
+    margin-left: 250px;
+    text-align: center;
+}
+
+form#add {
+    background: -webkit-gradient(
+		linear,
+		left top,
+		right bottom,
+		color-stop(0.31, #c9b5e8),
+		color-stop(0.95, #e4daf4)
+    );
+    background: -moz-linear-gradient(
+		center bottom,
+		#c9b5e8 31%,
+		#e4daf4 95%
+    );
+
+    border: 1px solid #8A77A1;
+    border-radius: 25px;
+    box-shadow: 2px 2px 5px #333355;
+    height: 205px;
+    margin: auto;
+    padding: 13px;
+    text-align: left;
+    width: 456px;
+}
+
+label {
+    float: left;
+    display: block;
+    font-weight: bold;
+    margin: 10px 7px 10px 0;
+    text-align: right;
+    width: 170px;
+}
+label:hover {
+    text-decoration: underline;
+}
+
+input[type=text], select {
+    margin: 10px 0;
+    transition: background 0.75s;
+    -moz-transition: background 0.75s;
+    -webkit-transition: background 0.75s; 
+    -o-transition: background 0.75s;
+}
+input, select {
+    background: #00EAF5;
+    border: #009AA5 solid 1px;
+    border-radius: 3px;
+    margin-top: 5px;
+}
+input:hover, input:focus, select:hover, select:focus {
+    background: #95cdff;
+}
+
+input#nompc {
+    font-variant: small-caps;
+}
+input#lignepc {
+    text-transform:uppercase;
+}
+
+input.erreur, select.erreur {
+    background: #CC0000;
+    border: #A59A00 solid 1px;
+}
+
+.table {
+    border: 1px solid black;
+    border-radius: 10px;
+    box-shadow: 3px 3px 5px #666666;
+	margin: auto;
+}
+.table .body div {
+    transition: background 500ms;
+    -moz-transition: background 500ms;
+    -webkit-transition: background 500ms;
+    -o-transition: background 500ms;
+}
+.table .body div.elt0 {
+	background: #5c93a0;
+}
+.table .body div.elt1 {
+	background: #5c96a5;
+}
+.table .body div:hover {
+	background: #73B14b;
+}
+.table.cols2 div span {
+	display: inline-block;
+    width: 50%;
+}
+.table.cols3 div span {
+	display: inline-block;
+    width: 45%;
+}
+.table.cols3 div span+span+span {
+    width: 10%;
+}
+.table.cols3 div.body span {
+    text-transform: uppercase;
+}
+.table.cols3 div.body span+span {
+    text-transform: none;
+}
+.table.cols3 div.body span+span+span {
+    text-transform: uppercase;
+}
+.table div.lign {
+	display: inline-block;
+    width: 100%;
+}
+
+.table .head {
+	background: #1070c9;
+    border-bottom: 1px solid black;
+    border-radius: 10px 10px 0 0;
+    font-weight: bolder;
+    display: block;
+    text-align: center;
+    width: 100%;
+}
+.table .foot { border-radius: 0 0 10px 10px; }
+
+.table#stats {
+    width: 42%;
+}
+.table#list {
+    width: 83%;
+}
+.table#list .head {
+	cursor: pointer;
+}
+.table .body div {
+	cursor: pointer;
+}
+
+.pagination {
+	background: #1070c9;
+    border: 1px solid black;
+    color: white;
+    margin: auto;
+    width: 442px;
+}
+.pagination.top {
+    border-radius: 10px 10px 0 0;
+    border-bottom: none;
+}
+.pagination.bottom {
+    border-top: none;
+    border-radius: 0 0 10px 10px;
+    box-shadow: 0px 2px 7px #666666;
+}
+.pagination a {
+	cursor: pointer;
+	padding: 0 5px;
+}
\ No newline at end of file
diff --git a/applications/chat/app.js b/applications/chat/app.js
new file mode 100644
index 0000000..79f6cfd
--- /dev/null
+++ b/applications/chat/app.js
@@ -0,0 +1,95 @@
+var chat_lastTime = 0;
+var chat_refresh_time = 1500;
+
+function chat_MAJ()
+{
+	new Ajax.Request(
+	 'ajax.php',
+	 {
+		method: 'get',
+		parameters: {time: chat_lastTime, d: "action", a: "chat"},
+		onSuccess: function(transport, json) {
+				if (json.messages.length > 0)
+				{
+					for(i=json.messages.length-1; i>=0; i--)
+					{
+						//On tranforme le timestamp en date correcte
+						var date = new Date();
+						var now = new Date();
+						date.setTime(json.messages[i]["timestamp"]*1000);
+
+						//On affiche tout
+						var newRow = $('chat').insertRow(0);
+						var newCell = newRow.insertCell(0);
+						if (date.getDay() != now.getDay())
+							newCell.innerHTML = '[' + json.messages[i]["pseudo"] + '] ' + (date.getDay()<10?"0"+date.getDay():date.getDay()) + "/" + (date.getMonth()<10?"0"+date.getMonth():date.getMonth()) + " " + (date.getHours()<10?"0"+date.getHours():date.getHours()) + ":" + (date.getMinutes()<10?"0"+date.getMinutes():date.getMinutes()) + ":" + (date.getSeconds()<10?"0"+date.getSeconds():date.getSeconds());
+						else
+							newCell.innerHTML = '[' + json.messages[i]["pseudo"] + '] ' + (date.getHours()<10?"0"+date.getHours():date.getHours()) + ":" + (date.getMinutes()<10?"0"+date.getMinutes():date.getMinutes()) + ":" + (date.getSeconds()<10?"0"+date.getSeconds():date.getSeconds());
+    					newCell = newRow.insertCell(1);
+						newCell.innerHTML = json.messages[i]["message"];
+						if (chat_lastTime < json.messages[i]["timestamp"])
+							chat_lastTime = json.messages[i]["timestamp"];
+					}
+				}
+			},
+		onFailure: function() { chat_MAJ(); }
+	 }
+	);
+	chat_refresh = setTimeout("chat_MAJ()", chat_refresh_time);
+}
+
+function chat_clearScreen()
+{
+	$('chat').innerHTML = "";
+	chat_write("JS", "Nettoyage de l'écran");
+}
+
+function chat_refreshScreen()
+{
+	chat_refresh = setTimeout("chat_MAJ()", 1);
+}
+
+function chat_reset()
+{
+	chat_lastTime = 0;
+}
+
+function chat_changeRefreshTime(newTime)
+{
+	if (newTime > 0)
+	{
+		if (newTime < 999)
+			newTime *= 1000;
+		chat_refresh_time = newTime;
+
+		chat_write("JS", "Temps de rafraîchissement passé à " + newTime/1000 + " seconde(s)");
+	}
+}
+
+function chat_sendCommande(commande)
+{
+	new Ajax.Request(
+	 'ajax.php?d=action&a=chat',
+	 {
+		method: 'post',
+		parameters: {comm: commande},
+		onSuccess: function(transport, json) {
+			if (json.confirm)
+				chat_write("Server", json.confirm);
+			else
+				chat_write("Server", "Rien");
+			},
+		onFailure: function() { alert("La requête a échouée!"); }
+	 }
+	);
+}
+
+function chat_write(posteur, message)
+{
+	var date = new Date();
+	var newRow = $('chat').insertRow(0);
+	var newCell = newRow.insertCell(0);
+	newCell.innerHTML = '<em>' + posteur + '</em> ' + (date.getHours()<10?"0"+date.getHours():date.getHours()) + ":" + (date.getMinutes()<10?"0"+date.getMinutes():date.getMinutes()) + ":" + (date.getSeconds()<10?"0"+date.getSeconds():date.getSeconds());
+	newCell = newRow.insertCell(1);
+	newCell.innerHTML = "<em>" + message + "</em>";
+}
\ No newline at end of file
diff --git a/applications/users/app.js b/applications/users/app.js
new file mode 100644
index 0000000..fb88de5
--- /dev/null
+++ b/applications/users/app.js
@@ -0,0 +1,217 @@
+var USERS_liste = false;
+
+function USERS_add()
+{
+	$('corps').innerHTML = "";
+	USERS_display("add", false);
+}
+
+function USERS_modif(id)
+{
+	$('corps').innerHTML = "";
+	if (!USERS_liste)
+		USERS_loadListe(false);
+
+	USERS_display("modif", USERS_liste[id]);
+}
+
+function USERS_delete(id)
+{
+	alert("Demande de suppression de l'utilisateur : " + id);
+}
+
+function USERS_loadListe(async)
+{
+	new Ajax.Request(
+		'ajax.php',
+			{
+			method: 'get',
+			asynchronous: async,
+			parameters: {d: "action", a: "users"},
+			onSuccess: function(transport, json)
+				{
+					USERS_liste = USERS_liste;
+				},
+			onFailure: function() { printEtat(3); }
+		}
+	);
+}
+
+function USERS_display(page, plus)
+{
+	alert('pom');
+	if (page == "add" || page == "modif")
+	{
+		formMod = document.createElement("form");
+		if (plus)
+			formMod.onsubmit = function() { USERS_sendModif(plus.id); return false; }
+		else
+			formMod.onsubmit = USERS_sendAdd;
+
+			fieldMod = document.createElement("fieldset");
+			fieldMod.style.width = "500px";
+			fieldMod.style.margin = "auto";
+				fieldleg = document.createElement("legend");
+				fieldleg.innerHTML = "Utilisateur";
+				fieldMod.appendChild(fieldleg);
+
+				labelchamp = document.createElement("label");
+				labelchamp.innerHTML = "Nom :";
+				labelchamp.setAttribute("for", "nom");
+				fieldMod.appendChild(labelchamp);
+					fieldMod.innerHTML += " ";
+				inputchamp = document.createElement("input");
+				inputchamp.type = "text";
+				inputchamp.id = "nom";
+				if (plus)
+					inputchamp.value = plus.pseudo;
+				fieldMod.appendChild(inputchamp);
+
+				fieldMod.appendChild(document.createElement("br"));
+
+				labelchamp = document.createElement("label");
+				labelchamp.innerHTML = "Mot de passe :";
+				labelchamp.setAttribute("for", "mdp");
+				fieldMod.appendChild(labelchamp);
+					fieldMod.innerHTML += " ";
+				inputchamp = document.createElement("input");
+				inputchamp.type = "password";
+				inputchamp.id = "mdp";
+				fieldMod.appendChild(inputchamp);
+
+				fieldMod.appendChild(document.createElement("br"));
+
+				labelchamp = document.createElement("label");
+				labelchamp.innerHTML = "Confirmer mot de passe :";
+				labelchamp.setAttribute("for", "conf");
+				fieldMod.appendChild(labelchamp);
+					fieldMod.innerHTML += " ";
+				inputchamp = document.createElement("input");
+				inputchamp.type = "password";
+				inputchamp.id = "conf";
+				fieldMod.appendChild(inputchamp);
+
+				fieldMod.appendChild(document.createElement("br"));
+				fieldMod.appendChild(document.createElement("br"));
+
+				labelchamp = document.createElement("label");
+				labelchamp.innerHTML = "Adresse électronique :";
+				labelchamp.setAttribute("for", "mail");
+				fieldMod.appendChild(labelchamp);
+					fieldMod.innerHTML += " ";
+				inputchamp = document.createElement("input");
+				inputchamp.type = "text";
+				if (plus)
+					inputchamp.value = plus.mail;
+				inputchamp.id = "mail";
+				fieldMod.appendChild(inputchamp);
+
+				fieldMod.appendChild(document.createElement("br"));
+				fieldMod.appendChild(document.createElement("br"));
+
+				inputchamp = document.createElement("input");
+				inputchamp.type = "submit";
+				inputchamp.value = "Continuer";
+				fieldMod.appendChild(inputchamp);
+			formMod.appendChild(fieldMod);
+		$('corps').appendChild(formMod);
+	}
+	else
+	{
+		if (plus)
+			USERS_liste = plus.users;
+
+		tableMessages = document.createElement("table");
+		tableMessages.style.margin = "auto";
+		tableMessages.style.width = "90%";
+			theMess = document.createElement("thead");
+				trMess = document.createElement("tr");
+					thMess = document.createElement("th");
+					thMess.innerHTML = "Action";
+					trMess.appendChild(thMess);
+					thMess = document.createElement("th");
+					thMess.innerHTML = "Utilisateur";
+					trMess.appendChild(thMess);
+					thMess = document.createElement("th");
+					thMess.innerHTML = "Adresse électronique";
+					trMess.appendChild(thMess);
+					thMess = document.createElement("th");
+					thMess.innerHTML = "Dernière connexion";
+					trMess.appendChild(thMess);
+					thMess = document.createElement("th");
+					thMess.innerHTML = "Dernière IP";
+					trMess.appendChild(thMess);
+				theMess.appendChild(trMess);
+			tableMessages.appendChild(theMess);
+				tboMess = document.createElement("tbody");
+				tboMess.id = "users";
+			tableMessages.appendChild(tboMess);
+		$('corps').appendChild(tableMessages);
+
+		nbUsers = USERS_liste.length;
+		for(i=0; i<nbUsers; i++)
+		{
+			var date = new Date();
+			date.setTime(USERS_liste[i].last_visite*1000);
+
+			var newRow = $('users').insertRow(-1);
+			var newCell = newRow.insertCell(0);
+			newCell.innerHTML = '<a href="javascript:USERS_modif(' + i + ');">Modifier</a>';
+			var newCell = newRow.insertCell(1);
+			newCell.innerHTML = USERS_liste[i].pseudo;
+			var newCell = newRow.insertCell(2);
+			newCell.innerHTML = USERS_liste[i].mail;
+			var newCell = newRow.insertCell(3);
+			newCell.innerHTML = (date.getDay()<10?"0"+date.getDay():date.getDay()) + "/" + (date.getMonth()<10?"0"+date.getMonth():date.getMonth()) + "/" + date.getFullYear() + " " + (date.getHours()<10?"0"+date.getHours():date.getHours()) + ":" + (date.getMinutes()<10?"0"+date.getMinutes():date.getMinutes()) + ":" + (date.getSeconds()<10?"0"+date.getSeconds():date.getSeconds());
+			var newCell = newRow.insertCell(4);
+			newCell.innerHTML = USERS_liste[i].last_ip;
+		}
+
+		var newRow = $('users').insertRow(-1);
+		var newCell = newRow.insertCell(0);
+		newCell.innerHTML = '<a href="javascript:USERS_add();">Ajouter</a>';
+	}
+}
+
+function USERS_sendAdd()
+{
+	if ($('mdp').value.length < 5)
+		alert("Le mot de passe est trop court !\nIl doit faire au moins 5 caractères.");
+	else if ($('mdp').value != $('conf').value)
+		alert("Le mot de passe est sa confirmation est différent !");
+	else
+	{
+		new Ajax.Request(
+			'ajax.php?d=action&a=users',
+				{
+				method: 'post',
+				asynchronous: async,
+				parameters: {nom: $('nom').value, mdp: $('mdp').value, mail: $('mail').value},
+				onSuccess: function(transport, json)
+					{
+						USERS_liste = json.users;
+					},
+				onFailure: function() { printEtat(3); }
+			}
+		);
+	}
+
+	return false;
+}
+
+function USERS_sendModif(id)
+{
+	if ($('mdp').value.length < 5)
+		alert("Le mot de passe est trop court !\nIl doit faire au moins 5 caractères.");
+	else if ($('mdp').value != $('conf').value)
+		alert("Le mot de passe est sa confirmation est différent !");
+	else
+	{
+		alert("Demande de modification pour l'utilisateur ayant l'ID : " + id);
+
+
+	}
+
+	$('mdp').value = "";
+	$('conf').value = "";
+}
\ No newline at end of file
diff --git a/common.css b/common.css
new file mode 100644
index 0000000..85d892f
--- /dev/null
+++ b/common.css
@@ -0,0 +1,116 @@
+body {
+	background: url('images/background.jpg') fixed #E1E2E4;
+	font-family: sans-serif;
+}
+
+#btMenu {
+	background-image: url('images/menu.png');
+	height: 60px;
+	left: 10px;
+	position: fixed;
+	top: 1px;
+	width: 60px;
+	z-index: 10;
+}
+#btMenu:hover {
+	background-position: 0 -60px;
+}
+#btMenu:active {
+	background-position: 0 -120px;
+}
+#btMenu span {
+	display: none;
+}
+
+.submenu
+{
+	background: #D6EDF8;
+	border: solid 1px #B6CDD8;
+	display: none;
+	padding: 0px;
+	text-align: left;
+	overflow: hidden;
+	z-index: 10;
+}
+
+#menu {
+	margin: 10px;
+	position: fixed;
+	top: 5px;
+	left: 20px;
+	width: 155px;
+}
+#menu #nameApp {
+	font-family: serif;
+	text-align: center;
+	font-weight: bold;
+}
+#menu #nameApp, .submenu li.hr {
+	border-bottom: groove 3px gray;
+	margin-bottom: 2px;
+	padding-bottom: 3px;
+}
+
+.submenu ul {
+	list-style: none;
+}
+
+.submenu li.item {
+	color: #6BCCD6;
+	display: block;
+	line-height: 20px;
+	padding: 0 5px 0 5px;
+	text-decoration: none;
+}
+.submenu li.item:hover {
+	background-color: #797979;
+	text-decoration: none;
+}
+
+div#etat {	
+	background-color: #CDF;
+	border-right: solid 1px #89B;
+	border-top: solid 1px #89B;
+	border-radius: 5px;
+	bottom: 0px;
+	font-size: small;
+	font-style: italic;
+	left: 0px;
+	padding: 1px 4px;
+	position: fixed;
+}
+
+
+div.autocomplete {
+  position: absolute;
+  width: 500px;
+  background-color: white;
+  border: 1px solid #888;
+  margin: 0px;
+  padding: 0px;
+}
+
+div.autocomplete ul {
+  list-style-type: none;
+  margin: 0px;
+  padding: 0px;
+  max-height: 20em;
+  overflow: auto;
+}
+
+div.autocomplete ul li.selected {
+    background-color: #ffb;
+}
+
+div.autocomplete ul li {
+  list-style-type:none;
+  display: block;
+  margin: 0;
+  padding: 2px;
+  cursor: pointer;
+}
+
+
+div.autocomplete ul li span.informal {
+    color: gray;
+}
\ No newline at end of file
diff --git a/favicon.ico b/favicon.ico
new file mode 100644
index 0000000..69df2c6
Binary files /dev/null and b/favicon.ico differ
diff --git a/fonts/kidprint.ttf b/fonts/kidprint.ttf
new file mode 100644
index 0000000..9426c8c
Binary files /dev/null and b/fonts/kidprint.ttf differ
diff --git a/images/background.jpg b/images/background.jpg
new file mode 100644
index 0000000..983ddd6
Binary files /dev/null and b/images/background.jpg differ
diff --git a/images/etats/alpha.png b/images/etats/alpha.png
new file mode 100644
index 0000000..e9c228c
Binary files /dev/null and b/images/etats/alpha.png differ
diff --git a/images/etats/beta.png b/images/etats/beta.png
new file mode 100644
index 0000000..28c087e
Binary files /dev/null and b/images/etats/beta.png differ
diff --git a/images/etats/construction.png b/images/etats/construction.png
new file mode 100644
index 0000000..f7f0f9b
Binary files /dev/null and b/images/etats/construction.png differ
diff --git a/images/etats/final.png b/images/etats/final.png
new file mode 100644
index 0000000..c8eaaea
Binary files /dev/null and b/images/etats/final.png differ
diff --git a/images/logog.png b/images/logog.png
new file mode 100644
index 0000000..3db64cf
Binary files /dev/null and b/images/logog.png differ
diff --git a/images/menu.png b/images/menu.png
new file mode 100644
index 0000000..64aa197
Binary files /dev/null and b/images/menu.png differ
diff --git a/images/menu.xcf b/images/menu.xcf
new file mode 100644
index 0000000..2848dfd
Binary files /dev/null and b/images/menu.xcf differ
diff --git a/images/pomme.png b/images/pomme.png
new file mode 100644
index 0000000..6473cea
Binary files /dev/null and b/images/pomme.png differ
diff --git a/images/titres/403.png b/images/titres/403.png
new file mode 100644
index 0000000..da39ef6
Binary files /dev/null and b/images/titres/403.png differ
diff --git a/images/titres/403en.png b/images/titres/403en.png
new file mode 100644
index 0000000..b4beaee
Binary files /dev/null and b/images/titres/403en.png differ
diff --git a/images/titres/404.png b/images/titres/404.png
new file mode 100644
index 0000000..4459377
Binary files /dev/null and b/images/titres/404.png differ
diff --git a/images/titres/404en.png b/images/titres/404en.png
new file mode 100644
index 0000000..748f6ba
Binary files /dev/null and b/images/titres/404en.png differ
diff --git a/images/titres/UK.png b/images/titres/UK.png
new file mode 100644
index 0000000..1d5aa47
Binary files /dev/null and b/images/titres/UK.png differ
diff --git a/images/titres/US.png b/images/titres/US.png
new file mode 100644
index 0000000..33b40d3
Binary files /dev/null and b/images/titres/US.png differ
diff --git a/images/titres/abonnement.png b/images/titres/abonnement.png
new file mode 100644
index 0000000..0a3cae5
Binary files /dev/null and b/images/titres/abonnement.png differ
diff --git a/images/titres/abonnements.png b/images/titres/abonnements.png
new file mode 100644
index 0000000..f551fc3
Binary files /dev/null and b/images/titres/abonnements.png differ
diff --git a/images/titres/aboutthissite.png b/images/titres/aboutthissite.png
new file mode 100644
index 0000000..4481cb0
Binary files /dev/null and b/images/titres/aboutthissite.png differ
diff --git a/images/titres/accueil.png b/images/titres/accueil.png
new file mode 100644
index 0000000..04bc1bc
Binary files /dev/null and b/images/titres/accueil.png differ
diff --git a/images/titres/achatenligne.png b/images/titres/achatenligne.png
new file mode 100644
index 0000000..0e97cc8
Binary files /dev/null and b/images/titres/achatenligne.png differ
diff --git a/images/titres/actualites.png b/images/titres/actualites.png
new file mode 100644
index 0000000..7c169fd
Binary files /dev/null and b/images/titres/actualites.png differ
diff --git a/images/titres/allemagne.png b/images/titres/allemagne.png
new file mode 100644
index 0000000..0b97715
Binary files /dev/null and b/images/titres/allemagne.png differ
diff --git a/images/titres/allemand.png b/images/titres/allemand.png
new file mode 100644
index 0000000..cff4340
Binary files /dev/null and b/images/titres/allemand.png differ
diff --git a/images/titres/aproposdusite.png b/images/titres/aproposdusite.png
new file mode 100644
index 0000000..48b118b
Binary files /dev/null and b/images/titres/aproposdusite.png differ
diff --git a/images/titres/authentification.png b/images/titres/authentification.png
new file mode 100644
index 0000000..ab789ce
Binary files /dev/null and b/images/titres/authentification.png differ
diff --git a/images/titres/avertissements.png b/images/titres/avertissements.png
new file mode 100644
index 0000000..47b9fe0
Binary files /dev/null and b/images/titres/avertissements.png differ
diff --git a/images/titres/bienvenue.png b/images/titres/bienvenue.png
new file mode 100644
index 0000000..820c096
Binary files /dev/null and b/images/titres/bienvenue.png differ
diff --git a/images/titres/bienvenueAlisson.png b/images/titres/bienvenueAlisson.png
new file mode 100644
index 0000000..5d591f1
Binary files /dev/null and b/images/titres/bienvenueAlisson.png differ
diff --git a/images/titres/bienvenueChristine.png b/images/titres/bienvenueChristine.png
new file mode 100644
index 0000000..497df20
Binary files /dev/null and b/images/titres/bienvenueChristine.png differ
diff --git a/images/titres/bienvenueFlorence.png b/images/titres/bienvenueFlorence.png
new file mode 100644
index 0000000..3cf339c
Binary files /dev/null and b/images/titres/bienvenueFlorence.png differ
diff --git a/images/titres/bienvenueFlorent.png b/images/titres/bienvenueFlorent.png
new file mode 100644
index 0000000..aa88da9
Binary files /dev/null and b/images/titres/bienvenueFlorent.png differ
diff --git a/images/titres/bienvenuePierreO.png b/images/titres/bienvenuePierreO.png
new file mode 100644
index 0000000..c7ddc10
Binary files /dev/null and b/images/titres/bienvenuePierreO.png differ
diff --git a/images/titres/bienvenueRaphael.png b/images/titres/bienvenueRaphael.png
new file mode 100644
index 0000000..7f4cdaa
Binary files /dev/null and b/images/titres/bienvenueRaphael.png differ
diff --git a/images/titres/bienvenueSerge.png b/images/titres/bienvenueSerge.png
new file mode 100644
index 0000000..c06ef5a
Binary files /dev/null and b/images/titres/bienvenueSerge.png differ
diff --git a/images/titres/boitedenvoi.png b/images/titres/boitedenvoi.png
new file mode 100644
index 0000000..b05974e
Binary files /dev/null and b/images/titres/boitedenvoi.png differ
diff --git a/images/titres/boitedereception.png b/images/titres/boitedereception.png
new file mode 100644
index 0000000..e836281
Binary files /dev/null and b/images/titres/boitedereception.png differ
diff --git a/images/titres/brouillons.png b/images/titres/brouillons.png
new file mode 100644
index 0000000..340a5d1
Binary files /dev/null and b/images/titres/brouillons.png differ
diff --git a/images/titres/centrelabappli.png b/images/titres/centrelabappli.png
new file mode 100644
index 0000000..c2031da
Binary files /dev/null and b/images/titres/centrelabappli.png differ
diff --git a/images/titres/chat.png b/images/titres/chat.png
new file mode 100644
index 0000000..c3acf68
Binary files /dev/null and b/images/titres/chat.png differ
diff --git a/images/titres/cluedo.png b/images/titres/cluedo.png
new file mode 100644
index 0000000..de515d5
Binary files /dev/null and b/images/titres/cluedo.png differ
diff --git a/images/titres/commande.png b/images/titres/commande.png
new file mode 100644
index 0000000..83f4a0c
Binary files /dev/null and b/images/titres/commande.png differ
diff --git a/images/titres/contact.png b/images/titres/contact.png
new file mode 100644
index 0000000..b034f4c
Binary files /dev/null and b/images/titres/contact.png differ
diff --git a/images/titres/deutschland.png b/images/titres/deutschland.png
new file mode 100644
index 0000000..0363db0
Binary files /dev/null and b/images/titres/deutschland.png differ
diff --git a/images/titres/developpement.png b/images/titres/developpement.png
new file mode 100644
index 0000000..87bb5bd
Binary files /dev/null and b/images/titres/developpement.png differ
diff --git a/images/titres/developpements.png b/images/titres/developpements.png
new file mode 100644
index 0000000..ebd9fa6
Binary files /dev/null and b/images/titres/developpements.png differ
diff --git a/images/titres/download.png b/images/titres/download.png
new file mode 100644
index 0000000..3fac32e
Binary files /dev/null and b/images/titres/download.png differ
diff --git a/images/titres/downloads.png b/images/titres/downloads.png
new file mode 100644
index 0000000..32c1a73
Binary files /dev/null and b/images/titres/downloads.png differ
diff --git a/images/titres/drafts.png b/images/titres/drafts.png
new file mode 100644
index 0000000..76c6190
Binary files /dev/null and b/images/titres/drafts.png differ
diff --git a/images/titres/england.png b/images/titres/england.png
new file mode 100644
index 0000000..bd9fa67
Binary files /dev/null and b/images/titres/england.png differ
diff --git a/images/titres/etatsunis.png b/images/titres/etatsunis.png
new file mode 100644
index 0000000..b861ad3
Binary files /dev/null and b/images/titres/etatsunis.png differ
diff --git a/images/titres/feed.png b/images/titres/feed.png
new file mode 100644
index 0000000..820b35e
Binary files /dev/null and b/images/titres/feed.png differ
diff --git a/images/titres/fluxrss.png b/images/titres/fluxrss.png
new file mode 100644
index 0000000..551842c
Binary files /dev/null and b/images/titres/fluxrss.png differ
diff --git a/images/titres/foireauxquestions.png b/images/titres/foireauxquestions.png
new file mode 100644
index 0000000..78645b9
Binary files /dev/null and b/images/titres/foireauxquestions.png differ
diff --git a/images/titres/forum.png b/images/titres/forum.png
new file mode 100644
index 0000000..5eca481
Binary files /dev/null and b/images/titres/forum.png differ
diff --git a/images/titres/france.png b/images/titres/france.png
new file mode 100644
index 0000000..779b995
Binary files /dev/null and b/images/titres/france.png differ
diff --git a/images/titres/gerersamusique.png b/images/titres/gerersamusique.png
new file mode 100644
index 0000000..e92031c
Binary files /dev/null and b/images/titres/gerersamusique.png differ
diff --git a/images/titres/gerersesporteclefs.png b/images/titres/gerersesporteclefs.png
new file mode 100644
index 0000000..e7c6548
Binary files /dev/null and b/images/titres/gerersesporteclefs.png differ
diff --git a/images/titres/germany.png b/images/titres/germany.png
new file mode 100644
index 0000000..c5bf076
Binary files /dev/null and b/images/titres/germany.png differ
diff --git a/images/titres/histoire.png b/images/titres/histoire.png
new file mode 100644
index 0000000..3a55f66
Binary files /dev/null and b/images/titres/histoire.png differ
diff --git a/images/titres/history.png b/images/titres/history.png
new file mode 100644
index 0000000..9b3f4fd
Binary files /dev/null and b/images/titres/history.png differ
diff --git a/images/titres/home.png b/images/titres/home.png
new file mode 100644
index 0000000..0b5ca05
Binary files /dev/null and b/images/titres/home.png differ
diff --git a/images/titres/homepage.png b/images/titres/homepage.png
new file mode 100644
index 0000000..6fcda6d
Binary files /dev/null and b/images/titres/homepage.png differ
diff --git a/images/titres/identification.png b/images/titres/identification.png
new file mode 100644
index 0000000..b65a0b8
Binary files /dev/null and b/images/titres/identification.png differ
diff --git a/images/titres/inscription.png b/images/titres/inscription.png
new file mode 100644
index 0000000..57010e3
Binary files /dev/null and b/images/titres/inscription.png differ
diff --git a/images/titres/jeuxenligne.png b/images/titres/jeuxenligne.png
new file mode 100644
index 0000000..8042baf
Binary files /dev/null and b/images/titres/jeuxenligne.png differ
diff --git a/images/titres/journal.png b/images/titres/journal.png
new file mode 100644
index 0000000..5243314
Binary files /dev/null and b/images/titres/journal.png differ
diff --git a/images/titres/labapplicenter.png b/images/titres/labapplicenter.png
new file mode 100644
index 0000000..566aeb9
Binary files /dev/null and b/images/titres/labapplicenter.png differ
diff --git a/images/titres/lastdevelopments.png b/images/titres/lastdevelopments.png
new file mode 100644
index 0000000..b1a8d41
Binary files /dev/null and b/images/titres/lastdevelopments.png differ
diff --git a/images/titres/login.png b/images/titres/login.png
new file mode 100644
index 0000000..0dbe342
Binary files /dev/null and b/images/titres/login.png differ
diff --git a/images/titres/messagerie.png b/images/titres/messagerie.png
new file mode 100644
index 0000000..3eb0ec5
Binary files /dev/null and b/images/titres/messagerie.png differ
diff --git a/images/titres/news.png b/images/titres/news.png
new file mode 100644
index 0000000..72d43a4
Binary files /dev/null and b/images/titres/news.png differ
diff --git a/images/titres/newspaper.png b/images/titres/newspaper.png
new file mode 100644
index 0000000..ce949ac
Binary files /dev/null and b/images/titres/newspaper.png differ
diff --git a/images/titres/nouveautes.png b/images/titres/nouveautes.png
new file mode 100644
index 0000000..104fa29
Binary files /dev/null and b/images/titres/nouveautes.png differ
diff --git a/images/titres/onlinegames.png b/images/titres/onlinegames.png
new file mode 100644
index 0000000..95ad670
Binary files /dev/null and b/images/titres/onlinegames.png differ
diff --git a/images/titres/pagededemarrage.png b/images/titres/pagededemarrage.png
new file mode 100644
index 0000000..fccc788
Binary files /dev/null and b/images/titres/pagededemarrage.png differ
diff --git a/images/titres/paiement.png b/images/titres/paiement.png
new file mode 100644
index 0000000..b913860
Binary files /dev/null and b/images/titres/paiement.png differ
diff --git a/images/titres/parametres.png b/images/titres/parametres.png
new file mode 100644
index 0000000..f06f5a9
Binary files /dev/null and b/images/titres/parametres.png differ
diff --git a/images/titres/partage.png b/images/titres/partage.png
new file mode 100644
index 0000000..5e26e26
Binary files /dev/null and b/images/titres/partage.png differ
diff --git a/images/titres/partenaires.png b/images/titres/partenaires.png
new file mode 100644
index 0000000..795e10a
Binary files /dev/null and b/images/titres/partenaires.png differ
diff --git a/images/titres/pochettescd.png b/images/titres/pochettescd.png
new file mode 100644
index 0000000..df52b4e
Binary files /dev/null and b/images/titres/pochettescd.png differ
diff --git a/images/titres/pommail.png b/images/titres/pommail.png
new file mode 100644
index 0000000..0ad79f4
Binary files /dev/null and b/images/titres/pommail.png differ
diff --git a/images/titres/popmail.png b/images/titres/popmail.png
new file mode 100644
index 0000000..943e785
Binary files /dev/null and b/images/titres/popmail.png differ
diff --git a/images/titres/products.png b/images/titres/products.png
new file mode 100644
index 0000000..9326947
Binary files /dev/null and b/images/titres/products.png differ
diff --git a/images/titres/produits.png b/images/titres/produits.png
new file mode 100644
index 0000000..e268124
Binary files /dev/null and b/images/titres/produits.png differ
diff --git a/images/titres/professionnel.png b/images/titres/professionnel.png
new file mode 100644
index 0000000..1598d3a
Binary files /dev/null and b/images/titres/professionnel.png differ
diff --git a/images/titres/professionnels.png b/images/titres/professionnels.png
new file mode 100644
index 0000000..70abe4a
Binary files /dev/null and b/images/titres/professionnels.png differ
diff --git a/images/titres/proffessionnal.png b/images/titres/proffessionnal.png
new file mode 100644
index 0000000..677761c
Binary files /dev/null and b/images/titres/proffessionnal.png differ
diff --git a/images/titres/programmation.png b/images/titres/programmation.png
new file mode 100644
index 0000000..f649129
Binary files /dev/null and b/images/titres/programmation.png differ
diff --git a/images/titres/projects.png b/images/titres/projects.png
new file mode 100644
index 0000000..902580a
Binary files /dev/null and b/images/titres/projects.png differ
diff --git a/images/titres/projets.png b/images/titres/projets.png
new file mode 100644
index 0000000..88aac95
Binary files /dev/null and b/images/titres/projets.png differ
diff --git a/images/titres/realisations.png b/images/titres/realisations.png
new file mode 100644
index 0000000..f4d89fb
Binary files /dev/null and b/images/titres/realisations.png differ
diff --git a/images/titres/recherche.png b/images/titres/recherche.png
new file mode 100644
index 0000000..9b084c7
Binary files /dev/null and b/images/titres/recherche.png differ
diff --git a/images/titres/register.png b/images/titres/register.png
new file mode 100644
index 0000000..6010b08
Binary files /dev/null and b/images/titres/register.png differ
diff --git a/images/titres/reglages.png b/images/titres/reglages.png
new file mode 100644
index 0000000..6eb498d
Binary files /dev/null and b/images/titres/reglages.png differ
diff --git a/images/titres/royaumeuni.png b/images/titres/royaumeuni.png
new file mode 100644
index 0000000..8ee989b
Binary files /dev/null and b/images/titres/royaumeuni.png differ
diff --git a/images/titres/search.png b/images/titres/search.png
new file mode 100644
index 0000000..16fb143
Binary files /dev/null and b/images/titres/search.png differ
diff --git a/images/titres/selection.png b/images/titres/selection.png
new file mode 100644
index 0000000..85d404c
Binary files /dev/null and b/images/titres/selection.png differ
diff --git a/images/titres/selectiondumois.png b/images/titres/selectiondumois.png
new file mode 100644
index 0000000..2dd1bfa
Binary files /dev/null and b/images/titres/selectiondumois.png differ
diff --git a/images/titres/selectiondumoment.png b/images/titres/selectiondumoment.png
new file mode 100644
index 0000000..52bb8c5
Binary files /dev/null and b/images/titres/selectiondumoment.png differ
diff --git a/images/titres/services.png b/images/titres/services.png
new file mode 100644
index 0000000..9eb1838
Binary files /dev/null and b/images/titres/services.png differ
diff --git a/images/titres/settings.png b/images/titres/settings.png
new file mode 100644
index 0000000..922e94a
Binary files /dev/null and b/images/titres/settings.png differ
diff --git a/images/titres/subscription.png b/images/titres/subscription.png
new file mode 100644
index 0000000..d7ded22
Binary files /dev/null and b/images/titres/subscription.png differ
diff --git a/images/titres/sudoku.png b/images/titres/sudoku.png
new file mode 100644
index 0000000..5e64b91
Binary files /dev/null and b/images/titres/sudoku.png differ
diff --git a/images/titres/sudokumania.png b/images/titres/sudokumania.png
new file mode 100644
index 0000000..51a4994
Binary files /dev/null and b/images/titres/sudokumania.png differ
diff --git a/images/titres/support technique.png b/images/titres/support technique.png
new file mode 100644
index 0000000..3f84bf9
Binary files /dev/null and b/images/titres/support technique.png differ
diff --git a/images/titres/telechargement.png b/images/titres/telechargement.png
new file mode 100644
index 0000000..b53f5fd
Binary files /dev/null and b/images/titres/telechargement.png differ
diff --git a/images/titres/telechargements.png b/images/titres/telechargements.png
new file mode 100644
index 0000000..a7bcb35
Binary files /dev/null and b/images/titres/telechargements.png differ
diff --git a/images/titres/toptelechargements.png b/images/titres/toptelechargements.png
new file mode 100644
index 0000000..e2ef01c
Binary files /dev/null and b/images/titres/toptelechargements.png differ
diff --git a/images/titres/touchecoule.png b/images/titres/touchecoule.png
new file mode 100644
index 0000000..83dcc21
Binary files /dev/null and b/images/titres/touchecoule.png differ
diff --git a/images/titres/transfert.png b/images/titres/transfert.png
new file mode 100644
index 0000000..edc4d28
Binary files /dev/null and b/images/titres/transfert.png differ
diff --git a/images/titres/transferts.png b/images/titres/transferts.png
new file mode 100644
index 0000000..b09b8a6
Binary files /dev/null and b/images/titres/transferts.png differ
diff --git a/images/titres/upload.png b/images/titres/upload.png
new file mode 100644
index 0000000..a503d48
Binary files /dev/null and b/images/titres/upload.png differ
diff --git a/images/titres/users.png b/images/titres/users.png
new file mode 100644
index 0000000..2b8796a
Binary files /dev/null and b/images/titres/users.png differ
diff --git a/images/titres/utilisateurs.png b/images/titres/utilisateurs.png
new file mode 100644
index 0000000..3c46731
Binary files /dev/null and b/images/titres/utilisateurs.png differ
diff --git a/images/titres/warnings.png b/images/titres/warnings.png
new file mode 100644
index 0000000..17cecaa
Binary files /dev/null and b/images/titres/warnings.png differ
diff --git a/images/titres/welcome.png b/images/titres/welcome.png
new file mode 100644
index 0000000..2c4f19a
Binary files /dev/null and b/images/titres/welcome.png differ
diff --git a/images/titres/willkommen.png b/images/titres/willkommen.png
new file mode 100644
index 0000000..062225b
Binary files /dev/null and b/images/titres/willkommen.png differ
diff --git a/index.html b/index.html
new file mode 100644
index 0000000..48da792
--- /dev/null
+++ b/index.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html lang="fr">
+	<head>
+		<title>.: Pommultimédia 4 home :.</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+		<link rel="stylesheet" href="common.css" type="text/css" media="all">
+		<link rel="stylesheet" href="style.css" type="text/css" media="all" id="main_thm">
+		<link rel="shortcut icon" type="image/x-icon" href="favicon.ico">
+		<script type="text/javascript" src="js/prototype.js"></script>
+		<script type="text/javascript" src="js/src/effects.js"></script>
+		<script type="text/javascript" src="js/src/controls.js"></script>
+		<script type="text/javascript" src="js/app.js"></script>
+		<script type="text/javascript" src="js/pa4h.js"></script>
+	</head>
+	<body id="body">
+		<div id="btMenu"><span>Menu</span></div>
+		<ul id="menu" class="submenu"></ul>
+		<div id="logo">
+			<img src="images/etats/alpha.png" alt="Alpha" id="etatAvance" />
+			<img src="images/titres/bienvenue.png" alt="Bienvenue" id="titre" />
+		</div>
+		<div id="corps">
+			<h1>Bienvenue sur le serveur <em>Pommultimédia for home</em> !</h1>
+			<noscript>
+				<h2 style="color: #FF0000;"><em>Pommultimédia for home</em> nécessite que votre navigateur supporte le JavaScript !</h2>
+				<p style="color: #FF0000;">Si vous utilisez un navigateur supportant cette technologie, veuillez l'activer pour pouvoir accéder au contenu disponible.<br /><br />Si votre navigateur ne supporte pas cette technologie, <a href="http://www.mozilla-europe.org/">téléchargez gratuitement Firefox</a> !</p>
+			</noscript>
+		</div>
+		<div id="etat">Détection du JavaScript ...</div>
+	</body>
+</html>
\ No newline at end of file
diff --git a/js/ajax.js b/js/ajax.js
new file mode 100644
index 0000000..6da45b8
--- /dev/null
+++ b/js/ajax.js
@@ -0,0 +1,196 @@
+var URL_SERVEUR = 'http://hsc.escrime.local/'; //URL du serveur
+var last_position_bandeau = true; //Dernière position du bandeau définie par l'utilisateur
+var fade_objects = {loading: {statut: -1, timer: false}, secondBody: {statut: -1, timer: false}};
+var ajax_save_html = false;
+var ajax_save_json = false;
+var ajax_time_sauve = false;
+
+function loadPage(url)
+	{
+		$('secondBody').className = document.getElementsByTagName("body").item(0).className;
+		decomp = url.split("?");
+		start_fadeIn('loading');
+		start_fadeIn('secondBody');
+		if (decomp.length >= 2) {
+			new Ajax.Request(
+			 'ajax.php',
+			 {
+				method: 'post',
+				parameters: {url: decomp[1]},
+				onSuccess: onSuccess_ajax,
+				onFailure: function() { loadPage("ici?p=accueil"); alert('Une erreur s\'est produite lors du téléchargement de la page !'); }
+			 }
+			);
+			hideShownMenu();
+			return false;
+		}
+
+		ajax_time_sauve = setTimeout("rescue", 15000);
+	}
+
+function onSuccess_ajax(transport, json)
+	{
+		ajax_save_html = transport.responseText;
+		if (json != null)
+			ajax_save_json = json;
+		else
+			ajax_save_json = false
+		printPage();
+	}
+
+function printPage()
+	{
+		if (fade_objects["secondBody"]["statut"] != 1)
+			setTimeout("printPage()", 500);
+		else
+			{
+				$('contenu').innerHTML = ajax_save_html;
+				verifLinks();
+				if (ajax_save_json != false)
+					{
+						document.getElementsByTagName("body").item(0).className = ajax_save_json.class;
+						if (ajax_save_json.bandeau && (document.getElementById('submenuContainer').style.top == "221px" || document.getElementById('submenuContainer').style.top == "220px"))
+							ajax_hideBandeau();
+						else if (document.getElementById('submenuContainer').style.top == "51px" && last_position_bandeau && !ajax_save_json.bandeau)
+							ajax_showBandeau();
+
+						if (ajax_save_json.special == "resultats")
+							load_pageResultats();
+						else if (ajax_save_json.special == "maps")
+							{
+    							var map = new GMap2(document.getElementById('map'));
+								initMap();
+							}
+					}
+
+				start_fadeOut('loading');
+				start_fadeOut('secondBody');
+
+			}
+	}
+
+function verifLinks()
+	{
+		totalLiens = document.getElementsByTagName("a");
+		for (var i=0 ; i < totalLiens.length ; i++)
+			{
+			//TODO tester si le lien appartient au serveur, s'il n'y appartient pas, on laisse le lien en normal
+				if (!document.getElementsByTagName("a").item(i).onclick) {
+					document.getElementsByTagName("a").item(i).onclick = function onclick(event)
+						{
+							loadPage(this.href);
+							return false;
+						};
+				}
+			}
+	}
+
+function ajax_hideBandeau()
+	{
+		ajax_rec_hideBandeau(0);
+	}
+
+function ajax_rec_hideBandeau(pos)
+	{
+		pos = pos + 15;
+		if (pos > 169) pos = 170;
+		modifyBandeau(pos);
+		if (pos <= 169) setTimeout('ajax_rec_hideBandeau(' + pos + ')', 0);
+	}
+
+
+function ajax_showBandeau()
+	{
+		ajax_rec_showBandeau(170);
+	}
+
+function ajax_rec_showBandeau(pos)
+	{
+		pos = pos - 15;
+		if (pos < 0) pos = 0;
+		modifyBandeau(pos);
+		if (pos > 0) setTimeout('ajax_rec_showBandeau(' + pos + ')', 0);
+	}
+
+function load_pageResultats()
+	{
+		initAutoCompleter();
+		$('formResultats').onsubmit = function onsubmit(event)
+			{
+				$('secondBody').className = document.getElementsByTagName("body").item(0).className;
+				start_fadeIn('loading');
+				start_fadeIn('secondBody');
+				new Ajax.Request(
+			 'ajax.php',
+			 {
+				method: 'post',
+				parameters: {url: "p=resultats", nom: $('nomtireur').value},
+				onSuccess: onSuccess_ajax,
+				onFailure: function() { alert('Failure !'); }
+			 }
+			);
+			return false;
+			};
+	}
+
+function start_fadeIn(id)
+	{
+		if (fade_objects[id]["statut"] == 0)
+			fade_objects[id]["timer"] = setTimeout("start_fadeIn(" + id + ")", 500);
+		else if (fade_objects[id]["statut"] != 1)
+			{
+				changeOpac(0, id);
+				document.getElementById(id).style.display = "block";
+				fade_objects[id]["statut"] = 0;
+
+				fadeIn(0, id);
+			}
+	}
+
+function start_fadeOut(id)
+	{
+		if (fade_objects[id]["statut"] == 0)
+			fade_objects[id]["timer"] = setTimeout("start_fadeOut(" + id + ")", 500);
+		else if (fade_objects[id]["statut"] != -1)
+			{
+				changeOpac(100, id);
+				document.getElementById(id).style.display = "block";
+				fade_objects[id]["statut"] = 0;
+
+				fadeOut(10, id);
+			}
+	}
+
+function fadeIn(i, id)
+	{
+		i++;
+		changeOpac(i*10, id);
+
+		if (i < 10)
+			setTimeout("fadeIn(" + i + ", '" + id + "')", 30);
+		else
+			fade_objects[id]["statut"] = 1;
+	}
+
+function fadeOut(i, id)
+	{
+		i--;
+		changeOpac(i*10, id);
+
+		if (i > 0)
+			setTimeout("fadeOut(" + i + ", '" + id + "')", 30);
+		else
+			{
+				document.getElementById(id).style.display = "none";
+				fade_objects[id]["statut"] = -1;
+			}
+	}
+
+function changeOpac(opacity, id) {
+	if (opacity > 100) opacity = 100;
+    var object = document.getElementById(id).style;
+    object.opacity = (opacity / 100);
+    object.MozOpacity = (opacity / 100);
+    object.KhtmlOpacity = (opacity / 100);
+    object.filter = "alpha(opacity=" + opacity + ")";
+}
\ No newline at end of file
diff --git a/js/app.js b/js/app.js
new file mode 100644
index 0000000..5507557
--- /dev/null
+++ b/js/app.js
@@ -0,0 +1,247 @@
+function Application(XMLproperties)
+{
+    this.name = XMLproperties.getElementsByTagName("name")[0].firstChild.data;
+    this.dir = XMLproperties.getElementsByTagName("dir")[0].firstChild.data;
+
+    if (XMLproperties.getElementsByTagName("description")[0])
+		this.description = XMLproperties.getElementsByTagName("description")[0].firstChild.data;
+    else
+		this.description = null;
+
+    this.etatAvancement = XMLproperties.getElementsByTagName("etatAvancement")[0].firstChild.data;
+    this.version = XMLproperties.getElementsByTagName("version")[0].firstChild.data;
+
+    if (XMLproperties.getElementsByTagName("lang")[0])
+		this.lang = XMLproperties.getElementsByTagName("lang")[0].firstChild.data;
+    else
+		this.lang = null;
+
+    if (XMLproperties.getElementsByTagName("developpeur")[0])
+		this.developpeur = XMLproperties.getElementsByTagName("developpeur")[0].firstChild.data;
+    else
+		this.developpeur = null;
+    
+    if (XMLproperties.getElementsByTagName("corps")[0])
+		this.corps = XMLproperties.getElementsByTagName("corps")[0].firstChild.data;
+    else
+		this.corps = "corps";
+    
+    this.menu = null;
+}
+
+Application.prototype.getHomeElt = function()
+{
+    var app = document.createElement("dl");
+    app.className = "application " + this.etatAvancement;
+    
+    var appTitle = document.createElement("dt");
+    appTitle.innerHTML = this.name;
+    var appDescription = document.createElement("dd");
+    appDescription.innerHTML = this.description;
+    
+    app.observe('click', this.load.bind(this));
+    
+    app.appendChild(appTitle);
+    app.appendChild(appDescription);
+    
+    return app;
+}
+
+Application.prototype.load = function()
+{
+    printEtat(6);
+    var test = new Ajax.Request(
+	'ajax.php',
+	{
+	    method: 'get',
+	    parameters: {d: "display", a: this.dir},
+	    onSuccess: this.loaded.bind(this),
+	    onFailure: function() { printEtat(3); }
+	}
+    );
+}
+
+Application.prototype.loaded = function(transport, json)
+{
+    clearScreen();
+
+    var display = transport.responseXML.documentElement.getElementsByTagName("display")[0];
+    var property = transport.responseXML.documentElement.getElementsByTagName("property")[0];
+    
+    if (display.getElementsByTagName("titre")[0])
+		$('titre').src = imgTitres_dir + display.getElementsByTagName("titre")[0].firstChild.data;
+    
+    if (display.getElementsByTagName("css"))
+    {
+		//On supprime le style par défaut
+		if ($("main_thm"))
+		    document.getElementsByTagName('head')[0].removeChild($("main_thm"));
+		
+		var styles = display.getElementsByTagName("css");
+		for (i = styles.length - 1; i >= 0; i--)
+		{
+		    var css_file = document.createElement("link");
+		    css_file.type = 'text/css';
+		    css_file.rel = 'stylesheet';
+		    css_file.className = 'app';
+		    if (styles[i].getAttribute("media"))
+		    	css_file.media = styles[i].getAttribute("media");
+		    css_file.href = "applications/" + this.dir + "/"  + styles[i].firstChild.data;
+		    
+		    document.getElementsByTagName('head')[0].appendChild(css_file);
+		}
+    }
+    
+    if (display.getElementsByTagName("script"))
+    {
+		var scripts = display.getElementsByTagName("script");
+		for (i = scripts.length - 1; i >= 0; i--)
+		{
+		    js_file = document.createElement("script");
+		    js_file.type = 'text/javascript';
+		    js_file.className = 'app';
+		    js_file.src = "applications/" + this.dir + "/"  + scripts[i].firstChild.data;
+		    js_file.defer = true;
+		    
+		    document.getElementsByTagName('head')[0].appendChild(js_file);
+		}
+    }
+    
+    if (display.getElementsByTagName("background").length > 0)
+		$('body').style.backgroundImage = "url(" + display.getElementsByTagName("background")[0].firstChild.data + ")";
+    
+    var etat;
+    if (property.getElementsByTagName("etatAvancement").length > 0)
+		etat = property.getElementsByTagName("etatAvancement")[0].firstChild.data;
+    else
+		etat = "";
+    
+    if (etat == "En construction" || etat == "en construction" || etat == "enconstruction" || etat == "construction" || etat == "c")
+		$('etatAvance').src = "images/etats/construction.png";
+    else if (etat == "Alpha" || etat == "alpha" || etat == "a")
+		$('etatAvance').src = "images/etats/alpha.png";
+    else if (etat == "Beta" || etat == "beta" || etat == "Béta" || etat == "béta" || etat == "b")
+		$('etatAvance').src = "images/etats/beta.png";
+    else
+		$('etatAvance').src = "images/etats/final.png";
+
+    //On affiche la page
+    if (display.getElementsByTagName('body')[0])
+	$('corps').innerHTML = display.getElementsByTagName('body')[0].firstChild.data;
+    
+    //On prépare le menu
+    if (property.getElementsByTagName("menu").length > 0)
+		this.menu = eval(property.getElementsByTagName("menu")[0].firstChild.data);
+    this.genMenu(username != "");
+    
+    //On lance l'application
+    if (display.getElementsByTagName("js")[0])
+    {
+		var scripts = display.getElementsByTagName("js");
+		for (i = scripts.length - 1; i >= 0; i--)
+		    eval(scripts[i].firstChild.data);
+		
+		runApplication(property, display, json);
+    }
+    else
+		setTimeout("runApplication" + this.dir + "(" + property + ", " + display + ", " + json + ");", 1);
+//		setTimeout("alert('test')", 0);
+    
+    printEtat(0);
+}
+
+Application.prototype.genMenu = function(online)
+{
+    //On supprime tous les éléments du menu actuel
+    clearNode($('menu'));
+
+    //On ajoute le titre
+    var item = document.createElement("li");
+    item.innerHTML = this.name;
+    item.id = "nameApp";
+    $('menu').appendChild(item);
+
+    //Lien vers la page d'accueil
+    var item = document.createElement("li");
+    item.onclick = function() { hideShownMenu(); firstLoad(); };
+    item.innerHTML = "Accueil";
+    if (online)
+		item.className = "item";
+    else
+		item.className = "item hr";
+    $('menu').appendChild(item);
+
+    //Lien de déconnexion
+    if (online)
+    {
+		var item = document.createElement("li");
+		item.onclick = function() { hideShownMenu(); deconnexion(); };
+		item.innerHTML = "Déconnexion";
+		item.className = "item hr";
+		$('menu').appendChild(item);
+    }
+
+    //On insère les éléments de l'app
+    if (this.menu)
+    {
+		for (var i = this.menu.length - 1; i >= 0; i--)
+		    addMenuItem(this.menu[i]["text"], this.menu[i]["eventClick"]);
+    }
+
+    //On insère le about app
+    var item = document.createElement("li");
+    item.observe('click', this.about.bind(this));
+    item.innerHTML = "À propos de ...";
+    item.className = "item hr";
+    $('menu').appendChild(item);    
+
+    //Lien vers la page à propos du site
+    var item = document.createElement("li");
+    item.onclick = function() { hideShownMenu(); loadPage('aproposdusite'); };
+    item.innerHTML = "À propos du site";
+    item.className = "item";
+    $('menu').appendChild(item);
+}
+
+Application.prototype.about = function()
+{
+    hideShownMenu();
+    $(this.corps).innerHTML = "";
+
+    //Texte correspondant à l'état de l'app
+    var txtEtat = "";
+    if (this.etatAvancement == "En construction" || this.etatAvancement == "en construction" || this.etatAvancement == "enconstruction" || this.etatAvancement == "construction" || this.etatAvancement == "c")
+		txtEtat = "En construction";
+    else if (this.etatAvancement == "Béta" || this.etatAvancement == "Beta" || this.etatAvancement == "beta" || this.etatAvancement == "béta" || this.etatAvancement == "b")
+		txtEtat = "Béta";
+    else if (this.etatAvancement == "Alpha" || this.etatAvancement == "alpha" || this.etatAvancement == "a")
+		txtEtat = "Alpha";
+
+    var titre = document.createElement("h2");
+    titre.innerHTML = "A propos de " + this.name + " pour Pommultimedia for Home";
+    $(this.corps).appendChild(titre);
+    titre = document.createElement("h3");
+    titre.innerHTML = this.name + "<br />Version " + this.version + " " + txtEtat;
+    $(this.corps).appendChild(titre);
+    if (this.description != null)
+    {
+		titre = document.createElement("h4");
+		titre.innerHTML = "<ins>Description :</ins> " + this.description;
+		$(this.corps).appendChild(titre);
+    }
+    if (this.lang != null)
+    {
+		titre = document.createElement("h4");
+		titre.innerHTML = "<ins>Langue :</ins> " + this.lang;
+		$(this.corps).appendChild(titre);
+    }
+    titre = document.createElement("h4");
+    titre.innerHTML = "<ins>Nom court :</ins> " + this.dir;
+    $(this.corps).appendChild(titre);
+    if (this.developpeur != null)
+    {
+		titre = document.createElement("h4");
+		titre.innerHTML = "<ins>Développeur :</ins> " + this.developpeur;
+		$(this.corps).appendChild(titre);
+    }
+}
\ No newline at end of file
diff --git a/js/pa4h.js b/js/pa4h.js
new file mode 100644
index 0000000..bca7954
--- /dev/null
+++ b/js/pa4h.js
@@ -0,0 +1,298 @@
+var imgTitres_dir = "images/titres/";
+var username = "";
+var apps = Array();
+
+function clearNode(node)
+{
+	if (node.hasChildNodes())
+	{
+	    while (node.childNodes.length >= 1)
+	        node.removeChild(node.firstChild);
+	}
+}
+
+window.onload = function()
+{
+	printEtat(1);
+	clearScreen();
+	firstLoad();
+	
+	document.getElementById('btMenu').onclick = function(){
+		showMenu();
+	}
+	document.getElementById('btMenu').onmouseout = function(){
+		setHideMenuTimeout();
+	}
+	document.getElementById('menu').onmouseover = function(){
+		showMenu();
+	}
+	document.getElementById('menu').onmouseout = function(){
+		setHideMenuTimeout();
+	}
+}
+
+function firstLoad()
+{
+	new Ajax.Request(
+		'ajax.php',
+		{
+			onSuccess: function(transport, json)
+			{
+				printEtat(2);
+				if (json.statut == 1)
+				{
+					username = json.username;
+					
+					if (window.sessionStorage && window.sessionStorage.username == username)
+					{
+						//On restaure l'application en cours
+						
+					}
+					else
+						page_accueil();
+				}
+				else
+					loadPage("connexion");
+				printEtat(0);
+			},
+			onFailure: function() { printEtat(3); }
+		}
+	);
+}
+
+function deconnexion()
+{
+	printEtat(1);
+	clearScreen();
+	new Ajax.Request(
+		'ajax.php',
+		{
+			method: 'get',
+			parameters: {d: "logout"},
+			onSuccess: function(transport, json) { firstLoad(); },
+			onFailure: function() { printEtat(3); }
+		}
+	);
+}
+
+function printEtat(id)
+{
+	if (id == 0)
+		$('etat').innerHTML = "";
+	else if (id == 1)
+		$('etat').innerHTML = "Connexion au serveur en cours ...";
+	else if (id == 2)
+		$('etat').innerHTML = "Connexion établie, affichage de la page ...";
+	else if (id == 3)
+		$('etat').innerHTML = "Impossible de contacter le serveur, délais d'attente expiré !";
+	else if (id == 4)
+		$('etat').innerHTML = "Vérification des informations en cours ...";
+	else if (id == 5)
+		$('etat').innerHTML = "Récupération de la liste des applications ...";
+	else if (id == 6)
+		$('etat').innerHTML = "Chargement de l'application ...";
+	else
+		$('etat').innerHTML = "État inconnu : #" + id;
+}
+
+function clearScreen()
+{
+	if ($('logo').style.display != "block")
+		$('logo').style.display = "block";
+
+	genMenu(username != "");
+	$('corps').innerHTML = "";
+
+	$('etatAvance').src = "images/etats/alpha.png";
+	
+	var head = document.getElementsByTagName("head")[0];
+	//On décharge les fichiers JavaScript non standards
+	if (head.getElementsByTagName("script")[4])
+	{
+		var scripts = head.getElementsByTagName("script");
+		for (i = scripts.length - 1; i >= 0; i--)
+		{
+			if (scripts[i].className == "app")
+				head.removeChild(scripts[i]);
+		}
+	}
+	
+	//Idem avec les fichiers CSS
+	if (head.getElementsByTagName("link")[3])
+	{
+		var links = head.getElementsByTagName("link");
+		for (i = links.length - 1; i >= 0; i--)
+		{
+			if (links[i].className == "app")
+				head.removeChild(links[i]);
+		}
+	}
+	
+	//On ajoute le thème par défaut
+	if (!$("main_thm"))
+	{
+		var css_file = document.createElement("link");
+		css_file.type = 'text/css';
+		css_file.rel = 'stylesheet';
+		css_file.media = 'all';
+		css_file.id = 'main_thm';
+		css_file.href = "style.css";
+		document.getElementsByTagName('head')[0].appendChild(css_file);
+	}
+}
+
+function genMenu(online)
+{
+    //On supprime tous les éléments du menu
+    clearNode($('menu'));
+    
+    //On ajoute le titre
+    var item = document.createElement("li");
+    item.innerHTML = "PA4home";
+    item.id = "nameApp";
+    $('menu').appendChild(item);
+	
+    //Lien vers la page d'accueil
+    item = document.createElement("li");
+    item.onclick = function() { hideShownMenu(); firstLoad(); };
+    item.innerHTML = "Accueil";
+    if (online)
+		item.className = "item";
+    else
+		item.className = "item hr";
+    $('menu').appendChild(item);
+	
+    //Lien de déconnexion
+    if (online)
+    {
+		item = document.createElement("li");
+		item.onclick = function() { hideShownMenu(); deconnexion(); };
+		item.innerHTML = "Déconnexion";
+		item.className = "item hr";
+		$('menu').appendChild(item);
+    }
+	
+    //Lien vers la page à propos du site
+    item = document.createElement("li");
+    item.onclick = function() { hideShownMenu(); loadPage('aproposdusite'); };
+    item.innerHTML = "À propos du site";
+    item.className = "item";
+    $('menu').appendChild(item);
+}
+
+function addMenuItem(text, iven)
+{
+    var item = document.createElement("li");
+    item.onclick = function(e) {
+		hideShownMenu();
+		eval(iven);
+    };
+    item.innerHTML = text;
+    item.className = "item";
+    $('menu').appendChild(item);
+}
+
+/**************************************
+ * Partie contenant les pages du site *
+ **************************************/
+
+function loadPage(nom)
+{
+	clearScreen();
+	printEtat(1);
+	new Ajax.Request(
+		'ajax.php',
+			{
+			method: 'get',
+			parameters: {d: "page", p: nom},
+			onSuccess: function(transport, json)
+				{
+					printEtat(2);
+					$('titre').src = imgTitres_dir + transport.responseXML.documentElement.getElementsByTagName("titre")[0].firstChild.data;
+					$('corps').innerHTML = transport.responseXML.documentElement.getElementsByTagName("body")[0].firstChild.data;
+					
+					if (transport.responseXML.documentElement.getElementsByTagName("js"))
+					{
+						var scripts = transport.responseXML.documentElement.getElementsByTagName("js");
+						var nbScripts = scripts.length;
+						for (i = 0; i < nbScripts; i++)
+							eval(scripts[i].firstChild.data);
+					}
+					
+					printEtat(0);
+				},
+			onFailure: function() { printEtat(3); }
+		}
+	);
+}
+
+function page_accueil()
+{
+	clearScreen();
+	printEtat(5);
+
+	if (username == "root" || username == "pierre-o")
+		$('titre').src = imgTitres_dir + "bienvenuePierreO.png";
+	else if (username == "sergcaen" || username == "serge")
+		$('titre').src = imgTitres_dir + "bienvenueSerge.png";
+	else if (username == "christine" || username == "chriscaen")
+		$('titre').src = imgTitres_dir + "bienvenueChristine.png";
+	else if (username == "raphael" || username == "minou")
+		$('titre').src = imgTitres_dir + "bienvenueRaphael.png";
+	else if (username == "florence" || username == "floflo")
+		$('titre').src = imgTitres_dir + "bienvenueFlorence.png";
+	else if (username == "florent")
+		$('titre').src = imgTitres_dir + "bienvenueFlorent.png";
+	else if (username == "alisson13081991" || username == "alisson13081991@hotmail.fr")
+		$('titre').src = imgTitres_dir + "bienvenueAlisson.png";
+	else
+		$('titre').src = imgTitres_dir + "bienvenue.png";
+
+	new Ajax.Request(
+ 		'ajax.php',
+ 			{
+				method: 'get',
+				parameters: {d: "accueil"},
+				onSuccess: function(transport, json)
+					{
+						var applications = transport.responseXML.documentElement.getElementsByTagName("application");
+						for (i = applications.length - 1; i >= 0; i--)
+						{
+							var app = new Application(applications[i]);
+							apps.pop(app);
+
+							var elt = app.getHomeElt();
+							
+							$('corps').appendChild(elt);
+						}
+						printEtat(0);
+					},
+				onFailure: function() { printEtat(3); }
+			}
+		);
+}
+
+function runApplication(property, display, json){
+    alert("Aucun lancement à faire !");
+}
+
+//Menu
+var menu_timeout;
+
+function showMenu()
+{
+	if (menu_timeout)
+		clearTimeout(menu_timeout);
+
+	$('menu').style.display = "block";
+}
+
+function setHideMenuTimeout()
+{
+	menu_timeout = setTimeout('hideShownMenu()', 500);
+}
+
+function hideShownMenu()
+{
+	$('menu').style.display = "none";
+}
\ No newline at end of file
diff --git a/js/prototype.js b/js/prototype.js
new file mode 100644
index 0000000..474b223
--- /dev/null
+++ b/js/prototype.js
@@ -0,0 +1,6082 @@
+/*  Prototype JavaScript framework, version 1.7
+ *  (c) 2005-2010 Sam Stephenson
+ *
+ *  Prototype is freely distributable under the terms of an MIT-style license.
+ *  For details, see the Prototype web site: http://www.prototypejs.org/
+ *
+ *--------------------------------------------------------------------------*/
+
+var Prototype = {
+
+  Version: '1.7',
+
+  Browser: (function(){
+    var ua = navigator.userAgent;
+    var isOpera = Object.prototype.toString.call(window.opera) == '[object Opera]';
+    return {
+      IE:             !!window.attachEvent && !isOpera,
+      Opera:          isOpera,
+      WebKit:         ua.indexOf('AppleWebKit/') > -1,
+      Gecko:          ua.indexOf('Gecko') > -1 && ua.indexOf('KHTML') === -1,
+      MobileSafari:   /Apple.*Mobile/.test(ua)
+    }
+  })(),
+
+  BrowserFeatures: {
+    XPath: !!document.evaluate,
+
+    SelectorsAPI: !!document.querySelector,
+
+    ElementExtensions: (function() {
+      var constructor = window.Element || window.HTMLElement;
+      return !!(constructor && constructor.prototype);
+    })(),
+    SpecificElementExtensions: (function() {
+      if (typeof window.HTMLDivElement !== 'undefined')
+        return true;
+
+      var div = document.createElement('div'),
+          form = document.createElement('form'),
+          isSupported = false;
+
+      if (div['__proto__'] && (div['__proto__'] !== form['__proto__'])) {
+        isSupported = true;
+      }
+
+      div = form = null;
+
+      return isSupported;
+    })()
+  },
+
+  ScriptFragment: '<script[^>]*>([\\S\\s]*?)<\/script>',
+  JSONFilter: /^\/\*-secure-([\s\S]*)\*\/\s*$/,
+
+  emptyFunction: function() { },
+
+  K: function(x) { return x }
+};
+
+if (Prototype.Browser.MobileSafari)
+  Prototype.BrowserFeatures.SpecificElementExtensions = false;
+
+
+var Abstract = { };
+
+
+var Try = {
+  these: function() {
+    var returnValue;
+
+    for (var i = 0, length = arguments.length; i < length; i++) {
+      var lambda = arguments[i];
+      try {
+        returnValue = lambda();
+        break;
+      } catch (e) { }
+    }
+
+    return returnValue;
+  }
+};
+
+/* Based on Alex Arnell's inheritance implementation. */
+
+var Class = (function() {
+
+  var IS_DONTENUM_BUGGY = (function(){
+    for (var p in { toString: 1 }) {
+      if (p === 'toString') return false;
+    }
+    return true;
+  })();
+
+  function subclass() {};
+  function create() {
+    var parent = null, properties = $A(arguments);
+    if (Object.isFunction(properties[0]))
+      parent = properties.shift();
+
+    function klass() {
+      this.initialize.apply(this, arguments);
+    }
+
+    Object.extend(klass, Class.Methods);
+    klass.superclass = parent;
+    klass.subclasses = [];
+
+    if (parent) {
+      subclass.prototype = parent.prototype;
+      klass.prototype = new subclass;
+      parent.subclasses.push(klass);
+    }
+
+    for (var i = 0, length = properties.length; i < length; i++)
+      klass.addMethods(properties[i]);
+
+    if (!klass.prototype.initialize)
+      klass.prototype.initialize = Prototype.emptyFunction;
+
+    klass.prototype.constructor = klass;
+    return klass;
+  }
+
+  function addMethods(source) {
+    var ancestor   = this.superclass && this.superclass.prototype,
+        properties = Object.keys(source);
+
+    if (IS_DONTENUM_BUGGY) {
+      if (source.toString != Object.prototype.toString)
+        properties.push("toString");
+      if (source.valueOf != Object.prototype.valueOf)
+        properties.push("valueOf");
+    }
+
+    for (var i = 0, length = properties.length; i < length; i++) {
+      var property = properties[i], value = source[property];
+      if (ancestor && Object.isFunction(value) &&
+          value.argumentNames()[0] == "$super") {
+        var method = value;
+        value = (function(m) {
+          return function() { return ancestor[m].apply(this, arguments); };
+        })(property).wrap(method);
+
+        value.valueOf = method.valueOf.bind(method);
+        value.toString = method.toString.bind(method);
+      }
+      this.prototype[property] = value;
+    }
+
+    return this;
+  }
+
+  return {
+    create: create,
+    Methods: {
+      addMethods: addMethods
+    }
+  };
+})();
+(function() {
+
+  var _toString = Object.prototype.toString,
+      NULL_TYPE = 'Null',
+      UNDEFINED_TYPE = 'Undefined',
+      BOOLEAN_TYPE = 'Boolean',
+      NUMBER_TYPE = 'Number',
+      STRING_TYPE = 'String',
+      OBJECT_TYPE = 'Object',
+      FUNCTION_CLASS = '[object Function]',
+      BOOLEAN_CLASS = '[object Boolean]',
+      NUMBER_CLASS = '[object Number]',
+      STRING_CLASS = '[object String]',
+      ARRAY_CLASS = '[object Array]',
+      DATE_CLASS = '[object Date]',
+      NATIVE_JSON_STRINGIFY_SUPPORT = window.JSON &&
+        typeof JSON.stringify === 'function' &&
+        JSON.stringify(0) === '0' &&
+        typeof JSON.stringify(Prototype.K) === 'undefined';
+
+  function Type(o) {
+    switch(o) {
+      case null: return NULL_TYPE;
+      case (void 0): return UNDEFINED_TYPE;
+    }
+    var type = typeof o;
+    switch(type) {
+      case 'boolean': return BOOLEAN_TYPE;
+      case 'number':  return NUMBER_TYPE;
+      case 'string':  return STRING_TYPE;
+    }
+    return OBJECT_TYPE;
+  }
+
+  function extend(destination, source) {
+    for (var property in source)
+      destination[property] = source[property];
+    return destination;
+  }
+
+  function inspect(object) {
+    try {
+      if (isUndefined(object)) return 'undefined';
+      if (object === null) return 'null';
+      return object.inspect ? object.inspect() : String(object);
+    } catch (e) {
+      if (e instanceof RangeError) return '...';
+      throw e;
+    }
+  }
+
+  function toJSON(value) {
+    return Str('', { '': value }, []);
+  }
+
+  function Str(key, holder, stack) {
+    var value = holder[key],
+        type = typeof value;
+
+    if (Type(value) === OBJECT_TYPE && typeof value.toJSON === 'function') {
+      value = value.toJSON(key);
+    }
+
+    var _class = _toString.call(value);
+
+    switch (_class) {
+      case NUMBER_CLASS:
+      case BOOLEAN_CLASS:
+      case STRING_CLASS:
+        value = value.valueOf();
+    }
+
+    switch (value) {
+      case null: return 'null';
+      case true: return 'true';
+      case false: return 'false';
+    }
+
+    type = typeof value;
+    switch (type) {
+      case 'string':
+        return value.inspect(true);
+      case 'number':
+        return isFinite(value) ? String(value) : 'null';
+      case 'object':
+
+        for (var i = 0, length = stack.length; i < length; i++) {
+          if (stack[i] === value) { throw new TypeError(); }
+        }
+        stack.push(value);
+
+        var partial = [];
+        if (_class === ARRAY_CLASS) {
+          for (var i = 0, length = value.length; i < length; i++) {
+            var str = Str(i, value, stack);
+            partial.push(typeof str === 'undefined' ? 'null' : str);
+          }
+          partial = '[' + partial.join(',') + ']';
+        } else {
+          var keys = Object.keys(value);
+          for (var i = 0, length = keys.length; i < length; i++) {
+            var key = keys[i], str = Str(key, value, stack);
+            if (typeof str !== "undefined") {
+               partial.push(key.inspect(true)+ ':' + str);
+             }
+          }
+          partial = '{' + partial.join(',') + '}';
+        }
+        stack.pop();
+        return partial;
+    }
+  }
+
+  function stringify(object) {
+    return JSON.stringify(object);
+  }
+
+  function toQueryString(object) {
+    return $H(object).toQueryString();
+  }
+
+  function toHTML(object) {
+    return object && object.toHTML ? object.toHTML() : String.interpret(object);
+  }
+
+  function keys(object) {
+    if (Type(object) !== OBJECT_TYPE) { throw new TypeError(); }
+    var results = [];
+    for (var property in object) {
+      if (object.hasOwnProperty(property)) {
+        results.push(property);
+      }
+    }
+    return results;
+  }
+
+  function values(object) {
+    var results = [];
+    for (var property in object)
+      results.push(object[property]);
+    return results;
+  }
+
+  function clone(object) {
+    return extend({ }, object);
+  }
+
+  function isElement(object) {
+    return !!(object && object.nodeType == 1);
+  }
+
+  function isArray(object) {
+    return _toString.call(object) === ARRAY_CLASS;
+  }
+
+  var hasNativeIsArray = (typeof Array.isArray == 'function')
+    && Array.isArray([]) && !Array.isArray({});
+
+  if (hasNativeIsArray) {
+    isArray = Array.isArray;
+  }
+
+  function isHash(object) {
+    return object instanceof Hash;
+  }
+
+  function isFunction(object) {
+    return _toString.call(object) === FUNCTION_CLASS;
+  }
+
+  function isString(object) {
+    return _toString.call(object) === STRING_CLASS;
+  }
+
+  function isNumber(object) {
+    return _toString.call(object) === NUMBER_CLASS;
+  }
+
+  function isDate(object) {
+    return _toString.call(object) === DATE_CLASS;
+  }
+
+  function isUndefined(object) {
+    return typeof object === "undefined";
+  }
+
+  extend(Object, {
+    extend:        extend,
+    inspect:       inspect,
+    toJSON:        NATIVE_JSON_STRINGIFY_SUPPORT ? stringify : toJSON,
+    toQueryString: toQueryString,
+    toHTML:        toHTML,
+    keys:          Object.keys || keys,
+    values:        values,
+    clone:         clone,
+    isElement:     isElement,
+    isArray:       isArray,
+    isHash:        isHash,
+    isFunction:    isFunction,
+    isString:      isString,
+    isNumber:      isNumber,
+    isDate:        isDate,
+    isUndefined:   isUndefined
+  });
+})();
+Object.extend(Function.prototype, (function() {
+  var slice = Array.prototype.slice;
+
+  function update(array, args) {
+    var arrayLength = array.length, length = args.length;
+    while (length--) array[arrayLength + length] = args[length];
+    return array;
+  }
+
+  function merge(array, args) {
+    array = slice.call(array, 0);
+    return update(array, args);
+  }
+
+  function argumentNames() {
+    var names = this.toString().match(/^[\s\(]*function[^(]*\(([^)]*)\)/)[1]
+      .replace(/\/\/.*?[\r\n]|\/\*(?:.|[\r\n])*?\*\//g, '')
+      .replace(/\s+/g, '').split(',');
+    return names.length == 1 && !names[0] ? [] : names;
+  }
+
+  function bind(context) {
+    if (arguments.length < 2 && Object.isUndefined(arguments[0])) return this;
+    var __method = this, args = slice.call(arguments, 1);
+    return function() {
+      var a = merge(args, arguments);
+      return __method.apply(context, a);
+    }
+  }
+
+  function bindAsEventListener(context) {
+    var __method = this, args = slice.call(arguments, 1);
+    return function(event) {
+      var a = update([event || window.event], args);
+      return __method.apply(context, a);
+    }
+  }
+
+  function curry() {
+    if (!arguments.length) return this;
+    var __method = this, args = slice.call(arguments, 0);
+    return function() {
+      var a = merge(args, arguments);
+      return __method.apply(this, a);
+    }
+  }
+
+  function delay(timeout) {
+    var __method = this, args = slice.call(arguments, 1);
+    timeout = timeout * 1000;
+    return window.setTimeout(function() {
+      return __method.apply(__method, args);
+    }, timeout);
+  }
+
+  function defer() {
+    var args = update([0.01], arguments);
+    return this.delay.apply(this, args);
+  }
+
+  function wrap(wrapper) {
+    var __method = this;
+    return function() {
+      var a = update([__method.bind(this)], arguments);
+      return wrapper.apply(this, a);
+    }
+  }
+
+  function methodize() {
+    if (this._methodized) return this._methodized;
+    var __method = this;
+    return this._methodized = function() {
+      var a = update([this], arguments);
+      return __method.apply(null, a);
+    };
+  }
+
+  return {
+    argumentNames:       argumentNames,
+    bind:                bind,
+    bindAsEventListener: bindAsEventListener,
+    curry:               curry,
+    delay:               delay,
+    defer:               defer,
+    wrap:                wrap,
+    methodize:           methodize
+  }
+})());
+
+
+
+(function(proto) {
+
+
+  function toISOString() {
+    return this.getUTCFullYear() + '-' +
+      (this.getUTCMonth() + 1).toPaddedString(2) + '-' +
+      this.getUTCDate().toPaddedString(2) + 'T' +
+      this.getUTCHours().toPaddedString(2) + ':' +
+      this.getUTCMinutes().toPaddedString(2) + ':' +
+      this.getUTCSeconds().toPaddedString(2) + 'Z';
+  }
+
+
+  function toJSON() {
+    return this.toISOString();
+  }
+
+  if (!proto.toISOString) proto.toISOString = toISOString;
+  if (!proto.toJSON) proto.toJSON = toJSON;
+
+})(Date.prototype);
+
+
+RegExp.prototype.match = RegExp.prototype.test;
+
+RegExp.escape = function(str) {
+  return String(str).replace(/([.*+?^=!:${}()|[\]\/\\])/g, '\\$1');
+};
+var PeriodicalExecuter = Class.create({
+  initialize: function(callback, frequency) {
+    this.callback = callback;
+    this.frequency = frequency;
+    this.currentlyExecuting = false;
+
+    this.registerCallback();
+  },
+
+  registerCallback: function() {
+    this.timer = setInterval(this.onTimerEvent.bind(this), this.frequency * 1000);
+  },
+
+  execute: function() {
+    this.callback(this);
+  },
+
+  stop: function() {
+    if (!this.timer) return;
+    clearInterval(this.timer);
+    this.timer = null;
+  },
+
+  onTimerEvent: function() {
+    if (!this.currentlyExecuting) {
+      try {
+        this.currentlyExecuting = true;
+        this.execute();
+        this.currentlyExecuting = false;
+      } catch(e) {
+        this.currentlyExecuting = false;
+        throw e;
+      }
+    }
+  }
+});
+Object.extend(String, {
+  interpret: function(value) {
+    return value == null ? '' : String(value);
+  },
+  specialChar: {
+    '\b': '\\b',
+    '\t': '\\t',
+    '\n': '\\n',
+    '\f': '\\f',
+    '\r': '\\r',
+    '\\': '\\\\'
+  }
+});
+
+Object.extend(String.prototype, (function() {
+  var NATIVE_JSON_PARSE_SUPPORT = window.JSON &&
+    typeof JSON.parse === 'function' &&
+    JSON.parse('{"test": true}').test;
+
+  function prepareReplacement(replacement) {
+    if (Object.isFunction(replacement)) return replacement;
+    var template = new Template(replacement);
+    return function(match) { return template.evaluate(match) };
+  }
+
+  function gsub(pattern, replacement) {
+    var result = '', source = this, match;
+    replacement = prepareReplacement(replacement);
+
+    if (Object.isString(pattern))
+      pattern = RegExp.escape(pattern);
+
+    if (!(pattern.length || pattern.source)) {
+      replacement = replacement('');
+      return replacement + source.split('').join(replacement) + replacement;
+    }
+
+    while (source.length > 0) {
+      if (match = source.match(pattern)) {
+        result += source.slice(0, match.index);
+        result += String.interpret(replacement(match));
+        source  = source.slice(match.index + match[0].length);
+      } else {
+        result += source, source = '';
+      }
+    }
+    return result;
+  }
+
+  function sub(pattern, replacement, count) {
+    replacement = prepareReplacement(replacement);
+    count = Object.isUndefined(count) ? 1 : count;
+
+    return this.gsub(pattern, function(match) {
+      if (--count < 0) return match[0];
+      return replacement(match);
+    });
+  }
+
+  function scan(pattern, iterator) {
+    this.gsub(pattern, iterator);
+    return String(this);
+  }
+
+  function truncate(length, truncation) {
+    length = length || 30;
+    truncation = Object.isUndefined(truncation) ? '...' : truncation;
+    return this.length > length ?
+      this.slice(0, length - truncation.length) + truncation : String(this);
+  }
+
+  function strip() {
+    return this.replace(/^\s+/, '').replace(/\s+$/, '');
+  }
+
+  function stripTags() {
+    return this.replace(/<\w+(\s+("[^"]*"|'[^']*'|[^>])+)?>|<\/\w+>/gi, '');
+  }
+
+  function stripScripts() {
+    return this.replace(new RegExp(Prototype.ScriptFragment, 'img'), '');
+  }
+
+  function extractScripts() {
+    var matchAll = new RegExp(Prototype.ScriptFragment, 'img'),
+        matchOne = new RegExp(Prototype.ScriptFragment, 'im');
+    return (this.match(matchAll) || []).map(function(scriptTag) {
+      return (scriptTag.match(matchOne) || ['', ''])[1];
+    });
+  }
+
+  function evalScripts() {
+    return this.extractScripts().map(function(script) { return eval(script) });
+  }
+
+  function escapeHTML() {
+    return this.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;');
+  }
+
+  function unescapeHTML() {
+    return this.stripTags().replace(/&lt;/g,'<').replace(/&gt;/g,'>').replace(/&amp;/g,'&');
+  }
+
+
+  function toQueryParams(separator) {
+    var match = this.strip().match(/([^?#]*)(#.*)?$/);
+    if (!match) return { };
+
+    return match[1].split(separator || '&').inject({ }, function(hash, pair) {
+      if ((pair = pair.split('='))[0]) {
+        var key = decodeURIComponent(pair.shift()),
+            value = pair.length > 1 ? pair.join('=') : pair[0];
+
+        if (value != undefined) value = decodeURIComponent(value);
+
+        if (key in hash) {
+          if (!Object.isArray(hash[key])) hash[key] = [hash[key]];
+          hash[key].push(value);
+        }
+        else hash[key] = value;
+      }
+      return hash;
+    });
+  }
+
+  function toArray() {
+    return this.split('');
+  }
+
+  function succ() {
+    return this.slice(0, this.length - 1) +
+      String.fromCharCode(this.charCodeAt(this.length - 1) + 1);
+  }
+
+  function times(count) {
+    return count < 1 ? '' : new Array(count + 1).join(this);
+  }
+
+  function camelize() {
+    return this.replace(/-+(.)?/g, function(match, chr) {
+      return chr ? chr.toUpperCase() : '';
+    });
+  }
+
+  function capitalize() {
+    return this.charAt(0).toUpperCase() + this.substring(1).toLowerCase();
+  }
+
+  function underscore() {
+    return this.replace(/::/g, '/')
+               .replace(/([A-Z]+)([A-Z][a-z])/g, '$1_$2')
+               .replace(/([a-z\d])([A-Z])/g, '$1_$2')
+               .replace(/-/g, '_')
+               .toLowerCase();
+  }
+
+  function dasherize() {
+    return this.replace(/_/g, '-');
+  }
+
+  function inspect(useDoubleQuotes) {
+    var escapedString = this.replace(/[\x00-\x1f\\]/g, function(character) {
+      if (character in String.specialChar) {
+        return String.specialChar[character];
+      }
+      return '\\u00' + character.charCodeAt().toPaddedString(2, 16);
+    });
+    if (useDoubleQuotes) return '"' + escapedString.replace(/"/g, '\\"') + '"';
+    return "'" + escapedString.replace(/'/g, '\\\'') + "'";
+  }
+
+  function unfilterJSON(filter) {
+    return this.replace(filter || Prototype.JSONFilter, '$1');
+  }
+
+  function isJSON() {
+    var str = this;
+    if (str.blank()) return false;
+    str = str.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@');
+    str = str.replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']');
+    str = str.replace(/(?:^|:|,)(?:\s*\[)+/g, '');
+    return (/^[\],:{}\s]*$/).test(str);
+  }
+
+  function evalJSON(sanitize) {
+    var json = this.unfilterJSON(),
+        cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g;
+    if (cx.test(json)) {
+      json = json.replace(cx, function (a) {
+        return '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
+      });
+    }
+    try {
+      if (!sanitize || json.isJSON()) return eval('(' + json + ')');
+    } catch (e) { }
+    throw new SyntaxError('Badly formed JSON string: ' + this.inspect());
+  }
+
+  function parseJSON() {
+    var json = this.unfilterJSON();
+    return JSON.parse(json);
+  }
+
+  function include(pattern) {
+    return this.indexOf(pattern) > -1;
+  }
+
+  function startsWith(pattern) {
+    return this.lastIndexOf(pattern, 0) === 0;
+  }
+
+  function endsWith(pattern) {
+    var d = this.length - pattern.length;
+    return d >= 0 && this.indexOf(pattern, d) === d;
+  }
+
+  function empty() {
+    return this == '';
+  }
+
+  function blank() {
+    return /^\s*$/.test(this);
+  }
+
+  function interpolate(object, pattern) {
+    return new Template(this, pattern).evaluate(object);
+  }
+
+  return {
+    gsub:           gsub,
+    sub:            sub,
+    scan:           scan,
+    truncate:       truncate,
+    strip:          String.prototype.trim || strip,
+    stripTags:      stripTags,
+    stripScripts:   stripScripts,
+    extractScripts: extractScripts,
+    evalScripts:    evalScripts,
+    escapeHTML:     escapeHTML,
+    unescapeHTML:   unescapeHTML,
+    toQueryParams:  toQueryParams,
+    parseQuery:     toQueryParams,
+    toArray:        toArray,
+    succ:           succ,
+    times:          times,
+    camelize:       camelize,
+    capitalize:     capitalize,
+    underscore:     underscore,
+    dasherize:      dasherize,
+    inspect:        inspect,
+    unfilterJSON:   unfilterJSON,
+    isJSON:         isJSON,
+    evalJSON:       NATIVE_JSON_PARSE_SUPPORT ? parseJSON : evalJSON,
+    include:        include,
+    startsWith:     startsWith,
+    endsWith:       endsWith,
+    empty:          empty,
+    blank:          blank,
+    interpolate:    interpolate
+  };
+})());
+
+var Template = Class.create({
+  initialize: function(template, pattern) {
+    this.template = template.toString();
+    this.pattern = pattern || Template.Pattern;
+  },
+
+  evaluate: function(object) {
+    if (object && Object.isFunction(object.toTemplateReplacements))
+      object = object.toTemplateReplacements();
+
+    return this.template.gsub(this.pattern, function(match) {
+      if (object == null) return (match[1] + '');
+
+      var before = match[1] || '';
+      if (before == '\\') return match[2];
+
+      var ctx = object, expr = match[3],
+          pattern = /^([^.[]+|\[((?:.*?[^\\])?)\])(\.|\[|$)/;
+
+      match = pattern.exec(expr);
+      if (match == null) return before;
+
+      while (match != null) {
+        var comp = match[1].startsWith('[') ? match[2].replace(/\\\\]/g, ']') : match[1];
+        ctx = ctx[comp];
+        if (null == ctx || '' == match[3]) break;
+        expr = expr.substring('[' == match[3] ? match[1].length : match[0].length);
+        match = pattern.exec(expr);
+      }
+
+      return before + String.interpret(ctx);
+    });
+  }
+});
+Template.Pattern = /(^|.|\r|\n)(#\{(.*?)\})/;
+
+var $break = { };
+
+var Enumerable = (function() {
+  function each(iterator, context) {
+    var index = 0;
+    try {
+      this._each(function(value) {
+        iterator.call(context, value, index++);
+      });
+    } catch (e) {
+      if (e != $break) throw e;
+    }
+    return this;
+  }
+
+  function eachSlice(number, iterator, context) {
+    var index = -number, slices = [], array = this.toArray();
+    if (number < 1) return array;
+    while ((index += number) < array.length)
+      slices.push(array.slice(index, index+number));
+    return slices.collect(iterator, context);
+  }
+
+  function all(iterator, context) {
+    iterator = iterator || Prototype.K;
+    var result = true;
+    this.each(function(value, index) {
+      result = result && !!iterator.call(context, value, index);
+      if (!result) throw $break;
+    });
+    return result;
+  }
+
+  function any(iterator, context) {
+    iterator = iterator || Prototype.K;
+    var result = false;
+    this.each(function(value, index) {
+      if (result = !!iterator.call(context, value, index))
+        throw $break;
+    });
+    return result;
+  }
+
+  function collect(iterator, context) {
+    iterator = iterator || Prototype.K;
+    var results = [];
+    this.each(function(value, index) {
+      results.push(iterator.call(context, value, index));
+    });
+    return results;
+  }
+
+  function detect(iterator, context) {
+    var result;
+    this.each(function(value, index) {
+      if (iterator.call(context, value, index)) {
+        result = value;
+        throw $break;
+      }
+    });
+    return result;
+  }
+
+  function findAll(iterator, context) {
+    var results = [];
+    this.each(function(value, index) {
+      if (iterator.call(context, value, index))
+        results.push(value);
+    });
+    return results;
+  }
+
+  function grep(filter, iterator, context) {
+    iterator = iterator || Prototype.K;
+    var results = [];
+
+    if (Object.isString(filter))
+      filter = new RegExp(RegExp.escape(filter));
+
+    this.each(function(value, index) {
+      if (filter.match(value))
+        results.push(iterator.call(context, value, index));
+    });
+    return results;
+  }
+
+  function include(object) {
+    if (Object.isFunction(this.indexOf))
+      if (this.indexOf(object) != -1) return true;
+
+    var found = false;
+    this.each(function(value) {
+      if (value == object) {
+        found = true;
+        throw $break;
+      }
+    });
+    return found;
+  }
+
+  function inGroupsOf(number, fillWith) {
+    fillWith = Object.isUndefined(fillWith) ? null : fillWith;
+    return this.eachSlice(number, function(slice) {
+      while(slice.length < number) slice.push(fillWith);
+      return slice;
+    });
+  }
+
+  function inject(memo, iterator, context) {
+    this.each(function(value, index) {
+      memo = iterator.call(context, memo, value, index);
+    });
+    return memo;
+  }
+
+  function invoke(method) {
+    var args = $A(arguments).slice(1);
+    return this.map(function(value) {
+      return value[method].apply(value, args);
+    });
+  }
+
+  function max(iterator, context) {
+    iterator = iterator || Prototype.K;
+    var result;
+    this.each(function(value, index) {
+      value = iterator.call(context, value, index);
+      if (result == null || value >= result)
+        result = value;
+    });
+    return result;
+  }
+
+  function min(iterator, context) {
+    iterator = iterator || Prototype.K;
+    var result;
+    this.each(function(value, index) {
+      value = iterator.call(context, value, index);
+      if (result == null || value < result)
+        result = value;
+    });
+    return result;
+  }
+
+  function partition(iterator, context) {
+    iterator = iterator || Prototype.K;
+    var trues = [], falses = [];
+    this.each(function(value, index) {
+      (iterator.call(context, value, index) ?
+        trues : falses).push(value);
+    });
+    return [trues, falses];
+  }
+
+  function pluck(property) {
+    var results = [];
+    this.each(function(value) {
+      results.push(value[property]);
+    });
+    return results;
+  }
+
+  function reject(iterator, context) {
+    var results = [];
+    this.each(function(value, index) {
+      if (!iterator.call(context, value, index))
+        results.push(value);
+    });
+    return results;
+  }
+
+  function sortBy(iterator, context) {
+    return this.map(function(value, index) {
+      return {
+        value: value,
+        criteria: iterator.call(context, value, index)
+      };
+    }).sort(function(left, right) {
+      var a = left.criteria, b = right.criteria;
+      return a < b ? -1 : a > b ? 1 : 0;
+    }).pluck('value');
+  }
+
+  function toArray() {
+    return this.map();
+  }
+
+  function zip() {
+    var iterator = Prototype.K, args = $A(arguments);
+    if (Object.isFunction(args.last()))
+      iterator = args.pop();
+
+    var collections = [this].concat(args).map($A);
+    return this.map(function(value, index) {
+      return iterator(collections.pluck(index));
+    });
+  }
+
+  function size() {
+    return this.toArray().length;
+  }
+
+  function inspect() {
+    return '#<Enumerable:' + this.toArray().inspect() + '>';
+  }
+
+
+
+
+
+
+
+
+
+  return {
+    each:       each,
+    eachSlice:  eachSlice,
+    all:        all,
+    every:      all,
+    any:        any,
+    some:       any,
+    collect:    collect,
+    map:        collect,
+    detect:     detect,
+    findAll:    findAll,
+    select:     findAll,
+    filter:     findAll,
+    grep:       grep,
+    include:    include,
+    member:     include,
+    inGroupsOf: inGroupsOf,
+    inject:     inject,
+    invoke:     invoke,
+    max:        max,
+    min:        min,
+    partition:  partition,
+    pluck:      pluck,
+    reject:     reject,
+    sortBy:     sortBy,
+    toArray:    toArray,
+    entries:    toArray,
+    zip:        zip,
+    size:       size,
+    inspect:    inspect,
+    find:       detect
+  };
+})();
+
+function $A(iterable) {
+  if (!iterable) return [];
+  if ('toArray' in Object(iterable)) return iterable.toArray();
+  var length = iterable.length || 0, results = new Array(length);
+  while (length--) results[length] = iterable[length];
+  return results;
+}
+
+
+function $w(string) {
+  if (!Object.isString(string)) return [];
+  string = string.strip();
+  return string ? string.split(/\s+/) : [];
+}
+
+Array.from = $A;
+
+
+(function() {
+  var arrayProto = Array.prototype,
+      slice = arrayProto.slice,
+      _each = arrayProto.forEach; // use native browser JS 1.6 implementation if available
+
+  function each(iterator, context) {
+    for (var i = 0, length = this.length >>> 0; i < length; i++) {
+      if (i in this) iterator.call(context, this[i], i, this);
+    }
+  }
+  if (!_each) _each = each;
+
+  function clear() {
+    this.length = 0;
+    return this;
+  }
+
+  function first() {
+    return this[0];
+  }
+
+  function last() {
+    return this[this.length - 1];
+  }
+
+  function compact() {
+    return this.select(function(value) {
+      return value != null;
+    });
+  }
+
+  function flatten() {
+    return this.inject([], function(array, value) {
+      if (Object.isArray(value))
+        return array.concat(value.flatten());
+      array.push(value);
+      return array;
+    });
+  }
+
+  function without() {
+    var values = slice.call(arguments, 0);
+    return this.select(function(value) {
+      return !values.include(value);
+    });
+  }
+
+  function reverse(inline) {
+    return (inline === false ? this.toArray() : this)._reverse();
+  }
+
+  function uniq(sorted) {
+    return this.inject([], function(array, value, index) {
+      if (0 == index || (sorted ? array.last() != value : !array.include(value)))
+        array.push(value);
+      return array;
+    });
+  }
+
+  function intersect(array) {
+    return this.uniq().findAll(function(item) {
+      return array.detect(function(value) { return item === value });
+    });
+  }
+
+
+  function clone() {
+    return slice.call(this, 0);
+  }
+
+  function size() {
+    return this.length;
+  }
+
+  function inspect() {
+    return '[' + this.map(Object.inspect).join(', ') + ']';
+  }
+
+  function indexOf(item, i) {
+    i || (i = 0);
+    var length = this.length;
+    if (i < 0) i = length + i;
+    for (; i < length; i++)
+      if (this[i] === item) return i;
+    return -1;
+  }
+
+  function lastIndexOf(item, i) {
+    i = isNaN(i) ? this.length : (i < 0 ? this.length + i : i) + 1;
+    var n = this.slice(0, i).reverse().indexOf(item);
+    return (n < 0) ? n : i - n - 1;
+  }
+
+  function concat() {
+    var array = slice.call(this, 0), item;
+    for (var i = 0, length = arguments.length; i < length; i++) {
+      item = arguments[i];
+      if (Object.isArray(item) && !('callee' in item)) {
+        for (var j = 0, arrayLength = item.length; j < arrayLength; j++)
+          array.push(item[j]);
+      } else {
+        array.push(item);
+      }
+    }
+    return array;
+  }
+
+  Object.extend(arrayProto, Enumerable);
+
+  if (!arrayProto._reverse)
+    arrayProto._reverse = arrayProto.reverse;
+
+  Object.extend(arrayProto, {
+    _each:     _each,
+    clear:     clear,
+    first:     first,
+    last:      last,
+    compact:   compact,
+    flatten:   flatten,
+    without:   without,
+    reverse:   reverse,
+    uniq:      uniq,
+    intersect: intersect,
+    clone:     clone,
+    toArray:   clone,
+    size:      size,
+    inspect:   inspect
+  });
+
+  var CONCAT_ARGUMENTS_BUGGY = (function() {
+    return [].concat(arguments)[0][0] !== 1;
+  })(1,2)
+
+  if (CONCAT_ARGUMENTS_BUGGY) arrayProto.concat = concat;
+
+  if (!arrayProto.indexOf) arrayProto.indexOf = indexOf;
+  if (!arrayProto.lastIndexOf) arrayProto.lastIndexOf = lastIndexOf;
+})();
+function $H(object) {
+  return new Hash(object);
+};
+
+var Hash = Class.create(Enumerable, (function() {
+  function initialize(object) {
+    this._object = Object.isHash(object) ? object.toObject() : Object.clone(object);
+  }
+
+
+  function _each(iterator) {
+    for (var key in this._object) {
+      var value = this._object[key], pair = [key, value];
+      pair.key = key;
+      pair.value = value;
+      iterator(pair);
+    }
+  }
+
+  function set(key, value) {
+    return this._object[key] = value;
+  }
+
+  function get(key) {
+    if (this._object[key] !== Object.prototype[key])
+      return this._object[key];
+  }
+
+  function unset(key) {
+    var value = this._object[key];
+    delete this._object[key];
+    return value;
+  }
+
+  function toObject() {
+    return Object.clone(this._object);
+  }
+
+
+
+  function keys() {
+    return this.pluck('key');
+  }
+
+  function values() {
+    return this.pluck('value');
+  }
+
+  function index(value) {
+    var match = this.detect(function(pair) {
+      return pair.value === value;
+    });
+    return match && match.key;
+  }
+
+  function merge(object) {
+    return this.clone().update(object);
+  }
+
+  function update(object) {
+    return new Hash(object).inject(this, function(result, pair) {
+      result.set(pair.key, pair.value);
+      return result;
+    });
+  }
+
+  function toQueryPair(key, value) {
+    if (Object.isUndefined(value)) return key;
+    return key + '=' + encodeURIComponent(String.interpret(value));
+  }
+
+  function toQueryString() {
+    return this.inject([], function(results, pair) {
+      var key = encodeURIComponent(pair.key), values = pair.value;
+
+      if (values && typeof values == 'object') {
+        if (Object.isArray(values)) {
+          var queryValues = [];
+          for (var i = 0, len = values.length, value; i < len; i++) {
+            value = values[i];
+            queryValues.push(toQueryPair(key, value));
+          }
+          return results.concat(queryValues);
+        }
+      } else results.push(toQueryPair(key, values));
+      return results;
+    }).join('&');
+  }
+
+  function inspect() {
+    return '#<Hash:{' + this.map(function(pair) {
+      return pair.map(Object.inspect).join(': ');
+    }).join(', ') + '}>';
+  }
+
+  function clone() {
+    return new Hash(this);
+  }
+
+  return {
+    initialize:             initialize,
+    _each:                  _each,
+    set:                    set,
+    get:                    get,
+    unset:                  unset,
+    toObject:               toObject,
+    toTemplateReplacements: toObject,
+    keys:                   keys,
+    values:                 values,
+    index:                  index,
+    merge:                  merge,
+    update:                 update,
+    toQueryString:          toQueryString,
+    inspect:                inspect,
+    toJSON:                 toObject,
+    clone:                  clone
+  };
+})());
+
+Hash.from = $H;
+Object.extend(Number.prototype, (function() {
+  function toColorPart() {
+    return this.toPaddedString(2, 16);
+  }
+
+  function succ() {
+    return this + 1;
+  }
+
+  function times(iterator, context) {
+    $R(0, this, true).each(iterator, context);
+    return this;
+  }
+
+  function toPaddedString(length, radix) {
+    var string = this.toString(radix || 10);
+    return '0'.times(length - string.length) + string;
+  }
+
+  function abs() {
+    return Math.abs(this);
+  }
+
+  function round() {
+    return Math.round(this);
+  }
+
+  function ceil() {
+    return Math.ceil(this);
+  }
+
+  function floor() {
+    return Math.floor(this);
+  }
+
+  return {
+    toColorPart:    toColorPart,
+    succ:           succ,
+    times:          times,
+    toPaddedString: toPaddedString,
+    abs:            abs,
+    round:          round,
+    ceil:           ceil,
+    floor:          floor
+  };
+})());
+
+function $R(start, end, exclusive) {
+  return new ObjectRange(start, end, exclusive);
+}
+
+var ObjectRange = Class.create(Enumerable, (function() {
+  function initialize(start, end, exclusive) {
+    this.start = start;
+    this.end = end;
+    this.exclusive = exclusive;
+  }
+
+  function _each(iterator) {
+    var value = this.start;
+    while (this.include(value)) {
+      iterator(value);
+      value = value.succ();
+    }
+  }
+
+  function include(value) {
+    if (value < this.start)
+      return false;
+    if (this.exclusive)
+      return value < this.end;
+    return value <= this.end;
+  }
+
+  return {
+    initialize: initialize,
+    _each:      _each,
+    include:    include
+  };
+})());
+
+
+
+var Ajax = {
+  getTransport: function() {
+    return Try.these(
+      function() {return new XMLHttpRequest()},
+      function() {return new ActiveXObject('Msxml2.XMLHTTP')},
+      function() {return new ActiveXObject('Microsoft.XMLHTTP')}
+    ) || false;
+  },
+
+  activeRequestCount: 0
+};
+
+Ajax.Responders = {
+  responders: [],
+
+  _each: function(iterator) {
+    this.responders._each(iterator);
+  },
+
+  register: function(responder) {
+    if (!this.include(responder))
+      this.responders.push(responder);
+  },
+
+  unregister: function(responder) {
+    this.responders = this.responders.without(responder);
+  },
+
+  dispatch: function(callback, request, transport, json) {
+    this.each(function(responder) {
+      if (Object.isFunction(responder[callback])) {
+        try {
+          responder[callback].apply(responder, [request, transport, json]);
+        } catch (e) { }
+      }
+    });
+  }
+};
+
+Object.extend(Ajax.Responders, Enumerable);
+
+Ajax.Responders.register({
+  onCreate:   function() { Ajax.activeRequestCount++ },
+  onComplete: function() { Ajax.activeRequestCount-- }
+});
+Ajax.Base = Class.create({
+  initialize: function(options) {
+    this.options = {
+      method:       'post',
+      asynchronous: true,
+      contentType:  'application/x-www-form-urlencoded',
+      encoding:     'UTF-8',
+      parameters:   '',
+      evalJSON:     true,
+      evalJS:       true
+    };
+    Object.extend(this.options, options || { });
+
+    this.options.method = this.options.method.toLowerCase();
+
+    if (Object.isHash(this.options.parameters))
+      this.options.parameters = this.options.parameters.toObject();
+  }
+});
+Ajax.Request = Class.create(Ajax.Base, {
+  _complete: false,
+
+  initialize: function($super, url, options) {
+    $super(options);
+    this.transport = Ajax.getTransport();
+    this.request(url);
+  },
+
+  request: function(url) {
+    this.url = url;
+    this.method = this.options.method;
+    var params = Object.isString(this.options.parameters) ?
+          this.options.parameters :
+          Object.toQueryString(this.options.parameters);
+
+    if (!['get', 'post'].include(this.method)) {
+      params += (params ? '&' : '') + "_method=" + this.method;
+      this.method = 'post';
+    }
+
+    if (params && this.method === 'get') {
+      this.url += (this.url.include('?') ? '&' : '?') + params;
+    }
+
+    this.parameters = params.toQueryParams();
+
+    try {
+      var response = new Ajax.Response(this);
+      if (this.options.onCreate) this.options.onCreate(response);
+      Ajax.Responders.dispatch('onCreate', this, response);
+
+      this.transport.open(this.method.toUpperCase(), this.url,
+        this.options.asynchronous);
+
+      if (this.options.asynchronous) this.respondToReadyState.bind(this).defer(1);
+
+      this.transport.onreadystatechange = this.onStateChange.bind(this);
+      this.setRequestHeaders();
+
+      this.body = this.method == 'post' ? (this.options.postBody || params) : null;
+      this.transport.send(this.body);
+
+      /* Force Firefox to handle ready state 4 for synchronous requests */
+      if (!this.options.asynchronous && this.transport.overrideMimeType)
+        this.onStateChange();
+
+    }
+    catch (e) {
+      this.dispatchException(e);
+    }
+  },
+
+  onStateChange: function() {
+    var readyState = this.transport.readyState;
+    if (readyState > 1 && !((readyState == 4) && this._complete))
+      this.respondToReadyState(this.transport.readyState);
+  },
+
+  setRequestHeaders: function() {
+    var headers = {
+      'X-Requested-With': 'XMLHttpRequest',
+      'X-Prototype-Version': Prototype.Version,
+      'Accept': 'text/javascript, text/html, application/xml, text/xml, */*'
+    };
+
+    if (this.method == 'post') {
+      headers['Content-type'] = this.options.contentType +
+        (this.options.encoding ? '; charset=' + this.options.encoding : '');
+
+      /* Force "Connection: close" for older Mozilla browsers to work
+       * around a bug where XMLHttpRequest sends an incorrect
+       * Content-length header. See Mozilla Bugzilla #246651.
+       */
+      if (this.transport.overrideMimeType &&
+          (navigator.userAgent.match(/Gecko\/(\d{4})/) || [0,2005])[1] < 2005)
+            headers['Connection'] = 'close';
+    }
+
+    if (typeof this.options.requestHeaders == 'object') {
+      var extras = this.options.requestHeaders;
+
+      if (Object.isFunction(extras.push))
+        for (var i = 0, length = extras.length; i < length; i += 2)
+          headers[extras[i]] = extras[i+1];
+      else
+        $H(extras).each(function(pair) { headers[pair.key] = pair.value });
+    }
+
+    for (var name in headers)
+      this.transport.setRequestHeader(name, headers[name]);
+  },
+
+  success: function() {
+    var status = this.getStatus();
+    return !status || (status >= 200 && status < 300) || status == 304;
+  },
+
+  getStatus: function() {
+    try {
+      if (this.transport.status === 1223) return 204;
+      return this.transport.status || 0;
+    } catch (e) { return 0 }
+  },
+
+  respondToReadyState: function(readyState) {
+    var state = Ajax.Request.Events[readyState], response = new Ajax.Response(this);
+
+    if (state == 'Complete') {
+      try {
+        this._complete = true;
+        (this.options['on' + response.status]
+         || this.options['on' + (this.success() ? 'Success' : 'Failure')]
+         || Prototype.emptyFunction)(response, response.headerJSON);
+      } catch (e) {
+        this.dispatchException(e);
+      }
+
+      var contentType = response.getHeader('Content-type');
+      if (this.options.evalJS == 'force'
+          || (this.options.evalJS && this.isSameOrigin() && contentType
+          && contentType.match(/^\s*(text|application)\/(x-)?(java|ecma)script(;.*)?\s*$/i)))
+        this.evalResponse();
+    }
+
+    try {
+      (this.options['on' + state] || Prototype.emptyFunction)(response, response.headerJSON);
+      Ajax.Responders.dispatch('on' + state, this, response, response.headerJSON);
+    } catch (e) {
+      this.dispatchException(e);
+    }
+
+    if (state == 'Complete') {
+      this.transport.onreadystatechange = Prototype.emptyFunction;
+    }
+  },
+
+  isSameOrigin: function() {
+    var m = this.url.match(/^\s*https?:\/\/[^\/]*/);
+    return !m || (m[0] == '#{protocol}//#{domain}#{port}'.interpolate({
+      protocol: location.protocol,
+      domain: document.domain,
+      port: location.port ? ':' + location.port : ''
+    }));
+  },
+
+  getHeader: function(name) {
+    try {
+      return this.transport.getResponseHeader(name) || null;
+    } catch (e) { return null; }
+  },
+
+  evalResponse: function() {
+    try {
+      return eval((this.transport.responseText || '').unfilterJSON());
+    } catch (e) {
+      this.dispatchException(e);
+    }
+  },
+
+  dispatchException: function(exception) {
+    (this.options.onException || Prototype.emptyFunction)(this, exception);
+    Ajax.Responders.dispatch('onException', this, exception);
+  }
+});
+
+Ajax.Request.Events =
+  ['Uninitialized', 'Loading', 'Loaded', 'Interactive', 'Complete'];
+
+
+
+
+
+
+
+
+Ajax.Response = Class.create({
+  initialize: function(request){
+    this.request = request;
+    var transport  = this.transport  = request.transport,
+        readyState = this.readyState = transport.readyState;
+
+    if ((readyState > 2 && !Prototype.Browser.IE) || readyState == 4) {
+      this.status       = this.getStatus();
+      this.statusText   = this.getStatusText();
+      this.responseText = String.interpret(transport.responseText);
+      this.headerJSON   = this._getHeaderJSON();
+    }
+
+    if (readyState == 4) {
+      var xml = transport.responseXML;
+      this.responseXML  = Object.isUndefined(xml) ? null : xml;
+      this.responseJSON = this._getResponseJSON();
+    }
+  },
+
+  status:      0,
+
+  statusText: '',
+
+  getStatus: Ajax.Request.prototype.getStatus,
+
+  getStatusText: function() {
+    try {
+      return this.transport.statusText || '';
+    } catch (e) { return '' }
+  },
+
+  getHeader: Ajax.Request.prototype.getHeader,
+
+  getAllHeaders: function() {
+    try {
+      return this.getAllResponseHeaders();
+    } catch (e) { return null }
+  },
+
+  getResponseHeader: function(name) {
+    return this.transport.getResponseHeader(name);
+  },
+
+  getAllResponseHeaders: function() {
+    return this.transport.getAllResponseHeaders();
+  },
+
+  _getHeaderJSON: function() {
+    var json = this.getHeader('X-JSON');
+    if (!json) return null;
+    json = decodeURIComponent(escape(json));
+    try {
+      return json.evalJSON(this.request.options.sanitizeJSON ||
+        !this.request.isSameOrigin());
+    } catch (e) {
+      this.request.dispatchException(e);
+    }
+  },
+
+  _getResponseJSON: function() {
+    var options = this.request.options;
+    if (!options.evalJSON || (options.evalJSON != 'force' &&
+      !(this.getHeader('Content-type') || '').include('application/json')) ||
+        this.responseText.blank())
+          return null;
+    try {
+      return this.responseText.evalJSON(options.sanitizeJSON ||
+        !this.request.isSameOrigin());
+    } catch (e) {
+      this.request.dispatchException(e);
+    }
+  }
+});
+
+Ajax.Updater = Class.create(Ajax.Request, {
+  initialize: function($super, container, url, options) {
+    this.container = {
+      success: (container.success || container),
+      failure: (container.failure || (container.success ? null : container))
+    };
+
+    options = Object.clone(options);
+    var onComplete = options.onComplete;
+    options.onComplete = (function(response, json) {
+      this.updateContent(response.responseText);
+      if (Object.isFunction(onComplete)) onComplete(response, json);
+    }).bind(this);
+
+    $super(url, options);
+  },
+
+  updateContent: function(responseText) {
+    var receiver = this.container[this.success() ? 'success' : 'failure'],
+        options = this.options;
+
+    if (!options.evalScripts) responseText = responseText.stripScripts();
+
+    if (receiver = $(receiver)) {
+      if (options.insertion) {
+        if (Object.isString(options.insertion)) {
+          var insertion = { }; insertion[options.insertion] = responseText;
+          receiver.insert(insertion);
+        }
+        else options.insertion(receiver, responseText);
+      }
+      else receiver.update(responseText);
+    }
+  }
+});
+
+Ajax.PeriodicalUpdater = Class.create(Ajax.Base, {
+  initialize: function($super, container, url, options) {
+    $super(options);
+    this.onComplete = this.options.onComplete;
+
+    this.frequency = (this.options.frequency || 2);
+    this.decay = (this.options.decay || 1);
+
+    this.updater = { };
+    this.container = container;
+    this.url = url;
+
+    this.start();
+  },
+
+  start: function() {
+    this.options.onComplete = this.updateComplete.bind(this);
+    this.onTimerEvent();
+  },
+
+  stop: function() {
+    this.updater.options.onComplete = undefined;
+    clearTimeout(this.timer);
+    (this.onComplete || Prototype.emptyFunction).apply(this, arguments);
+  },
+
+  updateComplete: function(response) {
+    if (this.options.decay) {
+      this.decay = (response.responseText == this.lastText ?
+        this.decay * this.options.decay : 1);
+
+      this.lastText = response.responseText;
+    }
+    this.timer = this.onTimerEvent.bind(this).delay(this.decay * this.frequency);
+  },
+
+  onTimerEvent: function() {
+    this.updater = new Ajax.Updater(this.container, this.url, this.options);
+  }
+});
+
+
+function $(element) {
+  if (arguments.length > 1) {
+    for (var i = 0, elements = [], length = arguments.length; i < length; i++)
+      elements.push($(arguments[i]));
+    return elements;
+  }
+  if (Object.isString(element))
+    element = document.getElementById(element);
+  return Element.extend(element);
+}
+
+if (Prototype.BrowserFeatures.XPath) {
+  document._getElementsByXPath = function(expression, parentElement) {
+    var results = [];
+    var query = document.evaluate(expression, $(parentElement) || document,
+      null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
+    for (var i = 0, length = query.snapshotLength; i < length; i++)
+      results.push(Element.extend(query.snapshotItem(i)));
+    return results;
+  };
+}
+
+/*--------------------------------------------------------------------------*/
+
+if (!Node) var Node = { };
+
+if (!Node.ELEMENT_NODE) {
+  Object.extend(Node, {
+    ELEMENT_NODE: 1,
+    ATTRIBUTE_NODE: 2,
+    TEXT_NODE: 3,
+    CDATA_SECTION_NODE: 4,
+    ENTITY_REFERENCE_NODE: 5,
+    ENTITY_NODE: 6,
+    PROCESSING_INSTRUCTION_NODE: 7,
+    COMMENT_NODE: 8,
+    DOCUMENT_NODE: 9,
+    DOCUMENT_TYPE_NODE: 10,
+    DOCUMENT_FRAGMENT_NODE: 11,
+    NOTATION_NODE: 12
+  });
+}
+
+
+
+(function(global) {
+  function shouldUseCache(tagName, attributes) {
+    if (tagName === 'select') return false;
+    if ('type' in attributes) return false;
+    return true;
+  }
+
+  var HAS_EXTENDED_CREATE_ELEMENT_SYNTAX = (function(){
+    try {
+      var el = document.createElement('<input name="x">');
+      return el.tagName.toLowerCase() === 'input' && el.name === 'x';
+    }
+    catch(err) {
+      return false;
+    }
+  })();
+
+  var element = global.Element;
+
+  global.Element = function(tagName, attributes) {
+    attributes = attributes || { };
+    tagName = tagName.toLowerCase();
+    var cache = Element.cache;
+
+    if (HAS_EXTENDED_CREATE_ELEMENT_SYNTAX && attributes.name) {
+      tagName = '<' + tagName + ' name="' + attributes.name + '">';
+      delete attributes.name;
+      return Element.writeAttribute(document.createElement(tagName), attributes);
+    }
+
+    if (!cache[tagName]) cache[tagName] = Element.extend(document.createElement(tagName));
+
+    var node = shouldUseCache(tagName, attributes) ?
+     cache[tagName].cloneNode(false) : document.createElement(tagName);
+
+    return Element.writeAttribute(node, attributes);
+  };
+
+  Object.extend(global.Element, element || { });
+  if (element) global.Element.prototype = element.prototype;
+
+})(this);
+
+Element.idCounter = 1;
+Element.cache = { };
+
+Element._purgeElement = function(element) {
+  var uid = element._prototypeUID;
+  if (uid) {
+    Element.stopObserving(element);
+    element._prototypeUID = void 0;
+    delete Element.Storage[uid];
+  }
+}
+
+Element.Methods = {
+  visible: function(element) {
+    return $(element).style.display != 'none';
+  },
+
+  toggle: function(element) {
+    element = $(element);
+    Element[Element.visible(element) ? 'hide' : 'show'](element);
+    return element;
+  },
+
+  hide: function(element) {
+    element = $(element);
+    element.style.display = 'none';
+    return element;
+  },
+
+  show: function(element) {
+    element = $(element);
+    element.style.display = '';
+    return element;
+  },
+
+  remove: function(element) {
+    element = $(element);
+    element.parentNode.removeChild(element);
+    return element;
+  },
+
+  update: (function(){
+
+    var SELECT_ELEMENT_INNERHTML_BUGGY = (function(){
+      var el = document.createElement("select"),
+          isBuggy = true;
+      el.innerHTML = "<option value=\"test\">test</option>";
+      if (el.options && el.options[0]) {
+        isBuggy = el.options[0].nodeName.toUpperCase() !== "OPTION";
+      }
+      el = null;
+      return isBuggy;
+    })();
+
+    var TABLE_ELEMENT_INNERHTML_BUGGY = (function(){
+      try {
+        var el = document.createElement("table");
+        if (el && el.tBodies) {
+          el.innerHTML = "<tbody><tr><td>test</td></tr></tbody>";
+          var isBuggy = typeof el.tBodies[0] == "undefined";
+          el = null;
+          return isBuggy;
+        }
+      } catch (e) {
+        return true;
+      }
+    })();
+
+    var LINK_ELEMENT_INNERHTML_BUGGY = (function() {
+      try {
+        var el = document.createElement('div');
+        el.innerHTML = "<link>";
+        var isBuggy = (el.childNodes.length === 0);
+        el = null;
+        return isBuggy;
+      } catch(e) {
+        return true;
+      }
+    })();
+
+    var ANY_INNERHTML_BUGGY = SELECT_ELEMENT_INNERHTML_BUGGY ||
+     TABLE_ELEMENT_INNERHTML_BUGGY || LINK_ELEMENT_INNERHTML_BUGGY;
+
+    var SCRIPT_ELEMENT_REJECTS_TEXTNODE_APPENDING = (function () {
+      var s = document.createElement("script"),
+          isBuggy = false;
+      try {
+        s.appendChild(document.createTextNode(""));
+        isBuggy = !s.firstChild ||
+          s.firstChild && s.firstChild.nodeType !== 3;
+      } catch (e) {
+        isBuggy = true;
+      }
+      s = null;
+      return isBuggy;
+    })();
+
+
+    function update(element, content) {
+      element = $(element);
+      var purgeElement = Element._purgeElement;
+
+      var descendants = element.getElementsByTagName('*'),
+       i = descendants.length;
+      while (i--) purgeElement(descendants[i]);
+
+      if (content && content.toElement)
+        content = content.toElement();
+
+      if (Object.isElement(content))
+        return element.update().insert(content);
+
+      content = Object.toHTML(content);
+
+      var tagName = element.tagName.toUpperCase();
+
+      if (tagName === 'SCRIPT' && SCRIPT_ELEMENT_REJECTS_TEXTNODE_APPENDING) {
+        element.text = content;
+        return element;
+      }
+
+      if (ANY_INNERHTML_BUGGY) {
+        if (tagName in Element._insertionTranslations.tags) {
+          while (element.firstChild) {
+            element.removeChild(element.firstChild);
+          }
+          Element._getContentFromAnonymousElement(tagName, content.stripScripts())
+            .each(function(node) {
+              element.appendChild(node)
+            });
+        } else if (LINK_ELEMENT_INNERHTML_BUGGY && Object.isString(content) && content.indexOf('<link') > -1) {
+          while (element.firstChild) {
+            element.removeChild(element.firstChild);
+          }
+          var nodes = Element._getContentFromAnonymousElement(tagName, content.stripScripts(), true);
+          nodes.each(function(node) { element.appendChild(node) });
+        }
+        else {
+          element.innerHTML = content.stripScripts();
+        }
+      }
+      else {
+        element.innerHTML = content.stripScripts();
+      }
+
+      content.evalScripts.bind(content).defer();
+      return element;
+    }
+
+    return update;
+  })(),
+
+  replace: function(element, content) {
+    element = $(element);
+    if (content && content.toElement) content = content.toElement();
+    else if (!Object.isElement(content)) {
+      content = Object.toHTML(content);
+      var range = element.ownerDocument.createRange();
+      range.selectNode(element);
+      content.evalScripts.bind(content).defer();
+      content = range.createContextualFragment(content.stripScripts());
+    }
+    element.parentNode.replaceChild(content, element);
+    return element;
+  },
+
+  insert: function(element, insertions) {
+    element = $(element);
+
+    if (Object.isString(insertions) || Object.isNumber(insertions) ||
+        Object.isElement(insertions) || (insertions && (insertions.toElement || insertions.toHTML)))
+          insertions = {bottom:insertions};
+
+    var content, insert, tagName, childNodes;
+
+    for (var position in insertions) {
+      content  = insertions[position];
+      position = position.toLowerCase();
+      insert = Element._insertionTranslations[position];
+
+      if (content && content.toElement) content = content.toElement();
+      if (Object.isElement(content)) {
+        insert(element, content);
+        continue;
+      }
+
+      content = Object.toHTML(content);
+
+      tagName = ((position == 'before' || position == 'after')
+        ? element.parentNode : element).tagName.toUpperCase();
+
+      childNodes = Element._getContentFromAnonymousElement(tagName, content.stripScripts());
+
+      if (position == 'top' || position == 'after') childNodes.reverse();
+      childNodes.each(insert.curry(element));
+
+      content.evalScripts.bind(content).defer();
+    }
+
+    return element;
+  },
+
+  wrap: function(element, wrapper, attributes) {
+    element = $(element);
+    if (Object.isElement(wrapper))
+      $(wrapper).writeAttribute(attributes || { });
+    else if (Object.isString(wrapper)) wrapper = new Element(wrapper, attributes);
+    else wrapper = new Element('div', wrapper);
+    if (element.parentNode)
+      element.parentNode.replaceChild(wrapper, element);
+    wrapper.appendChild(element);
+    return wrapper;
+  },
+
+  inspect: function(element) {
+    element = $(element);
+    var result = '<' + element.tagName.toLowerCase();
+    $H({'id': 'id', 'className': 'class'}).each(function(pair) {
+      var property = pair.first(),
+          attribute = pair.last(),
+          value = (element[property] || '').toString();
+      if (value) result += ' ' + attribute + '=' + value.inspect(true);
+    });
+    return result + '>';
+  },
+
+  recursivelyCollect: function(element, property, maximumLength) {
+    element = $(element);
+    maximumLength = maximumLength || -1;
+    var elements = [];
+
+    while (element = element[property]) {
+      if (element.nodeType == 1)
+        elements.push(Element.extend(element));
+      if (elements.length == maximumLength)
+        break;
+    }
+
+    return elements;
+  },
+
+  ancestors: function(element) {
+    return Element.recursivelyCollect(element, 'parentNode');
+  },
+
+  descendants: function(element) {
+    return Element.select(element, "*");
+  },
+
+  firstDescendant: function(element) {
+    element = $(element).firstChild;
+    while (element && element.nodeType != 1) element = element.nextSibling;
+    return $(element);
+  },
+
+  immediateDescendants: function(element) {
+    var results = [], child = $(element).firstChild;
+    while (child) {
+      if (child.nodeType === 1) {
+        results.push(Element.extend(child));
+      }
+      child = child.nextSibling;
+    }
+    return results;
+  },
+
+  previousSiblings: function(element, maximumLength) {
+    return Element.recursivelyCollect(element, 'previousSibling');
+  },
+
+  nextSiblings: function(element) {
+    return Element.recursivelyCollect(element, 'nextSibling');
+  },
+
+  siblings: function(element) {
+    element = $(element);
+    return Element.previousSiblings(element).reverse()
+      .concat(Element.nextSiblings(element));
+  },
+
+  match: function(element, selector) {
+    element = $(element);
+    if (Object.isString(selector))
+      return Prototype.Selector.match(element, selector);
+    return selector.match(element);
+  },
+
+  up: function(element, expression, index) {
+    element = $(element);
+    if (arguments.length == 1) return $(element.parentNode);
+    var ancestors = Element.ancestors(element);
+    return Object.isNumber(expression) ? ancestors[expression] :
+      Prototype.Selector.find(ancestors, expression, index);
+  },
+
+  down: function(element, expression, index) {
+    element = $(element);
+    if (arguments.length == 1) return Element.firstDescendant(element);
+    return Object.isNumber(expression) ? Element.descendants(element)[expression] :
+      Element.select(element, expression)[index || 0];
+  },
+
+  previous: function(element, expression, index) {
+    element = $(element);
+    if (Object.isNumber(expression)) index = expression, expression = false;
+    if (!Object.isNumber(index)) index = 0;
+
+    if (expression) {
+      return Prototype.Selector.find(element.previousSiblings(), expression, index);
+    } else {
+      return element.recursivelyCollect("previousSibling", index + 1)[index];
+    }
+  },
+
+  next: function(element, expression, index) {
+    element = $(element);
+    if (Object.isNumber(expression)) index = expression, expression = false;
+    if (!Object.isNumber(index)) index = 0;
+
+    if (expression) {
+      return Prototype.Selector.find(element.nextSiblings(), expression, index);
+    } else {
+      var maximumLength = Object.isNumber(index) ? index + 1 : 1;
+      return element.recursivelyCollect("nextSibling", index + 1)[index];
+    }
+  },
+
+
+  select: function(element) {
+    element = $(element);
+    var expressions = Array.prototype.slice.call(arguments, 1).join(', ');
+    return Prototype.Selector.select(expressions, element);
+  },
+
+  adjacent: function(element) {
+    element = $(element);
+    var expressions = Array.prototype.slice.call(arguments, 1).join(', ');
+    return Prototype.Selector.select(expressions, element.parentNode).without(element);
+  },
+
+  identify: function(element) {
+    element = $(element);
+    var id = Element.readAttribute(element, 'id');
+    if (id) return id;
+    do { id = 'anonymous_element_' + Element.idCounter++ } while ($(id));
+    Element.writeAttribute(element, 'id', id);
+    return id;
+  },
+
+  readAttribute: function(element, name) {
+    element = $(element);
+    if (Prototype.Browser.IE) {
+      var t = Element._attributeTranslations.read;
+      if (t.values[name]) return t.values[name](element, name);
+      if (t.names[name]) name = t.names[name];
+      if (name.include(':')) {
+        return (!element.attributes || !element.attributes[name]) ? null :
+         element.attributes[name].value;
+      }
+    }
+    return element.getAttribute(name);
+  },
+
+  writeAttribute: function(element, name, value) {
+    element = $(element);
+    var attributes = { }, t = Element._attributeTranslations.write;
+
+    if (typeof name == 'object') attributes = name;
+    else attributes[name] = Object.isUndefined(value) ? true : value;
+
+    for (var attr in attributes) {
+      name = t.names[attr] || attr;
+      value = attributes[attr];
+      if (t.values[attr]) name = t.values[attr](element, value);
+      if (value === false || value === null)
+        element.removeAttribute(name);
+      else if (value === true)
+        element.setAttribute(name, name);
+      else element.setAttribute(name, value);
+    }
+    return element;
+  },
+
+  getHeight: function(element) {
+    return Element.getDimensions(element).height;
+  },
+
+  getWidth: function(element) {
+    return Element.getDimensions(element).width;
+  },
+
+  classNames: function(element) {
+    return new Element.ClassNames(element);
+  },
+
+  hasClassName: function(element, className) {
+    if (!(element = $(element))) return;
+    var elementClassName = element.className;
+    return (elementClassName.length > 0 && (elementClassName == className ||
+      new RegExp("(^|\\s)" + className + "(\\s|$)").test(elementClassName)));
+  },
+
+  addClassName: function(element, className) {
+    if (!(element = $(element))) return;
+    if (!Element.hasClassName(element, className))
+      element.className += (element.className ? ' ' : '') + className;
+    return element;
+  },
+
+  removeClassName: function(element, className) {
+    if (!(element = $(element))) return;
+    element.className = element.className.replace(
+      new RegExp("(^|\\s+)" + className + "(\\s+|$)"), ' ').strip();
+    return element;
+  },
+
+  toggleClassName: function(element, className) {
+    if (!(element = $(element))) return;
+    return Element[Element.hasClassName(element, className) ?
+      'removeClassName' : 'addClassName'](element, className);
+  },
+
+  cleanWhitespace: function(element) {
+    element = $(element);
+    var node = element.firstChild;
+    while (node) {
+      var nextNode = node.nextSibling;
+      if (node.nodeType == 3 && !/\S/.test(node.nodeValue))
+        element.removeChild(node);
+      node = nextNode;
+    }
+    return element;
+  },
+
+  empty: function(element) {
+    return $(element).innerHTML.blank();
+  },
+
+  descendantOf: function(element, ancestor) {
+    element = $(element), ancestor = $(ancestor);
+
+    if (element.compareDocumentPosition)
+      return (element.compareDocumentPosition(ancestor) & 8) === 8;
+
+    if (ancestor.contains)
+      return ancestor.contains(element) && ancestor !== element;
+
+    while (element = element.parentNode)
+      if (element == ancestor) return true;
+
+    return false;
+  },
+
+  scrollTo: function(element) {
+    element = $(element);
+    var pos = Element.cumulativeOffset(element);
+    window.scrollTo(pos[0], pos[1]);
+    return element;
+  },
+
+  getStyle: function(element, style) {
+    element = $(element);
+    style = style == 'float' ? 'cssFloat' : style.camelize();
+    var value = element.style[style];
+    if (!value || value == 'auto') {
+      var css = document.defaultView.getComputedStyle(element, null);
+      value = css ? css[style] : null;
+    }
+    if (style == 'opacity') return value ? parseFloat(value) : 1.0;
+    return value == 'auto' ? null : value;
+  },
+
+  getOpacity: function(element) {
+    return $(element).getStyle('opacity');
+  },
+
+  setStyle: function(element, styles) {
+    element = $(element);
+    var elementStyle = element.style, match;
+    if (Object.isString(styles)) {
+      element.style.cssText += ';' + styles;
+      return styles.include('opacity') ?
+        element.setOpacity(styles.match(/opacity:\s*(\d?\.?\d*)/)[1]) : element;
+    }
+    for (var property in styles)
+      if (property == 'opacity') element.setOpacity(styles[property]);
+      else
+        elementStyle[(property == 'float' || property == 'cssFloat') ?
+          (Object.isUndefined(elementStyle.styleFloat) ? 'cssFloat' : 'styleFloat') :
+            property] = styles[property];
+
+    return element;
+  },
+
+  setOpacity: function(element, value) {
+    element = $(element);
+    element.style.opacity = (value == 1 || value === '') ? '' :
+      (value < 0.00001) ? 0 : value;
+    return element;
+  },
+
+  makePositioned: function(element) {
+    element = $(element);
+    var pos = Element.getStyle(element, 'position');
+    if (pos == 'static' || !pos) {
+      element._madePositioned = true;
+      element.style.position = 'relative';
+      if (Prototype.Browser.Opera) {
+        element.style.top = 0;
+        element.style.left = 0;
+      }
+    }
+    return element;
+  },
+
+  undoPositioned: function(element) {
+    element = $(element);
+    if (element._madePositioned) {
+      element._madePositioned = undefined;
+      element.style.position =
+        element.style.top =
+        element.style.left =
+        element.style.bottom =
+        element.style.right = '';
+    }
+    return element;
+  },
+
+  makeClipping: function(element) {
+    element = $(element);
+    if (element._overflow) return element;
+    element._overflow = Element.getStyle(element, 'overflow') || 'auto';
+    if (element._overflow !== 'hidden')
+      element.style.overflow = 'hidden';
+    return element;
+  },
+
+  undoClipping: function(element) {
+    element = $(element);
+    if (!element._overflow) return element;
+    element.style.overflow = element._overflow == 'auto' ? '' : element._overflow;
+    element._overflow = null;
+    return element;
+  },
+
+  clonePosition: function(element, source) {
+    var options = Object.extend({
+      setLeft:    true,
+      setTop:     true,
+      setWidth:   true,
+      setHeight:  true,
+      offsetTop:  0,
+      offsetLeft: 0
+    }, arguments[2] || { });
+
+    source = $(source);
+    var p = Element.viewportOffset(source), delta = [0, 0], parent = null;
+
+    element = $(element);
+
+    if (Element.getStyle(element, 'position') == 'absolute') {
+      parent = Element.getOffsetParent(element);
+      delta = Element.viewportOffset(parent);
+    }
+
+    if (parent == document.body) {
+      delta[0] -= document.body.offsetLeft;
+      delta[1] -= document.body.offsetTop;
+    }
+
+    if (options.setLeft)   element.style.left  = (p[0] - delta[0] + options.offsetLeft) + 'px';
+    if (options.setTop)    element.style.top   = (p[1] - delta[1] + options.offsetTop) + 'px';
+    if (options.setWidth)  element.style.width = source.offsetWidth + 'px';
+    if (options.setHeight) element.style.height = source.offsetHeight + 'px';
+    return element;
+  }
+};
+
+Object.extend(Element.Methods, {
+  getElementsBySelector: Element.Methods.select,
+
+  childElements: Element.Methods.immediateDescendants
+});
+
+Element._attributeTranslations = {
+  write: {
+    names: {
+      className: 'class',
+      htmlFor:   'for'
+    },
+    values: { }
+  }
+};
+
+if (Prototype.Browser.Opera) {
+  Element.Methods.getStyle = Element.Methods.getStyle.wrap(
+    function(proceed, element, style) {
+      switch (style) {
+        case 'height': case 'width':
+          if (!Element.visible(element)) return null;
+
+          var dim = parseInt(proceed(element, style), 10);
+
+          if (dim !== element['offset' + style.capitalize()])
+            return dim + 'px';
+
+          var properties;
+          if (style === 'height') {
+            properties = ['border-top-width', 'padding-top',
+             'padding-bottom', 'border-bottom-width'];
+          }
+          else {
+            properties = ['border-left-width', 'padding-left',
+             'padding-right', 'border-right-width'];
+          }
+          return properties.inject(dim, function(memo, property) {
+            var val = proceed(element, property);
+            return val === null ? memo : memo - parseInt(val, 10);
+          }) + 'px';
+        default: return proceed(element, style);
+      }
+    }
+  );
+
+  Element.Methods.readAttribute = Element.Methods.readAttribute.wrap(
+    function(proceed, element, attribute) {
+      if (attribute === 'title') return element.title;
+      return proceed(element, attribute);
+    }
+  );
+}
+
+else if (Prototype.Browser.IE) {
+  Element.Methods.getStyle = function(element, style) {
+    element = $(element);
+    style = (style == 'float' || style == 'cssFloat') ? 'styleFloat' : style.camelize();
+    var value = element.style[style];
+    if (!value && element.currentStyle) value = element.currentStyle[style];
+
+    if (style == 'opacity') {
+      if (value = (element.getStyle('filter') || '').match(/alpha\(opacity=(.*)\)/))
+        if (value[1]) return parseFloat(value[1]) / 100;
+      return 1.0;
+    }
+
+    if (value == 'auto') {
+      if ((style == 'width' || style == 'height') && (element.getStyle('display') != 'none'))
+        return element['offset' + style.capitalize()] + 'px';
+      return null;
+    }
+    return value;
+  };
+
+  Element.Methods.setOpacity = function(element, value) {
+    function stripAlpha(filter){
+      return filter.replace(/alpha\([^\)]*\)/gi,'');
+    }
+    element = $(element);
+    var currentStyle = element.currentStyle;
+    if ((currentStyle && !currentStyle.hasLayout) ||
+      (!currentStyle && element.style.zoom == 'normal'))
+        element.style.zoom = 1;
+
+    var filter = element.getStyle('filter'), style = element.style;
+    if (value == 1 || value === '') {
+      (filter = stripAlpha(filter)) ?
+        style.filter = filter : style.removeAttribute('filter');
+      return element;
+    } else if (value < 0.00001) value = 0;
+    style.filter = stripAlpha(filter) +
+      'alpha(opacity=' + (value * 100) + ')';
+    return element;
+  };
+
+  Element._attributeTranslations = (function(){
+
+    var classProp = 'className',
+        forProp = 'for',
+        el = document.createElement('div');
+
+    el.setAttribute(classProp, 'x');
+
+    if (el.className !== 'x') {
+      el.setAttribute('class', 'x');
+      if (el.className === 'x') {
+        classProp = 'class';
+      }
+    }
+    el = null;
+
+    el = document.createElement('label');
+    el.setAttribute(forProp, 'x');
+    if (el.htmlFor !== 'x') {
+      el.setAttribute('htmlFor', 'x');
+      if (el.htmlFor === 'x') {
+        forProp = 'htmlFor';
+      }
+    }
+    el = null;
+
+    return {
+      read: {
+        names: {
+          'class':      classProp,
+          'className':  classProp,
+          'for':        forProp,
+          'htmlFor':    forProp
+        },
+        values: {
+          _getAttr: function(element, attribute) {
+            return element.getAttribute(attribute);
+          },
+          _getAttr2: function(element, attribute) {
+            return element.getAttribute(attribute, 2);
+          },
+          _getAttrNode: function(element, attribute) {
+            var node = element.getAttributeNode(attribute);
+            return node ? node.value : "";
+          },
+          _getEv: (function(){
+
+            var el = document.createElement('div'), f;
+            el.onclick = Prototype.emptyFunction;
+            var value = el.getAttribute('onclick');
+
+            if (String(value).indexOf('{') > -1) {
+              f = function(element, attribute) {
+                attribute = element.getAttribute(attribute);
+                if (!attribute) return null;
+                attribute = attribute.toString();
+                attribute = attribute.split('{')[1];
+                attribute = attribute.split('}')[0];
+                return attribute.strip();
+              };
+            }
+            else if (value === '') {
+              f = function(element, attribute) {
+                attribute = element.getAttribute(attribute);
+                if (!attribute) return null;
+                return attribute.strip();
+              };
+            }
+            el = null;
+            return f;
+          })(),
+          _flag: function(element, attribute) {
+            return $(element).hasAttribute(attribute) ? attribute : null;
+          },
+          style: function(element) {
+            return element.style.cssText.toLowerCase();
+          },
+          title: function(element) {
+            return element.title;
+          }
+        }
+      }
+    }
+  })();
+
+  Element._attributeTranslations.write = {
+    names: Object.extend({
+      cellpadding: 'cellPadding',
+      cellspacing: 'cellSpacing'
+    }, Element._attributeTranslations.read.names),
+    values: {
+      checked: function(element, value) {
+        element.checked = !!value;
+      },
+
+      style: function(element, value) {
+        element.style.cssText = value ? value : '';
+      }
+    }
+  };
+
+  Element._attributeTranslations.has = {};
+
+  $w('colSpan rowSpan vAlign dateTime accessKey tabIndex ' +
+      'encType maxLength readOnly longDesc frameBorder').each(function(attr) {
+    Element._attributeTranslations.write.names[attr.toLowerCase()] = attr;
+    Element._attributeTranslations.has[attr.toLowerCase()] = attr;
+  });
+
+  (function(v) {
+    Object.extend(v, {
+      href:        v._getAttr2,
+      src:         v._getAttr2,
+      type:        v._getAttr,
+      action:      v._getAttrNode,
+      disabled:    v._flag,
+      checked:     v._flag,
+      readonly:    v._flag,
+      multiple:    v._flag,
+      onload:      v._getEv,
+      onunload:    v._getEv,
+      onclick:     v._getEv,
+      ondblclick:  v._getEv,
+      onmousedown: v._getEv,
+      onmouseup:   v._getEv,
+      onmouseover: v._getEv,
+      onmousemove: v._getEv,
+      onmouseout:  v._getEv,
+      onfocus:     v._getEv,
+      onblur:      v._getEv,
+      onkeypress:  v._getEv,
+      onkeydown:   v._getEv,
+      onkeyup:     v._getEv,
+      onsubmit:    v._getEv,
+      onreset:     v._getEv,
+      onselect:    v._getEv,
+      onchange:    v._getEv
+    });
+  })(Element._attributeTranslations.read.values);
+
+  if (Prototype.BrowserFeatures.ElementExtensions) {
+    (function() {
+      function _descendants(element) {
+        var nodes = element.getElementsByTagName('*'), results = [];
+        for (var i = 0, node; node = nodes[i]; i++)
+          if (node.tagName !== "!") // Filter out comment nodes.
+            results.push(node);
+        return results;
+      }
+
+      Element.Methods.down = function(element, expression, index) {
+        element = $(element);
+        if (arguments.length == 1) return element.firstDescendant();
+        return Object.isNumber(expression) ? _descendants(element)[expression] :
+          Element.select(element, expression)[index || 0];
+      }
+    })();
+  }
+
+}
+
+else if (Prototype.Browser.Gecko && /rv:1\.8\.0/.test(navigator.userAgent)) {
+  Element.Methods.setOpacity = function(element, value) {
+    element = $(element);
+    element.style.opacity = (value == 1) ? 0.999999 :
+      (value === '') ? '' : (value < 0.00001) ? 0 : value;
+    return element;
+  };
+}
+
+else if (Prototype.Browser.WebKit) {
+  Element.Methods.setOpacity = function(element, value) {
+    element = $(element);
+    element.style.opacity = (value == 1 || value === '') ? '' :
+      (value < 0.00001) ? 0 : value;
+
+    if (value == 1)
+      if (element.tagName.toUpperCase() == 'IMG' && element.width) {
+        element.width++; element.width--;
+      } else try {
+        var n = document.createTextNode(' ');
+        element.appendChild(n);
+        element.removeChild(n);
+      } catch (e) { }
+
+    return element;
+  };
+}
+
+if ('outerHTML' in document.documentElement) {
+  Element.Methods.replace = function(element, content) {
+    element = $(element);
+
+    if (content && content.toElement) content = content.toElement();
+    if (Object.isElement(content)) {
+      element.parentNode.replaceChild(content, element);
+      return element;
+    }
+
+    content = Object.toHTML(content);
+    var parent = element.parentNode, tagName = parent.tagName.toUpperCase();
+
+    if (Element._insertionTranslations.tags[tagName]) {
+      var nextSibling = element.next(),
+          fragments = Element._getContentFromAnonymousElement(tagName, content.stripScripts());
+      parent.removeChild(element);
+      if (nextSibling)
+        fragments.each(function(node) { parent.insertBefore(node, nextSibling) });
+      else
+        fragments.each(function(node) { parent.appendChild(node) });
+    }
+    else element.outerHTML = content.stripScripts();
+
+    content.evalScripts.bind(content).defer();
+    return element;
+  };
+}
+
+Element._returnOffset = function(l, t) {
+  var result = [l, t];
+  result.left = l;
+  result.top = t;
+  return result;
+};
+
+Element._getContentFromAnonymousElement = function(tagName, html, force) {
+  var div = new Element('div'),
+      t = Element._insertionTranslations.tags[tagName];
+
+  var workaround = false;
+  if (t) workaround = true;
+  else if (force) {
+    workaround = true;
+    t = ['', '', 0];
+  }
+
+  if (workaround) {
+    div.innerHTML = '&nbsp;' + t[0] + html + t[1];
+    div.removeChild(div.firstChild);
+    for (var i = t[2]; i--; ) {
+      div = div.firstChild;
+    }
+  }
+  else {
+    div.innerHTML = html;
+  }
+  return $A(div.childNodes);
+};
+
+Element._insertionTranslations = {
+  before: function(element, node) {
+    element.parentNode.insertBefore(node, element);
+  },
+  top: function(element, node) {
+    element.insertBefore(node, element.firstChild);
+  },
+  bottom: function(element, node) {
+    element.appendChild(node);
+  },
+  after: function(element, node) {
+    element.parentNode.insertBefore(node, element.nextSibling);
+  },
+  tags: {
+    TABLE:  ['<table>',                '</table>',                   1],
+    TBODY:  ['<table><tbody>',         '</tbody></table>',           2],
+    TR:     ['<table><tbody><tr>',     '</tr></tbody></table>',      3],
+    TD:     ['<table><tbody><tr><td>', '</td></tr></tbody></table>', 4],
+    SELECT: ['<select>',               '</select>',                  1]
+  }
+};
+
+(function() {
+  var tags = Element._insertionTranslations.tags;
+  Object.extend(tags, {
+    THEAD: tags.TBODY,
+    TFOOT: tags.TBODY,
+    TH:    tags.TD
+  });
+})();
+
+Element.Methods.Simulated = {
+  hasAttribute: function(element, attribute) {
+    attribute = Element._attributeTranslations.has[attribute] || attribute;
+    var node = $(element).getAttributeNode(attribute);
+    return !!(node && node.specified);
+  }
+};
+
+Element.Methods.ByTag = { };
+
+Object.extend(Element, Element.Methods);
+
+(function(div) {
+
+  if (!Prototype.BrowserFeatures.ElementExtensions && div['__proto__']) {
+    window.HTMLElement = { };
+    window.HTMLElement.prototype = div['__proto__'];
+    Prototype.BrowserFeatures.ElementExtensions = true;
+  }
+
+  div = null;
+
+})(document.createElement('div'));
+
+Element.extend = (function() {
+
+  function checkDeficiency(tagName) {
+    if (typeof window.Element != 'undefined') {
+      var proto = window.Element.prototype;
+      if (proto) {
+        var id = '_' + (Math.random()+'').slice(2),
+            el = document.createElement(tagName);
+        proto[id] = 'x';
+        var isBuggy = (el[id] !== 'x');
+        delete proto[id];
+        el = null;
+        return isBuggy;
+      }
+    }
+    return false;
+  }
+
+  function extendElementWith(element, methods) {
+    for (var property in methods) {
+      var value = methods[property];
+      if (Object.isFunction(value) && !(property in element))
+        element[property] = value.methodize();
+    }
+  }
+
+  var HTMLOBJECTELEMENT_PROTOTYPE_BUGGY = checkDeficiency('object');
+
+  if (Prototype.BrowserFeatures.SpecificElementExtensions) {
+    if (HTMLOBJECTELEMENT_PROTOTYPE_BUGGY) {
+      return function(element) {
+        if (element && typeof element._extendedByPrototype == 'undefined') {
+          var t = element.tagName;
+          if (t && (/^(?:object|applet|embed)$/i.test(t))) {
+            extendElementWith(element, Element.Methods);
+            extendElementWith(element, Element.Methods.Simulated);
+            extendElementWith(element, Element.Methods.ByTag[t.toUpperCase()]);
+          }
+        }
+        return element;
+      }
+    }
+    return Prototype.K;
+  }
+
+  var Methods = { }, ByTag = Element.Methods.ByTag;
+
+  var extend = Object.extend(function(element) {
+    if (!element || typeof element._extendedByPrototype != 'undefined' ||
+        element.nodeType != 1 || element == window) return element;
+
+    var methods = Object.clone(Methods),
+        tagName = element.tagName.toUpperCase();
+
+    if (ByTag[tagName]) Object.extend(methods, ByTag[tagName]);
+
+    extendElementWith(element, methods);
+
+    element._extendedByPrototype = Prototype.emptyFunction;
+    return element;
+
+  }, {
+    refresh: function() {
+      if (!Prototype.BrowserFeatures.ElementExtensions) {
+        Object.extend(Methods, Element.Methods);
+        Object.extend(Methods, Element.Methods.Simulated);
+      }
+    }
+  });
+
+  extend.refresh();
+  return extend;
+})();
+
+if (document.documentElement.hasAttribute) {
+  Element.hasAttribute = function(element, attribute) {
+    return element.hasAttribute(attribute);
+  };
+}
+else {
+  Element.hasAttribute = Element.Methods.Simulated.hasAttribute;
+}
+
+Element.addMethods = function(methods) {
+  var F = Prototype.BrowserFeatures, T = Element.Methods.ByTag;
+
+  if (!methods) {
+    Object.extend(Form, Form.Methods);
+    Object.extend(Form.Element, Form.Element.Methods);
+    Object.extend(Element.Methods.ByTag, {
+      "FORM":     Object.clone(Form.Methods),
+      "INPUT":    Object.clone(Form.Element.Methods),
+      "SELECT":   Object.clone(Form.Element.Methods),
+      "TEXTAREA": Object.clone(Form.Element.Methods),
+      "BUTTON":   Object.clone(Form.Element.Methods)
+    });
+  }
+
+  if (arguments.length == 2) {
+    var tagName = methods;
+    methods = arguments[1];
+  }
+
+  if (!tagName) Object.extend(Element.Methods, methods || { });
+  else {
+    if (Object.isArray(tagName)) tagName.each(extend);
+    else extend(tagName);
+  }
+
+  function extend(tagName) {
+    tagName = tagName.toUpperCase();
+    if (!Element.Methods.ByTag[tagName])
+      Element.Methods.ByTag[tagName] = { };
+    Object.extend(Element.Methods.ByTag[tagName], methods);
+  }
+
+  function copy(methods, destination, onlyIfAbsent) {
+    onlyIfAbsent = onlyIfAbsent || false;
+    for (var property in methods) {
+      var value = methods[property];
+      if (!Object.isFunction(value)) continue;
+      if (!onlyIfAbsent || !(property in destination))
+        destination[property] = value.methodize();
+    }
+  }
+
+  function findDOMClass(tagName) {
+    var klass;
+    var trans = {
+      "OPTGROUP": "OptGroup", "TEXTAREA": "TextArea", "P": "Paragraph",
+      "FIELDSET": "FieldSet", "UL": "UList", "OL": "OList", "DL": "DList",
+      "DIR": "Directory", "H1": "Heading", "H2": "Heading", "H3": "Heading",
+      "H4": "Heading", "H5": "Heading", "H6": "Heading", "Q": "Quote",
+      "INS": "Mod", "DEL": "Mod", "A": "Anchor", "IMG": "Image", "CAPTION":
+      "TableCaption", "COL": "TableCol", "COLGROUP": "TableCol", "THEAD":
+      "TableSection", "TFOOT": "TableSection", "TBODY": "TableSection", "TR":
+      "TableRow", "TH": "TableCell", "TD": "TableCell", "FRAMESET":
+      "FrameSet", "IFRAME": "IFrame"
+    };
+    if (trans[tagName]) klass = 'HTML' + trans[tagName] + 'Element';
+    if (window[klass]) return window[klass];
+    klass = 'HTML' + tagName + 'Element';
+    if (window[klass]) return window[klass];
+    klass = 'HTML' + tagName.capitalize() + 'Element';
+    if (window[klass]) return window[klass];
+
+    var element = document.createElement(tagName),
+        proto = element['__proto__'] || element.constructor.prototype;
+
+    element = null;
+    return proto;
+  }
+
+  var elementPrototype = window.HTMLElement ? HTMLElement.prototype :
+   Element.prototype;
+
+  if (F.ElementExtensions) {
+    copy(Element.Methods, elementPrototype);
+    copy(Element.Methods.Simulated, elementPrototype, true);
+  }
+
+  if (F.SpecificElementExtensions) {
+    for (var tag in Element.Methods.ByTag) {
+      var klass = findDOMClass(tag);
+      if (Object.isUndefined(klass)) continue;
+      copy(T[tag], klass.prototype);
+    }
+  }
+
+  Object.extend(Element, Element.Methods);
+  delete Element.ByTag;
+
+  if (Element.extend.refresh) Element.extend.refresh();
+  Element.cache = { };
+};
+
+
+document.viewport = {
+
+  getDimensions: function() {
+    return { width: this.getWidth(), height: this.getHeight() };
+  },
+
+  getScrollOffsets: function() {
+    return Element._returnOffset(
+      window.pageXOffset || document.documentElement.scrollLeft || document.body.scrollLeft,
+      window.pageYOffset || document.documentElement.scrollTop  || document.body.scrollTop);
+  }
+};
+
+(function(viewport) {
+  var B = Prototype.Browser, doc = document, element, property = {};
+
+  function getRootElement() {
+    if (B.WebKit && !doc.evaluate)
+      return document;
+
+    if (B.Opera && window.parseFloat(window.opera.version()) < 9.5)
+      return document.body;
+
+    return document.documentElement;
+  }
+
+  function define(D) {
+    if (!element) element = getRootElement();
+
+    property[D] = 'client' + D;
+
+    viewport['get' + D] = function() { return element[property[D]] };
+    return viewport['get' + D]();
+  }
+
+  viewport.getWidth  = define.curry('Width');
+
+  viewport.getHeight = define.curry('Height');
+})(document.viewport);
+
+
+Element.Storage = {
+  UID: 1
+};
+
+Element.addMethods({
+  getStorage: function(element) {
+    if (!(element = $(element))) return;
+
+    var uid;
+    if (element === window) {
+      uid = 0;
+    } else {
+      if (typeof element._prototypeUID === "undefined")
+        element._prototypeUID = Element.Storage.UID++;
+      uid = element._prototypeUID;
+    }
+
+    if (!Element.Storage[uid])
+      Element.Storage[uid] = $H();
+
+    return Element.Storage[uid];
+  },
+
+  store: function(element, key, value) {
+    if (!(element = $(element))) return;
+
+    if (arguments.length === 2) {
+      Element.getStorage(element).update(key);
+    } else {
+      Element.getStorage(element).set(key, value);
+    }
+
+    return element;
+  },
+
+  retrieve: function(element, key, defaultValue) {
+    if (!(element = $(element))) return;
+    var hash = Element.getStorage(element), value = hash.get(key);
+
+    if (Object.isUndefined(value)) {
+      hash.set(key, defaultValue);
+      value = defaultValue;
+    }
+
+    return value;
+  },
+
+  clone: function(element, deep) {
+    if (!(element = $(element))) return;
+    var clone = element.cloneNode(deep);
+    clone._prototypeUID = void 0;
+    if (deep) {
+      var descendants = Element.select(clone, '*'),
+          i = descendants.length;
+      while (i--) {
+        descendants[i]._prototypeUID = void 0;
+      }
+    }
+    return Element.extend(clone);
+  },
+
+  purge: function(element) {
+    if (!(element = $(element))) return;
+    var purgeElement = Element._purgeElement;
+
+    purgeElement(element);
+
+    var descendants = element.getElementsByTagName('*'),
+     i = descendants.length;
+
+    while (i--) purgeElement(descendants[i]);
+
+    return null;
+  }
+});
+
+(function() {
+
+  function toDecimal(pctString) {
+    var match = pctString.match(/^(\d+)%?$/i);
+    if (!match) return null;
+    return (Number(match[1]) / 100);
+  }
+
+  function getPixelValue(value, property, context) {
+    var element = null;
+    if (Object.isElement(value)) {
+      element = value;
+      value = element.getStyle(property);
+    }
+
+    if (value === null) {
+      return null;
+    }
+
+    if ((/^(?:-)?\d+(\.\d+)?(px)?$/i).test(value)) {
+      return window.parseFloat(value);
+    }
+
+    var isPercentage = value.include('%'), isViewport = (context === document.viewport);
+
+    if (/\d/.test(value) && element && element.runtimeStyle && !(isPercentage && isViewport)) {
+      var style = element.style.left, rStyle = element.runtimeStyle.left;
+      element.runtimeStyle.left = element.currentStyle.left;
+      element.style.left = value || 0;
+      value = element.style.pixelLeft;
+      element.style.left = style;
+      element.runtimeStyle.left = rStyle;
+
+      return value;
+    }
+
+    if (element && isPercentage) {
+      context = context || element.parentNode;
+      var decimal = toDecimal(value);
+      var whole = null;
+      var position = element.getStyle('position');
+
+      var isHorizontal = property.include('left') || property.include('right') ||
+       property.include('width');
+
+      var isVertical =  property.include('top') || property.include('bottom') ||
+        property.include('height');
+
+      if (context === document.viewport) {
+        if (isHorizontal) {
+          whole = document.viewport.getWidth();
+        } else if (isVertical) {
+          whole = document.viewport.getHeight();
+        }
+      } else {
+        if (isHorizontal) {
+          whole = $(context).measure('width');
+        } else if (isVertical) {
+          whole = $(context).measure('height');
+        }
+      }
+
+      return (whole === null) ? 0 : whole * decimal;
+    }
+
+    return 0;
+  }
+
+  function toCSSPixels(number) {
+    if (Object.isString(number) && number.endsWith('px')) {
+      return number;
+    }
+    return number + 'px';
+  }
+
+  function isDisplayed(element) {
+    var originalElement = element;
+    while (element && element.parentNode) {
+      var display = element.getStyle('display');
+      if (display === 'none') {
+        return false;
+      }
+      element = $(element.parentNode);
+    }
+    return true;
+  }
+
+  var hasLayout = Prototype.K;
+  if ('currentStyle' in document.documentElement) {
+    hasLayout = function(element) {
+      if (!element.currentStyle.hasLayout) {
+        element.style.zoom = 1;
+      }
+      return element;
+    };
+  }
+
+  function cssNameFor(key) {
+    if (key.include('border')) key = key + '-width';
+    return key.camelize();
+  }
+
+  Element.Layout = Class.create(Hash, {
+    initialize: function($super, element, preCompute) {
+      $super();
+      this.element = $(element);
+
+      Element.Layout.PROPERTIES.each( function(property) {
+        this._set(property, null);
+      }, this);
+
+      if (preCompute) {
+        this._preComputing = true;
+        this._begin();
+        Element.Layout.PROPERTIES.each( this._compute, this );
+        this._end();
+        this._preComputing = false;
+      }
+    },
+
+    _set: function(property, value) {
+      return Hash.prototype.set.call(this, property, value);
+    },
+
+    set: function(property, value) {
+      throw "Properties of Element.Layout are read-only.";
+    },
+
+    get: function($super, property) {
+      var value = $super(property);
+      return value === null ? this._compute(property) : value;
+    },
+
+    _begin: function() {
+      if (this._prepared) return;
+
+      var element = this.element;
+      if (isDisplayed(element)) {
+        this._prepared = true;
+        return;
+      }
+
+      var originalStyles = {
+        position:   element.style.position   || '',
+        width:      element.style.width      || '',
+        visibility: element.style.visibility || '',
+        display:    element.style.display    || ''
+      };
+
+      element.store('prototype_original_styles', originalStyles);
+
+      var position = element.getStyle('position'),
+       width = element.getStyle('width');
+
+      if (width === "0px" || width === null) {
+        element.style.display = 'block';
+        width = element.getStyle('width');
+      }
+
+      var context = (position === 'fixed') ? document.viewport :
+       element.parentNode;
+
+      element.setStyle({
+        position:   'absolute',
+        visibility: 'hidden',
+        display:    'block'
+      });
+
+      var positionedWidth = element.getStyle('width');
+
+      var newWidth;
+      if (width && (positionedWidth === width)) {
+        newWidth = getPixelValue(element, 'width', context);
+      } else if (position === 'absolute' || position === 'fixed') {
+        newWidth = getPixelValue(element, 'width', context);
+      } else {
+        var parent = element.parentNode, pLayout = $(parent).getLayout();
+
+        newWidth = pLayout.get('width') -
+         this.get('margin-left') -
+         this.get('border-left') -
+         this.get('padding-left') -
+         this.get('padding-right') -
+         this.get('border-right') -
+         this.get('margin-right');
+      }
+
+      element.setStyle({ width: newWidth + 'px' });
+
+      this._prepared = true;
+    },
+
+    _end: function() {
+      var element = this.element;
+      var originalStyles = element.retrieve('prototype_original_styles');
+      element.store('prototype_original_styles', null);
+      element.setStyle(originalStyles);
+      this._prepared = false;
+    },
+
+    _compute: function(property) {
+      var COMPUTATIONS = Element.Layout.COMPUTATIONS;
+      if (!(property in COMPUTATIONS)) {
+        throw "Property not found.";
+      }
+
+      return this._set(property, COMPUTATIONS[property].call(this, this.element));
+    },
+
+    toObject: function() {
+      var args = $A(arguments);
+      var keys = (args.length === 0) ? Element.Layout.PROPERTIES :
+       args.join(' ').split(' ');
+      var obj = {};
+      keys.each( function(key) {
+        if (!Element.Layout.PROPERTIES.include(key)) return;
+        var value = this.get(key);
+        if (value != null) obj[key] = value;
+      }, this);
+      return obj;
+    },
+
+    toHash: function() {
+      var obj = this.toObject.apply(this, arguments);
+      return new Hash(obj);
+    },
+
+    toCSS: function() {
+      var args = $A(arguments);
+      var keys = (args.length === 0) ? Element.Layout.PROPERTIES :
+       args.join(' ').split(' ');
+      var css = {};
+
+      keys.each( function(key) {
+        if (!Element.Layout.PROPERTIES.include(key)) return;
+        if (Element.Layout.COMPOSITE_PROPERTIES.include(key)) return;
+
+        var value = this.get(key);
+        if (value != null) css[cssNameFor(key)] = value + 'px';
+      }, this);
+      return css;
+    },
+
+    inspect: function() {
+      return "#<Element.Layout>";
+    }
+  });
+
+  Object.extend(Element.Layout, {
+    PROPERTIES: $w('height width top left right bottom border-left border-right border-top border-bottom padding-left padding-right padding-top padding-bottom margin-top margin-bottom margin-left margin-right padding-box-width padding-box-height border-box-width border-box-height margin-box-width margin-box-height'),
+
+    COMPOSITE_PROPERTIES: $w('padding-box-width padding-box-height margin-box-width margin-box-height border-box-width border-box-height'),
+
+    COMPUTATIONS: {
+      'height': function(element) {
+        if (!this._preComputing) this._begin();
+
+        var bHeight = this.get('border-box-height');
+        if (bHeight <= 0) {
+          if (!this._preComputing) this._end();
+          return 0;
+        }
+
+        var bTop = this.get('border-top'),
+         bBottom = this.get('border-bottom');
+
+        var pTop = this.get('padding-top'),
+         pBottom = this.get('padding-bottom');
+
+        if (!this._preComputing) this._end();
+
+        return bHeight - bTop - bBottom - pTop - pBottom;
+      },
+
+      'width': function(element) {
+        if (!this._preComputing) this._begin();
+
+        var bWidth = this.get('border-box-width');
+        if (bWidth <= 0) {
+          if (!this._preComputing) this._end();
+          return 0;
+        }
+
+        var bLeft = this.get('border-left'),
+         bRight = this.get('border-right');
+
+        var pLeft = this.get('padding-left'),
+         pRight = this.get('padding-right');
+
+        if (!this._preComputing) this._end();
+
+        return bWidth - bLeft - bRight - pLeft - pRight;
+      },
+
+      'padding-box-height': function(element) {
+        var height = this.get('height'),
+         pTop = this.get('padding-top'),
+         pBottom = this.get('padding-bottom');
+
+        return height + pTop + pBottom;
+      },
+
+      'padding-box-width': function(element) {
+        var width = this.get('width'),
+         pLeft = this.get('padding-left'),
+         pRight = this.get('padding-right');
+
+        return width + pLeft + pRight;
+      },
+
+      'border-box-height': function(element) {
+        if (!this._preComputing) this._begin();
+        var height = element.offsetHeight;
+        if (!this._preComputing) this._end();
+        return height;
+      },
+
+      'border-box-width': function(element) {
+        if (!this._preComputing) this._begin();
+        var width = element.offsetWidth;
+        if (!this._preComputing) this._end();
+        return width;
+      },
+
+      'margin-box-height': function(element) {
+        var bHeight = this.get('border-box-height'),
+         mTop = this.get('margin-top'),
+         mBottom = this.get('margin-bottom');
+
+        if (bHeight <= 0) return 0;
+
+        return bHeight + mTop + mBottom;
+      },
+
+      'margin-box-width': function(element) {
+        var bWidth = this.get('border-box-width'),
+         mLeft = this.get('margin-left'),
+         mRight = this.get('margin-right');
+
+        if (bWidth <= 0) return 0;
+
+        return bWidth + mLeft + mRight;
+      },
+
+      'top': function(element) {
+        var offset = element.positionedOffset();
+        return offset.top;
+      },
+
+      'bottom': function(element) {
+        var offset = element.positionedOffset(),
+         parent = element.getOffsetParent(),
+         pHeight = parent.measure('height');
+
+        var mHeight = this.get('border-box-height');
+
+        return pHeight - mHeight - offset.top;
+      },
+
+      'left': function(element) {
+        var offset = element.positionedOffset();
+        return offset.left;
+      },
+
+      'right': function(element) {
+        var offset = element.positionedOffset(),
+         parent = element.getOffsetParent(),
+         pWidth = parent.measure('width');
+
+        var mWidth = this.get('border-box-width');
+
+        return pWidth - mWidth - offset.left;
+      },
+
+      'padding-top': function(element) {
+        return getPixelValue(element, 'paddingTop');
+      },
+
+      'padding-bottom': function(element) {
+        return getPixelValue(element, 'paddingBottom');
+      },
+
+      'padding-left': function(element) {
+        return getPixelValue(element, 'paddingLeft');
+      },
+
+      'padding-right': function(element) {
+        return getPixelValue(element, 'paddingRight');
+      },
+
+      'border-top': function(element) {
+        return getPixelValue(element, 'borderTopWidth');
+      },
+
+      'border-bottom': function(element) {
+        return getPixelValue(element, 'borderBottomWidth');
+      },
+
+      'border-left': function(element) {
+        return getPixelValue(element, 'borderLeftWidth');
+      },
+
+      'border-right': function(element) {
+        return getPixelValue(element, 'borderRightWidth');
+      },
+
+      'margin-top': function(element) {
+        return getPixelValue(element, 'marginTop');
+      },
+
+      'margin-bottom': function(element) {
+        return getPixelValue(element, 'marginBottom');
+      },
+
+      'margin-left': function(element) {
+        return getPixelValue(element, 'marginLeft');
+      },
+
+      'margin-right': function(element) {
+        return getPixelValue(element, 'marginRight');
+      }
+    }
+  });
+
+  if ('getBoundingClientRect' in document.documentElement) {
+    Object.extend(Element.Layout.COMPUTATIONS, {
+      'right': function(element) {
+        var parent = hasLayout(element.getOffsetParent());
+        var rect = element.getBoundingClientRect(),
+         pRect = parent.getBoundingClientRect();
+
+        return (pRect.right - rect.right).round();
+      },
+
+      'bottom': function(element) {
+        var parent = hasLayout(element.getOffsetParent());
+        var rect = element.getBoundingClientRect(),
+         pRect = parent.getBoundingClientRect();
+
+        return (pRect.bottom - rect.bottom).round();
+      }
+    });
+  }
+
+  Element.Offset = Class.create({
+    initialize: function(left, top) {
+      this.left = left.round();
+      this.top  = top.round();
+
+      this[0] = this.left;
+      this[1] = this.top;
+    },
+
+    relativeTo: function(offset) {
+      return new Element.Offset(
+        this.left - offset.left,
+        this.top  - offset.top
+      );
+    },
+
+    inspect: function() {
+      return "#<Element.Offset left: #{left} top: #{top}>".interpolate(this);
+    },
+
+    toString: function() {
+      return "[#{left}, #{top}]".interpolate(this);
+    },
+
+    toArray: function() {
+      return [this.left, this.top];
+    }
+  });
+
+  function getLayout(element, preCompute) {
+    return new Element.Layout(element, preCompute);
+  }
+
+  function measure(element, property) {
+    return $(element).getLayout().get(property);
+  }
+
+  function getDimensions(element) {
+    element = $(element);
+    var display = Element.getStyle(element, 'display');
+
+    if (display && display !== 'none') {
+      return { width: element.offsetWidth, height: element.offsetHeight };
+    }
+
+    var style = element.style;
+    var originalStyles = {
+      visibility: style.visibility,
+      position:   style.position,
+      display:    style.display
+    };
+
+    var newStyles = {
+      visibility: 'hidden',
+      display:    'block'
+    };
+
+    if (originalStyles.position !== 'fixed')
+      newStyles.position = 'absolute';
+
+    Element.setStyle(element, newStyles);
+
+    var dimensions = {
+      width:  element.offsetWidth,
+      height: element.offsetHeight
+    };
+
+    Element.setStyle(element, originalStyles);
+
+    return dimensions;
+  }
+
+  function getOffsetParent(element) {
+    element = $(element);
+
+    if (isDocument(element) || isDetached(element) || isBody(element) || isHtml(element))
+      return $(document.body);
+
+    var isInline = (Element.getStyle(element, 'display') === 'inline');
+    if (!isInline && element.offsetParent) return $(element.offsetParent);
+
+    while ((element = element.parentNode) && element !== document.body) {
+      if (Element.getStyle(element, 'position') !== 'static') {
+        return isHtml(element) ? $(document.body) : $(element);
+      }
+    }
+
+    return $(document.body);
+  }
+
+
+  function cumulativeOffset(element) {
+    element = $(element);
+    var valueT = 0, valueL = 0;
+    if (element.parentNode) {
+      do {
+        valueT += element.offsetTop  || 0;
+        valueL += element.offsetLeft || 0;
+        element = element.offsetParent;
+      } while (element);
+    }
+    return new Element.Offset(valueL, valueT);
+  }
+
+  function positionedOffset(element) {
+    element = $(element);
+
+    var layout = element.getLayout();
+
+    var valueT = 0, valueL = 0;
+    do {
+      valueT += element.offsetTop  || 0;
+      valueL += element.offsetLeft || 0;
+      element = element.offsetParent;
+      if (element) {
+        if (isBody(element)) break;
+        var p = Element.getStyle(element, 'position');
+        if (p !== 'static') break;
+      }
+    } while (element);
+
+    valueL -= layout.get('margin-top');
+    valueT -= layout.get('margin-left');
+
+    return new Element.Offset(valueL, valueT);
+  }
+
+  function cumulativeScrollOffset(element) {
+    var valueT = 0, valueL = 0;
+    do {
+      valueT += element.scrollTop  || 0;
+      valueL += element.scrollLeft || 0;
+      element = element.parentNode;
+    } while (element);
+    return new Element.Offset(valueL, valueT);
+  }
+
+  function viewportOffset(forElement) {
+    element = $(element);
+    var valueT = 0, valueL = 0, docBody = document.body;
+
+    var element = forElement;
+    do {
+      valueT += element.offsetTop  || 0;
+      valueL += element.offsetLeft || 0;
+      if (element.offsetParent == docBody &&
+        Element.getStyle(element, 'position') == 'absolute') break;
+    } while (element = element.offsetParent);
+
+    element = forElement;
+    do {
+      if (element != docBody) {
+        valueT -= element.scrollTop  || 0;
+        valueL -= element.scrollLeft || 0;
+      }
+    } while (element = element.parentNode);
+    return new Element.Offset(valueL, valueT);
+  }
+
+  function absolutize(element) {
+    element = $(element);
+
+    if (Element.getStyle(element, 'position') === 'absolute') {
+      return element;
+    }
+
+    var offsetParent = getOffsetParent(element);
+    var eOffset = element.viewportOffset(),
+     pOffset = offsetParent.viewportOffset();
+
+    var offset = eOffset.relativeTo(pOffset);
+    var layout = element.getLayout();
+
+    element.store('prototype_absolutize_original_styles', {
+      left:   element.getStyle('left'),
+      top:    element.getStyle('top'),
+      width:  element.getStyle('width'),
+      height: element.getStyle('height')
+    });
+
+    element.setStyle({
+      position: 'absolute',
+      top:    offset.top + 'px',
+      left:   offset.left + 'px',
+      width:  layout.get('width') + 'px',
+      height: layout.get('height') + 'px'
+    });
+
+    return element;
+  }
+
+  function relativize(element) {
+    element = $(element);
+    if (Element.getStyle(element, 'position') === 'relative') {
+      return element;
+    }
+
+    var originalStyles =
+     element.retrieve('prototype_absolutize_original_styles');
+
+    if (originalStyles) element.setStyle(originalStyles);
+    return element;
+  }
+
+  if (Prototype.Browser.IE) {
+    getOffsetParent = getOffsetParent.wrap(
+      function(proceed, element) {
+        element = $(element);
+
+        if (isDocument(element) || isDetached(element) || isBody(element) || isHtml(element))
+          return $(document.body);
+
+        var position = element.getStyle('position');
+        if (position !== 'static') return proceed(element);
+
+        element.setStyle({ position: 'relative' });
+        var value = proceed(element);
+        element.setStyle({ position: position });
+        return value;
+      }
+    );
+
+    positionedOffset = positionedOffset.wrap(function(proceed, element) {
+      element = $(element);
+      if (!element.parentNode) return new Element.Offset(0, 0);
+      var position = element.getStyle('position');
+      if (position !== 'static') return proceed(element);
+
+      var offsetParent = element.getOffsetParent();
+      if (offsetParent && offsetParent.getStyle('position') === 'fixed')
+        hasLayout(offsetParent);
+
+      element.setStyle({ position: 'relative' });
+      var value = proceed(element);
+      element.setStyle({ position: position });
+      return value;
+    });
+  } else if (Prototype.Browser.Webkit) {
+    cumulativeOffset = function(element) {
+      element = $(element);
+      var valueT = 0, valueL = 0;
+      do {
+        valueT += element.offsetTop  || 0;
+        valueL += element.offsetLeft || 0;
+        if (element.offsetParent == document.body)
+          if (Element.getStyle(element, 'position') == 'absolute') break;
+
+        element = element.offsetParent;
+      } while (element);
+
+      return new Element.Offset(valueL, valueT);
+    };
+  }
+
+
+  Element.addMethods({
+    getLayout:              getLayout,
+    measure:                measure,
+    getDimensions:          getDimensions,
+    getOffsetParent:        getOffsetParent,
+    cumulativeOffset:       cumulativeOffset,
+    positionedOffset:       positionedOffset,
+    cumulativeScrollOffset: cumulativeScrollOffset,
+    viewportOffset:         viewportOffset,
+    absolutize:             absolutize,
+    relativize:             relativize
+  });
+
+  function isBody(element) {
+    return element.nodeName.toUpperCase() === 'BODY';
+  }
+
+  function isHtml(element) {
+    return element.nodeName.toUpperCase() === 'HTML';
+  }
+
+  function isDocument(element) {
+    return element.nodeType === Node.DOCUMENT_NODE;
+  }
+
+  function isDetached(element) {
+    return element !== document.body &&
+     !Element.descendantOf(element, document.body);
+  }
+
+  if ('getBoundingClientRect' in document.documentElement) {
+    Element.addMethods({
+      viewportOffset: function(element) {
+        element = $(element);
+        if (isDetached(element)) return new Element.Offset(0, 0);
+
+        var rect = element.getBoundingClientRect(),
+         docEl = document.documentElement;
+        return new Element.Offset(rect.left - docEl.clientLeft,
+         rect.top - docEl.clientTop);
+      }
+    });
+  }
+})();
+window.$$ = function() {
+  var expression = $A(arguments).join(', ');
+  return Prototype.Selector.select(expression, document);
+};
+
+Prototype.Selector = (function() {
+
+  function select() {
+    throw new Error('Method "Prototype.Selector.select" must be defined.');
+  }
+
+  function match() {
+    throw new Error('Method "Prototype.Selector.match" must be defined.');
+  }
+
+  function find(elements, expression, index) {
+    index = index || 0;
+    var match = Prototype.Selector.match, length = elements.length, matchIndex = 0, i;
+
+    for (i = 0; i < length; i++) {
+      if (match(elements[i], expression) && index == matchIndex++) {
+        return Element.extend(elements[i]);
+      }
+    }
+  }
+
+  function extendElements(elements) {
+    for (var i = 0, length = elements.length; i < length; i++) {
+      Element.extend(elements[i]);
+    }
+    return elements;
+  }
+
+
+  var K = Prototype.K;
+
+  return {
+    select: select,
+    match: match,
+    find: find,
+    extendElements: (Element.extend === K) ? K : extendElements,
+    extendElement: Element.extend
+  };
+})();
+Prototype._original_property = window.Sizzle;
+/*!
+ * Sizzle CSS Selector Engine - v1.0
+ *  Copyright 2009, The Dojo Foundation
+ *  Released under the MIT, BSD, and GPL Licenses.
+ *  More information: http://sizzlejs.com/
+ */
+(function(){
+
+var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,
+	done = 0,
+	toString = Object.prototype.toString,
+	hasDuplicate = false,
+	baseHasDuplicate = true;
+
+[0, 0].sort(function(){
+	baseHasDuplicate = false;
+	return 0;
+});
+
+var Sizzle = function(selector, context, results, seed) {
+	results = results || [];
+	var origContext = context = context || document;
+
+	if ( context.nodeType !== 1 && context.nodeType !== 9 ) {
+		return [];
+	}
+
+	if ( !selector || typeof selector !== "string" ) {
+		return results;
+	}
+
+	var parts = [], m, set, checkSet, check, mode, extra, prune = true, contextXML = isXML(context),
+		soFar = selector;
+
+	while ( (chunker.exec(""), m = chunker.exec(soFar)) !== null ) {
+		soFar = m[3];
+
+		parts.push( m[1] );
+
+		if ( m[2] ) {
+			extra = m[3];
+			break;
+		}
+	}
+
+	if ( parts.length > 1 && origPOS.exec( selector ) ) {
+		if ( parts.length === 2 && Expr.relative[ parts[0] ] ) {
+			set = posProcess( parts[0] + parts[1], context );
+		} else {
+			set = Expr.relative[ parts[0] ] ?
+				[ context ] :
+				Sizzle( parts.shift(), context );
+
+			while ( parts.length ) {
+				selector = parts.shift();
+
+				if ( Expr.relative[ selector ] )
+					selector += parts.shift();
+
+				set = posProcess( selector, set );
+			}
+		}
+	} else {
+		if ( !seed && parts.length > 1 && context.nodeType === 9 && !contextXML &&
+				Expr.match.ID.test(parts[0]) && !Expr.match.ID.test(parts[parts.length - 1]) ) {
+			var ret = Sizzle.find( parts.shift(), context, contextXML );
+			context = ret.expr ? Sizzle.filter( ret.expr, ret.set )[0] : ret.set[0];
+		}
+
+		if ( context ) {
+			var ret = seed ?
+				{ expr: parts.pop(), set: makeArray(seed) } :
+				Sizzle.find( parts.pop(), parts.length === 1 && (parts[0] === "~" || parts[0] === "+") && context.parentNode ? context.parentNode : context, contextXML );
+			set = ret.expr ? Sizzle.filter( ret.expr, ret.set ) : ret.set;
+
+			if ( parts.length > 0 ) {
+				checkSet = makeArray(set);
+			} else {
+				prune = false;
+			}
+
+			while ( parts.length ) {
+				var cur = parts.pop(), pop = cur;
+
+				if ( !Expr.relative[ cur ] ) {
+					cur = "";
+				} else {
+					pop = parts.pop();
+				}
+
+				if ( pop == null ) {
+					pop = context;
+				}
+
+				Expr.relative[ cur ]( checkSet, pop, contextXML );
+			}
+		} else {
+			checkSet = parts = [];
+		}
+	}
+
+	if ( !checkSet ) {
+		checkSet = set;
+	}
+
+	if ( !checkSet ) {
+		throw "Syntax error, unrecognized expression: " + (cur || selector);
+	}
+
+	if ( toString.call(checkSet) === "[object Array]" ) {
+		if ( !prune ) {
+			results.push.apply( results, checkSet );
+		} else if ( context && context.nodeType === 1 ) {
+			for ( var i = 0; checkSet[i] != null; i++ ) {
+				if ( checkSet[i] && (checkSet[i] === true || checkSet[i].nodeType === 1 && contains(context, checkSet[i])) ) {
+					results.push( set[i] );
+				}
+			}
+		} else {
+			for ( var i = 0; checkSet[i] != null; i++ ) {
+				if ( checkSet[i] && checkSet[i].nodeType === 1 ) {
+					results.push( set[i] );
+				}
+			}
+		}
+	} else {
+		makeArray( checkSet, results );
+	}
+
+	if ( extra ) {
+		Sizzle( extra, origContext, results, seed );
+		Sizzle.uniqueSort( results );
+	}
+
+	return results;
+};
+
+Sizzle.uniqueSort = function(results){
+	if ( sortOrder ) {
+		hasDuplicate = baseHasDuplicate;
+		results.sort(sortOrder);
+
+		if ( hasDuplicate ) {
+			for ( var i = 1; i < results.length; i++ ) {
+				if ( results[i] === results[i-1] ) {
+					results.splice(i--, 1);
+				}
+			}
+		}
+	}
+
+	return results;
+};
+
+Sizzle.matches = function(expr, set){
+	return Sizzle(expr, null, null, set);
+};
+
+Sizzle.find = function(expr, context, isXML){
+	var set, match;
+
+	if ( !expr ) {
+		return [];
+	}
+
+	for ( var i = 0, l = Expr.order.length; i < l; i++ ) {
+		var type = Expr.order[i], match;
+
+		if ( (match = Expr.leftMatch[ type ].exec( expr )) ) {
+			var left = match[1];
+			match.splice(1,1);
+
+			if ( left.substr( left.length - 1 ) !== "\\" ) {
+				match[1] = (match[1] || "").replace(/\\/g, "");
+				set = Expr.find[ type ]( match, context, isXML );
+				if ( set != null ) {
+					expr = expr.replace( Expr.match[ type ], "" );
+					break;
+				}
+			}
+		}
+	}
+
+	if ( !set ) {
+		set = context.getElementsByTagName("*");
+	}
+
+	return {set: set, expr: expr};
+};
+
+Sizzle.filter = function(expr, set, inplace, not){
+	var old = expr, result = [], curLoop = set, match, anyFound,
+		isXMLFilter = set && set[0] && isXML(set[0]);
+
+	while ( expr && set.length ) {
+		for ( var type in Expr.filter ) {
+			if ( (match = Expr.match[ type ].exec( expr )) != null ) {
+				var filter = Expr.filter[ type ], found, item;
+				anyFound = false;
+
+				if ( curLoop == result ) {
+					result = [];
+				}
+
+				if ( Expr.preFilter[ type ] ) {
+					match = Expr.preFilter[ type ]( match, curLoop, inplace, result, not, isXMLFilter );
+
+					if ( !match ) {
+						anyFound = found = true;
+					} else if ( match === true ) {
+						continue;
+					}
+				}
+
+				if ( match ) {
+					for ( var i = 0; (item = curLoop[i]) != null; i++ ) {
+						if ( item ) {
+							found = filter( item, match, i, curLoop );
+							var pass = not ^ !!found;
+
+							if ( inplace && found != null ) {
+								if ( pass ) {
+									anyFound = true;
+								} else {
+									curLoop[i] = false;
+								}
+							} else if ( pass ) {
+								result.push( item );
+								anyFound = true;
+							}
+						}
+					}
+				}
+
+				if ( found !== undefined ) {
+					if ( !inplace ) {
+						curLoop = result;
+					}
+
+					expr = expr.replace( Expr.match[ type ], "" );
+
+					if ( !anyFound ) {
+						return [];
+					}
+
+					break;
+				}
+			}
+		}
+
+		if ( expr == old ) {
+			if ( anyFound == null ) {
+				throw "Syntax error, unrecognized expression: " + expr;
+			} else {
+				break;
+			}
+		}
+
+		old = expr;
+	}
+
+	return curLoop;
+};
+
+var Expr = Sizzle.selectors = {
+	order: [ "ID", "NAME", "TAG" ],
+	match: {
+		ID: /#((?:[\w\u00c0-\uFFFF-]|\\.)+)/,
+		CLASS: /\.((?:[\w\u00c0-\uFFFF-]|\\.)+)/,
+		NAME: /\[name=['"]*((?:[\w\u00c0-\uFFFF-]|\\.)+)['"]*\]/,
+		ATTR: /\[\s*((?:[\w\u00c0-\uFFFF-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,
+		TAG: /^((?:[\w\u00c0-\uFFFF\*-]|\\.)+)/,
+		CHILD: /:(only|nth|last|first)-child(?:\((even|odd|[\dn+-]*)\))?/,
+		POS: /:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^-]|$)/,
+		PSEUDO: /:((?:[\w\u00c0-\uFFFF-]|\\.)+)(?:\((['"]*)((?:\([^\)]+\)|[^\2\(\)]*)+)\2\))?/
+	},
+	leftMatch: {},
+	attrMap: {
+		"class": "className",
+		"for": "htmlFor"
+	},
+	attrHandle: {
+		href: function(elem){
+			return elem.getAttribute("href");
+		}
+	},
+	relative: {
+		"+": function(checkSet, part, isXML){
+			var isPartStr = typeof part === "string",
+				isTag = isPartStr && !/\W/.test(part),
+				isPartStrNotTag = isPartStr && !isTag;
+
+			if ( isTag && !isXML ) {
+				part = part.toUpperCase();
+			}
+
+			for ( var i = 0, l = checkSet.length, elem; i < l; i++ ) {
+				if ( (elem = checkSet[i]) ) {
+					while ( (elem = elem.previousSibling) && elem.nodeType !== 1 ) {}
+
+					checkSet[i] = isPartStrNotTag || elem && elem.nodeName === part ?
+						elem || false :
+						elem === part;
+				}
+			}
+
+			if ( isPartStrNotTag ) {
+				Sizzle.filter( part, checkSet, true );
+			}
+		},
+		">": function(checkSet, part, isXML){
+			var isPartStr = typeof part === "string";
+
+			if ( isPartStr && !/\W/.test(part) ) {
+				part = isXML ? part : part.toUpperCase();
+
+				for ( var i = 0, l = checkSet.length; i < l; i++ ) {
+					var elem = checkSet[i];
+					if ( elem ) {
+						var parent = elem.parentNode;
+						checkSet[i] = parent.nodeName === part ? parent : false;
+					}
+				}
+			} else {
+				for ( var i = 0, l = checkSet.length; i < l; i++ ) {
+					var elem = checkSet[i];
+					if ( elem ) {
+						checkSet[i] = isPartStr ?
+							elem.parentNode :
+							elem.parentNode === part;
+					}
+				}
+
+				if ( isPartStr ) {
+					Sizzle.filter( part, checkSet, true );
+				}
+			}
+		},
+		"": function(checkSet, part, isXML){
+			var doneName = done++, checkFn = dirCheck;
+
+			if ( !/\W/.test(part) ) {
+				var nodeCheck = part = isXML ? part : part.toUpperCase();
+				checkFn = dirNodeCheck;
+			}
+
+			checkFn("parentNode", part, doneName, checkSet, nodeCheck, isXML);
+		},
+		"~": function(checkSet, part, isXML){
+			var doneName = done++, checkFn = dirCheck;
+
+			if ( typeof part === "string" && !/\W/.test(part) ) {
+				var nodeCheck = part = isXML ? part : part.toUpperCase();
+				checkFn = dirNodeCheck;
+			}
+
+			checkFn("previousSibling", part, doneName, checkSet, nodeCheck, isXML);
+		}
+	},
+	find: {
+		ID: function(match, context, isXML){
+			if ( typeof context.getElementById !== "undefined" && !isXML ) {
+				var m = context.getElementById(match[1]);
+				return m ? [m] : [];
+			}
+		},
+		NAME: function(match, context, isXML){
+			if ( typeof context.getElementsByName !== "undefined" ) {
+				var ret = [], results = context.getElementsByName(match[1]);
+
+				for ( var i = 0, l = results.length; i < l; i++ ) {
+					if ( results[i].getAttribute("name") === match[1] ) {
+						ret.push( results[i] );
+					}
+				}
+
+				return ret.length === 0 ? null : ret;
+			}
+		},
+		TAG: function(match, context){
+			return context.getElementsByTagName(match[1]);
+		}
+	},
+	preFilter: {
+		CLASS: function(match, curLoop, inplace, result, not, isXML){
+			match = " " + match[1].replace(/\\/g, "") + " ";
+
+			if ( isXML ) {
+				return match;
+			}
+
+			for ( var i = 0, elem; (elem = curLoop[i]) != null; i++ ) {
+				if ( elem ) {
+					if ( not ^ (elem.className && (" " + elem.className + " ").indexOf(match) >= 0) ) {
+						if ( !inplace )
+							result.push( elem );
+					} else if ( inplace ) {
+						curLoop[i] = false;
+					}
+				}
+			}
+
+			return false;
+		},
+		ID: function(match){
+			return match[1].replace(/\\/g, "");
+		},
+		TAG: function(match, curLoop){
+			for ( var i = 0; curLoop[i] === false; i++ ){}
+			return curLoop[i] && isXML(curLoop[i]) ? match[1] : match[1].toUpperCase();
+		},
+		CHILD: function(match){
+			if ( match[1] == "nth" ) {
+				var test = /(-?)(\d*)n((?:\+|-)?\d*)/.exec(
+					match[2] == "even" && "2n" || match[2] == "odd" && "2n+1" ||
+					!/\D/.test( match[2] ) && "0n+" + match[2] || match[2]);
+
+				match[2] = (test[1] + (test[2] || 1)) - 0;
+				match[3] = test[3] - 0;
+			}
+
+			match[0] = done++;
+
+			return match;
+		},
+		ATTR: function(match, curLoop, inplace, result, not, isXML){
+			var name = match[1].replace(/\\/g, "");
+
+			if ( !isXML && Expr.attrMap[name] ) {
+				match[1] = Expr.attrMap[name];
+			}
+
+			if ( match[2] === "~=" ) {
+				match[4] = " " + match[4] + " ";
+			}
+
+			return match;
+		},
+		PSEUDO: function(match, curLoop, inplace, result, not){
+			if ( match[1] === "not" ) {
+				if ( ( chunker.exec(match[3]) || "" ).length > 1 || /^\w/.test(match[3]) ) {
+					match[3] = Sizzle(match[3], null, null, curLoop);
+				} else {
+					var ret = Sizzle.filter(match[3], curLoop, inplace, true ^ not);
+					if ( !inplace ) {
+						result.push.apply( result, ret );
+					}
+					return false;
+				}
+			} else if ( Expr.match.POS.test( match[0] ) || Expr.match.CHILD.test( match[0] ) ) {
+				return true;
+			}
+
+			return match;
+		},
+		POS: function(match){
+			match.unshift( true );
+			return match;
+		}
+	},
+	filters: {
+		enabled: function(elem){
+			return elem.disabled === false && elem.type !== "hidden";
+		},
+		disabled: function(elem){
+			return elem.disabled === true;
+		},
+		checked: function(elem){
+			return elem.checked === true;
+		},
+		selected: function(elem){
+			elem.parentNode.selectedIndex;
+			return elem.selected === true;
+		},
+		parent: function(elem){
+			return !!elem.firstChild;
+		},
+		empty: function(elem){
+			return !elem.firstChild;
+		},
+		has: function(elem, i, match){
+			return !!Sizzle( match[3], elem ).length;
+		},
+		header: function(elem){
+			return /h\d/i.test( elem.nodeName );
+		},
+		text: function(elem){
+			return "text" === elem.type;
+		},
+		radio: function(elem){
+			return "radio" === elem.type;
+		},
+		checkbox: function(elem){
+			return "checkbox" === elem.type;
+		},
+		file: function(elem){
+			return "file" === elem.type;
+		},
+		password: function(elem){
+			return "password" === elem.type;
+		},
+		submit: function(elem){
+			return "submit" === elem.type;
+		},
+		image: function(elem){
+			return "image" === elem.type;
+		},
+		reset: function(elem){
+			return "reset" === elem.type;
+		},
+		button: function(elem){
+			return "button" === elem.type || elem.nodeName.toUpperCase() === "BUTTON";
+		},
+		input: function(elem){
+			return /input|select|textarea|button/i.test(elem.nodeName);
+		}
+	},
+	setFilters: {
+		first: function(elem, i){
+			return i === 0;
+		},
+		last: function(elem, i, match, array){
+			return i === array.length - 1;
+		},
+		even: function(elem, i){
+			return i % 2 === 0;
+		},
+		odd: function(elem, i){
+			return i % 2 === 1;
+		},
+		lt: function(elem, i, match){
+			return i < match[3] - 0;
+		},
+		gt: function(elem, i, match){
+			return i > match[3] - 0;
+		},
+		nth: function(elem, i, match){
+			return match[3] - 0 == i;
+		},
+		eq: function(elem, i, match){
+			return match[3] - 0 == i;
+		}
+	},
+	filter: {
+		PSEUDO: function(elem, match, i, array){
+			var name = match[1], filter = Expr.filters[ name ];
+
+			if ( filter ) {
+				return filter( elem, i, match, array );
+			} else if ( name === "contains" ) {
+				return (elem.textContent || elem.innerText || "").indexOf(match[3]) >= 0;
+			} else if ( name === "not" ) {
+				var not = match[3];
+
+				for ( var i = 0, l = not.length; i < l; i++ ) {
+					if ( not[i] === elem ) {
+						return false;
+					}
+				}
+
+				return true;
+			}
+		},
+		CHILD: function(elem, match){
+			var type = match[1], node = elem;
+			switch (type) {
+				case 'only':
+				case 'first':
+					while ( (node = node.previousSibling) )  {
+						if ( node.nodeType === 1 ) return false;
+					}
+					if ( type == 'first') return true;
+					node = elem;
+				case 'last':
+					while ( (node = node.nextSibling) )  {
+						if ( node.nodeType === 1 ) return false;
+					}
+					return true;
+				case 'nth':
+					var first = match[2], last = match[3];
+
+					if ( first == 1 && last == 0 ) {
+						return true;
+					}
+
+					var doneName = match[0],
+						parent = elem.parentNode;
+
+					if ( parent && (parent.sizcache !== doneName || !elem.nodeIndex) ) {
+						var count = 0;
+						for ( node = parent.firstChild; node; node = node.nextSibling ) {
+							if ( node.nodeType === 1 ) {
+								node.nodeIndex = ++count;
+							}
+						}
+						parent.sizcache = doneName;
+					}
+
+					var diff = elem.nodeIndex - last;
+					if ( first == 0 ) {
+						return diff == 0;
+					} else {
+						return ( diff % first == 0 && diff / first >= 0 );
+					}
+			}
+		},
+		ID: function(elem, match){
+			return elem.nodeType === 1 && elem.getAttribute("id") === match;
+		},
+		TAG: function(elem, match){
+			return (match === "*" && elem.nodeType === 1) || elem.nodeName === match;
+		},
+		CLASS: function(elem, match){
+			return (" " + (elem.className || elem.getAttribute("class")) + " ")
+				.indexOf( match ) > -1;
+		},
+		ATTR: function(elem, match){
+			var name = match[1],
+				result = Expr.attrHandle[ name ] ?
+					Expr.attrHandle[ name ]( elem ) :
+					elem[ name ] != null ?
+						elem[ name ] :
+						elem.getAttribute( name ),
+				value = result + "",
+				type = match[2],
+				check = match[4];
+
+			return result == null ?
+				type === "!=" :
+				type === "=" ?
+				value === check :
+				type === "*=" ?
+				value.indexOf(check) >= 0 :
+				type === "~=" ?
+				(" " + value + " ").indexOf(check) >= 0 :
+				!check ?
+				value && result !== false :
+				type === "!=" ?
+				value != check :
+				type === "^=" ?
+				value.indexOf(check) === 0 :
+				type === "$=" ?
+				value.substr(value.length - check.length) === check :
+				type === "|=" ?
+				value === check || value.substr(0, check.length + 1) === check + "-" :
+				false;
+		},
+		POS: function(elem, match, i, array){
+			var name = match[2], filter = Expr.setFilters[ name ];
+
+			if ( filter ) {
+				return filter( elem, i, match, array );
+			}
+		}
+	}
+};
+
+var origPOS = Expr.match.POS;
+
+for ( var type in Expr.match ) {
+	Expr.match[ type ] = new RegExp( Expr.match[ type ].source + /(?![^\[]*\])(?![^\(]*\))/.source );
+	Expr.leftMatch[ type ] = new RegExp( /(^(?:.|\r|\n)*?)/.source + Expr.match[ type ].source );
+}
+
+var makeArray = function(array, results) {
+	array = Array.prototype.slice.call( array, 0 );
+
+	if ( results ) {
+		results.push.apply( results, array );
+		return results;
+	}
+
+	return array;
+};
+
+try {
+	Array.prototype.slice.call( document.documentElement.childNodes, 0 );
+
+} catch(e){
+	makeArray = function(array, results) {
+		var ret = results || [];
+
+		if ( toString.call(array) === "[object Array]" ) {
+			Array.prototype.push.apply( ret, array );
+		} else {
+			if ( typeof array.length === "number" ) {
+				for ( var i = 0, l = array.length; i < l; i++ ) {
+					ret.push( array[i] );
+				}
+			} else {
+				for ( var i = 0; array[i]; i++ ) {
+					ret.push( array[i] );
+				}
+			}
+		}
+
+		return ret;
+	};
+}
+
+var sortOrder;
+
+if ( document.documentElement.compareDocumentPosition ) {
+	sortOrder = function( a, b ) {
+		if ( !a.compareDocumentPosition || !b.compareDocumentPosition ) {
+			if ( a == b ) {
+				hasDuplicate = true;
+			}
+			return 0;
+		}
+
+		var ret = a.compareDocumentPosition(b) & 4 ? -1 : a === b ? 0 : 1;
+		if ( ret === 0 ) {
+			hasDuplicate = true;
+		}
+		return ret;
+	};
+} else if ( "sourceIndex" in document.documentElement ) {
+	sortOrder = function( a, b ) {
+		if ( !a.sourceIndex || !b.sourceIndex ) {
+			if ( a == b ) {
+				hasDuplicate = true;
+			}
+			return 0;
+		}
+
+		var ret = a.sourceIndex - b.sourceIndex;
+		if ( ret === 0 ) {
+			hasDuplicate = true;
+		}
+		return ret;
+	};
+} else if ( document.createRange ) {
+	sortOrder = function( a, b ) {
+		if ( !a.ownerDocument || !b.ownerDocument ) {
+			if ( a == b ) {
+				hasDuplicate = true;
+			}
+			return 0;
+		}
+
+		var aRange = a.ownerDocument.createRange(), bRange = b.ownerDocument.createRange();
+		aRange.setStart(a, 0);
+		aRange.setEnd(a, 0);
+		bRange.setStart(b, 0);
+		bRange.setEnd(b, 0);
+		var ret = aRange.compareBoundaryPoints(Range.START_TO_END, bRange);
+		if ( ret === 0 ) {
+			hasDuplicate = true;
+		}
+		return ret;
+	};
+}
+
+(function(){
+	var form = document.createElement("div"),
+		id = "script" + (new Date).getTime();
+	form.innerHTML = "<a name='" + id + "'/>";
+
+	var root = document.documentElement;
+	root.insertBefore( form, root.firstChild );
+
+	if ( !!document.getElementById( id ) ) {
+		Expr.find.ID = function(match, context, isXML){
+			if ( typeof context.getElementById !== "undefined" && !isXML ) {
+				var m = context.getElementById(match[1]);
+				return m ? m.id === match[1] || typeof m.getAttributeNode !== "undefined" && m.getAttributeNode("id").nodeValue === match[1] ? [m] : undefined : [];
+			}
+		};
+
+		Expr.filter.ID = function(elem, match){
+			var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id");
+			return elem.nodeType === 1 && node && node.nodeValue === match;
+		};
+	}
+
+	root.removeChild( form );
+	root = form = null; // release memory in IE
+})();
+
+(function(){
+
+	var div = document.createElement("div");
+	div.appendChild( document.createComment("") );
+
+	if ( div.getElementsByTagName("*").length > 0 ) {
+		Expr.find.TAG = function(match, context){
+			var results = context.getElementsByTagName(match[1]);
+
+			if ( match[1] === "*" ) {
+				var tmp = [];
+
+				for ( var i = 0; results[i]; i++ ) {
+					if ( results[i].nodeType === 1 ) {
+						tmp.push( results[i] );
+					}
+				}
+
+				results = tmp;
+			}
+
+			return results;
+		};
+	}
+
+	div.innerHTML = "<a href='#'></a>";
+	if ( div.firstChild && typeof div.firstChild.getAttribute !== "undefined" &&
+			div.firstChild.getAttribute("href") !== "#" ) {
+		Expr.attrHandle.href = function(elem){
+			return elem.getAttribute("href", 2);
+		};
+	}
+
+	div = null; // release memory in IE
+})();
+
+if ( document.querySelectorAll ) (function(){
+	var oldSizzle = Sizzle, div = document.createElement("div");
+	div.innerHTML = "<p class='TEST'></p>";
+
+	if ( div.querySelectorAll && div.querySelectorAll(".TEST").length === 0 ) {
+		return;
+	}
+
+	Sizzle = function(query, context, extra, seed){
+		context = context || document;
+
+		if ( !seed && context.nodeType === 9 && !isXML(context) ) {
+			try {
+				return makeArray( context.querySelectorAll(query), extra );
+			} catch(e){}
+		}
+
+		return oldSizzle(query, context, extra, seed);
+	};
+
+	for ( var prop in oldSizzle ) {
+		Sizzle[ prop ] = oldSizzle[ prop ];
+	}
+
+	div = null; // release memory in IE
+})();
+
+if ( document.getElementsByClassName && document.documentElement.getElementsByClassName ) (function(){
+	var div = document.createElement("div");
+	div.innerHTML = "<div class='test e'></div><div class='test'></div>";
+
+	if ( div.getElementsByClassName("e").length === 0 )
+		return;
+
+	div.lastChild.className = "e";
+
+	if ( div.getElementsByClassName("e").length === 1 )
+		return;
+
+	Expr.order.splice(1, 0, "CLASS");
+	Expr.find.CLASS = function(match, context, isXML) {
+		if ( typeof context.getElementsByClassName !== "undefined" && !isXML ) {
+			return context.getElementsByClassName(match[1]);
+		}
+	};
+
+	div = null; // release memory in IE
+})();
+
+function dirNodeCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
+	var sibDir = dir == "previousSibling" && !isXML;
+	for ( var i = 0, l = checkSet.length; i < l; i++ ) {
+		var elem = checkSet[i];
+		if ( elem ) {
+			if ( sibDir && elem.nodeType === 1 ){
+				elem.sizcache = doneName;
+				elem.sizset = i;
+			}
+			elem = elem[dir];
+			var match = false;
+
+			while ( elem ) {
+				if ( elem.sizcache === doneName ) {
+					match = checkSet[elem.sizset];
+					break;
+				}
+
+				if ( elem.nodeType === 1 && !isXML ){
+					elem.sizcache = doneName;
+					elem.sizset = i;
+				}
+
+				if ( elem.nodeName === cur ) {
+					match = elem;
+					break;
+				}
+
+				elem = elem[dir];
+			}
+
+			checkSet[i] = match;
+		}
+	}
+}
+
+function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
+	var sibDir = dir == "previousSibling" && !isXML;
+	for ( var i = 0, l = checkSet.length; i < l; i++ ) {
+		var elem = checkSet[i];
+		if ( elem ) {
+			if ( sibDir && elem.nodeType === 1 ) {
+				elem.sizcache = doneName;
+				elem.sizset = i;
+			}
+			elem = elem[dir];
+			var match = false;
+
+			while ( elem ) {
+				if ( elem.sizcache === doneName ) {
+					match = checkSet[elem.sizset];
+					break;
+				}
+
+				if ( elem.nodeType === 1 ) {
+					if ( !isXML ) {
+						elem.sizcache = doneName;
+						elem.sizset = i;
+					}
+					if ( typeof cur !== "string" ) {
+						if ( elem === cur ) {
+							match = true;
+							break;
+						}
+
+					} else if ( Sizzle.filter( cur, [elem] ).length > 0 ) {
+						match = elem;
+						break;
+					}
+				}
+
+				elem = elem[dir];
+			}
+
+			checkSet[i] = match;
+		}
+	}
+}
+
+var contains = document.compareDocumentPosition ?  function(a, b){
+	return a.compareDocumentPosition(b) & 16;
+} : function(a, b){
+	return a !== b && (a.contains ? a.contains(b) : true);
+};
+
+var isXML = function(elem){
+	return elem.nodeType === 9 && elem.documentElement.nodeName !== "HTML" ||
+		!!elem.ownerDocument && elem.ownerDocument.documentElement.nodeName !== "HTML";
+};
+
+var posProcess = function(selector, context){
+	var tmpSet = [], later = "", match,
+		root = context.nodeType ? [context] : context;
+
+	while ( (match = Expr.match.PSEUDO.exec( selector )) ) {
+		later += match[0];
+		selector = selector.replace( Expr.match.PSEUDO, "" );
+	}
+
+	selector = Expr.relative[selector] ? selector + "*" : selector;
+
+	for ( var i = 0, l = root.length; i < l; i++ ) {
+		Sizzle( selector, root[i], tmpSet );
+	}
+
+	return Sizzle.filter( later, tmpSet );
+};
+
+
+window.Sizzle = Sizzle;
+
+})();
+
+;(function(engine) {
+  var extendElements = Prototype.Selector.extendElements;
+
+  function select(selector, scope) {
+    return extendElements(engine(selector, scope || document));
+  }
+
+  function match(element, selector) {
+    return engine.matches(selector, [element]).length == 1;
+  }
+
+  Prototype.Selector.engine = engine;
+  Prototype.Selector.select = select;
+  Prototype.Selector.match = match;
+})(Sizzle);
+
+window.Sizzle = Prototype._original_property;
+delete Prototype._original_property;
+
+var Form = {
+  reset: function(form) {
+    form = $(form);
+    form.reset();
+    return form;
+  },
+
+  serializeElements: function(elements, options) {
+    if (typeof options != 'object') options = { hash: !!options };
+    else if (Object.isUndefined(options.hash)) options.hash = true;
+    var key, value, submitted = false, submit = options.submit, accumulator, initial;
+
+    if (options.hash) {
+      initial = {};
+      accumulator = function(result, key, value) {
+        if (key in result) {
+          if (!Object.isArray(result[key])) result[key] = [result[key]];
+          result[key].push(value);
+        } else result[key] = value;
+        return result;
+      };
+    } else {
+      initial = '';
+      accumulator = function(result, key, value) {
+        return result + (result ? '&' : '') + encodeURIComponent(key) + '=' + encodeURIComponent(value);
+      }
+    }
+
+    return elements.inject(initial, function(result, element) {
+      if (!element.disabled && element.name) {
+        key = element.name; value = $(element).getValue();
+        if (value != null && element.type != 'file' && (element.type != 'submit' || (!submitted &&
+            submit !== false && (!submit || key == submit) && (submitted = true)))) {
+          result = accumulator(result, key, value);
+        }
+      }
+      return result;
+    });
+  }
+};
+
+Form.Methods = {
+  serialize: function(form, options) {
+    return Form.serializeElements(Form.getElements(form), options);
+  },
+
+  getElements: function(form) {
+    var elements = $(form).getElementsByTagName('*'),
+        element,
+        arr = [ ],
+        serializers = Form.Element.Serializers;
+    for (var i = 0; element = elements[i]; i++) {
+      arr.push(element);
+    }
+    return arr.inject([], function(elements, child) {
+      if (serializers[child.tagName.toLowerCase()])
+        elements.push(Element.extend(child));
+      return elements;
+    })
+  },
+
+  getInputs: function(form, typeName, name) {
+    form = $(form);
+    var inputs = form.getElementsByTagName('input');
+
+    if (!typeName && !name) return $A(inputs).map(Element.extend);
+
+    for (var i = 0, matchingInputs = [], length = inputs.length; i < length; i++) {
+      var input = inputs[i];
+      if ((typeName && input.type != typeName) || (name && input.name != name))
+        continue;
+      matchingInputs.push(Element.extend(input));
+    }
+
+    return matchingInputs;
+  },
+
+  disable: function(form) {
+    form = $(form);
+    Form.getElements(form).invoke('disable');
+    return form;
+  },
+
+  enable: function(form) {
+    form = $(form);
+    Form.getElements(form).invoke('enable');
+    return form;
+  },
+
+  findFirstElement: function(form) {
+    var elements = $(form).getElements().findAll(function(element) {
+      return 'hidden' != element.type && !element.disabled;
+    });
+    var firstByIndex = elements.findAll(function(element) {
+      return element.hasAttribute('tabIndex') && element.tabIndex >= 0;
+    }).sortBy(function(element) { return element.tabIndex }).first();
+
+    return firstByIndex ? firstByIndex : elements.find(function(element) {
+      return /^(?:input|select|textarea)$/i.test(element.tagName);
+    });
+  },
+
+  focusFirstElement: function(form) {
+    form = $(form);
+    var element = form.findFirstElement();
+    if (element) element.activate();
+    return form;
+  },
+
+  request: function(form, options) {
+    form = $(form), options = Object.clone(options || { });
+
+    var params = options.parameters, action = form.readAttribute('action') || '';
+    if (action.blank()) action = window.location.href;
+    options.parameters = form.serialize(true);
+
+    if (params) {
+      if (Object.isString(params)) params = params.toQueryParams();
+      Object.extend(options.parameters, params);
+    }
+
+    if (form.hasAttribute('method') && !options.method)
+      options.method = form.method;
+
+    return new Ajax.Request(action, options);
+  }
+};
+
+/*--------------------------------------------------------------------------*/
+
+
+Form.Element = {
+  focus: function(element) {
+    $(element).focus();
+    return element;
+  },
+
+  select: function(element) {
+    $(element).select();
+    return element;
+  }
+};
+
+Form.Element.Methods = {
+
+  serialize: function(element) {
+    element = $(element);
+    if (!element.disabled && element.name) {
+      var value = element.getValue();
+      if (value != undefined) {
+        var pair = { };
+        pair[element.name] = value;
+        return Object.toQueryString(pair);
+      }
+    }
+    return '';
+  },
+
+  getValue: function(element) {
+    element = $(element);
+    var method = element.tagName.toLowerCase();
+    return Form.Element.Serializers[method](element);
+  },
+
+  setValue: function(element, value) {
+    element = $(element);
+    var method = element.tagName.toLowerCase();
+    Form.Element.Serializers[method](element, value);
+    return element;
+  },
+
+  clear: function(element) {
+    $(element).value = '';
+    return element;
+  },
+
+  present: function(element) {
+    return $(element).value != '';
+  },
+
+  activate: function(element) {
+    element = $(element);
+    try {
+      element.focus();
+      if (element.select && (element.tagName.toLowerCase() != 'input' ||
+          !(/^(?:button|reset|submit)$/i.test(element.type))))
+        element.select();
+    } catch (e) { }
+    return element;
+  },
+
+  disable: function(element) {
+    element = $(element);
+    element.disabled = true;
+    return element;
+  },
+
+  enable: function(element) {
+    element = $(element);
+    element.disabled = false;
+    return element;
+  }
+};
+
+/*--------------------------------------------------------------------------*/
+
+var Field = Form.Element;
+
+var $F = Form.Element.Methods.getValue;
+
+/*--------------------------------------------------------------------------*/
+
+Form.Element.Serializers = (function() {
+  function input(element, value) {
+    switch (element.type.toLowerCase()) {
+      case 'checkbox':
+      case 'radio':
+        return inputSelector(element, value);
+      default:
+        return valueSelector(element, value);
+    }
+  }
+
+  function inputSelector(element, value) {
+    if (Object.isUndefined(value))
+      return element.checked ? element.value : null;
+    else element.checked = !!value;
+  }
+
+  function valueSelector(element, value) {
+    if (Object.isUndefined(value)) return element.value;
+    else element.value = value;
+  }
+
+  function select(element, value) {
+    if (Object.isUndefined(value))
+      return (element.type === 'select-one' ? selectOne : selectMany)(element);
+
+    var opt, currentValue, single = !Object.isArray(value);
+    for (var i = 0, length = element.length; i < length; i++) {
+      opt = element.options[i];
+      currentValue = this.optionValue(opt);
+      if (single) {
+        if (currentValue == value) {
+          opt.selected = true;
+          return;
+        }
+      }
+      else opt.selected = value.include(currentValue);
+    }
+  }
+
+  function selectOne(element) {
+    var index = element.selectedIndex;
+    return index >= 0 ? optionValue(element.options[index]) : null;
+  }
+
+  function selectMany(element) {
+    var values, length = element.length;
+    if (!length) return null;
+
+    for (var i = 0, values = []; i < length; i++) {
+      var opt = element.options[i];
+      if (opt.selected) values.push(optionValue(opt));
+    }
+    return values;
+  }
+
+  function optionValue(opt) {
+    return Element.hasAttribute(opt, 'value') ? opt.value : opt.text;
+  }
+
+  return {
+    input:         input,
+    inputSelector: inputSelector,
+    textarea:      valueSelector,
+    select:        select,
+    selectOne:     selectOne,
+    selectMany:    selectMany,
+    optionValue:   optionValue,
+    button:        valueSelector
+  };
+})();
+
+/*--------------------------------------------------------------------------*/
+
+
+Abstract.TimedObserver = Class.create(PeriodicalExecuter, {
+  initialize: function($super, element, frequency, callback) {
+    $super(callback, frequency);
+    this.element   = $(element);
+    this.lastValue = this.getValue();
+  },
+
+  execute: function() {
+    var value = this.getValue();
+    if (Object.isString(this.lastValue) && Object.isString(value) ?
+        this.lastValue != value : String(this.lastValue) != String(value)) {
+      this.callback(this.element, value);
+      this.lastValue = value;
+    }
+  }
+});
+
+Form.Element.Observer = Class.create(Abstract.TimedObserver, {
+  getValue: function() {
+    return Form.Element.getValue(this.element);
+  }
+});
+
+Form.Observer = Class.create(Abstract.TimedObserver, {
+  getValue: function() {
+    return Form.serialize(this.element);
+  }
+});
+
+/*--------------------------------------------------------------------------*/
+
+Abstract.EventObserver = Class.create({
+  initialize: function(element, callback) {
+    this.element  = $(element);
+    this.callback = callback;
+
+    this.lastValue = this.getValue();
+    if (this.element.tagName.toLowerCase() == 'form')
+      this.registerFormCallbacks();
+    else
+      this.registerCallback(this.element);
+  },
+
+  onElementEvent: function() {
+    var value = this.getValue();
+    if (this.lastValue != value) {
+      this.callback(this.element, value);
+      this.lastValue = value;
+    }
+  },
+
+  registerFormCallbacks: function() {
+    Form.getElements(this.element).each(this.registerCallback, this);
+  },
+
+  registerCallback: function(element) {
+    if (element.type) {
+      switch (element.type.toLowerCase()) {
+        case 'checkbox':
+        case 'radio':
+          Event.observe(element, 'click', this.onElementEvent.bind(this));
+          break;
+        default:
+          Event.observe(element, 'change', this.onElementEvent.bind(this));
+          break;
+      }
+    }
+  }
+});
+
+Form.Element.EventObserver = Class.create(Abstract.EventObserver, {
+  getValue: function() {
+    return Form.Element.getValue(this.element);
+  }
+});
+
+Form.EventObserver = Class.create(Abstract.EventObserver, {
+  getValue: function() {
+    return Form.serialize(this.element);
+  }
+});
+(function() {
+
+  var Event = {
+    KEY_BACKSPACE: 8,
+    KEY_TAB:       9,
+    KEY_RETURN:   13,
+    KEY_ESC:      27,
+    KEY_LEFT:     37,
+    KEY_UP:       38,
+    KEY_RIGHT:    39,
+    KEY_DOWN:     40,
+    KEY_DELETE:   46,
+    KEY_HOME:     36,
+    KEY_END:      35,
+    KEY_PAGEUP:   33,
+    KEY_PAGEDOWN: 34,
+    KEY_INSERT:   45,
+
+    cache: {}
+  };
+
+  var docEl = document.documentElement;
+  var MOUSEENTER_MOUSELEAVE_EVENTS_SUPPORTED = 'onmouseenter' in docEl
+    && 'onmouseleave' in docEl;
+
+
+
+  var isIELegacyEvent = function(event) { return false; };
+
+  if (window.attachEvent) {
+    if (window.addEventListener) {
+      isIELegacyEvent = function(event) {
+        return !(event instanceof window.Event);
+      };
+    } else {
+      isIELegacyEvent = function(event) { return true; };
+    }
+  }
+
+  var _isButton;
+
+  function _isButtonForDOMEvents(event, code) {
+    return event.which ? (event.which === code + 1) : (event.button === code);
+  }
+
+  var legacyButtonMap = { 0: 1, 1: 4, 2: 2 };
+  function _isButtonForLegacyEvents(event, code) {
+    return event.button === legacyButtonMap[code];
+  }
+
+  function _isButtonForWebKit(event, code) {
+    switch (code) {
+      case 0: return event.which == 1 && !event.metaKey;
+      case 1: return event.which == 2 || (event.which == 1 && event.metaKey);
+      case 2: return event.which == 3;
+      default: return false;
+    }
+  }
+
+  if (window.attachEvent) {
+    if (!window.addEventListener) {
+      _isButton = _isButtonForLegacyEvents;
+    } else {
+      _isButton = function(event, code) {
+        return isIELegacyEvent(event) ? _isButtonForLegacyEvents(event, code) :
+         _isButtonForDOMEvents(event, code);
+      }
+    }
+  } else if (Prototype.Browser.WebKit) {
+    _isButton = _isButtonForWebKit;
+  } else {
+    _isButton = _isButtonForDOMEvents;
+  }
+
+  function isLeftClick(event)   { return _isButton(event, 0) }
+
+  function isMiddleClick(event) { return _isButton(event, 1) }
+
+  function isRightClick(event)  { return _isButton(event, 2) }
+
+  function element(event) {
+    event = Event.extend(event);
+
+    var node = event.target, type = event.type,
+     currentTarget = event.currentTarget;
+
+    if (currentTarget && currentTarget.tagName) {
+      if (type === 'load' || type === 'error' ||
+        (type === 'click' && currentTarget.tagName.toLowerCase() === 'input'
+          && currentTarget.type === 'radio'))
+            node = currentTarget;
+    }
+
+    if (node.nodeType == Node.TEXT_NODE)
+      node = node.parentNode;
+
+    return Element.extend(node);
+  }
+
+  function findElement(event, expression) {
+    var element = Event.element(event);
+
+    if (!expression) return element;
+    while (element) {
+      if (Object.isElement(element) && Prototype.Selector.match(element, expression)) {
+        return Element.extend(element);
+      }
+      element = element.parentNode;
+    }
+  }
+
+  function pointer(event) {
+    return { x: pointerX(event), y: pointerY(event) };
+  }
+
+  function pointerX(event) {
+    var docElement = document.documentElement,
+     body = document.body || { scrollLeft: 0 };
+
+    return event.pageX || (event.clientX +
+      (docElement.scrollLeft || body.scrollLeft) -
+      (docElement.clientLeft || 0));
+  }
+
+  function pointerY(event) {
+    var docElement = document.documentElement,
+     body = document.body || { scrollTop: 0 };
+
+    return  event.pageY || (event.clientY +
+       (docElement.scrollTop || body.scrollTop) -
+       (docElement.clientTop || 0));
+  }
+
+
+  function stop(event) {
+    Event.extend(event);
+    event.preventDefault();
+    event.stopPropagation();
+
+    event.stopped = true;
+  }
+
+
+  Event.Methods = {
+    isLeftClick:   isLeftClick,
+    isMiddleClick: isMiddleClick,
+    isRightClick:  isRightClick,
+
+    element:     element,
+    findElement: findElement,
+
+    pointer:  pointer,
+    pointerX: pointerX,
+    pointerY: pointerY,
+
+    stop: stop
+  };
+
+  var methods = Object.keys(Event.Methods).inject({ }, function(m, name) {
+    m[name] = Event.Methods[name].methodize();
+    return m;
+  });
+
+  if (window.attachEvent) {
+    function _relatedTarget(event) {
+      var element;
+      switch (event.type) {
+        case 'mouseover':
+        case 'mouseenter':
+          element = event.fromElement;
+          break;
+        case 'mouseout':
+        case 'mouseleave':
+          element = event.toElement;
+          break;
+        default:
+          return null;
+      }
+      return Element.extend(element);
+    }
+
+    var additionalMethods = {
+      stopPropagation: function() { this.cancelBubble = true },
+      preventDefault:  function() { this.returnValue = false },
+      inspect: function() { return '[object Event]' }
+    };
+
+    Event.extend = function(event, element) {
+      if (!event) return false;
+
+      if (!isIELegacyEvent(event)) return event;
+
+      if (event._extendedByPrototype) return event;
+      event._extendedByPrototype = Prototype.emptyFunction;
+
+      var pointer = Event.pointer(event);
+
+      Object.extend(event, {
+        target: event.srcElement || element,
+        relatedTarget: _relatedTarget(event),
+        pageX:  pointer.x,
+        pageY:  pointer.y
+      });
+
+      Object.extend(event, methods);
+      Object.extend(event, additionalMethods);
+
+      return event;
+    };
+  } else {
+    Event.extend = Prototype.K;
+  }
+
+  if (window.addEventListener) {
+    Event.prototype = window.Event.prototype || document.createEvent('HTMLEvents').__proto__;
+    Object.extend(Event.prototype, methods);
+  }
+
+  function _createResponder(element, eventName, handler) {
+    var registry = Element.retrieve(element, 'prototype_event_registry');
+
+    if (Object.isUndefined(registry)) {
+      CACHE.push(element);
+      registry = Element.retrieve(element, 'prototype_event_registry', $H());
+    }
+
+    var respondersForEvent = registry.get(eventName);
+    if (Object.isUndefined(respondersForEvent)) {
+      respondersForEvent = [];
+      registry.set(eventName, respondersForEvent);
+    }
+
+    if (respondersForEvent.pluck('handler').include(handler)) return false;
+
+    var responder;
+    if (eventName.include(":")) {
+      responder = function(event) {
+        if (Object.isUndefined(event.eventName))
+          return false;
+
+        if (event.eventName !== eventName)
+          return false;
+
+        Event.extend(event, element);
+        handler.call(element, event);
+      };
+    } else {
+      if (!MOUSEENTER_MOUSELEAVE_EVENTS_SUPPORTED &&
+       (eventName === "mouseenter" || eventName === "mouseleave")) {
+        if (eventName === "mouseenter" || eventName === "mouseleave") {
+          responder = function(event) {
+            Event.extend(event, element);
+
+            var parent = event.relatedTarget;
+            while (parent && parent !== element) {
+              try { parent = parent.parentNode; }
+              catch(e) { parent = element; }
+            }
+
+            if (parent === element) return;
+
+            handler.call(element, event);
+          };
+        }
+      } else {
+        responder = function(event) {
+          Event.extend(event, element);
+          handler.call(element, event);
+        };
+      }
+    }
+
+    responder.handler = handler;
+    respondersForEvent.push(responder);
+    return responder;
+  }
+
+  function _destroyCache() {
+    for (var i = 0, length = CACHE.length; i < length; i++) {
+      Event.stopObserving(CACHE[i]);
+      CACHE[i] = null;
+    }
+  }
+
+  var CACHE = [];
+
+  if (Prototype.Browser.IE)
+    window.attachEvent('onunload', _destroyCache);
+
+  if (Prototype.Browser.WebKit)
+    window.addEventListener('unload', Prototype.emptyFunction, false);
+
+
+  var _getDOMEventName = Prototype.K,
+      translations = { mouseenter: "mouseover", mouseleave: "mouseout" };
+
+  if (!MOUSEENTER_MOUSELEAVE_EVENTS_SUPPORTED) {
+    _getDOMEventName = function(eventName) {
+      return (translations[eventName] || eventName);
+    };
+  }
+
+  function observe(element, eventName, handler) {
+    element = $(element);
+
+    var responder = _createResponder(element, eventName, handler);
+
+    if (!responder) return element;
+
+    if (eventName.include(':')) {
+      if (element.addEventListener)
+        element.addEventListener("dataavailable", responder, false);
+      else {
+        element.attachEvent("ondataavailable", responder);
+        element.attachEvent("onlosecapture", responder);
+      }
+    } else {
+      var actualEventName = _getDOMEventName(eventName);
+
+      if (element.addEventListener)
+        element.addEventListener(actualEventName, responder, false);
+      else
+        element.attachEvent("on" + actualEventName, responder);
+    }
+
+    return element;
+  }
+
+  function stopObserving(element, eventName, handler) {
+    element = $(element);
+
+    var registry = Element.retrieve(element, 'prototype_event_registry');
+    if (!registry) return element;
+
+    if (!eventName) {
+      registry.each( function(pair) {
+        var eventName = pair.key;
+        stopObserving(element, eventName);
+      });
+      return element;
+    }
+
+    var responders = registry.get(eventName);
+    if (!responders) return element;
+
+    if (!handler) {
+      responders.each(function(r) {
+        stopObserving(element, eventName, r.handler);
+      });
+      return element;
+    }
+
+    var i = responders.length, responder;
+    while (i--) {
+      if (responders[i].handler === handler) {
+        responder = responders[i];
+        break;
+      }
+    }
+    if (!responder) return element;
+
+    if (eventName.include(':')) {
+      if (element.removeEventListener)
+        element.removeEventListener("dataavailable", responder, false);
+      else {
+        element.detachEvent("ondataavailable", responder);
+        element.detachEvent("onlosecapture", responder);
+      }
+    } else {
+      var actualEventName = _getDOMEventName(eventName);
+      if (element.removeEventListener)
+        element.removeEventListener(actualEventName, responder, false);
+      else
+        element.detachEvent('on' + actualEventName, responder);
+    }
+
+    registry.set(eventName, responders.without(responder));
+
+    return element;
+  }
+
+  function fire(element, eventName, memo, bubble) {
+    element = $(element);
+
+    if (Object.isUndefined(bubble))
+      bubble = true;
+
+    if (element == document && document.createEvent && !element.dispatchEvent)
+      element = document.documentElement;
+
+    var event;
+    if (document.createEvent) {
+      event = document.createEvent('HTMLEvents');
+      event.initEvent('dataavailable', bubble, true);
+    } else {
+      event = document.createEventObject();
+      event.eventType = bubble ? 'ondataavailable' : 'onlosecapture';
+    }
+
+    event.eventName = eventName;
+    event.memo = memo || { };
+
+    if (document.createEvent)
+      element.dispatchEvent(event);
+    else
+      element.fireEvent(event.eventType, event);
+
+    return Event.extend(event);
+  }
+
+  Event.Handler = Class.create({
+    initialize: function(element, eventName, selector, callback) {
+      this.element   = $(element);
+      this.eventName = eventName;
+      this.selector  = selector;
+      this.callback  = callback;
+      this.handler   = this.handleEvent.bind(this);
+    },
+
+    start: function() {
+      Event.observe(this.element, this.eventName, this.handler);
+      return this;
+    },
+
+    stop: function() {
+      Event.stopObserving(this.element, this.eventName, this.handler);
+      return this;
+    },
+
+    handleEvent: function(event) {
+      var element = Event.findElement(event, this.selector);
+      if (element) this.callback.call(this.element, event, element);
+    }
+  });
+
+  function on(element, eventName, selector, callback) {
+    element = $(element);
+    if (Object.isFunction(selector) && Object.isUndefined(callback)) {
+      callback = selector, selector = null;
+    }
+
+    return new Event.Handler(element, eventName, selector, callback).start();
+  }
+
+  Object.extend(Event, Event.Methods);
+
+  Object.extend(Event, {
+    fire:          fire,
+    observe:       observe,
+    stopObserving: stopObserving,
+    on:            on
+  });
+
+  Element.addMethods({
+    fire:          fire,
+
+    observe:       observe,
+
+    stopObserving: stopObserving,
+
+    on:            on
+  });
+
+  Object.extend(document, {
+    fire:          fire.methodize(),
+
+    observe:       observe.methodize(),
+
+    stopObserving: stopObserving.methodize(),
+
+    on:            on.methodize(),
+
+    loaded:        false
+  });
+
+  if (window.Event) Object.extend(window.Event, Event);
+  else window.Event = Event;
+})();
+
+(function() {
+  /* Support for the DOMContentLoaded event is based on work by Dan Webb,
+     Matthias Miller, Dean Edwards, John Resig, and Diego Perini. */
+
+  var timer;
+
+  function fireContentLoadedEvent() {
+    if (document.loaded) return;
+    if (timer) window.clearTimeout(timer);
+    document.loaded = true;
+    document.fire('dom:loaded');
+  }
+
+  function checkReadyState() {
+    if (document.readyState === 'complete') {
+      document.stopObserving('readystatechange', checkReadyState);
+      fireContentLoadedEvent();
+    }
+  }
+
+  function pollDoScroll() {
+    try { document.documentElement.doScroll('left'); }
+    catch(e) {
+      timer = pollDoScroll.defer();
+      return;
+    }
+    fireContentLoadedEvent();
+  }
+
+  if (document.addEventListener) {
+    document.addEventListener('DOMContentLoaded', fireContentLoadedEvent, false);
+  } else {
+    document.observe('readystatechange', checkReadyState);
+    if (window == top)
+      timer = pollDoScroll.defer();
+  }
+
+  Event.observe(window, 'load', fireContentLoadedEvent);
+})();
+
+Element.addMethods();
+
+/*------------------------------- DEPRECATED -------------------------------*/
+
+Hash.toQueryString = Object.toQueryString;
+
+var Toggle = { display: Element.toggle };
+
+Element.Methods.childOf = Element.Methods.descendantOf;
+
+var Insertion = {
+  Before: function(element, content) {
+    return Element.insert(element, {before:content});
+  },
+
+  Top: function(element, content) {
+    return Element.insert(element, {top:content});
+  },
+
+  Bottom: function(element, content) {
+    return Element.insert(element, {bottom:content});
+  },
+
+  After: function(element, content) {
+    return Element.insert(element, {after:content});
+  }
+};
+
+var $continue = new Error('"throw $continue" is deprecated, use "return" instead');
+
+var Position = {
+  includeScrollOffsets: false,
+
+  prepare: function() {
+    this.deltaX =  window.pageXOffset
+                || document.documentElement.scrollLeft
+                || document.body.scrollLeft
+                || 0;
+    this.deltaY =  window.pageYOffset
+                || document.documentElement.scrollTop
+                || document.body.scrollTop
+                || 0;
+  },
+
+  within: function(element, x, y) {
+    if (this.includeScrollOffsets)
+      return this.withinIncludingScrolloffsets(element, x, y);
+    this.xcomp = x;
+    this.ycomp = y;
+    this.offset = Element.cumulativeOffset(element);
+
+    return (y >= this.offset[1] &&
+            y <  this.offset[1] + element.offsetHeight &&
+            x >= this.offset[0] &&
+            x <  this.offset[0] + element.offsetWidth);
+  },
+
+  withinIncludingScrolloffsets: function(element, x, y) {
+    var offsetcache = Element.cumulativeScrollOffset(element);
+
+    this.xcomp = x + offsetcache[0] - this.deltaX;
+    this.ycomp = y + offsetcache[1] - this.deltaY;
+    this.offset = Element.cumulativeOffset(element);
+
+    return (this.ycomp >= this.offset[1] &&
+            this.ycomp <  this.offset[1] + element.offsetHeight &&
+            this.xcomp >= this.offset[0] &&
+            this.xcomp <  this.offset[0] + element.offsetWidth);
+  },
+
+  overlap: function(mode, element) {
+    if (!mode) return 0;
+    if (mode == 'vertical')
+      return ((this.offset[1] + element.offsetHeight) - this.ycomp) /
+        element.offsetHeight;
+    if (mode == 'horizontal')
+      return ((this.offset[0] + element.offsetWidth) - this.xcomp) /
+        element.offsetWidth;
+  },
+
+
+  cumulativeOffset: Element.Methods.cumulativeOffset,
+
+  positionedOffset: Element.Methods.positionedOffset,
+
+  absolutize: function(element) {
+    Position.prepare();
+    return Element.absolutize(element);
+  },
+
+  relativize: function(element) {
+    Position.prepare();
+    return Element.relativize(element);
+  },
+
+  realOffset: Element.Methods.cumulativeScrollOffset,
+
+  offsetParent: Element.Methods.getOffsetParent,
+
+  page: Element.Methods.viewportOffset,
+
+  clone: function(source, target, options) {
+    options = options || { };
+    return Element.clonePosition(target, source, options);
+  }
+};
+
+/*--------------------------------------------------------------------------*/
+
+if (!document.getElementsByClassName) document.getElementsByClassName = function(instanceMethods){
+  function iter(name) {
+    return name.blank() ? null : "[contains(concat(' ', @class, ' '), ' " + name + " ')]";
+  }
+
+  instanceMethods.getElementsByClassName = Prototype.BrowserFeatures.XPath ?
+  function(element, className) {
+    className = className.toString().strip();
+    var cond = /\s/.test(className) ? $w(className).map(iter).join('') : iter(className);
+    return cond ? document._getElementsByXPath('.//*' + cond, element) : [];
+  } : function(element, className) {
+    className = className.toString().strip();
+    var elements = [], classNames = (/\s/.test(className) ? $w(className) : null);
+    if (!classNames && !className) return elements;
+
+    var nodes = $(element).getElementsByTagName('*');
+    className = ' ' + className + ' ';
+
+    for (var i = 0, child, cn; child = nodes[i]; i++) {
+      if (child.className && (cn = ' ' + child.className + ' ') && (cn.include(className) ||
+          (classNames && classNames.all(function(name) {
+            return !name.toString().blank() && cn.include(' ' + name + ' ');
+          }))))
+        elements.push(Element.extend(child));
+    }
+    return elements;
+  };
+
+  return function(className, parentElement) {
+    return $(parentElement || document.body).getElementsByClassName(className);
+  };
+}(Element.Methods);
+
+/*--------------------------------------------------------------------------*/
+
+Element.ClassNames = Class.create();
+Element.ClassNames.prototype = {
+  initialize: function(element) {
+    this.element = $(element);
+  },
+
+  _each: function(iterator) {
+    this.element.className.split(/\s+/).select(function(name) {
+      return name.length > 0;
+    })._each(iterator);
+  },
+
+  set: function(className) {
+    this.element.className = className;
+  },
+
+  add: function(classNameToAdd) {
+    if (this.include(classNameToAdd)) return;
+    this.set($A(this).concat(classNameToAdd).join(' '));
+  },
+
+  remove: function(classNameToRemove) {
+    if (!this.include(classNameToRemove)) return;
+    this.set($A(this).without(classNameToRemove).join(' '));
+  },
+
+  toString: function() {
+    return $A(this).join(' ');
+  }
+};
+
+Object.extend(Element.ClassNames.prototype, Enumerable);
+
+/*--------------------------------------------------------------------------*/
+
+(function() {
+  window.Selector = Class.create({
+    initialize: function(expression) {
+      this.expression = expression.strip();
+    },
+
+    findElements: function(rootElement) {
+      return Prototype.Selector.select(this.expression, rootElement);
+    },
+
+    match: function(element) {
+      return Prototype.Selector.match(element, this.expression);
+    },
+
+    toString: function() {
+      return this.expression;
+    },
+
+    inspect: function() {
+      return "#<Selector: " + this.expression + ">";
+    }
+  });
+
+  Object.extend(Selector, {
+    matchElements: function(elements, expression) {
+      var match = Prototype.Selector.match,
+          results = [];
+
+      for (var i = 0, length = elements.length; i < length; i++) {
+        var element = elements[i];
+        if (match(element, expression)) {
+          results.push(Element.extend(element));
+        }
+      }
+      return results;
+    },
+
+    findElement: function(elements, expression, index) {
+      index = index || 0;
+      var matchIndex = 0, element;
+      for (var i = 0, length = elements.length; i < length; i++) {
+        element = elements[i];
+        if (Prototype.Selector.match(element, expression) && index === matchIndex++) {
+          return Element.extend(element);
+        }
+      }
+    },
+
+    findChildElements: function(element, expressions) {
+      var selector = expressions.toArray().join(', ');
+      return Prototype.Selector.select(selector, element || document);
+    }
+  });
+})();
diff --git a/js/src/builder.js b/js/src/builder.js
new file mode 100644
index 0000000..dba8bec
--- /dev/null
+++ b/js/src/builder.js
@@ -0,0 +1,136 @@
+// script.aculo.us builder.js v1.8.2, Tue Nov 18 18:30:58 +0100 2008
+
+// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+//
+// script.aculo.us is freely distributable under the terms of an MIT-style license.
+// For details, see the script.aculo.us web site: http://script.aculo.us/
+
+var Builder = {
+  NODEMAP: {
+    AREA: 'map',
+    CAPTION: 'table',
+    COL: 'table',
+    COLGROUP: 'table',
+    LEGEND: 'fieldset',
+    OPTGROUP: 'select',
+    OPTION: 'select',
+    PARAM: 'object',
+    TBODY: 'table',
+    TD: 'table',
+    TFOOT: 'table',
+    TH: 'table',
+    THEAD: 'table',
+    TR: 'table'
+  },
+  // note: For Firefox < 1.5, OPTION and OPTGROUP tags are currently broken,
+  //       due to a Firefox bug
+  node: function(elementName) {
+    elementName = elementName.toUpperCase();
+
+    // try innerHTML approach
+    var parentTag = this.NODEMAP[elementName] || 'div';
+    var parentElement = document.createElement(parentTag);
+    try { // prevent IE "feature": http://dev.rubyonrails.org/ticket/2707
+      parentElement.innerHTML = "<" + elementName + "></" + elementName + ">";
+    } catch(e) {}
+    var element = parentElement.firstChild || null;
+
+    // see if browser added wrapping tags
+    if(element && (element.tagName.toUpperCase() != elementName))
+      element = element.getElementsByTagName(elementName)[0];
+
+    // fallback to createElement approach
+    if(!element) element = document.createElement(elementName);
+
+    // abort if nothing could be created
+    if(!element) return;
+
+    // attributes (or text)
+    if(arguments[1])
+      if(this._isStringOrNumber(arguments[1]) ||
+        (arguments[1] instanceof Array) ||
+        arguments[1].tagName) {
+          this._children(element, arguments[1]);
+        } else {
+          var attrs = this._attributes(arguments[1]);
+          if(attrs.length) {
+            try { // prevent IE "feature": http://dev.rubyonrails.org/ticket/2707
+              parentElement.innerHTML = "<" +elementName + " " +
+                attrs + "></" + elementName + ">";
+            } catch(e) {}
+            element = parentElement.firstChild || null;
+            // workaround firefox 1.0.X bug
+            if(!element) {
+              element = document.createElement(elementName);
+              for(attr in arguments[1])
+                element[attr == 'class' ? 'className' : attr] = arguments[1][attr];
+            }
+            if(element.tagName.toUpperCase() != elementName)
+              element = parentElement.getElementsByTagName(elementName)[0];
+          }
+        }
+
+    // text, or array of children
+    if(arguments[2])
+      this._children(element, arguments[2]);
+
+     return $(element);
+  },
+  _text: function(text) {
+     return document.createTextNode(text);
+  },
+
+  ATTR_MAP: {
+    'className': 'class',
+    'htmlFor': 'for'
+  },
+
+  _attributes: function(attributes) {
+    var attrs = [];
+    for(attribute in attributes)
+      attrs.push((attribute in this.ATTR_MAP ? this.ATTR_MAP[attribute] : attribute) +
+          '="' + attributes[attribute].toString().escapeHTML().gsub(/"/,'&quot;') + '"');
+    return attrs.join(" ");
+  },
+  _children: function(element, children) {
+    if(children.tagName) {
+      element.appendChild(children);
+      return;
+    }
+    if(typeof children=='object') { // array can hold nodes and text
+      children.flatten().each( function(e) {
+        if(typeof e=='object')
+          element.appendChild(e);
+        else
+          if(Builder._isStringOrNumber(e))
+            element.appendChild(Builder._text(e));
+      });
+    } else
+      if(Builder._isStringOrNumber(children))
+        element.appendChild(Builder._text(children));
+  },
+  _isStringOrNumber: function(param) {
+    return(typeof param=='string' || typeof param=='number');
+  },
+  build: function(html) {
+    var element = this.node('div');
+    $(element).update(html.strip());
+    return element.down();
+  },
+  dump: function(scope) {
+    if(typeof scope != 'object' && typeof scope != 'function') scope = window; //global scope
+
+    var tags = ("A ABBR ACRONYM ADDRESS APPLET AREA B BASE BASEFONT BDO BIG BLOCKQUOTE BODY " +
+      "BR BUTTON CAPTION CENTER CITE CODE COL COLGROUP DD DEL DFN DIR DIV DL DT EM FIELDSET " +
+      "FONT FORM FRAME FRAMESET H1 H2 H3 H4 H5 H6 HEAD HR HTML I IFRAME IMG INPUT INS ISINDEX "+
+      "KBD LABEL LEGEND LI LINK MAP MENU META NOFRAMES NOSCRIPT OBJECT OL OPTGROUP OPTION P "+
+      "PARAM PRE Q S SAMP SCRIPT SELECT SMALL SPAN STRIKE STRONG STYLE SUB SUP TABLE TBODY TD "+
+      "TEXTAREA TFOOT TH THEAD TITLE TR TT U UL VAR").split(/\s+/);
+
+    tags.each( function(tag){
+      scope[tag] = function() {
+        return Builder.node.apply(Builder, [tag].concat($A(arguments)));
+      };
+    });
+  }
+};
\ No newline at end of file
diff --git a/js/src/controls.js b/js/src/controls.js
new file mode 100644
index 0000000..c56ccb7
--- /dev/null
+++ b/js/src/controls.js
@@ -0,0 +1,965 @@
+// script.aculo.us controls.js v1.8.2, Tue Nov 18 18:30:58 +0100 2008
+
+// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+//           (c) 2005-2008 Ivan Krstic (http://blogs.law.harvard.edu/ivan)
+//           (c) 2005-2008 Jon Tirsen (http://www.tirsen.com)
+// Contributors:
+//  Richard Livsey
+//  Rahul Bhargava
+//  Rob Wills
+//
+// script.aculo.us is freely distributable under the terms of an MIT-style license.
+// For details, see the script.aculo.us web site: http://script.aculo.us/
+
+// Autocompleter.Base handles all the autocompletion functionality
+// that's independent of the data source for autocompletion. This
+// includes drawing the autocompletion menu, observing keyboard
+// and mouse events, and similar.
+//
+// Specific autocompleters need to provide, at the very least,
+// a getUpdatedChoices function that will be invoked every time
+// the text inside the monitored textbox changes. This method
+// should get the text for which to provide autocompletion by
+// invoking this.getToken(), NOT by directly accessing
+// this.element.value. This is to allow incremental tokenized
+// autocompletion. Specific auto-completion logic (AJAX, etc)
+// belongs in getUpdatedChoices.
+//
+// Tokenized incremental autocompletion is enabled automatically
+// when an autocompleter is instantiated with the 'tokens' option
+// in the options parameter, e.g.:
+// new Ajax.Autocompleter('id','upd', '/url/', { tokens: ',' });
+// will incrementally autocomplete with a comma as the token.
+// Additionally, ',' in the above example can be replaced with
+// a token array, e.g. { tokens: [',', '\n'] } which
+// enables autocompletion on multiple tokens. This is most
+// useful when one of the tokens is \n (a newline), as it
+// allows smart autocompletion after linebreaks.
+
+if(typeof Effect == 'undefined')
+  throw("controls.js requires including script.aculo.us' effects.js library");
+
+var Autocompleter = { };
+Autocompleter.Base = Class.create({
+  baseInitialize: function(element, update, options) {
+    element          = $(element);
+    this.element     = element;
+    this.update      = $(update);
+    this.hasFocus    = false;
+    this.changed     = false;
+    this.active      = false;
+    this.index       = 0;
+    this.entryCount  = 0;
+    this.oldElementValue = this.element.value;
+
+    if(this.setOptions)
+      this.setOptions(options);
+    else
+      this.options = options || { };
+
+    this.options.paramName    = this.options.paramName || this.element.name;
+    this.options.tokens       = this.options.tokens || [];
+    this.options.frequency    = this.options.frequency || 0.4;
+    this.options.minChars     = this.options.minChars || 1;
+    this.options.onShow       = this.options.onShow ||
+      function(element, update){
+        if(!update.style.position || update.style.position=='absolute') {
+          update.style.position = 'absolute';
+          Position.clone(element, update, {
+            setHeight: false,
+            offsetTop: element.offsetHeight
+          });
+        }
+        Effect.Appear(update,{duration:0.15});
+      };
+    this.options.onHide = this.options.onHide ||
+      function(element, update){ new Effect.Fade(update,{duration:0.15}) };
+
+    if(typeof(this.options.tokens) == 'string')
+      this.options.tokens = new Array(this.options.tokens);
+    // Force carriage returns as token delimiters anyway
+    if (!this.options.tokens.include('\n'))
+      this.options.tokens.push('\n');
+
+    this.observer = null;
+
+    this.element.setAttribute('autocomplete','off');
+
+    Element.hide(this.update);
+
+    Event.observe(this.element, 'blur', this.onBlur.bindAsEventListener(this));
+    Event.observe(this.element, 'keydown', this.onKeyPress.bindAsEventListener(this));
+  },
+
+  show: function() {
+    if(Element.getStyle(this.update, 'display')=='none') this.options.onShow(this.element, this.update);
+    if(!this.iefix &&
+      (Prototype.Browser.IE) &&
+      (Element.getStyle(this.update, 'position')=='absolute')) {
+      new Insertion.After(this.update,
+       '<iframe id="' + this.update.id + '_iefix" '+
+       'style="display:none;position:absolute;filter:progid:DXImageTransform.Microsoft.Alpha(opacity=0);" ' +
+       'src="javascript:false;" frameborder="0" scrolling="no"></iframe>');
+      this.iefix = $(this.update.id+'_iefix');
+    }
+    if(this.iefix) setTimeout(this.fixIEOverlapping.bind(this), 50);
+  },
+
+  fixIEOverlapping: function() {
+    Position.clone(this.update, this.iefix, {setTop:(!this.update.style.height)});
+    this.iefix.style.zIndex = 1;
+    this.update.style.zIndex = 2;
+    Element.show(this.iefix);
+  },
+
+  hide: function() {
+    this.stopIndicator();
+    if(Element.getStyle(this.update, 'display')!='none') this.options.onHide(this.element, this.update);
+    if(this.iefix) Element.hide(this.iefix);
+  },
+
+  startIndicator: function() {
+    if(this.options.indicator) Element.show(this.options.indicator);
+  },
+
+  stopIndicator: function() {
+    if(this.options.indicator) Element.hide(this.options.indicator);
+  },
+
+  onKeyPress: function(event) {
+    if(this.active)
+      switch(event.keyCode) {
+       case Event.KEY_TAB:
+       case Event.KEY_RETURN:
+         this.selectEntry();
+         Event.stop(event);
+       case Event.KEY_ESC:
+         this.hide();
+         this.active = false;
+         Event.stop(event);
+         return;
+       case Event.KEY_LEFT:
+       case Event.KEY_RIGHT:
+         return;
+       case Event.KEY_UP:
+         this.markPrevious();
+         this.render();
+         Event.stop(event);
+         return;
+       case Event.KEY_DOWN:
+         this.markNext();
+         this.render();
+         Event.stop(event);
+         return;
+      }
+     else
+       if(event.keyCode==Event.KEY_TAB || event.keyCode==Event.KEY_RETURN ||
+         (Prototype.Browser.WebKit > 0 && event.keyCode == 0)) return;
+
+    this.changed = true;
+    this.hasFocus = true;
+
+    if(this.observer) clearTimeout(this.observer);
+      this.observer =
+        setTimeout(this.onObserverEvent.bind(this), this.options.frequency*1000);
+  },
+
+  activate: function() {
+    this.changed = false;
+    this.hasFocus = true;
+    this.getUpdatedChoices();
+  },
+
+  onHover: function(event) {
+    var element = Event.findElement(event, 'LI');
+    if(this.index != element.autocompleteIndex)
+    {
+        this.index = element.autocompleteIndex;
+        this.render();
+    }
+    Event.stop(event);
+  },
+
+  onClick: function(event) {
+    var element = Event.findElement(event, 'LI');
+    this.index = element.autocompleteIndex;
+    this.selectEntry();
+    this.hide();
+  },
+
+  onBlur: function(event) {
+    // needed to make click events working
+    setTimeout(this.hide.bind(this), 250);
+    this.hasFocus = false;
+    this.active = false;
+  },
+
+  render: function() {
+    if(this.entryCount > 0) {
+      for (var i = 0; i < this.entryCount; i++)
+        this.index==i ?
+          Element.addClassName(this.getEntry(i),"selected") :
+          Element.removeClassName(this.getEntry(i),"selected");
+      if(this.hasFocus) {
+        this.show();
+        this.active = true;
+      }
+    } else {
+      this.active = false;
+      this.hide();
+    }
+  },
+
+  markPrevious: function() {
+    if(this.index > 0) this.index--;
+      else this.index = this.entryCount-1;
+    this.getEntry(this.index).scrollIntoView(true);
+  },
+
+  markNext: function() {
+    if(this.index < this.entryCount-1) this.index++;
+      else this.index = 0;
+    this.getEntry(this.index).scrollIntoView(false);
+  },
+
+  getEntry: function(index) {
+    return this.update.firstChild.childNodes[index];
+  },
+
+  getCurrentEntry: function() {
+    return this.getEntry(this.index);
+  },
+
+  selectEntry: function() {
+    this.active = false;
+    this.updateElement(this.getCurrentEntry());
+  },
+
+  updateElement: function(selectedElement) {
+    if (this.options.updateElement) {
+      this.options.updateElement(selectedElement);
+      return;
+    }
+    var value = '';
+    if (this.options.select) {
+      var nodes = $(selectedElement).select('.' + this.options.select) || [];
+      if(nodes.length>0) value = Element.collectTextNodes(nodes[0], this.options.select);
+    } else
+      value = Element.collectTextNodesIgnoreClass(selectedElement, 'informal');
+
+    var bounds = this.getTokenBounds();
+    if (bounds[0] != -1) {
+      var newValue = this.element.value.substr(0, bounds[0]);
+      var whitespace = this.element.value.substr(bounds[0]).match(/^\s+/);
+      if (whitespace)
+        newValue += whitespace[0];
+      this.element.value = newValue + value + this.element.value.substr(bounds[1]);
+    } else {
+      this.element.value = value;
+    }
+    this.oldElementValue = this.element.value;
+    this.element.focus();
+
+    if (this.options.afterUpdateElement)
+      this.options.afterUpdateElement(this.element, selectedElement);
+  },
+
+  updateChoices: function(choices) {
+    if(!this.changed && this.hasFocus) {
+      this.update.innerHTML = choices;
+      Element.cleanWhitespace(this.update);
+      Element.cleanWhitespace(this.update.down());
+
+      if(this.update.firstChild && this.update.down().childNodes) {
+        this.entryCount =
+          this.update.down().childNodes.length;
+        for (var i = 0; i < this.entryCount; i++) {
+          var entry = this.getEntry(i);
+          entry.autocompleteIndex = i;
+          this.addObservers(entry);
+        }
+      } else {
+        this.entryCount = 0;
+      }
+
+      this.stopIndicator();
+      this.index = 0;
+
+      if(this.entryCount==1 && this.options.autoSelect) {
+        this.selectEntry();
+        this.hide();
+      } else {
+        this.render();
+      }
+    }
+  },
+
+  addObservers: function(element) {
+    Event.observe(element, "mouseover", this.onHover.bindAsEventListener(this));
+    Event.observe(element, "click", this.onClick.bindAsEventListener(this));
+  },
+
+  onObserverEvent: function() {
+    this.changed = false;
+    this.tokenBounds = null;
+    if(this.getToken().length>=this.options.minChars) {
+      this.getUpdatedChoices();
+    } else {
+      this.active = false;
+      this.hide();
+    }
+    this.oldElementValue = this.element.value;
+  },
+
+  getToken: function() {
+    var bounds = this.getTokenBounds();
+    return this.element.value.substring(bounds[0], bounds[1]).strip();
+  },
+
+  getTokenBounds: function() {
+    if (null != this.tokenBounds) return this.tokenBounds;
+    var value = this.element.value;
+    if (value.strip().empty()) return [-1, 0];
+    var diff = arguments.callee.getFirstDifferencePos(value, this.oldElementValue);
+    var offset = (diff == this.oldElementValue.length ? 1 : 0);
+    var prevTokenPos = -1, nextTokenPos = value.length;
+    var tp;
+    for (var index = 0, l = this.options.tokens.length; index < l; ++index) {
+      tp = value.lastIndexOf(this.options.tokens[index], diff + offset - 1);
+      if (tp > prevTokenPos) prevTokenPos = tp;
+      tp = value.indexOf(this.options.tokens[index], diff + offset);
+      if (-1 != tp && tp < nextTokenPos) nextTokenPos = tp;
+    }
+    return (this.tokenBounds = [prevTokenPos + 1, nextTokenPos]);
+  }
+});
+
+Autocompleter.Base.prototype.getTokenBounds.getFirstDifferencePos = function(newS, oldS) {
+  var boundary = Math.min(newS.length, oldS.length);
+  for (var index = 0; index < boundary; ++index)
+    if (newS[index] != oldS[index])
+      return index;
+  return boundary;
+};
+
+Ajax.Autocompleter = Class.create(Autocompleter.Base, {
+  initialize: function(element, update, url, options) {
+    this.baseInitialize(element, update, options);
+    this.options.asynchronous  = true;
+    this.options.onComplete    = this.onComplete.bind(this);
+    this.options.defaultParams = this.options.parameters || null;
+    this.url                   = url;
+  },
+
+  getUpdatedChoices: function() {
+    this.startIndicator();
+
+    var entry = encodeURIComponent(this.options.paramName) + '=' +
+      encodeURIComponent(this.getToken());
+
+    this.options.parameters = this.options.callback ?
+      this.options.callback(this.element, entry) : entry;
+
+    if(this.options.defaultParams)
+      this.options.parameters += '&' + this.options.defaultParams;
+
+    new Ajax.Request(this.url, this.options);
+  },
+
+  onComplete: function(request) {
+    this.updateChoices(request.responseText);
+  }
+});
+
+// The local array autocompleter. Used when you'd prefer to
+// inject an array of autocompletion options into the page, rather
+// than sending out Ajax queries, which can be quite slow sometimes.
+//
+// The constructor takes four parameters. The first two are, as usual,
+// the id of the monitored textbox, and id of the autocompletion menu.
+// The third is the array you want to autocomplete from, and the fourth
+// is the options block.
+//
+// Extra local autocompletion options:
+// - choices - How many autocompletion choices to offer
+//
+// - partialSearch - If false, the autocompleter will match entered
+//                    text only at the beginning of strings in the
+//                    autocomplete array. Defaults to true, which will
+//                    match text at the beginning of any *word* in the
+//                    strings in the autocomplete array. If you want to
+//                    search anywhere in the string, additionally set
+//                    the option fullSearch to true (default: off).
+//
+// - fullSsearch - Search anywhere in autocomplete array strings.
+//
+// - partialChars - How many characters to enter before triggering
+//                   a partial match (unlike minChars, which defines
+//                   how many characters are required to do any match
+//                   at all). Defaults to 2.
+//
+// - ignoreCase - Whether to ignore case when autocompleting.
+//                 Defaults to true.
+//
+// It's possible to pass in a custom function as the 'selector'
+// option, if you prefer to write your own autocompletion logic.
+// In that case, the other options above will not apply unless
+// you support them.
+
+Autocompleter.Local = Class.create(Autocompleter.Base, {
+  initialize: function(element, update, array, options) {
+    this.baseInitialize(element, update, options);
+    this.options.array = array;
+  },
+
+  getUpdatedChoices: function() {
+    this.updateChoices(this.options.selector(this));
+  },
+
+  setOptions: function(options) {
+    this.options = Object.extend({
+      choices: 10,
+      partialSearch: true,
+      partialChars: 2,
+      ignoreCase: true,
+      fullSearch: false,
+      selector: function(instance) {
+        var ret       = []; // Beginning matches
+        var partial   = []; // Inside matches
+        var entry     = instance.getToken();
+        var count     = 0;
+
+        for (var i = 0; i < instance.options.array.length &&
+          ret.length < instance.options.choices ; i++) {
+
+          var elem = instance.options.array[i];
+          var foundPos = instance.options.ignoreCase ?
+            elem.toLowerCase().indexOf(entry.toLowerCase()) :
+            elem.indexOf(entry);
+
+          while (foundPos != -1) {
+            if (foundPos == 0 && elem.length != entry.length) {
+              ret.push("<li><strong>" + elem.substr(0, entry.length) + "</strong>" +
+                elem.substr(entry.length) + "</li>");
+              break;
+            } else if (entry.length >= instance.options.partialChars &&
+              instance.options.partialSearch && foundPos != -1) {
+              if (instance.options.fullSearch || /\s/.test(elem.substr(foundPos-1,1))) {
+                partial.push("<li>" + elem.substr(0, foundPos) + "<strong>" +
+                  elem.substr(foundPos, entry.length) + "</strong>" + elem.substr(
+                  foundPos + entry.length) + "</li>");
+                break;
+              }
+            }
+
+            foundPos = instance.options.ignoreCase ?
+              elem.toLowerCase().indexOf(entry.toLowerCase(), foundPos + 1) :
+              elem.indexOf(entry, foundPos + 1);
+
+          }
+        }
+        if (partial.length)
+          ret = ret.concat(partial.slice(0, instance.options.choices - ret.length));
+        return "<ul>" + ret.join('') + "</ul>";
+      }
+    }, options || { });
+  }
+});
+
+// AJAX in-place editor and collection editor
+// Full rewrite by Christophe Porteneuve <tdd@tddsworld.com> (April 2007).
+
+// Use this if you notice weird scrolling problems on some browsers,
+// the DOM might be a bit confused when this gets called so do this
+// waits 1 ms (with setTimeout) until it does the activation
+Field.scrollFreeActivate = function(field) {
+  setTimeout(function() {
+    Field.activate(field);
+  }, 1);
+};
+
+Ajax.InPlaceEditor = Class.create({
+  initialize: function(element, url, options) {
+    this.url = url;
+    this.element = element = $(element);
+    this.prepareOptions();
+    this._controls = { };
+    arguments.callee.dealWithDeprecatedOptions(options); // DEPRECATION LAYER!!!
+    Object.extend(this.options, options || { });
+    if (!this.options.formId && this.element.id) {
+      this.options.formId = this.element.id + '-inplaceeditor';
+      if ($(this.options.formId))
+        this.options.formId = '';
+    }
+    if (this.options.externalControl)
+      this.options.externalControl = $(this.options.externalControl);
+    if (!this.options.externalControl)
+      this.options.externalControlOnly = false;
+    this._originalBackground = this.element.getStyle('background-color') || 'transparent';
+    this.element.title = this.options.clickToEditText;
+    this._boundCancelHandler = this.handleFormCancellation.bind(this);
+    this._boundComplete = (this.options.onComplete || Prototype.emptyFunction).bind(this);
+    this._boundFailureHandler = this.handleAJAXFailure.bind(this);
+    this._boundSubmitHandler = this.handleFormSubmission.bind(this);
+    this._boundWrapperHandler = this.wrapUp.bind(this);
+    this.registerListeners();
+  },
+  checkForEscapeOrReturn: function(e) {
+    if (!this._editing || e.ctrlKey || e.altKey || e.shiftKey) return;
+    if (Event.KEY_ESC == e.keyCode)
+      this.handleFormCancellation(e);
+    else if (Event.KEY_RETURN == e.keyCode)
+      this.handleFormSubmission(e);
+  },
+  createControl: function(mode, handler, extraClasses) {
+    var control = this.options[mode + 'Control'];
+    var text = this.options[mode + 'Text'];
+    if ('button' == control) {
+      var btn = document.createElement('input');
+      btn.type = 'submit';
+      btn.value = text;
+      btn.className = 'editor_' + mode + '_button';
+      if ('cancel' == mode)
+        btn.onclick = this._boundCancelHandler;
+      this._form.appendChild(btn);
+      this._controls[mode] = btn;
+    } else if ('link' == control) {
+      var link = document.createElement('a');
+      link.href = '#';
+      link.appendChild(document.createTextNode(text));
+      link.onclick = 'cancel' == mode ? this._boundCancelHandler : this._boundSubmitHandler;
+      link.className = 'editor_' + mode + '_link';
+      if (extraClasses)
+        link.className += ' ' + extraClasses;
+      this._form.appendChild(link);
+      this._controls[mode] = link;
+    }
+  },
+  createEditField: function() {
+    var text = (this.options.loadTextURL ? this.options.loadingText : this.getText());
+    var fld;
+    if (1 >= this.options.rows && !/\r|\n/.test(this.getText())) {
+      fld = document.createElement('input');
+      fld.type = 'text';
+      var size = this.options.size || this.options.cols || 0;
+      if (0 < size) fld.size = size;
+    } else {
+      fld = document.createElement('textarea');
+      fld.rows = (1 >= this.options.rows ? this.options.autoRows : this.options.rows);
+      fld.cols = this.options.cols || 40;
+    }
+    fld.name = this.options.paramName;
+    fld.value = text; // No HTML breaks conversion anymore
+    fld.className = 'editor_field';
+    if (this.options.submitOnBlur)
+      fld.onblur = this._boundSubmitHandler;
+    this._controls.editor = fld;
+    if (this.options.loadTextURL)
+      this.loadExternalText();
+    this._form.appendChild(this._controls.editor);
+  },
+  createForm: function() {
+    var ipe = this;
+    function addText(mode, condition) {
+      var text = ipe.options['text' + mode + 'Controls'];
+      if (!text || condition === false) return;
+      ipe._form.appendChild(document.createTextNode(text));
+    };
+    this._form = $(document.createElement('form'));
+    this._form.id = this.options.formId;
+    this._form.addClassName(this.options.formClassName);
+    this._form.onsubmit = this._boundSubmitHandler;
+    this.createEditField();
+    if ('textarea' == this._controls.editor.tagName.toLowerCase())
+      this._form.appendChild(document.createElement('br'));
+    if (this.options.onFormCustomization)
+      this.options.onFormCustomization(this, this._form);
+    addText('Before', this.options.okControl || this.options.cancelControl);
+    this.createControl('ok', this._boundSubmitHandler);
+    addText('Between', this.options.okControl && this.options.cancelControl);
+    this.createControl('cancel', this._boundCancelHandler, 'editor_cancel');
+    addText('After', this.options.okControl || this.options.cancelControl);
+  },
+  destroy: function() {
+    if (this._oldInnerHTML)
+      this.element.innerHTML = this._oldInnerHTML;
+    this.leaveEditMode();
+    this.unregisterListeners();
+  },
+  enterEditMode: function(e) {
+    if (this._saving || this._editing) return;
+    this._editing = true;
+    this.triggerCallback('onEnterEditMode');
+    if (this.options.externalControl)
+      this.options.externalControl.hide();
+    this.element.hide();
+    this.createForm();
+    this.element.parentNode.insertBefore(this._form, this.element);
+    if (!this.options.loadTextURL)
+      this.postProcessEditField();
+    if (e) Event.stop(e);
+  },
+  enterHover: function(e) {
+    if (this.options.hoverClassName)
+      this.element.addClassName(this.options.hoverClassName);
+    if (this._saving) return;
+    this.triggerCallback('onEnterHover');
+  },
+  getText: function() {
+    return this.element.innerHTML.unescapeHTML();
+  },
+  handleAJAXFailure: function(transport) {
+    this.triggerCallback('onFailure', transport);
+    if (this._oldInnerHTML) {
+      this.element.innerHTML = this._oldInnerHTML;
+      this._oldInnerHTML = null;
+    }
+  },
+  handleFormCancellation: function(e) {
+    this.wrapUp();
+    if (e) Event.stop(e);
+  },
+  handleFormSubmission: function(e) {
+    var form = this._form;
+    var value = $F(this._controls.editor);
+    this.prepareSubmission();
+    var params = this.options.callback(form, value) || '';
+    if (Object.isString(params))
+      params = params.toQueryParams();
+    params.editorId = this.element.id;
+    if (this.options.htmlResponse) {
+      var options = Object.extend({ evalScripts: true }, this.options.ajaxOptions);
+      Object.extend(options, {
+        parameters: params,
+        onComplete: this._boundWrapperHandler,
+        onFailure: this._boundFailureHandler
+      });
+      new Ajax.Updater({ success: this.element }, this.url, options);
+    } else {
+      var options = Object.extend({ method: 'get' }, this.options.ajaxOptions);
+      Object.extend(options, {
+        parameters: params,
+        onComplete: this._boundWrapperHandler,
+        onFailure: this._boundFailureHandler
+      });
+      new Ajax.Request(this.url, options);
+    }
+    if (e) Event.stop(e);
+  },
+  leaveEditMode: function() {
+    this.element.removeClassName(this.options.savingClassName);
+    this.removeForm();
+    this.leaveHover();
+    this.element.style.backgroundColor = this._originalBackground;
+    this.element.show();
+    if (this.options.externalControl)
+      this.options.externalControl.show();
+    this._saving = false;
+    this._editing = false;
+    this._oldInnerHTML = null;
+    this.triggerCallback('onLeaveEditMode');
+  },
+  leaveHover: function(e) {
+    if (this.options.hoverClassName)
+      this.element.removeClassName(this.options.hoverClassName);
+    if (this._saving) return;
+    this.triggerCallback('onLeaveHover');
+  },
+  loadExternalText: function() {
+    this._form.addClassName(this.options.loadingClassName);
+    this._controls.editor.disabled = true;
+    var options = Object.extend({ method: 'get' }, this.options.ajaxOptions);
+    Object.extend(options, {
+      parameters: 'editorId=' + encodeURIComponent(this.element.id),
+      onComplete: Prototype.emptyFunction,
+      onSuccess: function(transport) {
+        this._form.removeClassName(this.options.loadingClassName);
+        var text = transport.responseText;
+        if (this.options.stripLoadedTextTags)
+          text = text.stripTags();
+        this._controls.editor.value = text;
+        this._controls.editor.disabled = false;
+        this.postProcessEditField();
+      }.bind(this),
+      onFailure: this._boundFailureHandler
+    });
+    new Ajax.Request(this.options.loadTextURL, options);
+  },
+  postProcessEditField: function() {
+    var fpc = this.options.fieldPostCreation;
+    if (fpc)
+      $(this._controls.editor)['focus' == fpc ? 'focus' : 'activate']();
+  },
+  prepareOptions: function() {
+    this.options = Object.clone(Ajax.InPlaceEditor.DefaultOptions);
+    Object.extend(this.options, Ajax.InPlaceEditor.DefaultCallbacks);
+    [this._extraDefaultOptions].flatten().compact().each(function(defs) {
+      Object.extend(this.options, defs);
+    }.bind(this));
+  },
+  prepareSubmission: function() {
+    this._saving = true;
+    this.removeForm();
+    this.leaveHover();
+    this.showSaving();
+  },
+  registerListeners: function() {
+    this._listeners = { };
+    var listener;
+    $H(Ajax.InPlaceEditor.Listeners).each(function(pair) {
+      listener = this[pair.value].bind(this);
+      this._listeners[pair.key] = listener;
+      if (!this.options.externalControlOnly)
+        this.element.observe(pair.key, listener);
+      if (this.options.externalControl)
+        this.options.externalControl.observe(pair.key, listener);
+    }.bind(this));
+  },
+  removeForm: function() {
+    if (!this._form) return;
+    this._form.remove();
+    this._form = null;
+    this._controls = { };
+  },
+  showSaving: function() {
+    this._oldInnerHTML = this.element.innerHTML;
+    this.element.innerHTML = this.options.savingText;
+    this.element.addClassName(this.options.savingClassName);
+    this.element.style.backgroundColor = this._originalBackground;
+    this.element.show();
+  },
+  triggerCallback: function(cbName, arg) {
+    if ('function' == typeof this.options[cbName]) {
+      this.options[cbName](this, arg);
+    }
+  },
+  unregisterListeners: function() {
+    $H(this._listeners).each(function(pair) {
+      if (!this.options.externalControlOnly)
+        this.element.stopObserving(pair.key, pair.value);
+      if (this.options.externalControl)
+        this.options.externalControl.stopObserving(pair.key, pair.value);
+    }.bind(this));
+  },
+  wrapUp: function(transport) {
+    this.leaveEditMode();
+    // Can't use triggerCallback due to backward compatibility: requires
+    // binding + direct element
+    this._boundComplete(transport, this.element);
+  }
+});
+
+Object.extend(Ajax.InPlaceEditor.prototype, {
+  dispose: Ajax.InPlaceEditor.prototype.destroy
+});
+
+Ajax.InPlaceCollectionEditor = Class.create(Ajax.InPlaceEditor, {
+  initialize: function($super, element, url, options) {
+    this._extraDefaultOptions = Ajax.InPlaceCollectionEditor.DefaultOptions;
+    $super(element, url, options);
+  },
+
+  createEditField: function() {
+    var list = document.createElement('select');
+    list.name = this.options.paramName;
+    list.size = 1;
+    this._controls.editor = list;
+    this._collection = this.options.collection || [];
+    if (this.options.loadCollectionURL)
+      this.loadCollection();
+    else
+      this.checkForExternalText();
+    this._form.appendChild(this._controls.editor);
+  },
+
+  loadCollection: function() {
+    this._form.addClassName(this.options.loadingClassName);
+    this.showLoadingText(this.options.loadingCollectionText);
+    var options = Object.extend({ method: 'get' }, this.options.ajaxOptions);
+    Object.extend(options, {
+      parameters: 'editorId=' + encodeURIComponent(this.element.id),
+      onComplete: Prototype.emptyFunction,
+      onSuccess: function(transport) {
+        var js = transport.responseText.strip();
+        if (!/^\[.*\]$/.test(js)) // TODO: improve sanity check
+          throw('Server returned an invalid collection representation.');
+        this._collection = eval(js);
+        this.checkForExternalText();
+      }.bind(this),
+      onFailure: this.onFailure
+    });
+    new Ajax.Request(this.options.loadCollectionURL, options);
+  },
+
+  showLoadingText: function(text) {
+    this._controls.editor.disabled = true;
+    var tempOption = this._controls.editor.firstChild;
+    if (!tempOption) {
+      tempOption = document.createElement('option');
+      tempOption.value = '';
+      this._controls.editor.appendChild(tempOption);
+      tempOption.selected = true;
+    }
+    tempOption.update((text || '').stripScripts().stripTags());
+  },
+
+  checkForExternalText: function() {
+    this._text = this.getText();
+    if (this.options.loadTextURL)
+      this.loadExternalText();
+    else
+      this.buildOptionList();
+  },
+
+  loadExternalText: function() {
+    this.showLoadingText(this.options.loadingText);
+    var options = Object.extend({ method: 'get' }, this.options.ajaxOptions);
+    Object.extend(options, {
+      parameters: 'editorId=' + encodeURIComponent(this.element.id),
+      onComplete: Prototype.emptyFunction,
+      onSuccess: function(transport) {
+        this._text = transport.responseText.strip();
+        this.buildOptionList();
+      }.bind(this),
+      onFailure: this.onFailure
+    });
+    new Ajax.Request(this.options.loadTextURL, options);
+  },
+
+  buildOptionList: function() {
+    this._form.removeClassName(this.options.loadingClassName);
+    this._collection = this._collection.map(function(entry) {
+      return 2 === entry.length ? entry : [entry, entry].flatten();
+    });
+    var marker = ('value' in this.options) ? this.options.value : this._text;
+    var textFound = this._collection.any(function(entry) {
+      return entry[0] == marker;
+    }.bind(this));
+    this._controls.editor.update('');
+    var option;
+    this._collection.each(function(entry, index) {
+      option = document.createElement('option');
+      option.value = entry[0];
+      option.selected = textFound ? entry[0] == marker : 0 == index;
+      option.appendChild(document.createTextNode(entry[1]));
+      this._controls.editor.appendChild(option);
+    }.bind(this));
+    this._controls.editor.disabled = false;
+    Field.scrollFreeActivate(this._controls.editor);
+  }
+});
+
+//**** DEPRECATION LAYER FOR InPlace[Collection]Editor! ****
+//**** This only  exists for a while,  in order to  let ****
+//**** users adapt to  the new API.  Read up on the new ****
+//**** API and convert your code to it ASAP!            ****
+
+Ajax.InPlaceEditor.prototype.initialize.dealWithDeprecatedOptions = function(options) {
+  if (!options) return;
+  function fallback(name, expr) {
+    if (name in options || expr === undefined) return;
+    options[name] = expr;
+  };
+  fallback('cancelControl', (options.cancelLink ? 'link' : (options.cancelButton ? 'button' :
+    options.cancelLink == options.cancelButton == false ? false : undefined)));
+  fallback('okControl', (options.okLink ? 'link' : (options.okButton ? 'button' :
+    options.okLink == options.okButton == false ? false : undefined)));
+  fallback('highlightColor', options.highlightcolor);
+  fallback('highlightEndColor', options.highlightendcolor);
+};
+
+Object.extend(Ajax.InPlaceEditor, {
+  DefaultOptions: {
+    ajaxOptions: { },
+    autoRows: 3,                                // Use when multi-line w/ rows == 1
+    cancelControl: 'link',                      // 'link'|'button'|false
+    cancelText: 'cancel',
+    clickToEditText: 'Click to edit',
+    externalControl: null,                      // id|elt
+    externalControlOnly: false,
+    fieldPostCreation: 'activate',              // 'activate'|'focus'|false
+    formClassName: 'inplaceeditor-form',
+    formId: null,                               // id|elt
+    highlightColor: '#ffff99',
+    highlightEndColor: '#ffffff',
+    hoverClassName: '',
+    htmlResponse: true,
+    loadingClassName: 'inplaceeditor-loading',
+    loadingText: 'Loading...',
+    okControl: 'button',                        // 'link'|'button'|false
+    okText: 'ok',
+    paramName: 'value',
+    rows: 1,                                    // If 1 and multi-line, uses autoRows
+    savingClassName: 'inplaceeditor-saving',
+    savingText: 'Saving...',
+    size: 0,
+    stripLoadedTextTags: false,
+    submitOnBlur: false,
+    textAfterControls: '',
+    textBeforeControls: '',
+    textBetweenControls: ''
+  },
+  DefaultCallbacks: {
+    callback: function(form) {
+      return Form.serialize(form);
+    },
+    onComplete: function(transport, element) {
+      // For backward compatibility, this one is bound to the IPE, and passes
+      // the element directly.  It was too often customized, so we don't break it.
+      new Effect.Highlight(element, {
+        startcolor: this.options.highlightColor, keepBackgroundImage: true });
+    },
+    onEnterEditMode: null,
+    onEnterHover: function(ipe) {
+      ipe.element.style.backgroundColor = ipe.options.highlightColor;
+      if (ipe._effect)
+        ipe._effect.cancel();
+    },
+    onFailure: function(transport, ipe) {
+      alert('Error communication with the server: ' + transport.responseText.stripTags());
+    },
+    onFormCustomization: null, // Takes the IPE and its generated form, after editor, before controls.
+    onLeaveEditMode: null,
+    onLeaveHover: function(ipe) {
+      ipe._effect = new Effect.Highlight(ipe.element, {
+        startcolor: ipe.options.highlightColor, endcolor: ipe.options.highlightEndColor,
+        restorecolor: ipe._originalBackground, keepBackgroundImage: true
+      });
+    }
+  },
+  Listeners: {
+    click: 'enterEditMode',
+    keydown: 'checkForEscapeOrReturn',
+    mouseover: 'enterHover',
+    mouseout: 'leaveHover'
+  }
+});
+
+Ajax.InPlaceCollectionEditor.DefaultOptions = {
+  loadingCollectionText: 'Loading options...'
+};
+
+// Delayed observer, like Form.Element.Observer,
+// but waits for delay after last key input
+// Ideal for live-search fields
+
+Form.Element.DelayedObserver = Class.create({
+  initialize: function(element, delay, callback) {
+    this.delay     = delay || 0.5;
+    this.element   = $(element);
+    this.callback  = callback;
+    this.timer     = null;
+    this.lastValue = $F(this.element);
+    Event.observe(this.element,'keyup',this.delayedListener.bindAsEventListener(this));
+  },
+  delayedListener: function(event) {
+    if(this.lastValue == $F(this.element)) return;
+    if(this.timer) clearTimeout(this.timer);
+    this.timer = setTimeout(this.onTimerEvent.bind(this), this.delay * 1000);
+    this.lastValue = $F(this.element);
+  },
+  onTimerEvent: function() {
+    this.timer = null;
+    this.callback(this.element, $F(this.element));
+  }
+});
\ No newline at end of file
diff --git a/js/src/dragdrop.js b/js/src/dragdrop.js
new file mode 100644
index 0000000..07c98e2
--- /dev/null
+++ b/js/src/dragdrop.js
@@ -0,0 +1,975 @@
+// script.aculo.us dragdrop.js v1.8.2, Tue Nov 18 18:30:58 +0100 2008
+
+// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+//           (c) 2005-2008 Sammi Williams (http://www.oriontransfer.co.nz, sammi@oriontransfer.co.nz)
+//
+// script.aculo.us is freely distributable under the terms of an MIT-style license.
+// For details, see the script.aculo.us web site: http://script.aculo.us/
+
+if(Object.isUndefined(Effect))
+  throw("dragdrop.js requires including script.aculo.us' effects.js library");
+
+var Droppables = {
+  drops: [],
+
+  remove: function(element) {
+    this.drops = this.drops.reject(function(d) { return d.element==$(element) });
+  },
+
+  add: function(element) {
+    element = $(element);
+    var options = Object.extend({
+      greedy:     true,
+      hoverclass: null,
+      tree:       false
+    }, arguments[1] || { });
+
+    // cache containers
+    if(options.containment) {
+      options._containers = [];
+      var containment = options.containment;
+      if(Object.isArray(containment)) {
+        containment.each( function(c) { options._containers.push($(c)) });
+      } else {
+        options._containers.push($(containment));
+      }
+    }
+
+    if(options.accept) options.accept = [options.accept].flatten();
+
+    Element.makePositioned(element); // fix IE
+    options.element = element;
+
+    this.drops.push(options);
+  },
+
+  findDeepestChild: function(drops) {
+    deepest = drops[0];
+
+    for (i = 1; i < drops.length; ++i)
+      if (Element.isParent(drops[i].element, deepest.element))
+        deepest = drops[i];
+
+    return deepest;
+  },
+
+  isContained: function(element, drop) {
+    var containmentNode;
+    if(drop.tree) {
+      containmentNode = element.treeNode;
+    } else {
+      containmentNode = element.parentNode;
+    }
+    return drop._containers.detect(function(c) { return containmentNode == c });
+  },
+
+  isAffected: function(point, element, drop) {
+    return (
+      (drop.element!=element) &&
+      ((!drop._containers) ||
+        this.isContained(element, drop)) &&
+      ((!drop.accept) ||
+        (Element.classNames(element).detect(
+          function(v) { return drop.accept.include(v) } ) )) &&
+      Position.within(drop.element, point[0], point[1]) );
+  },
+
+  deactivate: function(drop) {
+    if(drop.hoverclass)
+      Element.removeClassName(drop.element, drop.hoverclass);
+    this.last_active = null;
+  },
+
+  activate: function(drop) {
+    if(drop.hoverclass)
+      Element.addClassName(drop.element, drop.hoverclass);
+    this.last_active = drop;
+  },
+
+  show: function(point, element) {
+    if(!this.drops.length) return;
+    var drop, affected = [];
+
+    this.drops.each( function(drop) {
+      if(Droppables.isAffected(point, element, drop))
+        affected.push(drop);
+    });
+
+    if(affected.length>0)
+      drop = Droppables.findDeepestChild(affected);
+
+    if(this.last_active && this.last_active != drop) this.deactivate(this.last_active);
+    if (drop) {
+      Position.within(drop.element, point[0], point[1]);
+      if(drop.onHover)
+        drop.onHover(element, drop.element, Position.overlap(drop.overlap, drop.element));
+
+      if (drop != this.last_active) Droppables.activate(drop);
+    }
+  },
+
+  fire: function(event, element) {
+    if(!this.last_active) return;
+    Position.prepare();
+
+    if (this.isAffected([Event.pointerX(event), Event.pointerY(event)], element, this.last_active))
+      if (this.last_active.onDrop) {
+        this.last_active.onDrop(element, this.last_active.element, event);
+        return true;
+      }
+  },
+
+  reset: function() {
+    if(this.last_active)
+      this.deactivate(this.last_active);
+  }
+};
+
+var Draggables = {
+  drags: [],
+  observers: [],
+
+  register: function(draggable) {
+    if(this.drags.length == 0) {
+      this.eventMouseUp   = this.endDrag.bindAsEventListener(this);
+      this.eventMouseMove = this.updateDrag.bindAsEventListener(this);
+      this.eventKeypress  = this.keyPress.bindAsEventListener(this);
+
+      Event.observe(document, "mouseup", this.eventMouseUp);
+      Event.observe(document, "mousemove", this.eventMouseMove);
+      Event.observe(document, "keypress", this.eventKeypress);
+    }
+    this.drags.push(draggable);
+  },
+
+  unregister: function(draggable) {
+    this.drags = this.drags.reject(function(d) { return d==draggable });
+    if(this.drags.length == 0) {
+      Event.stopObserving(document, "mouseup", this.eventMouseUp);
+      Event.stopObserving(document, "mousemove", this.eventMouseMove);
+      Event.stopObserving(document, "keypress", this.eventKeypress);
+    }
+  },
+
+  activate: function(draggable) {
+    if(draggable.options.delay) {
+      this._timeout = setTimeout(function() {
+        Draggables._timeout = null;
+        window.focus();
+        Draggables.activeDraggable = draggable;
+      }.bind(this), draggable.options.delay);
+    } else {
+      window.focus(); // allows keypress events if window isn't currently focused, fails for Safari
+      this.activeDraggable = draggable;
+    }
+  },
+
+  deactivate: function() {
+    this.activeDraggable = null;
+  },
+
+  updateDrag: function(event) {
+    if(!this.activeDraggable) return;
+    var pointer = [Event.pointerX(event), Event.pointerY(event)];
+    // Mozilla-based browsers fire successive mousemove events with
+    // the same coordinates, prevent needless redrawing (moz bug?)
+    if(this._lastPointer && (this._lastPointer.inspect() == pointer.inspect())) return;
+    this._lastPointer = pointer;
+
+    this.activeDraggable.updateDrag(event, pointer);
+  },
+
+  endDrag: function(event) {
+    if(this._timeout) {
+      clearTimeout(this._timeout);
+      this._timeout = null;
+    }
+    if(!this.activeDraggable) return;
+    this._lastPointer = null;
+    this.activeDraggable.endDrag(event);
+    this.activeDraggable = null;
+  },
+
+  keyPress: function(event) {
+    if(this.activeDraggable)
+      this.activeDraggable.keyPress(event);
+  },
+
+  addObserver: function(observer) {
+    this.observers.push(observer);
+    this._cacheObserverCallbacks();
+  },
+
+  removeObserver: function(element) {  // element instead of observer fixes mem leaks
+    this.observers = this.observers.reject( function(o) { return o.element==element });
+    this._cacheObserverCallbacks();
+  },
+
+  notify: function(eventName, draggable, event) {  // 'onStart', 'onEnd', 'onDrag'
+    if(this[eventName+'Count'] > 0)
+      this.observers.each( function(o) {
+        if(o[eventName]) o[eventName](eventName, draggable, event);
+      });
+    if(draggable.options[eventName]) draggable.options[eventName](draggable, event);
+  },
+
+  _cacheObserverCallbacks: function() {
+    ['onStart','onEnd','onDrag'].each( function(eventName) {
+      Draggables[eventName+'Count'] = Draggables.observers.select(
+        function(o) { return o[eventName]; }
+      ).length;
+    });
+  }
+};
+
+/*--------------------------------------------------------------------------*/
+
+var Draggable = Class.create({
+  initialize: function(element) {
+    var defaults = {
+      handle: false,
+      reverteffect: function(element, top_offset, left_offset) {
+        var dur = Math.sqrt(Math.abs(top_offset^2)+Math.abs(left_offset^2))*0.02;
+        new Effect.Move(element, { x: -left_offset, y: -top_offset, duration: dur,
+          queue: {scope:'_draggable', position:'end'}
+        });
+      },
+      endeffect: function(element) {
+        var toOpacity = Object.isNumber(element._opacity) ? element._opacity : 1.0;
+        new Effect.Opacity(element, {duration:0.2, from:0.7, to:toOpacity,
+          queue: {scope:'_draggable', position:'end'},
+          afterFinish: function(){
+            Draggable._dragging[element] = false
+          }
+        });
+      },
+      zindex: 1000,
+      revert: false,
+      quiet: false,
+      scroll: false,
+      scrollSensitivity: 20,
+      scrollSpeed: 15,
+      snap: false,  // false, or xy or [x,y] or function(x,y){ return [x,y] }
+      delay: 0
+    };
+
+    if(!arguments[1] || Object.isUndefined(arguments[1].endeffect))
+      Object.extend(defaults, {
+        starteffect: function(element) {
+          element._opacity = Element.getOpacity(element);
+          Draggable._dragging[element] = true;
+          new Effect.Opacity(element, {duration:0.2, from:element._opacity, to:0.7});
+        }
+      });
+
+    var options = Object.extend(defaults, arguments[1] || { });
+
+    this.element = $(element);
+
+    if(options.handle && Object.isString(options.handle))
+      this.handle = this.element.down('.'+options.handle, 0);
+
+    if(!this.handle) this.handle = $(options.handle);
+    if(!this.handle) this.handle = this.element;
+
+    if(options.scroll && !options.scroll.scrollTo && !options.scroll.outerHTML) {
+      options.scroll = $(options.scroll);
+      this._isScrollChild = Element.childOf(this.element, options.scroll);
+    }
+
+    Element.makePositioned(this.element); // fix IE
+
+    this.options  = options;
+    this.dragging = false;
+
+    this.eventMouseDown = this.initDrag.bindAsEventListener(this);
+    Event.observe(this.handle, "mousedown", this.eventMouseDown);
+
+    Draggables.register(this);
+  },
+
+  destroy: function() {
+    Event.stopObserving(this.handle, "mousedown", this.eventMouseDown);
+    Draggables.unregister(this);
+  },
+
+  currentDelta: function() {
+    return([
+      parseInt(Element.getStyle(this.element,'left') || '0'),
+      parseInt(Element.getStyle(this.element,'top') || '0')]);
+  },
+
+  initDrag: function(event) {
+    if(!Object.isUndefined(Draggable._dragging[this.element]) &&
+      Draggable._dragging[this.element]) return;
+    if(Event.isLeftClick(event)) {
+      // abort on form elements, fixes a Firefox issue
+      var src = Event.element(event);
+      if((tag_name = src.tagName.toUpperCase()) && (
+        tag_name=='INPUT' ||
+        tag_name=='SELECT' ||
+        tag_name=='OPTION' ||
+        tag_name=='BUTTON' ||
+        tag_name=='TEXTAREA')) return;
+
+      var pointer = [Event.pointerX(event), Event.pointerY(event)];
+      var pos     = Position.cumulativeOffset(this.element);
+      this.offset = [0,1].map( function(i) { return (pointer[i] - pos[i]) });
+
+      Draggables.activate(this);
+      Event.stop(event);
+    }
+  },
+
+  startDrag: function(event) {
+    this.dragging = true;
+    if(!this.delta)
+      this.delta = this.currentDelta();
+
+    if(this.options.zindex) {
+      this.originalZ = parseInt(Element.getStyle(this.element,'z-index') || 0);
+      this.element.style.zIndex = this.options.zindex;
+    }
+
+    if(this.options.ghosting) {
+      this._clone = this.element.cloneNode(true);
+      this._originallyAbsolute = (this.element.getStyle('position') == 'absolute');
+      if (!this._originallyAbsolute)
+        Position.absolutize(this.element);
+      this.element.parentNode.insertBefore(this._clone, this.element);
+    }
+
+    if(this.options.scroll) {
+      if (this.options.scroll == window) {
+        var where = this._getWindowScroll(this.options.scroll);
+        this.originalScrollLeft = where.left;
+        this.originalScrollTop = where.top;
+      } else {
+        this.originalScrollLeft = this.options.scroll.scrollLeft;
+        this.originalScrollTop = this.options.scroll.scrollTop;
+      }
+    }
+
+    Draggables.notify('onStart', this, event);
+
+    if(this.options.starteffect) this.options.starteffect(this.element);
+  },
+
+  updateDrag: function(event, pointer) {
+    if(!this.dragging) this.startDrag(event);
+
+    if(!this.options.quiet){
+      Position.prepare();
+      Droppables.show(pointer, this.element);
+    }
+
+    Draggables.notify('onDrag', this, event);
+
+    this.draw(pointer);
+    if(this.options.change) this.options.change(this);
+
+    if(this.options.scroll) {
+      this.stopScrolling();
+
+      var p;
+      if (this.options.scroll == window) {
+        with(this._getWindowScroll(this.options.scroll)) { p = [ left, top, left+width, top+height ]; }
+      } else {
+        p = Position.page(this.options.scroll);
+        p[0] += this.options.scroll.scrollLeft + Position.deltaX;
+        p[1] += this.options.scroll.scrollTop + Position.deltaY;
+        p.push(p[0]+this.options.scroll.offsetWidth);
+        p.push(p[1]+this.options.scroll.offsetHeight);
+      }
+      var speed = [0,0];
+      if(pointer[0] < (p[0]+this.options.scrollSensitivity)) speed[0] = pointer[0]-(p[0]+this.options.scrollSensitivity);
+      if(pointer[1] < (p[1]+this.options.scrollSensitivity)) speed[1] = pointer[1]-(p[1]+this.options.scrollSensitivity);
+      if(pointer[0] > (p[2]-this.options.scrollSensitivity)) speed[0] = pointer[0]-(p[2]-this.options.scrollSensitivity);
+      if(pointer[1] > (p[3]-this.options.scrollSensitivity)) speed[1] = pointer[1]-(p[3]-this.options.scrollSensitivity);
+      this.startScrolling(speed);
+    }
+
+    // fix AppleWebKit rendering
+    if(Prototype.Browser.WebKit) window.scrollBy(0,0);
+
+    Event.stop(event);
+  },
+
+  finishDrag: function(event, success) {
+    this.dragging = false;
+
+    if(this.options.quiet){
+      Position.prepare();
+      var pointer = [Event.pointerX(event), Event.pointerY(event)];
+      Droppables.show(pointer, this.element);
+    }
+
+    if(this.options.ghosting) {
+      if (!this._originallyAbsolute)
+        Position.relativize(this.element);
+      delete this._originallyAbsolute;
+      Element.remove(this._clone);
+      this._clone = null;
+    }
+
+    var dropped = false;
+    if(success) {
+      dropped = Droppables.fire(event, this.element);
+      if (!dropped) dropped = false;
+    }
+    if(dropped && this.options.onDropped) this.options.onDropped(this.element);
+    Draggables.notify('onEnd', this, event);
+
+    var revert = this.options.revert;
+    if(revert && Object.isFunction(revert)) revert = revert(this.element);
+
+    var d = this.currentDelta();
+    if(revert && this.options.reverteffect) {
+      if (dropped == 0 || revert != 'failure')
+        this.options.reverteffect(this.element,
+          d[1]-this.delta[1], d[0]-this.delta[0]);
+    } else {
+      this.delta = d;
+    }
+
+    if(this.options.zindex)
+      this.element.style.zIndex = this.originalZ;
+
+    if(this.options.endeffect)
+      this.options.endeffect(this.element);
+
+    Draggables.deactivate(this);
+    Droppables.reset();
+  },
+
+  keyPress: function(event) {
+    if(event.keyCode!=Event.KEY_ESC) return;
+    this.finishDrag(event, false);
+    Event.stop(event);
+  },
+
+  endDrag: function(event) {
+    if(!this.dragging) return;
+    this.stopScrolling();
+    this.finishDrag(event, true);
+    Event.stop(event);
+  },
+
+  draw: function(point) {
+    var pos = Position.cumulativeOffset(this.element);
+    if(this.options.ghosting) {
+      var r   = Position.realOffset(this.element);
+      pos[0] += r[0] - Position.deltaX; pos[1] += r[1] - Position.deltaY;
+    }
+
+    var d = this.currentDelta();
+    pos[0] -= d[0]; pos[1] -= d[1];
+
+    if(this.options.scroll && (this.options.scroll != window && this._isScrollChild)) {
+      pos[0] -= this.options.scroll.scrollLeft-this.originalScrollLeft;
+      pos[1] -= this.options.scroll.scrollTop-this.originalScrollTop;
+    }
+
+    var p = [0,1].map(function(i){
+      return (point[i]-pos[i]-this.offset[i])
+    }.bind(this));
+
+    if(this.options.snap) {
+      if(Object.isFunction(this.options.snap)) {
+        p = this.options.snap(p[0],p[1],this);
+      } else {
+      if(Object.isArray(this.options.snap)) {
+        p = p.map( function(v, i) {
+          return (v/this.options.snap[i]).round()*this.options.snap[i] }.bind(this));
+      } else {
+        p = p.map( function(v) {
+          return (v/this.options.snap).round()*this.options.snap }.bind(this));
+      }
+    }}
+
+    var style = this.element.style;
+    if((!this.options.constraint) || (this.options.constraint=='horizontal'))
+      style.left = p[0] + "px";
+    if((!this.options.constraint) || (this.options.constraint=='vertical'))
+      style.top  = p[1] + "px";
+
+    if(style.visibility=="hidden") style.visibility = ""; // fix gecko rendering
+  },
+
+  stopScrolling: function() {
+    if(this.scrollInterval) {
+      clearInterval(this.scrollInterval);
+      this.scrollInterval = null;
+      Draggables._lastScrollPointer = null;
+    }
+  },
+
+  startScrolling: function(speed) {
+    if(!(speed[0] || speed[1])) return;
+    this.scrollSpeed = [speed[0]*this.options.scrollSpeed,speed[1]*this.options.scrollSpeed];
+    this.lastScrolled = new Date();
+    this.scrollInterval = setInterval(this.scroll.bind(this), 10);
+  },
+
+  scroll: function() {
+    var current = new Date();
+    var delta = current - this.lastScrolled;
+    this.lastScrolled = current;
+    if(this.options.scroll == window) {
+      with (this._getWindowScroll(this.options.scroll)) {
+        if (this.scrollSpeed[0] || this.scrollSpeed[1]) {
+          var d = delta / 1000;
+          this.options.scroll.scrollTo( left + d*this.scrollSpeed[0], top + d*this.scrollSpeed[1] );
+        }
+      }
+    } else {
+      this.options.scroll.scrollLeft += this.scrollSpeed[0] * delta / 1000;
+      this.options.scroll.scrollTop  += this.scrollSpeed[1] * delta / 1000;
+    }
+
+    Position.prepare();
+    Droppables.show(Draggables._lastPointer, this.element);
+    Draggables.notify('onDrag', this);
+    if (this._isScrollChild) {
+      Draggables._lastScrollPointer = Draggables._lastScrollPointer || $A(Draggables._lastPointer);
+      Draggables._lastScrollPointer[0] += this.scrollSpeed[0] * delta / 1000;
+      Draggables._lastScrollPointer[1] += this.scrollSpeed[1] * delta / 1000;
+      if (Draggables._lastScrollPointer[0] < 0)
+        Draggables._lastScrollPointer[0] = 0;
+      if (Draggables._lastScrollPointer[1] < 0)
+        Draggables._lastScrollPointer[1] = 0;
+      this.draw(Draggables._lastScrollPointer);
+    }
+
+    if(this.options.change) this.options.change(this);
+  },
+
+  _getWindowScroll: function(w) {
+    var T, L, W, H;
+    with (w.document) {
+      if (w.document.documentElement && documentElement.scrollTop) {
+        T = documentElement.scrollTop;
+        L = documentElement.scrollLeft;
+      } else if (w.document.body) {
+        T = body.scrollTop;
+        L = body.scrollLeft;
+      }
+      if (w.innerWidth) {
+        W = w.innerWidth;
+        H = w.innerHeight;
+      } else if (w.document.documentElement && documentElement.clientWidth) {
+        W = documentElement.clientWidth;
+        H = documentElement.clientHeight;
+      } else {
+        W = body.offsetWidth;
+        H = body.offsetHeight;
+      }
+    }
+    return { top: T, left: L, width: W, height: H };
+  }
+});
+
+Draggable._dragging = { };
+
+/*--------------------------------------------------------------------------*/
+
+var SortableObserver = Class.create({
+  initialize: function(element, observer) {
+    this.element   = $(element);
+    this.observer  = observer;
+    this.lastValue = Sortable.serialize(this.element);
+  },
+
+  onStart: function() {
+    this.lastValue = Sortable.serialize(this.element);
+  },
+
+  onEnd: function() {
+    Sortable.unmark();
+    if(this.lastValue != Sortable.serialize(this.element))
+      this.observer(this.element)
+  }
+});
+
+var Sortable = {
+  SERIALIZE_RULE: /^[^_\-](?:[A-Za-z0-9\-\_]*)[_](.*)$/,
+
+  sortables: { },
+
+  _findRootElement: function(element) {
+    while (element.tagName.toUpperCase() != "BODY") {
+      if(element.id && Sortable.sortables[element.id]) return element;
+      element = element.parentNode;
+    }
+  },
+
+  options: function(element) {
+    element = Sortable._findRootElement($(element));
+    if(!element) return;
+    return Sortable.sortables[element.id];
+  },
+
+  destroy: function(element){
+    element = $(element);
+    var s = Sortable.sortables[element.id];
+
+    if(s) {
+      Draggables.removeObserver(s.element);
+      s.droppables.each(function(d){ Droppables.remove(d) });
+      s.draggables.invoke('destroy');
+
+      delete Sortable.sortables[s.element.id];
+    }
+  },
+
+  create: function(element) {
+    element = $(element);
+    var options = Object.extend({
+      element:     element,
+      tag:         'li',       // assumes li children, override with tag: 'tagname'
+      dropOnEmpty: false,
+      tree:        false,
+      treeTag:     'ul',
+      overlap:     'vertical', // one of 'vertical', 'horizontal'
+      constraint:  'vertical', // one of 'vertical', 'horizontal', false
+      containment: element,    // also takes array of elements (or id's); or false
+      handle:      false,      // or a CSS class
+      only:        false,
+      delay:       0,
+      hoverclass:  null,
+      ghosting:    false,
+      quiet:       false,
+      scroll:      false,
+      scrollSensitivity: 20,
+      scrollSpeed: 15,
+      format:      this.SERIALIZE_RULE,
+
+      // these take arrays of elements or ids and can be
+      // used for better initialization performance
+      elements:    false,
+      handles:     false,
+
+      onChange:    Prototype.emptyFunction,
+      onUpdate:    Prototype.emptyFunction
+    }, arguments[1] || { });
+
+    // clear any old sortable with same element
+    this.destroy(element);
+
+    // build options for the draggables
+    var options_for_draggable = {
+      revert:      true,
+      quiet:       options.quiet,
+      scroll:      options.scroll,
+      scrollSpeed: options.scrollSpeed,
+      scrollSensitivity: options.scrollSensitivity,
+      delay:       options.delay,
+      ghosting:    options.ghosting,
+      constraint:  options.constraint,
+      handle:      options.handle };
+
+    if(options.starteffect)
+      options_for_draggable.starteffect = options.starteffect;
+
+    if(options.reverteffect)
+      options_for_draggable.reverteffect = options.reverteffect;
+    else
+      if(options.ghosting) options_for_draggable.reverteffect = function(element) {
+        element.style.top  = 0;
+        element.style.left = 0;
+      };
+
+    if(options.endeffect)
+      options_for_draggable.endeffect = options.endeffect;
+
+    if(options.zindex)
+      options_for_draggable.zindex = options.zindex;
+
+    // build options for the droppables
+    var options_for_droppable = {
+      overlap:     options.overlap,
+      containment: options.containment,
+      tree:        options.tree,
+      hoverclass:  options.hoverclass,
+      onHover:     Sortable.onHover
+    };
+
+    var options_for_tree = {
+      onHover:      Sortable.onEmptyHover,
+      overlap:      options.overlap,
+      containment:  options.containment,
+      hoverclass:   options.hoverclass
+    };
+
+    // fix for gecko engine
+    Element.cleanWhitespace(element);
+
+    options.draggables = [];
+    options.droppables = [];
+
+    // drop on empty handling
+    if(options.dropOnEmpty || options.tree) {
+      Droppables.add(element, options_for_tree);
+      options.droppables.push(element);
+    }
+
+    (options.elements || this.findElements(element, options) || []).each( function(e,i) {
+      var handle = options.handles ? $(options.handles[i]) :
+        (options.handle ? $(e).select('.' + options.handle)[0] : e);
+      options.draggables.push(
+        new Draggable(e, Object.extend(options_for_draggable, { handle: handle })));
+      Droppables.add(e, options_for_droppable);
+      if(options.tree) e.treeNode = element;
+      options.droppables.push(e);
+    });
+
+    if(options.tree) {
+      (Sortable.findTreeElements(element, options) || []).each( function(e) {
+        Droppables.add(e, options_for_tree);
+        e.treeNode = element;
+        options.droppables.push(e);
+      });
+    }
+
+    // keep reference
+    this.sortables[element.id] = options;
+
+    // for onupdate
+    Draggables.addObserver(new SortableObserver(element, options.onUpdate));
+
+  },
+
+  // return all suitable-for-sortable elements in a guaranteed order
+  findElements: function(element, options) {
+    return Element.findChildren(
+      element, options.only, options.tree ? true : false, options.tag);
+  },
+
+  findTreeElements: function(element, options) {
+    return Element.findChildren(
+      element, options.only, options.tree ? true : false, options.treeTag);
+  },
+
+  onHover: function(element, dropon, overlap) {
+    if(Element.isParent(dropon, element)) return;
+
+    if(overlap > .33 && overlap < .66 && Sortable.options(dropon).tree) {
+      return;
+    } else if(overlap>0.5) {
+      Sortable.mark(dropon, 'before');
+      if(dropon.previousSibling != element) {
+        var oldParentNode = element.parentNode;
+        element.style.visibility = "hidden"; // fix gecko rendering
+        dropon.parentNode.insertBefore(element, dropon);
+        if(dropon.parentNode!=oldParentNode)
+          Sortable.options(oldParentNode).onChange(element);
+        Sortable.options(dropon.parentNode).onChange(element);
+      }
+    } else {
+      Sortable.mark(dropon, 'after');
+      var nextElement = dropon.nextSibling || null;
+      if(nextElement != element) {
+        var oldParentNode = element.parentNode;
+        element.style.visibility = "hidden"; // fix gecko rendering
+        dropon.parentNode.insertBefore(element, nextElement);
+        if(dropon.parentNode!=oldParentNode)
+          Sortable.options(oldParentNode).onChange(element);
+        Sortable.options(dropon.parentNode).onChange(element);
+      }
+    }
+  },
+
+  onEmptyHover: function(element, dropon, overlap) {
+    var oldParentNode = element.parentNode;
+    var droponOptions = Sortable.options(dropon);
+
+    if(!Element.isParent(dropon, element)) {
+      var index;
+
+      var children = Sortable.findElements(dropon, {tag: droponOptions.tag, only: droponOptions.only});
+      var child = null;
+
+      if(children) {
+        var offset = Element.offsetSize(dropon, droponOptions.overlap) * (1.0 - overlap);
+
+        for (index = 0; index < children.length; index += 1) {
+          if (offset - Element.offsetSize (children[index], droponOptions.overlap) >= 0) {
+            offset -= Element.offsetSize (children[index], droponOptions.overlap);
+          } else if (offset - (Element.offsetSize (children[index], droponOptions.overlap) / 2) >= 0) {
+            child = index + 1 < children.length ? children[index + 1] : null;
+            break;
+          } else {
+            child = children[index];
+            break;
+          }
+        }
+      }
+
+      dropon.insertBefore(element, child);
+
+      Sortable.options(oldParentNode).onChange(element);
+      droponOptions.onChange(element);
+    }
+  },
+
+  unmark: function() {
+    if(Sortable._marker) Sortable._marker.hide();
+  },
+
+  mark: function(dropon, position) {
+    // mark on ghosting only
+    var sortable = Sortable.options(dropon.parentNode);
+    if(sortable && !sortable.ghosting) return;
+
+    if(!Sortable._marker) {
+      Sortable._marker =
+        ($('dropmarker') || Element.extend(document.createElement('DIV'))).
+          hide().addClassName('dropmarker').setStyle({position:'absolute'});
+      document.getElementsByTagName("body").item(0).appendChild(Sortable._marker);
+    }
+    var offsets = Position.cumulativeOffset(dropon);
+    Sortable._marker.setStyle({left: offsets[0]+'px', top: offsets[1] + 'px'});
+
+    if(position=='after')
+      if(sortable.overlap == 'horizontal')
+        Sortable._marker.setStyle({left: (offsets[0]+dropon.clientWidth) + 'px'});
+      else
+        Sortable._marker.setStyle({top: (offsets[1]+dropon.clientHeight) + 'px'});
+
+    Sortable._marker.show();
+  },
+
+  _tree: function(element, options, parent) {
+    var children = Sortable.findElements(element, options) || [];
+
+    for (var i = 0; i < children.length; ++i) {
+      var match = children[i].id.match(options.format);
+
+      if (!match) continue;
+
+      var child = {
+        id: encodeURIComponent(match ? match[1] : null),
+        element: element,
+        parent: parent,
+        children: [],
+        position: parent.children.length,
+        container: $(children[i]).down(options.treeTag)
+      };
+
+      /* Get the element containing the children and recurse over it */
+      if (child.container)
+        this._tree(child.container, options, child);
+
+      parent.children.push (child);
+    }
+
+    return parent;
+  },
+
+  tree: function(element) {
+    element = $(element);
+    var sortableOptions = this.options(element);
+    var options = Object.extend({
+      tag: sortableOptions.tag,
+      treeTag: sortableOptions.treeTag,
+      only: sortableOptions.only,
+      name: element.id,
+      format: sortableOptions.format
+    }, arguments[1] || { });
+
+    var root = {
+      id: null,
+      parent: null,
+      children: [],
+      container: element,
+      position: 0
+    };
+
+    return Sortable._tree(element, options, root);
+  },
+
+  /* Construct a [i] index for a particular node */
+  _constructIndex: function(node) {
+    var index = '';
+    do {
+      if (node.id) index = '[' + node.position + ']' + index;
+    } while ((node = node.parent) != null);
+    return index;
+  },
+
+  sequence: function(element) {
+    element = $(element);
+    var options = Object.extend(this.options(element), arguments[1] || { });
+
+    return $(this.findElements(element, options) || []).map( function(item) {
+      return item.id.match(options.format) ? item.id.match(options.format)[1] : '';
+    });
+  },
+
+  setSequence: function(element, new_sequence) {
+    element = $(element);
+    var options = Object.extend(this.options(element), arguments[2] || { });
+
+    var nodeMap = { };
+    this.findElements(element, options).each( function(n) {
+        if (n.id.match(options.format))
+            nodeMap[n.id.match(options.format)[1]] = [n, n.parentNode];
+        n.parentNode.removeChild(n);
+    });
+
+    new_sequence.each(function(ident) {
+      var n = nodeMap[ident];
+      if (n) {
+        n[1].appendChild(n[0]);
+        delete nodeMap[ident];
+      }
+    });
+  },
+
+  serialize: function(element) {
+    element = $(element);
+    var options = Object.extend(Sortable.options(element), arguments[1] || { });
+    var name = encodeURIComponent(
+      (arguments[1] && arguments[1].name) ? arguments[1].name : element.id);
+
+    if (options.tree) {
+      return Sortable.tree(element, arguments[1]).children.map( function (item) {
+        return [name + Sortable._constructIndex(item) + "[id]=" +
+                encodeURIComponent(item.id)].concat(item.children.map(arguments.callee));
+      }).flatten().join('&');
+    } else {
+      return Sortable.sequence(element, arguments[1]).map( function(item) {
+        return name + "[]=" + encodeURIComponent(item);
+      }).join('&');
+    }
+  }
+};
+
+// Returns true if child is contained within element
+Element.isParent = function(child, element) {
+  if (!child.parentNode || child == element) return false;
+  if (child.parentNode == element) return true;
+  return Element.isParent(child.parentNode, element);
+};
+
+Element.findChildren = function(element, only, recursive, tagName) {
+  if(!element.hasChildNodes()) return null;
+  tagName = tagName.toUpperCase();
+  if(only) only = [only].flatten();
+  var elements = [];
+  $A(element.childNodes).each( function(e) {
+    if(e.tagName && e.tagName.toUpperCase()==tagName &&
+      (!only || (Element.classNames(e).detect(function(v) { return only.include(v) }))))
+        elements.push(e);
+    if(recursive) {
+      var grandchildren = Element.findChildren(e, only, recursive, tagName);
+      if(grandchildren) elements.push(grandchildren);
+    }
+  });
+
+  return (elements.length>0 ? elements.flatten() : []);
+};
+
+Element.offsetSize = function (element, type) {
+  return element['offset' + ((type=='vertical' || type=='height') ? 'Height' : 'Width')];
+};
\ No newline at end of file
diff --git a/js/src/effects.js b/js/src/effects.js
new file mode 100644
index 0000000..f31a81a
--- /dev/null
+++ b/js/src/effects.js
@@ -0,0 +1,1130 @@
+// script.aculo.us effects.js v1.8.2, Tue Nov 18 18:30:58 +0100 2008
+
+// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+// Contributors:
+//  Justin Palmer (http://encytemedia.com/)
+//  Mark Pilgrim (http://diveintomark.org/)
+//  Martin Bialasinki
+//
+// script.aculo.us is freely distributable under the terms of an MIT-style license.
+// For details, see the script.aculo.us web site: http://script.aculo.us/
+
+// converts rgb() and #xxx to #xxxxxx format,
+// returns self (or first argument) if not convertable
+String.prototype.parseColor = function() {
+  var color = '#';
+  if (this.slice(0,4) == 'rgb(') {
+    var cols = this.slice(4,this.length-1).split(',');
+    var i=0; do { color += parseInt(cols[i]).toColorPart() } while (++i<3);
+  } else {
+    if (this.slice(0,1) == '#') {
+      if (this.length==4) for(var i=1;i<4;i++) color += (this.charAt(i) + this.charAt(i)).toLowerCase();
+      if (this.length==7) color = this.toLowerCase();
+    }
+  }
+  return (color.length==7 ? color : (arguments[0] || this));
+};
+
+/*--------------------------------------------------------------------------*/
+
+Element.collectTextNodes = function(element) {
+  return $A($(element).childNodes).collect( function(node) {
+    return (node.nodeType==3 ? node.nodeValue :
+      (node.hasChildNodes() ? Element.collectTextNodes(node) : ''));
+  }).flatten().join('');
+};
+
+Element.collectTextNodesIgnoreClass = function(element, className) {
+  return $A($(element).childNodes).collect( function(node) {
+    return (node.nodeType==3 ? node.nodeValue :
+      ((node.hasChildNodes() && !Element.hasClassName(node,className)) ?
+        Element.collectTextNodesIgnoreClass(node, className) : ''));
+  }).flatten().join('');
+};
+
+Element.setContentZoom = function(element, percent) {
+  element = $(element);
+  element.setStyle({fontSize: (percent/100) + 'em'});
+  if (Prototype.Browser.WebKit) window.scrollBy(0,0);
+  return element;
+};
+
+Element.getInlineOpacity = function(element){
+  return $(element).style.opacity || '';
+};
+
+Element.forceRerendering = function(element) {
+  try {
+    element = $(element);
+    var n = document.createTextNode(' ');
+    element.appendChild(n);
+    element.removeChild(n);
+  } catch(e) { }
+};
+
+/*--------------------------------------------------------------------------*/
+
+var Effect = {
+  _elementDoesNotExistError: {
+    name: 'ElementDoesNotExistError',
+    message: 'The specified DOM element does not exist, but is required for this effect to operate'
+  },
+  Transitions: {
+    linear: Prototype.K,
+    sinoidal: function(pos) {
+      return (-Math.cos(pos*Math.PI)/2) + .5;
+    },
+    reverse: function(pos) {
+      return 1-pos;
+    },
+    flicker: function(pos) {
+      var pos = ((-Math.cos(pos*Math.PI)/4) + .75) + Math.random()/4;
+      return pos > 1 ? 1 : pos;
+    },
+    wobble: function(pos) {
+      return (-Math.cos(pos*Math.PI*(9*pos))/2) + .5;
+    },
+    pulse: function(pos, pulses) {
+      return (-Math.cos((pos*((pulses||5)-.5)*2)*Math.PI)/2) + .5;
+    },
+    spring: function(pos) {
+      return 1 - (Math.cos(pos * 4.5 * Math.PI) * Math.exp(-pos * 6));
+    },
+    none: function(pos) {
+      return 0;
+    },
+    full: function(pos) {
+      return 1;
+    }
+  },
+  DefaultOptions: {
+    duration:   1.0,   // seconds
+    fps:        100,   // 100= assume 66fps max.
+    sync:       false, // true for combining
+    from:       0.0,
+    to:         1.0,
+    delay:      0.0,
+    queue:      'parallel'
+  },
+  tagifyText: function(element) {
+    var tagifyStyle = 'position:relative';
+    if (Prototype.Browser.IE) tagifyStyle += ';zoom:1';
+
+    element = $(element);
+    $A(element.childNodes).each( function(child) {
+      if (child.nodeType==3) {
+        child.nodeValue.toArray().each( function(character) {
+          element.insertBefore(
+            new Element('span', {style: tagifyStyle}).update(
+              character == ' ' ? String.fromCharCode(160) : character),
+              child);
+        });
+        Element.remove(child);
+      }
+    });
+  },
+  multiple: function(element, effect) {
+    var elements;
+    if (((typeof element == 'object') ||
+        Object.isFunction(element)) &&
+       (element.length))
+      elements = element;
+    else
+      elements = $(element).childNodes;
+
+    var options = Object.extend({
+      speed: 0.1,
+      delay: 0.0
+    }, arguments[2] || { });
+    var masterDelay = options.delay;
+
+    $A(elements).each( function(element, index) {
+      new effect(element, Object.extend(options, { delay: index * options.speed + masterDelay }));
+    });
+  },
+  PAIRS: {
+    'slide':  ['SlideDown','SlideUp'],
+    'blind':  ['BlindDown','BlindUp'],
+    'appear': ['Appear','Fade']
+  },
+  toggle: function(element, effect) {
+    element = $(element);
+    effect = (effect || 'appear').toLowerCase();
+    var options = Object.extend({
+      queue: { position:'end', scope:(element.id || 'global'), limit: 1 }
+    }, arguments[2] || { });
+    Effect[element.visible() ?
+      Effect.PAIRS[effect][1] : Effect.PAIRS[effect][0]](element, options);
+  }
+};
+
+Effect.DefaultOptions.transition = Effect.Transitions.sinoidal;
+
+/* ------------- core effects ------------- */
+
+Effect.ScopedQueue = Class.create(Enumerable, {
+  initialize: function() {
+    this.effects  = [];
+    this.interval = null;
+  },
+  _each: function(iterator) {
+    this.effects._each(iterator);
+  },
+  add: function(effect) {
+    var timestamp = new Date().getTime();
+
+    var position = Object.isString(effect.options.queue) ?
+      effect.options.queue : effect.options.queue.position;
+
+    switch(position) {
+      case 'front':
+        // move unstarted effects after this effect
+        this.effects.findAll(function(e){ return e.state=='idle' }).each( function(e) {
+            e.startOn  += effect.finishOn;
+            e.finishOn += effect.finishOn;
+          });
+        break;
+      case 'with-last':
+        timestamp = this.effects.pluck('startOn').max() || timestamp;
+        break;
+      case 'end':
+        // start effect after last queued effect has finished
+        timestamp = this.effects.pluck('finishOn').max() || timestamp;
+        break;
+    }
+
+    effect.startOn  += timestamp;
+    effect.finishOn += timestamp;
+
+    if (!effect.options.queue.limit || (this.effects.length < effect.options.queue.limit))
+      this.effects.push(effect);
+
+    if (!this.interval)
+      this.interval = setInterval(this.loop.bind(this), 15);
+  },
+  remove: function(effect) {
+    this.effects = this.effects.reject(function(e) { return e==effect });
+    if (this.effects.length == 0) {
+      clearInterval(this.interval);
+      this.interval = null;
+    }
+  },
+  loop: function() {
+    var timePos = new Date().getTime();
+    for(var i=0, len=this.effects.length;i<len;i++)
+      this.effects[i] && this.effects[i].loop(timePos);
+  }
+});
+
+Effect.Queues = {
+  instances: $H(),
+  get: function(queueName) {
+    if (!Object.isString(queueName)) return queueName;
+
+    return this.instances.get(queueName) ||
+      this.instances.set(queueName, new Effect.ScopedQueue());
+  }
+};
+Effect.Queue = Effect.Queues.get('global');
+
+Effect.Base = Class.create({
+  position: null,
+  start: function(options) {
+    function codeForEvent(options,eventName){
+      return (
+        (options[eventName+'Internal'] ? 'this.options.'+eventName+'Internal(this);' : '') +
+        (options[eventName] ? 'this.options.'+eventName+'(this);' : '')
+      );
+    }
+    if (options && options.transition === false) options.transition = Effect.Transitions.linear;
+    this.options      = Object.extend(Object.extend({ },Effect.DefaultOptions), options || { });
+    this.currentFrame = 0;
+    this.state        = 'idle';
+    this.startOn      = this.options.delay*1000;
+    this.finishOn     = this.startOn+(this.options.duration*1000);
+    this.fromToDelta  = this.options.to-this.options.from;
+    this.totalTime    = this.finishOn-this.startOn;
+    this.totalFrames  = this.options.fps*this.options.duration;
+
+    this.render = (function() {
+      function dispatch(effect, eventName) {
+        if (effect.options[eventName + 'Internal'])
+          effect.options[eventName + 'Internal'](effect);
+        if (effect.options[eventName])
+          effect.options[eventName](effect);
+      }
+
+      return function(pos) {
+        if (this.state === "idle") {
+          this.state = "running";
+          dispatch(this, 'beforeSetup');
+          if (this.setup) this.setup();
+          dispatch(this, 'afterSetup');
+        }
+        if (this.state === "running") {
+          pos = (this.options.transition(pos) * this.fromToDelta) + this.options.from;
+          this.position = pos;
+          dispatch(this, 'beforeUpdate');
+          if (this.update) this.update(pos);
+          dispatch(this, 'afterUpdate');
+        }
+      };
+    })();
+
+    this.event('beforeStart');
+    if (!this.options.sync)
+      Effect.Queues.get(Object.isString(this.options.queue) ?
+        'global' : this.options.queue.scope).add(this);
+  },
+  loop: function(timePos) {
+    if (timePos >= this.startOn) {
+      if (timePos >= this.finishOn) {
+        this.render(1.0);
+        this.cancel();
+        this.event('beforeFinish');
+        if (this.finish) this.finish();
+        this.event('afterFinish');
+        return;
+      }
+      var pos   = (timePos - this.startOn) / this.totalTime,
+          frame = (pos * this.totalFrames).round();
+      if (frame > this.currentFrame) {
+        this.render(pos);
+        this.currentFrame = frame;
+      }
+    }
+  },
+  cancel: function() {
+    if (!this.options.sync)
+      Effect.Queues.get(Object.isString(this.options.queue) ?
+        'global' : this.options.queue.scope).remove(this);
+    this.state = 'finished';
+  },
+  event: function(eventName) {
+    if (this.options[eventName + 'Internal']) this.options[eventName + 'Internal'](this);
+    if (this.options[eventName]) this.options[eventName](this);
+  },
+  inspect: function() {
+    var data = $H();
+    for(property in this)
+      if (!Object.isFunction(this[property])) data.set(property, this[property]);
+    return '#<Effect:' + data.inspect() + ',options:' + $H(this.options).inspect() + '>';
+  }
+});
+
+Effect.Parallel = Class.create(Effect.Base, {
+  initialize: function(effects) {
+    this.effects = effects || [];
+    this.start(arguments[1]);
+  },
+  update: function(position) {
+    this.effects.invoke('render', position);
+  },
+  finish: function(position) {
+    this.effects.each( function(effect) {
+      effect.render(1.0);
+      effect.cancel();
+      effect.event('beforeFinish');
+      if (effect.finish) effect.finish(position);
+      effect.event('afterFinish');
+    });
+  }
+});
+
+Effect.Tween = Class.create(Effect.Base, {
+  initialize: function(object, from, to) {
+    object = Object.isString(object) ? $(object) : object;
+    var args = $A(arguments), method = args.last(),
+      options = args.length == 5 ? args[3] : null;
+    this.method = Object.isFunction(method) ? method.bind(object) :
+      Object.isFunction(object[method]) ? object[method].bind(object) :
+      function(value) { object[method] = value };
+    this.start(Object.extend({ from: from, to: to }, options || { }));
+  },
+  update: function(position) {
+    this.method(position);
+  }
+});
+
+Effect.Event = Class.create(Effect.Base, {
+  initialize: function() {
+    this.start(Object.extend({ duration: 0 }, arguments[0] || { }));
+  },
+  update: Prototype.emptyFunction
+});
+
+Effect.Opacity = Class.create(Effect.Base, {
+  initialize: function(element) {
+    this.element = $(element);
+    if (!this.element) throw(Effect._elementDoesNotExistError);
+    // make this work on IE on elements without 'layout'
+    if (Prototype.Browser.IE && (!this.element.currentStyle.hasLayout))
+      this.element.setStyle({zoom: 1});
+    var options = Object.extend({
+      from: this.element.getOpacity() || 0.0,
+      to:   1.0
+    }, arguments[1] || { });
+    this.start(options);
+  },
+  update: function(position) {
+    this.element.setOpacity(position);
+  }
+});
+
+Effect.Move = Class.create(Effect.Base, {
+  initialize: function(element) {
+    this.element = $(element);
+    if (!this.element) throw(Effect._elementDoesNotExistError);
+    var options = Object.extend({
+      x:    0,
+      y:    0,
+      mode: 'relative'
+    }, arguments[1] || { });
+    this.start(options);
+  },
+  setup: function() {
+    this.element.makePositioned();
+    this.originalLeft = parseFloat(this.element.getStyle('left') || '0');
+    this.originalTop  = parseFloat(this.element.getStyle('top')  || '0');
+    if (this.options.mode == 'absolute') {
+      this.options.x = this.options.x - this.originalLeft;
+      this.options.y = this.options.y - this.originalTop;
+    }
+  },
+  update: function(position) {
+    this.element.setStyle({
+      left: (this.options.x  * position + this.originalLeft).round() + 'px',
+      top:  (this.options.y  * position + this.originalTop).round()  + 'px'
+    });
+  }
+});
+
+// for backwards compatibility
+Effect.MoveBy = function(element, toTop, toLeft) {
+  return new Effect.Move(element,
+    Object.extend({ x: toLeft, y: toTop }, arguments[3] || { }));
+};
+
+Effect.Scale = Class.create(Effect.Base, {
+  initialize: function(element, percent) {
+    this.element = $(element);
+    if (!this.element) throw(Effect._elementDoesNotExistError);
+    var options = Object.extend({
+      scaleX: true,
+      scaleY: true,
+      scaleContent: true,
+      scaleFromCenter: false,
+      scaleMode: 'box',        // 'box' or 'contents' or { } with provided values
+      scaleFrom: 100.0,
+      scaleTo:   percent
+    }, arguments[2] || { });
+    this.start(options);
+  },
+  setup: function() {
+    this.restoreAfterFinish = this.options.restoreAfterFinish || false;
+    this.elementPositioning = this.element.getStyle('position');
+
+    this.originalStyle = { };
+    ['top','left','width','height','fontSize'].each( function(k) {
+      this.originalStyle[k] = this.element.style[k];
+    }.bind(this));
+
+    this.originalTop  = this.element.offsetTop;
+    this.originalLeft = this.element.offsetLeft;
+
+    var fontSize = this.element.getStyle('font-size') || '100%';
+    ['em','px','%','pt'].each( function(fontSizeType) {
+      if (fontSize.indexOf(fontSizeType)>0) {
+        this.fontSize     = parseFloat(fontSize);
+        this.fontSizeType = fontSizeType;
+      }
+    }.bind(this));
+
+    this.factor = (this.options.scaleTo - this.options.scaleFrom)/100;
+
+    this.dims = null;
+    if (this.options.scaleMode=='box')
+      this.dims = [this.element.offsetHeight, this.element.offsetWidth];
+    if (/^content/.test(this.options.scaleMode))
+      this.dims = [this.element.scrollHeight, this.element.scrollWidth];
+    if (!this.dims)
+      this.dims = [this.options.scaleMode.originalHeight,
+                   this.options.scaleMode.originalWidth];
+  },
+  update: function(position) {
+    var currentScale = (this.options.scaleFrom/100.0) + (this.factor * position);
+    if (this.options.scaleContent && this.fontSize)
+      this.element.setStyle({fontSize: this.fontSize * currentScale + this.fontSizeType });
+    this.setDimensions(this.dims[0] * currentScale, this.dims[1] * currentScale);
+  },
+  finish: function(position) {
+    if (this.restoreAfterFinish) this.element.setStyle(this.originalStyle);
+  },
+  setDimensions: function(height, width) {
+    var d = { };
+    if (this.options.scaleX) d.width = width.round() + 'px';
+    if (this.options.scaleY) d.height = height.round() + 'px';
+    if (this.options.scaleFromCenter) {
+      var topd  = (height - this.dims[0])/2;
+      var leftd = (width  - this.dims[1])/2;
+      if (this.elementPositioning == 'absolute') {
+        if (this.options.scaleY) d.top = this.originalTop-topd + 'px';
+        if (this.options.scaleX) d.left = this.originalLeft-leftd + 'px';
+      } else {
+        if (this.options.scaleY) d.top = -topd + 'px';
+        if (this.options.scaleX) d.left = -leftd + 'px';
+      }
+    }
+    this.element.setStyle(d);
+  }
+});
+
+Effect.Highlight = Class.create(Effect.Base, {
+  initialize: function(element) {
+    this.element = $(element);
+    if (!this.element) throw(Effect._elementDoesNotExistError);
+    var options = Object.extend({ startcolor: '#ffff99' }, arguments[1] || { });
+    this.start(options);
+  },
+  setup: function() {
+    // Prevent executing on elements not in the layout flow
+    if (this.element.getStyle('display')=='none') { this.cancel(); return; }
+    // Disable background image during the effect
+    this.oldStyle = { };
+    if (!this.options.keepBackgroundImage) {
+      this.oldStyle.backgroundImage = this.element.getStyle('background-image');
+      this.element.setStyle({backgroundImage: 'none'});
+    }
+    if (!this.options.endcolor)
+      this.options.endcolor = this.element.getStyle('background-color').parseColor('#ffffff');
+    if (!this.options.restorecolor)
+      this.options.restorecolor = this.element.getStyle('background-color');
+    // init color calculations
+    this._base  = $R(0,2).map(function(i){ return parseInt(this.options.startcolor.slice(i*2+1,i*2+3),16) }.bind(this));
+    this._delta = $R(0,2).map(function(i){ return parseInt(this.options.endcolor.slice(i*2+1,i*2+3),16)-this._base[i] }.bind(this));
+  },
+  update: function(position) {
+    this.element.setStyle({backgroundColor: $R(0,2).inject('#',function(m,v,i){
+      return m+((this._base[i]+(this._delta[i]*position)).round().toColorPart()); }.bind(this)) });
+  },
+  finish: function() {
+    this.element.setStyle(Object.extend(this.oldStyle, {
+      backgroundColor: this.options.restorecolor
+    }));
+  }
+});
+
+Effect.ScrollTo = function(element) {
+  var options = arguments[1] || { },
+  scrollOffsets = document.viewport.getScrollOffsets(),
+  elementOffsets = $(element).cumulativeOffset();
+
+  if (options.offset) elementOffsets[1] += options.offset;
+
+  return new Effect.Tween(null,
+    scrollOffsets.top,
+    elementOffsets[1],
+    options,
+    function(p){ scrollTo(scrollOffsets.left, p.round()); }
+  );
+};
+
+/* ------------- combination effects ------------- */
+
+Effect.Fade = function(element) {
+  element = $(element);
+  var oldOpacity = element.getInlineOpacity();
+  var options = Object.extend({
+    from: element.getOpacity() || 1.0,
+    to:   0.0,
+    afterFinishInternal: function(effect) {
+      if (effect.options.to!=0) return;
+      effect.element.hide().setStyle({opacity: oldOpacity});
+    }
+  }, arguments[1] || { });
+  return new Effect.Opacity(element,options);
+};
+
+Effect.Appear = function(element) {
+  element = $(element);
+  var options = Object.extend({
+  from: (element.getStyle('display') == 'none' ? 0.0 : element.getOpacity() || 0.0),
+  to:   1.0,
+  // force Safari to render floated elements properly
+  afterFinishInternal: function(effect) {
+    effect.element.forceRerendering();
+  },
+  beforeSetup: function(effect) {
+    effect.element.setOpacity(effect.options.from).show();
+  }}, arguments[1] || { });
+  return new Effect.Opacity(element,options);
+};
+
+Effect.Puff = function(element) {
+  element = $(element);
+  var oldStyle = {
+    opacity: element.getInlineOpacity(),
+    position: element.getStyle('position'),
+    top:  element.style.top,
+    left: element.style.left,
+    width: element.style.width,
+    height: element.style.height
+  };
+  return new Effect.Parallel(
+   [ new Effect.Scale(element, 200,
+      { sync: true, scaleFromCenter: true, scaleContent: true, restoreAfterFinish: true }),
+     new Effect.Opacity(element, { sync: true, to: 0.0 } ) ],
+     Object.extend({ duration: 1.0,
+      beforeSetupInternal: function(effect) {
+        Position.absolutize(effect.effects[0].element);
+      },
+      afterFinishInternal: function(effect) {
+         effect.effects[0].element.hide().setStyle(oldStyle); }
+     }, arguments[1] || { })
+   );
+};
+
+Effect.BlindUp = function(element) {
+  element = $(element);
+  element.makeClipping();
+  return new Effect.Scale(element, 0,
+    Object.extend({ scaleContent: false,
+      scaleX: false,
+      restoreAfterFinish: true,
+      afterFinishInternal: function(effect) {
+        effect.element.hide().undoClipping();
+      }
+    }, arguments[1] || { })
+  );
+};
+
+Effect.BlindDown = function(element) {
+  element = $(element);
+  var elementDimensions = element.getDimensions();
+  return new Effect.Scale(element, 100, Object.extend({
+    scaleContent: false,
+    scaleX: false,
+    scaleFrom: 0,
+    scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},
+    restoreAfterFinish: true,
+    afterSetup: function(effect) {
+      effect.element.makeClipping().setStyle({height: '0px'}).show();
+    },
+    afterFinishInternal: function(effect) {
+      effect.element.undoClipping();
+    }
+  }, arguments[1] || { }));
+};
+
+Effect.SwitchOff = function(element) {
+  element = $(element);
+  var oldOpacity = element.getInlineOpacity();
+  return new Effect.Appear(element, Object.extend({
+    duration: 0.4,
+    from: 0,
+    transition: Effect.Transitions.flicker,
+    afterFinishInternal: function(effect) {
+      new Effect.Scale(effect.element, 1, {
+        duration: 0.3, scaleFromCenter: true,
+        scaleX: false, scaleContent: false, restoreAfterFinish: true,
+        beforeSetup: function(effect) {
+          effect.element.makePositioned().makeClipping();
+        },
+        afterFinishInternal: function(effect) {
+          effect.element.hide().undoClipping().undoPositioned().setStyle({opacity: oldOpacity});
+        }
+      });
+    }
+  }, arguments[1] || { }));
+};
+
+Effect.DropOut = function(element) {
+  element = $(element);
+  var oldStyle = {
+    top: element.getStyle('top'),
+    left: element.getStyle('left'),
+    opacity: element.getInlineOpacity() };
+  return new Effect.Parallel(
+    [ new Effect.Move(element, {x: 0, y: 100, sync: true }),
+      new Effect.Opacity(element, { sync: true, to: 0.0 }) ],
+    Object.extend(
+      { duration: 0.5,
+        beforeSetup: function(effect) {
+          effect.effects[0].element.makePositioned();
+        },
+        afterFinishInternal: function(effect) {
+          effect.effects[0].element.hide().undoPositioned().setStyle(oldStyle);
+        }
+      }, arguments[1] || { }));
+};
+
+Effect.Shake = function(element) {
+  element = $(element);
+  var options = Object.extend({
+    distance: 20,
+    duration: 0.5
+  }, arguments[1] || {});
+  var distance = parseFloat(options.distance);
+  var split = parseFloat(options.duration) / 10.0;
+  var oldStyle = {
+    top: element.getStyle('top'),
+    left: element.getStyle('left') };
+    return new Effect.Move(element,
+      { x:  distance, y: 0, duration: split, afterFinishInternal: function(effect) {
+    new Effect.Move(effect.element,
+      { x: -distance*2, y: 0, duration: split*2,  afterFinishInternal: function(effect) {
+    new Effect.Move(effect.element,
+      { x:  distance*2, y: 0, duration: split*2,  afterFinishInternal: function(effect) {
+    new Effect.Move(effect.element,
+      { x: -distance*2, y: 0, duration: split*2,  afterFinishInternal: function(effect) {
+    new Effect.Move(effect.element,
+      { x:  distance*2, y: 0, duration: split*2,  afterFinishInternal: function(effect) {
+    new Effect.Move(effect.element,
+      { x: -distance, y: 0, duration: split, afterFinishInternal: function(effect) {
+        effect.element.undoPositioned().setStyle(oldStyle);
+  }}); }}); }}); }}); }}); }});
+};
+
+Effect.SlideDown = function(element) {
+  element = $(element).cleanWhitespace();
+  // SlideDown need to have the content of the element wrapped in a container element with fixed height!
+  var oldInnerBottom = element.down().getStyle('bottom');
+  var elementDimensions = element.getDimensions();
+  return new Effect.Scale(element, 100, Object.extend({
+    scaleContent: false,
+    scaleX: false,
+    scaleFrom: window.opera ? 0 : 1,
+    scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},
+    restoreAfterFinish: true,
+    afterSetup: function(effect) {
+      effect.element.makePositioned();
+      effect.element.down().makePositioned();
+      if (window.opera) effect.element.setStyle({top: ''});
+      effect.element.makeClipping().setStyle({height: '0px'}).show();
+    },
+    afterUpdateInternal: function(effect) {
+      effect.element.down().setStyle({bottom:
+        (effect.dims[0] - effect.element.clientHeight) + 'px' });
+    },
+    afterFinishInternal: function(effect) {
+      effect.element.undoClipping().undoPositioned();
+      effect.element.down().undoPositioned().setStyle({bottom: oldInnerBottom}); }
+    }, arguments[1] || { })
+  );
+};
+
+Effect.SlideUp = function(element) {
+  element = $(element).cleanWhitespace();
+  var oldInnerBottom = element.down().getStyle('bottom');
+  var elementDimensions = element.getDimensions();
+  return new Effect.Scale(element, window.opera ? 0 : 1,
+   Object.extend({ scaleContent: false,
+    scaleX: false,
+    scaleMode: 'box',
+    scaleFrom: 100,
+    scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},
+    restoreAfterFinish: true,
+    afterSetup: function(effect) {
+      effect.element.makePositioned();
+      effect.element.down().makePositioned();
+      if (window.opera) effect.element.setStyle({top: ''});
+      effect.element.makeClipping().show();
+    },
+    afterUpdateInternal: function(effect) {
+      effect.element.down().setStyle({bottom:
+        (effect.dims[0] - effect.element.clientHeight) + 'px' });
+    },
+    afterFinishInternal: function(effect) {
+      effect.element.hide().undoClipping().undoPositioned();
+      effect.element.down().undoPositioned().setStyle({bottom: oldInnerBottom});
+    }
+   }, arguments[1] || { })
+  );
+};
+
+// Bug in opera makes the TD containing this element expand for a instance after finish
+Effect.Squish = function(element) {
+  return new Effect.Scale(element, window.opera ? 1 : 0, {
+    restoreAfterFinish: true,
+    beforeSetup: function(effect) {
+      effect.element.makeClipping();
+    },
+    afterFinishInternal: function(effect) {
+      effect.element.hide().undoClipping();
+    }
+  });
+};
+
+Effect.Grow = function(element) {
+  element = $(element);
+  var options = Object.extend({
+    direction: 'center',
+    moveTransition: Effect.Transitions.sinoidal,
+    scaleTransition: Effect.Transitions.sinoidal,
+    opacityTransition: Effect.Transitions.full
+  }, arguments[1] || { });
+  var oldStyle = {
+    top: element.style.top,
+    left: element.style.left,
+    height: element.style.height,
+    width: element.style.width,
+    opacity: element.getInlineOpacity() };
+
+  var dims = element.getDimensions();
+  var initialMoveX, initialMoveY;
+  var moveX, moveY;
+
+  switch (options.direction) {
+    case 'top-left':
+      initialMoveX = initialMoveY = moveX = moveY = 0;
+      break;
+    case 'top-right':
+      initialMoveX = dims.width;
+      initialMoveY = moveY = 0;
+      moveX = -dims.width;
+      break;
+    case 'bottom-left':
+      initialMoveX = moveX = 0;
+      initialMoveY = dims.height;
+      moveY = -dims.height;
+      break;
+    case 'bottom-right':
+      initialMoveX = dims.width;
+      initialMoveY = dims.height;
+      moveX = -dims.width;
+      moveY = -dims.height;
+      break;
+    case 'center':
+      initialMoveX = dims.width / 2;
+      initialMoveY = dims.height / 2;
+      moveX = -dims.width / 2;
+      moveY = -dims.height / 2;
+      break;
+  }
+
+  return new Effect.Move(element, {
+    x: initialMoveX,
+    y: initialMoveY,
+    duration: 0.01,
+    beforeSetup: function(effect) {
+      effect.element.hide().makeClipping().makePositioned();
+    },
+    afterFinishInternal: function(effect) {
+      new Effect.Parallel(
+        [ new Effect.Opacity(effect.element, { sync: true, to: 1.0, from: 0.0, transition: options.opacityTransition }),
+          new Effect.Move(effect.element, { x: moveX, y: moveY, sync: true, transition: options.moveTransition }),
+          new Effect.Scale(effect.element, 100, {
+            scaleMode: { originalHeight: dims.height, originalWidth: dims.width },
+            sync: true, scaleFrom: window.opera ? 1 : 0, transition: options.scaleTransition, restoreAfterFinish: true})
+        ], Object.extend({
+             beforeSetup: function(effect) {
+               effect.effects[0].element.setStyle({height: '0px'}).show();
+             },
+             afterFinishInternal: function(effect) {
+               effect.effects[0].element.undoClipping().undoPositioned().setStyle(oldStyle);
+             }
+           }, options)
+      );
+    }
+  });
+};
+
+Effect.Shrink = function(element) {
+  element = $(element);
+  var options = Object.extend({
+    direction: 'center',
+    moveTransition: Effect.Transitions.sinoidal,
+    scaleTransition: Effect.Transitions.sinoidal,
+    opacityTransition: Effect.Transitions.none
+  }, arguments[1] || { });
+  var oldStyle = {
+    top: element.style.top,
+    left: element.style.left,
+    height: element.style.height,
+    width: element.style.width,
+    opacity: element.getInlineOpacity() };
+
+  var dims = element.getDimensions();
+  var moveX, moveY;
+
+  switch (options.direction) {
+    case 'top-left':
+      moveX = moveY = 0;
+      break;
+    case 'top-right':
+      moveX = dims.width;
+      moveY = 0;
+      break;
+    case 'bottom-left':
+      moveX = 0;
+      moveY = dims.height;
+      break;
+    case 'bottom-right':
+      moveX = dims.width;
+      moveY = dims.height;
+      break;
+    case 'center':
+      moveX = dims.width / 2;
+      moveY = dims.height / 2;
+      break;
+  }
+
+  return new Effect.Parallel(
+    [ new Effect.Opacity(element, { sync: true, to: 0.0, from: 1.0, transition: options.opacityTransition }),
+      new Effect.Scale(element, window.opera ? 1 : 0, { sync: true, transition: options.scaleTransition, restoreAfterFinish: true}),
+      new Effect.Move(element, { x: moveX, y: moveY, sync: true, transition: options.moveTransition })
+    ], Object.extend({
+         beforeStartInternal: function(effect) {
+           effect.effects[0].element.makePositioned().makeClipping();
+         },
+         afterFinishInternal: function(effect) {
+           effect.effects[0].element.hide().undoClipping().undoPositioned().setStyle(oldStyle); }
+       }, options)
+  );
+};
+
+Effect.Pulsate = function(element) {
+  element = $(element);
+  var options    = arguments[1] || { },
+    oldOpacity = element.getInlineOpacity(),
+    transition = options.transition || Effect.Transitions.linear,
+    reverser   = function(pos){
+      return 1 - transition((-Math.cos((pos*(options.pulses||5)*2)*Math.PI)/2) + .5);
+    };
+
+  return new Effect.Opacity(element,
+    Object.extend(Object.extend({  duration: 2.0, from: 0,
+      afterFinishInternal: function(effect) { effect.element.setStyle({opacity: oldOpacity}); }
+    }, options), {transition: reverser}));
+};
+
+Effect.Fold = function(element) {
+  element = $(element);
+  var oldStyle = {
+    top: element.style.top,
+    left: element.style.left,
+    width: element.style.width,
+    height: element.style.height };
+  element.makeClipping();
+  return new Effect.Scale(element, 5, Object.extend({
+    scaleContent: false,
+    scaleX: false,
+    afterFinishInternal: function(effect) {
+    new Effect.Scale(element, 1, {
+      scaleContent: false,
+      scaleY: false,
+      afterFinishInternal: function(effect) {
+        effect.element.hide().undoClipping().setStyle(oldStyle);
+      } });
+  }}, arguments[1] || { }));
+};
+
+Effect.Morph = Class.create(Effect.Base, {
+  initialize: function(element) {
+    this.element = $(element);
+    if (!this.element) throw(Effect._elementDoesNotExistError);
+    var options = Object.extend({
+      style: { }
+    }, arguments[1] || { });
+
+    if (!Object.isString(options.style)) this.style = $H(options.style);
+    else {
+      if (options.style.include(':'))
+        this.style = options.style.parseStyle();
+      else {
+        this.element.addClassName(options.style);
+        this.style = $H(this.element.getStyles());
+        this.element.removeClassName(options.style);
+        var css = this.element.getStyles();
+        this.style = this.style.reject(function(style) {
+          return style.value == css[style.key];
+        });
+        options.afterFinishInternal = function(effect) {
+          effect.element.addClassName(effect.options.style);
+          effect.transforms.each(function(transform) {
+            effect.element.style[transform.style] = '';
+          });
+        };
+      }
+    }
+    this.start(options);
+  },
+
+  setup: function(){
+    function parseColor(color){
+      if (!color || ['rgba(0, 0, 0, 0)','transparent'].include(color)) color = '#ffffff';
+      color = color.parseColor();
+      return $R(0,2).map(function(i){
+        return parseInt( color.slice(i*2+1,i*2+3), 16 );
+      });
+    }
+    this.transforms = this.style.map(function(pair){
+      var property = pair[0], value = pair[1], unit = null;
+
+      if (value.parseColor('#zzzzzz') != '#zzzzzz') {
+        value = value.parseColor();
+        unit  = 'color';
+      } else if (property == 'opacity') {
+        value = parseFloat(value);
+        if (Prototype.Browser.IE && (!this.element.currentStyle.hasLayout))
+          this.element.setStyle({zoom: 1});
+      } else if (Element.CSS_LENGTH.test(value)) {
+          var components = value.match(/^([\+\-]?[0-9\.]+)(.*)$/);
+          value = parseFloat(components[1]);
+          unit = (components.length == 3) ? components[2] : null;
+      }
+
+      var originalValue = this.element.getStyle(property);
+      return {
+        style: property.camelize(),
+        originalValue: unit=='color' ? parseColor(originalValue) : parseFloat(originalValue || 0),
+        targetValue: unit=='color' ? parseColor(value) : value,
+        unit: unit
+      };
+    }.bind(this)).reject(function(transform){
+      return (
+        (transform.originalValue == transform.targetValue) ||
+        (
+          transform.unit != 'color' &&
+          (isNaN(transform.originalValue) || isNaN(transform.targetValue))
+        )
+      );
+    });
+  },
+  update: function(position) {
+    var style = { }, transform, i = this.transforms.length;
+    while(i--)
+      style[(transform = this.transforms[i]).style] =
+        transform.unit=='color' ? '#'+
+          (Math.round(transform.originalValue[0]+
+            (transform.targetValue[0]-transform.originalValue[0])*position)).toColorPart() +
+          (Math.round(transform.originalValue[1]+
+            (transform.targetValue[1]-transform.originalValue[1])*position)).toColorPart() +
+          (Math.round(transform.originalValue[2]+
+            (transform.targetValue[2]-transform.originalValue[2])*position)).toColorPart() :
+        (transform.originalValue +
+          (transform.targetValue - transform.originalValue) * position).toFixed(3) +
+            (transform.unit === null ? '' : transform.unit);
+    this.element.setStyle(style, true);
+  }
+});
+
+Effect.Transform = Class.create({
+  initialize: function(tracks){
+    this.tracks  = [];
+    this.options = arguments[1] || { };
+    this.addTracks(tracks);
+  },
+  addTracks: function(tracks){
+    tracks.each(function(track){
+      track = $H(track);
+      var data = track.values().first();
+      this.tracks.push($H({
+        ids:     track.keys().first(),
+        effect:  Effect.Morph,
+        options: { style: data }
+      }));
+    }.bind(this));
+    return this;
+  },
+  play: function(){
+    return new Effect.Parallel(
+      this.tracks.map(function(track){
+        var ids = track.get('ids'), effect = track.get('effect'), options = track.get('options');
+        var elements = [$(ids) || $$(ids)].flatten();
+        return elements.map(function(e){ return new effect(e, Object.extend({ sync:true }, options)) });
+      }).flatten(),
+      this.options
+    );
+  }
+});
+
+Element.CSS_PROPERTIES = $w(
+  'backgroundColor backgroundPosition borderBottomColor borderBottomStyle ' +
+  'borderBottomWidth borderLeftColor borderLeftStyle borderLeftWidth ' +
+  'borderRightColor borderRightStyle borderRightWidth borderSpacing ' +
+  'borderTopColor borderTopStyle borderTopWidth bottom clip color ' +
+  'fontSize fontWeight height left letterSpacing lineHeight ' +
+  'marginBottom marginLeft marginRight marginTop markerOffset maxHeight '+
+  'maxWidth minHeight minWidth opacity outlineColor outlineOffset ' +
+  'outlineWidth paddingBottom paddingLeft paddingRight paddingTop ' +
+  'right textIndent top width wordSpacing zIndex');
+
+Element.CSS_LENGTH = /^(([\+\-]?[0-9\.]+)(em|ex|px|in|cm|mm|pt|pc|\%))|0$/;
+
+String.__parseStyleElement = document.createElement('div');
+String.prototype.parseStyle = function(){
+  var style, styleRules = $H();
+  if (Prototype.Browser.WebKit)
+    style = new Element('div',{style:this}).style;
+  else {
+    String.__parseStyleElement.innerHTML = '<div style="' + this + '"></div>';
+    style = String.__parseStyleElement.childNodes[0].style;
+  }
+
+  Element.CSS_PROPERTIES.each(function(property){
+    if (style[property]) styleRules.set(property, style[property]);
+  });
+
+  if (Prototype.Browser.IE && this.include('opacity'))
+    styleRules.set('opacity', this.match(/opacity:\s*((?:0|1)?(?:\.\d*)?)/)[1]);
+
+  return styleRules;
+};
+
+if (document.defaultView && document.defaultView.getComputedStyle) {
+  Element.getStyles = function(element) {
+    var css = document.defaultView.getComputedStyle($(element), null);
+    return Element.CSS_PROPERTIES.inject({ }, function(styles, property) {
+      styles[property] = css[property];
+      return styles;
+    });
+  };
+} else {
+  Element.getStyles = function(element) {
+    element = $(element);
+    var css = element.currentStyle, styles;
+    styles = Element.CSS_PROPERTIES.inject({ }, function(results, property) {
+      results[property] = css[property];
+      return results;
+    });
+    if (!styles.opacity) styles.opacity = element.getOpacity();
+    return styles;
+  };
+}
+
+Effect.Methods = {
+  morph: function(element, style) {
+    element = $(element);
+    new Effect.Morph(element, Object.extend({ style: style }, arguments[2] || { }));
+    return element;
+  },
+  visualEffect: function(element, effect, options) {
+    element = $(element);
+    var s = effect.dasherize().camelize(), klass = s.charAt(0).toUpperCase() + s.substring(1);
+    new Effect[klass](element, options);
+    return element;
+  },
+  highlight: function(element, options) {
+    element = $(element);
+    new Effect.Highlight(element, options);
+    return element;
+  }
+};
+
+$w('fade appear grow shrink fold blindUp blindDown slideUp slideDown '+
+  'pulsate shake puff squish switchOff dropOut').each(
+  function(effect) {
+    Effect.Methods[effect] = function(element, options){
+      element = $(element);
+      Effect[effect.charAt(0).toUpperCase() + effect.substring(1)](element, options);
+      return element;
+    };
+  }
+);
+
+$w('getInlineOpacity forceRerendering setContentZoom collectTextNodes collectTextNodesIgnoreClass getStyles').each(
+  function(f) { Effect.Methods[f] = Element[f]; }
+);
+
+Element.addMethods(Effect.Methods);
\ No newline at end of file
diff --git a/js/src/scriptaculous.js b/js/src/scriptaculous.js
new file mode 100644
index 0000000..3e5543b
--- /dev/null
+++ b/js/src/scriptaculous.js
@@ -0,0 +1,60 @@
+// script.aculo.us scriptaculous.js v1.8.2, Tue Nov 18 18:30:58 +0100 2008
+
+// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+// For details, see the script.aculo.us web site: http://script.aculo.us/
+
+var Scriptaculous = {
+  Version: '1.8.2',
+  require: function(libraryName) {
+    // inserting via DOM fails in Safari 2.0, so brute force approach
+    document.write('<script type="text/javascript" src="'+libraryName+'"><\/script>');
+  },
+  REQUIRED_PROTOTYPE: '1.6.0.3',
+  load: function() {
+    function convertVersionString(versionString) {
+      var v = versionString.replace(/_.*|\./g, '');
+      v = parseInt(v + '0'.times(4-v.length));
+      return versionString.indexOf('_') > -1 ? v-1 : v;
+    }
+
+    if((typeof Prototype=='undefined') ||
+       (typeof Element == 'undefined') ||
+       (typeof Element.Methods=='undefined') ||
+       (convertVersionString(Prototype.Version) <
+        convertVersionString(Scriptaculous.REQUIRED_PROTOTYPE)))
+       throw("script.aculo.us requires the Prototype JavaScript framework >= " +
+        Scriptaculous.REQUIRED_PROTOTYPE);
+
+    var js = /scriptaculous\.js(\?.*)?$/;
+    $$('head script[src]').findAll(function(s) {
+      return s.src.match(js);
+    }).each(function(s) {
+      var path = s.src.replace(js, ''),
+      includes = s.src.match(/\?.*load=([a-z,]*)/);
+      (includes ? includes[1] : 'builder,effects,dragdrop,controls,slider,sound').split(',').each(
+       function(include) { Scriptaculous.require(path+include+'.js') });
+    });
+  }
+};
+
+Scriptaculous.load();
\ No newline at end of file
diff --git a/js/src/slider.js b/js/src/slider.js
new file mode 100644
index 0000000..40b7371
--- /dev/null
+++ b/js/src/slider.js
@@ -0,0 +1,275 @@
+// script.aculo.us slider.js v1.8.2, Tue Nov 18 18:30:58 +0100 2008
+
+// Copyright (c) 2005-2008 Marty Haught, Thomas Fuchs
+//
+// script.aculo.us is freely distributable under the terms of an MIT-style license.
+// For details, see the script.aculo.us web site: http://script.aculo.us/
+
+if (!Control) var Control = { };
+
+// options:
+//  axis: 'vertical', or 'horizontal' (default)
+//
+// callbacks:
+//  onChange(value)
+//  onSlide(value)
+Control.Slider = Class.create({
+  initialize: function(handle, track, options) {
+    var slider = this;
+
+    if (Object.isArray(handle)) {
+      this.handles = handle.collect( function(e) { return $(e) });
+    } else {
+      this.handles = [$(handle)];
+    }
+
+    this.track   = $(track);
+    this.options = options || { };
+
+    this.axis      = this.options.axis || 'horizontal';
+    this.increment = this.options.increment || 1;
+    this.step      = parseInt(this.options.step || '1');
+    this.range     = this.options.range || $R(0,1);
+
+    this.value     = 0; // assure backwards compat
+    this.values    = this.handles.map( function() { return 0 });
+    this.spans     = this.options.spans ? this.options.spans.map(function(s){ return $(s) }) : false;
+    this.options.startSpan = $(this.options.startSpan || null);
+    this.options.endSpan   = $(this.options.endSpan || null);
+
+    this.restricted = this.options.restricted || false;
+
+    this.maximum   = this.options.maximum || this.range.end;
+    this.minimum   = this.options.minimum || this.range.start;
+
+    // Will be used to align the handle onto the track, if necessary
+    this.alignX = parseInt(this.options.alignX || '0');
+    this.alignY = parseInt(this.options.alignY || '0');
+
+    this.trackLength = this.maximumOffset() - this.minimumOffset();
+
+    this.handleLength = this.isVertical() ?
+      (this.handles[0].offsetHeight != 0 ?
+        this.handles[0].offsetHeight : this.handles[0].style.height.replace(/px$/,"")) :
+      (this.handles[0].offsetWidth != 0 ? this.handles[0].offsetWidth :
+        this.handles[0].style.width.replace(/px$/,""));
+
+    this.active   = false;
+    this.dragging = false;
+    this.disabled = false;
+
+    if (this.options.disabled) this.setDisabled();
+
+    // Allowed values array
+    this.allowedValues = this.options.values ? this.options.values.sortBy(Prototype.K) : false;
+    if (this.allowedValues) {
+      this.minimum = this.allowedValues.min();
+      this.maximum = this.allowedValues.max();
+    }
+
+    this.eventMouseDown = this.startDrag.bindAsEventListener(this);
+    this.eventMouseUp   = this.endDrag.bindAsEventListener(this);
+    this.eventMouseMove = this.update.bindAsEventListener(this);
+
+    // Initialize handles in reverse (make sure first handle is active)
+    this.handles.each( function(h,i) {
+      i = slider.handles.length-1-i;
+      slider.setValue(parseFloat(
+        (Object.isArray(slider.options.sliderValue) ?
+          slider.options.sliderValue[i] : slider.options.sliderValue) ||
+         slider.range.start), i);
+      h.makePositioned().observe("mousedown", slider.eventMouseDown);
+    });
+
+    this.track.observe("mousedown", this.eventMouseDown);
+    document.observe("mouseup", this.eventMouseUp);
+    document.observe("mousemove", this.eventMouseMove);
+
+    this.initialized = true;
+  },
+  dispose: function() {
+    var slider = this;
+    Event.stopObserving(this.track, "mousedown", this.eventMouseDown);
+    Event.stopObserving(document, "mouseup", this.eventMouseUp);
+    Event.stopObserving(document, "mousemove", this.eventMouseMove);
+    this.handles.each( function(h) {
+      Event.stopObserving(h, "mousedown", slider.eventMouseDown);
+    });
+  },
+  setDisabled: function(){
+    this.disabled = true;
+  },
+  setEnabled: function(){
+    this.disabled = false;
+  },
+  getNearestValue: function(value){
+    if (this.allowedValues){
+      if (value >= this.allowedValues.max()) return(this.allowedValues.max());
+      if (value <= this.allowedValues.min()) return(this.allowedValues.min());
+
+      var offset = Math.abs(this.allowedValues[0] - value);
+      var newValue = this.allowedValues[0];
+      this.allowedValues.each( function(v) {
+        var currentOffset = Math.abs(v - value);
+        if (currentOffset <= offset){
+          newValue = v;
+          offset = currentOffset;
+        }
+      });
+      return newValue;
+    }
+    if (value > this.range.end) return this.range.end;
+    if (value < this.range.start) return this.range.start;
+    return value;
+  },
+  setValue: function(sliderValue, handleIdx){
+    if (!this.active) {
+      this.activeHandleIdx = handleIdx || 0;
+      this.activeHandle    = this.handles[this.activeHandleIdx];
+      this.updateStyles();
+    }
+    handleIdx = handleIdx || this.activeHandleIdx || 0;
+    if (this.initialized && this.restricted) {
+      if ((handleIdx>0) && (sliderValue<this.values[handleIdx-1]))
+        sliderValue = this.values[handleIdx-1];
+      if ((handleIdx < (this.handles.length-1)) && (sliderValue>this.values[handleIdx+1]))
+        sliderValue = this.values[handleIdx+1];
+    }
+    sliderValue = this.getNearestValue(sliderValue);
+    this.values[handleIdx] = sliderValue;
+    this.value = this.values[0]; // assure backwards compat
+
+    this.handles[handleIdx].style[this.isVertical() ? 'top' : 'left'] =
+      this.translateToPx(sliderValue);
+
+    this.drawSpans();
+    if (!this.dragging || !this.event) this.updateFinished();
+  },
+  setValueBy: function(delta, handleIdx) {
+    this.setValue(this.values[handleIdx || this.activeHandleIdx || 0] + delta,
+      handleIdx || this.activeHandleIdx || 0);
+  },
+  translateToPx: function(value) {
+    return Math.round(
+      ((this.trackLength-this.handleLength)/(this.range.end-this.range.start)) *
+      (value - this.range.start)) + "px";
+  },
+  translateToValue: function(offset) {
+    return ((offset/(this.trackLength-this.handleLength) *
+      (this.range.end-this.range.start)) + this.range.start);
+  },
+  getRange: function(range) {
+    var v = this.values.sortBy(Prototype.K);
+    range = range || 0;
+    return $R(v[range],v[range+1]);
+  },
+  minimumOffset: function(){
+    return(this.isVertical() ? this.alignY : this.alignX);
+  },
+  maximumOffset: function(){
+    return(this.isVertical() ?
+      (this.track.offsetHeight != 0 ? this.track.offsetHeight :
+        this.track.style.height.replace(/px$/,"")) - this.alignY :
+      (this.track.offsetWidth != 0 ? this.track.offsetWidth :
+        this.track.style.width.replace(/px$/,"")) - this.alignX);
+  },
+  isVertical:  function(){
+    return (this.axis == 'vertical');
+  },
+  drawSpans: function() {
+    var slider = this;
+    if (this.spans)
+      $R(0, this.spans.length-1).each(function(r) { slider.setSpan(slider.spans[r], slider.getRange(r)) });
+    if (this.options.startSpan)
+      this.setSpan(this.options.startSpan,
+        $R(0, this.values.length>1 ? this.getRange(0).min() : this.value ));
+    if (this.options.endSpan)
+      this.setSpan(this.options.endSpan,
+        $R(this.values.length>1 ? this.getRange(this.spans.length-1).max() : this.value, this.maximum));
+  },
+  setSpan: function(span, range) {
+    if (this.isVertical()) {
+      span.style.top = this.translateToPx(range.start);
+      span.style.height = this.translateToPx(range.end - range.start + this.range.start);
+    } else {
+      span.style.left = this.translateToPx(range.start);
+      span.style.width = this.translateToPx(range.end - range.start + this.range.start);
+    }
+  },
+  updateStyles: function() {
+    this.handles.each( function(h){ Element.removeClassName(h, 'selected') });
+    Element.addClassName(this.activeHandle, 'selected');
+  },
+  startDrag: function(event) {
+    if (Event.isLeftClick(event)) {
+      if (!this.disabled){
+        this.active = true;
+
+        var handle = Event.element(event);
+        var pointer  = [Event.pointerX(event), Event.pointerY(event)];
+        var track = handle;
+        if (track==this.track) {
+          var offsets  = Position.cumulativeOffset(this.track);
+          this.event = event;
+          this.setValue(this.translateToValue(
+           (this.isVertical() ? pointer[1]-offsets[1] : pointer[0]-offsets[0])-(this.handleLength/2)
+          ));
+          var offsets  = Position.cumulativeOffset(this.activeHandle);
+          this.offsetX = (pointer[0] - offsets[0]);
+          this.offsetY = (pointer[1] - offsets[1]);
+        } else {
+          // find the handle (prevents issues with Safari)
+          while((this.handles.indexOf(handle) == -1) && handle.parentNode)
+            handle = handle.parentNode;
+
+          if (this.handles.indexOf(handle)!=-1) {
+            this.activeHandle    = handle;
+            this.activeHandleIdx = this.handles.indexOf(this.activeHandle);
+            this.updateStyles();
+
+            var offsets  = Position.cumulativeOffset(this.activeHandle);
+            this.offsetX = (pointer[0] - offsets[0]);
+            this.offsetY = (pointer[1] - offsets[1]);
+          }
+        }
+      }
+      Event.stop(event);
+    }
+  },
+  update: function(event) {
+   if (this.active) {
+      if (!this.dragging) this.dragging = true;
+      this.draw(event);
+      if (Prototype.Browser.WebKit) window.scrollBy(0,0);
+      Event.stop(event);
+   }
+  },
+  draw: function(event) {
+    var pointer = [Event.pointerX(event), Event.pointerY(event)];
+    var offsets = Position.cumulativeOffset(this.track);
+    pointer[0] -= this.offsetX + offsets[0];
+    pointer[1] -= this.offsetY + offsets[1];
+    this.event = event;
+    this.setValue(this.translateToValue( this.isVertical() ? pointer[1] : pointer[0] ));
+    if (this.initialized && this.options.onSlide)
+      this.options.onSlide(this.values.length>1 ? this.values : this.value, this);
+  },
+  endDrag: function(event) {
+    if (this.active && this.dragging) {
+      this.finishDrag(event, true);
+      Event.stop(event);
+    }
+    this.active = false;
+    this.dragging = false;
+  },
+  finishDrag: function(event, success) {
+    this.active = false;
+    this.dragging = false;
+    this.updateFinished();
+  },
+  updateFinished: function() {
+    if (this.initialized && this.options.onChange)
+      this.options.onChange(this.values.length>1 ? this.values : this.value, this);
+    this.event = null;
+  }
+});
\ No newline at end of file
diff --git a/js/src/sound.js b/js/src/sound.js
new file mode 100644
index 0000000..e2487cd
--- /dev/null
+++ b/js/src/sound.js
@@ -0,0 +1,55 @@
+// script.aculo.us sound.js v1.8.2, Tue Nov 18 18:30:58 +0100 2008
+
+// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+//
+// Based on code created by Jules Gravinese (http://www.webveteran.com/)
+//
+// script.aculo.us is freely distributable under the terms of an MIT-style license.
+// For details, see the script.aculo.us web site: http://script.aculo.us/
+
+Sound = {
+  tracks: {},
+  _enabled: true,
+  template:
+    new Template('<embed style="height:0" id="sound_#{track}_#{id}" src="#{url}" loop="false" autostart="true" hidden="true"/>'),
+  enable: function(){
+    Sound._enabled = true;
+  },
+  disable: function(){
+    Sound._enabled = false;
+  },
+  play: function(url){
+    if(!Sound._enabled) return;
+    var options = Object.extend({
+      track: 'global', url: url, replace: false
+    }, arguments[1] || {});
+
+    if(options.replace && this.tracks[options.track]) {
+      $R(0, this.tracks[options.track].id).each(function(id){
+        var sound = $('sound_'+options.track+'_'+id);
+        sound.Stop && sound.Stop();
+        sound.remove();
+      });
+      this.tracks[options.track] = null;
+    }
+
+    if(!this.tracks[options.track])
+      this.tracks[options.track] = { id: 0 };
+    else
+      this.tracks[options.track].id++;
+
+    options.id = this.tracks[options.track].id;
+    $$('body')[0].insert(
+      Prototype.Browser.IE ? new Element('bgsound',{
+        id: 'sound_'+options.track+'_'+options.id,
+        src: options.url, loop: 1, autostart: true
+      }) : Sound.template.evaluate(options));
+  }
+};
+
+if(Prototype.Browser.Gecko && navigator.userAgent.indexOf("Win") > 0){
+  if(navigator.plugins && $A(navigator.plugins).detect(function(p){ return p.name.indexOf('QuickTime') != -1 }))
+    Sound.template = new Template('<object id="sound_#{track}_#{id}" width="0" height="0" type="audio/mpeg" data="#{url}"/>');
+  else
+    Sound.play = function(){};
+}
\ No newline at end of file
diff --git a/js/src/unittest.js b/js/src/unittest.js
new file mode 100644
index 0000000..446097e
--- /dev/null
+++ b/js/src/unittest.js
@@ -0,0 +1,568 @@
+// script.aculo.us unittest.js v1.8.2, Tue Nov 18 18:30:58 +0100 2008
+
+// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+//           (c) 2005-2008 Jon Tirsen (http://www.tirsen.com)
+//           (c) 2005-2008 Michael Schuerig (http://www.schuerig.de/michael/)
+//
+// script.aculo.us is freely distributable under the terms of an MIT-style license.
+// For details, see the script.aculo.us web site: http://script.aculo.us/
+
+// experimental, Firefox-only
+Event.simulateMouse = function(element, eventName) {
+  var options = Object.extend({
+    pointerX: 0,
+    pointerY: 0,
+    buttons:  0,
+    ctrlKey:  false,
+    altKey:   false,
+    shiftKey: false,
+    metaKey:  false
+  }, arguments[2] || {});
+  var oEvent = document.createEvent("MouseEvents");
+  oEvent.initMouseEvent(eventName, true, true, document.defaultView, 
+    options.buttons, options.pointerX, options.pointerY, options.pointerX, options.pointerY, 
+    options.ctrlKey, options.altKey, options.shiftKey, options.metaKey, 0, $(element));
+  
+  if(this.mark) Element.remove(this.mark);
+  this.mark = document.createElement('div');
+  this.mark.appendChild(document.createTextNode(" "));
+  document.body.appendChild(this.mark);
+  this.mark.style.position = 'absolute';
+  this.mark.style.top = options.pointerY + "px";
+  this.mark.style.left = options.pointerX + "px";
+  this.mark.style.width = "5px";
+  this.mark.style.height = "5px;";
+  this.mark.style.borderTop = "1px solid red;";
+  this.mark.style.borderLeft = "1px solid red;";
+  
+  if(this.step)
+    alert('['+new Date().getTime().toString()+'] '+eventName+'/'+Test.Unit.inspect(options));
+  
+  $(element).dispatchEvent(oEvent);
+};
+
+// Note: Due to a fix in Firefox 1.0.5/6 that probably fixed "too much", this doesn't work in 1.0.6 or DP2.
+// You need to downgrade to 1.0.4 for now to get this working
+// See https://bugzilla.mozilla.org/show_bug.cgi?id=289940 for the fix that fixed too much
+Event.simulateKey = function(element, eventName) {
+  var options = Object.extend({
+    ctrlKey: false,
+    altKey: false,
+    shiftKey: false,
+    metaKey: false,
+    keyCode: 0,
+    charCode: 0
+  }, arguments[2] || {});
+
+  var oEvent = document.createEvent("KeyEvents");
+  oEvent.initKeyEvent(eventName, true, true, window, 
+    options.ctrlKey, options.altKey, options.shiftKey, options.metaKey,
+    options.keyCode, options.charCode );
+  $(element).dispatchEvent(oEvent);
+};
+
+Event.simulateKeys = function(element, command) {
+  for(var i=0; i<command.length; i++) {
+    Event.simulateKey(element,'keypress',{charCode:command.charCodeAt(i)});
+  }
+};
+
+var Test = {};
+Test.Unit = {};
+
+// security exception workaround
+Test.Unit.inspect = Object.inspect;
+
+Test.Unit.Logger = Class.create();
+Test.Unit.Logger.prototype = {
+  initialize: function(log) {
+    this.log = $(log);
+    if (this.log) {
+      this._createLogTable();
+    }
+  },
+  start: function(testName) {
+    if (!this.log) return;
+    this.testName = testName;
+    this.lastLogLine = document.createElement('tr');
+    this.statusCell = document.createElement('td');
+    this.nameCell = document.createElement('td');
+    this.nameCell.className = "nameCell";
+    this.nameCell.appendChild(document.createTextNode(testName));
+    this.messageCell = document.createElement('td');
+    this.lastLogLine.appendChild(this.statusCell);
+    this.lastLogLine.appendChild(this.nameCell);
+    this.lastLogLine.appendChild(this.messageCell);
+    this.loglines.appendChild(this.lastLogLine);
+  },
+  finish: function(status, summary) {
+    if (!this.log) return;
+    this.lastLogLine.className = status;
+    this.statusCell.innerHTML = status;
+    this.messageCell.innerHTML = this._toHTML(summary);
+    this.addLinksToResults();
+  },
+  message: function(message) {
+    if (!this.log) return;
+    this.messageCell.innerHTML = this._toHTML(message);
+  },
+  summary: function(summary) {
+    if (!this.log) return;
+    this.logsummary.innerHTML = this._toHTML(summary);
+  },
+  _createLogTable: function() {
+    this.log.innerHTML =
+    '<div id="logsummary"></div>' +
+    '<table id="logtable">' +
+    '<thead><tr><th>Status</th><th>Test</th><th>Message</th></tr></thead>' +
+    '<tbody id="loglines"></tbody>' +
+    '</table>';
+    this.logsummary = $('logsummary');
+    this.loglines = $('loglines');
+  },
+  _toHTML: function(txt) {
+    return txt.escapeHTML().replace(/\n/g,"<br/>");
+  },
+  addLinksToResults: function(){ 
+    $$("tr.failed .nameCell").each( function(td){ // todo: limit to children of this.log
+      td.title = "Run only this test";
+      Event.observe(td, 'click', function(){ window.location.search = "?tests=" + td.innerHTML;});
+    });
+    $$("tr.passed .nameCell").each( function(td){ // todo: limit to children of this.log
+      td.title = "Run all tests";
+      Event.observe(td, 'click', function(){ window.location.search = "";});
+    });
+  }
+};
+
+Test.Unit.Runner = Class.create();
+Test.Unit.Runner.prototype = {
+  initialize: function(testcases) {
+    this.options = Object.extend({
+      testLog: 'testlog'
+    }, arguments[1] || {});
+    this.options.resultsURL = this.parseResultsURLQueryParameter();
+    this.options.tests      = this.parseTestsQueryParameter();
+    if (this.options.testLog) {
+      this.options.testLog = $(this.options.testLog) || null;
+    }
+    if(this.options.tests) {
+      this.tests = [];
+      for(var i = 0; i < this.options.tests.length; i++) {
+        if(/^test/.test(this.options.tests[i])) {
+          this.tests.push(new Test.Unit.Testcase(this.options.tests[i], testcases[this.options.tests[i]], testcases["setup"], testcases["teardown"]));
+        }
+      }
+    } else {
+      if (this.options.test) {
+        this.tests = [new Test.Unit.Testcase(this.options.test, testcases[this.options.test], testcases["setup"], testcases["teardown"])];
+      } else {
+        this.tests = [];
+        for(var testcase in testcases) {
+          if(/^test/.test(testcase)) {
+            this.tests.push(
+               new Test.Unit.Testcase(
+                 this.options.context ? ' -> ' + this.options.titles[testcase] : testcase, 
+                 testcases[testcase], testcases["setup"], testcases["teardown"]
+               ));
+          }
+        }
+      }
+    }
+    this.currentTest = 0;
+    this.logger = new Test.Unit.Logger(this.options.testLog);
+    setTimeout(this.runTests.bind(this), 1000);
+  },
+  parseResultsURLQueryParameter: function() {
+    return window.location.search.parseQuery()["resultsURL"];
+  },
+  parseTestsQueryParameter: function(){
+    if (window.location.search.parseQuery()["tests"]){
+        return window.location.search.parseQuery()["tests"].split(',');
+    };
+  },
+  // Returns:
+  //  "ERROR" if there was an error,
+  //  "FAILURE" if there was a failure, or
+  //  "SUCCESS" if there was neither
+  getResult: function() {
+    var hasFailure = false;
+    for(var i=0;i<this.tests.length;i++) {
+      if (this.tests[i].errors > 0) {
+        return "ERROR";
+      }
+      if (this.tests[i].failures > 0) {
+        hasFailure = true;
+      }
+    }
+    if (hasFailure) {
+      return "FAILURE";
+    } else {
+      return "SUCCESS";
+    }
+  },
+  postResults: function() {
+    if (this.options.resultsURL) {
+      new Ajax.Request(this.options.resultsURL, 
+        { method: 'get', parameters: 'result=' + this.getResult(), asynchronous: false });
+    }
+  },
+  runTests: function() {
+    var test = this.tests[this.currentTest];
+    if (!test) {
+      // finished!
+      this.postResults();
+      this.logger.summary(this.summary());
+      return;
+    }
+    if(!test.isWaiting) {
+      this.logger.start(test.name);
+    }
+    test.run();
+    if(test.isWaiting) {
+      this.logger.message("Waiting for " + test.timeToWait + "ms");
+      setTimeout(this.runTests.bind(this), test.timeToWait || 1000);
+    } else {
+      this.logger.finish(test.status(), test.summary());
+      this.currentTest++;
+      // tail recursive, hopefully the browser will skip the stackframe
+      this.runTests();
+    }
+  },
+  summary: function() {
+    var assertions = 0;
+    var failures = 0;
+    var errors = 0;
+    var messages = [];
+    for(var i=0;i<this.tests.length;i++) {
+      assertions +=   this.tests[i].assertions;
+      failures   +=   this.tests[i].failures;
+      errors     +=   this.tests[i].errors;
+    }
+    return (
+      (this.options.context ? this.options.context + ': ': '') + 
+      this.tests.length + " tests, " + 
+      assertions + " assertions, " + 
+      failures   + " failures, " +
+      errors     + " errors");
+  }
+};
+
+Test.Unit.Assertions = Class.create();
+Test.Unit.Assertions.prototype = {
+  initialize: function() {
+    this.assertions = 0;
+    this.failures   = 0;
+    this.errors     = 0;
+    this.messages   = [];
+  },
+  summary: function() {
+    return (
+      this.assertions + " assertions, " + 
+      this.failures   + " failures, " +
+      this.errors     + " errors" + "\n" +
+      this.messages.join("\n"));
+  },
+  pass: function() {
+    this.assertions++;
+  },
+  fail: function(message) {
+    this.failures++;
+    this.messages.push("Failure: " + message);
+  },
+  info: function(message) {
+    this.messages.push("Info: " + message);
+  },
+  error: function(error) {
+    this.errors++;
+    this.messages.push(error.name + ": "+ error.message + "(" + Test.Unit.inspect(error) +")");
+  },
+  status: function() {
+    if (this.failures > 0) return 'failed';
+    if (this.errors > 0) return 'error';
+    return 'passed';
+  },
+  assert: function(expression) {
+    var message = arguments[1] || 'assert: got "' + Test.Unit.inspect(expression) + '"';
+    try { expression ? this.pass() : 
+      this.fail(message); }
+    catch(e) { this.error(e); }
+  },
+  assertEqual: function(expected, actual) {
+    var message = arguments[2] || "assertEqual";
+    try { (expected == actual) ? this.pass() :
+      this.fail(message + ': expected "' + Test.Unit.inspect(expected) + 
+        '", actual "' + Test.Unit.inspect(actual) + '"'); }
+    catch(e) { this.error(e); }
+  },
+  assertInspect: function(expected, actual) {
+    var message = arguments[2] || "assertInspect";
+    try { (expected == actual.inspect()) ? this.pass() :
+      this.fail(message + ': expected "' + Test.Unit.inspect(expected) + 
+        '", actual "' + Test.Unit.inspect(actual) + '"'); }
+    catch(e) { this.error(e); }
+  },
+  assertEnumEqual: function(expected, actual) {
+    var message = arguments[2] || "assertEnumEqual";
+    try { $A(expected).length == $A(actual).length && 
+      expected.zip(actual).all(function(pair) { return pair[0] == pair[1] }) ?
+        this.pass() : this.fail(message + ': expected ' + Test.Unit.inspect(expected) + 
+          ', actual ' + Test.Unit.inspect(actual)); }
+    catch(e) { this.error(e); }
+  },
+  assertNotEqual: function(expected, actual) {
+    var message = arguments[2] || "assertNotEqual";
+    try { (expected != actual) ? this.pass() : 
+      this.fail(message + ': got "' + Test.Unit.inspect(actual) + '"'); }
+    catch(e) { this.error(e); }
+  },
+  assertIdentical: function(expected, actual) { 
+    var message = arguments[2] || "assertIdentical"; 
+    try { (expected === actual) ? this.pass() : 
+      this.fail(message + ': expected "' + Test.Unit.inspect(expected) +  
+        '", actual "' + Test.Unit.inspect(actual) + '"'); } 
+    catch(e) { this.error(e); } 
+  },
+  assertNotIdentical: function(expected, actual) { 
+    var message = arguments[2] || "assertNotIdentical"; 
+    try { !(expected === actual) ? this.pass() : 
+      this.fail(message + ': expected "' + Test.Unit.inspect(expected) +  
+        '", actual "' + Test.Unit.inspect(actual) + '"'); } 
+    catch(e) { this.error(e); } 
+  },
+  assertNull: function(obj) {
+    var message = arguments[1] || 'assertNull';
+    try { (obj==null) ? this.pass() : 
+      this.fail(message + ': got "' + Test.Unit.inspect(obj) + '"'); }
+    catch(e) { this.error(e); }
+  },
+  assertMatch: function(expected, actual) {
+    var message = arguments[2] || 'assertMatch';
+    var regex = new RegExp(expected);
+    try { (regex.exec(actual)) ? this.pass() :
+      this.fail(message + ' : regex: "' +  Test.Unit.inspect(expected) + ' did not match: ' + Test.Unit.inspect(actual) + '"'); }
+    catch(e) { this.error(e); }
+  },
+  assertHidden: function(element) {
+    var message = arguments[1] || 'assertHidden';
+    this.assertEqual("none", element.style.display, message);
+  },
+  assertNotNull: function(object) {
+    var message = arguments[1] || 'assertNotNull';
+    this.assert(object != null, message);
+  },
+  assertType: function(expected, actual) {
+    var message = arguments[2] || 'assertType';
+    try { 
+      (actual.constructor == expected) ? this.pass() : 
+      this.fail(message + ': expected "' + Test.Unit.inspect(expected) +  
+        '", actual "' + (actual.constructor) + '"'); }
+    catch(e) { this.error(e); }
+  },
+  assertNotOfType: function(expected, actual) {
+    var message = arguments[2] || 'assertNotOfType';
+    try { 
+      (actual.constructor != expected) ? this.pass() : 
+      this.fail(message + ': expected "' + Test.Unit.inspect(expected) +  
+        '", actual "' + (actual.constructor) + '"'); }
+    catch(e) { this.error(e); }
+  },
+  assertInstanceOf: function(expected, actual) {
+    var message = arguments[2] || 'assertInstanceOf';
+    try { 
+      (actual instanceof expected) ? this.pass() : 
+      this.fail(message + ": object was not an instance of the expected type"); }
+    catch(e) { this.error(e); } 
+  },
+  assertNotInstanceOf: function(expected, actual) {
+    var message = arguments[2] || 'assertNotInstanceOf';
+    try { 
+      !(actual instanceof expected) ? this.pass() : 
+      this.fail(message + ": object was an instance of the not expected type"); }
+    catch(e) { this.error(e); } 
+  },
+  assertRespondsTo: function(method, obj) {
+    var message = arguments[2] || 'assertRespondsTo';
+    try {
+      (obj[method] && typeof obj[method] == 'function') ? this.pass() : 
+      this.fail(message + ": object doesn't respond to [" + method + "]"); }
+    catch(e) { this.error(e); }
+  },
+  assertReturnsTrue: function(method, obj) {
+    var message = arguments[2] || 'assertReturnsTrue';
+    try {
+      var m = obj[method];
+      if(!m) m = obj['is'+method.charAt(0).toUpperCase()+method.slice(1)];
+      m() ? this.pass() : 
+      this.fail(message + ": method returned false"); }
+    catch(e) { this.error(e); }
+  },
+  assertReturnsFalse: function(method, obj) {
+    var message = arguments[2] || 'assertReturnsFalse';
+    try {
+      var m = obj[method];
+      if(!m) m = obj['is'+method.charAt(0).toUpperCase()+method.slice(1)];
+      !m() ? this.pass() : 
+      this.fail(message + ": method returned true"); }
+    catch(e) { this.error(e); }
+  },
+  assertRaise: function(exceptionName, method) {
+    var message = arguments[2] || 'assertRaise';
+    try { 
+      method();
+      this.fail(message + ": exception expected but none was raised"); }
+    catch(e) {
+      ((exceptionName == null) || (e.name==exceptionName)) ? this.pass() : this.error(e); 
+    }
+  },
+  assertElementsMatch: function() {
+    var expressions = $A(arguments), elements = $A(expressions.shift());
+    if (elements.length != expressions.length) {
+      this.fail('assertElementsMatch: size mismatch: ' + elements.length + ' elements, ' + expressions.length + ' expressions');
+      return false;
+    }
+    elements.zip(expressions).all(function(pair, index) {
+      var element = $(pair.first()), expression = pair.last();
+      if (element.match(expression)) return true;
+      this.fail('assertElementsMatch: (in index ' + index + ') expected ' + expression.inspect() + ' but got ' + element.inspect());
+    }.bind(this)) && this.pass();
+  },
+  assertElementMatches: function(element, expression) {
+    this.assertElementsMatch([element], expression);
+  },
+  benchmark: function(operation, iterations) {
+    var startAt = new Date();
+    (iterations || 1).times(operation);
+    var timeTaken = ((new Date())-startAt);
+    this.info((arguments[2] || 'Operation') + ' finished ' + 
+       iterations + ' iterations in ' + (timeTaken/1000)+'s' );
+    return timeTaken;
+  },
+  _isVisible: function(element) {
+    element = $(element);
+    if(!element.parentNode) return true;
+    this.assertNotNull(element);
+    if(element.style && Element.getStyle(element, 'display') == 'none')
+      return false;
+    
+    return this._isVisible(element.parentNode);
+  },
+  assertNotVisible: function(element) {
+    this.assert(!this._isVisible(element), Test.Unit.inspect(element) + " was not hidden and didn't have a hidden parent either. " + ("" || arguments[1]));
+  },
+  assertVisible: function(element) {
+    this.assert(this._isVisible(element), Test.Unit.inspect(element) + " was not visible. " + ("" || arguments[1]));
+  },
+  benchmark: function(operation, iterations) {
+    var startAt = new Date();
+    (iterations || 1).times(operation);
+    var timeTaken = ((new Date())-startAt);
+    this.info((arguments[2] || 'Operation') + ' finished ' + 
+       iterations + ' iterations in ' + (timeTaken/1000)+'s' );
+    return timeTaken;
+  }
+};
+
+Test.Unit.Testcase = Class.create();
+Object.extend(Object.extend(Test.Unit.Testcase.prototype, Test.Unit.Assertions.prototype), {
+  initialize: function(name, test, setup, teardown) {
+    Test.Unit.Assertions.prototype.initialize.bind(this)();
+    this.name           = name;
+    
+    if(typeof test == 'string') {
+      test = test.gsub(/(\.should[^\(]+\()/,'#{0}this,');
+      test = test.gsub(/(\.should[^\(]+)\(this,\)/,'#{1}(this)');
+      this.test = function() {
+        eval('with(this){'+test+'}');
+      }
+    } else {
+      this.test = test || function() {};
+    }
+    
+    this.setup          = setup || function() {};
+    this.teardown       = teardown || function() {};
+    this.isWaiting      = false;
+    this.timeToWait     = 1000;
+  },
+  wait: function(time, nextPart) {
+    this.isWaiting = true;
+    this.test = nextPart;
+    this.timeToWait = time;
+  },
+  run: function() {
+    try {
+      try {
+        if (!this.isWaiting) this.setup.bind(this)();
+        this.isWaiting = false;
+        this.test.bind(this)();
+      } finally {
+        if(!this.isWaiting) {
+          this.teardown.bind(this)();
+        }
+      }
+    }
+    catch(e) { this.error(e); }
+  }
+});
+
+// *EXPERIMENTAL* BDD-style testing to please non-technical folk
+// This draws many ideas from RSpec http://rspec.rubyforge.org/
+
+Test.setupBDDExtensionMethods = function(){
+  var METHODMAP = {
+    shouldEqual:     'assertEqual',
+    shouldNotEqual:  'assertNotEqual',
+    shouldEqualEnum: 'assertEnumEqual',
+    shouldBeA:       'assertType',
+    shouldNotBeA:    'assertNotOfType',
+    shouldBeAn:      'assertType',
+    shouldNotBeAn:   'assertNotOfType',
+    shouldBeNull:    'assertNull',
+    shouldNotBeNull: 'assertNotNull',
+    
+    shouldBe:        'assertReturnsTrue',
+    shouldNotBe:     'assertReturnsFalse',
+    shouldRespondTo: 'assertRespondsTo'
+  };
+  var makeAssertion = function(assertion, args, object) { 
+   	this[assertion].apply(this,(args || []).concat([object]));
+  };
+  
+  Test.BDDMethods = {};   
+  $H(METHODMAP).each(function(pair) { 
+    Test.BDDMethods[pair.key] = function() { 
+       var args = $A(arguments); 
+       var scope = args.shift(); 
+       makeAssertion.apply(scope, [pair.value, args, this]); }; 
+  });
+  
+  [Array.prototype, String.prototype, Number.prototype, Boolean.prototype].each(
+    function(p){ Object.extend(p, Test.BDDMethods) }
+  );
+};
+
+Test.context = function(name, spec, log){
+  Test.setupBDDExtensionMethods();
+  
+  var compiledSpec = {};
+  var titles = {};
+  for(specName in spec) {
+    switch(specName){
+      case "setup":
+      case "teardown":
+        compiledSpec[specName] = spec[specName];
+        break;
+      default:
+        var testName = 'test'+specName.gsub(/\s+/,'-').camelize();
+        var body = spec[specName].toString().split('\n').slice(1);
+        if(/^\{/.test(body[0])) body = body.slice(1);
+        body.pop();
+        body = body.map(function(statement){ 
+          return statement.strip()
+        });
+        compiledSpec[testName] = body.join('\n');
+        titles[testName] = specName;
+    }
+  }
+  new Test.Unit.Runner(compiledSpec, { titles: titles, testLog: log || 'testlog', context: name });
+};
\ No newline at end of file
diff --git a/onyx2/ban.list b/onyx2/ban.list
new file mode 100644
index 0000000..e69de29
diff --git a/onyx2/cache/templates/cache/cache b/onyx2/cache/templates/cache/cache
new file mode 100644
index 0000000..e69de29
diff --git a/onyx2/cache/templates/compile/compile b/onyx2/cache/templates/compile/compile
new file mode 100644
index 0000000..e69de29
diff --git a/onyx2/config/root.sample.xml b/onyx2/config/root.sample.xml
new file mode 100644
index 0000000..4feeeb9
--- /dev/null
+++ b/onyx2/config/root.sample.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configs active="1" root="/var/www/pa4home/htdocs/" cache="1">
+    <config match="ajax.php">
+        <env option="header">
+            <env option="Content-Type">text/xml;charset=utf-8</env>
+        </env>
+	</config>
+    <config match="index.php">
+        <env option="header">
+            <env option="Content-Type">text/html;charset=utf-8</env>
+        </env>
+	</config>
+    <config match="w/4eduel.php">
+        <var name="chrono"></var>
+        <env option="header">
+            <env option="Content-Type">text/html;charset=utf-8</env>
+        </env>
+	</config>
+    <config match="*">
+      <var name="version">1.0 Pré-alpha</var>
+      <var name="first_page">index.php</var> <!-- Page principale -->
+      <var name="url_images"></var> <!-- Adresse du serveur d'images et de contenu -->
+
+      <var name="db_prefix"></var> <!-- Préfixe des tables dans la base de données -->
+
+      <var name="chrono"><![CDATA[<!--Page générée en: $ secondes.-->]]></var>
+
+      <env option="auth">0</env>
+      <env option="timezone">Europe/Paris</env>
+      <env option="ignore_user_abort">1</env>
+      <env option="error_level">6143</env>
+      <env option="ini">
+	<env option="allow_url_fopen">0</env>
+	<env option="allow_url_include">0</env>
+	<env option="display_errors">1</env>
+	<env option="display_startup_errors">1</env>
+	<env option="magic_quotes_runtime">0</env>
+	<env option="magic_quotes_sybase">0</env>
+	<env option="memory_limit">64M</env>
+	<env option="log_errors">1</env>
+      </env>
+      <env option="log_php">1</env>
+      <env option="locale">
+	<env option="0">fr_FR.UTF8</env>
+	<env option="1">fr.UTF8</env>
+	<env option="2">fr_FR.UTF-8</env>
+	<env option="3">fr.UTF-8</env>
+      </env>
+
+      <module name="db">
+	<option name="type">mysql</option>
+	<option name="profile">default</option>
+	<option name="log">0</option>
+	<option name="crypt"></option>
+	<option name="no_connection"><![CDATA[Connexion &agrave; la base de donn&eacute;e impossible]]></option>
+      </module>
+
+      <module name="session">
+	<option name="active">1</option>
+	<option name="time">3600</option>
+	<option name="maxip">20</option>
+	<option name="cookie">pasession</option>
+	<option name="db">
+	  <option name="table">sessions</option>
+	</option>
+      </module>
+
+      <!--<module name="templates">
+	<option name="tpl"></option>
+	<option name="compile">modules/templates/compile/</option>
+	<option name="config">cache/templates/config/</option>
+	<option name="cache">cache/templates/cache/</option>
+      </module>-->
+
+        <!--<module name="fermerServeur">
+	    	<option name="type">1</option><!- 1: mise à jour prévue ; 2: mise à jour exceptionnelle ->
+		    <option name="temps">900</option> <!- temps en secondes ->
+    	</module>-->
+    </config>
+</configs>
diff --git a/onyx2/db/default.profile.php b/onyx2/db/default.profile.php
new file mode 100644
index 0000000..b82d3fa
--- /dev/null
+++ b/onyx2/db/default.profile.php
@@ -0,0 +1,10 @@
+<?php
+
+if(!defined('ONYX')) exit;
+
+$___profile['db'] = 'pa4home';
+$___profile['host'] = 'localhost';
+$___profile['user'] = 'root';
+$___profile['pass'] = '';
+
+?>
diff --git a/onyx2/include/JSON.php b/onyx2/include/JSON.php
new file mode 100644
index 0000000..0cddbdd
--- /dev/null
+++ b/onyx2/include/JSON.php
@@ -0,0 +1,806 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * Converts to and from JSON format.
+ *
+ * JSON (JavaScript Object Notation) is a lightweight data-interchange
+ * format. It is easy for humans to read and write. It is easy for machines
+ * to parse and generate. It is based on a subset of the JavaScript
+ * Programming Language, Standard ECMA-262 3rd Edition - December 1999.
+ * This feature can also be found in  Python. JSON is a text format that is
+ * completely language independent but uses conventions that are familiar
+ * to programmers of the C-family of languages, including C, C++, C#, Java,
+ * JavaScript, Perl, TCL, and many others. These properties make JSON an
+ * ideal data-interchange language.
+ *
+ * This package provides a simple encoder and decoder for JSON notation. It
+ * is intended for use with client-side Javascript applications that make
+ * use of HTTPRequest to perform server communication functions - data can
+ * be encoded into JSON notation for use in a client-side javascript, or
+ * decoded from incoming Javascript requests. JSON format is native to
+ * Javascript, and can be directly eval()'ed with no further parsing
+ * overhead
+ *
+ * All strings should be in ASCII or UTF-8 format!
+ *
+ * LICENSE: Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met: Redistributions of source code must retain the
+ * above copyright notice, this list of conditions and the following
+ * disclaimer. Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
+ * NO EVENT SHALL CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * @category
+ * @package     Services_JSON
+ * @author      Michal Migurski <mike-json@teczno.com>
+ * @author      Matt Knapp <mdknapp[at]gmail[dot]com>
+ * @author      Brett Stimmerman <brettstimmerman[at]gmail[dot]com>
+ * @copyright   2005 Michal Migurski
+ * @version     CVS: $Id: JSON.php,v 1.31 2006/06/28 05:54:17 migurski Exp $
+ * @license     http://www.opensource.org/licenses/bsd-license.php
+ * @link        http://pear.php.net/pepr/pepr-proposal-show.php?id=198
+ */
+
+/**
+ * Marker constant for Services_JSON::decode(), used to flag stack state
+ */
+define('SERVICES_JSON_SLICE',   1);
+
+/**
+ * Marker constant for Services_JSON::decode(), used to flag stack state
+ */
+define('SERVICES_JSON_IN_STR',  2);
+
+/**
+ * Marker constant for Services_JSON::decode(), used to flag stack state
+ */
+define('SERVICES_JSON_IN_ARR',  3);
+
+/**
+ * Marker constant for Services_JSON::decode(), used to flag stack state
+ */
+define('SERVICES_JSON_IN_OBJ',  4);
+
+/**
+ * Marker constant for Services_JSON::decode(), used to flag stack state
+ */
+define('SERVICES_JSON_IN_CMT', 5);
+
+/**
+ * Behavior switch for Services_JSON::decode()
+ */
+define('SERVICES_JSON_LOOSE_TYPE', 16);
+
+/**
+ * Behavior switch for Services_JSON::decode()
+ */
+define('SERVICES_JSON_SUPPRESS_ERRORS', 32);
+
+/**
+ * Converts to and from JSON format.
+ *
+ * Brief example of use:
+ *
+ * <code>
+ * // create a new instance of Services_JSON
+ * $json = new Services_JSON();
+ *
+ * // convert a complexe value to JSON notation, and send it to the browser
+ * $value = array('foo', 'bar', array(1, 2, 'baz'), array(3, array(4)));
+ * $output = $json->encode($value);
+ *
+ * print($output);
+ * // prints: ["foo","bar",[1,2,"baz"],[3,[4]]]
+ *
+ * // accept incoming POST data, assumed to be in JSON notation
+ * $input = file_get_contents('php://input', 1000000);
+ * $value = $json->decode($input);
+ * </code>
+ */
+class Services_JSON
+{
+   /**
+    * constructs a new JSON instance
+    *
+    * @param    int     $use    object behavior flags; combine with boolean-OR
+    *
+    *                           possible values:
+    *                           - SERVICES_JSON_LOOSE_TYPE:  loose typing.
+    *                                   "{...}" syntax creates associative arrays
+    *                                   instead of objects in decode().
+    *                           - SERVICES_JSON_SUPPRESS_ERRORS:  error suppression.
+    *                                   Values which can't be encoded (e.g. resources)
+    *                                   appear as NULL instead of throwing errors.
+    *                                   By default, a deeply-nested resource will
+    *                                   bubble up with an error, so all return values
+    *                                   from encode() should be checked with isError()
+    */
+    function Services_JSON($use = 0)
+    {
+        $this->use = $use;
+    }
+
+   /**
+    * convert a string from one UTF-16 char to one UTF-8 char
+    *
+    * Normally should be handled by mb_convert_encoding, but
+    * provides a slower PHP-only method for installations
+    * that lack the multibye string extension.
+    *
+    * @param    string  $utf16  UTF-16 character
+    * @return   string  UTF-8 character
+    * @access   private
+    */
+    function utf162utf8($utf16)
+    {
+        // oh please oh please oh please oh please oh please
+        if(function_exists('mb_convert_encoding')) {
+            return mb_convert_encoding($utf16, 'UTF-8', 'UTF-16');
+        }
+
+        $bytes = (ord($utf16{0}) << 8) | ord($utf16{1});
+
+        switch(true) {
+            case ((0x7F & $bytes) == $bytes):
+                // this case should never be reached, because we are in ASCII range
+                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                return chr(0x7F & $bytes);
+
+            case (0x07FF & $bytes) == $bytes:
+                // return a 2-byte UTF-8 character
+                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                return chr(0xC0 | (($bytes >> 6) & 0x1F))
+                     . chr(0x80 | ($bytes & 0x3F));
+
+            case (0xFFFF & $bytes) == $bytes:
+                // return a 3-byte UTF-8 character
+                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                return chr(0xE0 | (($bytes >> 12) & 0x0F))
+                     . chr(0x80 | (($bytes >> 6) & 0x3F))
+                     . chr(0x80 | ($bytes & 0x3F));
+        }
+
+        // ignoring UTF-32 for now, sorry
+        return '';
+    }
+
+   /**
+    * convert a string from one UTF-8 char to one UTF-16 char
+    *
+    * Normally should be handled by mb_convert_encoding, but
+    * provides a slower PHP-only method for installations
+    * that lack the multibye string extension.
+    *
+    * @param    string  $utf8   UTF-8 character
+    * @return   string  UTF-16 character
+    * @access   private
+    */
+    function utf82utf16($utf8)
+    {
+        // oh please oh please oh please oh please oh please
+        if(function_exists('mb_convert_encoding')) {
+            return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8');
+        }
+
+        switch(strlen($utf8)) {
+            case 1:
+                // this case should never be reached, because we are in ASCII range
+                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                return $utf8;
+
+            case 2:
+                // return a UTF-16 character from a 2-byte UTF-8 char
+                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                return chr(0x07 & (ord($utf8{0}) >> 2))
+                     . chr((0xC0 & (ord($utf8{0}) << 6))
+                         | (0x3F & ord($utf8{1})));
+
+            case 3:
+                // return a UTF-16 character from a 3-byte UTF-8 char
+                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                return chr((0xF0 & (ord($utf8{0}) << 4))
+                         | (0x0F & (ord($utf8{1}) >> 2)))
+                     . chr((0xC0 & (ord($utf8{1}) << 6))
+                         | (0x7F & ord($utf8{2})));
+        }
+
+        // ignoring UTF-32 for now, sorry
+        return '';
+    }
+
+   /**
+    * encodes an arbitrary variable into JSON format
+    *
+    * @param    mixed   $var    any number, boolean, string, array, or object to be encoded.
+    *                           see argument 1 to Services_JSON() above for array-parsing behavior.
+    *                           if var is a strng, note that encode() always expects it
+    *                           to be in ASCII or UTF-8 format!
+    *
+    * @return   mixed   JSON string representation of input var or an error if a problem occurs
+    * @access   public
+    */
+    function encode($var)
+    {
+        switch (gettype($var)) {
+            case 'boolean':
+                return $var ? 'true' : 'false';
+
+            case 'NULL':
+                return 'null';
+
+            case 'integer':
+                return (int) $var;
+
+            case 'double':
+            case 'float':
+                return (float) $var;
+
+            case 'string':
+                // STRINGS ARE EXPECTED TO BE IN ASCII OR UTF-8 FORMAT
+                $ascii = '';
+                $strlen_var = strlen($var);
+
+               /*
+                * Iterate over every character in the string,
+                * escaping with a slash or encoding to UTF-8 where necessary
+                */
+                for ($c = 0; $c < $strlen_var; ++$c) {
+
+                    $ord_var_c = ord($var{$c});
+
+                    switch (true) {
+                        case $ord_var_c == 0x08:
+                            $ascii .= '\b';
+                            break;
+                        case $ord_var_c == 0x09:
+                            $ascii .= '\t';
+                            break;
+                        case $ord_var_c == 0x0A:
+                            $ascii .= '\n';
+                            break;
+                        case $ord_var_c == 0x0C:
+                            $ascii .= '\f';
+                            break;
+                        case $ord_var_c == 0x0D:
+                            $ascii .= '\r';
+                            break;
+
+                        case $ord_var_c == 0x22:
+                        case $ord_var_c == 0x2F:
+                        case $ord_var_c == 0x5C:
+                            // double quote, slash, slosh
+                            $ascii .= '\\'.$var{$c};
+                            break;
+
+                        case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)):
+                            // characters U-00000000 - U-0000007F (same as ASCII)
+                            $ascii .= $var{$c};
+                            break;
+
+                        case (($ord_var_c & 0xE0) == 0xC0):
+                            // characters U-00000080 - U-000007FF, mask 110XXXXX
+                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                            $char = pack('C*', $ord_var_c, ord($var{$c + 1}));
+                            $c += 1;
+                            $utf16 = $this->utf82utf16($char);
+                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
+                            break;
+
+                        case (($ord_var_c & 0xF0) == 0xE0):
+                            // characters U-00000800 - U-0000FFFF, mask 1110XXXX
+                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                            $char = pack('C*', $ord_var_c,
+                                         ord($var{$c + 1}),
+                                         ord($var{$c + 2}));
+                            $c += 2;
+                            $utf16 = $this->utf82utf16($char);
+                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
+                            break;
+
+                        case (($ord_var_c & 0xF8) == 0xF0):
+                            // characters U-00010000 - U-001FFFFF, mask 11110XXX
+                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                            $char = pack('C*', $ord_var_c,
+                                         ord($var{$c + 1}),
+                                         ord($var{$c + 2}),
+                                         ord($var{$c + 3}));
+                            $c += 3;
+                            $utf16 = $this->utf82utf16($char);
+                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
+                            break;
+
+                        case (($ord_var_c & 0xFC) == 0xF8):
+                            // characters U-00200000 - U-03FFFFFF, mask 111110XX
+                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                            $char = pack('C*', $ord_var_c,
+                                         ord($var{$c + 1}),
+                                         ord($var{$c + 2}),
+                                         ord($var{$c + 3}),
+                                         ord($var{$c + 4}));
+                            $c += 4;
+                            $utf16 = $this->utf82utf16($char);
+                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
+                            break;
+
+                        case (($ord_var_c & 0xFE) == 0xFC):
+                            // characters U-04000000 - U-7FFFFFFF, mask 1111110X
+                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                            $char = pack('C*', $ord_var_c,
+                                         ord($var{$c + 1}),
+                                         ord($var{$c + 2}),
+                                         ord($var{$c + 3}),
+                                         ord($var{$c + 4}),
+                                         ord($var{$c + 5}));
+                            $c += 5;
+                            $utf16 = $this->utf82utf16($char);
+                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
+                            break;
+                    }
+                }
+
+                return '"'.$ascii.'"';
+
+            case 'array':
+               /*
+                * As per JSON spec if any array key is not an integer
+                * we must treat the the whole array as an object. We
+                * also try to catch a sparsely populated associative
+                * array with numeric keys here because some JS engines
+                * will create an array with empty indexes up to
+                * max_index which can cause memory issues and because
+                * the keys, which may be relevant, will be remapped
+                * otherwise.
+                *
+                * As per the ECMA and JSON specification an object may
+                * have any string as a property. Unfortunately due to
+                * a hole in the ECMA specification if the key is a
+                * ECMA reserved word or starts with a digit the
+                * parameter is only accessible using ECMAScript's
+                * bracket notation.
+                */
+
+                // treat as a JSON object
+                if (is_array($var) && count($var) && (array_keys($var) !== range(0, sizeof($var) - 1))) {
+                    $properties = array_map(array($this, 'name_value'),
+                                            array_keys($var),
+                                            array_values($var));
+
+                    foreach($properties as $property) {
+                        if(Services_JSON::isError($property)) {
+                            return $property;
+                        }
+                    }
+
+                    return '{' . join(',', $properties) . '}';
+                }
+
+                // treat it like a regular array
+                $elements = array_map(array($this, 'encode'), $var);
+
+                foreach($elements as $element) {
+                    if(Services_JSON::isError($element)) {
+                        return $element;
+                    }
+                }
+
+                return '[' . join(',', $elements) . ']';
+
+            case 'object':
+                $vars = get_object_vars($var);
+
+                $properties = array_map(array($this, 'name_value'),
+                                        array_keys($vars),
+                                        array_values($vars));
+
+                foreach($properties as $property) {
+                    if(Services_JSON::isError($property)) {
+                        return $property;
+                    }
+                }
+
+                return '{' . join(',', $properties) . '}';
+
+            default:
+                return ($this->use & SERVICES_JSON_SUPPRESS_ERRORS)
+                    ? 'null'
+                    : new Services_JSON_Error(gettype($var)." can not be encoded as JSON string");
+        }
+    }
+
+   /**
+    * array-walking function for use in generating JSON-formatted name-value pairs
+    *
+    * @param    string  $name   name of key to use
+    * @param    mixed   $value  reference to an array element to be encoded
+    *
+    * @return   string  JSON-formatted name-value pair, like '"name":value'
+    * @access   private
+    */
+    function name_value($name, $value)
+    {
+        $encoded_value = $this->encode($value);
+
+        if(Services_JSON::isError($encoded_value)) {
+            return $encoded_value;
+        }
+
+        return $this->encode(strval($name)) . ':' . $encoded_value;
+    }
+
+   /**
+    * reduce a string by removing leading and trailing comments and whitespace
+    *
+    * @param    $str    string      string value to strip of comments and whitespace
+    *
+    * @return   string  string value stripped of comments and whitespace
+    * @access   private
+    */
+    function reduce_string($str)
+    {
+        $str = preg_replace(array(
+
+                // eliminate single line comments in '// ...' form
+                '#^\s*//(.+)$#m',
+
+                // eliminate multi-line comments in '/* ... */' form, at start of string
+                '#^\s*/\*(.+)\*/#Us',
+
+                // eliminate multi-line comments in '/* ... */' form, at end of string
+                '#/\*(.+)\*/\s*$#Us'
+
+            ), '', $str);
+
+        // eliminate extraneous space
+        return trim($str);
+    }
+
+   /**
+    * decodes a JSON string into appropriate variable
+    *
+    * @param    string  $str    JSON-formatted string
+    *
+    * @return   mixed   number, boolean, string, array, or object
+    *                   corresponding to given JSON input string.
+    *                   See argument 1 to Services_JSON() above for object-output behavior.
+    *                   Note that decode() always returns strings
+    *                   in ASCII or UTF-8 format!
+    * @access   public
+    */
+    function decode($str)
+    {
+        $str = $this->reduce_string($str);
+
+        switch (strtolower($str)) {
+            case 'true':
+                return true;
+
+            case 'false':
+                return false;
+
+            case 'null':
+                return null;
+
+            default:
+                $m = array();
+
+                if (is_numeric($str)) {
+                    // Lookie-loo, it's a number
+
+                    // This would work on its own, but I'm trying to be
+                    // good about returning integers where appropriate:
+                    // return (float)$str;
+
+                    // Return float or int, as appropriate
+                    return ((float)$str == (integer)$str)
+                        ? (integer)$str
+                        : (float)$str;
+
+                } elseif (preg_match('/^("|\').*(\1)$/s', $str, $m) && $m[1] == $m[2]) {
+                    // STRINGS RETURNED IN UTF-8 FORMAT
+                    $delim = substr($str, 0, 1);
+                    $chrs = substr($str, 1, -1);
+                    $utf8 = '';
+                    $strlen_chrs = strlen($chrs);
+
+                    for ($c = 0; $c < $strlen_chrs; ++$c) {
+
+                        $substr_chrs_c_2 = substr($chrs, $c, 2);
+                        $ord_chrs_c = ord($chrs{$c});
+
+                        switch (true) {
+                            case $substr_chrs_c_2 == '\b':
+                                $utf8 .= chr(0x08);
+                                ++$c;
+                                break;
+                            case $substr_chrs_c_2 == '\t':
+                                $utf8 .= chr(0x09);
+                                ++$c;
+                                break;
+                            case $substr_chrs_c_2 == '\n':
+                                $utf8 .= chr(0x0A);
+                                ++$c;
+                                break;
+                            case $substr_chrs_c_2 == '\f':
+                                $utf8 .= chr(0x0C);
+                                ++$c;
+                                break;
+                            case $substr_chrs_c_2 == '\r':
+                                $utf8 .= chr(0x0D);
+                                ++$c;
+                                break;
+
+                            case $substr_chrs_c_2 == '\\"':
+                            case $substr_chrs_c_2 == '\\\'':
+                            case $substr_chrs_c_2 == '\\\\':
+                            case $substr_chrs_c_2 == '\\/':
+                                if (($delim == '"' && $substr_chrs_c_2 != '\\\'') ||
+                                   ($delim == "'" && $substr_chrs_c_2 != '\\"')) {
+                                    $utf8 .= $chrs{++$c};
+                                }
+                                break;
+
+                            case preg_match('/\\\u[0-9A-F]{4}/i', substr($chrs, $c, 6)):
+                                // single, escaped unicode character
+                                $utf16 = chr(hexdec(substr($chrs, ($c + 2), 2)))
+                                       . chr(hexdec(substr($chrs, ($c + 4), 2)));
+                                $utf8 .= $this->utf162utf8($utf16);
+                                $c += 5;
+                                break;
+
+                            case ($ord_chrs_c >= 0x20) && ($ord_chrs_c <= 0x7F):
+                                $utf8 .= $chrs{$c};
+                                break;
+
+                            case ($ord_chrs_c & 0xE0) == 0xC0:
+                                // characters U-00000080 - U-000007FF, mask 110XXXXX
+                                //see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                                $utf8 .= substr($chrs, $c, 2);
+                                ++$c;
+                                break;
+
+                            case ($ord_chrs_c & 0xF0) == 0xE0:
+                                // characters U-00000800 - U-0000FFFF, mask 1110XXXX
+                                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                                $utf8 .= substr($chrs, $c, 3);
+                                $c += 2;
+                                break;
+
+                            case ($ord_chrs_c & 0xF8) == 0xF0:
+                                // characters U-00010000 - U-001FFFFF, mask 11110XXX
+                                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                                $utf8 .= substr($chrs, $c, 4);
+                                $c += 3;
+                                break;
+
+                            case ($ord_chrs_c & 0xFC) == 0xF8:
+                                // characters U-00200000 - U-03FFFFFF, mask 111110XX
+                                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                                $utf8 .= substr($chrs, $c, 5);
+                                $c += 4;
+                                break;
+
+                            case ($ord_chrs_c & 0xFE) == 0xFC:
+                                // characters U-04000000 - U-7FFFFFFF, mask 1111110X
+                                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                                $utf8 .= substr($chrs, $c, 6);
+                                $c += 5;
+                                break;
+
+                        }
+
+                    }
+
+                    return $utf8;
+
+                } elseif (preg_match('/^\[.*\]$/s', $str) || preg_match('/^\{.*\}$/s', $str)) {
+                    // array, or object notation
+
+                    if ($str{0} == '[') {
+                        $stk = array(SERVICES_JSON_IN_ARR);
+                        $arr = array();
+                    } else {
+                        if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
+                            $stk = array(SERVICES_JSON_IN_OBJ);
+                            $obj = array();
+                        } else {
+                            $stk = array(SERVICES_JSON_IN_OBJ);
+                            $obj = new stdClass();
+                        }
+                    }
+
+                    array_push($stk, array('what'  => SERVICES_JSON_SLICE,
+                                           'where' => 0,
+                                           'delim' => false));
+
+                    $chrs = substr($str, 1, -1);
+                    $chrs = $this->reduce_string($chrs);
+
+                    if ($chrs == '') {
+                        if (reset($stk) == SERVICES_JSON_IN_ARR) {
+                            return $arr;
+
+                        } else {
+                            return $obj;
+
+                        }
+                    }
+
+                    //print("\nparsing {$chrs}\n");
+
+                    $strlen_chrs = strlen($chrs);
+
+                    for ($c = 0; $c <= $strlen_chrs; ++$c) {
+
+                        $top = end($stk);
+                        $substr_chrs_c_2 = substr($chrs, $c, 2);
+
+                        if (($c == $strlen_chrs) || (($chrs{$c} == ',') && ($top['what'] == SERVICES_JSON_SLICE))) {
+                            // found a comma that is not inside a string, array, etc.,
+                            // OR we've reached the end of the character list
+                            $slice = substr($chrs, $top['where'], ($c - $top['where']));
+                            array_push($stk, array('what' => SERVICES_JSON_SLICE, 'where' => ($c + 1), 'delim' => false));
+                            //print("Found split at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
+
+                            if (reset($stk) == SERVICES_JSON_IN_ARR) {
+                                // we are in an array, so just push an element onto the stack
+                                array_push($arr, $this->decode($slice));
+
+                            } elseif (reset($stk) == SERVICES_JSON_IN_OBJ) {
+                                // we are in an object, so figure
+                                // out the property name and set an
+                                // element in an associative array,
+                                // for now
+                                $parts = array();
+                                
+                                if (preg_match('/^\s*(["\'].*[^\\\]["\'])\s*:\s*(\S.*),?$/Uis', $slice, $parts)) {
+                                    // "name":value pair
+                                    $key = $this->decode($parts[1]);
+                                    $val = $this->decode($parts[2]);
+
+                                    if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
+                                        $obj[$key] = $val;
+                                    } else {
+                                        $obj->$key = $val;
+                                    }
+                                } elseif (preg_match('/^\s*(\w+)\s*:\s*(\S.*),?$/Uis', $slice, $parts)) {
+                                    // name:value pair, where name is unquoted
+                                    $key = $parts[1];
+                                    $val = $this->decode($parts[2]);
+
+                                    if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
+                                        $obj[$key] = $val;
+                                    } else {
+                                        $obj->$key = $val;
+                                    }
+                                }
+
+                            }
+
+                        } elseif ((($chrs{$c} == '"') || ($chrs{$c} == "'")) && ($top['what'] != SERVICES_JSON_IN_STR)) {
+                            // found a quote, and we are not inside a string
+                            array_push($stk, array('what' => SERVICES_JSON_IN_STR, 'where' => $c, 'delim' => $chrs{$c}));
+                            //print("Found start of string at {$c}\n");
+
+                        } elseif (($chrs{$c} == $top['delim']) &&
+                                 ($top['what'] == SERVICES_JSON_IN_STR) &&
+                                 ((strlen(substr($chrs, 0, $c)) - strlen(rtrim(substr($chrs, 0, $c), '\\'))) % 2 != 1)) {
+                            // found a quote, we're in a string, and it's not escaped
+                            // we know that it's not escaped becase there is _not_ an
+                            // odd number of backslashes at the end of the string so far
+                            array_pop($stk);
+                            //print("Found end of string at {$c}: ".substr($chrs, $top['where'], (1 + 1 + $c - $top['where']))."\n");
+
+                        } elseif (($chrs{$c} == '[') &&
+                                 in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
+                            // found a left-bracket, and we are in an array, object, or slice
+                            array_push($stk, array('what' => SERVICES_JSON_IN_ARR, 'where' => $c, 'delim' => false));
+                            //print("Found start of array at {$c}\n");
+
+                        } elseif (($chrs{$c} == ']') && ($top['what'] == SERVICES_JSON_IN_ARR)) {
+                            // found a right-bracket, and we're in an array
+                            array_pop($stk);
+                            //print("Found end of array at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
+
+                        } elseif (($chrs{$c} == '{') &&
+                                 in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
+                            // found a left-brace, and we are in an array, object, or slice
+                            array_push($stk, array('what' => SERVICES_JSON_IN_OBJ, 'where' => $c, 'delim' => false));
+                            //print("Found start of object at {$c}\n");
+
+                        } elseif (($chrs{$c} == '}') && ($top['what'] == SERVICES_JSON_IN_OBJ)) {
+                            // found a right-brace, and we're in an object
+                            array_pop($stk);
+                            //print("Found end of object at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
+
+                        } elseif (($substr_chrs_c_2 == '/*') &&
+                                 in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
+                            // found a comment start, and we are in an array, object, or slice
+                            array_push($stk, array('what' => SERVICES_JSON_IN_CMT, 'where' => $c, 'delim' => false));
+                            $c++;
+                            //print("Found start of comment at {$c}\n");
+
+                        } elseif (($substr_chrs_c_2 == '*/') && ($top['what'] == SERVICES_JSON_IN_CMT)) {
+                            // found a comment end, and we're in one now
+                            array_pop($stk);
+                            $c++;
+
+                            for ($i = $top['where']; $i <= $c; ++$i)
+                                $chrs = substr_replace($chrs, ' ', $i, 1);
+
+                            //print("Found end of comment at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
+
+                        }
+
+                    }
+
+                    if (reset($stk) == SERVICES_JSON_IN_ARR) {
+                        return $arr;
+
+                    } elseif (reset($stk) == SERVICES_JSON_IN_OBJ) {
+                        return $obj;
+
+                    }
+
+                }
+        }
+    }
+
+    /**
+     * @todo Ultimately, this should just call PEAR::isError()
+     */
+    function isError($data, $code = null)
+    {
+        if (class_exists('pear')) {
+            return PEAR::isError($data, $code);
+        } elseif (is_object($data) && (get_class($data) == 'services_json_error' ||
+                                 is_subclass_of($data, 'services_json_error'))) {
+            return true;
+        }
+
+        return false;
+    }
+}
+
+if (class_exists('PEAR_Error')) {
+
+    class Services_JSON_Error extends PEAR_Error
+    {
+        function Services_JSON_Error($message = 'unknown error', $code = null,
+                                     $mode = null, $options = null, $userinfo = null)
+        {
+            parent::PEAR_Error($message, $code, $mode, $options, $userinfo);
+        }
+    }
+
+} else {
+
+    /**
+     * @todo Ultimately, this class shall be descended from PEAR_Error
+     */
+    class Services_JSON_Error
+    {
+        function Services_JSON_Error($message = 'unknown error', $code = null,
+                                     $mode = null, $options = null, $userinfo = null)
+        {
+
+        }
+    }
+
+}
+    
+?>
diff --git a/onyx2/include/applications/GSM/main.php b/onyx2/include/applications/GSM/main.php
new file mode 100644
index 0000000..ced6cce
--- /dev/null
+++ b/onyx2/include/applications/GSM/main.php
@@ -0,0 +1,326 @@
+<?php
+//Fichier appelé pour afficher l'application
+
+$p = strtolower(gpc("p"));
+$titre = ucfirst(trim(gpc("titre", "post")));
+$auteur = ucwords(trim(gpc("auteur", "post")));
+
+if ($p == "liste")
+{
+	$bdd = new BDD();
+	$req = $bdd->query("SELECT id, titre, chanteur, CDDeca, CDChanteur, CDAnnee FROM gsm ORDER BY id;");
+	$req["nombre"] = $bdd->num_rows;
+	$reqCDA = $bdd->query("SELECT id, nom FROM gsm_cdannee;");
+	$reqCDC = $bdd->query("SELECT id, nom FROM gsm_cdchant;");
+	$reqCDD = $bdd->query("SELECT id, nom FROM gsm_cddece;");
+	$bdd->deconnexion();
+
+	$xml_cds = $xml->createElement("liste");
+	if (!empty($req))
+		foreach($req as $ligne)
+		{
+			if (!empty($ligne["id"]))
+			{
+				$chan = $xml->createElement("chanson");
+				$chan->setAttribute("id", $ligne["id"]);
+				$chan->setAttribute("titre", $ligne["titre"]);
+				$chan->setAttribute("chanteur", $ligne["chanteur"]);
+				$chan->setAttribute("CD_decenie", $ligne["CDDeca"]);
+				$chan->setAttribute("CD_annee", $ligne["CDAnnee"]);
+				$chan->setAttribute("CD_interprete", $ligne["CDChanteur"]);
+				$xml_cds->appendChild($chan);
+			}
+		}
+	if (!empty($reqCDA))
+		foreach($reqCDA as $cd)
+		{
+			$chan = $xml->createElement("cdannee");
+			$chan->setAttribute("id", $cd["id"]);
+			$chan->setAttribute("nom", $cd["nom"]);
+			$xml_cds->appendChild($chan);
+		}
+	if (!empty($reqCDC))
+		foreach($reqCDC as $cd)
+		{
+			$chan = $xml->createElement("cdchant");
+			$chan->setAttribute("id", $cd["id"]);
+			$chan->setAttribute("nom", $cd["nom"]);
+			$xml_cds->appendChild($chan);
+		}
+	if (!empty($reqCDD))
+		foreach($reqCDD as $cd)
+		{
+			$chan = $xml->createElement("cddece");
+			$chan->setAttribute("id", $cd["id"]);
+			$chan->setAttribute("nom", $cd["nom"]);
+			$xml_cds->appendChild($chan);
+		}
+	$xml_root->appendChild($xml_cds);
+}
+elseif ($p == "add" && ($type = intval(gpc("type", "post"))) && ($title = gpc("title", "post")))
+{
+	$color = hexdec(gpc("color", "post"));
+	
+	if ($type == 1)
+		$table = "gsm_cdannee";
+	else if ($type == 2)
+		$table = "gsm_cdchant";
+	else
+		$table = "gsm_cddece";
+	
+	$bdd = new BDD();
+	$bdd->escape($title);
+	$bdd->query("INSERT INTO `$table` (nom, color) VALUES ('$title', $color);");
+	$id = $bdd->insert_id();
+	$req = $bdd->unique_query("SELECT COUNT(id) AS nombre FROM gsm");
+	$bdd->deconnexion();
+	
+	$xml_root->appendChild($xml->createElement("id", $id));
+}
+elseif ($p == "del" && $id = intval(gpc("id", "post")))
+{
+	$bdd = new BDD();
+	$bdd->query("DELETE FROM `gsm` WHERE id = $id;");
+	$req = $bdd->unique_query("SELECT COUNT(id) AS nombre FROM gsm");
+	$bdd->deconnexion();
+}
+elseif ($p == "color" && ($type = intval(gpc("type", "get"))) && ($idAlbum = intval(gpc("id", "get"))))
+{
+	if ($type == 1)
+		$table = "gsm_cdannee";
+	else if ($type == 2)
+		$table = "gsm_cdchant";
+	else
+		$table = "gsm_cddece";
+
+	$bdd = new BDD();
+	$res = $bdd->unique_query("SELECT color FROM `$table` WHERE id = $idAlbum;");
+	$req = $bdd->unique_query("SELECT COUNT(id) AS nombre FROM gsm");
+	$bdd->deconnexion();
+	
+	$xml_root->appendChild($xml->createElement("color", sprintf("#%06X", $res["color"])));
+	
+	$color2R = ($res["color"] >> 16) & 255;
+	if ($color2R >= 25)
+		$color2R -= 25;
+	$color2G = ($res["color"] >> 8) & 255;
+	if ($color2G >= 25)
+		$color2G -= 25;
+	$color2B = ($res["color"]) & 255;
+	if ($color2B >= 25)
+		$color2B -= 25;
+	$xml_root->appendChild($xml->createElement("color", sprintf("#%02X%02X%02X", $color2R, $color2G, $color2B)));
+}
+elseif ($p == "rech")
+{
+	$type = substr(gpc("type", "post"), 0, 1);
+	$id = intval(gpc("id", "post"));
+
+	if ($type == "d")
+	{
+		$bdd = new BDD();
+		$rech = $bdd->query("SELECT * FROM gsm WHERE CDDeca = $id;");
+		$req = $bdd->unique_query("SELECT COUNT(id) AS nombre FROM gsm");
+		$bdd->deconnexion();
+	}
+	elseif ($type == "a")
+	{
+		$bdd = new BDD();
+		$rech = $bdd->query("SELECT * FROM gsm WHERE CDAnnee = $id;");
+		$req = $bdd->unique_query("SELECT COUNT(id) AS nombre FROM gsm");
+		$bdd->deconnexion();
+	}
+	elseif ($type == "i")
+	{
+		$bdd = new BDD();
+		$rech = $bdd->query("SELECT * FROM gsm WHERE CDChanteur = $id;");
+		$req = $bdd->unique_query("SELECT COUNT(id) AS nombre FROM gsm");
+		$bdd->deconnexion();
+	}
+
+	$xml_cds = $xml->createElement("album");
+	if (!empty($rech))
+	{
+		foreach($rech as $ligne)
+		{
+			$chan = $xml->createElement("chanson");
+			$chan->setAttribute("id", $ligne["id"]);
+			$chan->setAttribute("titre", $ligne["titre"]);
+			$chan->setAttribute("chanteur", $ligne["chanteur"]);
+			$chan->setAttribute("CD_decenie", $ligne["CDDeca"]);
+			$chan->setAttribute("CD_annee", $ligne["CDAnnee"]);
+			$chan->setAttribute("CD_interprete", $ligne["CDChanteur"]);
+			$xml_cds->appendChild($chan);
+		}
+	}
+	$xml_root->appendChild($xml_cds);
+}
+elseif ($p == "stats")
+{
+	$cds = array();
+	
+	$bdd = new BDD();
+	$cds["annees"] = $bdd->query("SELECT A.id, A.nom, COUNT(T.id) AS nombre FROM gsm_cdannee A LEFT OUTER JOIN gsm T ON A.id = T.CDAnnee GROUP BY A.id ORDER BY A.nom;");
+	$cds["interpretes"] = $bdd->query("SELECT A.id, A.nom, COUNT(T.id) AS nombre FROM gsm_cdchant A LEFT OUTER JOIN gsm T ON A.id = T.CDChanteur GROUP BY A.id ORDER BY A.nom;");
+	$cds["decenies"] = $bdd->query("SELECT A.id, A.nom, COUNT(T.id) AS nombre FROM gsm_cddece A LEFT OUTER JOIN gsm T ON A.id = T.CDDeca GROUP BY A.id ORDER BY A.nom;");
+	$req = $bdd->unique_query("SELECT COUNT(id) AS nombre FROM gsm");
+	$bdd->deconnexion();
+	
+	if (!empty($cds["annees"]))
+	{
+		foreach($cds["annees"] as $ligne)
+		{
+			$cd = $xml->createElement("annee");
+			$cd->setAttribute("id", $ligne["id"]);
+			$cd->setAttribute("nbTitles", $ligne["nombre"]);
+			$xml_root->appendChild($cd);
+		}
+	}
+	
+	if (!empty($cds["interpretes"]))
+	{
+		foreach($cds["interpretes"] as $ligne)
+		{
+			$cd = $xml->createElement("interprete");
+			$cd->setAttribute("id", $ligne["id"]);
+			$cd->setAttribute("nbTitles", $ligne["nombre"]);
+			$xml_root->appendChild($cd);
+		}
+	}
+	
+	if (!empty($cds["decenies"]))
+	{
+		foreach($cds["decenies"] as $ligne)
+		{
+			$cd = $xml->createElement("decenie");
+			$cd->setAttribute("id", $ligne["id"]);
+			$cd->setAttribute("nbTitles", $ligne["nombre"]);
+			$xml_root->appendChild($cd);
+		}
+	}
+}
+elseif ($p == "cds")
+{
+	$bdd = new BDD();
+	$cds["decenies"] = $bdd->query("SELECT A.*, COUNT(T.id) AS nombre FROM gsm_cddece A LEFT OUTER JOIN gsm T ON A.id = T.CDDeca GROUP BY A.nom;");
+	$cds["interpretes"] = $bdd->query("SELECT A.*, COUNT(T.id) AS nombre FROM gsm_cdchant A LEFT OUTER JOIN gsm T ON A.id = T.CDChanteur GROUP BY A.nom;");
+	$cds["annees"] = $bdd->query("SELECT A.*, COUNT(T.id) AS nombre FROM gsm_cdannee A LEFT OUTER JOIN gsm T ON A.id = T.CDAnnee GROUP BY A.nom;");
+	$req = $bdd->unique_query("SELECT COUNT(id) AS nombre FROM gsm");
+	$bdd->deconnexion();
+
+	$xml_cds = $xml->createElement("decenies");
+	if (!empty($cds["decenies"]))
+	{
+		foreach($cds["decenies"] as $ligne)
+		{
+			$cd = $xml->createElement("cd");
+			$cd->setAttribute("id", $ligne["id"]);
+			$cd->setAttribute("nom", $ligne["nom"]);
+			$cd->setAttribute("nombre_titres", $ligne["nombre"]);
+			$xml_cds->appendChild($cd);
+		}
+	}
+	$xml_root->appendChild($xml_cds);
+
+	$xml_cds = $xml->createElement("interpretes");
+	if (!empty($cds["interpretes"]))
+	{
+		foreach($cds["interpretes"] as $ligne)
+		{
+			$cd = $xml->createElement("cd");
+			$cd->setAttribute("id", $ligne["id"]);
+			$cd->setAttribute("nom", $ligne["nom"]);
+			$cd->setAttribute("nombre_titres", $ligne["nombre"]);
+			$xml_cds->appendChild($cd);
+		}
+	}
+	$xml_root->appendChild($xml_cds);
+
+	$xml_cds = $xml->createElement("annees");
+	if (!empty($cds["annees"]))
+	{
+		foreach($cds["annees"] as $ligne)
+		{
+			$cd = $xml->createElement("cd");
+			$cd->setAttribute("id", $ligne["id"]);
+			$cd->setAttribute("nom", $ligne["nom"]);
+			$cd->setAttribute("nombre_titres", $ligne["nombre"]);
+			$xml_cds->appendChild($cd);
+		}
+	}
+	$xml_root->appendChild($xml_cds);
+}
+elseif (!empty($titre) && !empty($auteur))
+{
+	$alb = intval(gpc("alb", "post"));
+	$type = intval(gpc("type", "post"));
+	$id = intval(gpc("id"));
+
+	$bdd = new BDD();
+	$bdd->escape($titre);
+	$bdd->escape($auteur);
+	if ($id)
+		$bdd->query("UPDATE gsm SET titre = '$titre', chanteur = '$auteur' WHERE id = $id;");
+	else
+	{
+		//On recherche la chanson pour tester si elle n'existe pas déjà
+		$chanson = $bdd->unique_query("SELECT id, CDDeca, CDAnnee, CDChanteur FROM gsm WHERE titre LIKE '$titre' AND chanteur LIKE '$auteur' LIMIT 1;");
+		$update = "";
+		if (!empty($chanson))
+		{
+			if (isset($update) && !empty($type) && $type == 3)
+			{
+				if (empty($chanson["CDDeca"]))
+					$update .= "CDDeca = ".$alb.", ";
+				else
+					$update = null;
+			}
+			if (isset($update) && !empty($type) && $type == 1)
+			{
+				if (empty($chanson["CDAnnee"]))
+					$update .= "CDAnnee = ".$alb.", ";
+				else
+					$update = null;
+			}
+			if (isset($update) && !empty($type) && $type == 2)
+			{
+				if (empty($chanson["CDChanteur"]))
+					$update .= "CDChanteur = ".$alb.", ";
+				else
+					$update = null;
+			}
+		}
+		if (!empty($update))
+		{
+			$bdd->query("UPDATE gsm SET $update titre = titre WHERE id = ".$chanson["id"].";");
+			$res = $chanson["id"];
+		}
+		else
+		{
+			if ($type == 1)
+				$disc = array("annee" => $alb, "interprete" => 0, "decenie" => 0);
+			else if ($type == 2)
+				$disc = array("annee" => 0, "interprete" => $alb, "decenie" => 0);
+			else if ($type == 3)
+				$disc = array("annee" => 0, "interprete" => 0, "decenie" => $alb);
+			else
+				$disc = array("annee" => 0, "interprete" => 0, "decenie" => 0);
+				
+			$bdd->query("INSERT INTO gsm (titre, chanteur, CDDeca, CDAnnee, CDChanteur) VALUES ('$titre', '$auteur', ".$disc["decenie"].", ".$disc["annee"].", ".$disc["interprete"].");");
+			$res = $bdd->insert_id();
+		}
+	}
+	$req = $bdd->unique_query("SELECT COUNT(id) AS nombre FROM gsm");
+	$bdd->deconnexion();
+	
+	$xml_root->appendChild($xml->createElement("id", $res));
+}
+else
+{
+	$bdd = new BDD();
+	$req = $bdd->unique_query("SELECT COUNT(id) AS nombre FROM gsm");
+	$bdd->deconnexion();
+}
+
+$json["nombre"] = $req["nombre"];
+?>
\ No newline at end of file
diff --git a/onyx2/include/applications/GSM/property.xml b/onyx2/include/applications/GSM/property.xml
new file mode 100644
index 0000000..aebb995
--- /dev/null
+++ b/onyx2/include/applications/GSM/property.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application active="1">
+	<property value="name">Gérer sa musique</property>
+	<property value="description">Cette application vous permet de gérer facilement votre discothèque.</property>
+	<property value="etatAvancement">beta</property>
+	<property value="version">1.1</property>
+	<property value="lang">fr_FR</property>
+	<property value="developpeur"><![CDATA[<span style="font-variant: small-caps">Mercier</span> Pierre-Olivier]]></property>
+	<property value="corps">contenu</property>
+
+	<security type="users" default="restricted">
+		<user>1</user>
+		<user>2</user>
+	</security>
+
+	<display value="logo">0</display>
+	<display value="css" media="all">main.css</display>
+	<display value="css" media="screen">style.css</display>
+	<display value="css" media="print">print.css</display>
+	<display value="script">app.js</display>
+	<display value="body">
+	  <![CDATA[
+		   <h1>Bienvenue dans la gestion d'une discothèque</h1>
+		   <ul id="GSM_menu">
+			   <li><h2>Discothèque</h2></li>
+			   <li onclick="GSM_add();">Ajouter un album</li>
+			   <li onclick="GSM_listAlbums();">Liste des albums</li>
+			   <li onclick="GSM_listTitres();">Liste des titres</li>
+			   <li>Nombre de titres enregistrés : <span id="nbpc"></span></li>
+		   </ul>
+		   <div id="contenu"></div>
+	  ]]>
+	</display>
+	<display value="js">
+		<![CDATA[
+function runApplication(property, display, json)
+{
+  $('logo').style.display = 'none';
+
+  $('contenu').innerHTML = "";
+  news = document.createElement("div");
+  news.className = "news";
+  news.innerHTML = "<h3>Bienvenue dans la version béta de GSM pour Pommultimédia For Home !</h3>Cette nouvelle version est plus rapide que la version précédente et a une meilleur intégration avec Pommultimédia For Home.<br />N'hésitez pas à nous faire part de vos commentaires ;)";
+  $('contenu').appendChild(news);
+}
+		]]>
+	</display>
+
+	<config value="table_bdd">gsm</config>
+</application>
\ No newline at end of file
diff --git a/onyx2/include/applications/GSPC/main.php b/onyx2/include/applications/GSPC/main.php
new file mode 100644
index 0000000..75907dd
--- /dev/null
+++ b/onyx2/include/applications/GSPC/main.php
@@ -0,0 +1,81 @@
+<?php
+//Fichier appelé pour afficher l'application
+
+$p = strtolower(gpc("p"));
+$nom = trim(utf8_decode(utf8_encode(strtolower(gpc("nom", "post")))));
+$ligne = trim(utf8_decode(utf8_encode(strtoupper(gpc("ligne", "post")))));
+
+//sleep(5);
+
+if ($p == "liste")
+{
+	$bdd = new BDD();
+	$req = $bdd->query("SELECT * FROM gspc;");
+	$req["nombre"] = $bdd->num_rows;
+	$bdd->deconnexion();
+
+	$xml_pc = $xml->createElement("liste");
+	foreach($req as $ligne)
+	{
+		if (!empty($ligne["reftable"]))
+		{
+			$portecle = $xml->createElement("porteclef");
+			$portecle->setAttribute("id", $ligne["reftable"]);
+			$portecle->setAttribute("nom", $ligne["nom"]);
+			$portecle->setAttribute("caracteristique", ucfirst($ligne["caracteristique"]));
+			$portecle->setAttribute("ligne", $ligne["ligne"]);
+			$portecle->setAttribute("special", $ligne["special"]);
+			$xml_pc->appendChild($portecle);
+		}
+	}
+	$xml_root->appendChild($xml_pc);
+}
+elseif ($p == "stats")
+{
+	$bdd = new BDD();
+	$req = $bdd->query("SELECT ligne, COUNT(reftable) AS nombre FROM `gspc` GROUP BY ligne ORDER BY ligne ASC;");
+	$bdd->deconnexion();
+
+	$xml_pc = $xml->createElement("statistiques");
+	foreach($req as $ligne)
+	{
+		$portecle = $xml->createElement("ligne");
+		$portecle->setAttribute("nom", $ligne["ligne"]);
+		$portecle->setAttribute("nombre", $ligne["nombre"]);
+		$xml_pc->appendChild($portecle);
+	}
+	$xml_root->appendChild($xml_pc);
+}
+elseif ($p == "del" && $id = intval(gpc("id", "post")))
+{
+	$bdd = new BDD();
+	$bdd->query("DELETE FROM `gspc` WHERE reftable = $id;");
+	$req = $bdd->unique_query("SELECT COUNT(reftable) AS nombre FROM gspc");
+	$bdd->deconnexion();
+}
+elseif (!empty($nom) && !empty($ligne))
+{
+	$carac = trim(utf8_decode(utf8_encode(gpc("caracteristique", "post"))));
+	$quantite = intval(gpc("quantite", "post"));
+	$id = intval(gpc("id"));
+
+	$bdd = new BDD();
+	$bdd->escape($nom);
+	$bdd->escape($carac);
+	$bdd->escape($ligne);
+	if ($id)
+		$bdd->query("UPDATE gspc SET nom = '$nom', caracteristique = '$carac', ligne = '$ligne', special = $quantite WHERE reftable = $id;");
+	else
+		$bdd->query("INSERT INTO gspc (nom, caracteristique, ligne, special) VALUES ('$nom', '$carac', '$ligne', $quantite);");
+	$req = $bdd->unique_query("SELECT COUNT(reftable) AS nombre FROM gspc");
+	$bdd->deconnexion();
+}
+else
+{
+	$bdd = new BDD();
+	$req = $bdd->unique_query("SELECT COUNT(reftable) AS nombre FROM gspc");
+	$bdd->deconnexion();
+}
+
+$json["nombre"] = $req["nombre"];
+?>
\ No newline at end of file
diff --git a/onyx2/include/applications/GSPC/property.xml b/onyx2/include/applications/GSPC/property.xml
new file mode 100644
index 0000000..4926d2b
--- /dev/null
+++ b/onyx2/include/applications/GSPC/property.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application active="1">
+	<property value="name">Gérer ses porte-clefs</property>
+	<property value="description">Cette application vous permet de gérer facilement une collection de porte-clefs.</property>
+	<property value="etatAvancement">final</property>
+	<property value="version">1.1</property>
+	<property value="lang">fr_FR</property>
+	<property value="developpeur"><![CDATA[<span style="font-variant: small-caps">Mercier</span> Pierre-Olivier]]></property>
+	<property value="corps">contenu</property>
+
+	<security type="users" default="restricted">
+		<user>1</user>
+		<user>2</user>
+	</security>
+<!--
+	<menu text="Test pommes" eventClick="alert('Alerte aux pommes !');" />
+	<menu text="Test abricot" eventClick="alert('Alerte aux abricots !');" />
+-->
+	<display value="logo">0</display>
+	<display value="css">style.css</display>
+	<display value="script">app.js</display>
+	<display value="body">
+	  <![CDATA[
+		   <h1>Bienvenue dans la gestion de collection de porte-clefs</h1>
+		   <ul id="GSPC_menu">
+		   <li><h2>Porte-clefs</h2></li>
+		   <li onclick="GSPC_add();">Ajouter un porte-clef</li>
+		   <li onclick="GSPC_list();">Liste des porte-clefs</li>
+		   <li onclick="GSPC_stats();">Liste des lignes</li>
+		   <li>Nombre de porte-clefs enregistrés : <span id="nbpc"></span></li>
+		   </ul>
+		   <div id="contenu"></div>
+	  ]]>
+	</display>
+	<display value="js">
+		<![CDATA[
+function runApplication(property, display, json)
+{
+  $('logo').style.display = 'none';
+
+  $('contenu').innerHTML = "";
+  news = document.createElement("div");
+  news.className = "news";
+  news.innerHTML = "<h3>Bienvenue dans la version finale de GSPC pour Pommultimédia For Home !</h3>Cette nouvelle version a été encore plus simplifiée et réduit les temps d'attente en préchargeant les données de manière asynchrone.<br />N'hésitez pas à nous faire part de vos commentaires. Bonne utilisation ;)";
+  $('contenu').appendChild(news);
+}
+		]]>
+	</display>
+
+	<config value="table_bdd">gspc</config>
+</application>
\ No newline at end of file
diff --git a/onyx2/include/applications/UDload/main.php b/onyx2/include/applications/UDload/main.php
new file mode 100644
index 0000000..3469d85
--- /dev/null
+++ b/onyx2/include/applications/UDload/main.php
@@ -0,0 +1,3 @@
+<?php
+//Fichier appelé pour afficher l'application
+?>
\ No newline at end of file
diff --git a/onyx2/include/applications/UDload/property.xml b/onyx2/include/applications/UDload/property.xml
new file mode 100644
index 0000000..b878a5f
--- /dev/null
+++ b/onyx2/include/applications/UDload/property.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application active="1">
+	<property value="name">Transfert de fichiers</property>
+	<property value="description">Cette application vous permet de transférer rapidement de petits fichiers et de les partager sur Internet.</property>
+	<property value="dir">UDload</property>
+	<property value="etatAvancement">final</property>
+	<property value="version">1.0</property>
+	<property value="lang">fr_FR</property>
+	<property value="developpeur"><![CDATA[<span style="font-variant: small-caps">Mercier</span> Pierre-Olivier]]></property>
+	<property value="js">
+		<![CDATA[
+			function runApplication(property, display, json)
+			{
+				formulaire = document.createElement("form");
+					formfield = document.createElement("fieldset");
+						labelfile = document.createElement("label");
+						labelfile.innerHTML = "Fichier à uploader : ";
+						formfield.appendChild(labelfile);
+						inputfile = document.createElement("input");
+						inputfile.name = "upfile";
+					formulaire.appendChild(formfield);
+				$('corps').appendChild(formulaire);
+			}
+		]]>
+	</property>
+
+	<security default="connected" />
+
+	<display value="titre">download.png</display>
+
+	<config value="table_bdd">udload</config>
+</application>
\ No newline at end of file
diff --git a/onyx2/include/applications/chat/main.php b/onyx2/include/applications/chat/main.php
new file mode 100644
index 0000000..5be77e6
--- /dev/null
+++ b/onyx2/include/applications/chat/main.php
@@ -0,0 +1,72 @@
+<?php
+//Fichier appelé pour afficher l'application
+if (isset($_POST['message']))
+{
+	$message = strip_tags(trim(gpc("message", "post")));
+	if (!empty($message) || $message == "0")
+	{
+		$bdd = new BDD();
+		$bdd->escape($message);
+		$bdd->query("INSERT INTO chat (id_membre, timestamp, message) VALUES (".$SESS->values['id_user'].", ".time().", '$message');");
+		$bdd->deconnexion();
+	}
+}
+elseif (isset($_POST['comm']))
+{
+	$commande = strip_tags(trim(gpc("comm", "post")));
+	if ($commande == "!clear")
+	{
+		if ($SESS->values["id_user"] == 1)
+		{
+			$bdd = new BDD();
+			$bdd->query("DELETE FROM chat;");
+			$bdd->deconnexion();
+			$json["confirm"] = "Tous les messages ont été supprimés";
+		}
+		else
+			$json["confirm"] = "Vous n'avez pas les autorisations nécessaires pour effacer les messages.";
+	}
+	elseif ($commande == "!online")
+	{
+		$users = Cache::read('chat_online');
+		$json["confirm"] = "Actuellement en ligne :<ul>";
+		foreach($users as $username => $time)
+		{
+			if (time()-30 < $time)
+				$json["confirm"] .= "<li>$username</li>";
+		}
+		$json["confirm"] .= "</ul>";
+	}
+	elseif ($commande == "!help" || $commande == "!hlp" || $commande == "!aide")
+	{
+		$json["confirm"] = "<table><tr><th>Commande</th><th>Description</th></tr>
+			<tr><td>!changeRefreshTime <ins>int</ins></td><td>Change le temps de rafraîchissement à <ins>int</ins> (milli)secondes</td></tr>
+			<tr><td>!cls</td><td>Nettoie l'écran</td></tr>
+			<tr><td>!clear</td><td>Supprime tous les messages enregistrés dans la base de données</td></tr>
+			<tr><td>!help</td><td>Affiche cet aide</td></tr>
+			<tr><td>!maj</td><td>Actualise les messages du chat</td></tr>
+			<tr><td>!online</td><td>Montre les utilisateurs en ligne (ces 30 dernières secondes)</td></tr>
+			<tr><td>!quit</td><td>Quitte le chat et affiche l'accueil</td></tr>
+			<tr><td>!reset</td><td>Réaffiche les 15 derniers messages envoyés</td></tr>
+			</table>";
+	}
+}
+else
+{
+	//Met à jour la liste des personnes en ligne
+	$users = Cache::read('chat_online');
+	$users[$SESS->values["username"]] = time();
+	Cache::set('chat_online', $users);
+
+	if (!empty($_GET['time']))
+		$time = intval(gpc("time"))." ORDER BY timestamp DESC";
+	else
+		$time = "0 ORDER BY timestamp DESC LIMIT 15";
+
+	$bdd = new BDD();
+	$messages = $bdd->query("SELECT C.*, U.pseudo FROM chat C INNER JOIN users U ON U.id = C.id_membre WHERE C.timestamp > $time;");
+	$bdd->deconnexion();
+
+	$json["messages"] = $messages;
+}
+?>
\ No newline at end of file
diff --git a/onyx2/include/applications/chat/property.xml b/onyx2/include/applications/chat/property.xml
new file mode 100644
index 0000000..2b7fe47
--- /dev/null
+++ b/onyx2/include/applications/chat/property.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application active="1">
+	<property value="name">Chat</property>
+	<property value="description">Cette application vous permet de dialoguer facilement avec les autres personnes connectées.</property>
+	<property value="dir">chat</property>
+	<property value="etatAvancement">beta</property>
+	<property value="version">1.0</property>
+	<property value="lang">fr_FR</property>
+	<property value="developpeur"><![CDATA[<span style="font-variant: small-caps">Mercier</span> Pierre-Olivier]]></property>
+	<property value="js">
+		<![CDATA[
+			function runApplication(property, display, json)
+			{
+				formulaire = document.createElement("form");
+				formulaire.onsubmit = sendMessage;
+					formfield = document.createElement("fieldset");
+					formfield.style.margin = "auto";
+						labelmess = document.createElement("label");
+						labelmess.innerHTML = "Message : ";
+						labelmess.setAttribute("for", "message");
+						formfield.appendChild(labelmess);
+						inputmessage = document.createElement("input");
+						inputmessage.name = "message";
+						inputmessage.id = "message";
+						inputmessage.size = "40";
+						formfield.appendChild(inputmessage);
+					formulaire.appendChild(formfield);
+				$('corps').appendChild(formulaire);
+				tableMessages = document.createElement("table");
+				tableMessages.style.margin = "auto";
+				tableMessages.style.width = "90%";
+					theMess = document.createElement("thead");
+						trMess = document.createElement("tr");
+							thMess = document.createElement("th");
+							thMess.innerHTML = "Date et heure";
+							trMess.appendChild(thMess);
+							thMess = document.createElement("th");
+							thMess.innerHTML = "Message";
+							trMess.appendChild(thMess);
+						theMess.appendChild(trMess);
+					tableMessages.appendChild(theMess);
+					tboMess = document.createElement("tbody");
+					tboMess.style.textAlign = "left";
+					tboMess.id = "chat";
+					tableMessages.appendChild(tboMess);
+				$('corps').appendChild(tableMessages);
+
+				printEtat(0);
+				chat_MAJ();
+			}
+
+			function sendMessage()
+			{
+				if ($('message').value == "!cls")
+				{
+					chat_clearScreen();
+					$('message').value = "";
+				}
+				else if ($('message').value == "!maj")
+				{
+					chat_refreshScreen();
+					$('message').value = "";
+				}
+				else if ($('message').value == "!reset")
+				{
+					chat_reset();
+					$('message').value = "";
+				}
+				else if ($('message').value == "!quit" || $('message').value == "!exit" || $('message').value == "!deco" || $('message').value == "!deconnexion")
+				{
+					first_page();
+				}
+				else if ($('message').value.toString().indexOf("!changerefreshtime ") == 0 || $('message').value.toString().indexOf("!changeRefreshtime ") == 0 || $('message').value.toString().indexOf("!changerefreshTime ") == 0 || $('message').value.toString().indexOf("!changeRefreshTime ") == 0)
+				{
+					split = $('message').value.toString().split(" ");
+					$('message').value = "";
+					chat_changeRefreshTime(split[1]);
+				}
+				else if ($('message').value == "!clear" || $('message').value == "!online" || $('message').value == "!help" || $('message').value == "!hlp" || $('message').value == "!aide")
+				{
+					chat_sendCommande($('message').value);
+					$('message').value = "";
+				}
+				else
+				{
+					new Ajax.Request(
+					 'ajax.php?d=action&amp;a=chat',
+					 {
+						method: 'post',
+						parameters: {message: $('message').value},
+						onSuccess: function(transport, json) {
+							$('message').value = "";
+							},
+						onFailure: function() { if (confirm("La requête a échouée, voulez-vous réessayer de renvoyer votre message ?")) sendMessage(); }
+					 }
+					);
+				}
+				return false;
+			}
+
+			function chat_MAJ()
+			{
+				var date = new Date();
+				var newRow = $('chat').insertRow(0);
+				var newCell = newRow.insertCell(0);
+				newCell.innerHTML = '<em>JS</em> ' + (date.getHours()<10?"0"+date.getHours():date.getHours()) + ":" + (date.getMinutes()<10?"0"+date.getMinutes():date.getMinutes()) + ":" + (date.getSeconds()<10?"0"+date.getSeconds():date.getSeconds());
+  				newCell = newRow.insertCell(1);
+				newCell.innerHTML = "<em>Connexion au chat</em>";
+				$('message').focus();
+				chat_refresh = setTimeout("chat_MAJ()", 150);
+			}
+		]]>
+	</property>
+
+	<security default="connected" />
+
+	<display value="titre">chat.png</display>
+	<display value="js">app.js</display>
+
+	<config value="table_bdd">chat</config>
+</application>
\ No newline at end of file
diff --git a/onyx2/include/applications/users/main.php b/onyx2/include/applications/users/main.php
new file mode 100644
index 0000000..d0bb2dd
--- /dev/null
+++ b/onyx2/include/applications/users/main.php
@@ -0,0 +1,13 @@
+<?php
+//Fichier appelé pour afficher l'application
+if (isset($_POST['message']))
+{
+
+}
+else
+{
+	$bdd = new BDD();
+	$json["users"] = $bdd->query("SELECT * FROM users ORDER BY last_visite DESC;");
+	$bdd->deconnexion();
+}
+?>
\ No newline at end of file
diff --git a/onyx2/include/applications/users/property.xml b/onyx2/include/applications/users/property.xml
new file mode 100644
index 0000000..be1197e
--- /dev/null
+++ b/onyx2/include/applications/users/property.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application active="1">
+	<property value="name">Gestion des utilisateurs</property>
+	<property value="description">Cette application permet de gérer les utilisateurs et les accès aux applications.</property>
+	<property value="dir">users</property>
+	<property value="etatAvancement">enconstruction</property>
+	<property value="version">1.0</property>
+	<property value="lang">fr_FR</property>
+	<property value="developpeur"><![CDATA[<span style="font-variant: small-caps">Mercier</span> Pierre-Olivier]]></property>
+	<property value="js">
+		<![CDATA[
+			function runApplication(property, display, json)
+			{
+				alert('pom');
+				USERS_display("main", json)
+				printEtat(0);
+			}
+
+			function USERS_display(page, plus)
+			{
+				alert("USERS_display('" + page + "', " + plus + ");");
+				USERS_liste = plus.users;
+				setTimeout("USERS_display('" + page + "', false);", 100);
+			}
+		]]>
+	</property>
+
+	<security type="users" default="restricted">
+		<user>1</user>
+	</security>
+
+	<display value="titre">utilisateurs.png</display>
+	<display value="js">app.js</display>
+
+	<config value="table_bdd">users</config>
+</application>
\ No newline at end of file
diff --git a/onyx2/include/functions.php b/onyx2/include/functions.php
new file mode 100644
index 0000000..66daa2b
--- /dev/null
+++ b/onyx2/include/functions.php
@@ -0,0 +1,85 @@
+<?php
+if (!defined("ONYX"))
+	exit;
+
+define("APPSDIR", ONYX."include/applications/");
+define("PAGESDIR", ONYX."include/pages/");
+
+function acces_application($application, $applicationXML = null)
+{
+	global $SESS;
+
+	$autoriser = false;
+
+	if (empty($applicationXML))
+	{
+		$applicationXML = new DOMDocument();
+		$applicationXML->load(APPSDIR.$application.'/property.xml');
+	}
+
+	if ($applicationXML->documentElement->getAttribute('active') && ($applicationXML->getElementsByTagName('application') || $applicationXML->getElementsByTagName('page')))
+	{
+		foreach($applicationXML->getElementsByTagName('security') as $security)
+		{
+			//Autorisation par défaut
+			if ($security->getAttribute('default') == "connected")
+				$autoriser = !empty($SESS->values["connecte"]);
+			elseif ($security->getAttribute('default') == "authorized")
+				$autoriser = true;
+
+			//Méthode(s) d'autorisation(s)
+			if (ereg("users", $security->getAttribute('type')) && !empty($SESS->values["username"]))
+			{
+				foreach($applicationXML->getElementsByTagName('user') as $user)
+				{
+					if (strtolower($user->textContent) == strtolower($SESS->values["id_user"]))
+						return !$autoriser;
+				}
+			}
+			if (ereg("usernames", $security->getAttribute('type')) && !empty($SESS->values["username"]))
+			{
+				foreach($applicationXML->getElementsByTagName('username') as $user)
+				{
+					if (strtolower($user->textContent) == strtolower($SESS->values["username"]))
+						return !$autoriser;
+				}
+			}
+			if (ereg("ips", $security->getAttribute('type')))
+			{
+				foreach($applicationXML->getElementsByTagName('ip') as $ip)
+				{
+					if ($ip->textContent == $_SERVER["REMOTE_ADDR"])
+						return !$autoriser;
+				}
+			}
+		}
+	}
+	return $autoriser;
+}
+
+function send404(&$xml_root)
+{
+	global $xml;
+
+	$xml_root->appendChild($xml->createElement("titre", "404.png"));
+	$xml_root->appendChild($xml->createElement("body", "Page introuvable"));
+}
+
+function send403(&$xml_root)
+{
+	global $xml;
+
+	$xml_root->appendChild($xml->createElement("titre", "avertissements.png"));
+	$xml_root->appendChild($xml->createElement("body", "<h2>Erreur 403</h2><h3>Vous n'êtes pas autorisé à accéder à cette page.</h3>Si vous êtes sur d'avoir le droit d'accèder à cette page et que le problème perciste, contacter l'administrateur."));
+}
+
+if (!function_exists("json_encode"))
+{
+	include_once(ONYX.'include/JSON.php');
+	function json_encode($value, $option = 0)
+	{
+		$json = new Services_JSON();
+		return $json->encode($value);
+	}
+}
+?>
\ No newline at end of file
diff --git a/onyx2/include/pages/aproposdusite.xml b/onyx2/include/pages/aproposdusite.xml
new file mode 100644
index 0000000..e6e6852
--- /dev/null
+++ b/onyx2/include/pages/aproposdusite.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<page active="1">
+	<display value="titre">aproposdusite.png</display>
+	<display value="body">
+		<![CDATA[
+			<h2>A propos de Pommultimedia for Home</h2>
+			<h3>Pommultimedia for Home<br />
+			Version 0.2 du 22/04/2011</h3>
+			<h3>Ce site a été développé avec Emacs et Eclipse (plug-in Aptana) sur un serveur utilisant la technologie <a href="http://www.php.net/">PHP</a>.</h3>
+			<br />
+			<h3>Navigateurs conseillés : <a href="www.mozilla.org/firefox/">Mozilla Firefox</a> et <a href="http://www.google.com/chrome/">Google Chrome</a>.</h3>
+			<br />
+			<h3>Historique des versions :</h3>
+			<h4>Version 0.2 du 22/04/2011</h4>
+			<ul>
+				<li>Factorisation du code JavaScript du framework</li>
+				<li>La page connexion est maintenant une page à part entière</li>
+				<li>Ajout du JavaScript aux pages</li>
+				<li>Les items du menu font maintenant parti du fichier XML de chaque application, ce n'est plus dans le JavaScript</li>
+				<li>Régénération de toutes les images d'en-tête : utilisation de la police du cahier des charges et toutes ont été générés</li>
+				<li>Le JavaScript évalué ne fait plus parti des propriétés de l'application, il est dans l'affichage (d'où : accélération du chargement de la liste des applications sur la page d'accueil)</li>
+				<li>Il peut y avoir plusieurs fichiers de scripts et de style par app, ils sont mieux déchargé à la fermeture de l'app</li>
+			</ul>
+			<h4>Version 0.1 du 04/08/2009</h4>
+			Version initiale
+		]]>
+	</display>
+
+	<security default="authorized" />
+</page>
\ No newline at end of file
diff --git a/onyx2/include/pages/connexion.xml b/onyx2/include/pages/connexion.xml
new file mode 100644
index 0000000..1e992c6
--- /dev/null
+++ b/onyx2/include/pages/connexion.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<page active="1">
+	<display value="titre">identification.png</display>
+	<display value="body">
+		<![CDATA[
+			<h1>Bienvenue sur le serveur <em>Pommultimédia for home</em> !</h1>
+			<h2>Pour vous connecter au serveur, veuillez indiquer votre nom d'utilisateur ainsi que votre mot de passe.</h2>
+			<form action="#" method="post">
+				<fieldset class="connexion">
+					<label for="pseudo">Nom d'utilisateur :</label>
+					<input type="text" id="pseudo" maxlength="32"><br>
+					<label for="mdp">Mot de passe :</label>
+					<input type="password" id="mdp" maxlength="32"><br>
+					<input type="submit" value="Connexion">
+				</fieldset>
+			</form>
+			<p id="erreur"></p>
+		]]>
+	</display>
+	<display value="js">
+		<![CDATA[
+function connexion(nom, pass)
+{
+	printEtat(4);
+	$('pseudo').disabled = "disabled";
+	$('mdp').disabled = "disabled";
+	new Ajax.Request(
+ 		'ajax.php?d=connecte',
+ 			{
+				method: 'post',
+				parameters: {name: nom, mdp: pass},
+				onSuccess: function(transport, json)
+				{
+					if (json.statut == 1)
+					{
+						printEtat(2);
+						username = nom.toLowerCase();
+						page_accueil();
+					}
+					else
+					{
+						$('pseudo').disabled = "";
+						$('mdp').disabled = "";
+						$('pseudo').className = "erreur";
+						$('mdp').className = "erreur";
+						$('erreur').innerHTML = "Nom d'utilisateur ou mot de passe incorrect !";
+						$('pseudo').focus();
+						$('pseudo').select();
+						printEtat(0);
+					}
+				},
+				onFailure: function() { printEtat(3); }
+			}
+		);
+}
+
+$('corps').getElementsByTagName("form")[0].onsubmit = function() { connexion($('pseudo').value, $('mdp').value); return false; };
+$('pseudo').focus();
+		]]>
+	</display>
+
+	<security default="authorized" />
+</page>
\ No newline at end of file
diff --git a/onyx2/lang/en.xml b/onyx2/lang/en.xml
new file mode 100644
index 0000000..de00065
--- /dev/null
+++ b/onyx2/lang/en.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lang type="en">
+    <!-- Module : fermerServeur -->
+    <var name="mdl_fermerServeur_title1">Server in maintenance</var>
+    <var name="mdl_fermerServeur_title2">Server in maintenance</var>
+    <var name="mdl_fermerServeur_title3">Server in maintenance</var>
+    <var name="mdl_fermerServeur_texte1"><![CDATA[The server is actualy under maintenance. Because of that, the website is unavailable at this time. We expect the server to be back in %d minutes.<br /><br />For more informations about corrections and novelties, please read the <a href="%s" class="lien">news on our board</a>.]]></var>
+    <var name="mdl_fermerServeur_texte2"><![CDATA[The server is actualy under maintenance. Because of that, the website is unavailable at this time. We expect the server to be back in %d minutes.<br /><br />For more informations about corrections and novelties, we advise you to read the <a href="%s" class="lien">HB Weekly Update on our board</a>.]]></var>
+    <var name="mdl_fermerServeur_texte3"><![CDATA[The server is actualy under maintenance. Because of that, the website is unavailable at this time. We expect the server to be back in %d minutes.<br /><br />For more informations about corrections and novelties, we advise you to read the <a href="http://www.halo-battle.fr/tester/changelog_page.php" class="lien">Mantis' ChangeLog</a>.]]></var>
+    <var name="mdl_fermerServeur_thanks">Thank you for your understanding</var>
+    
+    <!-- game/serveur -->
+    <var name="badNomMdp">Username or password incorrect.</var>
+    <var name="badAuthConnect">The server is unable to authenticate the connection.</var>
+    <var name="servSature">There is currently too many people logged on Halo-Battle. To ensure a reasonable speed for players, please try later.</var>
+    <var name="badPlanete">Your planet cannot be find !</var>
+    
+    <var name="banInf">You have been ban permanently from this galaxy for %s. You can't connect yourself anymore.</var>
+    <var name="banVac">An operator placed your account in vacation mode for %s. You can't connect until %s.</var>
+    <var name="modVac"><![CDATA[This account is in vacation mode. You can't have access to it until <br />%s.]]></var>
+
+    <!--
+        TEMPLATES
+    -->
+    <!-- Menu Header -->
+    <var name="hd_menu_Accueil">HOME</var>
+    <var name="hd_menu_Jeu">THE GAME</var>
+    <var name="hd_menu_Inscrire">JOIN NOW</var>
+    <var name="hd_menu_Forum">BOARD</var>
+    <var name="hd_menu_Blog">BLOG</var>
+    <var name="hd_menu_Hfr">HALO.FR</var>
+    <var name="hd_menu_rss">RSS :: subscribe</var>
+    <var name="hd_menu_search">search...</var>
+    <var name="hd_menu_advSearch">Advanced Search</var>
+    <!-- Connexion -->
+    <var name="mod_login_titre">Log-in</var>
+    <var name="mod_login_galaxie">Galaxy</var>
+    <var name="mod_login_forgotMdp">Forgot your password?</var>
+    <!-- Inscription -->
+    <var name="mod_inscription_texte"><![CDATA[<span><a href="%s">REGISTER NOW</a>  Join the Humanity or Destroy it</span> <p><br />Fight your enemy and Conquer the Sacred Rings in large and beautiful Galaxies inspired by the famous game Halo.<br /><br /><em>A simple free-registration and a web browser are required to play Halo-Battle so don't way anymore and join many others in epic battles!</em></p> <a href="%s" class="link"><span>Click here to join!</span></a> <a href="%s" class="more">Want to know more?</a>]]></var>
+    <!-- Accueil -->
+    <var name="cntRaces"><![CDATA[%d Marines and %d Covenants are fighting in <ins>this galaxy</ins>]]></var>
+    <!-- Footer -->
+    <var name="foot_realise">Directed by</var>
+    <var name="foot_design">Design by</var>
+    <var name="foot_menu_Accueil">Home</var>
+    <var name="foot_menu_Inscrire">Register</var>
+    <var name="foot_menu_Forum">Board</var>
+    <var name="foot_menu_Staff">Staff</var>
+    <var name="foot_menu_Faq">F.A.Q.</var>
+
+    <!-- Général -->
+    <var name="contactAdmin">If the problem persists, please contact an administrator.</var>
+    <var name="hello">Hello</var>
+    <var name="bye">Good bye</var>
+</lang>
diff --git a/onyx2/lang/fr.xml b/onyx2/lang/fr.xml
new file mode 100644
index 0000000..0e0d331
--- /dev/null
+++ b/onyx2/lang/fr.xml
@@ -0,0 +1,1176 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lang type="fr">
+    <!-- Module : fermerServeur -->
+    <var name="mdl_fermerServeur_title1">Serveur en maintenance</var>
+    <var name="mdl_fermerServeur_title2">Serveur en maintenance</var>
+    <var name="mdl_fermerServeur_title3">Serveur en maintenance</var>
+    <var name="mdl_fermerServeur_texte1"><![CDATA[Nous effectuons actuellement des opérations de maintenance sur le serveur, il est indisponible durant %d minutes.<br /><br />Pour plus d'information sur les corrections et nouveautés apportés, nous vous conseillons de lire l'<a href="%s" class="lien">annonce officielle de cette maintenance sur le forum du jeu</a>.]]></var>
+    <var name="mdl_fermerServeur_texte2"><![CDATA[Nous effectuons actuellement des opérations de maintenance sur le serveur, il est indisponible durant %d minutes.<br /><br />Pour plus d'information sur les corrections et nouveautés apportés, nous vous conseillons de lire la <a href="%s" class="lien">HB Weekly Update sur le forum du jeu</a>.]]></var>
+    <var name="mdl_fermerServeur_texte3"><![CDATA[Nous effectuons actuellement des opérations de maintenance sur le serveur, il est indisponible durant %d minutes.<br /><br />Pour plus d'information sur les corrections et nouveautés apportés, nous vous conseillons de lire le <a href="http://www.halo-battle.fr/tester/changelog_page.php" class="lien">ChangeLog de Mantis</a>.]]></var>
+    <var name="mdl_fermerServeur_thanks">Merci de votre compréhension</var>
+    
+    <!-- game/serveur -->
+    <var name="badNomMdp">Nom d'utilisateur ou mot de passe incorrect.</var>
+    <var name="badAuthConnect">Impossible d'authentifier la connexion !</var>
+    <var name="servSature">Il y a actuellement trop de monde connecté sur Halo-Battle. Pour permettre aux joueurs une navigation convenable, nous vous remercions de revenir plus tard.</var>
+    <var name="badPlanete">Impossible de trouver votre planète !</var>
+    
+    <var name="banInf">Vous êtes définitivement banni de cette galaxie pour %s. Vous ne pouvez plus vous reconnecter sur votre compte.</var>
+    <var name="banVac">Un opérateur a placé votre compte en mode vacances pour %s. Vous ne pouvez pas vous reconnecter sur votre compte avant le %s.</var>
+    <var name="modVac"><![CDATA[Vous ne pouvez pas sortir du mode vacances avant le<br />%s.]]></var>
+
+    <!--
+        NOM & DESCRIPTIONS
+    -->
+    <var name="humain">
+        <var name="ressources">
+            <var name="noms">
+                <var name="metal">métal</var>
+                <var name="cristal">cristal</var>
+                <var name="hydrogene">hydrogène</var>
+                <var name="energie">énergie</var>
+                <var name="credits">crédits</var>
+                <var name="0">métal</var>
+                <var name="1">cristal</var>
+                <var name="2">hydrogène</var>
+                <var name="3">énergie</var>
+                <var name="4">crédits</var>
+            </var>
+        </var>
+        <var name="caserne">
+            <var name="noms_sing">
+                <var name="0">marine</var>
+                <var name="1">fusiller</var>
+                <var name="2">grenadier</var>
+                <var name="3">T.C.A.O.</var>
+                <var name="4">sniper</var>
+                <var name="5">spartan</var>
+                <var name="6">médecin</var>
+                <var name="7">ingénieur</var>
+                <var name="8">soldat exo squelette</var>
+            </var>
+            <var name="noms_pluriel">
+                <var name="0">marines</var>
+                <var name="1">fusillers</var>
+                <var name="2">grenadiers</var>
+                <var name="3">T.C.A.O.</var>
+                <var name="4">snipers</var>
+                <var name="5">spartans</var>
+                <var name="6">médecins</var>
+                <var name="7">ingénieurs</var>
+                <var name="8">soldats exo squelette</var>
+            </var>
+            <var name="descriptions">
+                <var name="0">Les marines constituent l'infanterie de base de vos forces militaires. De faible puissance et de résistance plutôt médiocre, ils rivalisent avec les unités covenants standard. Ils sont équipés d'une armure de kevlar renforcée et d'un SMG.</var>
+                <var name="1">Les fusillers sont équipés de fusils d'assaut avec zoom intégré. Plus puissants que les marines standards, ils peuvent rivaliser avec des escouades entières de grunts dirigées par des élites hauts gradés.</var>
+                <var name="2">Les grenadiers sont les spécialistes en explosifs du CSNU sur le terrain. Ils peuvent détruire les véhicules légers grâce à leurs grenades et leurs lances missiles.</var>
+                <var name="3">Les TCAO sont des soldats d'assauts largués depuis l'espace directement sur les champs de batailles grâce à des modules spéciaux. Ces soldats sont surentraînés et très chevronnés, risquant leur vie à chaque instant en raison des sauts orbitaux qui font atteindre une chaleur extrême dans le module.</var>
+                <var name="4">Les snipers sont dotés de fusils de précision SA 2M capables de descendre des covenants à plusieurs centaines de mètres grâce à leur zoom maximum de 10x. Très efficasse à longue portée, ils deviennent inutiles au corps à corps.</var>
+                <var name="5">Les spartans sont les unités d'infanterie militaires les plus évoluées militairement du CSNU mais également des Covenants. Ils sont équipés d'une armure de type Mjolnir améliorant leurs capacités de combat, déjà exceptionnelles grâce à leur entraînement militaire depuis leur plus jeune âge, ainsi qu'à leurs implants cybernétiques, les rendants d'une grande efficacité inégalée au sein de l'infanterie.</var>
+                <var name="6">Les médecins sont sur le champ de bataille pour aider les soldats blessés par des tirs lors des affrontements. Ils peuvent réduire le nombre de morts lorsqu'ils sont bien utilisés et ainsi peut être changer l'issue de la bataille.</var>
+                <var name="7">Les ingénieurs sont là pour réparer vos véhicules endommagés lors des affrontements. Ils peuvent réduire le nombre de vos pertes de véhicules lorsqu'ils sont bien utilisés.</var>
+                <var name="8">Les soldats exo squelettiques possèdent des armures de combat très résistantes et d'une puissance énorme mais contre balancée par une faible autonomie d'énergie, une mobilité faible et d'une discrétion auditive aussi silencieuse qu'un char d'assaut dans un champs de mines lotus.</var>
+            </var>
+        </var>
+        <var name="batiments">
+            <var name="noms_sing">
+                <var name="0">usine de métallurgie</var>
+                <var name="1">usine de cristal</var>
+                <var name="2">synchronisateur d'hydrogène</var>
+                <var name="3">centrale solaire</var>
+                <var name="4">centrale énergétique</var>
+                <var name="5">base radar</var>
+                <var name="6">centre de recherches</var>
+                <var name="7">chantier terrestre</var>
+                <var name="8">chantier spatial</var>
+                <var name="9">école militaire</var>
+                <var name="10">silo de stockage</var>
+                <var name="11">centrale informatique</var>
+                <var name="12">module résidentiel</var>
+                <var name="13">arcologies</var>
+                <var name="14">bunker</var>
+                <var name="15">centre commercial</var>
+                <var name="16">centre loisir</var>
+                <var name="17">centre administratif</var>
+            </var>
+            <var name="descriptions">
+                <var name="0">Cette usine traite tous les métaux recueillis afin de produire du titanium-A ou différents types d'alliages de qualité pour vos différentes constructions planétaires ou spatiales. Chaque niveau augmente la production de métal.</var>
+                <var name="1">L'usine de cristal filtre les déchets récoltés avec les cristaux. Une fois séparés du reste ils sont classés par qualité par une quantité d'appareils de haute technologie. Plus les cristaux sont purs plus ceux-ci peuvent être transformés en unités de stockage de données ou en conducteurs énergétiques de haute qualité. Plus ce bâtiment sera développé, plus vous pourrez traiter de cristaux rapidement.</var>
+                <var name="2">Ce bâtiment use de l'eau pour la décomposer et en extraire l'hydrogène, la base de toutes vos productions énergétiques, pour ensuite l'acheminer dans des condensateurs ioniques afin de le rendre plus dense et par le fait même plus efficace. Chaque niveau augmente la production du synchronisateur.</var>
+                <var name="3">La centrale solaire produit l'énergie nécessaire au fonctionnement de vos usines. Elle fonctionne à partir d'une technologie Forruner qui consiste à envoyer un rayon à la verticale pour capter tous les rayons du soleil qui le croise.</var>
+                <var name="4">La centrale énergétique fonctionne avec un principe assez dépassé. En effet, l'énergie est produite par un réacteur à fusion qui en tournant produit de l'énergie comme le ferait une dynamo. Bien que ce principe fût révolutionnaire à l'époque, il fût rapidement dépassé par la centrale solaire qui permet de produire d'avantage d'énergie.</var>
+                <var name="5">Le centre de communication est un gigantesque relai de transmission envoyant des ondes entre les différents mondes connus et répertoriés de l'univers. Grâce à lui, vous pourrez communiquer avec d'autres administrateurs coloniaux afin de planifier ensemble des programmes d'actions communs. Equipé d'un radar, il vous permet de repérer les mouvements des flottes ennemies.</var>
+                <var name="6">Le centre de recherches est certainement l'une des bâtisses les plus importantes que vous puissiez construire dans votre colonie. Vos chercheurs travailleront sans relâche aucun afin de mettre au point de nouvelles technologies vous assurant suprématie et victoire sur les champs de bataille. Chaque niveau dévellopé augmente la vitesse de recherche de vos technologies.</var>
+                <var name="7">Le chantier terrestre vous permet de construire tous les véhicules atmosphérique du type warthog ou scorpion. Il permet ainsi à vos troupes d'accéder plus rapidement à un endroit et d'avoir un avantage avec l'armement de ces véhicules.</var>
+                <var name="8">Le chantier spatial permet de construire vôtre flotte de vaisseaux spatiaux. Généralement à la limite de l'atmosphère d'une planète il ne peut cependant se déplacer et doit impérativement rester en orbite. Le chantier spatial, bien que ressemblant à une station spatial, ne peut être détruit grâce à sa position qui lui confère un camouflage total.</var>
+                <var name="9">L'académie militaire forme les meilleurs officiers et sous-officiers de la galaxie. Ces hommes expérimentés vous aideront à choisir de meilleures stratégies défensives ou offensives ou encore même économiques face aux différentes situations qui vous seront imposées. Plus vous augmenterez le niveau de cette structure plus vos officiers seront rapides et efficaces dans leurs tâches.</var>
+                <var name="10">Comme toutes choses, vos ressources ont besoin d'espace pour être stockées ; c'est pourquoi ces énormes silos vous seront d'une aide précieuse afin d'y renfermer une grande quantité de matières premières pour toutes vos productions. Plus le niveau du silo est haut, plus il pourra contenir de ressources supplémentaires.</var>
+                <var name="11">La centrale informatique est le coeur de votre planète, le cerveau de votre territoire, analysant chaque particule détectée avec grand soin. Plus votre centrale est améliorée, plus rapidement et aisément les données seront traitées.</var>
+                <var name="12">~#DESCRIPTION MANQUANTE#~ Habitation</var>
+                <var name="13">~#DESCRIPTION MANQUANTE#~ Arcologies</var>
+                <var name="14">~#DESCRIPTION MANQUANTE#~ Bunker</var>
+                <var name="15">~#DESCRIPTION MANQUANTE#~ Centre commercial</var>
+                <var name="16">~#DESCRIPTION MANQUANTE#~ Centre de loisirs</var>
+                <var name="17">~#DESCRIPTION MANQUANTE#~ Centre administratif</var>
+            </var>
+        </var>
+        <var name="technologies">
+            <var name="noms_sing">
+                <var name="0">
+                    <var name="0">Forage niveau 1</var>
+                    <var name="1">Forage niveau 2</var>
+                    <var name="2">Forage niveau 3</var>
+                    <var name="3">Commerce galactique</var>
+                    <var name="4">Rendement métal niveau 1</var>
+                    <var name="5">Rendement métal niveau 2</var>
+                    <var name="6">Rendement métal niveau 3</var>
+                    <var name="7">Rendement cristal niveau 1</var>
+                    <var name="8">Rendement cristal niveau 2</var>
+                    <var name="9">Rendement cristal niveau 3</var>
+                    <var name="10">Rendement hydrogène niveau 1</var>
+                    <var name="11">Rendement hydrogène niveau 2</var>
+                    <var name="12">Rendement hydrogène niveau 3</var>
+                    <var name="13">Théorie du Marché niveau 1</var>
+                    <var name="14">Théorie du Marché niveau 2</var>
+                    <var name="15">Théorie du Marché niveau 3</var>
+                    <var name="16">Fonderies avancées niveau 1</var>
+                    <var name="17">Fonderies avancées niveau 2</var>
+                    <var name="18">Fonderies avancées niveau 3</var>
+                </var>
+                <var name="1">
+                    <var name="0">Maîtrise énergie niveau 1</var>
+                    <var name="1">Maîtrise énergie niveau 2</var>
+                    <var name="2">Maîtrise énergie niveau 3</var>
+                    <var name="3">Réacteur à combustion niveau 1</var>
+                    <var name="4">Réacteur à combustion niveau 2</var>
+                    <var name="5">Réacteur à combustion niveau 3</var>
+                    <var name="6">Réacteur à fusion niveau 1</var>
+                    <var name="7">Réacteur à fusion niveau 2</var>
+                    <var name="8">Réacteur à fusion niveau 3</var>
+                    <var name="9">Moteur subluminique niveau 1</var>
+                    <var name="10">Moteur subluminique niveau 2</var>
+                    <var name="11">Moteur subluminique niveau 3</var>
+                    <var name="12">Informatique niveau 1</var>
+                    <var name="13">Informatique niveau 2</var>
+                    <var name="14">Informatique niveau 3</var>
+                    <var name="15">IA niveau 1</var>
+                    <var name="16">IA niveau 2</var>
+                    <var name="17">IA niveau 3</var>
+                    <var name="18">Télécommunications niveau 1</var>
+                    <var name="19">Télécommunications niveau 2</var>
+                    <var name="20">Télécommunications niveau 3</var>
+                    <var name="21">Polymères radars niveau 1</var>
+                    <var name="22">Polymères radars niveau 2</var>
+                    <var name="23">Polymères radars niveau 3</var>
+                    <var name="24">Espionnage niveau 1</var>
+                    <var name="25">Espionnage niveau 2</var>
+                    <var name="26">Espionnage niveau 3</var>
+                    <var name="27">Contre-espionnage niveau 1</var>
+                    <var name="28">Contre-espionnage niveau 2</var>
+                    <var name="29">Contre-espionnage niveau 3</var>
+                </var>
+                <var name="2">
+                    <var name="0">Constructions planétaires niveau 1</var>
+                    <var name="1">Constructions planétaires niveau 2</var>
+                    <var name="2">Constructions planétaires niveau 3</var>
+                    <var name="3">Construction optimisée</var>
+                    <var name="4">Ingénierie orbitale</var>
+                    <var name="5">Aménagement territorial niveau 1</var>
+                    <var name="6">Aménagement territorial niveau 2</var>
+                    <var name="7">Aménagement territorial niveau 3</var>
+                </var>
+                <var name="3">
+                    <var name="0">Immigration coloniale niveau 1</var>
+                    <var name="1">Immigration coloniale niveau 2</var>
+                    <var name="2">Immigration coloniale niveau 3</var>
+                    <var name="3">Urbanisme niveau 1</var>
+                    <var name="4">Urbanisme niveau 2</var>
+                    <var name="5">Urbanisme niveau 3</var>
+                    <var name="6">Grandes surfaces</var>
+                    <var name="7">Centre de loisirs</var>
+                    <var name="8">Arcologie</var>
+                    <var name="9">Sciences politiques niveau 1</var>
+                    <var name="10">Sciences politiques niveau 2</var>
+                    <var name="11">Sciences politiques niveau 3</var>
+                    <var name="12">Stratégie militaire niveau 1</var>
+                    <var name="13">Stratégie militaire niveau 2</var>
+                    <var name="14">Stratégie militaire niveau 3</var>
+                </var>
+                <var name="4">
+                    <var name="0">Projectile Haut Densité niveau 1</var>
+                    <var name="1">Projectile Haut Densité niveau 2</var>
+                    <var name="2">Projectile Haut Densité niveau 3</var>
+                    <var name="3">Assistance de visée niveau 1</var>
+                    <var name="4">Assistance de visée niveau 2</var>
+                    <var name="5">Assistance de visée niveau 3</var>
+                    <var name="6">Guidage laser niveau 1</var>
+                    <var name="7">Guidage laser niveau 2</var>
+                    <var name="8">Guidage laser niveau 3</var>
+                    <var name="9">Condensateurs rapides niveau 1</var>
+                    <var name="10">Condensateurs rapides niveau 2</var>
+                    <var name="11">Condensateurs rapides niveau 3</var>
+                    <var name="12">Balistique avancée niveau 1</var>
+                    <var name="13">Balistique avancée niveau 2</var>
+                    <var name="14">Balistique avancée niveau 3</var>
+                    <var name="15">Accélération magnétique niveau 1</var>
+                    <var name="16">Accélération magnétique niveau 2</var>
+                    <var name="17">Accélération magnétique niveau 3</var>
+                </var>
+                <var name="5">
+                    <var name="0">Robotique niveau 1</var>
+                    <var name="1">Robotique niveau 2</var>
+                    <var name="2">Robotique niveau 3</var>
+                    <var name="3">Ingénierie atomique niveau 1</var>
+                    <var name="4">Ingénierie atomique niveau 2</var>
+                    <var name="5">Ingénierie atomique niveau 3</var>
+                    <var name="6">Nano-régénération niveau </var>
+                    <var name="7">Nano-régénération niveau 2</var>
+                    <var name="8">Nano-régénération niveau 3</var>
+                    <var name="9">Squelette renforcé niveau 1</var>
+                    <var name="10">Squelette renforcé niveau 2</var>
+                    <var name="11">Squelette renforcé niveau 3</var>
+                    <var name="12">Armatures enrichies niveau 1</var>
+                    <var name="13">Armatures enrichies niveau 2</var>
+                    <var name="14">Armatures enrichies niveau 3</var>
+                    <var name="15">Composés avancés niveau 1</var>
+                    <var name="16">Composés avancés niveau 2</var>
+                    <var name="17">Composés avancés niveau 3</var>
+                    <var name="18">Alliage niveau 1</var>
+                    <var name="19">Alliage niveau 2</var>
+                    <var name="20">Alliage niveau 3</var>
+                    <var name="21">Alliage avancé niveau 1</var>
+                    <var name="22">Alliage avancé niveau 2</var>
+                    <var name="23">Alliage avancé niveau 3</var>
+                    <var name="24">Armure moléculaire niveau 1</var>
+                    <var name="25">Armure moléculaire niveau 2</var>
+                    <var name="26">Armure moléculaire niveau 3</var>
+                </var>
+                <var name="6">
+                    <var name="0">Tourelle légère M202 XP</var>
+                    <var name="1">Canon de défense automatique</var>
+                    <var name="2">Artillerie lourde de 440mm</var>
+                    <var name="3">Lance-missiles Archer</var>
+                    <var name="4">Batterie de missiles Anaconda</var>
+                    <var name="5">Silo de missiles Shiva</var>
+                    <var name="6">Canon à accélération magnétique</var>
+                </var>
+                <var name="7">
+                    <var name="0">Prototype Intercepteur Longsword</var>
+                    <var name="1">Prototype Bombardier Longsword</var>
+                    <var name="2">Corvette de classe Mako</var>
+                    <var name="3">Prototype de Frégate</var>
+                    <var name="4">Récupération</var>
+                    <var name="5">Prototype de Destroyer</var>
+                    <var name="6">Prototype de Croiseur de classe Halcyon</var>
+                    <var name="7">Prototype de Croiseur de classe Marathon</var>
+                    <var name="8">Prototype de Porte-vaisseaux</var>
+                    <var name="9">Prototype de Super Porte-Vaisseaux</var>
+                    <var name="10">Prototype de Vaisseau d'exfiltration de classe Black Cat</var>
+                    <var name="11">Prototype de Super canon à accélération magnétique</var>
+                    <var name="12">Bunker souterrain</var>
+                    <var name="13">Bunker souterrain</var>
+                    <var name="14">Bunker souterrain</var>
+                </var>
+                <var name="8">
+                    <var name="0">Expansion niveau 1</var>
+                    <var name="1">Expansion niveau 2</var>
+                    <var name="2">Expansion niveau 3</var>
+                    <var name="3">Expansion niveau 4</var>
+                    <var name="4">Expansion niveau 5</var>
+                    <var name="5">Expansion niveau 6</var>
+                    <var name="6">Expansion niveau 7</var>
+                    <var name="7">Expansion niveau 8</var>
+                    <var name="8">Expansion niveau 9</var>
+                    <var name="9">Expansion niveau 10</var>
+                    <var name="10">Expansion niveau 11</var>
+                    <var name="11">Expansion niveau 12</var>
+                    <var name="12">Expansion niveau 13</var>
+                    <var name="13">Expansion niveau 14</var>
+                    <var name="14">Expansion niveau 15</var>
+                    <var name="15">Expansion niveau 16</var>
+                    <var name="16">Expansion niveau 17</var>
+                    <var name="17">Expansion niveau 18</var>
+                </var>
+            </var>
+            <var name="descriptions">
+                <var name="0">
+                    <var name="0">~#DESCRIPTION MANQUANTE#~ Forage niveau 1</var>
+                    <var name="1">~#DESCRIPTION MANQUANTE#~ Forage niveau 2</var>
+                    <var name="2">~#DESCRIPTION MANQUANTE#~ Forage niveau 3</var>
+                    <var name="3">~#DESCRIPTION MANQUANTE#~ Commerce galactique</var>
+                    <var name="4">~#DESCRIPTION MANQUANTE#~ Rendement métal niveau 1</var>
+                    <var name="5">~#DESCRIPTION MANQUANTE#~ Rendement métal niveau 2</var>
+                    <var name="6">~#DESCRIPTION MANQUANTE#~ Rendement métal niveau 3</var>
+                    <var name="7">~#DESCRIPTION MANQUANTE#~ Rendement cristal niveau 1</var>
+                    <var name="8">~#DESCRIPTION MANQUANTE#~ Rendement cristal niveau 2</var>
+                    <var name="9">~#DESCRIPTION MANQUANTE#~ Rendement cristal niveau 3</var>
+                    <var name="10">~#DESCRIPTION MANQUANTE#~ Rendement hydrogène niveau 1</var>
+                    <var name="11">~#DESCRIPTION MANQUANTE#~ Rendement hydrogène niveau 2</var>
+                    <var name="12">~#DESCRIPTION MANQUANTE#~ Rendement hydrogène niveau 3</var>
+                    <var name="13">~#DESCRIPTION MANQUANTE#~ Théorie du Marché niveau 1</var>
+                    <var name="14">~#DESCRIPTION MANQUANTE#~ Théorie du Marché niveau 2</var>
+                    <var name="15">~#DESCRIPTION MANQUANTE#~ Théorie du Marché niveau 3</var>
+                    <var name="16">~#DESCRIPTION MANQUANTE#~ Fonderies avancées niveau 1</var>
+                    <var name="17">~#DESCRIPTION MANQUANTE#~ Fonderies avancées niveau 2</var>
+                    <var name="18">~#DESCRIPTION MANQUANTE#~ Fonderies avancées niveau 3</var>
+                </var>
+                <var name="1">
+                    <var name="0">~#DESCRIPTION MANQUANTE#~ Maîtrise énergie niveau 1</var>
+                    <var name="1">~#DESCRIPTION MANQUANTE#~ Maîtrise énergie niveau 2</var>
+                    <var name="2">~#DESCRIPTION MANQUANTE#~ Maîtrise énergie niveau 3</var>
+                    <var name="3">~#DESCRIPTION MANQUANTE#~ Réacteur à combustion niveau 1</var>
+                    <var name="4">~#DESCRIPTION MANQUANTE#~ Réacteur à combustion niveau 2</var>
+                    <var name="5">~#DESCRIPTION MANQUANTE#~ Réacteur à combustion niveau 3</var>
+                    <var name="6">~#DESCRIPTION MANQUANTE#~ Réacteur à fusion niveau 1</var>
+                    <var name="7">~#DESCRIPTION MANQUANTE#~ Réacteur à fusion niveau 2</var>
+                    <var name="8">~#DESCRIPTION MANQUANTE#~ Réacteur à fusion niveau 3</var>
+                    <var name="9">~#DESCRIPTION MANQUANTE#~ Moteur subluminique niveau 1</var>
+                    <var name="10">~#DESCRIPTION MANQUANTE#~ Moteur subluminique niveau 2</var>
+                    <var name="11">~#DESCRIPTION MANQUANTE#~ Moteur subluminique niveau 3</var>
+                    <var name="12">~#DESCRIPTION MANQUANTE#~ Informatique niveau 1</var>
+                    <var name="13">~#DESCRIPTION MANQUANTE#~ Informatique niveau 2</var>
+                    <var name="14">~#DESCRIPTION MANQUANTE#~ Informatique niveau 3</var>
+                    <var name="15">~#DESCRIPTION MANQUANTE#~ IA niveau 1</var>
+                    <var name="16">~#DESCRIPTION MANQUANTE#~ IA niveau 2</var>
+                    <var name="17">~#DESCRIPTION MANQUANTE#~ IA niveau 3</var>
+                    <var name="18">~#DESCRIPTION MANQUANTE#~ Télécommunications niveau 1</var>
+                    <var name="19">~#DESCRIPTION MANQUANTE#~ Télécommunications niveau 2</var>
+                    <var name="20">~#DESCRIPTION MANQUANTE#~ Télécommunications niveau 3</var>
+                    <var name="21">~#DESCRIPTION MANQUANTE#~ Polymères radars niveau 1</var>
+                    <var name="22">~#DESCRIPTION MANQUANTE#~ Polymères radars niveau 2</var>
+                    <var name="23">~#DESCRIPTION MANQUANTE#~ Polymères radars niveau 3</var>
+                    <var name="24">~#DESCRIPTION MANQUANTE#~ Espionnage niveau 1</var>
+                    <var name="25">~#DESCRIPTION MANQUANTE#~ Espionnage niveau 2</var>
+                    <var name="26">~#DESCRIPTION MANQUANTE#~ Espionnage niveau 3</var>
+                    <var name="27">~#DESCRIPTION MANQUANTE#~ Contre-espionnage niveau 1</var>
+                    <var name="28">~#DESCRIPTION MANQUANTE#~ Contre-espionnage niveau 2</var>
+                    <var name="29">~#DESCRIPTION MANQUANTE#~ Contre-espionnage niveau 3</var>
+                </var>
+                <var name="2">
+                    <var name="0">~#DESCRIPTION MANQUANTE#~ Constructions planétaires niveau 1</var>
+                    <var name="1">~#DESCRIPTION MANQUANTE#~ Constructions planétaires niveau 2</var>
+                    <var name="2">~#DESCRIPTION MANQUANTE#~ Constructions planétaires niveau 3</var>
+                    <var name="3">~#DESCRIPTION MANQUANTE#~ Construction optimisée</var>
+                    <var name="4">~#DESCRIPTION MANQUANTE#~ Ingénierie orbitale</var>
+                    <var name="5">~#DESCRIPTION MANQUANTE#~ Aménagement territorial niveau 1</var>
+                    <var name="6">~#DESCRIPTION MANQUANTE#~ Aménagement territorial niveau 2</var>
+                    <var name="7">~#DESCRIPTION MANQUANTE#~ Aménagement territorial niveau 3</var>
+                </var>
+                <var name="3">
+                    <var name="0">~#DESCRIPTION MANQUANTE#~ Immigration coloniale niveau 1</var>
+                    <var name="1">~#DESCRIPTION MANQUANTE#~ Immigration coloniale niveau 2</var>
+                    <var name="2">~#DESCRIPTION MANQUANTE#~ Immigration coloniale niveau 3</var>
+                    <var name="3">~#DESCRIPTION MANQUANTE#~ Urbanisme niveau 1</var>
+                    <var name="4">~#DESCRIPTION MANQUANTE#~ Urbanisme niveau 2</var>
+                    <var name="5">~#DESCRIPTION MANQUANTE#~ Urbanisme niveau 3</var>
+                    <var name="6">~#DESCRIPTION MANQUANTE#~ Grandes surfaces</var>
+                    <var name="7">~#DESCRIPTION MANQUANTE#~ Centre de loisirs</var>
+                    <var name="8">~#DESCRIPTION MANQUANTE#~ Arcologie</var>
+                    <var name="9">~#DESCRIPTION MANQUANTE#~ Sciences politiques niveau 1</var>
+                    <var name="10">~#DESCRIPTION MANQUANTE#~ Sciences politiques niveau 2</var>
+                    <var name="11">~#DESCRIPTION MANQUANTE#~ Sciences politiques niveau 3</var>
+                    <var name="12">~#DESCRIPTION MANQUANTE#~ Stratégie militaire niveau 1</var>
+                    <var name="13">~#DESCRIPTION MANQUANTE#~ Stratégie militaire niveau 2</var>
+                    <var name="14">~#DESCRIPTION MANQUANTE#~ Stratégie militaire niveau 3</var>
+                </var>
+                <var name="4">
+                    <var name="0">~#DESCRIPTION MANQUANTE#~ Projectile Haut Densité niveau 1</var>
+                    <var name="1">~#DESCRIPTION MANQUANTE#~ Projectile Haut Densité niveau 2</var>
+                    <var name="2">~#DESCRIPTION MANQUANTE#~ Projectile Haut Densité niveau 3</var>
+                    <var name="3">~#DESCRIPTION MANQUANTE#~ Assistance de visée niveau 1</var>
+                    <var name="4">~#DESCRIPTION MANQUANTE#~ Assistance de visée niveau 2</var>
+                    <var name="5">~#DESCRIPTION MANQUANTE#~ Assistance de visée niveau 3</var>
+                    <var name="6">~#DESCRIPTION MANQUANTE#~ Guidage laser niveau 1</var>
+                    <var name="7">~#DESCRIPTION MANQUANTE#~ Guidage laser niveau 2</var>
+                    <var name="8">~#DESCRIPTION MANQUANTE#~ Guidage laser niveau 3</var>
+                    <var name="9">~#DESCRIPTION MANQUANTE#~ Condensateurs rapides niveau 1</var>
+                    <var name="10">~#DESCRIPTION MANQUANTE#~ Condensateurs rapides niveau 2</var>
+                    <var name="11">~#DESCRIPTION MANQUANTE#~ Condensateurs rapides niveau 3</var>
+                    <var name="12">~#DESCRIPTION MANQUANTE#~ Balistique avancée niveau 1</var>
+                    <var name="13">~#DESCRIPTION MANQUANTE#~ Balistique avancée niveau 2</var>
+                    <var name="14">~#DESCRIPTION MANQUANTE#~ Balistique avancée niveau 3</var>
+                    <var name="15">~#DESCRIPTION MANQUANTE#~ Accélération magnétique niveau 1</var>
+                    <var name="16">~#DESCRIPTION MANQUANTE#~ Accélération magnétique niveau 2</var>
+                    <var name="17">~#DESCRIPTION MANQUANTE#~ Accélération magnétique niveau 3</var>
+                </var>
+            
+                <var name="5">
+                    <var name="0">~#DESCRIPTION MANQUANTE#~ Robotique niveau 1</var>
+                    <var name="1">~#DESCRIPTION MANQUANTE#~ Robotique niveau 2</var>
+                    <var name="2">~#DESCRIPTION MANQUANTE#~ Robotique niveau 3</var>
+                    <var name="3">~#DESCRIPTION MANQUANTE#~ Ingénierie atomique niveau 1</var>
+                    <var name="4">~#DESCRIPTION MANQUANTE#~ Ingénierie atomique niveau 2</var>
+                    <var name="5">~#DESCRIPTION MANQUANTE#~ Ingénierie atomique niveau 3</var>
+                    <var name="6">~#DESCRIPTION MANQUANTE#~ Nano-régénération niveau </var>
+                    <var name="7">~#DESCRIPTION MANQUANTE#~ Nano-régénération niveau 2</var>
+                    <var name="8">~#DESCRIPTION MANQUANTE#~ Nano-régénération niveau 3</var>
+                    <var name="9">~#DESCRIPTION MANQUANTE#~ Squelette renforcé niveau 1</var>
+                    <var name="10">~#DESCRIPTION MANQUANTE#~ Squelette renforcé niveau 2</var>
+                    <var name="11">~#DESCRIPTION MANQUANTE#~ Squelette renforcé niveau 3</var>
+                    <var name="12">~#DESCRIPTION MANQUANTE#~ Armatures enrichies niveau 1</var>
+                    <var name="13">~#DESCRIPTION MANQUANTE#~ Armatures enrichies niveau 2</var>
+                    <var name="14">~#DESCRIPTION MANQUANTE#~ Armatures enrichies niveau 3</var>
+                    <var name="15">~#DESCRIPTION MANQUANTE#~ Composés avancés niveau 1</var>
+                    <var name="16">~#DESCRIPTION MANQUANTE#~ Composés avancés niveau 2</var>
+                    <var name="17">~#DESCRIPTION MANQUANTE#~ Composés avancés niveau 3</var>
+                    <var name="18">~#DESCRIPTION MANQUANTE#~ Alliage niveau 1</var>
+                    <var name="19">~#DESCRIPTION MANQUANTE#~ Alliage niveau 2</var>
+                    <var name="20">~#DESCRIPTION MANQUANTE#~ Alliage niveau 3</var>
+                    <var name="21">~#DESCRIPTION MANQUANTE#~ Alliage avancé niveau 1</var>
+                    <var name="22">~#DESCRIPTION MANQUANTE#~ Alliage avancé niveau 2</var>
+                    <var name="23">~#DESCRIPTION MANQUANTE#~ Alliage avancé niveau 3</var>
+                    <var name="24">~#DESCRIPTION MANQUANTE#~ Armure moléculaire niveau 1</var>
+                    <var name="25">~#DESCRIPTION MANQUANTE#~ Armure moléculaire niveau 2</var>
+                    <var name="26">~#DESCRIPTION MANQUANTE#~ Armure moléculaire niveau 3</var>
+                </var>
+                <var name="6">
+                    <var name="0">~#DESCRIPTION MANQUANTE#~ Tourelle légère M202 XP</var>
+                    <var name="1">~#DESCRIPTION MANQUANTE#~ Canon de défense automatique</var>
+                    <var name="2">~#DESCRIPTION MANQUANTE#~ Artillerie lourde de 440mm</var>
+                    <var name="3">~#DESCRIPTION MANQUANTE#~ Lance-missiles Archer</var>
+                    <var name="4">~#DESCRIPTION MANQUANTE#~ Batterie de missiles Anaconda</var>
+                    <var name="5">~#DESCRIPTION MANQUANTE#~ Silo de missiles Shiva</var>
+                    <var name="6">~#DESCRIPTION MANQUANTE#~ Canon à accélération magnétique</var>
+                </var>
+                <var name="7">
+                    <var name="0">~#DESCRIPTION MANQUANTE#~ Prototype Intercepteur Longsword</var>
+                    <var name="1">~#DESCRIPTION MANQUANTE#~ Prototype Bombardier Longsword</var>
+                    <var name="2">~#DESCRIPTION MANQUANTE#~ Corvette de classe Mako</var>
+                    <var name="3">~#DESCRIPTION MANQUANTE#~ Prototype de Frégate</var>
+                    <var name="4">~#DESCRIPTION MANQUANTE#~ Récupération</var>
+                    <var name="5">~#DESCRIPTION MANQUANTE#~ Prototype de Destroyer</var>
+                    <var name="6">~#DESCRIPTION MANQUANTE#~ Prototype de Croiseur de classe Halcyon</var>
+                    <var name="7">~#DESCRIPTION MANQUANTE#~ Prototype de Croiseur de classe Marathon</var>
+                    <var name="8">~#DESCRIPTION MANQUANTE#~ Prototype de Porte-vaisseaux</var>
+                    <var name="9">~#DESCRIPTION MANQUANTE#~ Prototype de Super Porte-Vaisseaux</var>
+                    <var name="10">~#DESCRIPTION MANQUANTE#~ Prototype de Vaisseau d'exfiltration de classe Black Cat</var>
+                    <var name="11">~#DESCRIPTION MANQUANTE#~ Prototype de Super canon à accélération magnétique</var>
+                    <var name="12">~#DESCRIPTION MANQUANTE#~ Bunker souterrain</var>
+                    <var name="13">~#DESCRIPTION MANQUANTE#~ Bunker souterrain</var>
+                    <var name="14">~#DESCRIPTION MANQUANTE#~ Bunker souterrain</var>
+                </var>
+                <var name="8">
+                    <var name="0">~#DESCRIPTION MANQUANTE#~ Expansion niveau 1</var>
+                    <var name="1">~#DESCRIPTION MANQUANTE#~ Expansion niveau 2</var>
+                    <var name="2">~#DESCRIPTION MANQUANTE#~ Expansion niveau 3</var>
+                    <var name="3">~#DESCRIPTION MANQUANTE#~ Expansion niveau 4</var>
+                    <var name="4">~#DESCRIPTION MANQUANTE#~ Expansion niveau 5</var>
+                    <var name="5">~#DESCRIPTION MANQUANTE#~ Expansion niveau 6</var>
+                    <var name="6">~#DESCRIPTION MANQUANTE#~ Expansion niveau 7</var>
+                    <var name="7">~#DESCRIPTION MANQUANTE#~ Expansion niveau 8</var>
+                    <var name="8">~#DESCRIPTION MANQUANTE#~ Expansion niveau 9</var>
+                    <var name="9">~#DESCRIPTION MANQUANTE#~ Expansion niveau 10</var>
+                    <var name="10">~#DESCRIPTION MANQUANTE#~ Expansion niveau 11</var>
+                    <var name="11">~#DESCRIPTION MANQUANTE#~ Expansion niveau 12</var>
+                    <var name="12">~#DESCRIPTION MANQUANTE#~ Expansion niveau 13</var>
+                    <var name="13">~#DESCRIPTION MANQUANTE#~ Expansion niveau 14</var>
+                    <var name="14">~#DESCRIPTION MANQUANTE#~ Expansion niveau 15</var>
+                    <var name="15">~#DESCRIPTION MANQUANTE#~ Expansion niveau 16</var>
+                    <var name="16">~#DESCRIPTION MANQUANTE#~ Expansion niveau 17</var>
+                    <var name="17">~#DESCRIPTION MANQUANTE#~ Expansion niveau 18</var>
+                </var>
+            </var>
+        </var>
+        <var name="terrestre">
+            <var name="noms_sing">
+                <var name="0">sparrowhawk</var>
+                <var name="1">077-TC Pelican</var>
+                <var name="2">C703 Shortsword Bomber</var>
+                <var name="3">SHD Albatros</var>
+                <var name="4">M12 LRV Warthogs</var>
+                <var name="5">M12G1 LAAV Warthogs</var>
+                <var name="6">M12A1 LAAV Warthogs</var>
+                <var name="7">M808B Scorpions MBT</var>
+                <var name="8">tourelle légère M202 XP</var>
+                <var name="9">lance-missiles Archer</var>
+                <var name="10">canon de défense automatique</var>
+                <var name="11">batterie de missiles Anaconda</var>
+                <var name="12">artillerie lourde de 440mm</var>
+                <var name="13">silo de missiles Shiva</var>
+                <var name="14">canon à accélération magnétique</var>
+                <var name="15">super canon à accélération magnétique</var>
+            </var>
+            <var name="noms_pluriel">
+                <var name="0">sparrowhawk</var>
+                <var name="1">077-TC Pelican</var>
+                <var name="2">C703 Shortsword Bomber</var>
+                <var name="3">SHD Albatros</var>
+                <var name="4">M12 LRV Warthogs</var>
+                <var name="5">M12G1 LAAV Warthogs</var>
+                <var name="6">M12A1 LAAV Warthogs</var>
+                <var name="7">M808B Scorpions MBT</var>
+                <var name="8">tourelles légères M202 XP</var>
+                <var name="9">lance-missiles Archer</var>
+                <var name="10">canons de défense automatique</var>
+                <var name="11">batteries de missiles Anaconda</var>
+                <var name="12">artilleries lourde de 440mm</var>
+                <var name="13">silos de missiles Shiva</var>
+                <var name="14">canons à accélération magnétique</var>
+                <var name="15">supers canons à accélération magnétique</var>
+            </var>
+            <var name="descriptions">
+                <var name="0">Véhicule à propulsion verticale permettant des attaques extrêmement rapides et destructrices grâce à ses six tubes lance-missiles, ses deux mitrailleuses légères, et sa mitrailleuse lourde frontale. Ces vaisseaux d'assaut rapide sont de véritables broyeurs de tôle grâce à leurs 6 tubes lance-missiles et sont capables de détruire des véhicules et des positions fortement blindées.</var>
+                <var name="1">Véhicule aérien de transport léger permettant le transport rapide de troupes à des endroits stratégiques tel un warthog ou un scorpion. Ils sont la base des renforts terrestres et permettent l'acheminement de troupes et de munitions rapidement.</var>
+                <var name="2">Vaisseau suborbital très rapide apte tant au combat aérien rapproché qu'au bombardement ciblé. Ces bombardiers ont un pointeur laser qui leur permet de viser au mieux les cibles ennemies, qu'elles soient au sol ou aériennes. Ils sont néanmoins capables de combattre en combat aérien rapproché grâce à leurs missiles thermo guidés et sont utilisés lors de bombardements de cibles mineures.</var>
+                <var name="3">Véhicule aérien de transport lourd permettant le transport en masse de troupes ou de véhicules tels que des warthogs ou bien une paire de scorpions vers des zones de largage. Ces véhicules de soutien aérien lourd sont surtout utilisés lors d'offensives nécessitant un déploiement en masse d'unités blindées et de munitions au plus près des lignes adverses.</var>
+                <var name="4">Véhicule d'attaque léger permettant des assauts rapides et efficaces, ainsi que le transport léger de troupes. Ces véhicules sont la base des véhicules terrestres du CSNU.</var>
+                <var name="5">Véhicule léger équipé d'un canon à accélération magnétique (CAM), très efficace contre du personnel, des véhicules moyennement blindés, ou bien contre des véhicules aériens légers. Les Warthog M12G1 sont très répandus et surtout utilisés lors d'offensives sur des cibles disposant d'un appui aérien ou terrestre léger.</var>
+                <var name="6">Véhicule léger, armé d'un lance-missiles anti-véhicule permettant des assauts rapides contre des véhicules blindés ou contre des positions fortifiées. Ils sont surtout utilisés en cas d'attaques de postes avancés.</var>
+                <var name="7">Tank blindé anti-véhicules. Permet l'attaque de cibles fortifiées grâce à ses balles perforantes de gros calibre. Ces tanks sont utilisés lors d'assauts massifs sur des bases fortifiées et vitales à l'ennemi.</var>
+                <var name="8">~#DESCRIPTION MANQUANTE#~ </var>
+                <var name="9">~#DESCRIPTION MANQUANTE#~ </var>
+                <var name="10">~#DESCRIPTION MANQUANTE#~ </var>
+                <var name="11">~#DESCRIPTION MANQUANTE#~ </var>
+                <var name="12">~#DESCRIPTION MANQUANTE#~ </var>
+                <var name="13">~#DESCRIPTION MANQUANTE#~ </var>
+                <var name="14">~#DESCRIPTION MANQUANTE#~ </var>
+                <var name="15">~#DESCRIPTION MANQUANTE#~ </var>
+            </var>
+        </var>
+        <var name="vaisseaux">
+            <var name="noms_sing">
+                <var name="0">cargo de classe Parabola</var>
+                <var name="1">cargo de classe Laden</var>
+                <var name="2">vaisseau de colonisation de classe Odyssey</var>
+                <var name="3">recycleur</var>
+                <var name="4">intercepteur Longsword</var>
+                <var name="5">bombardier Longsword</var>
+                <var name="6">corvette de classe Mako</var>
+                <var name="7">frégate</var>
+                <var name="8">destroyer</var>
+                <var name="9">croiseur de classe Halcyon</var>
+                <var name="10">croiseur de classe Marathon</var>
+                <var name="11">porte-vaisseaux</var>
+                <var name="12">super porte-Vaisseaux</var>
+                <var name="13">vaisseau d'exfiltration de classe Black Cat</var>
+            </var>
+            <var name="noms_pluriel">
+                <var name="0">cargos de classe Parabola</var>
+                <var name="1">cargos de classe Laden</var>
+                <var name="2">vaisseaux de colonisation de classe Odyssey</var>
+                <var name="3">recycleurs</var>
+                <var name="4">intercepteurs Longsword</var>
+                <var name="5">bombardiers Longsword</var>
+                <var name="6">corvettes de classe Mako</var>
+                <var name="7">frégates</var>
+                <var name="8">destroyer</var>
+                <var name="9">croiseurs de classe Halcyon</var>
+                <var name="10">croiseurs de classe Marathon</var>
+                <var name="11">porte-vaisseaux</var>
+                <var name="12">supers porte-Vaisseaux</var>
+                <var name="13">vaisseaux d'exfiltration de classe Black Cat</var>
+            </var>
+            <var name="descriptions">
+                <var name="0">Ces cargos de taille conséquente peuvent transporter assez de ressources et de nourriture pour nourrir une petite ville. Ils sont rapides, très manœuvrables mais peu résistants, ce qui est en fait des proies faciles pour les chasseurs ennemis.</var>
+                <var name="1">Ces cargos de taille massive permettent le transport d'une énorme quantité de ressources. Ils sont plus résistants que leurs homologues de classe Parabola, mais sont néanmoins les cibles prioritaires des chasseurs ennemis visant à faire le plus de pertes dans le camp adverse.</var>
+                <var name="2">~#DESCRIPTION MANQUANTE#~</var>
+                <var name="3">~#DESCRIPTION MANQUANTE#~</var>
+                <var name="4">~#DESCRIPTION MANQUANTE#~</var>
+                <var name="5">~#DESCRIPTION MANQUANTE#~</var>
+            
+                <var name="6">~#DESCRIPTION MANQUANTE#~</var>
+                <var name="7">~#DESCRIPTION MANQUANTE#~</var>
+                <var name="8">~#DESCRIPTION MANQUANTE#~</var>
+                <var name="9">~#DESCRIPTION MANQUANTE#~</var>
+                <var name="10">~#DESCRIPTION MANQUANTE#~</var>
+                <var name="11">~#DESCRIPTION MANQUANTE#~</var>
+            
+                <var name="12">~#DESCRIPTION MANQUANTE#~</var>
+                <var name="13">~#DESCRIPTION MANQUANTE#~</var>
+            </var>
+        </var>
+    </var>
+    <var name="covenant">
+        <var name="ressources">
+            <var name="noms">
+                <var name="metal">métal</var>
+                <var name="cristal">cristal</var>
+                <var name="hydrogene">ions</var>
+                <var name="energie">énergie</var>
+                <var name="credits">crédits</var>
+                <var name="0">métal</var>
+                <var name="1">cristal</var>
+                <var name="2">ions</var>
+                <var name="3">énergie</var>
+                <var name="4">crédits</var>
+            </var>
+        </var>
+        <var name="caserne">
+            <var name="noms_sing">
+                <var name="0">marine</var>
+                <var name="1">fusiller</var>
+                <var name="2">grenadier</var>
+                <var name="3">T.C.A.O.</var>
+                <var name="4">sniper</var>
+                <var name="5">spartan</var>
+                <var name="6">médecin</var>
+                <var name="7">ingénieur</var>
+                <var name="8">soldat exo squelette</var>
+            </var>
+            <var name="noms_pluriel">
+                <var name="0">marines</var>
+                <var name="1">fusillers</var>
+                <var name="2">grenadiers</var>
+                <var name="3">T.C.A.O.</var>
+                <var name="4">snipers</var>
+                <var name="5">spartans</var>
+                <var name="6">médecins</var>
+                <var name="7">ingénieurs</var>
+                <var name="8">soldats exo squelette</var>
+            </var>
+            <var name="descriptions">
+                <var name="0">Les marines constituent l'infanterie de base de vos forces militaires. De faible puissance et de résistance plutôt médiocre, ils rivalisent avec les unités covenants standard. Ils sont équipés d'une armure de kevlar renforcée et d'un SMG.</var>
+                <var name="1">Les fusillers sont équipés de fusils d'assaut avec zoom intégré. Plus puissants que les marines standards, ils peuvent rivaliser avec des escouades entières de grunts dirigées par des élites hauts gradés.</var>
+                <var name="2">Les grenadiers sont les spécialistes en explosifs du CSNU sur le terrain. Ils peuvent détruire les véhicules légers grâce à leurs grenades et leurs lances missiles.</var>
+                <var name="3">Les TCAO sont des soldats d'assauts largués depuis l'espace directement sur les champs de batailles grâce à des modules spéciaux. Ces soldats sont surentraînés et très chevronnés, risquant leur vie à chaque instant en raison des sauts orbitaux qui font atteindre une chaleur extrême dans le module.</var>
+                <var name="4">Les snipers sont dotés de fusils de précision SA 2M capables de descendre des covenants à plusieurs centaines de mètres grâce à leur zoom maximum de 10x. Très efficasse à longue portée, ils deviennent inutiles au corps à corps.</var>
+                <var name="5">Les spartans sont les unités d'infanterie militaires les plus évoluées militairement du CSNU mais également des Covenants. Ils sont équipés d'une armure de type Mjolnir améliorant leurs capacités de combat, déjà exceptionnelles grâce à leur entraînement militaire depuis leur plus jeune âge, ainsi qu'à leurs implants cybernétiques, les rendants d'une grande efficacité inégalée au sein de l'infanterie.</var>
+                <var name="6">Les médecins sont sur le champ de bataille pour aider les soldats blessés par des tirs lors des affrontements. Ils peuvent réduire le nombre de morts lorsqu'ils sont bien utilisés et ainsi peut être changer l'issue de la bataille.</var>
+                <var name="7">Les ingénieurs sont là pour réparer vos véhicules endommagés lors des affrontements. Ils peuvent réduire le nombre de vos pertes de véhicules lorsqu'ils sont bien utilisés.</var>
+                <var name="8">Les soldats exo squelettiques possèdent des armures de combat très résistantes et d'une puissance énorme mais contre balancée par une faible autonomie d'énergie, une mobilité faible et d'une discrétion auditive aussi silencieuse qu'un char d'assaut dans un champs de mines lotus.</var>
+            </var>
+        </var>
+        <var name="batiments">
+            <var name="noms_sing">
+                <var name="0">usine de métallurgie</var>
+                <var name="1">usine de cristal</var>
+                <var name="2">synchronisateur d'hydrogène</var>
+                <var name="3">centrale solaire</var>
+                <var name="4">centrale énergétique</var>
+                <var name="5">base radar</var>
+                <var name="6">centre de recherches</var>
+                <var name="7">chantier terrestre</var>
+                <var name="8">chantier spatial</var>
+                <var name="9">école militaire</var>
+                <var name="10">silo de stockage</var>
+                <var name="11">centrale informatique</var>
+                <var name="12">module résidentiel</var>
+                <var name="13">arcologies</var>
+                <var name="14">bunker</var>
+                <var name="15">centre commercial</var>
+                <var name="16">centre loisir</var>
+                <var name="17">centre administratif</var>
+            </var>
+            <var name="descriptions">
+                <var name="0">Cette usine traite tous les métaux recueillis afin de produire du titanium-A ou différents types d'alliages de qualité pour vos différentes constructions planétaires ou spatiales. Chaque niveau augmente la production de métal.</var>
+                <var name="1">L'usine de cristal filtre les déchets récoltés avec les cristaux. Une fois séparés du reste ils sont classés par qualité par une quantité d'appareils de haute technologie. Plus les cristaux sont purs plus ceux-ci peuvent être transformés en unités de stockage de données ou en conducteurs énergétiques de haute qualité. Plus ce bâtiment sera développé, plus vous pourrez traiter de cristaux rapidement.</var>
+                <var name="2">Ce bâtiment use de l'eau pour la décomposer et en extraire l'hydrogène, la base de toutes vos productions énergétiques, pour ensuite l'acheminer dans des condensateurs ioniques afin de le rendre plus dense et par le fait même plus efficace. Chaque niveau augmente la production du synchronisateur.</var>
+                <var name="3">La centrale solaire produit l'énergie nécessaire au fonctionnement de vos usines. Elle fonctionne à partir d'une technologie Forruner qui consiste à envoyer un rayon à la verticale pour capter tous les rayons du soleil qui le croise.</var>
+                <var name="4">La centrale énergétique fonctionne avec un principe assez dépassé. En effet, l'énergie est produite par un réacteur à fusion qui en tournant produit de l'énergie comme le ferait une dynamo. Bien que ce principe fût révolutionnaire à l'époque, il fût rapidement dépassé par la centrale solaire qui permet de produire d'avantage d'énergie.</var>
+                <var name="5">Le centre de communication est un gigantesque relai de transmission envoyant des ondes entre les différents mondes connus et répertoriés de l'univers. Grâce à lui, vous pourrez communiquer avec d'autres administrateurs coloniaux afin de planifier ensemble des programmes d'actions communs. Equipé d'un radar, il vous permet de repérer les mouvements des flottes ennemies.</var>
+                <var name="6">Le centre de recherches est certainement l'une des bâtisses les plus importantes que vous puissiez construire dans votre colonie. Vos chercheurs travailleront sans relâche aucun afin de mettre au point de nouvelles technologies vous assurant suprématie et victoire sur les champs de bataille. Chaque niveau dévellopé augmente la vitesse de recherche de vos technologies.</var>
+                <var name="7">Le chantier terrestre vous permet de construire tous les véhicules atmosphérique du type warthog ou scorpion. Il permet ainsi à vos troupes d'accéder plus rapidement à un endroit et d'avoir un avantage avec l'armement de ces véhicules.</var>
+                <var name="8">Le chantier spatial permet de construire vôtre flotte de vaisseaux spatiaux. Généralement à la limite de l'atmosphère d'une planète il ne peut cependant se déplacer et doit impérativement rester en orbite. Le chantier spatial, bien que ressemblant à une station spatial, ne peut être détruit grâce à sa position qui lui confère un camouflage total.</var>
+                <var name="9">L'académie militaire forme les meilleurs officiers et sous-officiers de la galaxie. Ces hommes expérimentés vous aideront à choisir de meilleures stratégies défensives ou offensives ou encore même économiques face aux différentes situations qui vous seront imposées. Plus vous augmenterez le niveau de cette structure plus vos officiers seront rapides et efficaces dans leurs tâches.</var>
+                <var name="10">Comme toutes choses, vos ressources ont besoin d'espace pour être stockées ; c'est pourquoi ces énormes silos vous seront d'une aide précieuse afin d'y renfermer une grande quantité de matières premières pour toutes vos productions. Plus le niveau du silo est haut, plus il pourra contenir de ressources supplémentaires.</var>
+                <var name="11">La centrale informatique est le coeur de votre planète, le cerveau de votre territoire, analysant chaque particule détectée avec grand soin. Plus votre centrale est améliorée, plus rapidement et aisément les données seront traitées.</var>
+                <var name="12">~#DESCRIPTION MANQUANTE#~ Habitation</var>
+                <var name="13">~#DESCRIPTION MANQUANTE#~ Arcologies</var>
+                <var name="14">~#DESCRIPTION MANQUANTE#~ Bunker</var>
+                <var name="15">~#DESCRIPTION MANQUANTE#~ Centre commercial</var>
+                <var name="16">~#DESCRIPTION MANQUANTE#~ Centre de loisirs</var>
+                <var name="17">~#DESCRIPTION MANQUANTE#~ Centre administratif</var>
+            </var>
+        </var>
+        <var name="technologies">
+            <var name="noms_sing">
+                <var name="0">
+                    <var name="0">Forage niveau 1</var>
+                    <var name="1">Forage niveau 2</var>
+                    <var name="2">Forage niveau 3</var>
+                    <var name="3">Commerce galactique</var>
+                    <var name="4">Rendement métal niveau 1</var>
+                    <var name="5">Rendement métal niveau 2</var>
+                    <var name="6">Rendement métal niveau 3</var>
+                    <var name="7">Rendement cristal niveau 1</var>
+                    <var name="8">Rendement cristal niveau 2</var>
+                    <var name="9">Rendement cristal niveau 3</var>
+                    <var name="10">Rendement hydrogène niveau 1</var>
+                    <var name="11">Rendement hydrogène niveau 2</var>
+                    <var name="12">Rendement hydrogène niveau 3</var>
+                    <var name="13">Théorie du Marché niveau 1</var>
+                    <var name="14">Théorie du Marché niveau 2</var>
+                    <var name="15">Théorie du Marché niveau 3</var>
+                    <var name="16">Fonderies avancées niveau 1</var>
+                    <var name="17">Fonderies avancées niveau 2</var>
+                    <var name="18">Fonderies avancées niveau 3</var>
+                </var>
+                <var name="1">
+                    <var name="0">Maîtrise énergie niveau 1</var>
+                    <var name="1">Maîtrise énergie niveau 2</var>
+                    <var name="2">Maîtrise énergie niveau 3</var>
+                    <var name="3">Réacteur à combustion niveau 1</var>
+                    <var name="4">Réacteur à combustion niveau 2</var>
+                    <var name="5">Réacteur à combustion niveau 3</var>
+                    <var name="6">Réacteur à fusion niveau 1</var>
+                    <var name="7">Réacteur à fusion niveau 2</var>
+                    <var name="8">Réacteur à fusion niveau 3</var>
+                    <var name="9">Moteur subluminique niveau 1</var>
+                    <var name="10">Moteur subluminique niveau 2</var>
+                    <var name="11">Moteur subluminique niveau 3</var>
+                    <var name="12">Informatique niveau 1</var>
+                    <var name="13">Informatique niveau 2</var>
+                    <var name="14">Informatique niveau 3</var>
+                    <var name="15">IA niveau 1</var>
+                    <var name="16">IA niveau 2</var>
+                    <var name="17">IA niveau 3</var>
+                    <var name="18">Télécommunications niveau 1</var>
+                    <var name="19">Télécommunications niveau 2</var>
+                    <var name="20">Télécommunications niveau 3</var>
+                    <var name="21">Polymères radars niveau 1</var>
+                    <var name="22">Polymères radars niveau 2</var>
+                    <var name="23">Polymères radars niveau 3</var>
+                    <var name="24">Espionnage niveau 1</var>
+                    <var name="25">Espionnage niveau 2</var>
+                    <var name="26">Espionnage niveau 3</var>
+                    <var name="27">Contre-espionnage niveau 1</var>
+                    <var name="28">Contre-espionnage niveau 2</var>
+                    <var name="29">Contre-espionnage niveau 3</var>
+                </var>
+                <var name="2">
+                    <var name="0">Constructions planétaires niveau 1</var>
+                    <var name="1">Constructions planétaires niveau 2</var>
+                    <var name="2">Constructions planétaires niveau 3</var>
+                    <var name="3">Construction optimisée</var>
+                    <var name="4">Ingénierie orbitale</var>
+                    <var name="5">Aménagement territorial niveau 1</var>
+                    <var name="6">Aménagement territorial niveau 2</var>
+                    <var name="7">Aménagement territorial niveau 3</var>
+                </var>
+                <var name="3">
+                    <var name="0">Immigration coloniale niveau 1</var>
+                    <var name="1">Immigration coloniale niveau 2</var>
+                    <var name="2">Immigration coloniale niveau 3</var>
+                    <var name="3">Urbanisme niveau 1</var>
+                    <var name="4">Urbanisme niveau 2</var>
+                    <var name="5">Urbanisme niveau 3</var>
+                    <var name="6">Grandes surfaces</var>
+                    <var name="7">Centre de loisirs</var>
+                    <var name="8">Arcologie</var>
+                    <var name="9">Sciences politiques niveau 1</var>
+                    <var name="10">Sciences politiques niveau 2</var>
+                    <var name="11">Sciences politiques niveau 3</var>
+                    <var name="12">Stratégie militaire niveau 1</var>
+                    <var name="13">Stratégie militaire niveau 2</var>
+                    <var name="14">Stratégie militaire niveau 3</var>
+                </var>
+                <var name="4">
+                    <var name="0">Projectile Haut Densité niveau 1</var>
+                    <var name="1">Projectile Haut Densité niveau 2</var>
+                    <var name="2">Projectile Haut Densité niveau 3</var>
+                    <var name="3">Assistance de visée niveau 1</var>
+                    <var name="4">Assistance de visée niveau 2</var>
+                    <var name="5">Assistance de visée niveau 3</var>
+                    <var name="6">Guidage laser niveau 1</var>
+                    <var name="7">Guidage laser niveau 2</var>
+                    <var name="8">Guidage laser niveau 3</var>
+                    <var name="9">Condensateurs rapides niveau 1</var>
+                    <var name="10">Condensateurs rapides niveau 2</var>
+                    <var name="11">Condensateurs rapides niveau 3</var>
+                    <var name="12">Balistique avancée niveau 1</var>
+                    <var name="13">Balistique avancée niveau 2</var>
+                    <var name="14">Balistique avancée niveau 3</var>
+                    <var name="15">Accélération magnétique niveau 1</var>
+                    <var name="16">Accélération magnétique niveau 2</var>
+                    <var name="17">Accélération magnétique niveau 3</var>
+                </var>
+                <var name="5">
+                    <var name="0">Robotique niveau 1</var>
+                    <var name="1">Robotique niveau 2</var>
+                    <var name="2">Robotique niveau 3</var>
+                    <var name="3">Ingénierie atomique niveau 1</var>
+                    <var name="4">Ingénierie atomique niveau 2</var>
+                    <var name="5">Ingénierie atomique niveau 3</var>
+                    <var name="6">Nano-régénération niveau </var>
+                    <var name="7">Nano-régénération niveau 2</var>
+                    <var name="8">Nano-régénération niveau 3</var>
+                    <var name="9">Squelette renforcé niveau 1</var>
+                    <var name="10">Squelette renforcé niveau 2</var>
+                    <var name="11">Squelette renforcé niveau 3</var>
+                    <var name="12">Armatures enrichies niveau 1</var>
+                    <var name="13">Armatures enrichies niveau 2</var>
+                    <var name="14">Armatures enrichies niveau 3</var>
+                    <var name="15">Composés avancés niveau 1</var>
+                    <var name="16">Composés avancés niveau 2</var>
+                    <var name="17">Composés avancés niveau 3</var>
+                    <var name="18">Alliage niveau 1</var>
+                    <var name="19">Alliage niveau 2</var>
+                    <var name="20">Alliage niveau 3</var>
+                    <var name="21">Alliage avancé niveau 1</var>
+                    <var name="22">Alliage avancé niveau 2</var>
+                    <var name="23">Alliage avancé niveau 3</var>
+                    <var name="24">Armure moléculaire niveau 1</var>
+                    <var name="25">Armure moléculaire niveau 2</var>
+                    <var name="26">Armure moléculaire niveau 3</var>
+                </var>
+                <var name="6">
+                    <var name="0">Tourelle légère M202 XP</var>
+                    <var name="1">Canon de défense automatique</var>
+                    <var name="2">Artillerie lourde de 440mm</var>
+                    <var name="3">Lance-missiles Archer</var>
+                    <var name="4">Batterie de missiles Anaconda</var>
+                    <var name="5">Silo de missiles Shiva</var>
+                    <var name="6">Canon à accélération magnétique</var>
+                </var>
+                <var name="7">
+                    <var name="0">Prototype Intercepteur Longsword</var>
+                    <var name="1">Prototype Bombardier Longsword</var>
+                    <var name="2">Corvette de classe Mako</var>
+                    <var name="3">Prototype de Frégate</var>
+                    <var name="4">Récupération</var>
+                    <var name="5">Prototype de Destroyer</var>
+                    <var name="6">Prototype de Croiseur de classe Halcyon</var>
+                    <var name="7">Prototype de Croiseur de classe Marathon</var>
+                    <var name="8">Prototype de Porte-vaisseaux</var>
+                    <var name="9">Prototype de Super Porte-Vaisseaux</var>
+                    <var name="10">Prototype de Vaisseau d'exfiltration de classe Black Cat</var>
+                    <var name="11">Prototype de Super canon à accélération magnétique</var>
+                    <var name="12">Bunker souterrain</var>
+                    <var name="13">Bunker souterrain</var>
+                    <var name="14">Bunker souterrain</var>
+                </var>
+                <var name="8">
+                    <var name="0">Expansion niveau 1</var>
+                    <var name="1">Expansion niveau 2</var>
+                    <var name="2">Expansion niveau 3</var>
+                    <var name="3">Expansion niveau 4</var>
+                    <var name="4">Expansion niveau 5</var>
+                    <var name="5">Expansion niveau 6</var>
+                    <var name="6">Expansion niveau 7</var>
+                    <var name="7">Expansion niveau 8</var>
+                    <var name="8">Expansion niveau 9</var>
+                    <var name="9">Expansion niveau 10</var>
+                    <var name="10">Expansion niveau 11</var>
+                    <var name="11">Expansion niveau 12</var>
+                    <var name="12">Expansion niveau 13</var>
+                    <var name="13">Expansion niveau 14</var>
+                    <var name="14">Expansion niveau 15</var>
+                    <var name="15">Expansion niveau 16</var>
+                    <var name="16">Expansion niveau 17</var>
+                    <var name="17">Expansion niveau 18</var>
+                </var>
+            </var>
+            <var name="descriptions">
+                <var name="0">
+                    <var name="0">~#DESCRIPTION MANQUANTE#~ Forage niveau 1</var>
+                    <var name="1">~#DESCRIPTION MANQUANTE#~ Forage niveau 2</var>
+                    <var name="2">~#DESCRIPTION MANQUANTE#~ Forage niveau 3</var>
+                    <var name="3">~#DESCRIPTION MANQUANTE#~ Commerce galactique</var>
+                    <var name="4">~#DESCRIPTION MANQUANTE#~ Rendement métal niveau 1</var>
+                    <var name="5">~#DESCRIPTION MANQUANTE#~ Rendement métal niveau 2</var>
+                    <var name="6">~#DESCRIPTION MANQUANTE#~ Rendement métal niveau 3</var>
+                    <var name="7">~#DESCRIPTION MANQUANTE#~ Rendement cristal niveau 1</var>
+                    <var name="8">~#DESCRIPTION MANQUANTE#~ Rendement cristal niveau 2</var>
+                    <var name="9">~#DESCRIPTION MANQUANTE#~ Rendement cristal niveau 3</var>
+                    <var name="10">~#DESCRIPTION MANQUANTE#~ Rendement hydrogène niveau 1</var>
+                    <var name="11">~#DESCRIPTION MANQUANTE#~ Rendement hydrogène niveau 2</var>
+                    <var name="12">~#DESCRIPTION MANQUANTE#~ Rendement hydrogène niveau 3</var>
+                    <var name="13">~#DESCRIPTION MANQUANTE#~ Théorie du Marché niveau 1</var>
+                    <var name="14">~#DESCRIPTION MANQUANTE#~ Théorie du Marché niveau 2</var>
+                    <var name="15">~#DESCRIPTION MANQUANTE#~ Théorie du Marché niveau 3</var>
+                    <var name="16">~#DESCRIPTION MANQUANTE#~ Fonderies avancées niveau 1</var>
+                    <var name="17">~#DESCRIPTION MANQUANTE#~ Fonderies avancées niveau 2</var>
+                    <var name="18">~#DESCRIPTION MANQUANTE#~ Fonderies avancées niveau 3</var>
+                </var>
+                <var name="1">
+                    <var name="0">~#DESCRIPTION MANQUANTE#~ Maîtrise énergie niveau 1</var>
+                    <var name="1">~#DESCRIPTION MANQUANTE#~ Maîtrise énergie niveau 2</var>
+                    <var name="2">~#DESCRIPTION MANQUANTE#~ Maîtrise énergie niveau 3</var>
+                    <var name="3">~#DESCRIPTION MANQUANTE#~ Réacteur à combustion niveau 1</var>
+                    <var name="4">~#DESCRIPTION MANQUANTE#~ Réacteur à combustion niveau 2</var>
+                    <var name="5">~#DESCRIPTION MANQUANTE#~ Réacteur à combustion niveau 3</var>
+                    <var name="6">~#DESCRIPTION MANQUANTE#~ Réacteur à fusion niveau 1</var>
+                    <var name="7">~#DESCRIPTION MANQUANTE#~ Réacteur à fusion niveau 2</var>
+                    <var name="8">~#DESCRIPTION MANQUANTE#~ Réacteur à fusion niveau 3</var>
+                    <var name="9">~#DESCRIPTION MANQUANTE#~ Moteur subluminique niveau 1</var>
+                    <var name="10">~#DESCRIPTION MANQUANTE#~ Moteur subluminique niveau 2</var>
+                    <var name="11">~#DESCRIPTION MANQUANTE#~ Moteur subluminique niveau 3</var>
+                    <var name="12">~#DESCRIPTION MANQUANTE#~ Informatique niveau 1</var>
+                    <var name="13">~#DESCRIPTION MANQUANTE#~ Informatique niveau 2</var>
+                    <var name="14">~#DESCRIPTION MANQUANTE#~ Informatique niveau 3</var>
+                    <var name="15">~#DESCRIPTION MANQUANTE#~ IA niveau 1</var>
+                    <var name="16">~#DESCRIPTION MANQUANTE#~ IA niveau 2</var>
+                    <var name="17">~#DESCRIPTION MANQUANTE#~ IA niveau 3</var>
+                    <var name="18">~#DESCRIPTION MANQUANTE#~ Télécommunications niveau 1</var>
+                    <var name="19">~#DESCRIPTION MANQUANTE#~ Télécommunications niveau 2</var>
+                    <var name="20">~#DESCRIPTION MANQUANTE#~ Télécommunications niveau 3</var>
+                    <var name="21">~#DESCRIPTION MANQUANTE#~ Polymères radars niveau 1</var>
+                    <var name="22">~#DESCRIPTION MANQUANTE#~ Polymères radars niveau 2</var>
+                    <var name="23">~#DESCRIPTION MANQUANTE#~ Polymères radars niveau 3</var>
+                    <var name="24">~#DESCRIPTION MANQUANTE#~ Espionnage niveau 1</var>
+                    <var name="25">~#DESCRIPTION MANQUANTE#~ Espionnage niveau 2</var>
+                    <var name="26">~#DESCRIPTION MANQUANTE#~ Espionnage niveau 3</var>
+                    <var name="27">~#DESCRIPTION MANQUANTE#~ Contre-espionnage niveau 1</var>
+                    <var name="28">~#DESCRIPTION MANQUANTE#~ Contre-espionnage niveau 2</var>
+                    <var name="29">~#DESCRIPTION MANQUANTE#~ Contre-espionnage niveau 3</var>
+                </var>
+                <var name="2">
+                    <var name="0">~#DESCRIPTION MANQUANTE#~ Constructions planétaires niveau 1</var>
+                    <var name="1">~#DESCRIPTION MANQUANTE#~ Constructions planétaires niveau 2</var>
+                    <var name="2">~#DESCRIPTION MANQUANTE#~ Constructions planétaires niveau 3</var>
+                    <var name="3">~#DESCRIPTION MANQUANTE#~ Construction optimisée</var>
+                    <var name="4">~#DESCRIPTION MANQUANTE#~ Ingénierie orbitale</var>
+                    <var name="5">~#DESCRIPTION MANQUANTE#~ Aménagement territorial niveau 1</var>
+                    <var name="6">~#DESCRIPTION MANQUANTE#~ Aménagement territorial niveau 2</var>
+                    <var name="7">~#DESCRIPTION MANQUANTE#~ Aménagement territorial niveau 3</var>
+                </var>
+                <var name="3">
+                    <var name="0">~#DESCRIPTION MANQUANTE#~ Immigration coloniale niveau 1</var>
+                    <var name="1">~#DESCRIPTION MANQUANTE#~ Immigration coloniale niveau 2</var>
+                    <var name="2">~#DESCRIPTION MANQUANTE#~ Immigration coloniale niveau 3</var>
+                    <var name="3">~#DESCRIPTION MANQUANTE#~ Urbanisme niveau 1</var>
+                    <var name="4">~#DESCRIPTION MANQUANTE#~ Urbanisme niveau 2</var>
+                    <var name="5">~#DESCRIPTION MANQUANTE#~ Urbanisme niveau 3</var>
+                    <var name="6">~#DESCRIPTION MANQUANTE#~ Grandes surfaces</var>
+                    <var name="7">~#DESCRIPTION MANQUANTE#~ Centre de loisirs</var>
+                    <var name="8">~#DESCRIPTION MANQUANTE#~ Arcologie</var>
+                    <var name="9">~#DESCRIPTION MANQUANTE#~ Sciences politiques niveau 1</var>
+                    <var name="10">~#DESCRIPTION MANQUANTE#~ Sciences politiques niveau 2</var>
+                    <var name="11">~#DESCRIPTION MANQUANTE#~ Sciences politiques niveau 3</var>
+                    <var name="12">~#DESCRIPTION MANQUANTE#~ Stratégie militaire niveau 1</var>
+                    <var name="13">~#DESCRIPTION MANQUANTE#~ Stratégie militaire niveau 2</var>
+                    <var name="14">~#DESCRIPTION MANQUANTE#~ Stratégie militaire niveau 3</var>
+                </var>
+                <var name="4">
+                    <var name="0">~#DESCRIPTION MANQUANTE#~ Projectile Haut Densité niveau 1</var>
+                    <var name="1">~#DESCRIPTION MANQUANTE#~ Projectile Haut Densité niveau 2</var>
+                    <var name="2">~#DESCRIPTION MANQUANTE#~ Projectile Haut Densité niveau 3</var>
+                    <var name="3">~#DESCRIPTION MANQUANTE#~ Assistance de visée niveau 1</var>
+                    <var name="4">~#DESCRIPTION MANQUANTE#~ Assistance de visée niveau 2</var>
+                    <var name="5">~#DESCRIPTION MANQUANTE#~ Assistance de visée niveau 3</var>
+                    <var name="6">~#DESCRIPTION MANQUANTE#~ Guidage laser niveau 1</var>
+                    <var name="7">~#DESCRIPTION MANQUANTE#~ Guidage laser niveau 2</var>
+                    <var name="8">~#DESCRIPTION MANQUANTE#~ Guidage laser niveau 3</var>
+                    <var name="9">~#DESCRIPTION MANQUANTE#~ Condensateurs rapides niveau 1</var>
+                    <var name="10">~#DESCRIPTION MANQUANTE#~ Condensateurs rapides niveau 2</var>
+                    <var name="11">~#DESCRIPTION MANQUANTE#~ Condensateurs rapides niveau 3</var>
+                    <var name="12">~#DESCRIPTION MANQUANTE#~ Balistique avancée niveau 1</var>
+                    <var name="13">~#DESCRIPTION MANQUANTE#~ Balistique avancée niveau 2</var>
+                    <var name="14">~#DESCRIPTION MANQUANTE#~ Balistique avancée niveau 3</var>
+                    <var name="15">~#DESCRIPTION MANQUANTE#~ Accélération magnétique niveau 1</var>
+                    <var name="16">~#DESCRIPTION MANQUANTE#~ Accélération magnétique niveau 2</var>
+                    <var name="17">~#DESCRIPTION MANQUANTE#~ Accélération magnétique niveau 3</var>
+                </var>
+            
+                <var name="5">
+                    <var name="0">~#DESCRIPTION MANQUANTE#~ Robotique niveau 1</var>
+                    <var name="1">~#DESCRIPTION MANQUANTE#~ Robotique niveau 2</var>
+                    <var name="2">~#DESCRIPTION MANQUANTE#~ Robotique niveau 3</var>
+                    <var name="3">~#DESCRIPTION MANQUANTE#~ Ingénierie atomique niveau 1</var>
+                    <var name="4">~#DESCRIPTION MANQUANTE#~ Ingénierie atomique niveau 2</var>
+                    <var name="5">~#DESCRIPTION MANQUANTE#~ Ingénierie atomique niveau 3</var>
+                    <var name="6">~#DESCRIPTION MANQUANTE#~ Nano-régénération niveau </var>
+                    <var name="7">~#DESCRIPTION MANQUANTE#~ Nano-régénération niveau 2</var>
+                    <var name="8">~#DESCRIPTION MANQUANTE#~ Nano-régénération niveau 3</var>
+                    <var name="9">~#DESCRIPTION MANQUANTE#~ Squelette renforcé niveau 1</var>
+                    <var name="10">~#DESCRIPTION MANQUANTE#~ Squelette renforcé niveau 2</var>
+                    <var name="11">~#DESCRIPTION MANQUANTE#~ Squelette renforcé niveau 3</var>
+                    <var name="12">~#DESCRIPTION MANQUANTE#~ Armatures enrichies niveau 1</var>
+                    <var name="13">~#DESCRIPTION MANQUANTE#~ Armatures enrichies niveau 2</var>
+                    <var name="14">~#DESCRIPTION MANQUANTE#~ Armatures enrichies niveau 3</var>
+                    <var name="15">~#DESCRIPTION MANQUANTE#~ Composés avancés niveau 1</var>
+                    <var name="16">~#DESCRIPTION MANQUANTE#~ Composés avancés niveau 2</var>
+                    <var name="17">~#DESCRIPTION MANQUANTE#~ Composés avancés niveau 3</var>
+                    <var name="18">~#DESCRIPTION MANQUANTE#~ Alliage niveau 1</var>
+                    <var name="19">~#DESCRIPTION MANQUANTE#~ Alliage niveau 2</var>
+                    <var name="20">~#DESCRIPTION MANQUANTE#~ Alliage niveau 3</var>
+                    <var name="21">~#DESCRIPTION MANQUANTE#~ Alliage avancé niveau 1</var>
+                    <var name="22">~#DESCRIPTION MANQUANTE#~ Alliage avancé niveau 2</var>
+                    <var name="23">~#DESCRIPTION MANQUANTE#~ Alliage avancé niveau 3</var>
+                    <var name="24">~#DESCRIPTION MANQUANTE#~ Armure moléculaire niveau 1</var>
+                    <var name="25">~#DESCRIPTION MANQUANTE#~ Armure moléculaire niveau 2</var>
+                    <var name="26">~#DESCRIPTION MANQUANTE#~ Armure moléculaire niveau 3</var>
+                </var>
+                <var name="6">
+                    <var name="0">~#DESCRIPTION MANQUANTE#~ Tourelle légère M202 XP</var>
+                    <var name="1">~#DESCRIPTION MANQUANTE#~ Canon de défense automatique</var>
+                    <var name="2">~#DESCRIPTION MANQUANTE#~ Artillerie lourde de 440mm</var>
+                    <var name="3">~#DESCRIPTION MANQUANTE#~ Lance-missiles Archer</var>
+                    <var name="4">~#DESCRIPTION MANQUANTE#~ Batterie de missiles Anaconda</var>
+                    <var name="5">~#DESCRIPTION MANQUANTE#~ Silo de missiles Shiva</var>
+                    <var name="6">~#DESCRIPTION MANQUANTE#~ Canon à accélération magnétique</var>
+                </var>
+                <var name="7">
+                    <var name="0">~#DESCRIPTION MANQUANTE#~ Prototype Intercepteur Longsword</var>
+                    <var name="1">~#DESCRIPTION MANQUANTE#~ Prototype Bombardier Longsword</var>
+                    <var name="2">~#DESCRIPTION MANQUANTE#~ Corvette de classe Mako</var>
+                    <var name="3">~#DESCRIPTION MANQUANTE#~ Prototype de Frégate</var>
+                    <var name="4">~#DESCRIPTION MANQUANTE#~ Récupération</var>
+                    <var name="5">~#DESCRIPTION MANQUANTE#~ Prototype de Destroyer</var>
+                    <var name="6">~#DESCRIPTION MANQUANTE#~ Prototype de Croiseur de classe Halcyon</var>
+                    <var name="7">~#DESCRIPTION MANQUANTE#~ Prototype de Croiseur de classe Marathon</var>
+                    <var name="8">~#DESCRIPTION MANQUANTE#~ Prototype de Porte-vaisseaux</var>
+                    <var name="9">~#DESCRIPTION MANQUANTE#~ Prototype de Super Porte-Vaisseaux</var>
+                    <var name="10">~#DESCRIPTION MANQUANTE#~ Prototype de Vaisseau d'exfiltration de classe Black Cat</var>
+                    <var name="11">~#DESCRIPTION MANQUANTE#~ Prototype de Super canon à accélération magnétique</var>
+                    <var name="12">~#DESCRIPTION MANQUANTE#~ Bunker souterrain</var>
+                    <var name="13">~#DESCRIPTION MANQUANTE#~ Bunker souterrain</var>
+                    <var name="14">~#DESCRIPTION MANQUANTE#~ Bunker souterrain</var>
+                </var>
+                <var name="8">
+                    <var name="0">~#DESCRIPTION MANQUANTE#~ Expansion niveau 1</var>
+                    <var name="1">~#DESCRIPTION MANQUANTE#~ Expansion niveau 2</var>
+                    <var name="2">~#DESCRIPTION MANQUANTE#~ Expansion niveau 3</var>
+                    <var name="3">~#DESCRIPTION MANQUANTE#~ Expansion niveau 4</var>
+                    <var name="4">~#DESCRIPTION MANQUANTE#~ Expansion niveau 5</var>
+                    <var name="5">~#DESCRIPTION MANQUANTE#~ Expansion niveau 6</var>
+                    <var name="6">~#DESCRIPTION MANQUANTE#~ Expansion niveau 7</var>
+                    <var name="7">~#DESCRIPTION MANQUANTE#~ Expansion niveau 8</var>
+                    <var name="8">~#DESCRIPTION MANQUANTE#~ Expansion niveau 9</var>
+                    <var name="9">~#DESCRIPTION MANQUANTE#~ Expansion niveau 10</var>
+                    <var name="10">~#DESCRIPTION MANQUANTE#~ Expansion niveau 11</var>
+                    <var name="11">~#DESCRIPTION MANQUANTE#~ Expansion niveau 12</var>
+                    <var name="12">~#DESCRIPTION MANQUANTE#~ Expansion niveau 13</var>
+                    <var name="13">~#DESCRIPTION MANQUANTE#~ Expansion niveau 14</var>
+                    <var name="14">~#DESCRIPTION MANQUANTE#~ Expansion niveau 15</var>
+                    <var name="15">~#DESCRIPTION MANQUANTE#~ Expansion niveau 16</var>
+                    <var name="16">~#DESCRIPTION MANQUANTE#~ Expansion niveau 17</var>
+                    <var name="17">~#DESCRIPTION MANQUANTE#~ Expansion niveau 18</var>
+                </var>
+            </var>
+        </var>
+        <var name="terrestre">
+            <var name="noms_sing">
+                <var name="0">sparrowhawk</var>
+                <var name="1">077-TC Pelican</var>
+                <var name="2">C703 Shortsword Bomber</var>
+                <var name="3">SHD Albatros</var>
+                <var name="4">M12 LRV Warthogs</var>
+                <var name="5">M12G1 LAAV Warthogs</var>
+                <var name="6">M12A1 LAAV Warthogs</var>
+                <var name="7">M808B Scorpions MBT</var>
+                <var name="8">tourelle légère M202 XP</var>
+                <var name="9">lance-missiles Archer</var>
+                <var name="10">canon de défense automatique</var>
+                <var name="11">batterie de missiles Anaconda</var>
+                <var name="12">artillerie lourde de 440mm</var>
+                <var name="13">silo de missiles Shiva</var>
+                <var name="14">canon à accélération magnétique</var>
+                <var name="15">super canon à accélération magnétique</var>
+            </var>
+            <var name="noms_pluriel">
+                <var name="0">sparrowhawk</var>
+                <var name="1">077-TC Pelican</var>
+                <var name="2">C703 Shortsword Bomber</var>
+                <var name="3">SHD Albatros</var>
+                <var name="4">M12 LRV Warthogs</var>
+                <var name="5">M12G1 LAAV Warthogs</var>
+                <var name="6">M12A1 LAAV Warthogs</var>
+                <var name="7">M808B Scorpions MBT</var>
+                <var name="8">tourelles légères M202 XP</var>
+                <var name="9">lance-missiles Archer</var>
+                <var name="10">canons de défense automatique</var>
+                <var name="11">batteries de missiles Anaconda</var>
+                <var name="12">artilleries lourde de 440mm</var>
+                <var name="13">silos de missiles Shiva</var>
+                <var name="14">canons à accélération magnétique</var>
+                <var name="15">supers canons à accélération magnétique</var>
+            </var>
+            <var name="descriptions">
+                <var name="0">Véhicule à propulsion verticale permettant des attaques extrêmement rapides et destructrices grâce à ses six tubes lance-missiles, ses deux mitrailleuses légères, et sa mitrailleuse lourde frontale. Ces vaisseaux d'assaut rapide sont de véritables broyeurs de tôle grâce à leurs 6 tubes lance-missiles et sont capables de détruire des véhicules et des positions fortement blindées.</var>
+                <var name="1">Véhicule aérien de transport léger permettant le transport rapide de troupes à des endroits stratégiques tel un warthog ou un scorpion. Ils sont la base des renforts terrestres et permettent l'acheminement de troupes et de munitions rapidement.</var>
+                <var name="2">Vaisseau suborbital très rapide apte tant au combat aérien rapproché qu'au bombardement ciblé. Ces bombardiers ont un pointeur laser qui leur permet de viser au mieux les cibles ennemies, qu'elles soient au sol ou aériennes. Ils sont néanmoins capables de combattre en combat aérien rapproché grâce à leurs missiles thermo guidés et sont utilisés lors de bombardements de cibles mineures.</var>
+                <var name="3">Véhicule aérien de transport lourd permettant le transport en masse de troupes ou de véhicules tels que des warthogs ou bien une paire de scorpions vers des zones de largage. Ces véhicules de soutien aérien lourd sont surtout utilisés lors d'offensives nécessitant un déploiement en masse d'unités blindées et de munitions au plus près des lignes adverses.</var>
+                <var name="4">Véhicule d'attaque léger permettant des assauts rapides et efficaces, ainsi que le transport léger de troupes. Ces véhicules sont la base des véhicules terrestres du CSNU.</var>
+                <var name="5">Véhicule léger équipé d'un canon à accélération magnétique (CAM), très efficace contre du personnel, des véhicules moyennement blindés, ou bien contre des véhicules aériens légers. Les Warthog M12G1 sont très répandus et surtout utilisés lors d'offensives sur des cibles disposant d'un appui aérien ou terrestre léger.</var>
+                <var name="6">Véhicule léger, armé d'un lance-missiles anti-véhicule permettant des assauts rapides contre des véhicules blindés ou contre des positions fortifiées. Ils sont surtout utilisés en cas d'attaques de postes avancés.</var>
+                <var name="7">Tank blindé anti-véhicules. Permet l'attaque de cibles fortifiées grâce à ses balles perforantes de gros calibre. Ces tanks sont utilisés lors d'assauts massifs sur des bases fortifiées et vitales à l'ennemi.</var>
+                <var name="8">~#DESCRIPTION MANQUANTE#~ </var>
+                <var name="9">~#DESCRIPTION MANQUANTE#~ </var>
+                <var name="10">~#DESCRIPTION MANQUANTE#~ </var>
+                <var name="11">~#DESCRIPTION MANQUANTE#~ </var>
+                <var name="12">~#DESCRIPTION MANQUANTE#~ </var>
+                <var name="13">~#DESCRIPTION MANQUANTE#~ </var>
+                <var name="14">~#DESCRIPTION MANQUANTE#~ </var>
+                <var name="15">~#DESCRIPTION MANQUANTE#~ </var>
+            </var>
+        </var>
+        <var name="vaisseaux">
+            <var name="noms_sing">
+                <var name="0">cargo de classe Parabola</var>
+                <var name="1">cargo de classe Laden</var>
+                <var name="2">vaisseau de colonisation de classe Odyssey</var>
+                <var name="3">recycleur</var>
+                <var name="4">intercepteur Longsword</var>
+                <var name="5">bombardier Longsword</var>
+                <var name="6">corvette de classe Mako</var>
+                <var name="7">frégate</var>
+                <var name="8">destroyer</var>
+                <var name="9">croiseur de classe Halcyon</var>
+                <var name="10">croiseur de classe Marathon</var>
+                <var name="11">porte-vaisseaux</var>
+                <var name="12">super porte-Vaisseaux</var>
+                <var name="13">vaisseau d'exfiltration de classe Black Cat</var>
+            </var>
+            <var name="noms_pluriel">
+                <var name="0">cargos de classe Parabola</var>
+                <var name="1">cargos de classe Laden</var>
+                <var name="2">vaisseaux de colonisation de classe Odyssey</var>
+                <var name="3">recycleurs</var>
+                <var name="4">intercepteurs Longsword</var>
+                <var name="5">bombardiers Longsword</var>
+                <var name="6">corvettes de classe Mako</var>
+                <var name="7">frégates</var>
+                <var name="8">destroyer</var>
+                <var name="9">croiseurs de classe Halcyon</var>
+                <var name="10">croiseurs de classe Marathon</var>
+                <var name="11">porte-vaisseaux</var>
+                <var name="12">supers porte-Vaisseaux</var>
+                <var name="13">vaisseaux d'exfiltration de classe Black Cat</var>
+            </var>
+            <var name="descriptions">
+                <var name="0">Ces cargos de taille conséquente peuvent transporter assez de ressources et de nourriture pour nourrir une petite ville. Ils sont rapides, très manœuvrables mais peu résistants, ce qui est en fait des proies faciles pour les chasseurs ennemis.</var>
+                <var name="1">Ces cargos de taille massive permettent le transport d'une énorme quantité de ressources. Ils sont plus résistants que leurs homologues de classe Parabola, mais sont néanmoins les cibles prioritaires des chasseurs ennemis visant à faire le plus de pertes dans le camp adverse.</var>
+                <var name="2">~#DESCRIPTION MANQUANTE#~</var>
+                <var name="3">~#DESCRIPTION MANQUANTE#~</var>
+                <var name="4">~#DESCRIPTION MANQUANTE#~</var>
+                <var name="5">~#DESCRIPTION MANQUANTE#~</var>
+            
+                <var name="6">~#DESCRIPTION MANQUANTE#~</var>
+                <var name="7">~#DESCRIPTION MANQUANTE#~</var>
+                <var name="8">~#DESCRIPTION MANQUANTE#~</var>
+                <var name="9">~#DESCRIPTION MANQUANTE#~</var>
+                <var name="10">~#DESCRIPTION MANQUANTE#~</var>
+                <var name="11">~#DESCRIPTION MANQUANTE#~</var>
+            
+                <var name="12">~#DESCRIPTION MANQUANTE#~</var>
+                <var name="13">~#DESCRIPTION MANQUANTE#~</var>
+            </var>
+        </var>
+    </var>
+
+    <!--
+        TEMPLATES
+    -->
+    <!-- Menu Header -->
+    <var name="hd_menu_Accueil">ACCUEIL</var>
+    <var name="hd_menu_Jeu">LE JEU</var>
+    <var name="hd_menu_Inscrire">S'INSCRIRE</var>
+    <var name="hd_menu_Forum">FORUM</var>
+    <var name="hd_menu_Blog">BLOG</var>
+    <var name="hd_menu_Hfr">HALO.FR</var>
+    <var name="hd_menu_rss">RSS :: s'abonner</var>
+    <var name="hd_menu_search">rechercher ...</var>
+    <var name="hd_menu_advSearch">Recherche Avancée</var>
+    <!-- Connexion -->
+    <var name="mod_login_titre">Connexion</var>
+    <var name="mod_login_galaxie">Galaxie </var>
+    <var name="mod_login_forgotMdp">Mot de passe oublié</var>
+    <!-- Inscription -->
+    <var name="mod_inscription_texte"><![CDATA[<span><a href="%s">INSCRIVEZ VOUS</a>  Rejoignez l'alliance ou engagez-vous</span> <p><strong>DEFENDREZ VOUS L'HUMANITE OU LA DETRUIREZ VOUS?</strong><br /><br />Repoussez l'ennemi et partez a la conquète des mondes-anneaux dans des univers vastes et riches basés sur l'univers du jeu vidéo Halo<br /><br /><em>Une simple inscription gratuite et un navigateur internet sont demandés pour pouvoir participer a des batailles épiques!</em></p> <a href="%s" class="link"><span>Cliquez ici pour vous inscrire</span></a> <a href="%s" class="more">En savoir plus</a>]]></var>
+    <!-- Accueil -->
+    <var name="cntRaces"><![CDATA[%d Marines et %d Covenants se battent dans <ins>cette galaxie</ins>]]></var>
+    <!-- Footer -->
+    <var name="foot_realise">Réalisé par</var>
+    <var name="foot_design">Designé par</var>
+    <var name="foot_menu_Accueil">Accueil</var>
+    <var name="foot_menu_Inscrire">S'inscrire</var>
+    <var name="foot_menu_Forum">Forum</var>
+    <var name="foot_menu_Staff">Staff</var>
+    <var name="foot_menu_Faq">F.A.Q.</var>
+
+    <!-- Général -->
+    <var name="contactAdmin">Si le problème persiste, contactez un administrateur.</var>
+    <var name="hello">Boujour</var>
+    <var name="bye">Au revoir</var>
+</lang>
diff --git a/onyx2/load.php b/onyx2/load.php
new file mode 100644
index 0000000..9bfa699
--- /dev/null
+++ b/onyx2/load.php
@@ -0,0 +1,166 @@
+<?php
+
+$chrono_start = microtime(TRUE);
+
+if(version_compare(PHP_VERSION, '5.1.0', '<')) trigger_error('Version de php non supportee',E_USER_ERROR);
+
+define('ONYX_VERSION','2.0');
+
+define('FILE',$_SERVER["SCRIPT_FILENAME"]);
+
+define('ONYX',dirname(__FILE__).'/');
+
+if(!is_readable(ONYX."ban.list")) trigger_error('Fichier de ban introuvable',E_USER_ERROR);
+if(in_array($_SERVER['REMOTE_ADDR'], file(ONYX."ban.list",FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES))) die('banni');
+
+require_once('require/parse.php');
+require_once('require/cache.php');
+require_once('require/str.php');
+require_once('require/env.php');
+
+#   *** Chargement de la configuration ***
+
+$cached = Cache::read('_configuration_'.FILE);
+if($cached['check'] == md5_file(ONYX.'config/root.xml').md5_file(ONYX.'modules/modules.xml'))
+    {
+        $VAR = $cached['var'];
+        $ENV = $cached['env'];
+        define('ROOT',$cached['root']);
+
+        foreach($cached['modules'] as $name)
+            {
+                if(isset($cached['opt'][$name]))
+                    {
+                        $OPT = $cached['opt'][$name];
+                        
+                        include_once(ONYX.'modules/'.$name.'/main.php');
+                    }
+            }
+        
+        define('CACHED',TRUE);
+    }
+else
+    {
+        $xml = new DOMDocument();
+
+        $xml->load(ONYX.'config/root.xml') or trigger_error('Erreur du fichier de configuration',E_USER_ERROR);
+        $xml->normalizeDocument();
+        //$xml->validate();
+        
+        if($root = $xml->documentElement->getAttribute('root'))
+            {
+                if($root == substr(FILE,0,strlen($root)))
+                    {
+                        define('ROOT',$root);
+                        
+                        $search = substr(FILE,strlen($root));
+                        
+                        $paths = explode('/',$search);
+                        $paths2 = $paths;
+                        foreach($paths as $key => $path)
+                            {
+                                for($i = $key - 1; $i >= 0; $i--)
+                                    {
+                                        $paths2[$key] = $paths[$i] . '/' . $paths2[$key];
+                                    }
+                                if($key != count($paths) - 1) $paths2[$key] .= '/';
+                            }
+                        
+                        foreach($xml->getElementsByTagName('config') as $value)
+                            {
+                                $config[$value->getAttribute('match')] = $value;
+                            }
+                        
+                        $VAR = $ENV = $modules = array();
+                        array_unshift($paths2,'*');
+                        
+                        foreach($paths2 as $path)
+                            {
+                                if(isset($config[$path]))
+                                    {
+                                        $VAR = array_merge($VAR,parse_config($config[$path]));
+                                        
+                                        $ENV = array_merge($ENV,parse_config($config[$path],'env','option'));
+                                        
+                                        foreach($config[$path]->getElementsByTagName('module') as $module)
+                                            {
+                                                $modules[$module->getAttribute('name')] = $module;
+                                            }
+                                    }
+                            }
+                        
+                        $xml_modules = new DOMDocument();
+                        $xml_modules->load(ONYX.'modules/modules.xml') or trigger_error('Erreur du fichier de modules',E_USER_ERROR);
+                        $xml_modules->normalizeDocument();
+                        foreach($xml_modules->getElementsByTagName('module') as $module)
+                            {
+                                if(!ctype_alnum($module->getAttribute('name'))) trigger_error('Le nom du module contient des caracteres illegaux',E_USER_ERROR);
+                                
+                                $all_modules[$module->getAttribute('name')] = $module;
+                            }
+                        
+                        $all_opt = $load_modules = array();
+
+                        foreach($modules as $name => $module)
+                            {
+                                if(isset($all_modules[$name]) && !in_array($name,$load_modules))
+                                    {
+                                        if($require = $all_modules[$name]->getAttribute('require'))
+                                            if(!in_array($require,$load_modules))
+                                                {
+                                                    trigger_error("Module '$name' requiert '$require'",E_USER_WARNING);
+                                                    continue;
+                                                }
+                                        
+                                        $OPT = parse_config($module,'option');
+                                        $OPT = array_merge(parse_config($all_modules[$name]->getElementsByTagName('default')->item(0),'option'), $OPT);
+                                        
+                                        include_once(ONYX.'modules/'.$name.'/main.php');
+                                        
+                                        $all_opt[$name] = $OPT;
+                                        
+                                        $load_modules[] = $name;
+                                    }
+                            }
+                        
+                        if($xml->documentElement->getAttribute('cache'))
+                            Cache::set('_configuration_'.FILE,array('var' => $VAR,'env' => $ENV, 'root' => $root,'modules' => $load_modules,'opt' => $all_opt, 'check' => md5_file(ONYX.'config/root.xml').md5_file(ONYX.'modules/modules.xml')));
+                        
+                        else Cache::del('_configuration_'.FILE);
+                    }
+                else trigger_error('Fichier hors de la racine',E_USER_ERROR);
+            }
+        else trigger_error('Configuration erronnee',E_USER_ERROR);
+        
+        define('CACHED',FALSE);
+    }
+
+error_reporting($ENV['error_level']);
+
+set_include_path(get_include_path() . PATH_SEPARATOR . ONYX.'include/');
+
+ignore_user_abort($ENV['ignore_user_abort']);
+
+setLocale(LC_ALL,$ENV['locale']);
+
+date_default_timezone_set($ENV["timezone"]);
+
+if(isset($VAR['chrono']))
+    {
+        function view_chrono()
+            {
+                global $chrono_start,$VAR;
+                echo str_replace('$',round(microtime(TRUE) - $chrono_start,4),$VAR['chrono']);
+            }
+        register_shutdown_function('view_chrono');
+    }
+
+if($ENV['log_php']) ini_set('error_log',ONYX.'log/php.log');
+
+foreach($ENV['ini'] as $name => $value) ini_set($name,$value);
+
+foreach($ENV['header'] as $name => $value) header($name.': '.$value);
+
+unset($xml,$root,$search,$paths,$paths2,$path,$key,$i,$value,$config,$modules,$module,$load_modules,$xml_modules,$all_modules,$name,$require,$OPT,$all_opt,$dir,$file,$ENV,$cached);
+
+?>
\ No newline at end of file
diff --git a/onyx2/log/php.log b/onyx2/log/php.log
new file mode 100755
index 0000000..e69de29
diff --git a/onyx2/modules/bbcode/main.php b/onyx2/modules/bbcode/main.php
new file mode 100644
index 0000000..db64ce5
--- /dev/null
+++ b/onyx2/modules/bbcode/main.php
@@ -0,0 +1,60 @@
+<?php
+
+if(!defined('ONYX')) exit;
+
+$bbcode_config = $OPT;
+
+function bbcode($var,$level=0)
+	{
+		global $bbcode_config;
+		
+		switch($level)
+			{
+				case 1:
+				$pattern[] = '#\\[code\\](.+?)\\[/code\\]#us';
+				$replace[] = '<pre>$1</pre>';
+				
+				$pattern[] = '#\\[size=([1-3][0-9])\\](.+?)\\[/size\\]#us';
+				$replace[] = '<span style="font-size: $1px;">$2</span>';
+				
+				$pattern[] = '#\\[color=(aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|purple|red|silver|teal|white|yellow|\\#[0-9A-Fa-f]{6})\\](.+?)\\[/color\\]#us';
+				$replace[] = '<span style="color: $1;">$2</span>';
+				
+				$pattern[] = '#\\[img\\]http(s)?://([a-zA-Z0-9_/.%*+~,;:\\#-]+)\\[/img\\]#u';
+				$replace[] = '<img src="http$1://$2" alt="$2" />';
+				
+				default:
+				case 0:
+				$pattern[] = '#\\[url=(?:http(s)?://)?([a-zA-Z0-9_/.%*+~,;:?&=\\#-]+)\\](.+?)\\[/url\\]#u';
+				$replace[] = '<a href="http$1://$2">$3</a>';
+				
+				$pattern[] = '#\\[url\\](?:http(s)?://)?([a-zA-Z0-9_/.%*+~,;:?&=\\#-]+)\\[/url\\]#u';
+				$replace[] = '<a href="http$1://$2">$2</a>';
+				
+				$pattern[] = '#\\[cite\\](.+?)\\[/cite\\]#us';
+				$replace[] = '<q>$1</q>';
+				
+				$pattern[] = '#\\[u\\](.+?)\\[/u\\]#us';
+				$replace[] = '<ins>$1</ins>';
+				
+				$pattern[] = '#\\[i\\](.+?)\\[/i\\]#us';
+				$replace[] = '<em>$1</em>';
+				
+				$pattern[] = '#\\[b\\](.+?)\\[/b\\]#us';
+				$replace[] = '<strong>$1</strong>';
+				
+				if(isset($bbcode_config['smiley']) && isset($bbcode_config['smiley_dir']))
+                                    foreach($bbcode_config['smiley'] as $keys => $values)
+					{
+						$pattern[] = '#'.preg_quote($values).'#u';
+						$replace[] = '<img src="'.$bbcode_config['smiley_dir'].'/'.htmlspecialchars($keys).'.gif" alt="'.htmlspecialchars($keys).'" />';
+					}
+			}
+		
+		$pattern = array_reverse($pattern);
+		$replace = array_reverse($replace);
+		
+		$var = preg_replace($pattern,$replace,$var);
+		return $var;
+	}
+?>
\ No newline at end of file
diff --git a/onyx2/modules/captcha/fonts/0.ttfdd b/onyx2/modules/captcha/fonts/0.ttfdd
new file mode 100644
index 0000000..40c89c0
Binary files /dev/null and b/onyx2/modules/captcha/fonts/0.ttfdd differ
diff --git a/onyx2/modules/captcha/fonts/1.ttf b/onyx2/modules/captcha/fonts/1.ttf
new file mode 100644
index 0000000..c5197c2
Binary files /dev/null and b/onyx2/modules/captcha/fonts/1.ttf differ
diff --git a/onyx2/modules/captcha/main.php b/onyx2/modules/captcha/main.php
new file mode 100644
index 0000000..94e8610
--- /dev/null
+++ b/onyx2/modules/captcha/main.php
@@ -0,0 +1,121 @@
+<?php
+if(!defined('ONYX')) exit;
+
+$_ONYX_OPT_CAPTCHA = $OPT;
+
+class Captcha
+{
+	static function check($entry)
+	{
+	  $SESS = new Session();
+
+	  return isset($SESS->values["_captcha"]) && $SESS->values["_captcha"] == strtolower($entry);
+	}
+
+	private static function genImg()
+	{
+		global $_ONYX_OPT_CAPTCHA;
+		$SESS = new Session();
+
+		//Création de l'image à partir d'un fond
+		$_img = imagecreate($_ONYX_OPT_CAPTCHA["sizeX"], $_ONYX_OPT_CAPTCHA["sizeY"]);
+		imagefilledrectangle($_img, 0, 0, $_ONYX_OPT_CAPTCHA["sizeX"], $_ONYX_OPT_CAPTCHA["sizeY"], imagecolorallocate($_img, $_ONYX_OPT_CAPTCHA["back"]["red"], $_ONYX_OPT_CAPTCHA["back"]["green"], $_ONYX_OPT_CAPTCHA["back"]["blue"]));
+
+		//Définition de la liste des caractères
+		if (empty($_ONYX_OPT_CAPTCHA["caracteres"]))
+			$caracteres = "2345678azertypsdfhjkmwxcbn";
+		else
+			$caracteres = $_ONYX_OPT_CAPTCHA["caracteres"];
+		$nb_caracteres = strlen($caracteres) - 1;
+
+		//On récupère tous les fichiers de polices
+		if (empty($_ONYX_OPT_CAPTCHA["fonts_dir"]))
+			$fontsDir = ONYX."modules/captcha/fonts";
+		else
+			$fontsDir = ONYX.$_ONYX_OPT_CAPTCHA["fonts_dir"];
+
+		$fonts = glob($fontsDir."/*.ttf");
+		$nb_fonts = count($fonts) - 1;
+
+		//On définit des couleurs
+		if (empty($_ONYX_OPT_CAPTCHA["colors"]) || !is_array($_ONYX_OPT_CAPTCHA["colors"]))
+			$colors = array(
+				imagecolorallocate($_img, rand(250,225), rand(0,25), rand(0,25)),
+				imagecolorallocate($_img, rand(0,25), rand(250,225), rand(0,25)),
+				imagecolorallocate($_img, rand(0,55), rand(0,55), rand(250,255)),
+				imagecolorallocate($_img, rand(0,25), rand(250,225), rand(250,225)),
+				imagecolorallocate($_img, rand(250,225), rand(0,25), rand(250,225)),
+				imagecolorallocate($_img, rand(250,225), rand(250,225), rand(0,25)),
+				//imagecolorallocate($_img, rand(200,225), rand(200,225), rand(200,225))
+				imagecolorallocate($_img, rand(0,55), rand(0,55), rand(0,55))
+			);
+		else
+			$colors = $_ONYX_OPT_CAPTCHA["colors"];
+		$nb_colors = count($colors) - 1;
+
+		//On définit la couleur de fond
+		$arriere_plan = imagecolorallocatealpha($_img, 0, mt_rand(0,255), 0, 127);
+
+		$SESS->values["_captcha"] = "";
+
+		$dist = $_ONYX_OPT_CAPTCHA["sizeX"] / $_ONYX_OPT_CAPTCHA["nb_carac"];
+		$dist2 = $dist / 2;
+		$dist4 = $dist2 / 2;
+		$height2 = $_ONYX_OPT_CAPTCHA["sizeY"] / 2;
+		$height4 = $height2 / 2;
+
+		//Si la configuration indique un fichier contenant des mots, on l'utilise
+		if (!empty($_ONYX_OPT_CAPTCHA["mots"]) && is_readable(ONYX."modules/captcha/".$_ONYX_OPT_CAPTCHA["mots"]))
+		  {
+		    $mot = file(ONYX."modules/captcha/".$_ONYX_OPT_CAPTCHA["mots"], FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES);
+		    $mot = $mot[mt_rand(0, count($mot) - 1)];
+		  }
+
+		//Création du captcha en lui-même
+		for($i = 0; $i < $_ONYX_OPT_CAPTCHA["nb_carac"]; $i++)
+		{
+		  if (empty($mot) || empty($mot[$i]))
+		    {
+		      if (mt_rand(0,2) == 1)
+			$char = strtoupper($caracteres[mt_rand(0, $nb_caracteres)]);
+		      else
+			$char = $caracteres[mt_rand(0, $nb_caracteres)];
+		    }
+		  else
+		    $char = $mot[$i];
+
+		  ImageTTFText($_img, mt_rand(14,23), mt_rand(-17, 20), $i * $dist + mt_rand(0,$dist2), mt_rand(0, $height4) + $height2, $colors[mt_rand(0, $nb_colors)], $fonts[mt_rand(0, $nb_fonts)], $char);
+
+		  $SESS->values["_captcha"] .= strtolower($char);
+		}
+		$SESS->put();
+
+		return $_img;
+	}
+
+	static function newCaptcha()
+	{
+		ob_start();
+		imagepng(Captcha::genImg());
+		return base64_encode(ob_get_clean());
+	}
+
+	static function _debug()
+	{
+		return base64_decode(Captcha::newCaptcha());
+	}
+
+	static function printNewCaptcha()
+	{
+		print "data:image/png;base64,".Captcha::newCaptcha();
+	}
+
+	static function showNewCaptcha()
+	{
+		header ("Content-type: image/png");
+
+		imagepng($_img = Captcha::genImg());
+		imagedestroy($_img);
+	}
+}
+?>
\ No newline at end of file
diff --git a/onyx2/modules/captcha/mots.list b/onyx2/modules/captcha/mots.list
new file mode 100644
index 0000000..7d1d6b5
--- /dev/null
+++ b/onyx2/modules/captcha/mots.list
@@ -0,0 +1,3834 @@
+Nevertheless
+experts
+effects
+health
+serious
+example
+radiation
+affect
+concentratio
+memory
+cancer
+Consequently
+schools
+banned
+teacher
+suffered
+headaches
+burning
+sensations
+Recherche
+brouillon
+minutes
+Recherche
+analogie
+exemples
+rapportant
+Penser
+historique
+sociologique
+volutions
+scientifique
+anthropologi
+autres
+Penser
+rience
+personnelle
+Penser
+rumeurs
+opinion
+publique
+appelle
+essayant
+pousser
+arguments
+possible
+partant
+exemples
+espace
+diterran
+limites
+difficiles
+tracer
+exemple
+Portugal
+abords
+propre
+espace
+contraste
+mographique
+industriel
+contraste
+veloppement
+Maghreb
+partie
+contraste
+existe
+toujours
+opposition
+niveau
+croissance
+conomique
+veloppement
+riches
+France
+Italie
+Espagne
+accroissemen
+faible
+opposition
+Proche
+Orient
+enfants
+Europe
+aujourd
+continent
+grande
+croissance
+valable
+continent
+surtout
+historiqueme
+dragons
+Singapour
+expansion
+suivie
+beaucoup
+pacifique
+Malaisie
+Philippines
+Vietnam
+veloppement
+initiateur
+clencheur
+expansion
+asiatique
+passer
+Toyota
+renfloue
+industrie
+automobile
+ricaine
+bourse
+Street
+changes
+peuvent
+marchandises
+capitaux
+technologies
+mondialisati
+conomique
+capitalisme
+interviennen
+possible
+changes
+conomie
+principaux
+acteurs
+particulier
+multinationa
+mondialisati
+voulue
+grandes
+riches
+entendu
+pauvres
+pauvres
+fortes
+mesurer
+utiliser
+habitants
+Programme
+Nations
+veloppement
+invent
+Indice
+veloppement
+Humain
+indicateur
+combine
+mographique
+savoir
+alphab
+tisation
+nombre
+habitant
+indice
+bonheur
+absolu
+distances
+conomique
+trouve
+plaine
+Appalaches
+histoire
+circulation
+fluviale
+Michigan
+plateau
+central
+fertile
+Alaska
+grandes
+ensemble
+particulier
+naturel
+pacifique
+montagnes
+isolent
+plaine
+centrale
+immigration
+particuli
+rement
+immigration
+saxonne
+immigration
+exclusivemen
+pauvres
+encore
+partie
+colonie
+tablissement
+nation
+appartenant
+groupe
+dominant
+pendance
+souverainet
+colonies
+peuplement
+colonis
+colonisateur
+colonisation
+pendance
+Canada
+appartient
+Anglais
+Afrique
+colonisation
+petite
+partie
+France
+Anglais
+Afrique
+Depuis
+Australie
+Nouvelle
+Anglais
+appartient
+anglais
+France
+conservera
+finalement
+petite
+colonisation
+accords
+autres
+guerres
+coloniales
+Royaume
+faveur
+accords
+tandis
+guerres
+coloniales
+taient
+matiques
+Portugal
+Royaume
+travailliste
+reviennent
+pouvoir
+annoncent
+officielleme
+gociations
+Common
+Wealth
+commence
+Empire
+France
+consensus
+favorable
+colonisation
+Depuis
+quelques
+sondages
+population
+communiste
+hostile
+colonisation
+Indochine
+Brazzaville
+Gaulle
+rejette
+pendance
+autonomie
+orique
+statut
+particulier
+satisfait
+revendicatio
+naissantes
+meutes
+sanglantes
+clatent
+juillet
+proposent
+reconstructi
+Brettons
+reconstruise
+mondial
+monnaies
+valaient
+naissance
+Internationa
+doctrine
+Jdanov
+Pologne
+septembre
+vidence
+existants
+ritable
+glaciation
+Staline
+ritable
+socialistes
+occidentaux
+consid
+changement
+politique
+Khrouchtchev
+ritage
+Staline
+nombre
+crises
+Europe
+Pologne
+Hongrie
+particuli
+rement
+avions
+espions
+couvrent
+quelques
+tiques
+agissent
+violemment
+Kennedy
+discours
+demandant
+retrait
+blocus
+pendant
+plusieurs
+guerre
+dissout
+assembl
+gaullistes
+gagnent
+lections
+gislatives
+tudiants
+pouvaient
+encore
+puisque
+majorit
+gauche
+traditionnel
+novatrices
+Comment
+parvient
+rationalisme
+consiste
+connaissance
+rationnelle
+raison
+essence
+animal
+raison
+Descartes
+Spinoza
+Leibniz
+Contre
+rationaliste
+empiristes
+rience
+permet
+tablir
+vraiment
+connaissance
+Berkeley
+accessible
+esprit
+humain
+dogmatique
+existe
+esprit
+humain
+atteindre
+Platon
+Descartes
+Spinoza
+Leibniz
+septique
+doctrine
+laquelle
+certain
+existe
+existe
+inaccessible
+esprit
+humain
+Pyrrhon
+Nietzsche
+spiritualist
+esprit
+humain
+distincte
+pendant
+Berkeley
+Bergson
+rialiste
+consid
+mocrite
+courant
+Epicure
+Diderot
+Volont
+synonyme
+plaisir
+sacrifier
+certain
+plaisir
+obtenir
+libert
+action
+libert
+volont
+arbitre
+finition
+ignore
+Exemple
+Descartes
+louche
+interdit
+tenter
+chance
+libert
+action
+savoir
+cision
+librement
+libert
+libert
+France
+peuple
+exprimer
+opinion
+chacun
+voyager
+tranger
+autorisation
+personne
+parler
+partir
+savoir
+instruction
+permet
+judicieuseme
+moyens
+voyager
+distinction
+tablie
+libert
+abstraite
+formelle
+libert
+libert
+minimum
+instruction
+minimum
+argent
+libert
+simple
+possibilit
+pouvoir
+Comment
+expliquer
+conscience
+individuelle
+velopp
+groupes
+primitive
+cialisation
+pratiquement
+inexistante
+chacun
+autres
+membres
+groupe
+Uniformit
+uniformit
+valeurs
+penser
+volution
+industrielle
+valeur
+dominante
+Occident
+utilit
+performance
+vitesse
+individualis
+individualis
+individu
+canismes
+flexifs
+psychologiqu
+sociologique
+dominent
+conscience
+ignore
+mesure
+sultat
+canique
+classe
+sociale
+Descartes
+refuse
+possibilit
+inconsciente
+inconscient
+psychique
+finition
+sienne
+vouloir
+imaginer
+sentir
+figures
+produit
+conscience
+Durkheim
+conscience
+morale
+personnelle
+chacun
+conscience
+collective
+caract
+ristiques
+majeures
+devoir
+minemment
+sociales
+devoir
+collectif
+coercitif
+contrainte
+devoir
+conscience
+morale
+adresse
+caract
+transcendant
+devoir
+Transcendanc
+devoir
+transcendanc
+rapport
+individu
+interpr
+tation
+sociologique
+devoir
+risque
+morale
+conformisme
+devoir
+coutumes
+groupe
+auquel
+appartient
+morale
+conflits
+sociales
+tablies
+Exemple
+Antigone
+Sophocle
+devoirs
+intime
+bouche
+conscience
+morale
+personnelle
+Antigone
+semble
+conscience
+collective
+objection
+Antigone
+appartient
+groupes
+familles
+communaut
+religieuses
+imposent
+devoirs
+contraires
+devoirs
+citoyenne
+conscience
+personnelle
+encore
+devoirs
+impose
+appartenance
+Nouvelle
+Objection
+soumettre
+sollicitatio
+contradictoi
+Pascal
+risque
+risque
+raisonnable
+Argument
+quitable
+prendre
+compte
+probabilit
+obtenir
+possible
+Pascal
+suivant
+terrestre
+possible
+ternelle
+atitude
+paradis
+avantageux
+misant
+ternelle
+infiniment
+avantageux
+risque
+religieuse
+ressentie
+besoin
+souffre
+souffre
+ressent
+souffrance
+insupportabl
+impression
+souffrance
+absurde
+religion
+conjure
+impression
+absurdit
+disant
+rassure
+souffres
+religion
+apaise
+souffrance
+incapable
+maladie
+souffre
+patient
+entretient
+maladie
+religion
+apparait
+souvent
+imaginaire
+apparenter
+comportement
+vrotique
+Exemple
+christianism
+acosmisme
+appartient
+apolitisme
+affaires
+Original
+signifie
+exceptionnel
+unique
+commencement
+artiste
+imitateur
+reproduit
+cesseurs
+reproduire
+nature
+caract
+artiste
+ensemble
+donnent
+oeuvre
+disposition
+esprit
+laquelle
+nature
+critique
+romantique
+profit
+traditionnel
+ritable
+artiste
+inspiration
+verbes
+distinguer
+preuve
+produits
+inspiration
+peuvent
+mauvaise
+qualit
+artiste
+maudit
+artiste
+personnage
+officiel
+valeurs
+dominantes
+laquelle
+exemple
+bourgeois
+gentilhomme
+visait
+ridiculiser
+singer
+noblesse
+ridicule
+commun
+commun
+condens
+flatte
+noblesse
+classe
+dominante
+France
+travail
+technique
+innove
+permanence
+volution
+historique
+moyens
+travail
+humain
+activit
+instinctive
+animaux
+lentement
+volution
+technique
+distingue
+conomique
+distingue
+conomique
+produit
+produit
+instinct
+animal
+transmission
+ditaire
+tandis
+technique
+transmet
+ritage
+apprentissag
+Gourhan
+organisation
+physique
+possible
+cessaire
+apparition
+technique
+retrouve
+sophismes
+Protagoras
+analyse
+travail
+capitalistes
+caract
+capitaliste
+ralisation
+marchandises
+travail
+devient
+marchandise
+change
+capitalisme
+invent
+travail
+ralisation
+salariat
+travail
+vendre
+appartient
+salari
+esclave
+appartient
+employ
+patron
+amoureux
+instinct
+sexuel
+instinct
+reproduction
+amoureux
+asservi
+travers
+volont
+puissante
+risque
+sacrifier
+diatis
+comparaison
+autres
+alisation
+tendance
+humiliation
+instinct
+reproduction
+exprime
+inconsciemme
+amoureux
+sacrifice
+individu
+Illusion
+amoureux
+poursuivre
+bonheur
+personnel
+instrument
+volont
+puissante
+nation
+amoureux
+Schopenhauer
+marier
+possible
+prendre
+horreur
+quelqu
+Obligation
+juridique
+positive
+existe
+consulter
+exemple
+acquitter
+existe
+devoirs
+stricts
+devoirs
+premiers
+tement
+termin
+obligatoires
+seconds
+laissent
+libert
+initiative
+exemple
+serment
+secret
+assister
+indigents
+bonheur
+dessein
+finalit
+bonheur
+alisable
+constitution
+dualit
+gative
+absence
+douleur
+positive
+forces
+sentiments
+plaisir
+Finalement
+plaisir
+perdure
+devenir
+pouvons
+intens
+contraste
+Descartes
+connaissais
+toujours
+clairement
+serais
+jamais
+jugement
+devrais
+serais
+rement
+jamais
+indiff
+indiff
+Descartes
+libert
+connaissance
+picure
+picurisme
+convient
+rarchiser
+parler
+besoins
+naturels
+cessaires
+manger
+dormir
+besoins
+naturels
+cessaires
+manger
+reproduire
+besoins
+naturels
+cessaires
+manger
+couverts
+philosophie
+pratique
+mettre
+application
+moniste
+interm
+diaire
+sentations
+impossible
+savoir
+sentations
+comparaisons
+impossible
+fausset
+sentation
+lorsqu
+contredit
+autres
+sentations
+Exemple
+lorsque
+sentations
+tactiles
+visuelles
+contredisent
+fausse
+quence
+serait
+intense
+sentations
+organisme
+organisme
+vivant
+montre
+marche
+Descartes
+nature
+vivant
+machine
+Descartes
+inaugure
+tradition
+strictement
+caniste
+terministe
+biologie
+justice
+impuissante
+respect
+mettre
+ensemble
+justice
+besoin
+solutions
+envisageable
+fortifier
+justice
+hommes
+savent
+justice
+justifier
+justificatio
+illusoire
+pouvoir
+social
+rarchie
+fonction
+discours
+ologique
+croire
+pouvoir
+parfaits
+honorent
+puissants
+pensent
+injustices
+terrestres
+partie
+timent
+hommes
+plient
+nitence
+participer
+injustices
+devoir
+parables
+impliquent
+contrat
+chacun
+quelque
+autrui
+contract
+contrat
+stipulant
+change
+services
+Exemple
+Descartes
+nature
+consiste
+pesante
+touche
+quelque
+seulement
+substance
+tendue
+longueur
+largeur
+profondeur
+quelque
+mesure
+Oxydant
+oxydant
+chimique
+capable
+capter
+plusieurs
+lectrons
+ducteur
+ducteur
+chimique
+capable
+plusieurs
+lectrons
+Couple
+oxydant
+ducteur
+couple
+oxydant
+ducteur
+ensemble
+oxydant
+ducteur
+corresponden
+actions
+oxydor
+duction
+Dispersion
+milieu
+dispersif
+propage
+quence
+source
+Diffraction
+diffraction
+intervient
+lorsque
+dimensions
+obstacle
+grandeur
+petites
+longueur
+vitesse
+longueur
+restent
+inchang
+multiple
+existe
+entier
+divisible
+multiple
+divise
+nombres
+multiples
+existe
+triangles
+semblables
+seulement
+longueurs
+proportionne
+longueurs
+similitude
+transformati
+conserve
+rapports
+longueurs
+conserve
+longueurs
+appelle
+plupart
+subduction
+existe
+accumulation
+diments
+niveau
+prisme
+diments
+apport
+lithosph
+anique
+plongeante
+contact
+plaque
+chevauchante
+collision
+toujours
+plaques
+lithosph
+riques
+continentale
+convergentes
+quence
+former
+montagnes
+collision
+exemple
+Himalaya
+Attention
+toutes
+montagnes
+collision
+existaient
+centaine
+millions
+appelait
+failles
+inverses
+roches
+dimentaires
+prouve
+marges
+passives
+convergence
+Lorsque
+placement
+faille
+chevauchemen
+bordures
+retrouve
+nappes
+roches
+dimentaires
+roches
+centes
+nappes
+charri
+plusieurs
+dizaines
+appelle
+nappes
+charriage
+nombreuses
+ressemblance
+actuelles
+peuvent
+hasard
+consid
+toutes
+vivantes
+actuelles
+fossiles
+origine
+commune
+commun
+parent
+proches
+apparue
+environ
+milliards
+cellules
+procaryotes
+volution
+majeure
+apparition
+cellules
+eucaryotes
+environ
+milliards
+millions
+apparaissent
+sarcopt
+rygiens
+articulation
+membres
+basale
+appartenance
+humaine
+corresponden
+caract
+partag
+ensemble
+hominin
+comparaison
+chimpanz
+hominin
+chelle
+stratigraphi
+ologiques
+histoire
+permet
+ordonner
+nements
+ologiques
+biologiques
+distingue
+organisation
+Ordonner
+roches
+relatives
+datation
+relative
+Recherche
+isotopes
+radioactifs
+datation
+absolue
+chelle
+stratigraphi
+ologiques
+histoire
+permet
+ordonner
+nements
+ologiques
+biologiques
+ensemble
+caract
+risent
+nombreux
+caract
+identiques
+transmis
+rations
+rations
+preuve
+certaine
+stabilit
+Chaque
+individu
+propres
+caract
+ristiques
+preuve
+certaine
+variabilit
+mutation
+existe
+substitution
+remplacement
+addition
+insertion
+suppression
+assure
+passage
+passage
+cellule
+prophase
+accompagne
+duplication
+individualis
+chromosomes
+assiste
+appariement
+chromosomes
+regroupent
+taphase
+anaphase
+homologues
+chromosomes
+migrent
+cellulaires
+condensent
+cytodi
+applique
+lophase
+taphase
+chaque
+cellule
+chromosomes
+regroupent
+centre
+transmission
+sanguine
+enfant
+accouchement
+maternel
+sexuelle
+Durant
+infection
+multiplier
+cellules
+immunitaires
+redescendre
+niveau
+faible
+fixant
+anticorps
+complexes
+immuns
+association
+plusieurs
+anticorps
+plusieurs
+paquets
+neutralise
+cellule
+anticorps
+truisent
+lymphocytes
+cellules
+initier
+production
+anticorps
+lymphocytes
+fabriqu
+moelle
+certaines
+maladies
+mortelles
+anticipe
+contact
+ventuels
+faisant
+immunitaire
+injectant
+immunitaire
+primaire
+maladie
+cellules
+second
+contact
+clenche
+immunitaire
+rapide
+veloppement
+embryonnaire
+notypique
+indiff
+existe
+quatre
+grandes
+rentiation
+notypique
+sexuelle
+chelonner
+veloppement
+embryonnaire
+pubert
+testicules
+notamment
+cellules
+Leydig
+principaux
+acteurs
+production
+testost
+cependant
+cepteurs
+peuvent
+seules
+cellules
+ostasie
+hypophyse
+responsable
+stimulation
+gonades
+hormone
+stimuler
+production
+testost
+ovarien
+moyenne
+naissance
+commenc
+ovogonies
+prophase
+partir
+pubert
+chaque
+quelques
+centaines
+ovogonies
+terminent
+volution
+donner
+nopause
+correspond
+puisement
+ovaire
+ovarien
+compos
+condation
+rencontre
+spermatozo
+ovocyte
+trompe
+spermatozo
+confront
+nombreux
+obstacles
+chorionic
+gonadotropin
+hormone
+proche
+particularit
+placer
+cepteurs
+hormone
+produite
+embryon
+maintient
+ovaire
+Nowadays
+companies
+advertising
+effort
+environment
+influenced
+actions
+question
+ourselves
+companies
+really
+concerned
+environment
+making
+profit
+question
+trying
+answer
+document
+answer
+implies
+sentation
+Bouygues
+Telecom
+Operateur
+communicatio
+France
+Inventeur
+forfait
+pouvoir
+fonctionner
+entreprise
+importance
+informations
+dispose
+performant
+information
+ensemble
+organis
+ressources
+logiciels
+personnels
+permet
+regrouper
+classifier
+traiter
+diffuser
+information
+Bouygues
+Telecom
+budget
+annuel
+Direction
+Information
+levait
+millions
+hormones
+contenues
+pilules
+exercent
+permanence
+trocontr
+complexe
+hypotalamo
+hypophysaire
+production
+faible
+constante
+fonctionneme
+cyclique
+ovaire
+ovulation
+contraceptif
+galement
+action
+glaire
+cervicale
+course
+customers
+change
+operations
+managers
+produce
+current
+society
+society
+wanting
+reduce
+satisfying
+customer
+Operations
+managers
+changes
+environment
+ethics
+preoccupatio
+rising
+public
+became
+ethical
+practices
+companies
+corruption
+employee
+started
+concerned
+Companies
+themselves
+careful
+issues
+ethical
+social
+responsibili
+operations
+managers
+changes
+Indeed
+supply
+instance
+occasions
+salespeople
+bribes
+customers
+Thanks
+people
+became
+environmenta
+issues
+governments
+started
+involved
+resolving
+problems
+Marketing
+actions
+emissions
+packaging
+Organic
+products
+recycled
+recyclable
+materials
+Presentation
+company
+Second
+largest
+cosmetic
+franchise
+stores
+countries
+products
+utilis
+depuis
+antiquit
+premier
+forage
+commenc
+ellement
+exploit
+facteur
+clencheur
+seconde
+volution
+industrielle
+destin
+nombreux
+hommes
+Staline
+commenc
+apparatchik
+leader
+syndical
+centre
+trolier
+George
+sident
+Zapata
+devenir
+sident
+occupent
+places
+classement
+chiffre
+affaires
+grosses
+entreprises
+industrielle
+volution
+responsabili
+indiscutable
+cycles
+conomiques
+depuis
+inflation
+stimul
+troliers
+contre
+inflation
+doivent
+beaucoup
+trolier
+excellence
+velopp
+Cependant
+questions
+posent
+ressources
+renouvelable
+pourrait
+optique
+demander
+comment
+devenu
+mondial
+premiers
+signes
+montrent
+sormais
+fonction
+attribu
+durant
+Guerres
+Mondiales
+transversale
+lorsque
+points
+milieu
+propagation
+placent
+perpendicula
+irement
+placement
+transport
+transfert
+nergie
+Exemples
+surface
+diffraction
+consiste
+passer
+petite
+dimension
+figure
+diffraction
+toujours
+perpendicula
+largeur
+centrale
+diminue
+largeur
+augmente
+inversement
+capacit
+condensateur
+exprime
+Exemple
+condensateur
+constitu
+plaques
+talliques
+isolent
+ralement
+isolant
+appelle
+lectrique
+atomique
+nombre
+changer
+noyaux
+isotopes
+existe
+noyaux
+stables
+exemple
+carbone
+noyaux
+instables
+exemple
+carbone
+rience
+visualise
+oscilloscope
+ultrasonore
+metteur
+cepteur
+toutes
+riodiques
+sinuso
+amplitude
+petite
+certaines
+positions
+metteur
+cepteur
+courbes
+superposent
+appelle
+longueur
+petite
+distance
+parant
+metteur
+cepteur
+permettant
+visualiser
+courbes
+Kepler
+mouvement
+autour
+soleil
+rentiel
+liocentrique
+appliquent
+galement
+satellites
+autour
+rentiel
+ocentrique
+satellite
+mouvement
+circulaire
+uniforme
+autour
+vitesse
+distance
+rentiels
+utilis
+rentiels
+pourra
+appliquer
+Newton
+existe
+rentiels
+rentiels
+terrestres
+trouvant
+rentiels
+ocentriques
+satellites
+terrestres
+rentiels
+liocentrique
+pendule
+simple
+constitu
+importante
+souvent
+aluminium
+longueur
+importante
+exprime
+secondes
+cessaire
+retour
+nergies
+expriment
+Joules
+pouvoir
+fonctionner
+entreprise
+importance
+informations
+dispose
+performant
+information
+ensemble
+organis
+ressources
+logiciels
+personnels
+permet
+regrouper
+classifier
+traiter
+diffuser
+information
+started
+herself
+school
+started
+magazine
+although
+career
+expanding
+studies
+affected
+classmates
+actively
+participates
+aspects
+estate
+development
+projects
+evaluation
+development
+planning
+construction
+marketing
+involved
+decisions
+initial
+making
+details
+interiors
+selections
+residences
+suites
+recrutement
+employ
+changent
+chaque
+Importance
+valeurs
+entreprise
+Importance
+situation
+familiale
+cathlon
+opened
+France
+Michel
+Leclerq
+wanted
+create
+beginners
+passionate
+prices
+cathlon
+extended
+passing
+simple
+seller
+designer
+extension
+Quickly
+started
+create
+brands
+number
+regrouping
+sports
+before
+cathlon
+attention
+during
+recruitment
+employees
+should
+believe
+respect
+values
+company
+values
+important
+cathlon
+attitude
+behavior
+employees
+including
+highest
+managers
+lequel
+travaill
+toiles
+cependant
+servit
+pendant
+seconde
+guerre
+mondiale
+entreprise
+actuelle
+propri
+maintenant
+chambres
+restaurant
+salles
+ception
+chiffre
+affaire
+million
+livres
+entreprise
+familiale
+directeurs
+propri
+taires
+quatre
+relation
+privil
+Western
+cependant
+principaleme
+marketing
+connue
+entier
+publicitaire
+majeur
+plupart
+servations
+provient
+Western
+annuellement
+respecter
+beaucoup
+Western
+fourni
+divers
+objets
+publicitaire
+gobelets
+dessous
+verres
+ration
+troite
+employ
+chelle
+ailleurs
+contact
+managers
+gouvernante
+difficile
+progresser
+chelle
+rarchique
+principaleme
+langue
+plupart
+employ
+trangers
+trisent
+suffisamment
+langue
+anglaise
+puisse
+attribuer
+postes
+responsabili
+gouvernante
+vocals
+guitar
+keyboard
+vocals
+Clayton
+guitar
+Mullen
+percussions
+September
+released
+limited
+Ireland
+entitled
+December
+performed
+London
+February
+second
+single
+another
+released
+target
+audience
+similar
+conventional
+drinks
+companies
+everybody
+attracted
+products
+mainly
+target
+sportsmen
+youngsters
+tourists
+countries
+because
+really
+energetic
+drinks
+Pourtant
+peuvent
+tromper
+seraient
+autant
+plupart
+ellement
+rendre
+compte
+poursuis
+puisque
+trompe
+Pourtant
+mettant
+tranger
+porter
+regard
+critique
+Montaigne
+explique
+Essais
+renversement
+hensif
+indiens
+nouveau
+sauvages
+Imaginons
+maintenant
+actions
+propre
+culture
+seraient
+certainement
+sociales
+abandon
+serrure
+cylindrique
+ricain
+Londres
+Premier
+dirigeable
+Giffard
+France
+Pasteur
+introduit
+pasteurisati
+France
+Alfred
+invente
+dynamite
+Ouverture
+Allemand
+couvre
+lectromagn
+tiques
+Holland
+marine
+ricaine
+Premier
+ventilateur
+introduit
+montage
+production
+financi
+licopt
+Sikorsky
+Guyane
+partement
+France
+Atlantique
+Suriname
+couverte
+grande
+partie
+Guyane
+territoire
+toient
+plusieurs
+populations
+diverses
+origines
+diviser
+citoyens
+grands
+groupes
+guyanais
+pandus
+Guyane
+puisqu
+sentent
+population
+Viennent
+ensuite
+rindiens
+ethnies
+nombre
+Marrons
+quatre
+ethnies
+environ
+territoire
+Guyane
+sentent
+personnes
+tropolitains
+sentent
+population
+autres
+Chinois
+siliens
+Surinamiens
+environ
+Convention
+Nations
+droits
+Enfant
+Assembl
+Nations
+novembre
+groupe
+sentants
+trentaine
+organisation
+gouvernement
+Solidarit
+droits
+respecter
+Convention
+Nations
+droits
+enfant
+cident
+adopter
+droits
+ducation
+parents
+responsables
+ducation
+enseignement
+gratuit
+discipline
+scolaire
+respecter
+dignit
+enfants
+prononce
+suivie
+prononce
+milieu
+voyelle
+prononce
+milieu
+lorsqu
+consonne
+pauvres
+commun
+suffisantes
+commun
+riches
+commun
+Croire
+plaisir
+sybarite
+Voltaire
+existence
+consacr
+uniquement
+plaisir
+Phrase
+gative
+montre
+saccord
+termes
+joratifs
+veries
+utopie
+sybarite
+joratif
+personne
+voluptueuse
+Voltaire
+plaisir
+cessit
+respecter
+certain
+nombre
+contraintes
+Hippocrate
+aspect
+solide
+envisag
+fractures
+compos
+liquide
+liquides
+quilibre
+maladie
+maladie
+liquides
+apparaissent
+quilibre
+Maladie
+lateur
+quilibre
+humeurs
+Claude
+Bernard
+disait
+decine
+hippocratiqu
+alable
+decine
+scientifique
+decine
+observation
+laquelle
+examens
+decine
+initiatrice
+biologie
+Aristote
+biologie
+biologie
+savoir
+connaissance
+biosph
+toutes
+formes
+fonctions
+savoir
+orique
+topique
+influence
+plusieurs
+facteurs
+importance
+narcissisme
+ressemble
+sensible
+perception
+conscient
+fonction
+gration
+laboration
+permanente
+psychiques
+compte
+spatialit
+temporalit
+circonf
+rieure
+faisant
+larynx
+hauteur
+descend
+oblique
+hauteur
+divise
+bronches
+bronches
+primitives
+droite
+gauche
+muqueux
+marque
+division
+bronches
+primitives
+Lorsque
+explorer
+poumons
+endoscopie
+souple
+passant
+branche
+droite
+pulmonaire
+orient
+frontal
+gauche
+droite
+crosse
+pulmonaire
+enrouler
+autour
+bronchique
+chaque
+donner
+branches
+suivent
+bronchique
+Fiction
+orientale
+contourner
+censure
+critique
+satire
+despotisme
+oriental
+critiquer
+institutions
+Voltaire
+montre
+interdiction
+lecture
+conduit
+cadence
+peuple
+utilisant
+ironie
+Rousseau
+philosophie
+pessimiste
+Hommes
+peuvent
+victimes
+moment
+derniers
+Hommes
+Rousseau
+permanente
+Hommes
+Travailler
+devoir
+indispensabl
+social
+travail
+permet
+velopper
+dagogie
+active
+travail
+manuel
+artisanat
+travail
+rieure
+superlatifs
+rapproche
+nature
+pendante
+fortune
+artisan
+travailler
+permet
+gagner
+libert
+petitesse
+oxymore
+domine
+univers
+cachot
+Question
+torique
+infini
+Formule
+interpr
+tative
+subjonctif
+consid
+regarde
+recherche
+apprenne
+racont
+conversation
+Montaigne
+faisait
+voyage
+personne
+cheval
+nonciation
+beaucoup
+vivant
+employait
+simple
+imparfait
+cessit
+remettre
+autres
+opinions
+jugements
+autrui
+associ
+expressions
+gatives
+accordent
+opinions
+autres
+souvent
+fausses
+cessit
+remettre
+permettre
+construire
+propres
+opinions
+Sartre
+existentiali
+philosophie
+libert
+responsabili
+sommes
+faisons
+destin
+serait
+avance
+engagement
+auteur
+analyse
+stalinisme
+maccarthysme
+montre
+autres
+enjeux
+bipolaris
+Stalinienne
+Maccarthysme
+Pyrrhus
+rament
+violent
+orgueilleux
+rieure
+amoureux
+Andromaque
+Hermione
+Sparte
+origine
+guerre
+vement
+princesse
+termine
+souvent
+actions
+Oreste
+assassiner
+Pyrrhus
+Pyrrhus
+aliser
+pourquoi
+venger
+Hermione
+complot
+politique
+sentiment
+inexpliqu
+inexplicable
+aucune
+analyse
+raisons
+laissent
+emporter
+discernement
+volont
+condamn
+avance
+destin
+destination
+termine
+nements
+avance
+Oreste
+synonyme
+diction
+descend
+Agamemnon
+famille
+Atrides
+famille
+tragique
+victime
+premier
+famille
+enfants
+festin
+famille
+maudite
+always
+subway
+drawing
+panels
+drawings
+simple
+Pyramids
+flying
+saucers
+figures
+animals
+babies
+around
+became
+signature
+daytime
+always
+people
+watching
+propage
+milieux
+transparents
+milieux
+opaques
+Certaines
+surfaces
+chissent
+miroir
+surface
+blanche
+autres
+absorbent
+objets
+Remarque
+permet
+mesure
+grandes
+distances
+fonctionne
+principe
+permet
+mesure
+position
+objets
+maritimes
+liaison
+covalente
+atomes
+correspond
+commun
+chacun
+lectron
+couche
+externe
+lectrons
+forment
+doublet
+doublet
+commun
+atomes
+consid
+appartenant
+chacun
+atomes
+finition
+fraction
+changement
+direction
+lorsqu
+traverse
+surface
+paration
+milieux
+transparents
+blanche
+obtient
+spectre
+continu
+blanche
+toutes
+couleurs
+orange
+indigo
+violet
+constitu
+lumineuse
+caract
+grandeur
+physique
+longueur
+permet
+exprimer
+facilement
+nombres
+mement
+grands
+nombre
+atomes
+intervenant
+chelle
+humaine
+molaire
+monoatomique
+molaire
+correspondan
+polyatomique
+molaire
+substance
+absorbe
+certaines
+radiations
+spectre
+blanche
+traversant
+substance
+spectre
+bandes
+absorption
+absorptions
+missions
+longueur
+chimique
+absorbe
+radiations
+capable
+mettre
+Firstly
+children
+Because
+parents
+Besides
+brothers
+sisters
+Consequently
+enough
+support
+family
+school
+Consequently
+receive
+education
+become
+skilled
+workers
+ninsule
+loponn
+grande
+correspond
+territoire
+Attique
+apparue
+beaucoup
+correspond
+renversement
+Tyrannie
+renversement
+politique
+mocratie
+proclam
+devient
+classique
+formes
+Clisth
+guerres
+diques
+durent
+vainqueur
+reprises
+loponn
+guerres
+loponn
+Sparte
+clatent
+Sparte
+vainqueur
+Claudio
+certain
+viendra
+explique
+spadassins
+doivent
+arrive
+change
+quelques
+paroles
+Marianne
+Octave
+jardin
+population
+mondiale
+multipli
+tandis
+production
+agricole
+multipli
+oriquement
+situation
+alimentaire
+liorer
+disparit
+importantes
+mographique
+Allemagne
+croissance
+postmoderne
+croissance
+proche
+moderne
+Afrique
+seulement
+quelques
+comptoirs
+centre
+Afrique
+encore
+structures
+politiques
+fronti
+continent
+entier
+colonis
+empire
+africain
+France
+morceaux
+Maghreb
+Afrique
+occidentale
+Afrique
+quatoriale
+Madagascar
+colonisation
+empires
+clatent
+nombreux
+africains
+jeunes
+fronti
+souvent
+instables
+injustifi
+abstraites
+atomes
+nombre
+lectrons
+couche
+externe
+regroup
+colonne
+chimiques
+colonne
+calcificatio
+riodique
+propri
+chimiques
+semblables
+forment
+famille
+chimique
+Exemples
+familles
+Famille
+alcalins
+colonne
+hydrog
+partie
+famille
+couche
+externe
+atomes
+lectron
+appelle
+solution
+aqueuse
+solution
+solvant
+dissoudre
+solution
+aqueuse
+compos
+ioniques
+appelle
+dilution
+conservation
+quantit
+Exemple
+diluer
+solution
+signifie
+concentratio
+solution
+concentratio
+solution
+facteur
+dilution
+mocratie
+religion
+assure
+citoyens
+permet
+gration
+citoyens
+religieuse
+culturelle
+civique
+Religion
+polyth
+religieuses
+Panath
+Construction
+nombreux
+monuments
+couverte
+Antiquit
+moyens
+fouilles
+effectu
+notamment
+reconquit
+Espagne
+depuis
+couverte
+textes
+Antiquit
+conserv
+musulmans
+Constantinop
+envahie
+Musulmans
+Seldjouqides
+fuient
+emportant
+manuscrits
+antiquit
+naissance
+imprimerie
+Gutenberg
+invente
+Mayence
+imprimerie
+imprime
+premier
+imprimer
+besoin
+papier
+parchemin
+pression
+lettres
+mobiles
+Europe
+Angleterre
+Thomas
+France
+Rabelais
+Mirandole
+Italie
+Machiavel
+forment
+publique
+lettres
+lectriquemen
+neutre
+nombre
+protons
+nombre
+lectrons
+chimique
+ensemble
+atomes
+isotopes
+nombre
+protons
+atomique
+chimique
+conserve
+action
+dispara
+change
+Exemple
+cuivre
+hydrog
+lectrons
+monoatomique
+proches
+forces
+lectromagn
+tiques
+couche
+contient
+lectrons
+couche
+externe
+chelle
+cellule
+nutrition
+autotrophe
+veloppement
+possible
+apport
+organique
+milieu
+organique
+cellule
+fabriqu
+partir
+organique
+chlorelles
+autotrophie
+autotrophie
+photosynth
+chloroplaste
+division
+cellulaire
+chromatine
+condense
+chromosomes
+chromatides
+chaque
+cellule
+chromatide
+chaque
+chromosome
+chromosomes
+chromatide
+morceau
+portant
+message
+particulier
+terminant
+caract
+Chaque
+plusieurs
+sentants
+rences
+quences
+exemple
+groupe
+sanguin
+utilise
+filtre
+histoire
+portrait
+portrait
+culturel
+Breton
+Lorrain
+mentarit
+ritages
+contexte
+historique
+guerre
+Sparte
+Bonaparte
+enfant
+contexte
+faible
+devrait
+guerrier
+puissance
+militaire
+France
+Cellule
+cellule
+compartiment
+membrane
+contenant
+liquide
+lequel
+baignent
+organites
+organites
+entour
+double
+membrane
+enveloppe
+contient
+information
+cellule
+condens
+chromosomes
+condens
+chromatine
+Mitochondrie
+entour
+membrane
+contient
+membrane
+formant
+nombreux
+ticulum
+endoplasmiqu
+souvent
+associ
+sicules
+diffusion
+rapide
+musulmans
+atteint
+Poitiers
+repouss
+conservent
+Espagne
+partir
+commencer
+reconqu
+Espagne
+piliers
+profession
+Mecque
+donner
+pauvres
+revenus
+Ramadan
+soleil
+lerinage
+religion
+mement
+exigeante
+laquelle
+relations
+soumission
+servent
+louanges
+rences
+catholiques
+orthodoxes
+libataire
+beaucoup
+chants
+corations
+particuli
+immersion
+totale
+calendrier
+religieux
+nergie
+solaire
+partie
+quitablement
+oivent
+nergie
+solaire
+quateur
+beaucoup
+nergie
+solaire
+niveau
+condense
+pression
+niveau
+quateur
+dilate
+pression
+latitude
+quatorial
+redescend
+pression
+origine
+circule
+hautes
+pressions
+tropicales
+basses
+pressions
+quatoriales
+latitude
+polaire
+chauff
+contact
+remonte
+altitude
+pression
+another
+whished
+imagined
+better
+torturing
+finally
+realized
+wished
+easier
+started
+success
+Mickey
+actually
+celebrated
+birthday
+article
+occasion
+Mickey
+single
+Steamboat
+Willie
+animation
+synchronized
+Mickey
+before
+really
+shorts
+example
+success
+Steamboat
+Willie
+launched
+Disney
+Company
+technology
+little
+definition
+images
+through
+computers
+drawings
+anymore
+computer
+Disney
+production
+dimension
+concept
+though
+Disney
+fellows
+regretted
+softness
+drawings
+fantastic
+success
+Disney
+Studios
+scenario
+technology
+opened
+Immediately
+success
+imagination
+enchanting
+dreams
+beauty
+appreciated
+children
+sister
+brother
+parents
+parents
+everyone
+feeling
+coming
+Disney
+problems
+worries
+everything
+forgotten
+Florida
+Disneyworld
+achievement
+result
+million
+visitors
+expected
+during
+actually
+opened
+million
+Toulouse
+aujourd
+surnom
+depuis
+droite
+repass
+gauche
+longue
+candidat
+sortant
+Moudenc
+centre
+tiquet
+socialiste
+Pierre
+origine
+listes
+rentes
+cherch
+faveurs
+toulousains
+sultats
+premier
+avaient
+pourtant
+favori
+positionnait
+Ensuite
+venait
+quatri
+particularit
+locale
+groupe
+suffrages
+prolif
+ration
+cellulaire
+concerne
+toutes
+cellules
+impliqu
+laboration
+tement
+remplacement
+piderme
+apport
+vasculaire
+comprend
+laboration
+granulation
+soutien
+piderme
+transitoire
+angiogen
+assurant
+vascularisat
+laboration
+cellules
+pidermiques
+enzymes
+olytiques
+collag
+permettent
+digestion
+membrane
+basale
+migration
+cellules
+classicisme
+cherche
+fondant
+chaque
+construction
+claires
+rigoureuses
+souhaite
+opposer
+Baroque
+artistes
+baroques
+guerres
+religion
+convaincus
+incertitude
+devenir
+imaginent
+constamment
+changeant
+saisons
+transformati
+traduisent
+nature
+inconstance
+mouvements
+humain
+Partout
+mouvement
+humaine
+fugace
+instabilit
+choses
+conduit
+crivains
+alistes
+veulent
+peindre
+explorer
+quotidienne
+toutes
+formes
+sentent
+ensemble
+milieux
+sociaux
+compris
+favoris
+romantisme
+revendique
+sensibilit
+nouvelle
+rapport
+Raison
+repose
+sentiments
+nature
+peuples
+opprim
+libert
+crivains
+naturalistes
+appuient
+couvertes
+science
+transposent
+milieu
+individus
+inscrivent
+continuit
+courant
+aliste
+senter
+parole
+possible
+culture
+pratiquement
+uniquement
+religion
+tienne
+remettre
+autres
+civilisation
+cultures
+consid
+ennemies
+Encyclop
+Diderot
+rassembler
+connaissance
+parses
+surface
+exposer
+hommes
+vivons
+transmettre
+hommes
+viendront
+dresser
+inventaire
+raisonn
+critique
+connaissance
+oriques
+encourager
+applications
+techniques
+savoir
+techniques
+scientifique
+moteur
+conomique
+utopie
+currente
+bonheur
+individuel
+collectif
+utopie
+privatif
+signifiant
+existe
+signifiant
+mouvement
+imaginaire
+alisable
+critiquer
+imperfection
+proposer
+nouvelles
+valeurs
+politiques
+sociales
+registre
+tragique
+prennent
+conscience
+forces
+destin
+forces
+dominent
+passent
+sistent
+peuvent
+politiques
+divines
+sociales
+morale
+registre
+fantastique
+climats
+particuliers
+univers
+baignant
+obscurit
+angoissant
+fantastique
+sitation
+interpr
+tation
+rationnelle
+irrationnell
+nements
+Examen
+clinique
+matique
+Comporte
+examen
+vasculaire
+moteur
+sensitif
+anesth
+ventuellemen
+radiographie
+recherche
+tranger
+fracture
+Examen
+sensitif
+chaque
+comparative
+patient
+regard
+articulation
+exploration
+chirurgicale
+rechercher
+ouverture
+articulaire
+explor
+Situer
+paratexte
+auteur
+publication
+oeuvre
+terminer
+auquel
+appartient
+romanesque
+Identifier
+narratif
+descriptif
+informatif
+argumentatif
+Comparaison
+relation
+compar
+comparant
+souligner
+commun
+introduite
+comparaison
+cherche
+vocatrice
+lecteur
+oiseau
+Gradation
+Succession
+termes
+intensit
+croissante
+croissante
+tendre
+hyperbole
+tristesse
+malheur
+sespoir
+lecture
+perspective
+prouver
+hypoth
+sespoir
+lecture
+pourront
+formul
+sespoir
+grande
+partie
+lecture
+analytique
+commentaire
+compos
+partir
+moment
+choisit
+lecture
+oriente
+lecture
+hypoth
+arguments
+viendront
+confirmer
+lecture
+explication
+parties
+Celles
+arguments
+viennent
+confirmer
+hypoth
+lecture
+doivent
+certaine
+remarques
+aucune
+montrer
+exemple
+exprime
+sespoir
+personnage
+pourra
+exemple
+tudier
+expression
+interne
+personnage
+externe
+raconte
+uniquement
+omniscient
+narrateur
+modalisateur
+termes
+montrant
+conviction
+auteur
+certitude
+adverbes
+certainement
+verbes
+sembler
+adjectifs
+vraisemblabl
+lecture
+analytique
+Analyser
+question
+demande
+exactement
+enjeux
+argumentativ
+rapport
+mouvement
+terminer
+lecture
+analytique
+pondre
+question
+Construire
+permettant
+pondre
+question
+assimiler
+lectures
+analytiques
+groupements
+textes
+oeuvres
+grales
+senterez
+preuve
+travailler
+consacrer
+plusieurs
+heures
+semaine
+travail
+personnel
+travail
+personnel
+consiste
+fiches
+capitulative
+textes
+Attention
+Fiches
+pourront
+recrach
+organiser
+travail
+personnel
+pondre
+question
+examinant
+textes
+autres
+organiser
+grands
+chercher
+connaissance
+acquises
+durant
+textes
+analysant
+concevoir
+devoir
+invention
+comporte
+partie
+argumentativ
+concevoir
+dissertation
+argument
+paragraphe
+argumentatif
+argument
+explication
+exemple
+pouvez
+appuyer
+textes
+corpus
+pendant
+exemples
+nature
+sensible
+inspir
+comprend
+exprimer
+inspir
+autres
+mission
+annoncer
+meilleur
+exprimer
+autres
+peuvent
+parler
+opprim
+certain
+public
+exprimer
+ressentir
+lecteur
+capacit
+laisser
+mouvoir
+sensibilit
+certains
+lecteurs
+pragmatiques
+message
+difficult
+implicite
+allusif
+motion
+imagination
+implicite
+chapper
+lecteur
+raisonnement
+raisonnement
+inductif
+tablir
+partir
+particulier
+raisonnement
+ductif
+appliquer
+particuliers
+raisonnement
+absurde
+montrer
+quences
+absurdes
+combattue
+raisonnement
+concessif
+admettre
+partie
+arguments
+adverse
+opposer
+arguments
+raisonnement
+dialectique
+Caract
+ristiques
+philosophiqu
+histoire
+accumulant
+personnage
+preuves
+transformer
+mouvement
+voyage
+rencontres
+riences
+provoquent
+conscience
+change
+personnages
+secondaires
+caract
+modifie
+Fonctions
+philosophiqu
+didactique
+auteur
+interroge
+philosophiqu
+bonheur
+critique
+remise
+question
+structures
+monarchie
+torture
+mettre
+relation
+analyse
+arguments
+utilis
+auteur
+identifier
+argumentatio
+identifier
+fendue
+combattue
+identifier
+arguments
+relever
+argumentatio
+utilis
+auteur
+convaincre
+lecteur
+Forces
+argumentatio
+directe
+convaincre
+cision
+rigueur
+logique
+arguments
+exprim
+premier
+raisonnement
+ductif
+risques
+erreur
+interpr
+tation
+lecteurs
+structure
+rigoureuse
+solidit
+logique
+quence
+arguments
+exemples
+implication
+auteur
+laisser
+appara
+subjectivit
+ajoute
+dimension
+personnelle
+argumentatio
+Limites
+argumentatio
+directe
+clament
+public
+cultiv
+premier
+permis
+examiner
+taille
+constitu
+plusieurs
+couches
+dimentaires
+disposition
+actuelle
+ensembles
+datent
+poques
+rentes
+ensembles
+compos
+roches
+dimentaires
+horizontalem
+ensemble
+inclin
+placement
+plaques
+tectoniques
+plissements
+terrain
+ensemble
+plissement
+terrain
+puisque
+ensemble
+parfaitement
+horizontal
+Europe
+origine
+grecque
+continent
+terres
+population
+mondial
+environ
+millions
+habitants
+construction
+politique
+seconde
+guerre
+mondiale
+difficile
+trouver
+ographique
+Europe
+contraire
+grande
+diversit
+milieu
+chance
+cytoplasme
+indispensabl
+cytoplasme
+messager
+messager
+interm
+diaire
+message
+quitte
+messager
+cytoplasme
+Question
+Comment
+information
+transmise
+lement
+messager
+Macromol
+plusieurs
+polypeptidiq
+acides
+liaison
+peptidiques
+caract
+conformation
+spatiale
+porteur
+maladie
+malade
+fabrique
+moglobine
+anormale
+notype
+rosigotte
+dominante
+maladie
+cessive
+individu
+fabrique
+presque
+moglobine
+anormale
+tection
+maladie
+lectrophor
+moglobine
+ralisme
+accompagn
+volution
+industrielle
+durant
+volution
+industrielle
+libert
+totale
+entreprise
+demande
+conomie
+intervient
+conomie
+limites
+apparues
+grandes
+Keynes
\ No newline at end of file
diff --git a/onyx2/modules/chconfig/__config.class.php b/onyx2/modules/chconfig/__config.class.php
new file mode 100644
index 0000000..26162b6
--- /dev/null
+++ b/onyx2/modules/chconfig/__config.class.php
@@ -0,0 +1,28 @@
+<?php
+
+if(!defined('ONYX')) exit;
+
+class __config
+{
+  //Tableau des variables de la configuration
+  var $vars = array();
+
+  //Tableau des variables d'environnement
+  var $envs = array();
+
+  //Tableau des modules
+  var $modules = array();
+
+  function __construct($xml = null)
+  {
+    if (isset($xml))
+      {
+	$this->vars = parse_config($xml, "var", "name");
+	$this->envs = parse_config($xml, "env", "option");
+
+	foreach($xml->getElementsByTagName('module') as $module)
+	  $this->modules[$module->getAttribute('name')] = parse_config($module, "option", "name");
+      }
+  }
+}
+?>
\ No newline at end of file
diff --git a/onyx2/modules/chconfig/chconfig.class.php b/onyx2/modules/chconfig/chconfig.class.php
new file mode 100644
index 0000000..0b587db
--- /dev/null
+++ b/onyx2/modules/chconfig/chconfig.class.php
@@ -0,0 +1,110 @@
+<?php
+
+if(!defined('ONYX')) exit;
+
+class chConfig
+{
+  //Adresse vers le fichier de configuration en cours de modification
+  private $_filename;
+
+  //Le site est-il actif ?
+  var $active = 1;
+
+  //Adresse absolue vers le dossier principal
+  var $root;
+
+  //Activer le cache ?
+  var $cache = 1;
+
+  //Liste des configurations en fonction des fichiers
+  var $configs;
+
+
+  // Constructeur qui charge le fichier de configuration
+  function __construct($filename = null)
+  {
+    if (!empty($filename))
+      $this->_filename = $filename;
+    else
+      $this->_filename = ONYX."config/root.xml";
+
+    //On charge le fichier
+    $xml = new DOMDocument();
+    $xml->load($this->_filename);
+
+    $this->active = $xml->documentElement->getAttribute('active');
+    $this->root = $xml->documentElement->getAttribute('root');
+    $this->cache = $xml->documentElement->getAttribute('cache');
+
+    $this->configs = array();
+    
+    foreach($xml->getElementsByTagName('config') as $value)
+      {
+	$this->configs[$value->getAttribute('match')] = new __config($value);
+      }
+  }
+
+  function addConfig($config)
+  {
+    $this->configs[$config] = new __config();
+  }
+
+  function addVar($name, $value, $config = "*")
+  {
+    $this->configs[$config]->vars[$name] = $value;
+  }
+
+  function addEnv($option, $value, $config = "*")
+  {
+    $this->configs[$config]->envs[$option] = $value;
+  }
+
+  function addModule($name, $config = "*")
+  {
+    $this->configs[$config]->modules[$name] = array();
+  }
+
+  function addModuleOption($moduleName, $name, $value, $config = "*")
+  {
+    $this->configs[$config]->modules[$moduleName][$name] = $value;
+  }
+
+  //Fonction qui écrit le fichier
+  function write()
+  {
+    $xml = new DOMDocument('1.0', 'UTF-8');
+    $xml->formatOutput = true;
+
+    $xml_configs = $xml->createElement("configs");
+    $xml_configs->setAttribute("active", $this->active);
+    $xml_configs->setAttribute("root", $this->root);
+    $xml_configs->setAttribute("cache", $this->cache);
+
+    foreach($this->configs as $match => $config)
+      {
+	$xml_config = $xml->createElement("config");
+	$xml_config->setAttribute("match", $match);
+
+	//On écrit les variables
+	chConfig::unparse_config($xml, $xml_config, $config->vars, "var", "name");
+	chConfig::unparse_config($xml, $xml_config, $config->envs, "env", "option");
+
+	//On écrit les modules
+	if (is_array($config->modules))
+	  foreach($config->modules as $mod_name => $module)
+	    {
+	      $xml_module = $xml->createElement("module");
+	      $xml_module->setAttribute("name", $mod_name);
+	      chConfig::unparse_config($xml, $xml_module, $module, "option", "name");
+	      $xml_config->appendChild($xml_module);
+	    }
+
+	$xml_configs->appendChild($xml_config);
+      }
+
+    $xml->appendChild($xml_configs);
+
+    $xml->save($this->_filename);
+  }
+}
+?>
\ No newline at end of file
diff --git a/onyx2/modules/chconfig/chmodules.class.php b/onyx2/modules/chconfig/chmodules.class.php
new file mode 100644
index 0000000..5f889b8
--- /dev/null
+++ b/onyx2/modules/chconfig/chmodules.class.php
@@ -0,0 +1,57 @@
+<?php
+
+if(!defined('ONYX')) exit;
+
+class chModules
+{
+  //Adresse vers le fichier de configuration en cours de modification
+  private $_filename;
+
+  //Liste des modules
+  var $modules = array();
+
+
+  // Constructeur qui charge le fichier de modules
+  function __construct($filename = null)
+  {
+    if (!empty($filename))
+      $this->_filename = $filename;
+    else
+      $this->_filename = ONYX."modules/modules.xml";
+
+    //On charge le fichier
+    $xml = new DOMDocument();
+    $xml->load($this->_filename);
+    
+    foreach($xml->getElementsByTagName('module') as $value)
+      {
+	$this->modules[$value->getAttribute('name')] = parse_config($value->getElementsByTagName("default")->item(0), "option", "name");
+      }
+  }
+
+  function write()
+  {
+    $xml = new DOMDocument('1.0', 'UTF-8');
+    $xml->formatOutput = true;
+
+    $xml_modules = $xml->createElement("modules");
+
+    foreach($this->modules as $name => $module)
+      {
+	$xml_module = $xml->createElement("module");
+	$xml_module->setAttribute("name", $name);
+
+	$xml_def = $xml->createElement("default");
+	unparse_config($xml, $xml_def, $module, "option", "name");
+
+	$xml_module->appendChild($xml_def);
+	$xml_modules->appendChild($xml_module);
+      }
+
+    $xml->appendChild($xml_modules);
+
+    return $xml;
+  }
+}
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/chconfig/main.php b/onyx2/modules/chconfig/main.php
new file mode 100644
index 0000000..91fe13c
--- /dev/null
+++ b/onyx2/modules/chconfig/main.php
@@ -0,0 +1,65 @@
+<?php
+
+if(!defined('ONYX')) exit;
+
+function unparse_config($create, $xml, $array, $node = 'var', $attribut = 'name')
+{
+  if (is_array($array))
+    foreach($array as $name => $var)
+      {
+	if (is_array($var))
+	  {
+	    $xml_var = $create->createElement($node);
+	    $xml_var->setAttribute($attribut, $name);
+	    
+	    unparse_config($create, $xml_var, $var, $node, $attribut);
+	    
+	    $xml->appendChild($xml_var);
+	  }
+	else
+	  {
+	    $xml_var = $create->createElement($node, $var);
+	    $xml_var->setAttribute($attribut, $name);
+	    $xml->appendChild($xml_var);
+	  }
+      }
+}
+
+require_once("__config.class.php");
+require_once("chconfig.class.php");
+require_once("chmodules.class.php");
+
+function chconfig($type, $file = null)
+{
+  $sortie = "";
+
+  if ($type == "modules")
+    {
+      $sortie .= '<h1>Modification des paramètres de modules</h1><form action="?t=modules" method="post">';
+
+      //On charge ce qu'on veut afficher
+      $mods = new chModules($file);
+
+      $sortie .= '</form>';
+    }
+  elseif ($type == "bdd")
+    {
+      $sortie .= "<h1>Modification des paramètres de base de données</h1>";
+    }
+  else
+    {
+      $sortie .= "<h1>Modification des paramètres de configuration</h1>";
+    }
+
+  return $sortie;
+}
+
+//Affichage automatique
+if (!empty($OPT["show"]))
+  {
+    echo "<html><head><title>Modification des paramètres d'Onyx2</title></head><body>";
+    echo chconfig(gpc("t"));
+    echo "</body></html>";
+    exit;
+  }
+?>
\ No newline at end of file
diff --git a/onyx2/modules/db/main.php b/onyx2/modules/db/main.php
new file mode 100644
index 0000000..57133af
--- /dev/null
+++ b/onyx2/modules/db/main.php
@@ -0,0 +1,28 @@
+<?php
+
+if(!defined('ONYX')) exit;
+
+switch($OPT['type'])
+    {
+        case 'mysql':
+        case 'postgresql':
+            
+            $api = array('mysql' => 'mysql_connect', 'postgresql' => 'pg_connect');
+            if(!function_exists($api[$OPT['type']])) trigger_error('API introuvable',E_USER_ERROR);
+            unset($api);
+            
+            function dbpass($crypt,$cle)
+                {
+                    return cxor(base64_decode($crypt),md5($cle,TRUE));
+                }
+            
+            $db_config = $OPT;
+            
+            require_once($OPT['type'].'.class.php');
+            define('DB_TYPE',$OPT['type']);
+            break;
+        
+        default: trigger_error('Base de donnee inconnue',E_USER_ERROR);
+    }
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/db/mysql.class.php b/onyx2/modules/db/mysql.class.php
new file mode 100644
index 0000000..b37c734
--- /dev/null
+++ b/onyx2/modules/db/mysql.class.php
@@ -0,0 +1,171 @@
+<?php
+
+class BDD
+    {
+        var $connected;
+        
+        private $session;
+        
+        private $reponse;
+        
+        var $host;
+        
+        var $user;
+        
+        private $password;
+        
+        var $database;
+        
+        var $num_rows;
+        
+        var $nodb;
+        
+        
+        function __construct($profile=NULL)
+            {
+                if($profile === FALSE) return FALSE;
+                
+                global $db_config;
+                
+                if(empty($profile))
+                    {
+                        if(!$db_config['profile']) return FALSE;
+                        $profile = &$db_config['profile'];
+                    }
+                
+                if(!ctype_alnum($profile)) trigger_error('Le nom du profil contient des caracteres illegaux',E_USER_ERROR);
+                
+                if($db_config['profile'])
+                    {
+                        require(ONYX.'db/'.$profile.'.profile.php');
+                        
+                        $db = &$___profile['db'];
+                        $host = &$___profile['host'];
+                        $user = &$___profile['user'];
+                        $pass = &$___profile['pass'];
+                    }
+                
+                if($db_config['crypt']) $pass = dbpass($pass,$db_config['crypt']);
+                
+                return $this->connexion($host,$user,$pass,$db);
+            }
+        
+        function connexion($host,$user,$pass,$db=NULL)
+            {
+                if($this->session) $this->deconnexion();
+                
+                $this->reponse = NULL;
+                
+                $this->session = mysql_connect($host,$user,$pass);
+                
+                if(!$this->session)
+                    {
+                        elog('Connexion impossible a la base de donnee : '.$this->erreur(),2);
+                        if(function_exists($this->nodb)) call_user_func($this->nodb);
+                        return FALSE;
+                    }
+                
+                mysql_query('SET CHARACTER SET "utf8"',$this->session);
+                
+                $this->host = $host;
+                $this->user = $user;
+                $this->password = $pass;
+                if($db) $this->db($db);
+                
+                $this->connected = TRUE;
+		return TRUE;
+            }
+        
+        function reconnexion()
+            {
+                if(!empty($this->host) && !empty($this->user) && !empty($this->password) && !empty($this->database)) return $this->connexion($this->host,$this->user,$this->password,$this->database);
+            }
+        
+        function deconnexion()
+            {
+                if(!$this->session) return FALSE;
+                
+                $r =  mysql_close($this->session);
+                $this->session = FALSE;
+                $this->connected = FALSE;
+                return $r;
+            }
+        
+        function erreur()
+            {
+                if(!$this->session) return FALSE;
+                
+                return mysql_error($this->session);
+            }
+        
+        function db($db=NULL)
+            {
+                if(!$this->session) return FALSE;
+                
+                return $this->database = mysql_select_db($db,$this->session) ? $db : $this->database;
+            }
+        
+        function escape(&$var)
+            {
+                if(!$this->session) return FALSE;
+                $var = mysql_real_escape_string($var,$this->session);
+                return $var;
+            }
+        
+        function query($query)
+            {
+                if(!$this->session) return FALSE;
+                
+                $this->reponse = mysql_query($query,$this->session);
+                
+                global $db_config;
+                
+                if(!$this->reponse && $db_config['log']) elog('Erreur Mysql: " '.$this->erreur().' ", avec la requète: { '.$query.' }.',1);
+                
+                $this->num_rows = @mysql_num_rows($this->reponse);
+                
+                if($this->num_rows == 0) return NULL;
+                
+                elseif($this->num_rows >= 1)
+                    {
+                        for($i=0; $var = mysql_fetch_assoc($this->reponse); $i++) $sortie[$i] = $var;
+                        return $sortie;
+                    }
+                
+                else return FALSE;
+            }
+        
+        function unique_query($query)
+            {
+                    if(!$this->session) return FALSE;
+                    
+                    $this->reponse = mysql_query($query,$this->session);
+                    
+                    global $db_config;
+                    
+                    if(!$this->reponse && $db_config['log']) elog('Erreur Mysql: " '.$this->erreur().' ", avec la requète: { '.$query.' }.',1);
+                    
+                    $this->num_rows = @mysql_num_rows($this->reponse);
+                    
+                    if($this->num_rows == 0) return NULL;
+                    
+                    elseif($this->num_rows >= 1) return mysql_fetch_assoc($this->reponse);
+                    
+                    else return FALSE;
+            }
+    	
+    	function affected()
+            {
+                if(!$this->session) return FALSE;
+                
+                return mysql_affected_rows($this->session);
+            }
+
+	function insert_id()
+	{
+	  if(!$this->session) return FALSE;
+                
+	  return mysql_insert_id($this->session);
+	}
+    }
+?>
diff --git a/onyx2/modules/db/postgresql.class.php b/onyx2/modules/db/postgresql.class.php
new file mode 100644
index 0000000..9694b34
--- /dev/null
+++ b/onyx2/modules/db/postgresql.class.php
@@ -0,0 +1,169 @@
+<?php
+
+class BDD
+    {
+        var $connected;
+        
+        private $session;
+        
+        private $reponse;
+        
+        var $host;
+        
+        var $user;
+        
+        private $password;
+        
+        var $database;
+        
+        var $num_rows;
+        
+        var $nodb;
+        
+        
+        function __construct($profile=NULL)
+            {
+                if($profile === FALSE) return FALSE;
+                
+                global $db_config;
+                
+                if(empty($profile))
+                    {
+                        if(!$db_config['profile']) return FALSE;
+                        $profile = &$db_config['profile'];
+                    }
+                
+                if(!ctype_alnum($profile)) trigger_error('Le nom du profil contient des caracteres illegaux',E_USER_ERROR);
+                
+                if($db_config['profile'])
+                    {
+                        require(ONYX.'db/'.$profile.'.profile.php');
+                        
+                        $db = &$___profile['db'];
+                        $host = &$___profile['host'];
+                        $user = &$___profile['user'];
+                        $pass = &$___profile['pass'];
+                    }
+                
+                if($db_config['crypt']) $pass = dbpass($pass,$db_config['crypt']);
+                
+                return $this->connexion($host,$user,$pass,$db);
+            }
+        
+        function connexion($host,$user,$pass,$db=NULL)
+            {
+                if($this->session) $this->deconnexion();
+                
+                $this->reponse = NULL;
+                
+                $host = pg_escape_string($host);
+                $user = pg_escape_string($user);
+                $pass = pg_escape_string($pass);
+                $db = pg_escape_string($db);
+                
+                $this->session = pg_connect("host='$host' port=5432 dbname='$db' user='$user' password='$pass'");
+                
+                if(!$this->session)
+                    {
+                        elog('Connexion impossible a la base de donnee : '.$this->erreur(),2);
+                        if(function_exists($this->nodb)) call_user_func($this->nodb);
+                        return FALSE;
+                    }
+                
+                pg_setclientencoding($this->session,'UTF8');
+                
+                $this->host = $host;
+                $this->user = $user;
+                $this->password = $pass;
+                $this->database = $db;
+                
+                $this->connected = TRUE;
+		return TRUE;
+            }
+        
+                function reconnexion()
+            {
+                if(!empty($this->host) && !empty($this->user) && !empty($this->password) && !empty($this->database)) return $this->connexion($this->host,$this->user,$this->password,$this->database);
+            }
+        
+        function deconnexion()
+            {
+                if(!$this->session) return FALSE;
+                
+                $r =  pg_close($this->session);
+                $this->session = FALSE;
+                $this->connected = FALSE;
+                return $r;
+            }
+        
+        function erreur()
+            {
+                if(!$this->session) return FALSE;
+                
+                return pg_last_error($this->session);
+            }
+        
+        function db($db)
+            {
+                if(!$this->session) return FALSE;
+                
+                return $this->database = pg_query($this->session,"\\connect ".pg_escape_string($db)) ? $db : $this->database;
+            }
+        
+        function escape(&$var)
+            {
+                if(!$this->session) return FALSE;
+                $var = pg_escape_string($this->session,$var);
+                return $var;
+            }
+        
+        function query($query)
+            {
+                if(!$this->session) return FALSE;
+                
+                $this->reponse = pg_query($this->session,$query);
+                
+                global $db_config;
+                
+                if(!$this->reponse && $db_config['log']) elog('Erreur PostgreSQL: " '.$this->erreur().' ", avec la requète: { '.$query.' }.',1);
+                
+                $this->num_rows = pg_num_rows($this->reponse);
+                
+                if($this->num_rows == 0) return NULL;
+                
+                elseif($this->num_rows >= 1)
+                    {
+                        for($i=0; $var = pg_fetch_assoc($this->reponse); $i++) $sortie[$i] = $var;
+                        return $sortie;
+                    }
+                
+                else return FALSE;
+            }
+        
+        function unique_query($query)
+            {
+                    if(!$this->session) return FALSE;
+                    
+                    $this->reponse = pg_query($this->session,$query);
+                    
+                    global $db_config;
+                    
+                    if(!$this->reponse && $db_config['log']) elog('Erreur PostgreSQL: " '.$this->erreur().' ", avec la requète: { '.$query.' }.',1);
+                    
+                    $this->num_rows = pg_num_rows($this->reponse);
+                    
+                    if($this->num_rows == 0) return NULL;
+                    
+                    elseif($this->num_rows >= 1) return pg_fetch_assoc($this->reponse);
+                    
+                    else return FALSE;
+            }
+    	
+    	function affected()
+            {
+                if(!$this->session) return FALSE;
+                
+                return pg_affected_rows($this->reponse);
+            }
+    }
+?>
diff --git a/onyx2/modules/lang/main.php b/onyx2/modules/lang/main.php
new file mode 100644
index 0000000..0b0b8bc
--- /dev/null
+++ b/onyx2/modules/lang/main.php
@@ -0,0 +1,96 @@
+<?php
+
+  /**
+   * Module de gestion des langues pour Onyx
+   *
+   * @link http://onyx.halo-battle.fr/
+   * @authour 2011 Némunaire <nemunaire@gmail.com>
+   * @version 2.0
+   * @see The GNU Public License (GPL)
+   * Last modified: 13/02/2011
+   */
+
+  /**
+   * This program is free software: you can redistribute it and/or modify
+   * it under the terms of the GNU General Public License as published by
+   * the Free Software Foundation, either version 3 of the License, or
+   * (at your option) any later version.
+   *
+   * This program is distributed in the hope that it will be useful,
+   * but WITHOUT ANY WARRANTY; without even the implied warranty of
+   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   * GNU General Public License for more details.
+   *
+   * You should have received a copy of the GNU General Public License
+   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+   */
+
+if(!defined("ONYX")) exit;
+
+if(!is_readable(ONYX."lang/".$OPT["type"]."/"))
+  {
+    if(is_readable(ONYX."lang/".$OPT["type"].".xml"))
+      trigger_error("You run the version 2 of Onyx language module. Convert your XML language file into JSON files (see Onyx website  : http://onyx.halo-battle.fr/).", E_USER_ERROR);
+    else
+      trigger_error('Language directory not found or unreadable.', E_USER_ERROR);
+  }
+
+define('LANG', $OPT['type']);
+
+/**
+ * Classe gérant les chargements dynamiques des fichiers de langue
+ */
+class Lang
+{
+  private static $loaded = array();
+
+  private static function loadFile($file, $lang = LANG)
+  {
+    if (is_array($file))
+      $filename = ONYX."lang/".$lang."/".implode("/", $file).".json";
+    else
+      $filename = ONYX."lang/".$lang."/".$file.".json";
+
+    if(!is_readable($filename))
+      {
+	if (is_array($file))
+	  trigger_error("Language file $lang/".implode("/", $file)." not found or unreadable.", E_USER_ERROR);
+	else
+	  trigger_error("Language file $lang/$file not found or unreadable.", E_USER_ERROR);
+      }
+
+    //Lang::loaded[md5($filename)] = json_decode(file_get_contents($filename), true);
+    Lang::$loaded[$filename] = json_decode(file_get_contents($filename), true);
+  }
+
+  public static function getText($file, $path, $lang = LANG)
+  {
+    if (is_array($file))
+      $filename = ONYX."lang/".$lang."/".implode("/", $file).".json";
+    else
+      $filename = ONYX."lang/".$lang."/".$file.".json";
+    //$filename = md5($filename);
+
+    if (empty(Lang::$loaded[$filename]))
+      Lang::loadFile($file, $lang);
+
+    if (!is_array($path) && preg_match("#/#", $path))
+	$path = explode("/", $path);
+
+    if (is_array($path))
+      {
+	$ret = Lang::$loaded[$filename];
+
+	foreach($path as $p)
+	  {
+	    $ret = $ret[$p];
+	  }
+
+	return $ret;
+      }
+    else
+      return Lang::$loaded[$filename][$path];
+  }
+}
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/mail/class.phpmailer.php b/onyx2/modules/mail/class.phpmailer.php
new file mode 100644
index 0000000..0947923
--- /dev/null
+++ b/onyx2/modules/mail/class.phpmailer.php
@@ -0,0 +1,2320 @@
+<?php
+/*~ class.phpmailer.php
+.---------------------------------------------------------------------------.
+|  Software: PHPMailer - PHP email class                                    |
+|   Version: 5.1                                                            |
+|   Contact: via sourceforge.net support pages (also www.worxware.com)      |
+|      Info: http://phpmailer.sourceforge.net                               |
+|   Support: http://sourceforge.net/projects/phpmailer/                     |
+| ------------------------------------------------------------------------- |
+|     Admin: Andy Prevost (project admininistrator)                         |
+|   Authors: Andy Prevost (codeworxtech) codeworxtech@users.sourceforge.net |
+|          : Marcus Bointon (coolbru) coolbru@users.sourceforge.net         |
+|   Founder: Brent R. Matzelle (original founder)                           |
+| Copyright (c) 2004-2009, Andy Prevost. All Rights Reserved.               |
+| Copyright (c) 2001-2003, Brent R. Matzelle                                |
+| ------------------------------------------------------------------------- |
+|   License: Distributed under the Lesser General Public License (LGPL)     |
+|            http://www.gnu.org/copyleft/lesser.html                        |
+| This program is distributed in the hope that it will be useful - WITHOUT  |
+| ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or     |
+| FITNESS FOR A PARTICULAR PURPOSE.                                         |
+| ------------------------------------------------------------------------- |
+| We offer a number of paid services (www.worxware.com):                    |
+| - Web Hosting on highly optimized fast and secure servers                 |
+| - Technology Consulting                                                   |
+| - Oursourcing (highly qualified programmers and graphic designers)        |
+'---------------------------------------------------------------------------'
+*/
+
+/**
+ * PHPMailer - PHP email transport class
+ * NOTE: Requires PHP version 5 or later
+ * @package PHPMailer
+ * @author Andy Prevost
+ * @author Marcus Bointon
+ * @copyright 2004 - 2009 Andy Prevost
+ * @version $Id: class.phpmailer.php 447 2009-05-25 01:36:38Z codeworxtech $
+ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+ */
+
+if (version_compare(PHP_VERSION, '5.0.0', '<') ) exit("Sorry, this version of PHPMailer will only run on PHP version 5 or greater!\n");
+
+class PHPMailer {
+
+  /////////////////////////////////////////////////
+  // PROPERTIES, PUBLIC
+  /////////////////////////////////////////////////
+
+  /**
+   * Email priority (1 = High, 3 = Normal, 5 = low).
+   * @var int
+   */
+  public $Priority          = 3;
+
+  /**
+   * Sets the CharSet of the message.
+   * @var string
+   */
+  public $CharSet           = 'iso-8859-1';
+
+  /**
+   * Sets the Content-type of the message.
+   * @var string
+   */
+  public $ContentType       = 'text/plain';
+
+  /**
+   * Sets the Encoding of the message. Options for this are
+   *  "8bit", "7bit", "binary", "base64", and "quoted-printable".
+   * @var string
+   */
+  public $Encoding          = '8bit';
+
+  /**
+   * Holds the most recent mailer error message.
+   * @var string
+   */
+  public $ErrorInfo         = '';
+
+  /**
+   * Sets the From email address for the message.
+   * @var string
+   */
+  public $From              = 'root@localhost';
+
+  /**
+   * Sets the From name of the message.
+   * @var string
+   */
+  public $FromName          = 'Root User';
+
+  /**
+   * Sets the Sender email (Return-Path) of the message.  If not empty,
+   * will be sent via -f to sendmail or as 'MAIL FROM' in smtp mode.
+   * @var string
+   */
+  public $Sender            = '';
+
+  /**
+   * Sets the Subject of the message.
+   * @var string
+   */
+  public $Subject           = '';
+
+  /**
+   * Sets the Body of the message.  This can be either an HTML or text body.
+   * If HTML then run IsHTML(true).
+   * @var string
+   */
+  public $Body              = '';
+
+  /**
+   * Sets the text-only body of the message.  This automatically sets the
+   * email to multipart/alternative.  This body can be read by mail
+   * clients that do not have HTML email capability such as mutt. Clients
+   * that can read HTML will view the normal Body.
+   * @var string
+   */
+  public $AltBody           = '';
+
+  /**
+   * Sets word wrapping on the body of the message to a given number of
+   * characters.
+   * @var int
+   */
+  public $WordWrap          = 0;
+
+  /**
+   * Method to send mail: ("mail", "sendmail", or "smtp").
+   * @var string
+   */
+  public $Mailer            = 'mail';
+
+  /**
+   * Sets the path of the sendmail program.
+   * @var string
+   */
+  public $Sendmail          = '/usr/sbin/sendmail';
+
+  /**
+   * Path to PHPMailer plugins.  Useful if the SMTP class
+   * is in a different directory than the PHP include path.
+   * @var string
+   */
+  public $PluginDir         = '';
+
+  /**
+   * Sets the email address that a reading confirmation will be sent.
+   * @var string
+   */
+  public $ConfirmReadingTo  = '';
+
+  /**
+   * Sets the hostname to use in Message-Id and Received headers
+   * and as default HELO string. If empty, the value returned
+   * by SERVER_NAME is used or 'localhost.localdomain'.
+   * @var string
+   */
+  public $Hostname          = '';
+
+  /**
+   * Sets the message ID to be used in the Message-Id header.
+   * If empty, a unique id will be generated.
+   * @var string
+   */
+  public $MessageID         = '';
+
+  /////////////////////////////////////////////////
+  // PROPERTIES FOR SMTP
+  /////////////////////////////////////////////////
+
+  /**
+   * Sets the SMTP hosts.  All hosts must be separated by a
+   * semicolon.  You can also specify a different port
+   * for each host by using this format: [hostname:port]
+   * (e.g. "smtp1.example.com:25;smtp2.example.com").
+   * Hosts will be tried in order.
+   * @var string
+   */
+  public $Host          = 'localhost';
+
+  /**
+   * Sets the default SMTP server port.
+   * @var int
+   */
+  public $Port          = 25;
+
+  /**
+   * Sets the SMTP HELO of the message (Default is $Hostname).
+   * @var string
+   */
+  public $Helo          = '';
+
+  /**
+   * Sets connection prefix.
+   * Options are "", "ssl" or "tls"
+   * @var string
+   */
+  public $SMTPSecure    = '';
+
+  /**
+   * Sets SMTP authentication. Utilizes the Username and Password variables.
+   * @var bool
+   */
+  public $SMTPAuth      = false;
+
+  /**
+   * Sets SMTP username.
+   * @var string
+   */
+  public $Username      = '';
+
+  /**
+   * Sets SMTP password.
+   * @var string
+   */
+  public $Password      = '';
+
+  /**
+   * Sets the SMTP server timeout in seconds.
+   * This function will not work with the win32 version.
+   * @var int
+   */
+  public $Timeout       = 10;
+
+  /**
+   * Sets SMTP class debugging on or off.
+   * @var bool
+   */
+  public $SMTPDebug     = false;
+
+  /**
+   * Prevents the SMTP connection from being closed after each mail
+   * sending.  If this is set to true then to close the connection
+   * requires an explicit call to SmtpClose().
+   * @var bool
+   */
+  public $SMTPKeepAlive = false;
+
+  /**
+   * Provides the ability to have the TO field process individual
+   * emails, instead of sending to entire TO addresses
+   * @var bool
+   */
+  public $SingleTo      = false;
+
+   /**
+   * If SingleTo is true, this provides the array to hold the email addresses
+   * @var bool
+   */
+  public $SingleToArray = array();
+
+ /**
+   * Provides the ability to change the line ending
+   * @var string
+   */
+  public $LE              = "\n";
+
+  /**
+   * Used with DKIM DNS Resource Record
+   * @var string
+   */
+  public $DKIM_selector   = 'phpmailer';
+
+  /**
+   * Used with DKIM DNS Resource Record
+   * optional, in format of email address 'you@yourdomain.com'
+   * @var string
+   */
+  public $DKIM_identity   = '';
+
+  /**
+   * Used with DKIM DNS Resource Record
+   * optional, in format of email address 'you@yourdomain.com'
+   * @var string
+   */
+  public $DKIM_domain     = '';
+
+  /**
+   * Used with DKIM DNS Resource Record
+   * optional, in format of email address 'you@yourdomain.com'
+   * @var string
+   */
+  public $DKIM_private    = '';
+
+  /**
+   * Callback Action function name
+   * the function that handles the result of the send email action. Parameters:
+   *   bool    $result        result of the send action
+   *   string  $to            email address of the recipient
+   *   string  $cc            cc email addresses
+   *   string  $bcc           bcc email addresses
+   *   string  $subject       the subject
+   *   string  $body          the email body
+   * @var string
+   */
+  public $action_function = ''; //'callbackAction';
+
+  /**
+   * Sets the PHPMailer Version number
+   * @var string
+   */
+  public $Version         = '5.1';
+
+  /////////////////////////////////////////////////
+  // PROPERTIES, PRIVATE AND PROTECTED
+  /////////////////////////////////////////////////
+
+  private   $smtp           = NULL;
+  private   $to             = array();
+  private   $cc             = array();
+  private   $bcc            = array();
+  private   $ReplyTo        = array();
+  private   $all_recipients = array();
+  private   $attachment     = array();
+  private   $CustomHeader   = array();
+  private   $message_type   = '';
+  private   $boundary       = array();
+  protected $language       = array();
+  private   $error_count    = 0;
+  private   $sign_cert_file = "";
+  private   $sign_key_file  = "";
+  private   $sign_key_pass  = "";
+  private   $exceptions     = false;
+
+  /////////////////////////////////////////////////
+  // CONSTANTS
+  /////////////////////////////////////////////////
+
+  const STOP_MESSAGE  = 0; // message only, continue processing
+  const STOP_CONTINUE = 1; // message?, likely ok to continue processing
+  const STOP_CRITICAL = 2; // message, plus full stop, critical error reached
+
+  /////////////////////////////////////////////////
+  // METHODS, VARIABLES
+  /////////////////////////////////////////////////
+
+  /**
+   * Constructor
+   * @param boolean $exceptions Should we throw external exceptions?
+   */
+  public function __construct($exceptions = false) {
+    $this->exceptions = ($exceptions == true);
+  }
+
+  /**
+   * Sets message type to HTML.
+   * @param bool $ishtml
+   * @return void
+   */
+  public function IsHTML($ishtml = true) {
+    if ($ishtml) {
+      $this->ContentType = 'text/html';
+    } else {
+      $this->ContentType = 'text/plain';
+    }
+  }
+
+  /**
+   * Sets Mailer to send message using SMTP.
+   * @return void
+   */
+  public function IsSMTP() {
+    $this->Mailer = 'smtp';
+  }
+
+  /**
+   * Sets Mailer to send message using PHP mail() function.
+   * @return void
+   */
+  public function IsMail() {
+    $this->Mailer = 'mail';
+  }
+
+  /**
+   * Sets Mailer to send message using the $Sendmail program.
+   * @return void
+   */
+  public function IsSendmail() {
+    if (!stristr(ini_get('sendmail_path'), 'sendmail')) {
+      $this->Sendmail = '/var/qmail/bin/sendmail';
+    }
+    $this->Mailer = 'sendmail';
+  }
+
+  /**
+   * Sets Mailer to send message using the qmail MTA.
+   * @return void
+   */
+  public function IsQmail() {
+    if (stristr(ini_get('sendmail_path'), 'qmail')) {
+      $this->Sendmail = '/var/qmail/bin/sendmail';
+    }
+    $this->Mailer = 'sendmail';
+  }
+
+  /////////////////////////////////////////////////
+  // METHODS, RECIPIENTS
+  /////////////////////////////////////////////////
+
+  /**
+   * Adds a "To" address.
+   * @param string $address
+   * @param string $name
+   * @return boolean true on success, false if address already used
+   */
+  public function AddAddress($address, $name = '') {
+    return $this->AddAnAddress('to', $address, $name);
+  }
+
+  /**
+   * Adds a "Cc" address.
+   * Note: this function works with the SMTP mailer on win32, not with the "mail" mailer.
+   * @param string $address
+   * @param string $name
+   * @return boolean true on success, false if address already used
+   */
+  public function AddCC($address, $name = '') {
+    return $this->AddAnAddress('cc', $address, $name);
+  }
+
+  /**
+   * Adds a "Bcc" address.
+   * Note: this function works with the SMTP mailer on win32, not with the "mail" mailer.
+   * @param string $address
+   * @param string $name
+   * @return boolean true on success, false if address already used
+   */
+  public function AddBCC($address, $name = '') {
+    return $this->AddAnAddress('bcc', $address, $name);
+  }
+
+  /**
+   * Adds a "Reply-to" address.
+   * @param string $address
+   * @param string $name
+   * @return boolean
+   */
+  public function AddReplyTo($address, $name = '') {
+    return $this->AddAnAddress('ReplyTo', $address, $name);
+  }
+
+  /**
+   * Adds an address to one of the recipient arrays
+   * Addresses that have been added already return false, but do not throw exceptions
+   * @param string $kind One of 'to', 'cc', 'bcc', 'ReplyTo'
+   * @param string $address The email address to send to
+   * @param string $name
+   * @return boolean true on success, false if address already used or invalid in some way
+   * @access private
+   */
+  private function AddAnAddress($kind, $address, $name = '') {
+    if (!preg_match('/^(to|cc|bcc|ReplyTo)$/', $kind)) {
+      echo 'Invalid recipient array: ' . kind;
+      return false;
+    }
+    $address = trim($address);
+    $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
+    if (!self::ValidateAddress($address)) {
+      $this->SetError($this->Lang('invalid_address').': '. $address);
+      if ($this->exceptions) {
+        throw new phpmailerException($this->Lang('invalid_address').': '.$address);
+      }
+      echo $this->Lang('invalid_address').': '.$address;
+      return false;
+    }
+    if ($kind != 'ReplyTo') {
+      if (!isset($this->all_recipients[strtolower($address)])) {
+        array_push($this->$kind, array($address, $name));
+        $this->all_recipients[strtolower($address)] = true;
+        return true;
+      }
+    } else {
+      if (!array_key_exists(strtolower($address), $this->ReplyTo)) {
+        $this->ReplyTo[strtolower($address)] = array($address, $name);
+      return true;
+    }
+  }
+  return false;
+}
+
+/**
+ * Set the From and FromName properties
+ * @param string $address
+ * @param string $name
+ * @return boolean
+ */
+  public function SetFrom($address, $name = '',$auto=1) {
+    $address = trim($address);
+    $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
+    if (!self::ValidateAddress($address)) {
+      $this->SetError($this->Lang('invalid_address').': '. $address);
+      if ($this->exceptions) {
+        throw new phpmailerException($this->Lang('invalid_address').': '.$address);
+      }
+      echo $this->Lang('invalid_address').': '.$address;
+      return false;
+    }
+    $this->From = $address;
+    $this->FromName = $name;
+    if ($auto) {
+      if (empty($this->ReplyTo)) {
+        $this->AddAnAddress('ReplyTo', $address, $name);
+      }
+      if (empty($this->Sender)) {
+        $this->Sender = $address;
+      }
+    }
+    return true;
+  }
+
+  /**
+   * Check that a string looks roughly like an email address should
+   * Static so it can be used without instantiation
+   * Tries to use PHP built-in validator in the filter extension (from PHP 5.2), falls back to a reasonably competent regex validator
+   * Conforms approximately to RFC2822
+   * @link http://www.hexillion.com/samples/#Regex Original pattern found here
+   * @param string $address The email address to check
+   * @return boolean
+   * @static
+   * @access public
+   */
+  public static function ValidateAddress($address) {
+    if (function_exists('filter_var')) { //Introduced in PHP 5.2
+      if(filter_var($address, FILTER_VALIDATE_EMAIL) === FALSE) {
+        return false;
+      } else {
+        return true;
+      }
+    } else {
+      return preg_match('/^(?:[\w\!\#\$\%\&\'\*\+\-\/\=\?\^\`\{\|\}\~]+\.)*[\w\!\#\$\%\&\'\*\+\-\/\=\?\^\`\{\|\}\~]+@(?:(?:(?:[a-zA-Z0-9_](?:[a-zA-Z0-9_\-](?!\.)){0,61}[a-zA-Z0-9_-]?\.)+[a-zA-Z0-9_](?:[a-zA-Z0-9_\-](?!$)){0,61}[a-zA-Z0-9_]?)|(?:\[(?:(?:[01]?\d{1,2}|2[0-4]\d|25[0-5])\.){3}(?:[01]?\d{1,2}|2[0-4]\d|25[0-5])\]))$/', $address);
+    }
+  }
+
+  /////////////////////////////////////////////////
+  // METHODS, MAIL SENDING
+  /////////////////////////////////////////////////
+
+  /**
+   * Creates message and assigns Mailer. If the message is
+   * not sent successfully then it returns false.  Use the ErrorInfo
+   * variable to view description of the error.
+   * @return bool
+   */
+  public function Send() {
+    try {
+      if ((count($this->to) + count($this->cc) + count($this->bcc)) < 1) {
+        throw new phpmailerException($this->Lang('provide_address'), self::STOP_CRITICAL);
+      }
+
+      // Set whether the message is multipart/alternative
+      if(!empty($this->AltBody)) {
+        $this->ContentType = 'multipart/alternative';
+      }
+
+      $this->error_count = 0; // reset errors
+      $this->SetMessageType();
+      $header = $this->CreateHeader();
+      $body = $this->CreateBody();
+
+      if (empty($this->Body)) {
+        throw new phpmailerException($this->Lang('empty_message'), self::STOP_CRITICAL);
+      }
+
+      // digitally sign with DKIM if enabled
+      if ($this->DKIM_domain && $this->DKIM_private) {
+        $header_dkim = $this->DKIM_Add($header,$this->Subject,$body);
+        $header = str_replace("\r\n","\n",$header_dkim) . $header;
+      }
+
+      // Choose the mailer and send through it
+      switch($this->Mailer) {
+        case 'sendmail':
+          return $this->SendmailSend($header, $body);
+        case 'smtp':
+          return $this->SmtpSend($header, $body);
+        default:
+          return $this->MailSend($header, $body);
+      }
+
+    } catch (phpmailerException $e) {
+      $this->SetError($e->getMessage());
+      if ($this->exceptions) {
+        throw $e;
+      }
+      echo $e->getMessage()."\n";
+      return false;
+    }
+  }
+
+  /**
+   * Sends mail using the $Sendmail program.
+   * @param string $header The message headers
+   * @param string $body The message body
+   * @access protected
+   * @return bool
+   */
+  protected function SendmailSend($header, $body) {
+    if ($this->Sender != '') {
+      $sendmail = sprintf("%s -oi -f %s -t", escapeshellcmd($this->Sendmail), escapeshellarg($this->Sender));
+    } else {
+      $sendmail = sprintf("%s -oi -t", escapeshellcmd($this->Sendmail));
+    }
+    if ($this->SingleTo === true) {
+      foreach ($this->SingleToArray as $key => $val) {
+        if(!@$mail = popen($sendmail, 'w')) {
+          throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+        }
+        fputs($mail, "To: " . $val . "\n");
+        fputs($mail, $header);
+        fputs($mail, $body);
+        $result = pclose($mail);
+        // implement call back function if it exists
+        $isSent = ($result == 0) ? 1 : 0;
+        $this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body);
+        if($result != 0) {
+          throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+        }
+      }
+    } else {
+      if(!@$mail = popen($sendmail, 'w')) {
+        throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+      }
+      fputs($mail, $header);
+      fputs($mail, $body);
+      $result = pclose($mail);
+      // implement call back function if it exists
+      $isSent = ($result == 0) ? 1 : 0;
+      $this->doCallback($isSent,$this->to,$this->cc,$this->bcc,$this->Subject,$body);
+      if($result != 0) {
+        throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+      }
+    }
+    return true;
+  }
+
+  /**
+   * Sends mail using the PHP mail() function.
+   * @param string $header The message headers
+   * @param string $body The message body
+   * @access protected
+   * @return bool
+   */
+  protected function MailSend($header, $body) {
+    $toArr = array();
+    foreach($this->to as $t) {
+      $toArr[] = $this->AddrFormat($t);
+    }
+    $to = implode(', ', $toArr);
+
+    $params = sprintf("-oi -f %s", $this->Sender);
+    if ($this->Sender != '' && strlen(ini_get('safe_mode'))< 1) {
+      $old_from = ini_get('sendmail_from');
+      ini_set('sendmail_from', $this->Sender);
+      if ($this->SingleTo === true && count($toArr) > 1) {
+        foreach ($toArr as $key => $val) {
+          $rt = @mail($val, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
+          // implement call back function if it exists
+          $isSent = ($rt == 1) ? 1 : 0;
+          $this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body);
+        }
+      } else {
+        $rt = @mail($to, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
+        // implement call back function if it exists
+        $isSent = ($rt == 1) ? 1 : 0;
+        $this->doCallback($isSent,$to,$this->cc,$this->bcc,$this->Subject,$body);
+      }
+    } else {
+      if ($this->SingleTo === true && count($toArr) > 1) {
+        foreach ($toArr as $key => $val) {
+          $rt = @mail($val, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
+          // implement call back function if it exists
+          $isSent = ($rt == 1) ? 1 : 0;
+          $this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body);
+        }
+      } else {
+        $rt = @mail($to, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header);
+        // implement call back function if it exists
+        $isSent = ($rt == 1) ? 1 : 0;
+        $this->doCallback($isSent,$to,$this->cc,$this->bcc,$this->Subject,$body);
+      }
+    }
+    if (isset($old_from)) {
+      ini_set('sendmail_from', $old_from);
+    }
+    if(!$rt) {
+      throw new phpmailerException($this->Lang('instantiate'), self::STOP_CRITICAL);
+    }
+    return true;
+  }
+
+  /**
+   * Sends mail via SMTP using PhpSMTP
+   * Returns false if there is a bad MAIL FROM, RCPT, or DATA input.
+   * @param string $header The message headers
+   * @param string $body The message body
+   * @uses SMTP
+   * @access protected
+   * @return bool
+   */
+  protected function SmtpSend($header, $body) {
+    require_once $this->PluginDir . 'class.smtp.php';
+    $bad_rcpt = array();
+
+    if(!$this->SmtpConnect()) {
+      throw new phpmailerException($this->Lang('smtp_connect_failed'), self::STOP_CRITICAL);
+    }
+    $smtp_from = ($this->Sender == '') ? $this->From : $this->Sender;
+    if(!$this->smtp->Mail($smtp_from)) {
+      throw new phpmailerException($this->Lang('from_failed') . $smtp_from, self::STOP_CRITICAL);
+    }
+
+    // Attempt to send attach all recipients
+    foreach($this->to as $to) {
+      if (!$this->smtp->Recipient($to[0])) {
+        $bad_rcpt[] = $to[0];
+        // implement call back function if it exists
+        $isSent = 0;
+        $this->doCallback($isSent,$to[0],'','',$this->Subject,$body);
+      } else {
+        // implement call back function if it exists
+        $isSent = 1;
+        $this->doCallback($isSent,$to[0],'','',$this->Subject,$body);
+      }
+    }
+    foreach($this->cc as $cc) {
+      if (!$this->smtp->Recipient($cc[0])) {
+        $bad_rcpt[] = $cc[0];
+        // implement call back function if it exists
+        $isSent = 0;
+        $this->doCallback($isSent,'',$cc[0],'',$this->Subject,$body);
+      } else {
+        // implement call back function if it exists
+        $isSent = 1;
+        $this->doCallback($isSent,'',$cc[0],'',$this->Subject,$body);
+      }
+    }
+    foreach($this->bcc as $bcc) {
+      if (!$this->smtp->Recipient($bcc[0])) {
+        $bad_rcpt[] = $bcc[0];
+        // implement call back function if it exists
+        $isSent = 0;
+        $this->doCallback($isSent,'','',$bcc[0],$this->Subject,$body);
+      } else {
+        // implement call back function if it exists
+        $isSent = 1;
+        $this->doCallback($isSent,'','',$bcc[0],$this->Subject,$body);
+      }
+    }
+
+
+    if (count($bad_rcpt) > 0 ) { //Create error message for any bad addresses
+      $badaddresses = implode(', ', $bad_rcpt);
+      throw new phpmailerException($this->Lang('recipients_failed') . $badaddresses);
+    }
+    if(!$this->smtp->Data($header . $body)) {
+      throw new phpmailerException($this->Lang('data_not_accepted'), self::STOP_CRITICAL);
+    }
+    if($this->SMTPKeepAlive == true) {
+      $this->smtp->Reset();
+    }
+    return true;
+  }
+
+  /**
+   * Initiates a connection to an SMTP server.
+   * Returns false if the operation failed.
+   * @uses SMTP
+   * @access public
+   * @return bool
+   */
+  public function SmtpConnect() {
+    if(is_null($this->smtp)) {
+      $this->smtp = new SMTP();
+    }
+
+    $this->smtp->do_debug = $this->SMTPDebug;
+    $hosts = explode(';', $this->Host);
+    $index = 0;
+    $connection = $this->smtp->Connected();
+
+    // Retry while there is no connection
+    try {
+      while($index < count($hosts) && !$connection) {
+        $hostinfo = array();
+        if (preg_match('/^(.+):([0-9]+)$/', $hosts[$index], $hostinfo)) {
+          $host = $hostinfo[1];
+          $port = $hostinfo[2];
+        } else {
+          $host = $hosts[$index];
+          $port = $this->Port;
+        }
+
+        $tls = ($this->SMTPSecure == 'tls');
+        $ssl = ($this->SMTPSecure == 'ssl');
+
+        if ($this->smtp->Connect(($ssl ? 'ssl://':'').$host, $port, $this->Timeout)) {
+
+          $hello = ($this->Helo != '' ? $this->Helo : $this->ServerHostname());
+          $this->smtp->Hello($hello);
+
+          if ($tls) {
+            if (!$this->smtp->StartTLS()) {
+              throw new phpmailerException($this->Lang('tls'));
+            }
+
+            //We must resend HELO after tls negotiation
+            $this->smtp->Hello($hello);
+          }
+
+          $connection = true;
+          if ($this->SMTPAuth) {
+            if (!$this->smtp->Authenticate($this->Username, $this->Password)) {
+              throw new phpmailerException($this->Lang('authenticate'));
+            }
+          }
+        }
+        $index++;
+        if (!$connection) {
+          throw new phpmailerException($this->Lang('connect_host'));
+        }
+      }
+    } catch (phpmailerException $e) {
+      $this->smtp->Reset();
+      throw $e;
+    }
+    return true;
+  }
+
+  /**
+   * Closes the active SMTP session if one exists.
+   * @return void
+   */
+  public function SmtpClose() {
+    if(!is_null($this->smtp)) {
+      if($this->smtp->Connected()) {
+        $this->smtp->Quit();
+        $this->smtp->Close();
+      }
+    }
+  }
+
+  /**
+  * Sets the language for all class error messages.
+  * Returns false if it cannot load the language file.  The default language is English.
+  * @param string $langcode ISO 639-1 2-character language code (e.g. Portuguese: "br")
+  * @param string $lang_path Path to the language file directory
+  * @access public
+  */
+  function SetLanguage($langcode = 'en', $lang_path = 'language/') {
+    //Define full set of translatable strings
+    $PHPMAILER_LANG = array(
+      'provide_address' => 'You must provide at least one recipient email address.',
+      'mailer_not_supported' => ' mailer is not supported.',
+      'execute' => 'Could not execute: ',
+      'instantiate' => 'Could not instantiate mail function.',
+      'authenticate' => 'SMTP Error: Could not authenticate.',
+      'from_failed' => 'The following From address failed: ',
+      'recipients_failed' => 'SMTP Error: The following recipients failed: ',
+      'data_not_accepted' => 'SMTP Error: Data not accepted.',
+      'connect_host' => 'SMTP Error: Could not connect to SMTP host.',
+      'file_access' => 'Could not access file: ',
+      'file_open' => 'File Error: Could not open file: ',
+      'encoding' => 'Unknown encoding: ',
+      'signing' => 'Signing Error: ',
+      'smtp_error' => 'SMTP server error: ',
+      'empty_message' => 'Message body empty',
+      'invalid_address' => 'Invalid address',
+      'variable_set' => 'Cannot set or reset variable: '
+    );
+    //Overwrite language-specific strings. This way we'll never have missing translations - no more "language string failed to load"!
+    $l = true;
+    if ($langcode != 'en') { //There is no English translation file
+      $l = @include $lang_path.'phpmailer.lang-'.$langcode.'.php';
+    }
+    $this->language = $PHPMAILER_LANG;
+    return ($l == true); //Returns false if language not found
+  }
+
+  /**
+  * Return the current array of language strings
+  * @return array
+  */
+  public function GetTranslations() {
+    return $this->language;
+  }
+
+  /////////////////////////////////////////////////
+  // METHODS, MESSAGE CREATION
+  /////////////////////////////////////////////////
+
+  /**
+   * Creates recipient headers.
+   * @access public
+   * @return string
+   */
+  public function AddrAppend($type, $addr) {
+    $addr_str = $type . ': ';
+    $addresses = array();
+    foreach ($addr as $a) {
+      $addresses[] = $this->AddrFormat($a);
+    }
+    $addr_str .= implode(', ', $addresses);
+    $addr_str .= $this->LE;
+
+    return $addr_str;
+  }
+
+  /**
+   * Formats an address correctly.
+   * @access public
+   * @return string
+   */
+  public function AddrFormat($addr) {
+    if (empty($addr[1])) {
+      return $this->SecureHeader($addr[0]);
+    } else {
+      return $this->EncodeHeader($this->SecureHeader($addr[1]), 'phrase') . " <" . $this->SecureHeader($addr[0]) . ">";
+    }
+  }
+
+  /**
+   * Wraps message for use with mailers that do not
+   * automatically perform wrapping and for quoted-printable.
+   * Original written by philippe.
+   * @param string $message The message to wrap
+   * @param integer $length The line length to wrap to
+   * @param boolean $qp_mode Whether to run in Quoted-Printable mode
+   * @access public
+   * @return string
+   */
+  public function WrapText($message, $length, $qp_mode = false) {
+    $soft_break = ($qp_mode) ? sprintf(" =%s", $this->LE) : $this->LE;
+    // If utf-8 encoding is used, we will need to make sure we don't
+    // split multibyte characters when we wrap
+    $is_utf8 = (strtolower($this->CharSet) == "utf-8");
+
+    $message = $this->FixEOL($message);
+    if (substr($message, -1) == $this->LE) {
+      $message = substr($message, 0, -1);
+    }
+
+    $line = explode($this->LE, $message);
+    $message = '';
+    for ($i=0 ;$i < count($line); $i++) {
+      $line_part = explode(' ', $line[$i]);
+      $buf = '';
+      for ($e = 0; $e<count($line_part); $e++) {
+        $word = $line_part[$e];
+        if ($qp_mode and (strlen($word) > $length)) {
+          $space_left = $length - strlen($buf) - 1;
+          if ($e != 0) {
+            if ($space_left > 20) {
+              $len = $space_left;
+              if ($is_utf8) {
+                $len = $this->UTF8CharBoundary($word, $len);
+              } elseif (substr($word, $len - 1, 1) == "=") {
+                $len--;
+              } elseif (substr($word, $len - 2, 1) == "=") {
+                $len -= 2;
+              }
+              $part = substr($word, 0, $len);
+              $word = substr($word, $len);
+              $buf .= ' ' . $part;
+              $message .= $buf . sprintf("=%s", $this->LE);
+            } else {
+              $message .= $buf . $soft_break;
+            }
+            $buf = '';
+          }
+          while (strlen($word) > 0) {
+            $len = $length;
+            if ($is_utf8) {
+              $len = $this->UTF8CharBoundary($word, $len);
+            } elseif (substr($word, $len - 1, 1) == "=") {
+              $len--;
+            } elseif (substr($word, $len - 2, 1) == "=") {
+              $len -= 2;
+            }
+            $part = substr($word, 0, $len);
+            $word = substr($word, $len);
+
+            if (strlen($word) > 0) {
+              $message .= $part . sprintf("=%s", $this->LE);
+            } else {
+              $buf = $part;
+            }
+          }
+        } else {
+          $buf_o = $buf;
+          $buf .= ($e == 0) ? $word : (' ' . $word);
+
+          if (strlen($buf) > $length and $buf_o != '') {
+            $message .= $buf_o . $soft_break;
+            $buf = $word;
+          }
+        }
+      }
+      $message .= $buf . $this->LE;
+    }
+
+    return $message;
+  }
+
+  /**
+   * Finds last character boundary prior to maxLength in a utf-8
+   * quoted (printable) encoded string.
+   * Original written by Colin Brown.
+   * @access public
+   * @param string $encodedText utf-8 QP text
+   * @param int    $maxLength   find last character boundary prior to this length
+   * @return int
+   */
+  public function UTF8CharBoundary($encodedText, $maxLength) {
+    $foundSplitPos = false;
+    $lookBack = 3;
+    while (!$foundSplitPos) {
+      $lastChunk = substr($encodedText, $maxLength - $lookBack, $lookBack);
+      $encodedCharPos = strpos($lastChunk, "=");
+      if ($encodedCharPos !== false) {
+        // Found start of encoded character byte within $lookBack block.
+        // Check the encoded byte value (the 2 chars after the '=')
+        $hex = substr($encodedText, $maxLength - $lookBack + $encodedCharPos + 1, 2);
+        $dec = hexdec($hex);
+        if ($dec < 128) { // Single byte character.
+          // If the encoded char was found at pos 0, it will fit
+          // otherwise reduce maxLength to start of the encoded char
+          $maxLength = ($encodedCharPos == 0) ? $maxLength :
+          $maxLength - ($lookBack - $encodedCharPos);
+          $foundSplitPos = true;
+        } elseif ($dec >= 192) { // First byte of a multi byte character
+          // Reduce maxLength to split at start of character
+          $maxLength = $maxLength - ($lookBack - $encodedCharPos);
+          $foundSplitPos = true;
+        } elseif ($dec < 192) { // Middle byte of a multi byte character, look further back
+          $lookBack += 3;
+        }
+      } else {
+        // No encoded character found
+        $foundSplitPos = true;
+      }
+    }
+    return $maxLength;
+  }
+
+
+  /**
+   * Set the body wrapping.
+   * @access public
+   * @return void
+   */
+  public function SetWordWrap() {
+    if($this->WordWrap < 1) {
+      return;
+    }
+
+    switch($this->message_type) {
+      case 'alt':
+      case 'alt_attachments':
+        $this->AltBody = $this->WrapText($this->AltBody, $this->WordWrap);
+        break;
+      default:
+        $this->Body = $this->WrapText($this->Body, $this->WordWrap);
+        break;
+    }
+  }
+
+  /**
+   * Assembles message header.
+   * @access public
+   * @return string The assembled header
+   */
+  public function CreateHeader() {
+    $result = '';
+
+    // Set the boundaries
+    $uniq_id = md5(uniqid(time()));
+    $this->boundary[1] = 'b1_' . $uniq_id;
+    $this->boundary[2] = 'b2_' . $uniq_id;
+
+    $result .= $this->HeaderLine('Date', self::RFCDate());
+    if($this->Sender == '') {
+      $result .= $this->HeaderLine('Return-Path', trim($this->From));
+    } else {
+      $result .= $this->HeaderLine('Return-Path', trim($this->Sender));
+    }
+
+    // To be created automatically by mail()
+    if($this->Mailer != 'mail') {
+      if ($this->SingleTo === true) {
+        foreach($this->to as $t) {
+          $this->SingleToArray[] = $this->AddrFormat($t);
+        }
+      } else {
+        if(count($this->to) > 0) {
+          $result .= $this->AddrAppend('To', $this->to);
+        } elseif (count($this->cc) == 0) {
+          $result .= $this->HeaderLine('To', 'undisclosed-recipients:;');
+        }
+      }
+    }
+
+    $from = array();
+    $from[0][0] = trim($this->From);
+    $from[0][1] = $this->FromName;
+    $result .= $this->AddrAppend('From', $from);
+
+    // sendmail and mail() extract Cc from the header before sending
+    if(count($this->cc) > 0) {
+      $result .= $this->AddrAppend('Cc', $this->cc);
+    }
+
+    // sendmail and mail() extract Bcc from the header before sending
+    if((($this->Mailer == 'sendmail') || ($this->Mailer == 'mail')) && (count($this->bcc) > 0)) {
+      $result .= $this->AddrAppend('Bcc', $this->bcc);
+    }
+
+    if(count($this->ReplyTo) > 0) {
+      $result .= $this->AddrAppend('Reply-to', $this->ReplyTo);
+    }
+
+    // mail() sets the subject itself
+    if($this->Mailer != 'mail') {
+      $result .= $this->HeaderLine('Subject', $this->EncodeHeader($this->SecureHeader($this->Subject)));
+    }
+
+    if($this->MessageID != '') {
+      $result .= $this->HeaderLine('Message-ID',$this->MessageID);
+    } else {
+      $result .= sprintf("Message-ID: <%s@%s>%s", $uniq_id, $this->ServerHostname(), $this->LE);
+    }
+    $result .= $this->HeaderLine('X-Priority', $this->Priority);
+    $result .= $this->HeaderLine('X-Mailer', 'PHPMailer '.$this->Version.' (phpmailer.sourceforge.net)');
+
+    if($this->ConfirmReadingTo != '') {
+      $result .= $this->HeaderLine('Disposition-Notification-To', '<' . trim($this->ConfirmReadingTo) . '>');
+    }
+
+    // Add custom headers
+    for($index = 0; $index < count($this->CustomHeader); $index++) {
+      $result .= $this->HeaderLine(trim($this->CustomHeader[$index][0]), $this->EncodeHeader(trim($this->CustomHeader[$index][1])));
+    }
+    if (!$this->sign_key_file) {
+      $result .= $this->HeaderLine('MIME-Version', '1.0');
+      $result .= $this->GetMailMIME();
+    }
+
+    return $result;
+  }
+
+  /**
+   * Returns the message MIME.
+   * @access public
+   * @return string
+   */
+  public function GetMailMIME() {
+    $result = '';
+    switch($this->message_type) {
+      case 'plain':
+        $result .= $this->HeaderLine('Content-Transfer-Encoding', $this->Encoding);
+        $result .= sprintf("Content-Type: %s; charset=\"%s\"", $this->ContentType, $this->CharSet);
+        break;
+      case 'attachments':
+      case 'alt_attachments':
+        if($this->InlineImageExists()){
+          $result .= sprintf("Content-Type: %s;%s\ttype=\"text/html\";%s\tboundary=\"%s\"%s", 'multipart/related', $this->LE, $this->LE, $this->boundary[1], $this->LE);
+        } else {
+          $result .= $this->HeaderLine('Content-Type', 'multipart/mixed;');
+          $result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] . '"');
+        }
+        break;
+      case 'alt':
+        $result .= $this->HeaderLine('Content-Type', 'multipart/alternative;');
+        $result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] . '"');
+        break;
+    }
+
+    if($this->Mailer != 'mail') {
+      $result .= $this->LE.$this->LE;
+    }
+
+    return $result;
+  }
+
+  /**
+   * Assembles the message body.  Returns an empty string on failure.
+   * @access public
+   * @return string The assembled message body
+   */
+  public function CreateBody() {
+    $body = '';
+
+    if ($this->sign_key_file) {
+      $body .= $this->GetMailMIME();
+    }
+
+    $this->SetWordWrap();
+
+    switch($this->message_type) {
+      case 'alt':
+        $body .= $this->GetBoundary($this->boundary[1], '', 'text/plain', '');
+        $body .= $this->EncodeString($this->AltBody, $this->Encoding);
+        $body .= $this->LE.$this->LE;
+        $body .= $this->GetBoundary($this->boundary[1], '', 'text/html', '');
+        $body .= $this->EncodeString($this->Body, $this->Encoding);
+        $body .= $this->LE.$this->LE;
+        $body .= $this->EndBoundary($this->boundary[1]);
+        break;
+      case 'plain':
+        $body .= $this->EncodeString($this->Body, $this->Encoding);
+        break;
+      case 'attachments':
+        $body .= $this->GetBoundary($this->boundary[1], '', '', '');
+        $body .= $this->EncodeString($this->Body, $this->Encoding);
+        $body .= $this->LE;
+        $body .= $this->AttachAll();
+        break;
+      case 'alt_attachments':
+        $body .= sprintf("--%s%s", $this->boundary[1], $this->LE);
+        $body .= sprintf("Content-Type: %s;%s" . "\tboundary=\"%s\"%s", 'multipart/alternative', $this->LE, $this->boundary[2], $this->LE.$this->LE);
+        $body .= $this->GetBoundary($this->boundary[2], '', 'text/plain', '') . $this->LE; // Create text body
+        $body .= $this->EncodeString($this->AltBody, $this->Encoding);
+        $body .= $this->LE.$this->LE;
+        $body .= $this->GetBoundary($this->boundary[2], '', 'text/html', '') . $this->LE; // Create the HTML body
+        $body .= $this->EncodeString($this->Body, $this->Encoding);
+        $body .= $this->LE.$this->LE;
+        $body .= $this->EndBoundary($this->boundary[2]);
+        $body .= $this->AttachAll();
+        break;
+    }
+
+    if ($this->IsError()) {
+      $body = '';
+    } elseif ($this->sign_key_file) {
+      try {
+        $file = tempnam('', 'mail');
+        file_put_contents($file, $body); //TODO check this worked
+        $signed = tempnam("", "signed");
+        if (@openssl_pkcs7_sign($file, $signed, "file://".$this->sign_cert_file, array("file://".$this->sign_key_file, $this->sign_key_pass), NULL)) {
+          @unlink($file);
+          @unlink($signed);
+          $body = file_get_contents($signed);
+        } else {
+          @unlink($file);
+          @unlink($signed);
+          throw new phpmailerException($this->Lang("signing").openssl_error_string());
+        }
+      } catch (phpmailerException $e) {
+        $body = '';
+        if ($this->exceptions) {
+          throw $e;
+        }
+      }
+    }
+
+    return $body;
+  }
+
+  /**
+   * Returns the start of a message boundary.
+   * @access private
+   */
+  private function GetBoundary($boundary, $charSet, $contentType, $encoding) {
+    $result = '';
+    if($charSet == '') {
+      $charSet = $this->CharSet;
+    }
+    if($contentType == '') {
+      $contentType = $this->ContentType;
+    }
+    if($encoding == '') {
+      $encoding = $this->Encoding;
+    }
+    $result .= $this->TextLine('--' . $boundary);
+    $result .= sprintf("Content-Type: %s; charset = \"%s\"", $contentType, $charSet);
+    $result .= $this->LE;
+    $result .= $this->HeaderLine('Content-Transfer-Encoding', $encoding);
+    $result .= $this->LE;
+
+    return $result;
+  }
+
+  /**
+   * Returns the end of a message boundary.
+   * @access private
+   */
+  private function EndBoundary($boundary) {
+    return $this->LE . '--' . $boundary . '--' . $this->LE;
+  }
+
+  /**
+   * Sets the message type.
+   * @access private
+   * @return void
+   */
+  private function SetMessageType() {
+    if(count($this->attachment) < 1 && strlen($this->AltBody) < 1) {
+      $this->message_type = 'plain';
+    } else {
+      if(count($this->attachment) > 0) {
+        $this->message_type = 'attachments';
+      }
+      if(strlen($this->AltBody) > 0 && count($this->attachment) < 1) {
+        $this->message_type = 'alt';
+      }
+      if(strlen($this->AltBody) > 0 && count($this->attachment) > 0) {
+        $this->message_type = 'alt_attachments';
+      }
+    }
+  }
+
+  /**
+   *  Returns a formatted header line.
+   * @access public
+   * @return string
+   */
+  public function HeaderLine($name, $value) {
+    return $name . ': ' . $value . $this->LE;
+  }
+
+  /**
+   * Returns a formatted mail line.
+   * @access public
+   * @return string
+   */
+  public function TextLine($value) {
+    return $value . $this->LE;
+  }
+
+  /////////////////////////////////////////////////
+  // CLASS METHODS, ATTACHMENTS
+  /////////////////////////////////////////////////
+
+  /**
+   * Adds an attachment from a path on the filesystem.
+   * Returns false if the file could not be found
+   * or accessed.
+   * @param string $path Path to the attachment.
+   * @param string $name Overrides the attachment name.
+   * @param string $encoding File encoding (see $Encoding).
+   * @param string $type File extension (MIME) type.
+   * @return bool
+   */
+  public function AddAttachment($path, $name = '', $encoding = 'base64', $type = 'application/octet-stream') {
+    try {
+      if ( !@is_file($path) ) {
+        throw new phpmailerException($this->Lang('file_access') . $path, self::STOP_CONTINUE);
+      }
+      $filename = basename($path);
+      if ( $name == '' ) {
+        $name = $filename;
+      }
+
+      $this->attachment[] = array(
+        0 => $path,
+        1 => $filename,
+        2 => $name,
+        3 => $encoding,
+        4 => $type,
+        5 => false,  // isStringAttachment
+        6 => 'attachment',
+        7 => 0
+      );
+
+    } catch (phpmailerException $e) {
+      $this->SetError($e->getMessage());
+      if ($this->exceptions) {
+        throw $e;
+      }
+      echo $e->getMessage()."\n";
+      if ( $e->getCode() == self::STOP_CRITICAL ) {
+        return false;
+      }
+    }
+    return true;
+  }
+
+  /**
+  * Return the current array of attachments
+  * @return array
+  */
+  public function GetAttachments() {
+    return $this->attachment;
+  }
+
+  /**
+   * Attaches all fs, string, and binary attachments to the message.
+   * Returns an empty string on failure.
+   * @access private
+   * @return string
+   */
+  private function AttachAll() {
+    // Return text of body
+    $mime = array();
+    $cidUniq = array();
+    $incl = array();
+
+    // Add all attachments
+    foreach ($this->attachment as $attachment) {
+      // Check for string attachment
+      $bString = $attachment[5];
+      if ($bString) {
+        $string = $attachment[0];
+      } else {
+        $path = $attachment[0];
+      }
+
+      if (in_array($attachment[0], $incl)) { continue; }
+      $filename    = $attachment[1];
+      $name        = $attachment[2];
+      $encoding    = $attachment[3];
+      $type        = $attachment[4];
+      $disposition = $attachment[6];
+      $cid         = $attachment[7];
+      $incl[]      = $attachment[0];
+      if ( $disposition == 'inline' && isset($cidUniq[$cid]) ) { continue; }
+      $cidUniq[$cid] = true;
+
+      $mime[] = sprintf("--%s%s", $this->boundary[1], $this->LE);
+      $mime[] = sprintf("Content-Type: %s; name=\"%s\"%s", $type, $this->EncodeHeader($this->SecureHeader($name)), $this->LE);
+      $mime[] = sprintf("Content-Transfer-Encoding: %s%s", $encoding, $this->LE);
+
+      if($disposition == 'inline') {
+        $mime[] = sprintf("Content-ID: <%s>%s", $cid, $this->LE);
+      }
+
+      $mime[] = sprintf("Content-Disposition: %s; filename=\"%s\"%s", $disposition, $this->EncodeHeader($this->SecureHeader($name)), $this->LE.$this->LE);
+
+      // Encode as string attachment
+      if($bString) {
+        $mime[] = $this->EncodeString($string, $encoding);
+        if($this->IsError()) {
+          return '';
+        }
+        $mime[] = $this->LE.$this->LE;
+      } else {
+        $mime[] = $this->EncodeFile($path, $encoding);
+        if($this->IsError()) {
+          return '';
+        }
+        $mime[] = $this->LE.$this->LE;
+      }
+    }
+
+    $mime[] = sprintf("--%s--%s", $this->boundary[1], $this->LE);
+
+    return join('', $mime);
+  }
+
+  /**
+   * Encodes attachment in requested format.
+   * Returns an empty string on failure.
+   * @param string $path The full path to the file
+   * @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable'
+   * @see EncodeFile()
+   * @access private
+   * @return string
+   */
+  private function EncodeFile($path, $encoding = 'base64') {
+    try {
+      if (!is_readable($path)) {
+        throw new phpmailerException($this->Lang('file_open') . $path, self::STOP_CONTINUE);
+      }
+      if (function_exists('get_magic_quotes')) {
+        function get_magic_quotes() {
+          return false;
+        }
+      }
+      if (PHP_VERSION < 6) {
+        $magic_quotes = get_magic_quotes_runtime();
+        set_magic_quotes_runtime(0);
+      }
+      $file_buffer  = file_get_contents($path);
+      $file_buffer  = $this->EncodeString($file_buffer, $encoding);
+      if (PHP_VERSION < 6) { set_magic_quotes_runtime($magic_quotes); }
+      return $file_buffer;
+    } catch (Exception $e) {
+      $this->SetError($e->getMessage());
+      return '';
+    }
+  }
+
+  /**
+   * Encodes string to requested format.
+   * Returns an empty string on failure.
+   * @param string $str The text to encode
+   * @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable'
+   * @access public
+   * @return string
+   */
+  public function EncodeString ($str, $encoding = 'base64') {
+    $encoded = '';
+    switch(strtolower($encoding)) {
+      case 'base64':
+        $encoded = chunk_split(base64_encode($str), 76, $this->LE);
+        break;
+      case '7bit':
+      case '8bit':
+        $encoded = $this->FixEOL($str);
+        //Make sure it ends with a line break
+        if (substr($encoded, -(strlen($this->LE))) != $this->LE)
+          $encoded .= $this->LE;
+        break;
+      case 'binary':
+        $encoded = $str;
+        break;
+      case 'quoted-printable':
+        $encoded = $this->EncodeQP($str);
+        break;
+      default:
+        $this->SetError($this->Lang('encoding') . $encoding);
+        break;
+    }
+    return $encoded;
+  }
+
+  /**
+   * Encode a header string to best (shortest) of Q, B, quoted or none.
+   * @access public
+   * @return string
+   */
+  public function EncodeHeader($str, $position = 'text') {
+    $x = 0;
+
+    switch (strtolower($position)) {
+      case 'phrase':
+        if (!preg_match('/[\200-\377]/', $str)) {
+          // Can't use addslashes as we don't know what value has magic_quotes_sybase
+          $encoded = addcslashes($str, "\0..\37\177\\\"");
+          if (($str == $encoded) && !preg_match('/[^A-Za-z0-9!#$%&\'*+\/=?^_`{|}~ -]/', $str)) {
+            return ($encoded);
+          } else {
+            return ("\"$encoded\"");
+          }
+        }
+        $x = preg_match_all('/[^\040\041\043-\133\135-\176]/', $str, $matches);
+        break;
+      case 'comment':
+        $x = preg_match_all('/[()"]/', $str, $matches);
+        // Fall-through
+      case 'text':
+      default:
+        $x += preg_match_all('/[\000-\010\013\014\016-\037\177-\377]/', $str, $matches);
+        break;
+    }
+
+    if ($x == 0) {
+      return ($str);
+    }
+
+    $maxlen = 75 - 7 - strlen($this->CharSet);
+    // Try to select the encoding which should produce the shortest output
+    if (strlen($str)/3 < $x) {
+      $encoding = 'B';
+      if (function_exists('mb_strlen') && $this->HasMultiBytes($str)) {
+        // Use a custom function which correctly encodes and wraps long
+        // multibyte strings without breaking lines within a character
+        $encoded = $this->Base64EncodeWrapMB($str);
+      } else {
+        $encoded = base64_encode($str);
+        $maxlen -= $maxlen % 4;
+        $encoded = trim(chunk_split($encoded, $maxlen, "\n"));
+      }
+    } else {
+      $encoding = 'Q';
+      $encoded = $this->EncodeQ($str, $position);
+      $encoded = $this->WrapText($encoded, $maxlen, true);
+      $encoded = str_replace('='.$this->LE, "\n", trim($encoded));
+    }
+
+    $encoded = preg_replace('/^(.*)$/m', " =?".$this->CharSet."?$encoding?\\1?=", $encoded);
+    $encoded = trim(str_replace("\n", $this->LE, $encoded));
+
+    return $encoded;
+  }
+
+  /**
+   * Checks if a string contains multibyte characters.
+   * @access public
+   * @param string $str multi-byte text to wrap encode
+   * @return bool
+   */
+  public function HasMultiBytes($str) {
+    if (function_exists('mb_strlen')) {
+      return (strlen($str) > mb_strlen($str, $this->CharSet));
+    } else { // Assume no multibytes (we can't handle without mbstring functions anyway)
+      return false;
+    }
+  }
+
+  /**
+   * Correctly encodes and wraps long multibyte strings for mail headers
+   * without breaking lines within a character.
+   * Adapted from a function by paravoid at http://uk.php.net/manual/en/function.mb-encode-mimeheader.php
+   * @access public
+   * @param string $str multi-byte text to wrap encode
+   * @return string
+   */
+  public function Base64EncodeWrapMB($str) {
+    $start = "=?".$this->CharSet."?B?";
+    $end = "?=";
+    $encoded = "";
+
+    $mb_length = mb_strlen($str, $this->CharSet);
+    // Each line must have length <= 75, including $start and $end
+    $length = 75 - strlen($start) - strlen($end);
+    // Average multi-byte ratio
+    $ratio = $mb_length / strlen($str);
+    // Base64 has a 4:3 ratio
+    $offset = $avgLength = floor($length * $ratio * .75);
+
+    for ($i = 0; $i < $mb_length; $i += $offset) {
+      $lookBack = 0;
+
+      do {
+        $offset = $avgLength - $lookBack;
+        $chunk = mb_substr($str, $i, $offset, $this->CharSet);
+        $chunk = base64_encode($chunk);
+        $lookBack++;
+      }
+      while (strlen($chunk) > $length);
+
+      $encoded .= $chunk . $this->LE;
+    }
+
+    // Chomp the last linefeed
+    $encoded = substr($encoded, 0, -strlen($this->LE));
+    return $encoded;
+  }
+
+  /**
+  * Encode string to quoted-printable.
+  * Only uses standard PHP, slow, but will always work
+  * @access public
+  * @param string $string the text to encode
+  * @param integer $line_max Number of chars allowed on a line before wrapping
+  * @return string
+  */
+  public function EncodeQPphp( $input = '', $line_max = 76, $space_conv = false) {
+    $hex = array('0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F');
+    $lines = preg_split('/(?:\r\n|\r|\n)/', $input);
+    $eol = "\r\n";
+    $escape = '=';
+    $output = '';
+    while( list(, $line) = each($lines) ) {
+      $linlen = strlen($line);
+      $newline = '';
+      for($i = 0; $i < $linlen; $i++) {
+        $c = substr( $line, $i, 1 );
+        $dec = ord( $c );
+        if ( ( $i == 0 ) && ( $dec == 46 ) ) { // convert first point in the line into =2E
+          $c = '=2E';
+        }
+        if ( $dec == 32 ) {
+          if ( $i == ( $linlen - 1 ) ) { // convert space at eol only
+            $c = '=20';
+          } else if ( $space_conv ) {
+            $c = '=20';
+          }
+        } elseif ( ($dec == 61) || ($dec < 32 ) || ($dec > 126) ) { // always encode "\t", which is *not* required
+          $h2 = floor($dec/16);
+          $h1 = floor($dec%16);
+          $c = $escape.$hex[$h2].$hex[$h1];
+        }
+        if ( (strlen($newline) + strlen($c)) >= $line_max ) { // CRLF is not counted
+          $output .= $newline.$escape.$eol; //  soft line break; " =\r\n" is okay
+          $newline = '';
+          // check if newline first character will be point or not
+          if ( $dec == 46 ) {
+            $c = '=2E';
+          }
+        }
+        $newline .= $c;
+      } // end of for
+      $output .= $newline.$eol;
+    } // end of while
+    return $output;
+  }
+
+  /**
+  * Encode string to RFC2045 (6.7) quoted-printable format
+  * Uses a PHP5 stream filter to do the encoding about 64x faster than the old version
+  * Also results in same content as you started with after decoding
+  * @see EncodeQPphp()
+  * @access public
+  * @param string $string the text to encode
+  * @param integer $line_max Number of chars allowed on a line before wrapping
+  * @param boolean $space_conv Dummy param for compatibility with existing EncodeQP function
+  * @return string
+  * @author Marcus Bointon
+  */
+  public function EncodeQP($string, $line_max = 76, $space_conv = false) {
+    if (function_exists('quoted_printable_encode')) { //Use native function if it's available (>= PHP5.3)
+      return quoted_printable_encode($string);
+    }
+    $filters = stream_get_filters();
+    if (!in_array('convert.*', $filters)) { //Got convert stream filter?
+      return $this->EncodeQPphp($string, $line_max, $space_conv); //Fall back to old implementation
+    }
+    $fp = fopen('php://temp/', 'r+');
+    $string = preg_replace('/\r\n?/', $this->LE, $string); //Normalise line breaks
+    $params = array('line-length' => $line_max, 'line-break-chars' => $this->LE);
+    $s = stream_filter_append($fp, 'convert.quoted-printable-encode', STREAM_FILTER_READ, $params);
+    fputs($fp, $string);
+    rewind($fp);
+    $out = stream_get_contents($fp);
+    stream_filter_remove($s);
+    $out = preg_replace('/^\./m', '=2E', $out); //Encode . if it is first char on a line, workaround for bug in Exchange
+    fclose($fp);
+    return $out;
+  }
+
+  /**
+   * Encode string to q encoding.
+   * @link http://tools.ietf.org/html/rfc2047
+   * @param string $str the text to encode
+   * @param string $position Where the text is going to be used, see the RFC for what that means
+   * @access public
+   * @return string
+   */
+  public function EncodeQ ($str, $position = 'text') {
+    // There should not be any EOL in the string
+    $encoded = preg_replace('/[\r\n]*/', '', $str);
+
+    switch (strtolower($position)) {
+      case 'phrase':
+        $encoded = preg_replace("/([^A-Za-z0-9!*+\/ -])/e", "'='.sprintf('%02X', ord('\\1'))", $encoded);
+        break;
+      case 'comment':
+        $encoded = preg_replace("/([\(\)\"])/e", "'='.sprintf('%02X', ord('\\1'))", $encoded);
+      case 'text':
+      default:
+        // Replace every high ascii, control =, ? and _ characters
+        //TODO using /e (equivalent to eval()) is probably not a good idea
+        $encoded = preg_replace('/([\000-\011\013\014\016-\037\075\077\137\177-\377])/e',
+              "'='.sprintf('%02X', ord('\\1'))", $encoded);
+        break;
+    }
+
+    // Replace every spaces to _ (more readable than =20)
+    $encoded = str_replace(' ', '_', $encoded);
+
+    return $encoded;
+  }
+
+  /**
+   * Adds a string or binary attachment (non-filesystem) to the list.
+   * This method can be used to attach ascii or binary data,
+   * such as a BLOB record from a database.
+   * @param string $string String attachment data.
+   * @param string $filename Name of the attachment.
+   * @param string $encoding File encoding (see $Encoding).
+   * @param string $type File extension (MIME) type.
+   * @return void
+   */
+  public function AddStringAttachment($string, $filename, $encoding = 'base64', $type = 'application/octet-stream') {
+    // Append to $attachment array
+    $this->attachment[] = array(
+      0 => $string,
+      1 => $filename,
+      2 => basename($filename),
+      3 => $encoding,
+      4 => $type,
+      5 => true,  // isStringAttachment
+      6 => 'attachment',
+      7 => 0
+    );
+  }
+
+  /**
+   * Adds an embedded attachment.  This can include images, sounds, and
+   * just about any other document.  Make sure to set the $type to an
+   * image type.  For JPEG images use "image/jpeg" and for GIF images
+   * use "image/gif".
+   * @param string $path Path to the attachment.
+   * @param string $cid Content ID of the attachment.  Use this to identify
+   *        the Id for accessing the image in an HTML form.
+   * @param string $name Overrides the attachment name.
+   * @param string $encoding File encoding (see $Encoding).
+   * @param string $type File extension (MIME) type.
+   * @return bool
+   */
+  public function AddEmbeddedImage($path, $cid, $name = '', $encoding = 'base64', $type = 'application/octet-stream') {
+
+    if ( !@is_file($path) ) {
+      $this->SetError($this->Lang('file_access') . $path);
+      return false;
+    }
+
+    $filename = basename($path);
+    if ( $name == '' ) {
+      $name = $filename;
+    }
+
+    // Append to $attachment array
+    $this->attachment[] = array(
+      0 => $path,
+      1 => $filename,
+      2 => $name,
+      3 => $encoding,
+      4 => $type,
+      5 => false,  // isStringAttachment
+      6 => 'inline',
+      7 => $cid
+    );
+
+    return true;
+  }
+
+  /**
+   * Returns true if an inline attachment is present.
+   * @access public
+   * @return bool
+   */
+  public function InlineImageExists() {
+    foreach($this->attachment as $attachment) {
+      if ($attachment[6] == 'inline') {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  /////////////////////////////////////////////////
+  // CLASS METHODS, MESSAGE RESET
+  /////////////////////////////////////////////////
+
+  /**
+   * Clears all recipients assigned in the TO array.  Returns void.
+   * @return void
+   */
+  public function ClearAddresses() {
+    foreach($this->to as $to) {
+      unset($this->all_recipients[strtolower($to[0])]);
+    }
+    $this->to = array();
+  }
+
+  /**
+   * Clears all recipients assigned in the CC array.  Returns void.
+   * @return void
+   */
+  public function ClearCCs() {
+    foreach($this->cc as $cc) {
+      unset($this->all_recipients[strtolower($cc[0])]);
+    }
+    $this->cc = array();
+  }
+
+  /**
+   * Clears all recipients assigned in the BCC array.  Returns void.
+   * @return void
+   */
+  public function ClearBCCs() {
+    foreach($this->bcc as $bcc) {
+      unset($this->all_recipients[strtolower($bcc[0])]);
+    }
+    $this->bcc = array();
+  }
+
+  /**
+   * Clears all recipients assigned in the ReplyTo array.  Returns void.
+   * @return void
+   */
+  public function ClearReplyTos() {
+    $this->ReplyTo = array();
+  }
+
+  /**
+   * Clears all recipients assigned in the TO, CC and BCC
+   * array.  Returns void.
+   * @return void
+   */
+  public function ClearAllRecipients() {
+    $this->to = array();
+    $this->cc = array();
+    $this->bcc = array();
+    $this->all_recipients = array();
+  }
+
+  /**
+   * Clears all previously set filesystem, string, and binary
+   * attachments.  Returns void.
+   * @return void
+   */
+  public function ClearAttachments() {
+    $this->attachment = array();
+  }
+
+  /**
+   * Clears all custom headers.  Returns void.
+   * @return void
+   */
+  public function ClearCustomHeaders() {
+    $this->CustomHeader = array();
+  }
+
+  /////////////////////////////////////////////////
+  // CLASS METHODS, MISCELLANEOUS
+  /////////////////////////////////////////////////
+
+  /**
+   * Adds the error message to the error container.
+   * @access protected
+   * @return void
+   */
+  protected function SetError($msg) {
+    $this->error_count++;
+    if ($this->Mailer == 'smtp' and !is_null($this->smtp)) {
+      $lasterror = $this->smtp->getError();
+      if (!empty($lasterror) and array_key_exists('smtp_msg', $lasterror)) {
+        $msg .= '<p>' . $this->Lang('smtp_error') . $lasterror['smtp_msg'] . "</p>\n";
+      }
+    }
+    $this->ErrorInfo = $msg;
+  }
+
+  /**
+   * Returns the proper RFC 822 formatted date.
+   * @access public
+   * @return string
+   * @static
+   */
+  public static function RFCDate() {
+    $tz = date('Z');
+    $tzs = ($tz < 0) ? '-' : '+';
+    $tz = abs($tz);
+    $tz = (int)($tz/3600)*100 + ($tz%3600)/60;
+    $result = sprintf("%s %s%04d", date('D, j M Y H:i:s'), $tzs, $tz);
+
+    return $result;
+  }
+
+  /**
+   * Returns the server hostname or 'localhost.localdomain' if unknown.
+   * @access private
+   * @return string
+   */
+  private function ServerHostname() {
+    if (!empty($this->Hostname)) {
+      $result = $this->Hostname;
+    } elseif (isset($_SERVER['SERVER_NAME'])) {
+      $result = $_SERVER['SERVER_NAME'];
+    } else {
+      $result = 'localhost.localdomain';
+    }
+
+    return $result;
+  }
+
+  /**
+   * Returns a message in the appropriate language.
+   * @access private
+   * @return string
+   */
+  private function Lang($key) {
+    if(count($this->language) < 1) {
+      $this->SetLanguage('en'); // set the default language
+    }
+
+    if(isset($this->language[$key])) {
+      return $this->language[$key];
+    } else {
+      return 'Language string failed to load: ' . $key;
+    }
+  }
+
+  /**
+   * Returns true if an error occurred.
+   * @access public
+   * @return bool
+   */
+  public function IsError() {
+    return ($this->error_count > 0);
+  }
+
+  /**
+   * Changes every end of line from CR or LF to CRLF.
+   * @access private
+   * @return string
+   */
+  private function FixEOL($str) {
+    $str = str_replace("\r\n", "\n", $str);
+    $str = str_replace("\r", "\n", $str);
+    $str = str_replace("\n", $this->LE, $str);
+    return $str;
+  }
+
+  /**
+   * Adds a custom header.
+   * @access public
+   * @return void
+   */
+  public function AddCustomHeader($custom_header) {
+    $this->CustomHeader[] = explode(':', $custom_header, 2);
+  }
+
+  /**
+   * Evaluates the message and returns modifications for inline images and backgrounds
+   * @access public
+   * @return $message
+   */
+  public function MsgHTML($message, $basedir = '') {
+    preg_match_all("/(src|background)=\"(.*)\"/Ui", $message, $images);
+    if(isset($images[2])) {
+      foreach($images[2] as $i => $url) {
+        // do not change urls for absolute images (thanks to corvuscorax)
+        if (!preg_match('#^[A-z]+://#',$url)) {
+          $filename = basename($url);
+          $directory = dirname($url);
+          ($directory == '.')?$directory='':'';
+          $cid = 'cid:' . md5($filename);
+          $ext = pathinfo($filename, PATHINFO_EXTENSION);
+          $mimeType  = self::_mime_types($ext);
+          if ( strlen($basedir) > 1 && substr($basedir,-1) != '/') { $basedir .= '/'; }
+          if ( strlen($directory) > 1 && substr($directory,-1) != '/') { $directory .= '/'; }
+          if ( $this->AddEmbeddedImage($basedir.$directory.$filename, md5($filename), $filename, 'base64',$mimeType) ) {
+            $message = preg_replace("/".$images[1][$i]."=\"".preg_quote($url, '/')."\"/Ui", $images[1][$i]."=\"".$cid."\"", $message);
+          }
+        }
+      }
+    }
+    $this->IsHTML(true);
+    $this->Body = $message;
+    $textMsg = trim(strip_tags(preg_replace('/<(head|title|style|script)[^>]*>.*?<\/\\1>/s','',$message)));
+    if (!empty($textMsg) && empty($this->AltBody)) {
+      $this->AltBody = html_entity_decode($textMsg);
+    }
+    if (empty($this->AltBody)) {
+      $this->AltBody = 'To view this email message, open it in a program that understands HTML!' . "\n\n";
+    }
+  }
+
+  /**
+   * Gets the MIME type of the embedded or inline image
+   * @param string File extension
+   * @access public
+   * @return string MIME type of ext
+   * @static
+   */
+  public static function _mime_types($ext = '') {
+    $mimes = array(
+      'hqx'   =>  'application/mac-binhex40',
+      'cpt'   =>  'application/mac-compactpro',
+      'doc'   =>  'application/msword',
+      'bin'   =>  'application/macbinary',
+      'dms'   =>  'application/octet-stream',
+      'lha'   =>  'application/octet-stream',
+      'lzh'   =>  'application/octet-stream',
+      'exe'   =>  'application/octet-stream',
+      'class' =>  'application/octet-stream',
+      'psd'   =>  'application/octet-stream',
+      'so'    =>  'application/octet-stream',
+      'sea'   =>  'application/octet-stream',
+      'dll'   =>  'application/octet-stream',
+      'oda'   =>  'application/oda',
+      'pdf'   =>  'application/pdf',
+      'ai'    =>  'application/postscript',
+      'eps'   =>  'application/postscript',
+      'ps'    =>  'application/postscript',
+      'smi'   =>  'application/smil',
+      'smil'  =>  'application/smil',
+      'mif'   =>  'application/vnd.mif',
+      'xls'   =>  'application/vnd.ms-excel',
+      'ppt'   =>  'application/vnd.ms-powerpoint',
+      'wbxml' =>  'application/vnd.wap.wbxml',
+      'wmlc'  =>  'application/vnd.wap.wmlc',
+      'dcr'   =>  'application/x-director',
+      'dir'   =>  'application/x-director',
+      'dxr'   =>  'application/x-director',
+      'dvi'   =>  'application/x-dvi',
+      'gtar'  =>  'application/x-gtar',
+      'php'   =>  'application/x-httpd-php',
+      'php4'  =>  'application/x-httpd-php',
+      'php3'  =>  'application/x-httpd-php',
+      'phtml' =>  'application/x-httpd-php',
+      'phps'  =>  'application/x-httpd-php-source',
+      'js'    =>  'application/x-javascript',
+      'swf'   =>  'application/x-shockwave-flash',
+      'sit'   =>  'application/x-stuffit',
+      'tar'   =>  'application/x-tar',
+      'tgz'   =>  'application/x-tar',
+      'xhtml' =>  'application/xhtml+xml',
+      'xht'   =>  'application/xhtml+xml',
+      'zip'   =>  'application/zip',
+      'mid'   =>  'audio/midi',
+      'midi'  =>  'audio/midi',
+      'mpga'  =>  'audio/mpeg',
+      'mp2'   =>  'audio/mpeg',
+      'mp3'   =>  'audio/mpeg',
+      'aif'   =>  'audio/x-aiff',
+      'aiff'  =>  'audio/x-aiff',
+      'aifc'  =>  'audio/x-aiff',
+      'ram'   =>  'audio/x-pn-realaudio',
+      'rm'    =>  'audio/x-pn-realaudio',
+      'rpm'   =>  'audio/x-pn-realaudio-plugin',
+      'ra'    =>  'audio/x-realaudio',
+      'rv'    =>  'video/vnd.rn-realvideo',
+      'wav'   =>  'audio/x-wav',
+      'bmp'   =>  'image/bmp',
+      'gif'   =>  'image/gif',
+      'jpeg'  =>  'image/jpeg',
+      'jpg'   =>  'image/jpeg',
+      'jpe'   =>  'image/jpeg',
+      'png'   =>  'image/png',
+      'tiff'  =>  'image/tiff',
+      'tif'   =>  'image/tiff',
+      'css'   =>  'text/css',
+      'html'  =>  'text/html',
+      'htm'   =>  'text/html',
+      'shtml' =>  'text/html',
+      'txt'   =>  'text/plain',
+      'text'  =>  'text/plain',
+      'log'   =>  'text/plain',
+      'rtx'   =>  'text/richtext',
+      'rtf'   =>  'text/rtf',
+      'xml'   =>  'text/xml',
+      'xsl'   =>  'text/xml',
+      'mpeg'  =>  'video/mpeg',
+      'mpg'   =>  'video/mpeg',
+      'mpe'   =>  'video/mpeg',
+      'qt'    =>  'video/quicktime',
+      'mov'   =>  'video/quicktime',
+      'avi'   =>  'video/x-msvideo',
+      'movie' =>  'video/x-sgi-movie',
+      'doc'   =>  'application/msword',
+      'word'  =>  'application/msword',
+      'xl'    =>  'application/excel',
+      'eml'   =>  'message/rfc822'
+    );
+    return (!isset($mimes[strtolower($ext)])) ? 'application/octet-stream' : $mimes[strtolower($ext)];
+  }
+
+  /**
+  * Set (or reset) Class Objects (variables)
+  *
+  * Usage Example:
+  * $page->set('X-Priority', '3');
+  *
+  * @access public
+  * @param string $name Parameter Name
+  * @param mixed $value Parameter Value
+  * NOTE: will not work with arrays, there are no arrays to set/reset
+  * @todo Should this not be using __set() magic function?
+  */
+  public function set($name, $value = '') {
+    try {
+      if (isset($this->$name) ) {
+        $this->$name = $value;
+      } else {
+        throw new phpmailerException($this->Lang('variable_set') . $name, self::STOP_CRITICAL);
+      }
+    } catch (Exception $e) {
+      $this->SetError($e->getMessage());
+      if ($e->getCode() == self::STOP_CRITICAL) {
+        return false;
+      }
+    }
+    return true;
+  }
+
+  /**
+   * Strips newlines to prevent header injection.
+   * @access public
+   * @param string $str String
+   * @return string
+   */
+  public function SecureHeader($str) {
+    $str = str_replace("\r", '', $str);
+    $str = str_replace("\n", '', $str);
+    return trim($str);
+  }
+
+  /**
+   * Set the private key file and password to sign the message.
+   *
+   * @access public
+   * @param string $key_filename Parameter File Name
+   * @param string $key_pass Password for private key
+   */
+  public function Sign($cert_filename, $key_filename, $key_pass) {
+    $this->sign_cert_file = $cert_filename;
+    $this->sign_key_file = $key_filename;
+    $this->sign_key_pass = $key_pass;
+  }
+
+  /**
+   * Set the private key file and password to sign the message.
+   *
+   * @access public
+   * @param string $key_filename Parameter File Name
+   * @param string $key_pass Password for private key
+   */
+  public function DKIM_QP($txt) {
+    $tmp="";
+    $line="";
+    for ($i=0;$i<strlen($txt);$i++) {
+      $ord=ord($txt[$i]);
+      if ( ((0x21 <= $ord) && ($ord <= 0x3A)) || $ord == 0x3C || ((0x3E <= $ord) && ($ord <= 0x7E)) ) {
+        $line.=$txt[$i];
+      } else {
+        $line.="=".sprintf("%02X",$ord);
+      }
+    }
+    return $line;
+  }
+
+  /**
+   * Generate DKIM signature
+   *
+   * @access public
+   * @param string $s Header
+   */
+  public function DKIM_Sign($s) {
+    $privKeyStr = file_get_contents($this->DKIM_private);
+    if ($this->DKIM_passphrase!='') {
+      $privKey = openssl_pkey_get_private($privKeyStr,$this->DKIM_passphrase);
+    } else {
+      $privKey = $privKeyStr;
+    }
+    if (openssl_sign($s, $signature, $privKey)) {
+      return base64_encode($signature);
+    }
+  }
+
+  /**
+   * Generate DKIM Canonicalization Header
+   *
+   * @access public
+   * @param string $s Header
+   */
+  public function DKIM_HeaderC($s) {
+    $s=preg_replace("/\r\n\s+/"," ",$s);
+    $lines=explode("\r\n",$s);
+    foreach ($lines as $key=>$line) {
+      list($heading,$value)=explode(":",$line,2);
+      $heading=strtolower($heading);
+      $value=preg_replace("/\s+/"," ",$value) ; // Compress useless spaces
+      $lines[$key]=$heading.":".trim($value) ; // Don't forget to remove WSP around the value
+    }
+    $s=implode("\r\n",$lines);
+    return $s;
+  }
+
+  /**
+   * Generate DKIM Canonicalization Body
+   *
+   * @access public
+   * @param string $body Message Body
+   */
+  public function DKIM_BodyC($body) {
+    if ($body == '') return "\r\n";
+    // stabilize line endings
+    $body=str_replace("\r\n","\n",$body);
+    $body=str_replace("\n","\r\n",$body);
+    // END stabilize line endings
+    while (substr($body,strlen($body)-4,4) == "\r\n\r\n") {
+      $body=substr($body,0,strlen($body)-2);
+    }
+    return $body;
+  }
+
+  /**
+   * Create the DKIM header, body, as new header
+   *
+   * @access public
+   * @param string $headers_line Header lines
+   * @param string $subject Subject
+   * @param string $body Body
+   */
+  public function DKIM_Add($headers_line,$subject,$body) {
+    $DKIMsignatureType    = 'rsa-sha1'; // Signature & hash algorithms
+    $DKIMcanonicalization = 'relaxed/simple'; // Canonicalization of header/body
+    $DKIMquery            = 'dns/txt'; // Query method
+    $DKIMtime             = time() ; // Signature Timestamp = seconds since 00:00:00 - Jan 1, 1970 (UTC time zone)
+    $subject_header       = "Subject: $subject";
+    $headers              = explode("\r\n",$headers_line);
+    foreach($headers as $header) {
+      if (strpos($header,'From:') === 0) {
+        $from_header=$header;
+      } elseif (strpos($header,'To:') === 0) {
+        $to_header=$header;
+      }
+    }
+    $from     = str_replace('|','=7C',$this->DKIM_QP($from_header));
+    $to       = str_replace('|','=7C',$this->DKIM_QP($to_header));
+    $subject  = str_replace('|','=7C',$this->DKIM_QP($subject_header)) ; // Copied header fields (dkim-quoted-printable
+    $body     = $this->DKIM_BodyC($body);
+    $DKIMlen  = strlen($body) ; // Length of body
+    $DKIMb64  = base64_encode(pack("H*", sha1($body))) ; // Base64 of packed binary SHA-1 hash of body
+    $ident    = ($this->DKIM_identity == '')? '' : " i=" . $this->DKIM_identity . ";";
+    $dkimhdrs = "DKIM-Signature: v=1; a=" . $DKIMsignatureType . "; q=" . $DKIMquery . "; l=" . $DKIMlen . "; s=" . $this->DKIM_selector . ";\r\n".
+                "\tt=" . $DKIMtime . "; c=" . $DKIMcanonicalization . ";\r\n".
+                "\th=From:To:Subject;\r\n".
+                "\td=" . $this->DKIM_domain . ";" . $ident . "\r\n".
+                "\tz=$from\r\n".
+                "\t|$to\r\n".
+                "\t|$subject;\r\n".
+                "\tbh=" . $DKIMb64 . ";\r\n".
+                "\tb=";
+    $toSign   = $this->DKIM_HeaderC($from_header . "\r\n" . $to_header . "\r\n" . $subject_header . "\r\n" . $dkimhdrs);
+    $signed   = $this->DKIM_Sign($toSign);
+    return "X-PHPMAILER-DKIM: phpmailer.worxware.com\r\n".$dkimhdrs.$signed."\r\n";
+  }
+
+  protected function doCallback($isSent,$to,$cc,$bcc,$subject,$body) {
+    if (!empty($this->action_function) && function_exists($this->action_function)) {
+      $params = array($isSent,$to,$cc,$bcc,$subject,$body);
+      call_user_func_array($this->action_function,$params);
+    }
+  }
+}
+
+class phpmailerException extends Exception {
+  public function errorMessage() {
+    $errorMsg = '<strong>' . $this->getMessage() . "</strong><br />\n";
+    return $errorMsg;
+  }
+}
+?>
\ No newline at end of file
diff --git a/onyx2/modules/mail/class.pop3.php b/onyx2/modules/mail/class.pop3.php
new file mode 100644
index 0000000..f9fd3b2
--- /dev/null
+++ b/onyx2/modules/mail/class.pop3.php
@@ -0,0 +1,407 @@
+<?php
+/*~ class.pop3.php
+.---------------------------------------------------------------------------.
+|  Software: PHPMailer - PHP email class                                    |
+|   Version: 5.1                                                            |
+|   Contact: via sourceforge.net support pages (also www.codeworxtech.com)  |
+|      Info: http://phpmailer.sourceforge.net                               |
+|   Support: http://sourceforge.net/projects/phpmailer/                     |
+| ------------------------------------------------------------------------- |
+|     Admin: Andy Prevost (project admininistrator)                         |
+|   Authors: Andy Prevost (codeworxtech) codeworxtech@users.sourceforge.net |
+|          : Marcus Bointon (coolbru) coolbru@users.sourceforge.net         |
+|   Founder: Brent R. Matzelle (original founder)                           |
+| Copyright (c) 2004-2009, Andy Prevost. All Rights Reserved.               |
+| Copyright (c) 2001-2003, Brent R. Matzelle                                |
+| ------------------------------------------------------------------------- |
+|   License: Distributed under the Lesser General Public License (LGPL)     |
+|            http://www.gnu.org/copyleft/lesser.html                        |
+| This program is distributed in the hope that it will be useful - WITHOUT  |
+| ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or     |
+| FITNESS FOR A PARTICULAR PURPOSE.                                         |
+| ------------------------------------------------------------------------- |
+| We offer a number of paid services (www.codeworxtech.com):                |
+| - Web Hosting on highly optimized fast and secure servers                 |
+| - Technology Consulting                                                   |
+| - Oursourcing (highly qualified programmers and graphic designers)        |
+'---------------------------------------------------------------------------'
+*/
+
+/**
+ * PHPMailer - PHP POP Before SMTP Authentication Class
+ * NOTE: Designed for use with PHP version 5 and up
+ * @package PHPMailer
+ * @author Andy Prevost
+ * @author Marcus Bointon
+ * @copyright 2004 - 2009 Andy Prevost
+ * @license http://www.gnu.org/copyleft/lesser.html Distributed under the Lesser General Public License (LGPL)
+ * @version $Id: class.pop3.php 444 2009-05-05 11:22:26Z coolbru $
+ */
+
+/**
+ * POP Before SMTP Authentication Class
+ * Version 5.0.0
+ *
+ * Author: Richard Davey (rich@corephp.co.uk)
+ * Modifications: Andy Prevost
+ * License: LGPL, see PHPMailer License
+ *
+ * Specifically for PHPMailer to allow POP before SMTP authentication.
+ * Does not yet work with APOP - if you have an APOP account, contact Richard Davey
+ * and we can test changes to this script.
+ *
+ * This class is based on the structure of the SMTP class originally authored by Chris Ryan
+ *
+ * This class is rfc 1939 compliant and implements all the commands
+ * required for POP3 connection, authentication and disconnection.
+ *
+ * @package PHPMailer
+ * @author Richard Davey
+ */
+
+class POP3 {
+  /**
+   * Default POP3 port
+   * @var int
+   */
+  public $POP3_PORT = 110;
+
+  /**
+   * Default Timeout
+   * @var int
+   */
+  public $POP3_TIMEOUT = 30;
+
+  /**
+   * POP3 Carriage Return + Line Feed
+   * @var string
+   */
+  public $CRLF = "\r\n";
+
+  /**
+   * Displaying Debug warnings? (0 = now, 1+ = yes)
+   * @var int
+   */
+  public $do_debug = 2;
+
+  /**
+   * POP3 Mail Server
+   * @var string
+   */
+  public $host;
+
+  /**
+   * POP3 Port
+   * @var int
+   */
+  public $port;
+
+  /**
+   * POP3 Timeout Value
+   * @var int
+   */
+  public $tval;
+
+  /**
+   * POP3 Username
+   * @var string
+   */
+  public $username;
+
+  /**
+   * POP3 Password
+   * @var string
+   */
+  public $password;
+
+  /////////////////////////////////////////////////
+  // PROPERTIES, PRIVATE AND PROTECTED
+  /////////////////////////////////////////////////
+
+  private $pop_conn;
+  private $connected;
+  private $error;     //  Error log array
+
+  /**
+   * Constructor, sets the initial values
+   * @access public
+   * @return POP3
+   */
+  public function __construct() {
+    $this->pop_conn  = 0;
+    $this->connected = false;
+    $this->error     = null;
+  }
+
+  /**
+   * Combination of public events - connect, login, disconnect
+   * @access public
+   * @param string $host
+   * @param integer $port
+   * @param integer $tval
+   * @param string $username
+   * @param string $password
+   */
+  public function Authorise ($host, $port = false, $tval = false, $username, $password, $debug_level = 0) {
+    $this->host = $host;
+
+    //  If no port value is passed, retrieve it
+    if ($port == false) {
+      $this->port = $this->POP3_PORT;
+    } else {
+      $this->port = $port;
+    }
+
+    //  If no port value is passed, retrieve it
+    if ($tval == false) {
+      $this->tval = $this->POP3_TIMEOUT;
+    } else {
+      $this->tval = $tval;
+    }
+
+    $this->do_debug = $debug_level;
+    $this->username = $username;
+    $this->password = $password;
+
+    //  Refresh the error log
+    $this->error = null;
+
+    //  Connect
+    $result = $this->Connect($this->host, $this->port, $this->tval);
+
+    if ($result) {
+      $login_result = $this->Login($this->username, $this->password);
+
+      if ($login_result) {
+        $this->Disconnect();
+
+        return true;
+      }
+
+    }
+
+    //  We need to disconnect regardless if the login succeeded
+    $this->Disconnect();
+
+    return false;
+  }
+
+  /**
+   * Connect to the POP3 server
+   * @access public
+   * @param string $host
+   * @param integer $port
+   * @param integer $tval
+   * @return boolean
+   */
+  public function Connect ($host, $port = false, $tval = 30) {
+    //  Are we already connected?
+    if ($this->connected) {
+      return true;
+    }
+
+    /*
+    On Windows this will raise a PHP Warning error if the hostname doesn't exist.
+    Rather than supress it with @fsockopen, let's capture it cleanly instead
+    */
+
+    set_error_handler(array(&$this, 'catchWarning'));
+
+    //  Connect to the POP3 server
+    $this->pop_conn = fsockopen($host,    //  POP3 Host
+                  $port,    //  Port #
+                  $errno,   //  Error Number
+                  $errstr,  //  Error Message
+                  $tval);   //  Timeout (seconds)
+
+    //  Restore the error handler
+    restore_error_handler();
+
+    //  Does the Error Log now contain anything?
+    if ($this->error && $this->do_debug >= 1) {
+      $this->displayErrors();
+    }
+
+    //  Did we connect?
+    if ($this->pop_conn == false) {
+      //  It would appear not...
+      $this->error = array(
+        'error' => "Failed to connect to server $host on port $port",
+        'errno' => $errno,
+        'errstr' => $errstr
+      );
+
+      if ($this->do_debug >= 1) {
+        $this->displayErrors();
+      }
+
+      return false;
+    }
+
+    //  Increase the stream time-out
+
+    //  Check for PHP 4.3.0 or later
+    if (version_compare(phpversion(), '5.0.0', 'ge')) {
+      stream_set_timeout($this->pop_conn, $tval, 0);
+    } else {
+      //  Does not work on Windows
+      if (substr(PHP_OS, 0, 3) !== 'WIN') {
+        socket_set_timeout($this->pop_conn, $tval, 0);
+      }
+    }
+
+    //  Get the POP3 server response
+    $pop3_response = $this->getResponse();
+
+    //  Check for the +OK
+    if ($this->checkResponse($pop3_response)) {
+    //  The connection is established and the POP3 server is talking
+    $this->connected = true;
+      return true;
+    }
+
+  }
+
+  /**
+   * Login to the POP3 server (does not support APOP yet)
+   * @access public
+   * @param string $username
+   * @param string $password
+   * @return boolean
+   */
+  public function Login ($username = '', $password = '') {
+    if ($this->connected == false) {
+      $this->error = 'Not connected to POP3 server';
+
+      if ($this->do_debug >= 1) {
+        $this->displayErrors();
+      }
+    }
+
+    if (empty($username)) {
+      $username = $this->username;
+    }
+
+    if (empty($password)) {
+      $password = $this->password;
+    }
+
+    $pop_username = "USER $username" . $this->CRLF;
+    $pop_password = "PASS $password" . $this->CRLF;
+
+    //  Send the Username
+    $this->sendString($pop_username);
+    $pop3_response = $this->getResponse();
+
+    if ($this->checkResponse($pop3_response)) {
+      //  Send the Password
+      $this->sendString($pop_password);
+      $pop3_response = $this->getResponse();
+
+      if ($this->checkResponse($pop3_response)) {
+        return true;
+      } else {
+        return false;
+      }
+    } else {
+      return false;
+    }
+  }
+
+  /**
+   * Disconnect from the POP3 server
+   * @access public
+   */
+  public function Disconnect () {
+    $this->sendString('QUIT');
+
+    fclose($this->pop_conn);
+  }
+
+  /////////////////////////////////////////////////
+  //  Private Methods
+  /////////////////////////////////////////////////
+
+  /**
+   * Get the socket response back.
+   * $size is the maximum number of bytes to retrieve
+   * @access private
+   * @param integer $size
+   * @return string
+   */
+  private function getResponse ($size = 128) {
+    $pop3_response = fgets($this->pop_conn, $size);
+
+    return $pop3_response;
+  }
+
+  /**
+   * Send a string down the open socket connection to the POP3 server
+   * @access private
+   * @param string $string
+   * @return integer
+   */
+  private function sendString ($string) {
+    $bytes_sent = fwrite($this->pop_conn, $string, strlen($string));
+
+    return $bytes_sent;
+  }
+
+  /**
+   * Checks the POP3 server response for +OK or -ERR
+   * @access private
+   * @param string $string
+   * @return boolean
+   */
+  private function checkResponse ($string) {
+    if (substr($string, 0, 3) !== '+OK') {
+      $this->error = array(
+        'error' => "Server reported an error: $string",
+        'errno' => 0,
+        'errstr' => ''
+      );
+
+      if ($this->do_debug >= 1) {
+        $this->displayErrors();
+      }
+
+      return false;
+    } else {
+      return true;
+    }
+
+  }
+
+  /**
+   * If debug is enabled, display the error message array
+   * @access private
+   */
+  private function displayErrors () {
+    echo '<pre>';
+
+    foreach ($this->error as $single_error) {
+      print_r($single_error);
+    }
+
+    echo '</pre>';
+  }
+
+  /**
+   * Takes over from PHP for the socket warning handler
+   * @access private
+   * @param integer $errno
+   * @param string $errstr
+   * @param string $errfile
+   * @param integer $errline
+   */
+  private function catchWarning ($errno, $errstr, $errfile, $errline) {
+    $this->error[] = array(
+      'error' => "Connecting to the POP3 server raised a PHP warning: ",
+      'errno' => $errno,
+      'errstr' => $errstr
+    );
+  }
+
+  //  End of class
+}
+?>
\ No newline at end of file
diff --git a/onyx2/modules/mail/class.smtp.php b/onyx2/modules/mail/class.smtp.php
new file mode 100644
index 0000000..c664d97
--- /dev/null
+++ b/onyx2/modules/mail/class.smtp.php
@@ -0,0 +1,814 @@
+<?php
+/*~ class.smtp.php
+.---------------------------------------------------------------------------.
+|  Software: PHPMailer - PHP email class                                    |
+|   Version: 5.1                                                            |
+|   Contact: via sourceforge.net support pages (also www.codeworxtech.com)  |
+|      Info: http://phpmailer.sourceforge.net                               |
+|   Support: http://sourceforge.net/projects/phpmailer/                     |
+| ------------------------------------------------------------------------- |
+|     Admin: Andy Prevost (project admininistrator)                         |
+|   Authors: Andy Prevost (codeworxtech) codeworxtech@users.sourceforge.net |
+|          : Marcus Bointon (coolbru) coolbru@users.sourceforge.net         |
+|   Founder: Brent R. Matzelle (original founder)                           |
+| Copyright (c) 2004-2009, Andy Prevost. All Rights Reserved.               |
+| Copyright (c) 2001-2003, Brent R. Matzelle                                |
+| ------------------------------------------------------------------------- |
+|   License: Distributed under the Lesser General Public License (LGPL)     |
+|            http://www.gnu.org/copyleft/lesser.html                        |
+| This program is distributed in the hope that it will be useful - WITHOUT  |
+| ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or     |
+| FITNESS FOR A PARTICULAR PURPOSE.                                         |
+| ------------------------------------------------------------------------- |
+| We offer a number of paid services (www.codeworxtech.com):                |
+| - Web Hosting on highly optimized fast and secure servers                 |
+| - Technology Consulting                                                   |
+| - Oursourcing (highly qualified programmers and graphic designers)        |
+'---------------------------------------------------------------------------'
+*/
+
+/**
+ * PHPMailer - PHP SMTP email transport class
+ * NOTE: Designed for use with PHP version 5 and up
+ * @package PHPMailer
+ * @author Andy Prevost
+ * @author Marcus Bointon
+ * @copyright 2004 - 2008 Andy Prevost
+ * @license http://www.gnu.org/copyleft/lesser.html Distributed under the Lesser General Public License (LGPL)
+ * @version $Id: class.smtp.php 444 2009-05-05 11:22:26Z coolbru $
+ */
+
+/**
+ * SMTP is rfc 821 compliant and implements all the rfc 821 SMTP
+ * commands except TURN which will always return a not implemented
+ * error. SMTP also provides some utility methods for sending mail
+ * to an SMTP server.
+ * original author: Chris Ryan
+ */
+
+class SMTP {
+  /**
+   *  SMTP server port
+   *  @var int
+   */
+  public $SMTP_PORT = 25;
+
+  /**
+   *  SMTP reply line ending
+   *  @var string
+   */
+  public $CRLF = "\r\n";
+
+  /**
+   *  Sets whether debugging is turned on
+   *  @var bool
+   */
+  public $do_debug;       // the level of debug to perform
+
+  /**
+   *  Sets VERP use on/off (default is off)
+   *  @var bool
+   */
+  public $do_verp = false;
+
+  /////////////////////////////////////////////////
+  // PROPERTIES, PRIVATE AND PROTECTED
+  /////////////////////////////////////////////////
+
+  private $smtp_conn; // the socket to the server
+  private $error;     // error if any on the last call
+  private $helo_rply; // the reply the server sent to us for HELO
+
+  /**
+   * Initialize the class so that the data is in a known state.
+   * @access public
+   * @return void
+   */
+  public function __construct() {
+    $this->smtp_conn = 0;
+    $this->error = null;
+    $this->helo_rply = null;
+
+    $this->do_debug = 0;
+  }
+
+  /////////////////////////////////////////////////
+  // CONNECTION FUNCTIONS
+  /////////////////////////////////////////////////
+
+  /**
+   * Connect to the server specified on the port specified.
+   * If the port is not specified use the default SMTP_PORT.
+   * If tval is specified then a connection will try and be
+   * established with the server for that number of seconds.
+   * If tval is not specified the default is 30 seconds to
+   * try on the connection.
+   *
+   * SMTP CODE SUCCESS: 220
+   * SMTP CODE FAILURE: 421
+   * @access public
+   * @return bool
+   */
+  public function Connect($host, $port = 0, $tval = 30) {
+    // set the error val to null so there is no confusion
+    $this->error = null;
+
+    // make sure we are __not__ connected
+    if($this->connected()) {
+      // already connected, generate error
+      $this->error = array("error" => "Already connected to a server");
+      return false;
+    }
+
+    if(empty($port)) {
+      $port = $this->SMTP_PORT;
+    }
+
+    // connect to the smtp server
+    $this->smtp_conn = @fsockopen($host,    // the host of the server
+                                 $port,    // the port to use
+                                 $errno,   // error number if any
+                                 $errstr,  // error message if any
+                                 $tval);   // give up after ? secs
+    // verify we connected properly
+    if(empty($this->smtp_conn)) {
+      $this->error = array("error" => "Failed to connect to server",
+                           "errno" => $errno,
+                           "errstr" => $errstr);
+      if($this->do_debug >= 1) {
+        echo "SMTP -> ERROR: " . $this->error["error"] . ": $errstr ($errno)" . $this->CRLF . '<br />';
+      }
+      return false;
+    }
+
+    // SMTP server can take longer to respond, give longer timeout for first read
+    // Windows does not have support for this timeout function
+    if(substr(PHP_OS, 0, 3) != "WIN")
+     socket_set_timeout($this->smtp_conn, $tval, 0);
+
+    // get any announcement
+    $announce = $this->get_lines();
+
+    if($this->do_debug >= 2) {
+      echo "SMTP -> FROM SERVER:" . $announce . $this->CRLF . '<br />';
+    }
+
+    return true;
+  }
+
+  /**
+   * Initiate a TLS communication with the server.
+   *
+   * SMTP CODE 220 Ready to start TLS
+   * SMTP CODE 501 Syntax error (no parameters allowed)
+   * SMTP CODE 454 TLS not available due to temporary reason
+   * @access public
+   * @return bool success
+   */
+  public function StartTLS() {
+    $this->error = null; # to avoid confusion
+
+    if(!$this->connected()) {
+      $this->error = array("error" => "Called StartTLS() without being connected");
+      return false;
+    }
+
+    fputs($this->smtp_conn,"STARTTLS" . $this->CRLF);
+
+    $rply = $this->get_lines();
+    $code = substr($rply,0,3);
+
+    if($this->do_debug >= 2) {
+      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
+    }
+
+    if($code != 220) {
+      $this->error =
+         array("error"     => "STARTTLS not accepted from server",
+               "smtp_code" => $code,
+               "smtp_msg"  => substr($rply,4));
+      if($this->do_debug >= 1) {
+        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
+      }
+      return false;
+    }
+
+    // Begin encrypted connection
+    if(!stream_socket_enable_crypto($this->smtp_conn, true, STREAM_CRYPTO_METHOD_TLS_CLIENT)) {
+      return false;
+    }
+
+    return true;
+  }
+
+  /**
+   * Performs SMTP authentication.  Must be run after running the
+   * Hello() method.  Returns true if successfully authenticated.
+   * @access public
+   * @return bool
+   */
+  public function Authenticate($username, $password) {
+    // Start authentication
+    fputs($this->smtp_conn,"AUTH LOGIN" . $this->CRLF);
+
+    $rply = $this->get_lines();
+    $code = substr($rply,0,3);
+
+    if($code != 334) {
+      $this->error =
+        array("error" => "AUTH not accepted from server",
+              "smtp_code" => $code,
+              "smtp_msg" => substr($rply,4));
+      if($this->do_debug >= 1) {
+        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
+      }
+      return false;
+    }
+
+    // Send encoded username
+    fputs($this->smtp_conn, base64_encode($username) . $this->CRLF);
+
+    $rply = $this->get_lines();
+    $code = substr($rply,0,3);
+
+    if($code != 334) {
+      $this->error =
+        array("error" => "Username not accepted from server",
+              "smtp_code" => $code,
+              "smtp_msg" => substr($rply,4));
+      if($this->do_debug >= 1) {
+        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
+      }
+      return false;
+    }
+
+    // Send encoded password
+    fputs($this->smtp_conn, base64_encode($password) . $this->CRLF);
+
+    $rply = $this->get_lines();
+    $code = substr($rply,0,3);
+
+    if($code != 235) {
+      $this->error =
+        array("error" => "Password not accepted from server",
+              "smtp_code" => $code,
+              "smtp_msg" => substr($rply,4));
+      if($this->do_debug >= 1) {
+        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
+      }
+      return false;
+    }
+
+    return true;
+  }
+
+  /**
+   * Returns true if connected to a server otherwise false
+   * @access public
+   * @return bool
+   */
+  public function Connected() {
+    if(!empty($this->smtp_conn)) {
+      $sock_status = socket_get_status($this->smtp_conn);
+      if($sock_status["eof"]) {
+        // the socket is valid but we are not connected
+        if($this->do_debug >= 1) {
+            echo "SMTP -> NOTICE:" . $this->CRLF . "EOF caught while checking if connected";
+        }
+        $this->Close();
+        return false;
+      }
+      return true; // everything looks good
+    }
+    return false;
+  }
+
+  /**
+   * Closes the socket and cleans up the state of the class.
+   * It is not considered good to use this function without
+   * first trying to use QUIT.
+   * @access public
+   * @return void
+   */
+  public function Close() {
+    $this->error = null; // so there is no confusion
+    $this->helo_rply = null;
+    if(!empty($this->smtp_conn)) {
+      // close the connection and cleanup
+      fclose($this->smtp_conn);
+      $this->smtp_conn = 0;
+    }
+  }
+
+  /////////////////////////////////////////////////
+  // SMTP COMMANDS
+  /////////////////////////////////////////////////
+
+  /**
+   * Issues a data command and sends the msg_data to the server
+   * finializing the mail transaction. $msg_data is the message
+   * that is to be send with the headers. Each header needs to be
+   * on a single line followed by a <CRLF> with the message headers
+   * and the message body being seperated by and additional <CRLF>.
+   *
+   * Implements rfc 821: DATA <CRLF>
+   *
+   * SMTP CODE INTERMEDIATE: 354
+   *     [data]
+   *     <CRLF>.<CRLF>
+   *     SMTP CODE SUCCESS: 250
+   *     SMTP CODE FAILURE: 552,554,451,452
+   * SMTP CODE FAILURE: 451,554
+   * SMTP CODE ERROR  : 500,501,503,421
+   * @access public
+   * @return bool
+   */
+  public function Data($msg_data) {
+    $this->error = null; // so no confusion is caused
+
+    if(!$this->connected()) {
+      $this->error = array(
+              "error" => "Called Data() without being connected");
+      return false;
+    }
+
+    fputs($this->smtp_conn,"DATA" . $this->CRLF);
+
+    $rply = $this->get_lines();
+    $code = substr($rply,0,3);
+
+    if($this->do_debug >= 2) {
+      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
+    }
+
+    if($code != 354) {
+      $this->error =
+        array("error" => "DATA command not accepted from server",
+              "smtp_code" => $code,
+              "smtp_msg" => substr($rply,4));
+      if($this->do_debug >= 1) {
+        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
+      }
+      return false;
+    }
+
+    /* the server is ready to accept data!
+     * according to rfc 821 we should not send more than 1000
+     * including the CRLF
+     * characters on a single line so we will break the data up
+     * into lines by \r and/or \n then if needed we will break
+     * each of those into smaller lines to fit within the limit.
+     * in addition we will be looking for lines that start with
+     * a period '.' and append and additional period '.' to that
+     * line. NOTE: this does not count towards limit.
+     */
+
+    // normalize the line breaks so we know the explode works
+    $msg_data = str_replace("\r\n","\n",$msg_data);
+    $msg_data = str_replace("\r","\n",$msg_data);
+    $lines = explode("\n",$msg_data);
+
+    /* we need to find a good way to determine is headers are
+     * in the msg_data or if it is a straight msg body
+     * currently I am assuming rfc 822 definitions of msg headers
+     * and if the first field of the first line (':' sperated)
+     * does not contain a space then it _should_ be a header
+     * and we can process all lines before a blank "" line as
+     * headers.
+     */
+
+    $field = substr($lines[0],0,strpos($lines[0],":"));
+    $in_headers = false;
+    if(!empty($field) && !strstr($field," ")) {
+      $in_headers = true;
+    }
+
+    $max_line_length = 998; // used below; set here for ease in change
+
+    while(list(,$line) = @each($lines)) {
+      $lines_out = null;
+      if($line == "" && $in_headers) {
+        $in_headers = false;
+      }
+      // ok we need to break this line up into several smaller lines
+      while(strlen($line) > $max_line_length) {
+        $pos = strrpos(substr($line,0,$max_line_length)," ");
+
+        // Patch to fix DOS attack
+        if(!$pos) {
+          $pos = $max_line_length - 1;
+          $lines_out[] = substr($line,0,$pos);
+          $line = substr($line,$pos);
+        } else {
+          $lines_out[] = substr($line,0,$pos);
+          $line = substr($line,$pos + 1);
+        }
+
+        /* if processing headers add a LWSP-char to the front of new line
+         * rfc 822 on long msg headers
+         */
+        if($in_headers) {
+          $line = "\t" . $line;
+        }
+      }
+      $lines_out[] = $line;
+
+      // send the lines to the server
+      while(list(,$line_out) = @each($lines_out)) {
+        if(strlen($line_out) > 0)
+        {
+          if(substr($line_out, 0, 1) == ".") {
+            $line_out = "." . $line_out;
+          }
+        }
+        fputs($this->smtp_conn,$line_out . $this->CRLF);
+      }
+    }
+
+    // message data has been sent
+    fputs($this->smtp_conn, $this->CRLF . "." . $this->CRLF);
+
+    $rply = $this->get_lines();
+    $code = substr($rply,0,3);
+
+    if($this->do_debug >= 2) {
+      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
+    }
+
+    if($code != 250) {
+      $this->error =
+        array("error" => "DATA not accepted from server",
+              "smtp_code" => $code,
+              "smtp_msg" => substr($rply,4));
+      if($this->do_debug >= 1) {
+        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
+      }
+      return false;
+    }
+    return true;
+  }
+
+  /**
+   * Sends the HELO command to the smtp server.
+   * This makes sure that we and the server are in
+   * the same known state.
+   *
+   * Implements from rfc 821: HELO <SP> <domain> <CRLF>
+   *
+   * SMTP CODE SUCCESS: 250
+   * SMTP CODE ERROR  : 500, 501, 504, 421
+   * @access public
+   * @return bool
+   */
+  public function Hello($host = '') {
+    $this->error = null; // so no confusion is caused
+
+    if(!$this->connected()) {
+      $this->error = array(
+            "error" => "Called Hello() without being connected");
+      return false;
+    }
+
+    // if hostname for HELO was not specified send default
+    if(empty($host)) {
+      // determine appropriate default to send to server
+      $host = "localhost";
+    }
+
+    // Send extended hello first (RFC 2821)
+    if(!$this->SendHello("EHLO", $host)) {
+      if(!$this->SendHello("HELO", $host)) {
+        return false;
+      }
+    }
+
+    return true;
+  }
+
+  /**
+   * Sends a HELO/EHLO command.
+   * @access private
+   * @return bool
+   */
+  private function SendHello($hello, $host) {
+    fputs($this->smtp_conn, $hello . " " . $host . $this->CRLF);
+
+    $rply = $this->get_lines();
+    $code = substr($rply,0,3);
+
+    if($this->do_debug >= 2) {
+      echo "SMTP -> FROM SERVER: " . $rply . $this->CRLF . '<br />';
+    }
+
+    if($code != 250) {
+      $this->error =
+        array("error" => $hello . " not accepted from server",
+              "smtp_code" => $code,
+              "smtp_msg" => substr($rply,4));
+      if($this->do_debug >= 1) {
+        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
+      }
+      return false;
+    }
+
+    $this->helo_rply = $rply;
+
+    return true;
+  }
+
+  /**
+   * Starts a mail transaction from the email address specified in
+   * $from. Returns true if successful or false otherwise. If True
+   * the mail transaction is started and then one or more Recipient
+   * commands may be called followed by a Data command.
+   *
+   * Implements rfc 821: MAIL <SP> FROM:<reverse-path> <CRLF>
+   *
+   * SMTP CODE SUCCESS: 250
+   * SMTP CODE SUCCESS: 552,451,452
+   * SMTP CODE SUCCESS: 500,501,421
+   * @access public
+   * @return bool
+   */
+  public function Mail($from) {
+    $this->error = null; // so no confusion is caused
+
+    if(!$this->connected()) {
+      $this->error = array(
+              "error" => "Called Mail() without being connected");
+      return false;
+    }
+
+    $useVerp = ($this->do_verp ? "XVERP" : "");
+    fputs($this->smtp_conn,"MAIL FROM:<" . $from . ">" . $useVerp . $this->CRLF);
+
+    $rply = $this->get_lines();
+    $code = substr($rply,0,3);
+
+    if($this->do_debug >= 2) {
+      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
+    }
+
+    if($code != 250) {
+      $this->error =
+        array("error" => "MAIL not accepted from server",
+              "smtp_code" => $code,
+              "smtp_msg" => substr($rply,4));
+      if($this->do_debug >= 1) {
+        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
+      }
+      return false;
+    }
+    return true;
+  }
+
+  /**
+   * Sends the quit command to the server and then closes the socket
+   * if there is no error or the $close_on_error argument is true.
+   *
+   * Implements from rfc 821: QUIT <CRLF>
+   *
+   * SMTP CODE SUCCESS: 221
+   * SMTP CODE ERROR  : 500
+   * @access public
+   * @return bool
+   */
+  public function Quit($close_on_error = true) {
+    $this->error = null; // so there is no confusion
+
+    if(!$this->connected()) {
+      $this->error = array(
+              "error" => "Called Quit() without being connected");
+      return false;
+    }
+
+    // send the quit command to the server
+    fputs($this->smtp_conn,"quit" . $this->CRLF);
+
+    // get any good-bye messages
+    $byemsg = $this->get_lines();
+
+    if($this->do_debug >= 2) {
+      echo "SMTP -> FROM SERVER:" . $byemsg . $this->CRLF . '<br />';
+    }
+
+    $rval = true;
+    $e = null;
+
+    $code = substr($byemsg,0,3);
+    if($code != 221) {
+      // use e as a tmp var cause Close will overwrite $this->error
+      $e = array("error" => "SMTP server rejected quit command",
+                 "smtp_code" => $code,
+                 "smtp_rply" => substr($byemsg,4));
+      $rval = false;
+      if($this->do_debug >= 1) {
+        echo "SMTP -> ERROR: " . $e["error"] . ": " . $byemsg . $this->CRLF . '<br />';
+      }
+    }
+
+    if(empty($e) || $close_on_error) {
+      $this->Close();
+    }
+
+    return $rval;
+  }
+
+  /**
+   * Sends the command RCPT to the SMTP server with the TO: argument of $to.
+   * Returns true if the recipient was accepted false if it was rejected.
+   *
+   * Implements from rfc 821: RCPT <SP> TO:<forward-path> <CRLF>
+   *
+   * SMTP CODE SUCCESS: 250,251
+   * SMTP CODE FAILURE: 550,551,552,553,450,451,452
+   * SMTP CODE ERROR  : 500,501,503,421
+   * @access public
+   * @return bool
+   */
+  public function Recipient($to) {
+    $this->error = null; // so no confusion is caused
+
+    if(!$this->connected()) {
+      $this->error = array(
+              "error" => "Called Recipient() without being connected");
+      return false;
+    }
+
+    fputs($this->smtp_conn,"RCPT TO:<" . $to . ">" . $this->CRLF);
+
+    $rply = $this->get_lines();
+    $code = substr($rply,0,3);
+
+    if($this->do_debug >= 2) {
+      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
+    }
+
+    if($code != 250 && $code != 251) {
+      $this->error =
+        array("error" => "RCPT not accepted from server",
+              "smtp_code" => $code,
+              "smtp_msg" => substr($rply,4));
+      if($this->do_debug >= 1) {
+        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
+      }
+      return false;
+    }
+    return true;
+  }
+
+  /**
+   * Sends the RSET command to abort and transaction that is
+   * currently in progress. Returns true if successful false
+   * otherwise.
+   *
+   * Implements rfc 821: RSET <CRLF>
+   *
+   * SMTP CODE SUCCESS: 250
+   * SMTP CODE ERROR  : 500,501,504,421
+   * @access public
+   * @return bool
+   */
+  public function Reset() {
+    $this->error = null; // so no confusion is caused
+
+    if(!$this->connected()) {
+      $this->error = array(
+              "error" => "Called Reset() without being connected");
+      return false;
+    }
+
+    fputs($this->smtp_conn,"RSET" . $this->CRLF);
+
+    $rply = $this->get_lines();
+    $code = substr($rply,0,3);
+
+    if($this->do_debug >= 2) {
+      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
+    }
+
+    if($code != 250) {
+      $this->error =
+        array("error" => "RSET failed",
+              "smtp_code" => $code,
+              "smtp_msg" => substr($rply,4));
+      if($this->do_debug >= 1) {
+        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
+      }
+      return false;
+    }
+
+    return true;
+  }
+
+  /**
+   * Starts a mail transaction from the email address specified in
+   * $from. Returns true if successful or false otherwise. If True
+   * the mail transaction is started and then one or more Recipient
+   * commands may be called followed by a Data command. This command
+   * will send the message to the users terminal if they are logged
+   * in and send them an email.
+   *
+   * Implements rfc 821: SAML <SP> FROM:<reverse-path> <CRLF>
+   *
+   * SMTP CODE SUCCESS: 250
+   * SMTP CODE SUCCESS: 552,451,452
+   * SMTP CODE SUCCESS: 500,501,502,421
+   * @access public
+   * @return bool
+   */
+  public function SendAndMail($from) {
+    $this->error = null; // so no confusion is caused
+
+    if(!$this->connected()) {
+      $this->error = array(
+          "error" => "Called SendAndMail() without being connected");
+      return false;
+    }
+
+    fputs($this->smtp_conn,"SAML FROM:" . $from . $this->CRLF);
+
+    $rply = $this->get_lines();
+    $code = substr($rply,0,3);
+
+    if($this->do_debug >= 2) {
+      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
+    }
+
+    if($code != 250) {
+      $this->error =
+        array("error" => "SAML not accepted from server",
+              "smtp_code" => $code,
+              "smtp_msg" => substr($rply,4));
+      if($this->do_debug >= 1) {
+        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
+      }
+      return false;
+    }
+    return true;
+  }
+
+  /**
+   * This is an optional command for SMTP that this class does not
+   * support. This method is here to make the RFC821 Definition
+   * complete for this class and __may__ be implimented in the future
+   *
+   * Implements from rfc 821: TURN <CRLF>
+   *
+   * SMTP CODE SUCCESS: 250
+   * SMTP CODE FAILURE: 502
+   * SMTP CODE ERROR  : 500, 503
+   * @access public
+   * @return bool
+   */
+  public function Turn() {
+    $this->error = array("error" => "This method, TURN, of the SMTP ".
+                                    "is not implemented");
+    if($this->do_debug >= 1) {
+      echo "SMTP -> NOTICE: " . $this->error["error"] . $this->CRLF . '<br />';
+    }
+    return false;
+  }
+
+  /**
+  * Get the current error
+  * @access public
+  * @return array
+  */
+  public function getError() {
+    return $this->error;
+  }
+
+  /////////////////////////////////////////////////
+  // INTERNAL FUNCTIONS
+  /////////////////////////////////////////////////
+
+  /**
+   * Read in as many lines as possible
+   * either before eof or socket timeout occurs on the operation.
+   * With SMTP we can tell if we have more lines to read if the
+   * 4th character is '-' symbol. If it is a space then we don't
+   * need to read anything else.
+   * @access private
+   * @return string
+   */
+  private function get_lines() {
+    $data = "";
+    while($str = @fgets($this->smtp_conn,515)) {
+      if($this->do_debug >= 4) {
+        echo "SMTP -> get_lines(): \$data was \"$data\"" . $this->CRLF . '<br />';
+        echo "SMTP -> get_lines(): \$str is \"$str\"" . $this->CRLF . '<br />';
+      }
+      $data .= $str;
+      if($this->do_debug >= 4) {
+        echo "SMTP -> get_lines(): \$data is \"$data\"" . $this->CRLF . '<br />';
+      }
+      // if 4th character is a space, we are done reading, break the loop
+      if(substr($str,3,1) == " ") { break; }
+    }
+    return $data;
+  }
+
+}
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/mail/language/phpmailer.lang-ar.php b/onyx2/modules/mail/language/phpmailer.lang-ar.php
new file mode 100644
index 0000000..c7f343a
--- /dev/null
+++ b/onyx2/modules/mail/language/phpmailer.lang-ar.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * PHPMailer language file.
+ * Arabic Version, UTF-8
+ * by : bahjat al mostafa <bahjat983@hotmail.com>
+ */
+
+$PHPMAILER_LANG = array();
+
+$PHPMAILER_LANG['provide_address'] = 'You must provide at least one ' .
+                                     'recipient email address.';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer غير مدعوم.';
+$PHPMAILER_LANG['execute'] = 'لم أستطع تنفيذ : ';
+$PHPMAILER_LANG['instantiate'] = 'لم نستطع توفير خدمة البريد.';
+$PHPMAILER_LANG['authenticate'] = 'SMTP Error: لم نستطع تأكيد الهوية.';
+$PHPMAILER_LANG['from_failed'] = 'البريد التالي لم نستطع ارسال البريد له : ';
+$PHPMAILER_LANG['recipients_failed'] = 'SMTP Error: الأخطاء التالية ' .
+                                       'فشل في الارسال لكل من : ';
+$PHPMAILER_LANG['data_not_accepted'] = 'SMTP Error: لم يتم قبول المعلومات .';
+$PHPMAILER_LANG['connect_host'] = 'SMTP Error: لم نستطع الاتصال بمخدم SMTP.';
+$PHPMAILER_LANG['file_access'] = 'لم نستطع الوصول للملف: ';
+$PHPMAILER_LANG['file_open'] = 'File Error: لم نستطع فتح الملف: ';
+$PHPMAILER_LANG['encoding'] = 'ترميز غير معروف: ';
+$PHPMAILER_LANG['signing'] = 'خطأ في التوقيع: ';
+$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: ';
+?>
\ No newline at end of file
diff --git a/onyx2/modules/mail/language/phpmailer.lang-br.php b/onyx2/modules/mail/language/phpmailer.lang-br.php
new file mode 100644
index 0000000..d2e9753
--- /dev/null
+++ b/onyx2/modules/mail/language/phpmailer.lang-br.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * PHPMailer language file.
+ * Portuguese Version
+ * By Paulo Henrique Garcia - paulo@controllerweb.com.br
+ */
+
+$PHPMAILER_LANG = array();
+$PHPMAILER_LANG['provide_address']      = 'Você deve fornecer pelo menos um endereço de destinatário de email.';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer não suportado.';
+$PHPMAILER_LANG['execute']              = 'Não foi possível executar: ';
+$PHPMAILER_LANG['instantiate']          = 'Não foi possível instanciar a função mail.';
+$PHPMAILER_LANG['authenticate']         = 'Erro de SMTP: Não foi possível autenticar.';
+$PHPMAILER_LANG['from_failed']          = 'Os endereços de rementente a seguir falharam: ';
+$PHPMAILER_LANG['recipients_failed']    = 'Erro de SMTP: Os endereços de destinatário a seguir falharam: ';
+$PHPMAILER_LANG['data_not_accepted']    = 'Erro de SMTP: Dados não aceitos.';
+$PHPMAILER_LANG['connect_host']         = 'Erro de SMTP: Não foi possível conectar com o servidor SMTP.';
+$PHPMAILER_LANG['file_access']          = 'Não foi possível acessar o arquivo: ';
+$PHPMAILER_LANG['file_open']            = 'Erro de Arquivo: Não foi possível abrir o arquivo: ';
+$PHPMAILER_LANG['encoding']             = 'Codificação desconhecida: ';
+$PHPMAILER_LANG['signing']              = 'Signing Error: ';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP server error: ';
+?>
\ No newline at end of file
diff --git a/onyx2/modules/mail/language/phpmailer.lang-ca.php b/onyx2/modules/mail/language/phpmailer.lang-ca.php
new file mode 100644
index 0000000..bb10044
--- /dev/null
+++ b/onyx2/modules/mail/language/phpmailer.lang-ca.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * PHPMailer language file.
+ * Catalan Version
+ * By Ivan: web AT microstudi DOT com
+ */
+
+$PHPMAILER_LANG = array();
+
+$PHPMAILER_LANG['provide_address']      = 'S\'ha de proveir almenys una adreça d\'email com a destinatari.';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer no està suportat';
+$PHPMAILER_LANG['execute']              = 'No es pot executar: ';
+$PHPMAILER_LANG['instantiate']          = 'No s\'ha pogut crear una instància de la funció Mail.';
+$PHPMAILER_LANG['authenticate']         = 'Error SMTP: No s\'hapogut autenticar.';
+$PHPMAILER_LANG['from_failed']          = 'La(s) següent(s) adreces de remitent han fallat: ';
+$PHPMAILER_LANG['recipients_failed']    = 'Error SMTP: Els següents destinataris han fallat: ';
+$PHPMAILER_LANG['data_not_accepted']    = 'Error SMTP: Dades no acceptades.';
+$PHPMAILER_LANG['connect_host']         = 'Error SMTP: No es pot connectar al servidor SMTP.';
+$PHPMAILER_LANG['file_access']          = 'No es pot accedir a l\'arxiu: ';
+$PHPMAILER_LANG['file_open']            = 'Error d\'Arxiu: No es pot obrir l\'arxiu: ';
+$PHPMAILER_LANG['encoding']             = 'Codificació desconeguda: ';
+$PHPMAILER_LANG['signing']              = 'Signing Error: ';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP server error: ';
+?>
\ No newline at end of file
diff --git a/onyx2/modules/mail/language/phpmailer.lang-ch.php b/onyx2/modules/mail/language/phpmailer.lang-ch.php
new file mode 100644
index 0000000..5251402
--- /dev/null
+++ b/onyx2/modules/mail/language/phpmailer.lang-ch.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * PHPMailer language file.  
+ * Chinese Version
+ * By LiuXin: www.80x86.cn/blog/
+ */
+
+$PHPMAILER_LANG = array();
+
+$PHPMAILER_LANG['provide_address'] = '您必须提供至少一个 收信人的email地址。';
+$PHPMAILER_LANG['mailer_not_supported'] = ' 您所选择的发送邮件的方法并不支持。';
+$PHPMAILER_LANG['execute'] = '不能执行: ';
+$PHPMAILER_LANG['instantiate'] = '不能实现mail方法。';
+$PHPMAILER_LANG['authenticate'] = 'SMTP 错误：身份验证失败。';
+$PHPMAILER_LANG['from_failed'] = '下面的发送地址邮件发送失败了： ';
+$PHPMAILER_LANG['recipients_failed'] = 'SMTP 错误： 下面的 收件人失败了： ';
+$PHPMAILER_LANG['data_not_accepted'] = 'SMTP 错误: 数据不可接受。';
+$PHPMAILER_LANG['connect_host'] = 'SMTP 错误: 不能连接SMTP主机。';
+$PHPMAILER_LANG['file_access'] = '不能访问文件：';
+$PHPMAILER_LANG['file_open'] = '文件错误：不能打开文件：';
+$PHPMAILER_LANG['encoding'] = '未知编码：';
+$PHPMAILER_LANG['signing'] = 'Signing Error: ';
+$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: ';
+?>
\ No newline at end of file
diff --git a/onyx2/modules/mail/language/phpmailer.lang-cz.php b/onyx2/modules/mail/language/phpmailer.lang-cz.php
new file mode 100644
index 0000000..2c6b353
--- /dev/null
+++ b/onyx2/modules/mail/language/phpmailer.lang-cz.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * PHPMailer language file.
+ * Czech Version
+ */
+
+$PHPMAILER_LANG = array();
+
+$PHPMAILER_LANG["provide_address"]      = 'Musíte zadat alespoò jednu emailovou adresu pøíjemce.';
+$PHPMAILER_LANG["mailer_not_supported"] = ' mailový klient není podporován.';
+$PHPMAILER_LANG["execute"]              = 'Nelze provést: ';
+$PHPMAILER_LANG["instantiate"]          = 'Nelze vytvoøit instanci emailové funkce.';
+$PHPMAILER_LANG["authenticate"]         = 'SMTP Error: Chyba autentikace.';
+$PHPMAILER_LANG["from_failed"]          = 'Následující adresa From je nesprávná: ';
+$PHPMAILER_LANG["recipients_failed"]    = 'SMTP Error: Adresy pøíjemcù nejsou správné ' .
+$PHPMAILER_LANG["data_not_accepted"]    = 'SMTP Error: Data nebyla pøijata';
+$PHPMAILER_LANG["connect_host"]         = 'SMTP Error: Nelze navázat spojení se SMTP serverem.';
+$PHPMAILER_LANG["file_access"]          = 'Soubor nenalezen: ';
+$PHPMAILER_LANG["file_open"]            = 'File Error: Nelze otevøít soubor pro ètení: ';
+$PHPMAILER_LANG["encoding"]             = 'Neznámé kódování: ';
+$PHPMAILER_LANG["signing"]              = 'Signing Error: ';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP server error: ';
+?>
\ No newline at end of file
diff --git a/onyx2/modules/mail/language/phpmailer.lang-de.php b/onyx2/modules/mail/language/phpmailer.lang-de.php
new file mode 100644
index 0000000..eab1061
--- /dev/null
+++ b/onyx2/modules/mail/language/phpmailer.lang-de.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * PHPMailer language file.
+ * German Version
+ * Thanks to Yann-Patrick Schlame for the latest update!
+ */
+
+$PHPMAILER_LANG = array();
+
+$PHPMAILER_LANG['provide_address']      = 'Bitte geben Sie mindestens eine Empfänger Emailadresse an.';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer wird nicht unterstützt.';
+$PHPMAILER_LANG['execute']              = 'Konnte folgenden Befehl nicht ausführen: ';
+$PHPMAILER_LANG['instantiate']          = 'Mail Funktion konnte nicht initialisiert werden.';
+$PHPMAILER_LANG['authenticate']         = 'SMTP Fehler: Authentifizierung fehlgeschlagen.';
+$PHPMAILER_LANG['from_failed']          = 'Die folgende Absenderadresse ist nicht korrekt: ';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP Fehler: Die folgenden Empfänger sind nicht korrekt: ';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP Fehler: Daten werden nicht akzeptiert.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP Fehler: Konnte keine Verbindung zum SMTP-Host herstellen.';
+$PHPMAILER_LANG['file_access']          = 'Zugriff auf folgende Datei fehlgeschlagen: ';
+$PHPMAILER_LANG['file_open']            = 'Datei Fehler: konnte folgende Datei nicht öffnen: ';
+$PHPMAILER_LANG['encoding']             = 'Unbekanntes Encoding-Format: ';
+$PHPMAILER_LANG['signing']              = 'Fehler beim Signieren: ';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP server error: ';
+?>
\ No newline at end of file
diff --git a/onyx2/modules/mail/language/phpmailer.lang-dk.php b/onyx2/modules/mail/language/phpmailer.lang-dk.php
new file mode 100644
index 0000000..defe5b6
--- /dev/null
+++ b/onyx2/modules/mail/language/phpmailer.lang-dk.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * PHPMailer language file.
+ * Danish Version
+ * Author: Mikael Stokkebro <info@stokkebro.dk> */
+
+$PHPMAILER_LANG = array();
+
+$PHPMAILER_LANG['provide_address']      = 'Du skal indtaste mindst en modtagers emailadresse.';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer understøttes ikke.';
+$PHPMAILER_LANG['execute']              = 'Kunne ikke køre: ';
+$PHPMAILER_LANG['instantiate']          = 'Kunne ikke initialisere email funktionen.';
+$PHPMAILER_LANG['authenticate']         = 'SMTP fejl: Kunne ikke logge på.';
+$PHPMAILER_LANG['from_failed']          = 'Følgende afsenderadresse er forkert: ';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP fejl: Følgende modtagere er forkerte: ';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP fejl: Data kunne ikke accepteres.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP fejl: Kunne ikke tilslutte SMTP serveren.';
+$PHPMAILER_LANG['file_access']          = 'Ingen adgang til fil: ';
+$PHPMAILER_LANG['file_open']            = 'Fil fejl: Kunne ikke åbne filen: ';
+$PHPMAILER_LANG['encoding']             = 'Ukendt encode-format: ';
+$PHPMAILER_LANG['signing']              = 'Signing Error: ';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP server error: ';
+?>
\ No newline at end of file
diff --git a/onyx2/modules/mail/language/phpmailer.lang-en.php b/onyx2/modules/mail/language/phpmailer.lang-en.php
new file mode 100644
index 0000000..7704319
--- /dev/null
+++ b/onyx2/modules/mail/language/phpmailer.lang-en.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * PHPMailer language file.
+ * English Version
+ */
+
+$PHPMAILER_LANG = array();
+
+$PHPMAILER_LANG['provide_address']      = 'You must provide at least one recipient email address.';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer is not supported.';
+$PHPMAILER_LANG['execute']              = 'Could not execute: ';
+$PHPMAILER_LANG['instantiate']          = 'Could not instantiate mail function.';
+$PHPMAILER_LANG['authenticate']         = 'SMTP Error: Could not authenticate.';
+$PHPMAILER_LANG['from_failed']          = 'The following From address failed: ';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP Error: The following recipients failed: ';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP Error: Data not accepted.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP Error: Could not connect to SMTP host.';
+$PHPMAILER_LANG['file_access']          = 'Could not access file: ';
+$PHPMAILER_LANG['file_open']            = 'File Error: Could not open file: ';
+$PHPMAILER_LANG['encoding']             = 'Unknown encoding: ';
+$PHPMAILER_LANG['signing']              = 'Signing Error: ';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP server error: ';
+?>
\ No newline at end of file
diff --git a/onyx2/modules/mail/language/phpmailer.lang-es.php b/onyx2/modules/mail/language/phpmailer.lang-es.php
new file mode 100644
index 0000000..b14b747
--- /dev/null
+++ b/onyx2/modules/mail/language/phpmailer.lang-es.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * PHPMailer language file.
+ * Versión en español
+ */
+
+$PHPMAILER_LANG = array();
+
+$PHPMAILER_LANG['provide_address']      = 'Debe proveer al menos una dirección de email como destinatario.';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer no está soportado.';
+$PHPMAILER_LANG['execute']              = 'No puedo ejecutar: ';
+$PHPMAILER_LANG['instantiate']          = 'No pude crear una instancia de la función Mail.';
+$PHPMAILER_LANG['authenticate']         = 'Error SMTP: No se pudo autentificar.';
+$PHPMAILER_LANG['from_failed']          = 'La(s) siguiente(s) direcciones de remitente fallaron: ';
+$PHPMAILER_LANG['recipients_failed']    = 'Error SMTP: Los siguientes destinatarios fallaron: ';
+$PHPMAILER_LANG['data_not_accepted']    = 'Error SMTP: Datos no aceptados.';
+$PHPMAILER_LANG['connect_host']         = 'Error SMTP: No puedo conectar al servidor SMTP.';
+$PHPMAILER_LANG['file_access']          = 'No puedo acceder al archivo: ';
+$PHPMAILER_LANG['file_open']            = 'Error de Archivo: No puede abrir el archivo: ';
+$PHPMAILER_LANG['encoding']             = 'Codificación desconocida: ';
+$PHPMAILER_LANG['signing']              = 'Error al firmar: ';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP server error: ';
+?>
\ No newline at end of file
diff --git a/onyx2/modules/mail/language/phpmailer.lang-et.php b/onyx2/modules/mail/language/phpmailer.lang-et.php
new file mode 100644
index 0000000..943680c
--- /dev/null
+++ b/onyx2/modules/mail/language/phpmailer.lang-et.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * PHPMailer language file.
+ * Estonian Version
+ * By Indrek Päri
+ */
+
+$PHPMAILER_LANG = array();
+
+$PHPMAILER_LANG['provide_address']      = 'Te peate määrama vähemalt ühe saaja e-posti aadressi.';
+$PHPMAILER_LANG['mailer_not_supported'] = ' maileri tugi puudub.';
+$PHPMAILER_LANG['execute']              = 'Tegevus ebaõnnestus: ';
+$PHPMAILER_LANG['instantiate']          = 'mail funktiooni käivitamine ebaõnnestus.';
+$PHPMAILER_LANG['authenticate']         = 'SMTP Viga: Autoriseerimise viga.';
+$PHPMAILER_LANG['from_failed']          = 'Järgnev saatja e-posti aadress on vigane: ';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP Viga: Järgnevate saajate e-posti aadressid on vigased: ';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP Viga: Vigased andmed.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP Viga: Ei õnnestunud luua ühendust SMTP serveriga.';
+$PHPMAILER_LANG['file_access']          = 'Pole piisavalt õiguseid järgneva faili avamiseks: ';
+$PHPMAILER_LANG['file_open']            = 'Faili Viga: Faili avamine ebaõnnestus: ';
+$PHPMAILER_LANG['encoding']             = 'Tundmatu Unknown kodeering: ';
+$PHPMAILER_LANG['signing']              = 'Signing Error: ';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP server error: ';
+?>
\ No newline at end of file
diff --git a/onyx2/modules/mail/language/phpmailer.lang-fi.php b/onyx2/modules/mail/language/phpmailer.lang-fi.php
new file mode 100644
index 0000000..b58ffc3
--- /dev/null
+++ b/onyx2/modules/mail/language/phpmailer.lang-fi.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * PHPMailer language file.
+ * Finnish Version
+ * By Jyry Kuukanen
+ */
+
+$PHPMAILER_LANG = array();
+
+$PHPMAILER_LANG['provide_address']      = 'Aseta vähintään yksi vastaanottajan sähk&ouml;postiosoite.';
+$PHPMAILER_LANG['mailer_not_supported'] = 'postivälitintyyppiä ei tueta.';
+$PHPMAILER_LANG['execute']              = 'Suoritus epäonnistui: ';
+$PHPMAILER_LANG['instantiate']          = 'mail-funktion luonti epäonnistui.';
+$PHPMAILER_LANG['authenticate']         = 'SMTP-virhe: käyttäjätunnistus epäonnistui.';
+$PHPMAILER_LANG['from_failed']          = 'Seuraava lähettäjän osoite on virheellinen: ';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP-virhe: seuraava vastaanottaja osoite on virheellinen.';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP-virhe: data on virheellinen.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP-virhe: yhteys palvelimeen ei onnistu.';
+$PHPMAILER_LANG['file_access']          = 'Seuraavaan tiedostoon ei ole oikeuksia: ';
+$PHPMAILER_LANG['file_open']            = 'Tiedostovirhe: Ei voida avata tiedostoa: ';
+$PHPMAILER_LANG['encoding']             = 'Tuntematon koodaustyyppi: ';
+$PHPMAILER_LANG['signing']              = 'Signing Error: ';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP server error: ';
+?>
\ No newline at end of file
diff --git a/onyx2/modules/mail/language/phpmailer.lang-fo.php b/onyx2/modules/mail/language/phpmailer.lang-fo.php
new file mode 100644
index 0000000..57f4178
--- /dev/null
+++ b/onyx2/modules/mail/language/phpmailer.lang-fo.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * PHPMailer language file.
+ * Faroese Version [language of the Faroe Islands, a Danish dominion]
+ * This file created: 11-06-2004
+ * Supplied by Dávur Sørensen [www.profo-webdesign.dk]
+ */
+
+$PHPMAILER_LANG = array();
+
+$PHPMAILER_LANG['provide_address']      = 'Tú skal uppgeva minst móttakara-emailadressu(r).';
+$PHPMAILER_LANG['mailer_not_supported'] = ' er ikki supporterað.';
+$PHPMAILER_LANG['execute']              = 'Kundi ikki útføra: ';
+$PHPMAILER_LANG['instantiate']          = 'Kuni ikki instantiera mail funktión.';
+$PHPMAILER_LANG['authenticate']         = 'SMTP feilur: Kundi ikki góðkenna.';
+$PHPMAILER_LANG['from_failed']          = 'fylgjandi Frá/From adressa miseydnaðist: ';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP Feilur: Fylgjandi móttakarar miseydnaðust: ';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP feilur: Data ikki góðkent.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP feilur: Kundi ikki knýta samband við SMTP vert.';
+$PHPMAILER_LANG['file_access']          = 'Kundi ikki tilganga fílu: ';
+$PHPMAILER_LANG['file_open']            = 'Fílu feilur: Kundi ikki opna fílu: ';
+$PHPMAILER_LANG['encoding']             = 'Ókend encoding: ';
+$PHPMAILER_LANG['signing']              = 'Signing Error: ';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP server error: ';
+?>
\ No newline at end of file
diff --git a/onyx2/modules/mail/language/phpmailer.lang-fr.php b/onyx2/modules/mail/language/phpmailer.lang-fr.php
new file mode 100644
index 0000000..8c9fe7b
--- /dev/null
+++ b/onyx2/modules/mail/language/phpmailer.lang-fr.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * PHPMailer language file.
+ * French Version
+ */
+
+$PHPMAILER_LANG = array();
+
+$PHPMAILER_LANG['provide_address']      = 'Vous devez fournir au moins une adresse de destinataire.';
+$PHPMAILER_LANG['mailer_not_supported'] = ' client de messagerie non supporté.';
+$PHPMAILER_LANG['execute']              = 'Impossible de lancer l\'exécution : ';
+$PHPMAILER_LANG['instantiate']          = 'Impossible d\'instancier la fonction mail.';
+$PHPMAILER_LANG['authenticate']         = 'Erreur SMTP : Echec de l\'authentification.';
+$PHPMAILER_LANG['from_failed']          = 'L\'adresse d\'expéditeur suivante a échouée : ';
+$PHPMAILER_LANG['recipients_failed']    = 'Erreur SMTP : Les destinataires suivants sont en erreur : ';
+$PHPMAILER_LANG['data_not_accepted']    = 'Erreur SMTP : Données incorrects.';
+$PHPMAILER_LANG['connect_host']         = 'Erreur SMTP : Impossible de se connecter au serveur SMTP.';
+$PHPMAILER_LANG['file_access']          = 'Impossible d\'accéder au fichier : ';
+$PHPMAILER_LANG['file_open']            = 'Erreur Fichier : ouverture impossible : ';
+$PHPMAILER_LANG['encoding']             = 'Encodage inconnu : ';
+$PHPMAILER_LANG['signing']              = 'Signing Error: ';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP server error: ';
+?>
\ No newline at end of file
diff --git a/onyx2/modules/mail/language/phpmailer.lang-hu.php b/onyx2/modules/mail/language/phpmailer.lang-hu.php
new file mode 100644
index 0000000..06ca038
--- /dev/null
+++ b/onyx2/modules/mail/language/phpmailer.lang-hu.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * PHPMailer language file.
+ * Hungarian Version
+ */
+
+$PHPMAILER_LANG = array();
+
+$PHPMAILER_LANG['provide_address']      = 'Meg kell adnod legalább egy címzett email címet.';
+$PHPMAILER_LANG['mailer_not_supported'] = ' levelezõ nem támogatott.';
+$PHPMAILER_LANG['execute']              = 'Nem tudtam végrehajtani: ';
+$PHPMAILER_LANG['instantiate']          = 'Nem sikerült példányosítani a mail funkciót.';
+$PHPMAILER_LANG['authenticate']         = 'SMTP Hiba: Sikertelen autentikáció.';
+$PHPMAILER_LANG['from_failed']          = 'Az alábbi Feladó cím hibás: ';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP Hiba: Az alábbi címzettek hibásak: ';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP Hiba: Nem elfogadható adat.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP Hiba: Nem tudtam csatlakozni az SMTP host-hoz.';
+$PHPMAILER_LANG['file_access']          = 'Nem sikerült elérni a következõ fájlt: ';
+$PHPMAILER_LANG['file_open']            = 'Fájl Hiba: Nem sikerült megnyitni a következõ fájlt: ';
+$PHPMAILER_LANG['encoding']             = 'Ismeretlen kódolás: ';
+$PHPMAILER_LANG['signing']              = 'Signing Error: ';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP server error: ';
+?>
\ No newline at end of file
diff --git a/onyx2/modules/mail/language/phpmailer.lang-it.php b/onyx2/modules/mail/language/phpmailer.lang-it.php
new file mode 100644
index 0000000..b9c89d7
--- /dev/null
+++ b/onyx2/modules/mail/language/phpmailer.lang-it.php
@@ -0,0 +1,26 @@
+<?php
+/**
+* PHPMailer language file.
+* Italian version
+* @package PHPMailer
+* @author Ilias Bartolini <brain79@inwind.it>*/
+
+$PHPMAILER_LANG = array();
+
+$PHPMAILER_LANG['provide_address']      = 'Deve essere fornito almeno un indirizzo ricevente';
+$PHPMAILER_LANG['mailer_not_supported'] = 'Mailer non supportato';
+$PHPMAILER_LANG['execute']              = 'Impossibile eseguire l\'operazione: ';
+$PHPMAILER_LANG['instantiate']          = 'Impossibile istanziare la funzione mail';
+$PHPMAILER_LANG['authenticate']         = 'SMTP Error: Impossibile autenticarsi.';
+$PHPMAILER_LANG['from_failed']          = 'I seguenti indirizzi mittenti hanno generato errore: ';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP Error: I seguenti indirizzi'.
+                                          'destinatari hanno generato errore: ';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP Error: Data non accettati dal'.
+                                          'server.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP Error: Impossibile connettersi all\'host SMTP.';
+$PHPMAILER_LANG['file_access']          = 'Impossibile accedere al file: ';
+$PHPMAILER_LANG['file_open']            = 'File Error: Impossibile aprire il file: ';
+$PHPMAILER_LANG['encoding']             = 'Encoding set dei caratteri sconosciuto: ';
+$PHPMAILER_LANG['signing']              = 'Signing Error: ';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP server error: ';
+?>
\ No newline at end of file
diff --git a/onyx2/modules/mail/language/phpmailer.lang-ja.php b/onyx2/modules/mail/language/phpmailer.lang-ja.php
new file mode 100644
index 0000000..c9b81c1
--- /dev/null
+++ b/onyx2/modules/mail/language/phpmailer.lang-ja.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * PHPMailer language file.  
+ * Japanese Version
+ * By Mitsuhiro Yoshida - http://mitstek.com/
+ */
+
+$PHPMAILER_LANG = array();
+
+$PHPMAILER_LANG['provide_address'] = '少なくとも1つメールアドレスを 指定する必要があります。';
+$PHPMAILER_LANG['mailer_not_supported'] = ' メーラーがサポートされていません。';
+$PHPMAILER_LANG['execute'] = '実行できませんでした: ';
+$PHPMAILER_LANG['instantiate'] = 'メール関数が正常に動作しませんでした。';
+$PHPMAILER_LANG['authenticate'] = 'SMTPエラー: 認証できませんでした。';
+$PHPMAILER_LANG['from_failed'] = '次のFromアドレスに間違いがあります: ';
+$PHPMAILER_LANG['recipients_failed'] = 'SMTPエラー: 次の受信者アドレスに 間違いがあります: ';
+$PHPMAILER_LANG['data_not_accepted'] = 'SMTPエラー: データが受け付けられませんでした。';
+$PHPMAILER_LANG['connect_host'] = 'SMTPエラー: SMTPホストに接続できませんでした。';
+$PHPMAILER_LANG['file_access'] = 'ファイルにアクセスできません: ';
+$PHPMAILER_LANG['file_open'] = 'ファイルエラー: ファイルを開けません: ';
+$PHPMAILER_LANG['encoding'] = '不明なエンコーディング: ';
+$PHPMAILER_LANG['signing'] = 'Signing Error: ';
+$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: ';
+?>
\ No newline at end of file
diff --git a/onyx2/modules/mail/language/phpmailer.lang-nl.php b/onyx2/modules/mail/language/phpmailer.lang-nl.php
new file mode 100644
index 0000000..6d9b336
--- /dev/null
+++ b/onyx2/modules/mail/language/phpmailer.lang-nl.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * PHPMailer language file.
+ * Dutch Version
+ */
+
+$PHPMAILER_LANG = array();
+
+$PHPMAILER_LANG['provide_address']      = 'Er moet tenmiste één ontvanger emailadres opgegeven worden.';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer wordt niet ondersteund.';
+$PHPMAILER_LANG['execute']              = 'Kon niet uitvoeren: ';
+$PHPMAILER_LANG['instantiate']          = 'Kon mail functie niet initialiseren.';
+$PHPMAILER_LANG['authenticate']         = 'SMTP Fout: authenticatie mislukt.';
+$PHPMAILER_LANG['from_failed']          = 'De volgende afzender adressen zijn mislukt: ';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP Fout: De volgende ontvangers zijn mislukt: ';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP Fout: Data niet geaccepteerd.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP Fout: Kon niet verbinden met SMTP host.';
+$PHPMAILER_LANG['file_access']          = 'Kreeg geen toegang tot bestand: ';
+$PHPMAILER_LANG['file_open']            = 'Bestandsfout: Kon bestand niet openen: ';
+$PHPMAILER_LANG['encoding']             = 'Onbekende codering: ';
+$PHPMAILER_LANG['signing']              = 'Signing Error: ';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP server error: ';
+?>
\ No newline at end of file
diff --git a/onyx2/modules/mail/language/phpmailer.lang-no.php b/onyx2/modules/mail/language/phpmailer.lang-no.php
new file mode 100644
index 0000000..77b30a4
--- /dev/null
+++ b/onyx2/modules/mail/language/phpmailer.lang-no.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * PHPMailer language file.
+ * Norwegian Version
+ */
+
+$PHPMAILER_LANG = array();
+
+$PHPMAILER_LANG['provide_address']      = 'Du må ha med minst en mottager adresse.';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer er ikke supportert.';
+$PHPMAILER_LANG['execute']              = 'Kunne ikke utføre: ';
+$PHPMAILER_LANG['instantiate']          = 'Kunne ikke instantiate mail funksjonen.';
+$PHPMAILER_LANG['authenticate']         = 'SMTP Feil: Kunne ikke authentisere.';
+$PHPMAILER_LANG['from_failed']          = 'Følgende Fra feilet: ';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP Feil: Følgende mottagere feilet: ';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP Feil: Data ble ikke akseptert.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP Feil: Kunne ikke koble til SMTP host.';
+$PHPMAILER_LANG['file_access']          = 'Kunne ikke få tilgang til filen: ';
+$PHPMAILER_LANG['file_open']            = 'Fil feil: Kunne ikke åpne filen: ';
+$PHPMAILER_LANG['encoding']             = 'Ukjent encoding: ';
+$PHPMAILER_LANG['signing']              = 'Signing Error: ';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP server error: ';
+?>
\ No newline at end of file
diff --git a/onyx2/modules/mail/language/phpmailer.lang-pl.php b/onyx2/modules/mail/language/phpmailer.lang-pl.php
new file mode 100644
index 0000000..20820d2
--- /dev/null
+++ b/onyx2/modules/mail/language/phpmailer.lang-pl.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * PHPMailer language file.  
+ * Polish Version
+ */
+
+$PHPMAILER_LANG = array();
+
+$PHPMAILER_LANG["provide_address"] = 'Należy podać prawidłowy adres email Odbiorcy.';
+$PHPMAILER_LANG["mailer_not_supported"] = 'Wybrana metoda wysyłki wiadomości nie jest obsługiwana.';
+$PHPMAILER_LANG["execute"] = 'Nie można uruchomić: ';
+$PHPMAILER_LANG["instantiate"] = 'Nie można wywołać funkcji mail(). Sprawdź konfigurację serwera.';
+$PHPMAILER_LANG["authenticate"] = 'Błąd SMTP: Nie można przeprowadzić autentykacji.';
+$PHPMAILER_LANG["from_failed"] = 'Następujący adres Nadawcy jest jest nieprawidłowy: ';
+$PHPMAILER_LANG["recipients_failed"] = 'Błąd SMTP: Następujący odbiorcy są nieprawidłowi: ';
+$PHPMAILER_LANG["data_not_accepted"] = 'Błąd SMTP: Dane nie zostały przyjęte.';
+$PHPMAILER_LANG["connect_host"] = 'Błąd SMTP: Nie można połączyć się z wybranym hostem.';
+$PHPMAILER_LANG["file_access"] = 'Brak dostępu do pliku: ';
+$PHPMAILER_LANG["file_open"] = 'Nie można otworzyć pliku: ';
+$PHPMAILER_LANG["encoding"] = 'Nieznany sposób kodowania znaków: ';
+$PHPMAILER_LANG['signing'] = 'Signing Error: ';
+$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: ';
+?>
\ No newline at end of file
diff --git a/onyx2/modules/mail/language/phpmailer.lang-ro.php b/onyx2/modules/mail/language/phpmailer.lang-ro.php
new file mode 100644
index 0000000..01cb6bf
--- /dev/null
+++ b/onyx2/modules/mail/language/phpmailer.lang-ro.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * PHPMailer language file.
+ * Romanian Version
+ * @package PHPMailer
+ * @author Catalin Constantin <catalin@dazoot.ro> */
+
+$PHPMAILER_LANG = array();
+
+$PHPMAILER_LANG['provide_address']      = 'Trebuie sa adaugati cel putin un recipient (adresa de mail).';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer nu este suportat.';
+$PHPMAILER_LANG['execute']              = 'Nu pot executa:  ';
+$PHPMAILER_LANG['instantiate']          = 'Nu am putut instantia functia mail.';
+$PHPMAILER_LANG['authenticate']         = 'Eroare SMTP: Nu a functionat autentificarea.';
+$PHPMAILER_LANG['from_failed']          = 'Urmatoarele adrese From au dat eroare: ';
+$PHPMAILER_LANG['recipients_failed']    = 'Eroare SMTP: Urmatoarele adrese de mail au dat eroare: ';
+$PHPMAILER_LANG['data_not_accepted']    = 'Eroare SMTP: Continutul mailului nu a fost acceptat.';
+$PHPMAILER_LANG['connect_host']         = 'Eroare SMTP: Nu m-am putut conecta la adresa SMTP.';
+$PHPMAILER_LANG['file_access']          = 'Nu pot accesa fisierul: ';
+$PHPMAILER_LANG['file_open']            = 'Eroare de fisier: Nu pot deschide fisierul: ';
+$PHPMAILER_LANG['encoding']             = 'Encodare necunoscuta: ';
+$PHPMAILER_LANG['signing']              = 'Signing Error: ';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP server error: ';
+?>
\ No newline at end of file
diff --git a/onyx2/modules/mail/language/phpmailer.lang-ru.php b/onyx2/modules/mail/language/phpmailer.lang-ru.php
new file mode 100644
index 0000000..7619c29
--- /dev/null
+++ b/onyx2/modules/mail/language/phpmailer.lang-ru.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * PHPMailer language file.
+ * Russian Version by Alexey Chumakov <alex@chumakov.ru> */
+
+$PHPMAILER_LANG = array();
+
+$PHPMAILER_LANG['provide_address']      = 'Пожалуйста, введите хотя бы один адрес e-mail получателя.';
+$PHPMAILER_LANG['mailer_not_supported'] = ' - почтовый сервер не поддерживается.';
+$PHPMAILER_LANG['execute']              = 'Невозможно выполнить команду: ';
+$PHPMAILER_LANG['instantiate']          = 'Невозможно запустить функцию mail.';
+$PHPMAILER_LANG['authenticate']         = 'Ошибка SMTP: ошибка авторизации.';
+$PHPMAILER_LANG['from_failed']          = 'Неверный адрес отправителя: ';
+$PHPMAILER_LANG['recipients_failed']    = 'Ошибка SMTP: отправка по следующим ' .
+                                          'адресам получателей не удалась: ';
+$PHPMAILER_LANG['data_not_accepted']    = 'Ошибка SMTP: данные не приняты.';
+$PHPMAILER_LANG['connect_host']         = 'Ошибка SMTP: не удается подключиться к серверу SMTP.';
+$PHPMAILER_LANG['file_access']          = 'Нет доступа к файлу: ';
+$PHPMAILER_LANG['file_open']            = 'Файловая ошибка: не удается открыть файл: ';
+$PHPMAILER_LANG['encoding']             = 'Неизвестный вид кодировки: ';
+$PHPMAILER_LANG['signing']              = 'Signing Error: ';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP server error: ';
+?>
\ No newline at end of file
diff --git a/onyx2/modules/mail/language/phpmailer.lang-se.php b/onyx2/modules/mail/language/phpmailer.lang-se.php
new file mode 100644
index 0000000..461d10b
--- /dev/null
+++ b/onyx2/modules/mail/language/phpmailer.lang-se.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * PHPMailer language file.
+ * Swedish Version
+ * Author: Johan Linnér <johan@linner.biz> */
+
+$PHPMAILER_LANG = array();
+
+$PHPMAILER_LANG['provide_address']      = 'Du måste ange minst en mottagares e-postadress.';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer stöds inte.';
+$PHPMAILER_LANG['execute']              = 'Kunde inte köra: ';
+$PHPMAILER_LANG['instantiate']          = 'Kunde inte initiera e-postfunktion.';
+$PHPMAILER_LANG['authenticate']         = 'SMTP fel: Kunde inte autentisera.';
+$PHPMAILER_LANG['from_failed']          = 'Följande avsändaradress är felaktig: ';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP fel: Följande mottagare är felaktig: ';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP fel: Data accepterades inte.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP fel: Kunde inte ansluta till SMTP-server.';
+$PHPMAILER_LANG['file_access']          = 'Ingen åtkomst till fil: ';
+$PHPMAILER_LANG['file_open']            = 'Fil fel: Kunde inte öppna fil: ';
+$PHPMAILER_LANG['encoding']             = 'Okänt encode-format: ';
+$PHPMAILER_LANG['signing']              = 'Signing Error: ';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP server error: ';
+?>
\ No newline at end of file
diff --git a/onyx2/modules/mail/language/phpmailer.lang-tr.php b/onyx2/modules/mail/language/phpmailer.lang-tr.php
new file mode 100644
index 0000000..cdc32e5
--- /dev/null
+++ b/onyx2/modules/mail/language/phpmailer.lang-tr.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * PHPMailer dil dosyasý.
+ * Türkçe Versiyonu
+ * ÝZYAZILIM - Elçin Özel - Can Yýlmaz - Mehmet Benlioðlu
+ */
+
+$PHPMAILER_LANG = array();
+
+$PHPMAILER_LANG['provide_address']      = 'En az bir tane mail adresi belirtmek zorundasýnýz alýcýnýn email adresi.';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailler desteklenmemektedir.';
+$PHPMAILER_LANG['execute']              = 'Çalýþtýrýlamýyor: ';
+$PHPMAILER_LANG['instantiate']          = 'Örnek mail fonksiyonu yaratýlamadý.';
+$PHPMAILER_LANG['authenticate']         = 'SMTP Hatasý: Doðrulanamýyor.';
+$PHPMAILER_LANG['from_failed']          = 'Baþarýsýz olan gönderici adresi: ';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP Hatasý: alýcýlara ulaþmadý: ';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP Hatasý: Veri kabul edilmedi.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP Hatasý: SMTP hosta baðlanýlamýyor.';
+$PHPMAILER_LANG['file_access']          = 'Dosyaya eriþilemiyor: ';
+$PHPMAILER_LANG['file_open']            = 'Dosya Hatasý: Dosya açýlamýyor: ';
+$PHPMAILER_LANG['encoding']             = 'Bilinmeyen þifreleme: ';
+$PHPMAILER_LANG['signing']              = 'Signing Error: ';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP server error: ';
+?>
\ No newline at end of file
diff --git a/onyx2/modules/mail/language/phpmailer.lang-zh.php b/onyx2/modules/mail/language/phpmailer.lang-zh.php
new file mode 100644
index 0000000..31c10fa
--- /dev/null
+++ b/onyx2/modules/mail/language/phpmailer.lang-zh.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * PHPMailer language file.  
+ * Traditional Chinese Version
+ * @author liqwei <liqwei@liqwei.com>
+ */
+
+$PHPMAILER_LANG = array();
+$PHPMAILER_LANG['provide_address'] = '必須提供至少一個收件人地址。';
+$PHPMAILER_LANG['mailer_not_supported'] = '發信客戶端不被支持。';
+$PHPMAILER_LANG['execute'] = '無法執行：';
+$PHPMAILER_LANG['instantiate'] = '未知函數調用。';
+$PHPMAILER_LANG['authenticate'] = 'SMTP 錯誤：登錄失敗。';
+$PHPMAILER_LANG['from_failed'] = '發送地址錯誤：';
+$PHPMAILER_LANG['recipients_failed'] = 'SMTP 錯誤：收件人地址錯誤：';
+$PHPMAILER_LANG['data_not_accepted'] = 'SMTP 錯誤：數據不被接受。';
+$PHPMAILER_LANG['connect_host'] = 'SMTP 錯誤：無法連接到 SMTP 主機。';
+$PHPMAILER_LANG['file_access'] = '無法訪問文件：';
+$PHPMAILER_LANG['file_open'] = '文件錯誤：無法打開文件：';
+$PHPMAILER_LANG['encoding'] = '未知編碼: ';
+$PHPMAILER_LANG['signing'] = 'Signing Error: ';
+$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: ';
+?>
\ No newline at end of file
diff --git a/onyx2/modules/mail/language/phpmailer.lang-zh_cn.php b/onyx2/modules/mail/language/phpmailer.lang-zh_cn.php
new file mode 100644
index 0000000..b01d806
--- /dev/null
+++ b/onyx2/modules/mail/language/phpmailer.lang-zh_cn.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * PHPMailer language file.  
+ * Simplified Chinese Version
+ * @author liqwei <liqwei@liqwei.com>
+ */
+
+$PHPMAILER_LANG = array();
+
+$PHPMAILER_LANG["provide_address"] = '必须提供至少一个收件人地址。';
+$PHPMAILER_LANG["mailer_not_supported"] = '发信客户端不被支持。';
+$PHPMAILER_LANG["execute"] = '无法执行：';
+$PHPMAILER_LANG["instantiate"] = '未知函数调用。';
+$PHPMAILER_LANG["authenticate"] = 'SMTP 错误：登录失败。';
+$PHPMAILER_LANG["from_failed"] = '发送地址错误：';
+$PHPMAILER_LANG["recipients_failed"] = 'SMTP 错误：收件人地址错误：';
+$PHPMAILER_LANG["data_not_accepted"] = 'SMTP 错误：数据不被接受。';
+$PHPMAILER_LANG["connect_host"] = 'SMTP 错误：无法连接到 SMTP 主机。';
+$PHPMAILER_LANG["file_access"] = '无法访问文件：';
+$PHPMAILER_LANG["file_open"] = '文件错误：无法打开文件：';
+$PHPMAILER_LANG["encoding"] = '未知编码: ';
+$PHPMAILER_LANG["signing"] = 'Signing Error: ';
+$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: ';
+?>
\ No newline at end of file
diff --git a/onyx2/modules/mail/main.php b/onyx2/modules/mail/main.php
new file mode 100644
index 0000000..4e7fefb
--- /dev/null
+++ b/onyx2/modules/mail/main.php
@@ -0,0 +1,38 @@
+<?php
+
+if(!defined('ONYX')) exit;
+
+define('PHPMAILER_DIR', ONYX.'modules/mail/');
+
+require_once(PHPMAILER_DIR."class.phpmailer.php");
+
+define('_MAIL_MAILER', $OPT['mailer']);
+define('_MAIL_LANG', $OPT['lang']);
+define('_MAIL_CHARSET', $OPT['charset']);
+define('_MAIL_HOST', $OPT['host']);
+define('_MAIL_PORT', $OPT['port']);
+define('_MAIL_SECURE', $OPT['secure']);
+define('_MAIL_FROM', $OPT['from']);
+define('_MAIL_FROMNAME', $OPT['fromname']);
+define('_MAIL_AUTH', !empty($OPT['username']));
+define('_MAIL_USERNAME', $OPT['username']);
+define('_MAIL_PASSWORD', $OPT['password']);
+
+class Mailer extends PHPmailer
+{ 
+  var $CharSet = _MAIL_CHARSET;
+  var $From = _MAIL_FROM;
+  var $FromName = _MAIL_FROMNAME;
+  var $Mailer = _MAIL_MAILER;
+  var $Version = "2.0";
+  var $Host = _MAIL_HOST;
+  var $Port = _MAIL_PORT;
+  var $SMTPSecure = _MAIL_SECURE;
+  var $SMTPAuth = _MAIL_AUTH;
+  var $Username = _MAIL_USERNAME;
+  var $Password = _MAIL_PASSWORD;
+  var $Timeout = 5;
+
+  var $Sendmail = "/usr/lib/sendmail";
+}
+?>
\ No newline at end of file
diff --git a/onyx2/modules/modules.xml b/onyx2/modules/modules.xml
new file mode 100644
index 0000000..568375e
--- /dev/null
+++ b/onyx2/modules/modules.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<modules>
+  <module name="db">
+    <default>
+      <option name="type">mysql</option>
+    </default>
+  </module>
+
+  <module name="session" require="db"/>
+
+  <module name="test"/>
+
+  <module name="templates">
+    <default>
+      <option name="profile">default</option>
+      <option name="compile">cache/templates/compile/</option>
+      <option name="config">modules/templates/config/</option>
+      <option name="cache">cache/templates/cache/</option>
+    </default>
+  </module>
+
+  <module name="bbcode">
+    <default>
+      <option name="smiley_dir">./images/smile/</option>
+      <option name="smiley">
+	<option name="wink">:wink:</option>
+	<option name="biggrin">:D</option>
+	<option name="smile">:-)</option>
+	<option name="razz">:P</option>
+	<option name="eek">:shock:</option>
+	<option name="cool">8-)</option>
+	<option name="twisted">:twisted:</option>
+	<option name="evil">:evil:</option>
+	<option name="mad">:-x</option>
+	<option name="confused">:-?</option>
+	<option name="sad">:-(</option>
+	<option name="surprised">:-O</option>
+	<option name="neutral">:-|</option>
+	<option name="redface">:oops:</option>
+	<option name="rolleyes">:roll:</option>
+	<option name="lol">:lol:</option>
+      </option>
+    </default>
+  </module>
+
+  <module name="lang">
+    <default>
+      <option name="type">fr</option>
+    </default>
+  </module>
+
+  <module name="chconfig">
+    <default>
+      <option name="show">0</option>
+    </default>
+  </module>
+
+  <module name="mail">
+    <default>
+      <option name="mailer">smtp</option>
+      <option name="lang">fr</option>
+      <option name="charset">utf-8</option>
+      <option name="host">smtp.googlemail.com</option>
+      <option name="port">465</option>
+      <option name="secure">tls</option>
+      <option name="from">no-reply@halo-battle.fr</option>
+      <option name="fromname">Halo-Battle</option>
+      <option name="username">halo-battle</option>
+      <option name="password">bloublou</option>
+    </default>
+  </module>
+
+  <module name="pistage">
+    <default>
+      <option name="dir">log/users</option>
+      <option name="ips"></option>
+    </default>
+  </module>
+
+    <module name="captcha" require="session">
+        <default>
+            <option name="caracteres">34678aertyupqdfhjkmwxcbn</option>
+            <option name="sizeX">231</option>
+            <option name="sizeY">60</option>
+            <option name="nb_carac">6</option>
+	    <option name="back">
+	      <option name="red">0</option>
+	      <option name="green">0</option>
+	      <option name="blue">0</option>
+	    </option>
+        </default>
+    </module>
+</modules>
diff --git a/onyx2/modules/pistage/main.php b/onyx2/modules/pistage/main.php
new file mode 100644
index 0000000..bf5eb34
--- /dev/null
+++ b/onyx2/modules/pistage/main.php
@@ -0,0 +1,34 @@
+<?php
+
+if(!defined('ONYX')) exit;
+
+$pistage = false;
+$file = null;
+
+if (!is_dir(ONYX."log/users"))
+  mkdir(ONYX."log/users");
+
+if (!empty($OPT['ips']))
+{
+	$ips = explode(';', $OPT['ips']);
+	if (in_array($_SERVER["REMOTE_ADDR"], $ips))
+		$pistage = true;
+}
+
+if (!empty($OPT['ids']))
+{
+	$SESS = new Session();
+
+	$ids = explode(';', $OPT['ids']);
+	if (isset($SESS->values['id']) && in_array($SESS->values['id'], $ids))
+	{
+		$pistage = true;
+		$file = $SESS->values['id'].".log";
+	}
+}
+
+if ($pistage)
+	elog(var_export($_REQUEST, TRUE), 0, ONYX."log/users", $file);
+
+unset($pistage, $SESS, $ips, $ids);
+?>
\ No newline at end of file
diff --git a/onyx2/modules/session/main.php b/onyx2/modules/session/main.php
new file mode 100644
index 0000000..6a8a1a6
--- /dev/null
+++ b/onyx2/modules/session/main.php
@@ -0,0 +1,20 @@
+<?php
+
+if(!defined('ONYX')) exit;
+
+if(defined('DB_TYPE'))
+    {
+        switch(DB_TYPE)
+            {
+                case 'mysql':
+                case 'postgresql':
+                    
+                    $session_config = $OPT;
+                    
+                    require_once(DB_TYPE.'.class.php');
+                    break;
+                
+                default: trigger_error('Base de donnee inconnue',E_USER_ERROR);
+            }
+    }
+?>
\ No newline at end of file
diff --git a/onyx2/modules/session/mysql.class.php b/onyx2/modules/session/mysql.class.php
new file mode 100644
index 0000000..74c96c7
--- /dev/null
+++ b/onyx2/modules/session/mysql.class.php
@@ -0,0 +1,161 @@
+<?php
+
+class Session
+{
+	
+  private $cookie;
+	
+  private $db;
+  
+  var $level = 0;
+  
+  var $values = array();
+  
+  function __construct($profile = NULL)
+  {
+    global $session_config;
+    
+    if(!empty($session_config['profile'])) $profile = $session_config['profile'];
+    
+    $cookie = strhex(base64_decode(gpc($session_config['cookie'],'cookie')));
+    $ip = encode_ip();
+    
+    $table = $session_config['db']['table'];
+
+    $this->db = new BDD($profile);
+
+    $this->clean();
+    
+    if(!$cookie)
+      {
+	$this->new_cookie();
+	$this->db->deconnexion();
+	return FALSE;
+      }
+    
+    $this->db->escape($cookie);
+    
+    if (defined("DEBUG"))
+      $query = $this->db->unique_query("SELECT session,level,var FROM $table WHERE session= 0x$cookie AND active=1");
+    else
+      $query = $this->db->unique_query("SELECT session,level,var FROM $table WHERE session= 0x$cookie AND ip= 0x$ip AND active=1");      
+
+    if($this->db->num_rows == 1)
+      {
+	$time = time();
+	
+	$this->db->query("UPDATE $table SET time='$time' WHERE session= 0x$cookie");
+	
+	$this->db->deconnexion();
+	
+	$this->cookie = strhex($query['session']);
+	$this->level = $query['level'];
+	if(!empty($query['var'])) $this->values = unserialize($query['var']);
+	
+	setcookie($session_config['cookie'],base64_encode(hexstr($this->cookie)),time() + $session_config['time']);
+      }
+    else
+      {
+	$this->new_cookie();
+	$this->db->deconnexion();
+      }
+    
+    return TRUE;
+  }
+  
+  private function clean()
+  {
+    global $session_config;
+    
+    if(!$this->db->connected) return FALSE;
+    
+    $time = time()-$session_config['time'];
+    $ip = encode_ip();
+    $ipmax = $session_config['maxip'];
+    
+    $table = $session_config['db']['table'];
+    
+    $this->db->query("DELETE FROM $table WHERE time < $time AND active = 1");
+    
+    if($ipmax > 0) $this->db->query("DELETE FROM $table WHERE ip = (SELECT * FROM (SELECT ip FROM $table GROUP BY ip HAVING COUNT(ip) > $ipmax) AS tmp)");
+  }
+  
+  private function new_cookie()
+  {
+    global $session_config;
+    
+    if(!$this->db->connected) return FALSE;
+    
+    $time = time();
+    
+    $level = (is_int($this->level) && strlen($this->level) <= 2) ? $this->level : 0 ;
+    
+    $sess_cookie = random(256);
+    $ip = encode_ip();
+    
+    $this->cookie = $sess_cookie;
+    
+    $table = $session_config['db']['table'];
+    
+    $this->db->escape($sess_cookie);
+    
+    $this->db->query("INSERT INTO $table(session,time,ip,var,level,active) VALUES(0x$sess_cookie,$time,0x$ip,$level,0,1) ");
+    
+    setcookie($session_config['cookie'],base64_encode(hexstr($this->cookie)),time() + $session_config['time']);
+  }
+  
+  function put($uid = NULL)
+  {
+    global $session_config;
+    
+    if(empty($this->cookie)) return FALSE;
+    
+    $var = serialize($this->values);
+    
+    $cookie = $this->cookie;
+    
+    $uid = empty($uid) ? '0' : md5($uid);
+    
+    $level = (is_int($this->level) || (ctype_digit($this->level)) && strlen($this->level) <= 2) ? $this->level : 0 ;
+    
+    $table = $session_config['db']['table'];
+    
+    $this->db->reconnexion();
+    
+    $this->db->escape($var);
+    
+    if($uid != '0')
+      {
+	$this->db->query("DELETE FROM $table WHERE uid = 0x$uid AND session != 0x$cookie AND active = 1");
+	$this->db->query("UPDATE $table SET var='$var', level='$level', uid= 0x$uid  WHERE session= 0x$cookie");
+      }
+    else
+      $this->db->query("UPDATE $table SET var='$var', level='$level' WHERE session= 0x$cookie");
+    
+    $this->db->deconnexion();
+  }
+  
+  function close()
+  {
+    global $session_config;
+    
+    if(empty($this->cookie)) return FALSE;
+    
+    $cookie = $this->cookie;
+    
+    $table = $session_config['db']['table'];
+    
+    $this->db->reconnexion();
+    
+    $this->db->query("DELETE FROM $table WHERE session = 0x$cookie AND active = 1");
+    
+    $this->db->deconnexion();
+    
+    setcookie($session_config['cookie'],'',0);
+    
+    $this->values = array();
+    $this->level = 0;
+    
+  }
+}
+?>
\ No newline at end of file
diff --git a/onyx2/modules/session/postgresql.class.php b/onyx2/modules/session/postgresql.class.php
new file mode 100644
index 0000000..307d99a
--- /dev/null
+++ b/onyx2/modules/session/postgresql.class.php
@@ -0,0 +1,153 @@
+<?php
+
+class Session {
+	
+	private $cookie;
+	
+	private $db;
+	
+	var $level = 0;
+	
+	var $values = array();
+	
+	function __construct($profile = NULL)
+		{
+			global $session_config;
+			
+			if(!empty($session_config['profile'])) $profile = $session_config['profile'];
+			
+			$cookie = strhex(base64_decode(gpc($session_config['cookie'],'cookie')));
+			$ip = encode_ip();
+			
+			$table = $session_config['db']['table'];
+			
+			$this->db = new BDD($profile);
+			
+			$this->clean();
+			
+			if(!$cookie)
+				{
+					$this->new_cookie();
+					$this->db->deconnexion();
+					return FALSE;
+				}
+			
+			$this->db->escape($cookie);
+			
+			$query = $this->db->unique_query("SELECT session,level,var FROM $table WHERE session= X'$cookie' AND ip= X'$ip' AND active= TRUE");
+			
+			if($this->db->num_rows == 1)
+				{
+					$time = time();
+			
+					$this->db->query("UPDATE $table SET time='$time' WHERE session= X'$cookie'");
+					
+					$this->db->deconnexion();
+					
+					$this->cookie = bithex($query['session']);
+					$this->level = $query['level'];
+					if(!empty($query['var'])) $this->values = unserialize($query['var']);
+					
+					setcookie($session_config['cookie'],base64_encode(hexstr($this->cookie)),time() + $session_config['time']);
+				}
+			else
+				{
+					$this->new_cookie();
+					$this->db->deconnexion();
+				}
+			
+			return TRUE;
+		}
+	
+	private function clean()
+		{
+			global $session_config;
+			
+			if(!$this->db->connected) return FALSE;
+			
+			$time = time()-$session_config['time'];
+			$ip = encode_ip();
+			$ipmax = $session_config['maxip'];
+			
+			$table = $session_config['db']['table'];
+			
+			$this->db->query("DELETE FROM $table WHERE time < $time AND active = TRUE");
+			
+			if($ipmax > 0) $this->db->query("DELETE FROM $table WHERE ip = (SELECT ip FROM $table GROUP BY ip HAVING COUNT(ip) > $ipmax)");
+		}
+	
+	private function new_cookie()
+		{
+			global $session_config;
+			
+			if(!$this->db->connected) return FALSE;
+			
+			$time = time();
+			
+			$level = (is_int($this->level) && strlen($this->level) <= 2) ? $this->level : 0 ;
+			
+			$sess_cookie = random(256);
+			$ip = encode_ip();
+			
+			$this->cookie = $sess_cookie;
+			
+			$table = $session_config['db']['table'];
+			
+			$this->db->escape($sess_cookie);
+			
+			$this->db->query("INSERT INTO $table(session,time,ip,var,level,active) VALUES(X'$sess_cookie',$time,X'$ip',$level,0,TRUE)");
+			
+			setcookie($session_config['cookie'],base64_encode(hexstr($this->cookie)),time() + $session_config['time']);
+		}
+    
+    function put($uid = NULL)
+    	{
+		global $session_config;
+		
+		if(empty($this->cookie)) return FALSE;
+		
+		$var = serialize($this->values);
+		
+		$cookie = $this->cookie;
+		
+		$uid = empty($uid) ? '0' : md5($uid);
+		
+		$level = (is_int($this->level) || (ctype_digit($this->level)) && strlen($this->level) <= 2) ? $this->level : 0 ;
+		
+		$table = $session_config['db']['table'];
+		
+		$this->db->reconnexion();
+		
+		$this->db->escape($var);
+		
+		if($uid != '0') $this->db->query("DELETE FROM $table WHERE uid = X'$uid' AND session != X'$cookie' AND active = TRUE");
+		
+		$this->db->query("UPDATE $table SET var='$var', level='$level', uid= X'$uid'  WHERE session= X'$cookie'");
+		
+		$this->db->deconnexion();
+    	}
+    
+    function close()
+    	{
+    		global $session_config;
+    		
+    		if(empty($this->cookie)) return FALSE;
+    		
+		$cookie = $this->cookie;
+		
+		$table = $session_config['db']['table'];
+		
+		$this->db->reconnexion();
+		
+		$this->db->query("DELETE FROM $table WHERE session = X'$cookie' AND active = TRUE");
+
+		$this->db->deconnexion();
+		
+		setcookie($session_config['cookie'],'',0);
+		
+		$this->values = array();
+		$this->level = 0;
+    		
+    	}
+}
+?>
diff --git a/onyx2/modules/templates/config/config b/onyx2/modules/templates/config/config
new file mode 100644
index 0000000..e69de29
diff --git a/onyx2/modules/templates/main.php b/onyx2/modules/templates/main.php
new file mode 100644
index 0000000..a400cff
--- /dev/null
+++ b/onyx2/modules/templates/main.php
@@ -0,0 +1,29 @@
+<?php
+
+if(!defined('ONYX')) exit;
+
+define('SMARTY_DIR',ONYX.'modules/templates/smarty/');
+
+require_once(SMARTY_DIR."Smarty.class.php");
+
+define('_TEMPLATE_DIR',ONYX.'tpl/'.$OPT['tpl'].'/');
+define('_TEMPLATE_COMPILE',ONYX.$OPT['compile']);
+define('_TEMPLATE_CONFIG',ONYX.$OPT['config']);
+define('_TEMPLATE_CACHE',ONYX.$OPT['cache']);
+
+class Template extends Smarty
+	{
+		//var $compile_check = false;
+		//var $force_compile = true;
+
+		public function __construct()
+		{
+			parent::__construct();
+			$this->setTemplateDir(_TEMPLATE_DIR);
+			$this->setCompileDir(_TEMPLATE_COMPILE);
+			$this->setCacheDir(_TEMPLATE_CACHE);
+			//SetCONFIGDIR !
+		}
+	}
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/Smarty.class.php b/onyx2/modules/templates/smarty/Smarty.class.php
new file mode 100644
index 0000000..feb8817
--- /dev/null
+++ b/onyx2/modules/templates/smarty/Smarty.class.php
@@ -0,0 +1,815 @@
+<?php
+
+/**
+ * Project:     Smarty: the PHP compiling template engine
+ * File:        Smarty.class.php
+ * SVN:         $Id: Smarty.class.php 3895 2010-12-31 13:47:12Z uwe.tews@googlemail.com $
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * 
+ * For questions, help, comments, discussion, etc., please join the
+ * Smarty mailing list. Send a blank e-mail to
+ * smarty-discussion-subscribe@googlegroups.com
+ * 
+ * @link http://www.smarty.net/
+ * @copyright 2008 New Digital Group, Inc.
+ * @author Monte Ohrt <monte at ohrt dot com> 
+ * @author Uwe Tews 
+ * @package Smarty
+ * @version 3.0.7
+ */
+
+/**
+ * define shorthand directory separator constant
+ */
+if (!defined('DS')) {
+    define('DS', DIRECTORY_SEPARATOR);
+} 
+
+/**
+ * set SMARTY_DIR to absolute path to Smarty library files.
+ * Sets SMARTY_DIR only if user application has not already defined it.
+ */
+if (!defined('SMARTY_DIR')) {
+    define('SMARTY_DIR', dirname(__FILE__) . DS);
+} 
+
+/**
+ * set SMARTY_SYSPLUGINS_DIR to absolute path to Smarty internal plugins.
+ * Sets SMARTY_SYSPLUGINS_DIR only if user application has not already defined it.
+ */
+if (!defined('SMARTY_SYSPLUGINS_DIR')) {
+    define('SMARTY_SYSPLUGINS_DIR', SMARTY_DIR . 'sysplugins' . DS);
+} 
+if (!defined('SMARTY_PLUGINS_DIR')) {
+    define('SMARTY_PLUGINS_DIR', SMARTY_DIR . 'plugins' . DS);
+} 
+if (!defined('SMARTY_RESOURCE_CHAR_SET')) {
+    define('SMARTY_RESOURCE_CHAR_SET', 'UTF-8');
+} 
+if (!defined('SMARTY_RESOURCE_DATE_FORMAT')) {
+    define('SMARTY_RESOURCE_DATE_FORMAT', '%b %e, %Y');
+} 
+
+/**
+ * register the class autoloader
+ */
+if (!defined('SMARTY_SPL_AUTOLOAD')) {
+    define('SMARTY_SPL_AUTOLOAD', 0);
+} 
+
+if (SMARTY_SPL_AUTOLOAD && set_include_path(get_include_path() . PATH_SEPARATOR . SMARTY_SYSPLUGINS_DIR) !== false) {
+    $registeredAutoLoadFunctions = spl_autoload_functions();
+    if (!isset($registeredAutoLoadFunctions['spl_autoload'])) {
+        spl_autoload_register();
+    } 
+} else {
+    spl_autoload_register('smartyAutoload');
+} 
+
+/**
+ * This is the main Smarty class
+ */
+class Smarty extends Smarty_Internal_Data {
+	/**
+	* constant definitions
+	*/
+    // smarty version
+    const SMARTY_VERSION = 'Smarty-3.0.7'; 
+  	//define variable scopes
+	const SCOPE_LOCAL = 0;
+	const SCOPE_PARENT = 1;
+	const SCOPE_ROOT = 2;
+	const SCOPE_GLOBAL = 3;
+	// define caching modes
+	const CACHING_OFF = 0;
+	const CACHING_LIFETIME_CURRENT = 1;
+	const CACHING_LIFETIME_SAVED = 2;
+	/** modes for handling of "<?php ... ?>" tags in templates. **/
+	const PHP_PASSTHRU = 0; //-> print tags as plain text
+	const PHP_QUOTE = 1; //-> escape tags as entities
+	const PHP_REMOVE = 2; //-> escape tags as entities
+	const PHP_ALLOW = 3; //-> escape tags as entities
+	// filter types
+	const FILTER_POST = 'post';
+	const FILTER_PRE = 'pre';
+	const FILTER_OUTPUT = 'output';
+	const FILTER_VARIABLE = 'variable';
+	// plugin types
+	const PLUGIN_FUNCTION = 'function';
+	const PLUGIN_BLOCK = 'block';
+	const PLUGIN_COMPILER = 'compiler';
+	const PLUGIN_MODIFIER = 'modifier';
+
+	/**
+	* static variables
+	*/
+    // assigned global tpl vars
+    static $global_tpl_vars = array(); 
+
+	/**
+	* variables
+	*/
+    // auto literal on delimiters with whitspace
+    public $auto_literal = true; 
+    // display error on not assigned variables
+    public $error_unassigned = false; 
+    // template directory
+    public $template_dir = null; 
+    // default template handler
+    public $default_template_handler_func = null; 
+    // compile directory
+    public $compile_dir = null; 
+    // plugins directory
+    public $plugins_dir = null; 
+    // cache directory
+    public $cache_dir = null; 
+    // config directory
+    public $config_dir = null; 
+    // force template compiling?
+    public $force_compile = false; 
+    // check template for modifications?
+    public $compile_check = true; 
+    // locking concurrent compiles
+    public $compile_locking = true; 
+    // use sub dirs for compiled/cached files?
+    public $use_sub_dirs = false; 
+    // compile_error?
+    public $compile_error = false; 
+    // caching enabled
+    public $caching = false; 
+    // merge compiled includes
+    public $merge_compiled_includes = false; 
+    // cache lifetime
+    public $cache_lifetime = 3600; 
+    // force cache file creation
+    public $force_cache = false; 
+    // cache_id
+    public $cache_id = null; 
+    // compile_id
+    public $compile_id = null; 
+    // template delimiters
+    public $left_delimiter = "{";
+    public $right_delimiter = "}"; 
+    // security
+    public $security_class = 'Smarty_Security';
+    public $security_policy = null;
+    public $php_handling = self::PHP_PASSTHRU;
+    public $allow_php_tag = false;
+    public $allow_php_templates = false;
+    public $direct_access_security = true; 
+    public $trusted_dir = array();
+    // debug mode
+    public $debugging = false;
+    public $debugging_ctrl = 'NONE';
+    public $smarty_debug_id = 'SMARTY_DEBUG';
+    public $debug_tpl = null; 
+    // When set, smarty does uses this value as error_reporting-level.
+    public $error_reporting = null; 
+    // config var settings
+    public $config_overwrite = true; //Controls whether variables with the same name overwrite each other.
+    public $config_booleanize = true; //Controls whether config values of on/true/yes and off/false/no get converted to boolean
+    public $config_read_hidden = false; //Controls whether hidden config sections/vars are read from the file.                                                      
+    // config vars
+    public $config_vars = array(); 
+    // assigned tpl vars
+    public $tpl_vars = array(); 
+    // dummy parent object
+    public $parent = null; 
+    // global template functions
+    public $template_functions = array(); 
+    // resource type used if none given
+    public $default_resource_type = 'file'; 
+    // caching type
+    public $caching_type = 'file'; 
+    // internal cache resource types
+    public $cache_resource_types = array('file'); 
+    // internal config properties
+    public $properties = array(); 
+    // config type
+    public $default_config_type = 'file'; 
+    // cached template objects
+    public $template_objects = null; 
+    // check If-Modified-Since headers
+    public $cache_modified_check = false; 
+    // registered plugins
+    public $registered_plugins = array(); 
+    // plugin search order
+    public $plugin_search_order = array('function', 'block', 'compiler', 'class'); 
+    // registered objects
+    public $registered_objects = array(); 
+    // registered classes
+    public $registered_classes = array(); 
+    // registered filters
+    public $registered_filters = array(); 
+    // registered resources
+    public $registered_resources = array(); 
+    // autoload filter
+    public $autoload_filters = array(); 
+    // status of filter on variable output
+    public $variable_filter = true; 
+    // default modifier
+    public $default_modifiers = array(); 
+    // global internal smarty  vars
+    static $_smarty_vars = array(); 
+    // start time for execution time calculation
+    public $start_time = 0; 
+    // default file permissions
+    public $_file_perms = 0644; 
+    // default dir permissions
+    public $_dir_perms = 0771; 
+    // block tag hierarchy
+    public $_tag_stack = array(); 
+    // flag if {block} tag is compiled for template inheritance
+    public $inheritance = false;
+    // generate deprecated function call notices?
+    public $deprecation_notices = true;
+    // Smarty 2 BC
+    public $_version = self::SMARTY_VERSION;
+    // self pointer to Smarty object
+    public $smarty;
+
+    /**
+     * Class constructor, initializes basic smarty properties
+     */
+    public function __construct()
+    { 
+		// selfpointer need by some other class methods
+		$this->smarty = $this;
+        if (is_callable('mb_internal_encoding')) {
+            mb_internal_encoding(SMARTY_RESOURCE_CHAR_SET);
+        } 
+        $this->start_time = microtime(true); 
+        // set default dirs
+        $this->template_dir = array('.' . DS . 'templates' . DS);
+        $this->compile_dir = '.' . DS . 'templates_c' . DS;
+        $this->plugins_dir = array(SMARTY_PLUGINS_DIR);
+        $this->cache_dir = '.' . DS . 'cache' . DS;
+        $this->config_dir = '.' . DS . 'configs' . DS;
+        $this->debug_tpl = SMARTY_DIR . 'debug.tpl';
+        if (isset($_SERVER['SCRIPT_NAME'])) {
+            $this->assignGlobal('SCRIPT_NAME', $_SERVER['SCRIPT_NAME']);
+        } 
+    } 
+
+    /**
+     * Class destructor
+     */
+    public function __destruct()
+    { 
+    } 
+
+    /**
+     * fetches a rendered Smarty template
+     * 
+     * @param string $template the resource handle of the template file or template object
+     * @param mixed $cache_id cache id to be used with this template
+     * @param mixed $compile_id compile id to be used with this template
+     * @param object $ |null $parent next higher level of Smarty variables
+     * @return string rendered template output
+     */
+    public function fetch($template, $cache_id = null, $compile_id = null, $parent = null, $display = false)
+    {
+        if (!empty($cache_id) && is_object($cache_id)) {
+            $parent = $cache_id;
+            $cache_id = null;
+        } 
+        if ($parent === null) {
+            // get default Smarty data object
+            $parent = $this;
+        } 
+        // create template object if necessary
+        ($template instanceof $this->template_class)? $_template = $template :
+        $_template = $this->createTemplate ($template, $cache_id, $compile_id, $parent, false);
+        if (isset($this->error_reporting)) {
+        	$_smarty_old_error_level = error_reporting($this->error_reporting);
+    	}
+    	// check URL debugging control
+        if (!$this->debugging && $this->debugging_ctrl == 'URL') {
+            if (isset($_SERVER['QUERY_STRING'])) {
+                $_query_string = $_SERVER['QUERY_STRING'];
+            } else {
+                $_query_string = '';
+            } 
+            if (false !== strpos($_query_string, $this->smarty_debug_id)) {
+                if (false !== strpos($_query_string, $this->smarty_debug_id . '=on')) {
+                    // enable debugging for this browser session
+                    setcookie('SMARTY_DEBUG', true);
+                    $this->debugging = true;
+                } elseif (false !== strpos($_query_string, $this->smarty_debug_id . '=off')) {
+                    // disable debugging for this browser session
+                    setcookie('SMARTY_DEBUG', false);
+                    $this->debugging = false;
+                } else {
+                    // enable debugging for this page
+                    $this->debugging = true;
+                } 
+            } else {
+                if (isset($_COOKIE['SMARTY_DEBUG'])) {
+                    $this->debugging = true;
+                } 
+            } 
+        } 
+        // obtain data for cache modified check
+        if ($this->cache_modified_check && $this->caching && $display) {
+            $_isCached = $_template->isCached() && !$_template->has_nocache_code;
+            if ($_isCached) {
+                $_gmt_mtime = gmdate('D, d M Y H:i:s', $_template->getCachedTimestamp()) . ' GMT';
+            } else {
+                $_gmt_mtime = '';
+            } 
+        } 
+        // return rendered template
+        if ((!$this->caching || $_template->resource_object->isEvaluated) && (isset($this->autoload_filters['output']) || isset($this->registered_filters['output']))) {
+            $_output = Smarty_Internal_Filter_Handler::runFilter('output', $_template->getRenderedTemplate(), $_template);
+        } else {
+            $_output = $_template->getRenderedTemplate();
+        } 
+        $_template->rendered_content = null;
+        if (isset($this->error_reporting)) {
+        	error_reporting($_smarty_old_error_level);
+        } 
+        // display or fetch
+        if ($display) {
+            if ($this->caching && $this->cache_modified_check) {
+                $_last_modified_date = @substr($_SERVER['HTTP_IF_MODIFIED_SINCE'], 0, strpos($_SERVER['HTTP_IF_MODIFIED_SINCE'], 'GMT') + 3);
+                if ($_isCached && $_gmt_mtime == $_last_modified_date) {
+                    if (php_sapi_name() == 'cgi')
+                        header('Status: 304 Not Modified');
+                    else
+                        header('HTTP/1.1 304 Not Modified');
+                } else {
+                    header('Last-Modified: ' . gmdate('D, d M Y H:i:s', $_template->getCachedTimestamp()) . ' GMT');
+                    echo $_output;
+                } 
+            } else {
+                echo $_output;
+            } 
+            // debug output
+            if ($this->debugging) {
+                Smarty_Internal_Debug::display_debug($this);
+            } 
+            return;
+        } else {
+            // return fetched content
+            return $_output;
+        } 
+    } 
+
+    /**
+     * displays a Smarty template
+     * 
+     * @param string $ |object $template the resource handle of the template file  or template object
+     * @param mixed $cache_id cache id to be used with this template
+     * @param mixed $compile_id compile id to be used with this template
+     * @param object $parent next higher level of Smarty variables
+     */
+    public function display($template, $cache_id = null, $compile_id = null, $parent = null)
+    { 
+        // display template
+        $this->fetch ($template, $cache_id, $compile_id, $parent, true);
+    } 
+
+    /**
+     * test if cache i valid
+     * 
+     * @param string $ |object $template the resource handle of the template file or template object
+     * @param mixed $cache_id cache id to be used with this template
+     * @param mixed $compile_id compile id to be used with this template
+     * @param object $parent next higher level of Smarty variables
+     * @return boolean cache status
+     */
+    public function isCached($template, $cache_id = null, $compile_id = null, $parent = null)
+    {
+    	if ($parent === null) {
+    		$parent = $this;
+    	}
+        if (!($template instanceof $this->template_class)) {
+            $template = $this->createTemplate ($template, $cache_id, $compile_id, $parent, false);
+        } 
+        // return cache status of template
+        return $template->isCached();
+    } 
+
+    /**
+     * creates a data object
+     * 
+     * @param object $parent next higher level of Smarty variables
+     * @returns object data object
+     */
+    public function createData($parent = null)
+    {
+        return new Smarty_Data($parent, $this);
+    } 
+
+    /**
+     * creates a template object
+     * 
+     * @param string $template the resource handle of the template file
+     * @param mixed $cache_id cache id to be used with this template
+     * @param mixed $compile_id compile id to be used with this template
+     * @param object $parent next higher level of Smarty variables
+     * @param boolean $do_clone flag is Smarty object shall be cloned
+     * @returns object template object
+     */
+    public function createTemplate($template, $cache_id = null, $compile_id = null, $parent = null, $do_clone = true)
+    {
+        if (!empty($cache_id) && (is_object($cache_id) || is_array($cache_id))) {
+            $parent = $cache_id;
+            $cache_id = null;
+        } 
+        if (!empty($parent) && is_array($parent)) {
+            $data = $parent;
+            $parent = null;
+        } else {
+            $data = null;
+        } 
+        if (!is_object($template)) {
+            // we got a template resource
+            // already in template cache?
+            $_templateId =  sha1($template . $cache_id . $compile_id);
+            if (isset($this->template_objects[$_templateId]) && $this->caching) {
+                // return cached template object
+                $tpl = $this->template_objects[$_templateId];
+            } else {
+                // create new template object
+                if ($do_clone) {
+                	$tpl = new $this->template_class($template, clone $this, $parent, $cache_id, $compile_id);
+                } else {
+                	$tpl = new $this->template_class($template, $this, $parent, $cache_id, $compile_id);
+                }
+            } 
+        } else {
+            // just return a copy of template class
+            $tpl = $template;
+        } 
+        // fill data if present
+        if (!empty($data) && is_array($data)) {
+            // set up variable values
+            foreach ($data as $_key => $_val) {
+                $tpl->tpl_vars[$_key] = new Smarty_variable($_val);
+            } 
+        } 
+        return $tpl;
+    } 
+    
+     
+
+    /**
+     * Check if a template resource exists
+     * 
+     * @param string $resource_name template name
+     * @return boolean status
+     */
+    function templateExists($resource_name)
+    { 
+        // create template object
+        $save = $this->template_objects;
+        $tpl = new $this->template_class($resource_name, $this); 
+        // check if it does exists
+        $result = $tpl->isExisting();
+        $this->template_objects = $save;
+        return $result;
+    } 
+
+    /**
+     * Returns a single or all global  variables
+     * 
+     * @param object $smarty 
+     * @param string $varname variable name or null
+     * @return string variable value or or array of variables
+     */
+    function getGlobal($varname = null)
+    {
+        if (isset($varname)) {
+            if (isset(self::$global_tpl_vars[$varname])) {
+                return self::$global_tpl_vars[$varname]->value;
+            } else {
+                return '';
+            } 
+        } else {
+            $_result = array();
+            foreach (self::$global_tpl_vars AS $key => $var) {
+                $_result[$key] = $var->value;
+            } 
+            return $_result;
+        } 
+    } 
+
+    /**
+    * Empty cache folder
+    * 
+    * @param integer $exp_time expiration time
+    * @param string $type resource type
+    * @return integer number of cache files deleted
+    */
+    function clearAllCache($exp_time = null, $type = null)
+    { 
+       // load cache resource and call clearAll
+        return $this->loadCacheResource($type)->clearAll($exp_time);
+    }        
+
+    /**
+    * Empty cache for a specific template
+    * 
+    * @param string $template_name template name
+    * @param string $cache_id cache id
+    * @param string $compile_id compile id
+    * @param integer $exp_time expiration time
+    * @param string $type resource type
+    * @return integer number of cache files deleted
+    */
+    function clearCache($template_name, $cache_id = null, $compile_id = null, $exp_time = null, $type = null)
+    { 
+       // load cache resource and call clear
+        return $this->loadCacheResource($type)->clear($template_name, $cache_id, $compile_id, $exp_time);
+    }
+
+    /**
+     * Loads security class and enables security
+     */
+    public function enableSecurity($security_class = null)
+    {
+    	if ($security_class instanceof Smarty_Security) {
+			$this->security_policy = $security_class;
+			return;
+		}
+    	if ($security_class == null) {
+    		$security_class = $this->security_class;
+    	}
+        if (class_exists($security_class)) {
+            $this->security_policy = new $security_class($this);
+        } else {
+            throw new SmartyException("Security class '$security_class' is not defined");
+        } 
+    } 
+
+    /**
+     * Disable security
+     */
+    public function disableSecurity()
+    {
+       $this->security_policy = null;
+    } 
+
+    /**
+    * Loads cache resource.
+    * 
+    * @param string $type cache resource type
+    * @return object of cache resource
+    */
+    public function loadCacheResource($type = null) {
+        if (!isset($type)) {
+            $type = $this->caching_type;
+        } 
+        if (in_array($type, $this->cache_resource_types)) {
+            $cache_resource_class = 'Smarty_Internal_CacheResource_' . ucfirst($type);
+            return new $cache_resource_class($this);
+        } 
+        else {
+            // try plugins dir
+            $cache_resource_class = 'Smarty_CacheResource_' . ucfirst($type);
+            if ($this->loadPlugin($cache_resource_class)) {
+                return new $cache_resource_class($this);
+            } 
+            else {
+                throw new SmartyException("Unable to load cache resource '{$type}'");
+            } 
+        } 
+    } 
+
+
+    /**
+     * Set template directory
+     * 
+     * @param string $ |array $template_dir folder(s) of template sorces
+     */
+    public function setTemplateDir($template_dir)
+    {
+        $this->template_dir = (array)$template_dir;
+        return;
+    } 
+
+    /**
+     * Adds template directory(s) to existing ones
+     * 
+     * @param string $ |array $template_dir folder(s) of template sources
+     */
+    public function addTemplateDir($template_dir)
+    {
+        $this->template_dir = array_unique(array_merge((array)$this->template_dir, (array)$template_dir));
+        return;
+    } 
+ 
+    /**
+     * Adds directory of plugin files
+     * 
+     * @param object $smarty 
+     * @param string $ |array $ plugins folder
+     * @return 
+     */
+    function addPluginsDir($plugins_dir)
+    {
+        $this->plugins_dir = array_unique(array_merge((array)$this->plugins_dir, (array)$plugins_dir));
+        return;
+    } 
+
+
+    /**
+     * return a reference to a registered object
+     * 
+     * @param string $name object name
+     * @return object 
+     */
+    function getRegisteredObject($name)
+    {
+        if (!isset($this->registered_objects[$name]))
+            throw new SmartyException("'$name' is not a registered object");
+
+        if (!is_object($this->registered_objects[$name][0]))
+            throw new SmartyException("registered '$name' is not an object");
+
+        return $this->registered_objects[$name][0];
+    } 
+
+
+    /**
+     * return name of debugging template
+     * 
+     * @return string 
+     */
+    function getDebugTemplate()
+    {
+        return $this->debug_tpl;
+    } 
+
+    /**
+     * set the debug template
+     * 
+     * @param string $tpl_name 
+     * @return bool 
+     */
+    function setDebugTemplate($tpl_name)
+    {
+        return $this->debug_tpl = $tpl_name;
+    } 
+
+    /**
+     * Takes unknown classes and loads plugin files for them
+     * class name format: Smarty_PluginType_PluginName
+     * plugin filename format: plugintype.pluginname.php
+     * 
+     * @param string $plugin_name class plugin name to load
+     * @return string |boolean filepath of loaded file or false
+     */
+    public function loadPlugin($plugin_name, $check = true)
+    { 
+        // if function or class exists, exit silently (already loaded)
+        if ($check && (is_callable($plugin_name) || class_exists($plugin_name, false)))
+            return true; 
+        // Plugin name is expected to be: Smarty_[Type]_[Name]
+        $_plugin_name = strtolower($plugin_name);
+        $_name_parts = explode('_', $_plugin_name, 3); 
+        // class name must have three parts to be valid plugin
+        if (count($_name_parts) < 3 || $_name_parts[0] !== 'smarty') {
+            throw new SmartyException("plugin {$plugin_name} is not a valid name format");
+            return false;
+        } 
+        // if type is "internal", get plugin from sysplugins
+        if ($_name_parts[1] == 'internal') {
+            $file = SMARTY_SYSPLUGINS_DIR . $_plugin_name . '.php';
+            if (file_exists($file)) {
+                require_once($file);
+                return $file;
+            } else {
+                return false;
+            } 
+        } 
+        // plugin filename is expected to be: [type].[name].php
+        $_plugin_filename = "{$_name_parts[1]}.{$_name_parts[2]}.php"; 
+        // loop through plugin dirs and find the plugin
+        foreach((array)$this->plugins_dir as $_plugin_dir) {
+            if (strpos('/\\', substr($_plugin_dir, -1)) === false) {
+                $_plugin_dir .= DS;
+            } 
+            $file = $_plugin_dir . $_plugin_filename;
+            if (file_exists($file)) {
+                require_once($file);
+                return $file;
+            } 
+        } 
+        // no plugin loaded
+        return false;
+    } 
+
+    /**
+    * clean up properties on cloned object
+     */
+    public function __clone()
+    {
+    	// clear config vars
+    	$this->config_vars = array(); 
+    	// clear assigned tpl vars
+    	$this->tpl_vars = array();
+    	// clear objects for external methods
+    	unset($this->register);  
+    	unset($this->filter);  
+	}
+
+
+    /**
+     * Handle unknown class methods
+	 *
+     * @param string $name unknown methode name
+     * @param array $args aurgument array
+     */
+    public function __call($name, $args)
+    {
+        static $camel_func;
+        if (!isset($camel_func))
+            $camel_func = create_function('$c', 'return "_" . strtolower($c[1]);'); 
+        // see if this is a set/get for a property
+        $first3 = strtolower(substr($name, 0, 3));
+        if (in_array($first3, array('set', 'get')) && substr($name, 3, 1) !== '_') {
+            // try to keep case correct for future PHP 6.0 case-sensitive class methods
+            // lcfirst() not available < PHP 5.3.0, so improvise
+            $property_name = strtolower(substr($name, 3, 1)) . substr($name, 4); 
+            // convert camel case to underscored name
+            $property_name = preg_replace_callback('/([A-Z])/', $camel_func, $property_name);
+            if (!property_exists($this, $property_name)) {
+                throw new SmartyException("property '$property_name' does not exist.");
+                return false;
+            } 
+            if ($first3 == 'get')
+                return $this->$property_name;
+            else
+                return $this->$property_name = $args[0];
+        }
+       // Smarty Backward Compatible wrapper
+		if (strpos($name,'_') !== false) {
+        	if (!isset($this->wrapper)) {
+           	 $this->wrapper = new Smarty_Internal_Wrapper($this);
+        	} 
+        	return $this->wrapper->convert($name, $args);
+        }
+        // external Smarty methods ?
+        foreach(array('filter','register') as $external) {  
+        	if (method_exists("Smarty_Internal_{$external}",$name)) {
+        		if (!isset($this->$external)) {
+        			$class = "Smarty_Internal_{$external}";
+            		$this->$external = new $class($this);
+        		} 
+        		return call_user_func_array(array($this->$external,$name), $args);
+			}
+		}
+		if (in_array($name,array('clearCompiledTemplate','compileAllTemplates','compileAllConfig','testInstall','getTags'))) {
+       		if (!isset($this->utility)) {
+            	$this->utility = new Smarty_Internal_Utility($this);
+        	} 
+        	return call_user_func_array(array($this->utility,$name), $args);
+		}
+         // PHP4 call to constructor?
+        if (strtolower($name) == 'smarty') {
+            throw new SmartyException('Please use parent::__construct() to call parent constuctor');
+            return false;
+        } 
+        throw new SmartyException("Call of unknown function '$name'.");
+   } 
+} 
+
+/**
+ * Autoloader
+ */
+function smartyAutoload($class)
+{
+    $_class = strtolower($class);
+    if (substr($_class, 0, 16) === 'smarty_internal_' || $_class == 'smarty_security') {
+        include SMARTY_SYSPLUGINS_DIR . $_class . '.php';
+    } 
+} 
+
+/**
+ * Smarty exception class
+ */
+Class SmartyException extends Exception {
+}
+
+/**
+ * Smarty compiler exception class
+ */
+Class SmartyCompilerException extends SmartyException  {
+}
+
+?>
diff --git a/onyx2/modules/templates/smarty/debug.tpl b/onyx2/modules/templates/smarty/debug.tpl
new file mode 100644
index 0000000..058c5b2
--- /dev/null
+++ b/onyx2/modules/templates/smarty/debug.tpl
@@ -0,0 +1,133 @@
+{capture name='_smarty_debug' assign=debug_output}
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+    <title>Smarty Debug Console</title>
+<style type="text/css">
+{literal}
+body, h1, h2, td, th, p {
+    font-family: sans-serif;
+    font-weight: normal;
+    font-size: 0.9em;
+    margin: 1px;
+    padding: 0;
+}
+
+h1 {
+    margin: 0;
+    text-align: left;
+    padding: 2px;
+    background-color: #f0c040;
+    color:  black;
+    font-weight: bold;
+    font-size: 1.2em;
+ }
+
+h2 {
+    background-color: #9B410E;
+    color: white;
+    text-align: left;
+    font-weight: bold;
+    padding: 2px;
+    border-top: 1px solid black;
+}
+
+body {
+    background: black; 
+}
+
+p, table, div {
+    background: #f0ead8;
+} 
+
+p {
+    margin: 0;
+    font-style: italic;
+    text-align: center;
+}
+
+table {
+    width: 100%;
+}
+
+th, td {
+    font-family: monospace;
+    vertical-align: top;
+    text-align: left;
+    width: 50%;
+}
+
+td {
+    color: green;
+}
+
+.odd {
+    background-color: #eeeeee;
+}
+
+.even {
+    background-color: #fafafa;
+}
+
+.exectime {
+    font-size: 0.8em;
+    font-style: italic;
+}
+
+#table_assigned_vars th {
+    color: blue;
+}
+
+#table_config_vars th {
+    color: maroon;
+}
+{/literal}
+</style>
+</head>
+<body>
+
+<h1>Smarty Debug Console  -  {if isset($template_name)}{$template_name|debug_print_var}{else}Total Time {$execution_time|string_format:"%.5f"}{/if}</h1>
+
+{if !empty($template_data)}
+<h2>included templates &amp; config files (load time in seconds)</h2>
+
+<div>
+{foreach $template_data as $template}
+  <font color=brown>{$template.name}</font>
+  <span class="exectime">
+   (compile {$template['compile_time']|string_format:"%.5f"}) (render {$template['render_time']|string_format:"%.5f"}) (cache {$template['cache_time']|string_format:"%.5f"})
+  </span>
+  <br>
+{/foreach}
+</div>
+{/if}
+
+<h2>assigned template variables</h2>
+
+<table id="table_assigned_vars">
+    {foreach $assigned_vars as $vars}
+       <tr class="{if $vars@iteration % 2 eq 0}odd{else}even{/if}">   
+       <th>${$vars@key|escape:'html'}</th>
+       <td>{$vars|debug_print_var}</td></tr>
+    {/foreach}
+</table>
+
+<h2>assigned config file variables (outer template scope)</h2>
+
+<table id="table_config_vars">
+    {foreach $config_vars as $vars}
+       <tr class="{if $vars@iteration % 2 eq 0}odd{else}even{/if}">   
+       <th>{$vars@key|escape:'html'}</th>
+       <td>{$vars|debug_print_var}</td></tr>
+    {/foreach}
+
+</table>
+</body>
+</html>
+{/capture}
+<script type="text/javascript">
+{$id = $template_name|default:''|md5}
+    _smarty_console = window.open("","console{$id}","width=680,height=600,resizable,scrollbars=yes");
+    _smarty_console.document.write("{$debug_output|escape:'javascript'}");
+    _smarty_console.document.close();
+</script>
diff --git a/onyx2/modules/templates/smarty/plugins/block.php.php b/onyx2/modules/templates/smarty/plugins/block.php.php
new file mode 100644
index 0000000..8fedd8b
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/block.php.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Smarty plugin to execute PHP code
+ * 
+ * @package Smarty
+ * @subpackage PluginsBlock
+ * @author Uwe Tews 
+ */
+
+/**
+ * Smarty {php}{/php} block plugin
+ * 
+ * @param string $content contents of the block
+ * @param object $template template object
+ * @param boolean $ &$repeat repeat flag
+ * @return string content re-formatted
+ */
+function smarty_block_php($params, $content, $template, &$repeat)
+{ 
+    if (!$template->allow_php_tag) {
+        throw new SmartyException("{php} is deprecated, set allow_php_tag = true to enable");
+    } 
+    eval($content);
+    return '';
+}
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/plugins/block.textformat.php b/onyx2/modules/templates/smarty/plugins/block.textformat.php
new file mode 100644
index 0000000..517fd62
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/block.textformat.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * Smarty plugin to format text blocks
+ *
+ * @package Smarty
+ * @subpackage PluginsBlock
+ */
+
+/**
+ * Smarty {textformat}{/textformat} block plugin
+ * 
+ * Type:     block function<br>
+ * Name:     textformat<br>
+ * Purpose:  format text a certain way with preset styles
+ *            or custom wrap/indent settings<br>
+ * 
+ * @link http://smarty.php.net/manual/en/language.function.textformat.php {textformat}
+ *       (Smarty online manual)
+ * @param array $params parameters
+ * <pre>
+ * Params:   style: string (email)
+ *            indent: integer (0)
+ *            wrap: integer (80)
+ *            wrap_char string ("\n")
+ *            indent_char: string (" ")
+ *            wrap_boundary: boolean (true)
+ * </pre>
+ * @author Monte Ohrt <monte at ohrt dot com> 
+ * @param string $content contents of the block
+ * @param object $template template object
+ * @param boolean &$repeat repeat flag
+ * @return string content re-formatted
+ */
+function smarty_block_textformat($params, $content, $template, &$repeat)
+{
+    if (is_null($content)) {
+        return;
+    } 
+
+    $style = null;
+    $indent = 0;
+    $indent_first = 0;
+    $indent_char = ' ';
+    $wrap = 80;
+    $wrap_char = "\n";
+    $wrap_cut = false;
+    $assign = null;
+
+    foreach ($params as $_key => $_val) {
+        switch ($_key) {
+            case 'style':
+            case 'indent_char':
+            case 'wrap_char':
+            case 'assign':
+                $$_key = (string)$_val;
+                break;
+
+            case 'indent':
+            case 'indent_first':
+            case 'wrap':
+                $$_key = (int)$_val;
+                break;
+
+            case 'wrap_cut':
+                $$_key = (bool)$_val;
+                break;
+
+            default:
+                trigger_error("textformat: unknown attribute '$_key'");
+        } 
+    } 
+
+    if ($style == 'email') {
+        $wrap = 72;
+    } 
+    // split into paragraphs
+    $_paragraphs = preg_split('![\r\n][\r\n]!', $content);
+    $_output = '';
+
+    for($_x = 0, $_y = count($_paragraphs); $_x < $_y; $_x++) {
+        if ($_paragraphs[$_x] == '') {
+            continue;
+        } 
+        // convert mult. spaces & special chars to single space
+        $_paragraphs[$_x] = preg_replace(array('!\s+!', '!(^\s+)|(\s+$)!'), array(' ', ''), $_paragraphs[$_x]); 
+        // indent first line
+        if ($indent_first > 0) {
+            $_paragraphs[$_x] = str_repeat($indent_char, $indent_first) . $_paragraphs[$_x];
+        } 
+        // wordwrap sentences
+        $_paragraphs[$_x] = wordwrap($_paragraphs[$_x], $wrap - $indent, $wrap_char, $wrap_cut); 
+        // indent lines
+        if ($indent > 0) {
+            $_paragraphs[$_x] = preg_replace('!^!m', str_repeat($indent_char, $indent), $_paragraphs[$_x]);
+        } 
+    } 
+    $_output = implode($wrap_char . $wrap_char, $_paragraphs);
+    
+    return $assign ? $template->assign($assign, $_output) : $_output;
+} 
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/plugins/function.counter.php b/onyx2/modules/templates/smarty/plugins/function.counter.php
new file mode 100644
index 0000000..7c50bd4
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/function.counter.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Smarty plugin
+ * @package Smarty
+ * @subpackage PluginsFunction
+ */
+
+/**
+ * Smarty {counter} function plugin
+ *
+ * Type:     function<br>
+ * Name:     counter<br>
+ * Purpose:  print out a counter value
+ * @author Monte Ohrt <monte at ohrt dot com>
+ * @link http://smarty.php.net/manual/en/language.function.counter.php {counter}
+ *       (Smarty online manual)
+ * @param array parameters
+ * @param Smarty
+ * @param object $template template object
+ * @return string|null
+ */
+function smarty_function_counter($params, $template)
+{
+    static $counters = array();
+
+    $name = (isset($params['name'])) ? $params['name'] : 'default';
+    if (!isset($counters[$name])) {
+        $counters[$name] = array(
+            'start'=>1,
+            'skip'=>1,
+            'direction'=>'up',
+            'count'=>1
+            );
+    }
+    $counter =& $counters[$name];
+
+    if (isset($params['start'])) {
+        $counter['start'] = $counter['count'] = (int)$params['start'];
+    }
+
+    if (!empty($params['assign'])) {
+        $counter['assign'] = $params['assign'];
+    }
+
+    if (isset($counter['assign'])) {
+        $template->assign($counter['assign'], $counter['count']);
+    }
+    
+    if (isset($params['print'])) {
+        $print = (bool)$params['print'];
+    } else {
+        $print = empty($counter['assign']);
+    }
+
+    if ($print) {
+        $retval = $counter['count'];
+    } else {
+        $retval = null;
+    }
+
+    if (isset($params['skip'])) {
+        $counter['skip'] = $params['skip'];
+    }
+    
+    if (isset($params['direction'])) {
+        $counter['direction'] = $params['direction'];
+    }
+
+    if ($counter['direction'] == "down")
+        $counter['count'] -= $counter['skip'];
+    else
+        $counter['count'] += $counter['skip'];
+    
+    return $retval;
+    
+}
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/plugins/function.cycle.php b/onyx2/modules/templates/smarty/plugins/function.cycle.php
new file mode 100644
index 0000000..98e3e28
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/function.cycle.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package Smarty
+ * @subpackage PluginsFunction
+ */
+
+/**
+ * Smarty {cycle} function plugin
+ *
+ * Type:     function<br>
+ * Name:     cycle<br>
+ * Date:     May 3, 2002<br>
+ * Purpose:  cycle through given values<br>
+ * Input:
+ *         - name = name of cycle (optional)
+ *         - values = comma separated list of values to cycle,
+ *                    or an array of values to cycle
+ *                    (this can be left out for subsequent calls)
+ *         - reset = boolean - resets given var to true
+ *         - print = boolean - print var or not. default is true
+ *         - advance = boolean - whether or not to advance the cycle
+ *         - delimiter = the value delimiter, default is ","
+ *         - assign = boolean, assigns to template var instead of
+ *                    printed.
+ *
+ * Examples:<br>
+ * <pre>
+ * {cycle values="#eeeeee,#d0d0d0d"}
+ * {cycle name=row values="one,two,three" reset=true}
+ * {cycle name=row}
+ * </pre>
+ * @link http://smarty.php.net/manual/en/language.function.cycle.php {cycle}
+ *       (Smarty online manual)
+ * @author Monte Ohrt <monte at ohrt dot com>
+ * @author credit to Mark Priatel <mpriatel@rogers.com>
+ * @author credit to Gerard <gerard@interfold.com>
+ * @author credit to Jason Sweat <jsweat_php@yahoo.com>
+ * @version  1.3
+ * @param array
+ * @param object $template template object
+ * @return string|null
+ */
+
+function smarty_function_cycle($params, $template)
+{
+    static $cycle_vars;
+    
+    $name = (empty($params['name'])) ? 'default' : $params['name'];
+    $print = (isset($params['print'])) ? (bool)$params['print'] : true;
+    $advance = (isset($params['advance'])) ? (bool)$params['advance'] : true;
+    $reset = (isset($params['reset'])) ? (bool)$params['reset'] : false;
+            
+    if (!in_array('values', array_keys($params))) {
+        if(!isset($cycle_vars[$name]['values'])) {
+            trigger_error("cycle: missing 'values' parameter");
+            return;
+        }
+    } else {
+        if(isset($cycle_vars[$name]['values'])
+            && $cycle_vars[$name]['values'] != $params['values'] ) {
+            $cycle_vars[$name]['index'] = 0;
+        }
+        $cycle_vars[$name]['values'] = $params['values'];
+    }
+
+    if (isset($params['delimiter'])) {
+        $cycle_vars[$name]['delimiter'] = $params['delimiter'];
+    } elseif (!isset($cycle_vars[$name]['delimiter'])) {
+        $cycle_vars[$name]['delimiter'] = ',';       
+    }
+    
+    if(is_array($cycle_vars[$name]['values'])) {
+        $cycle_array = $cycle_vars[$name]['values'];
+    } else {
+        $cycle_array = explode($cycle_vars[$name]['delimiter'],$cycle_vars[$name]['values']);
+    }
+    
+    if(!isset($cycle_vars[$name]['index']) || $reset ) {
+        $cycle_vars[$name]['index'] = 0;
+    }
+    
+    if (isset($params['assign'])) {
+        $print = false;
+        $template->assign($params['assign'], $cycle_array[$cycle_vars[$name]['index']]);
+    }
+        
+    if($print) {
+        $retval = $cycle_array[$cycle_vars[$name]['index']];
+    } else {
+        $retval = null;
+    }
+
+    if($advance) {
+        if ( $cycle_vars[$name]['index'] >= count($cycle_array) -1 ) {
+            $cycle_vars[$name]['index'] = 0;
+        } else {
+            $cycle_vars[$name]['index']++;
+        }
+    }
+    
+    return $retval;
+}
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/plugins/function.fetch.php b/onyx2/modules/templates/smarty/plugins/function.fetch.php
new file mode 100644
index 0000000..2b09fb9
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/function.fetch.php
@@ -0,0 +1,216 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package Smarty
+ * @subpackage PluginsFunction
+ */
+
+/**
+ * Smarty {fetch} plugin
+ *
+ * Type:     function<br>
+ * Name:     fetch<br>
+ * Purpose:  fetch file, web or ftp data and display results
+ * @link http://smarty.php.net/manual/en/language.function.fetch.php {fetch}
+ *       (Smarty online manual)
+ * @author Monte Ohrt <monte at ohrt dot com>
+ * @param array $params parameters
+ * @param object $template template object
+ * @return string|null if the assign parameter is passed, Smarty assigns the
+ *                     result to a template variable
+ */
+function smarty_function_fetch($params, $template)
+{
+    if (empty($params['file'])) {
+        trigger_error("[plugin] fetch parameter 'file' cannot be empty",E_USER_NOTICE);
+        return;
+    }
+
+    $content = '';
+    if (isset($template->security_policy) && !preg_match('!^(http|ftp)://!i', $params['file'])) {
+        if(!$template->security_policy->isTrustedResourceDir($params['file'])) {
+            return;
+        }
+        
+        // fetch the file
+        if($fp = @fopen($params['file'],'r')) {
+            while(!feof($fp)) {
+                $content .= fgets ($fp,4096);
+            }
+            fclose($fp);
+        } else {
+            trigger_error('[plugin] fetch cannot read file \'' . $params['file'] . '\'',E_USER_NOTICE);
+            return;
+        }
+    } else {
+        // not a local file
+        if(preg_match('!^http://!i',$params['file'])) {
+            // http fetch
+            if($uri_parts = parse_url($params['file'])) {
+                // set defaults
+                $host = $server_name = $uri_parts['host'];
+                $timeout = 30;
+                $accept = "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*";
+                $agent = "Smarty Template Engine ".$template->_version;
+                $referer = "";
+                $uri = !empty($uri_parts['path']) ? $uri_parts['path'] : '/';
+                $uri .= !empty($uri_parts['query']) ? '?' . $uri_parts['query'] : '';
+                $_is_proxy = false;
+                if(empty($uri_parts['port'])) {
+                    $port = 80;
+                } else {
+                    $port = $uri_parts['port'];
+                }
+                if(!empty($uri_parts['user'])) {
+                    $user = $uri_parts['user'];
+                }
+                if(!empty($uri_parts['pass'])) {
+                    $pass = $uri_parts['pass'];
+                }
+                // loop through parameters, setup headers
+                foreach($params as $param_key => $param_value) {
+                    switch($param_key) {
+                        case "file":
+                        case "assign":
+                        case "assign_headers":
+                            break;
+                        case "user":
+                            if(!empty($param_value)) {
+                                $user = $param_value;
+                            }
+                            break;
+                        case "pass":
+                            if(!empty($param_value)) {
+                                $pass = $param_value;
+                            }
+                            break;
+                        case "accept":
+                            if(!empty($param_value)) {
+                                $accept = $param_value;
+                            }
+                            break;
+                        case "header":
+                            if(!empty($param_value)) {
+                                if(!preg_match('![\w\d-]+: .+!',$param_value)) {
+                                    trigger_error("[plugin] invalid header format '".$param_value."'",E_USER_NOTICE);
+                                    return;
+                                } else {
+                                    $extra_headers[] = $param_value;
+                                }
+                            }
+                            break;
+                        case "proxy_host":
+                            if(!empty($param_value)) {
+                                $proxy_host = $param_value;
+                            }
+                            break;
+                        case "proxy_port":
+                            if(!preg_match('!\D!', $param_value)) {
+                                $proxy_port = (int) $param_value;
+                            } else {
+                                trigger_error("[plugin] invalid value for attribute '".$param_key."'",E_USER_NOTICE);
+                                return;
+                            }
+                            break;
+                        case "agent":
+                            if(!empty($param_value)) {
+                                $agent = $param_value;
+                            }
+                            break;
+                        case "referer":
+                            if(!empty($param_value)) {
+                                $referer = $param_value;
+                            }
+                            break;
+                        case "timeout":
+                            if(!preg_match('!\D!', $param_value)) {
+                                $timeout = (int) $param_value;
+                            } else {
+                                trigger_error("[plugin] invalid value for attribute '".$param_key."'",E_USER_NOTICE);
+                                return;
+                            }
+                            break;
+                        default:
+                            trigger_error("[plugin] unrecognized attribute '".$param_key."'",E_USER_NOTICE);
+                            return;
+                    }
+                }
+                if(!empty($proxy_host) && !empty($proxy_port)) {
+                    $_is_proxy = true;
+                    $fp = fsockopen($proxy_host,$proxy_port,$errno,$errstr,$timeout);
+                } else {
+                    $fp = fsockopen($server_name,$port,$errno,$errstr,$timeout);
+                }
+
+                if(!$fp) {
+                    trigger_error("[plugin] unable to fetch: $errstr ($errno)",E_USER_NOTICE);
+                    return;
+                } else {
+                    if($_is_proxy) {
+                        fputs($fp, 'GET ' . $params['file'] . " HTTP/1.0\r\n");
+                    } else {
+                        fputs($fp, "GET $uri HTTP/1.0\r\n");
+                    }
+                    if(!empty($host)) {
+                        fputs($fp, "Host: $host\r\n");
+                    }
+                    if(!empty($accept)) {
+                        fputs($fp, "Accept: $accept\r\n");
+                    }
+                    if(!empty($agent)) {
+                        fputs($fp, "User-Agent: $agent\r\n");
+                    }
+                    if(!empty($referer)) {
+                        fputs($fp, "Referer: $referer\r\n");
+                    }
+                    if(isset($extra_headers) && is_array($extra_headers)) {
+                        foreach($extra_headers as $curr_header) {
+                            fputs($fp, $curr_header."\r\n");
+                        }
+                    }
+                    if(!empty($user) && !empty($pass)) {
+                        fputs($fp, "Authorization: BASIC ".base64_encode("$user:$pass")."\r\n");
+                    }
+
+                    fputs($fp, "\r\n");
+                    while(!feof($fp)) {
+                        $content .= fgets($fp,4096);
+                    }
+                    fclose($fp);
+                    $csplit = preg_split("!\r\n\r\n!",$content,2);
+
+                    $content = $csplit[1];
+
+                    if(!empty($params['assign_headers'])) {
+                        $template->assign($params['assign_headers'],preg_split("!\r\n!",$csplit[0]));
+                    }
+                }
+            } else {
+                trigger_error("[plugin fetch] unable to parse URL, check syntax",E_USER_NOTICE);
+                return;
+            }
+        } else {
+            // ftp fetch
+            if($fp = @fopen($params['file'],'r')) {
+                while(!feof($fp)) {
+                    $content .= fgets ($fp,4096);
+                }
+                fclose($fp);
+            } else {
+                trigger_error('[plugin] fetch cannot read file \'' . $params['file'] .'\'',E_USER_NOTICE);
+                return;
+            }
+        }
+
+    }
+
+
+    if (!empty($params['assign'])) {
+        $template->assign($params['assign'],$content);
+    } else {
+        return $content;
+    }
+}
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/plugins/function.html_checkboxes.php b/onyx2/modules/templates/smarty/plugins/function.html_checkboxes.php
new file mode 100644
index 0000000..6a1a3ff
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/function.html_checkboxes.php
@@ -0,0 +1,143 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package Smarty
+ * @subpackage PluginsFunction
+ */
+
+/**
+ * Smarty {html_checkboxes} function plugin
+ *
+ * File:       function.html_checkboxes.php<br>
+ * Type:       function<br>
+ * Name:       html_checkboxes<br>
+ * Date:       24.Feb.2003<br>
+ * Purpose:    Prints out a list of checkbox input types<br>
+ * Examples:
+ * <pre>
+ * {html_checkboxes values=$ids output=$names}
+ * {html_checkboxes values=$ids name='box' separator='<br>' output=$names}
+ * {html_checkboxes values=$ids checked=$checked separator='<br>' output=$names}
+ * </pre>
+ * @link http://smarty.php.net/manual/en/language.function.html.checkboxes.php {html_checkboxes}
+ *      (Smarty online manual)
+ * @author     Christopher Kvarme <christopher.kvarme@flashjab.com>
+ * @author credits to Monte Ohrt <monte at ohrt dot com>
+ * @version    1.0
+ * @param array $params parameters
+ * Input:<br>
+ *           - name       (optional) - string default "checkbox"
+ *           - values     (required) - array
+ *           - options    (optional) - associative array
+ *           - checked    (optional) - array default not set
+ *           - separator  (optional) - ie <br> or &nbsp;
+ *           - output     (optional) - the output next to each checkbox
+ *           - assign     (optional) - assign the output as an array to this variable
+ * @param object $template template object
+ * @return string
+ * @uses smarty_function_escape_special_chars()
+ */
+function smarty_function_html_checkboxes($params, $template)
+{
+    require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
+
+    $name = 'checkbox';
+    $values = null;
+    $options = null;
+    $selected = null;
+    $separator = '';
+    $labels = true;
+    $output = null;
+
+    $extra = '';
+
+    foreach($params as $_key => $_val) {
+        switch($_key) {
+            case 'name':
+            case 'separator':
+                $$_key = $_val;
+                break;
+
+            case 'labels':
+                $$_key = (bool)$_val;
+                break;
+
+            case 'options':
+                $$_key = (array)$_val;
+                break;
+
+            case 'values':
+            case 'output':
+                $$_key = array_values((array)$_val);
+                break;
+
+            case 'checked':
+            case 'selected':
+                $selected = array_map('strval', array_values((array)$_val));
+                break;
+
+            case 'checkboxes':
+                trigger_error('html_checkboxes: the use of the "checkboxes" attribute is deprecated, use "options" instead', E_USER_WARNING);
+                $options = (array)$_val;
+                break;
+
+            case 'assign':
+                break;
+
+            default:
+                if(!is_array($_val)) {
+                    $extra .= ' '.$_key.'="'.smarty_function_escape_special_chars($_val).'"';
+                } else {
+                    trigger_error("html_checkboxes: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
+                }
+                break;
+        }
+    }
+
+    if (!isset($options) && !isset($values))
+        return ''; /* raise error here? */
+
+    settype($selected, 'array');
+    $_html_result = array();
+
+    if (isset($options)) {
+
+        foreach ($options as $_key=>$_val)
+            $_html_result[] = smarty_function_html_checkboxes_output($name, $_key, $_val, $selected, $extra, $separator, $labels);
+
+
+    } else {
+        foreach ($values as $_i=>$_key) {
+            $_val = isset($output[$_i]) ? $output[$_i] : '';
+            $_html_result[] = smarty_function_html_checkboxes_output($name, $_key, $_val, $selected, $extra, $separator, $labels);
+        }
+
+    }
+
+    if(!empty($params['assign'])) {
+        $template->assign($params['assign'], $_html_result);
+    } else {
+        return implode("\n",$_html_result);
+    }
+
+}
+
+function smarty_function_html_checkboxes_output($name, $value, $output, $selected, $extra, $separator, $labels) {
+    $_output = '';
+    if ($labels) $_output .= '<label>';
+    $_output .= '<input type="checkbox" name="'
+        . smarty_function_escape_special_chars($name) . '[]" value="'
+        . smarty_function_escape_special_chars($value) . '"';
+
+    if (in_array((string)$value, $selected)) {
+        $_output .= ' checked="checked"';
+    }
+    $_output .= $extra . ' />' . $output;
+    if ($labels) $_output .= '</label>';
+    $_output .=  $separator;
+
+    return $_output;
+}
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/plugins/function.html_image.php b/onyx2/modules/templates/smarty/plugins/function.html_image.php
new file mode 100644
index 0000000..abb7b57
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/function.html_image.php
@@ -0,0 +1,137 @@
+<?php
+/**
+ * Smarty plugin
+ * 
+ * @package Smarty
+ * @subpackage PluginsFunction
+ */
+
+/**
+ * Smarty {html_image} function plugin
+ * 
+ * Type:     function<br>
+ * Name:     html_image<br>
+ * Date:     Feb 24, 2003<br>
+ * Purpose:  format HTML tags for the image<br>
+ * Examples: {html_image file="/images/masthead.gif"}
+ * Output:   <img src="/images/masthead.gif" width=400 height=23>
+ * 
+ * @link http://smarty.php.net/manual/en/language.function.html.image.php {html_image}
+ *      (Smarty online manual)
+ * @author Monte Ohrt <monte at ohrt dot com> 
+ * @author credits to Duda <duda@big.hu> 
+ * @version 1.0
+ * @param array $params parameters
+ * Input:<br>
+ *          - file = file (and path) of image (required)
+ *          - height = image height (optional, default actual height)
+ *          - width = image width (optional, default actual width)
+ *          - basedir = base directory for absolute paths, default
+ *                      is environment variable DOCUMENT_ROOT
+ *          - path_prefix = prefix for path output (optional, default empty)
+ * @param object $template template object
+ * @return string 
+ * @uses smarty_function_escape_special_chars()
+ */
+function smarty_function_html_image($params, $template)
+{
+    require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
+ 
+    $alt = '';
+    $file = '';
+    $height = '';
+    $width = '';
+    $extra = '';
+    $prefix = '';
+    $suffix = '';
+    $path_prefix = '';
+    $server_vars = $_SERVER;
+    $basedir = isset($server_vars['DOCUMENT_ROOT']) ? $server_vars['DOCUMENT_ROOT'] : '';
+    foreach($params as $_key => $_val) {
+        switch ($_key) {
+            case 'file':
+            case 'height':
+            case 'width':
+            case 'dpi':
+            case 'path_prefix':
+            case 'basedir':
+                $$_key = $_val;
+                break;
+
+            case 'alt':
+                if (!is_array($_val)) {
+                    $$_key = smarty_function_escape_special_chars($_val);
+                } else {
+                    throw new SmartyException ("html_image: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
+                } 
+                break;
+
+            case 'link':
+            case 'href':
+                $prefix = '<a href="' . $_val . '">';
+                $suffix = '</a>';
+                break;
+
+            default:
+                if (!is_array($_val)) {
+                    $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
+                } else {
+                    throw new SmartyException ("html_image: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
+                } 
+                break;
+        } 
+    } 
+
+    if (empty($file)) {
+        trigger_error("html_image: missing 'file' parameter", E_USER_NOTICE);
+        return;
+    } 
+
+    if (substr($file, 0, 1) == '/') {
+        $_image_path = $basedir . $file;
+    } else {
+        $_image_path = $file;
+    } 
+
+    if (!isset($params['width']) || !isset($params['height'])) {
+        if (!$_image_data = @getimagesize($_image_path)) {
+            if (!file_exists($_image_path)) {
+                trigger_error("html_image: unable to find '$_image_path'", E_USER_NOTICE);
+                return;
+            } else if (!is_readable($_image_path)) {
+                trigger_error("html_image: unable to read '$_image_path'", E_USER_NOTICE);
+                return;
+            } else {
+                trigger_error("html_image: '$_image_path' is not a valid image file", E_USER_NOTICE);
+                return;
+            } 
+        } 
+        if (isset($template->security_policy)) {
+            if (!$template->security_policy->isTrustedResourceDir($_image_path)) {
+                return;
+            } 
+        } 
+
+        if (!isset($params['width'])) {
+            $width = $_image_data[0];
+        } 
+        if (!isset($params['height'])) {
+            $height = $_image_data[1];
+        } 
+    } 
+
+    if (isset($params['dpi'])) {
+        if (strstr($server_vars['HTTP_USER_AGENT'], 'Mac')) {
+            $dpi_default = 72;
+        } else {
+            $dpi_default = 96;
+        } 
+        $_resize = $dpi_default / $params['dpi'];
+        $width = round($width * $_resize);
+        $height = round($height * $_resize);
+    } 
+
+    return $prefix . '<img src="' . $path_prefix . $file . '" alt="' . $alt . '" width="' . $width . '" height="' . $height . '"' . $extra . ' />' . $suffix;
+} 
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/plugins/function.html_options.php b/onyx2/modules/templates/smarty/plugins/function.html_options.php
new file mode 100644
index 0000000..7ac0390
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/function.html_options.php
@@ -0,0 +1,133 @@
+<?php
+/**
+ * Smarty plugin
+ * 
+ * @package Smarty
+ * @subpackage PluginsFunction
+ */
+
+/**
+ * Smarty {html_options} function plugin
+ * 
+ * Type:     function<br>
+ * Name:     html_options<br>
+ * Purpose:  Prints the list of <option> tags generated from
+ *            the passed parameters
+ * 
+ * @link http://smarty.php.net/manual/en/language.function.html.options.php {html_image}
+ *      (Smarty online manual)
+ * @author Monte Ohrt <monte at ohrt dot com> 
+ * @param array $params parameters
+ * Input:<br>
+ *            - name       (optional) - string default "select"
+ *            - values     (required if no options supplied) - array
+ *            - options    (required if no values supplied) - associative array
+ *            - selected   (optional) - string default not set
+ *            - output     (required if not options supplied) - array
+ * @param object $template template object
+ * @return string 
+ * @uses smarty_function_escape_special_chars()
+ */
+function smarty_function_html_options($params, $template)
+{
+    require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
+
+    $name = null;
+    $values = null;
+    $options = null;
+    $selected = array();
+    $output = null;
+    $id = null;
+    $class = null;
+
+    $extra = '';
+    $options_extra = '';
+
+    foreach($params as $_key => $_val) {
+        switch ($_key) {
+            case 'name':
+            case 'class':
+            case 'id':
+                $$_key = (string)$_val;
+                break;
+
+            case 'options':
+                $$_key = (array)$_val;
+                break;
+
+            case 'values':
+            case 'output':
+                $$_key = array_values((array)$_val);
+                break;
+
+            case 'selected':
+                $$_key = array_map('strval', array_values((array)$_val));
+                break;
+
+            default:
+                if (!is_array($_val)) {
+                    $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
+                } else {
+                    trigger_error("html_options: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
+                } 
+                break;
+        } 
+    } 
+
+    if (!isset($options) && !isset($values))
+        return '';
+    /* raise error here? */
+
+    $_html_result = '';
+    $_idx = 0;
+
+    if (isset($options)) {
+        foreach ($options as $_key => $_val) {
+          $_html_result .= smarty_function_html_options_optoutput($_key, $_val, $selected, $id, $class, $_idx);
+        }
+    } else {
+        foreach ($values as $_i => $_key) {
+            $_val = isset($output[$_i]) ? $output[$_i] : '';
+            $_html_result .= smarty_function_html_options_optoutput($_key, $_val, $selected, $id, $class, $_idx);
+        } 
+    } 
+
+    if (!empty($name)) {
+        $_html_class = !empty($class) ? ' class="'.$class.'"' : '';
+        $_html_id = !empty($id) ? ' id="'.$id.'"' : '';
+        $_html_result = '<select name="' . $name . '"' . $_html_class . $_html_id . $extra . '>' . "\n" . $_html_result . '</select>' . "\n";
+    } 
+
+    return $_html_result;
+} 
+
+function smarty_function_html_options_optoutput($key, $value, $selected, $id, $class, &$idx)
+{
+    if (!is_array($value)) {
+        $_html_result = '<option value="' .
+        smarty_function_escape_special_chars($key) . '"';
+        if (in_array((string)$key, $selected))
+            $_html_result .= ' selected="selected"';
+        $_html_class = !empty($class) ? ' class="'.$class.' option"' : '';
+        $_html_id = !empty($id) ? ' id="'.$id.'-'.$idx.'"' : '';
+        $_html_result .= $_html_class . $_html_id . '>' . smarty_function_escape_special_chars($value) . '</option>' . "\n";
+        $idx++;
+    } else {
+        $_idx = 0;
+        $_html_result = smarty_function_html_options_optgroup($key, $value, $selected, $id.'-'.$idx, $class, $_idx);
+        $idx++;
+    }
+    return $_html_result;
+} 
+
+function smarty_function_html_options_optgroup($key, $values, $selected, $id, $class, &$idx)
+{
+    $optgroup_html = '<optgroup label="' . smarty_function_escape_special_chars($key) . '">' . "\n";
+    foreach ($values as $key => $value) {
+        $optgroup_html .= smarty_function_html_options_optoutput($key, $value, $selected, $id, $class, $idx);
+    } 
+    $optgroup_html .= "</optgroup>\n";
+    return $optgroup_html;
+} 
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/plugins/function.html_radios.php b/onyx2/modules/templates/smarty/plugins/function.html_radios.php
new file mode 100644
index 0000000..c6b27ed
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/function.html_radios.php
@@ -0,0 +1,154 @@
+<?php
+/**
+ * Smarty plugin
+ * 
+ * @package Smarty
+ * @subpackage PluginsFunction
+ */
+
+/**
+ * Smarty {html_radios} function plugin
+ * 
+ * File:       function.html_radios.php<br>
+ * Type:       function<br>
+ * Name:       html_radios<br>
+ * Date:       24.Feb.2003<br>
+ * Purpose:    Prints out a list of radio input types<br>
+ * Examples:
+ * <pre>
+ * {html_radios values=$ids output=$names}
+ * {html_radios values=$ids name='box' separator='<br>' output=$names}
+ * {html_radios values=$ids checked=$checked separator='<br>' output=$names}
+ * </pre>
+ * 
+ * @link http://smarty.php.net/manual/en/language.function.html.radios.php {html_radios}
+ *      (Smarty online manual)
+ * @author Christopher Kvarme <christopher.kvarme@flashjab.com> 
+ * @author credits to Monte Ohrt <monte at ohrt dot com> 
+ * @version 1.0
+ * @param array $params parameters
+ * Input:<br>
+ *            - name       (optional) - string default "radio"
+ *            - values     (required) - array
+ *            - options    (optional) - associative array
+ *            - checked    (optional) - array default not set
+ *            - separator  (optional) - ie <br> or &nbsp;
+ *            - output     (optional) - the output next to each radio button
+ *            - assign     (optional) - assign the output as an array to this variable
+ * @param object $template template object
+ * @return string 
+ * @uses smarty_function_escape_special_chars()
+ */
+function smarty_function_html_radios($params, $template)
+{
+    require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
+
+    $name = 'radio';
+    $values = null;
+    $options = null;
+    $selected = null;
+    $separator = '';
+    $labels = true;
+    $label_ids = false;
+    $output = null;
+    $extra = '';
+
+    foreach($params as $_key => $_val) {
+        switch ($_key) {
+            case 'name':
+            case 'separator':
+                $$_key = (string)$_val;
+                break;
+
+            case 'checked':
+            case 'selected':
+                if (is_array($_val)) {
+                    trigger_error('html_radios: the "' . $_key . '" attribute cannot be an array', E_USER_WARNING);
+                } else {
+                    $selected = (string)$_val;
+                } 
+                break;
+
+            case 'labels':
+            case 'label_ids':
+                $$_key = (bool)$_val;
+                break;
+
+            case 'options':
+                $$_key = (array)$_val;
+                break;
+
+            case 'values':
+            case 'output':
+                $$_key = array_values((array)$_val);
+                break;
+
+            case 'radios':
+                trigger_error('html_radios: the use of the "radios" attribute is deprecated, use "options" instead', E_USER_WARNING);
+                $options = (array)$_val;
+                break;
+
+            case 'assign':
+                break;
+
+            default:
+                if (!is_array($_val)) {
+                    $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
+                } else {
+                    trigger_error("html_radios: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
+                } 
+                break;
+        } 
+    } 
+
+    if (!isset($options) && !isset($values))
+        return '';
+    /* raise error here? */
+
+    $_html_result = array();
+
+    if (isset($options)) {
+        foreach ($options as $_key => $_val)
+        $_html_result[] = smarty_function_html_radios_output($name, $_key, $_val, $selected, $extra, $separator, $labels, $label_ids);
+    } else {
+        foreach ($values as $_i => $_key) {
+            $_val = isset($output[$_i]) ? $output[$_i] : '';
+            $_html_result[] = smarty_function_html_radios_output($name, $_key, $_val, $selected, $extra, $separator, $labels, $label_ids);
+        } 
+    } 
+
+    if (!empty($params['assign'])) {
+        $template->assign($params['assign'], $_html_result);
+    } else {
+        return implode("\n", $_html_result);
+    } 
+} 
+
+function smarty_function_html_radios_output($name, $value, $output, $selected, $extra, $separator, $labels, $label_ids)
+{
+    $_output = '';
+    if ($labels) {
+        if ($label_ids) {
+            $_id = smarty_function_escape_special_chars(preg_replace('![^\w\-\.]!', '_', $name . '_' . $value));
+            $_output .= '<label for="' . $_id . '">';
+        } else {
+            $_output .= '<label>';
+        } 
+    } 
+    $_output .= '<input type="radio" name="'
+     . smarty_function_escape_special_chars($name) . '" value="'
+     . smarty_function_escape_special_chars($value) . '"';
+
+    if ($labels && $label_ids) $_output .= ' id="' . $_id . '"';
+
+    if ((string)$value == $selected) {
+        $_output .= ' checked="checked"';
+    } 
+    $_output .= $extra . ' />' . $output;
+    if ($labels) $_output .= '</label>';
+    $_output .= $separator;
+
+    return $_output;
+} 
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/plugins/function.html_select_date.php b/onyx2/modules/templates/smarty/plugins/function.html_select_date.php
new file mode 100644
index 0000000..1d57fdc
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/function.html_select_date.php
@@ -0,0 +1,330 @@
+<?php
+/**
+ * Smarty plugin
+ * 
+ * @package Smarty
+ * @subpackage PluginsFunction
+ */
+
+/**
+ * Smarty {html_select_date} plugin
+ * 
+ * Type:     function<br>
+ * Name:     html_select_date<br>
+ * Purpose:  Prints the dropdowns for date selection.
+ * 
+ * ChangeLog:<br>
+ *            - 1.0 initial release
+ *            - 1.1 added support for +/- N syntax for begin
+ *                 and end year values. (Monte)
+ *            - 1.2 added support for yyyy-mm-dd syntax for
+ *                 time value. (Jan Rosier)
+ *            - 1.3 added support for choosing format for
+ *                 month values (Gary Loescher)
+ *            - 1.3.1 added support for choosing format for
+ *                 day values (Marcus Bointon)
+ *            - 1.3.2 support negative timestamps, force year
+ *              dropdown to include given date unless explicitly set (Monte)
+ *            - 1.3.4 fix behaviour of 0000-00-00 00:00:00 dates to match that
+ *              of 0000-00-00 dates (cybot, boots)
+ * 
+ * @link http://smarty.php.net/manual/en/language.function.html.select.date.php {html_select_date}
+ *      (Smarty online manual)
+ * @version 1.3.4
+ * @author Andrei Zmievski 
+ * @author Monte Ohrt <monte at ohrt dot com> 
+ * @param array $params parameters
+ * @param object $template template object
+ * @return string 
+ */
+function smarty_function_html_select_date($params, $template)
+{
+    require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
+    require_once(SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php');
+    require_once(SMARTY_PLUGINS_DIR . 'function.html_options.php');
+
+    /* Default values. */
+    $prefix = "Date_";
+    $start_year = strftime("%Y");
+    $end_year = $start_year;
+    $display_days = true;
+    $display_months = true;
+    $display_years = true;
+    $month_format = "%B";
+    /* Write months as numbers by default  GL */
+    $month_value_format = "%m";
+    $day_format = "%02d";
+    /* Write day values using this format MB */
+    $day_value_format = "%d";
+    $year_as_text = false;
+    /* Display years in reverse order? Ie. 2000,1999,.... */
+    $reverse_years = false;
+    /* Should the select boxes be part of an array when returned from PHP?
+       e.g. setting it to "birthday", would create "birthday[Day]",
+       "birthday[Month]" & "birthday[Year]". Can be combined with prefix */
+    $field_array = null;
+    /* <select size>'s of the different <select> tags.
+       If not set, uses default dropdown. */
+    $day_size = null;
+    $month_size = null;
+    $year_size = null;
+    /* Unparsed attributes common to *ALL* the <select>/<input> tags.
+       An example might be in the template: all_extra ='class ="foo"'. */
+    $all_extra = null;
+    /* Separate attributes for the tags. */
+    $day_extra = null;
+    $month_extra = null;
+    $year_extra = null;
+    /* Order in which to display the fields.
+       "D" -> day, "M" -> month, "Y" -> year. */
+    $field_order = 'MDY';
+    /* String printed between the different fields. */
+    $field_separator = "\n";
+    $time = time();
+    $all_empty = null;
+    $day_empty = null;
+    $month_empty = null;
+    $year_empty = null;
+    $extra_attrs = '';
+
+    foreach ($params as $_key => $_value) {
+        switch ($_key) {
+            case 'prefix':
+            case 'time':
+            case 'start_year':
+            case 'end_year':
+            case 'month_format':
+            case 'day_format':
+            case 'day_value_format':
+            case 'field_array':
+            case 'day_size':
+            case 'month_size':
+            case 'year_size':
+            case 'all_extra':
+            case 'day_extra':
+            case 'month_extra':
+            case 'year_extra':
+            case 'field_order':
+            case 'field_separator':
+            case 'month_value_format':
+            case 'month_empty':
+            case 'day_empty':
+            case 'year_empty':
+                $$_key = (string)$_value;
+                break;
+
+            case 'all_empty':
+                $$_key = (string)$_value;
+                $day_empty = $month_empty = $year_empty = $all_empty;
+                break;
+
+            case 'display_days':
+            case 'display_months':
+            case 'display_years':
+            case 'year_as_text':
+            case 'reverse_years':
+                $$_key = (bool)$_value;
+                break;
+
+            default:
+                if (!is_array($_value)) {
+                    $extra_attrs .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_value) . '"';
+                } else {
+                    trigger_error("html_select_date: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
+                } 
+                break;
+        } 
+    } 
+
+    if (preg_match('!^-\d+$!', $time)) {
+        // negative timestamp, use date()
+        $time = date('Y-m-d', $time);
+    } 
+    // If $time is not in format yyyy-mm-dd
+    if (preg_match('/^(\d{0,4}-\d{0,2}-\d{0,2})/', $time, $found)) {
+        $time = $found[1];
+    } else {
+        // use smarty_make_timestamp to get an unix timestamp and
+        // strftime to make yyyy-mm-dd
+        $time = strftime('%Y-%m-%d', smarty_make_timestamp($time));
+    } 
+    // Now split this in pieces, which later can be used to set the select
+    $time = explode("-", $time); 
+    // make syntax "+N" or "-N" work with start_year and end_year
+    if (preg_match('!^(\+|\-)\s*(\d+)$!', $end_year, $match)) {
+        if ($match[1] == '+') {
+            $end_year = strftime('%Y') + $match[2];
+        } else {
+            $end_year = strftime('%Y') - $match[2];
+        } 
+    } 
+    if (preg_match('!^(\+|\-)\s*(\d+)$!', $start_year, $match)) {
+        if ($match[1] == '+') {
+            $start_year = strftime('%Y') + $match[2];
+        } else {
+            $start_year = strftime('%Y') - $match[2];
+        } 
+    } 
+    if (strlen($time[0]) > 0) {
+        if ($start_year > $time[0] && !isset($params['start_year'])) {
+            // force start year to include given date if not explicitly set
+            $start_year = $time[0];
+        } 
+        if ($end_year < $time[0] && !isset($params['end_year'])) {
+            // force end year to include given date if not explicitly set
+            $end_year = $time[0];
+        } 
+    } 
+
+    $field_order = strtoupper($field_order);
+
+    $html_result = $month_result = $day_result = $year_result = "";
+
+    $field_separator_count = -1;
+    if ($display_months) {
+        $field_separator_count++;
+        $month_names = array();
+        $month_values = array();
+        if (isset($month_empty)) {
+            $month_names[''] = $month_empty;
+            $month_values[''] = '';
+        } 
+        for ($i = 1; $i <= 12; $i++) {
+            $month_names[$i] = strftime($month_format, mktime(0, 0, 0, $i, 1, 2000));
+            $month_values[$i] = strftime($month_value_format, mktime(0, 0, 0, $i, 1, 2000));
+        } 
+
+        $month_result .= '<select name=';
+        if (null !== $field_array) {
+            $month_result .= '"' . $field_array . '[' . $prefix . 'Month]"';
+        } else {
+            $month_result .= '"' . $prefix . 'Month"';
+        } 
+        if (null !== $month_size) {
+            $month_result .= ' size="' . $month_size . '"';
+        } 
+        if (null !== $month_extra) {
+            $month_result .= ' ' . $month_extra;
+        } 
+        if (null !== $all_extra) {
+            $month_result .= ' ' . $all_extra;
+        } 
+        $month_result .= $extra_attrs . '>' . "\n";
+
+        $month_result .= smarty_function_html_options(array('output' => $month_names,
+                'values' => $month_values,
+                'selected' => (int)$time[1] ? strftime($month_value_format, mktime(0, 0, 0, (int)$time[1], 1, 2000)) : '',
+                'print_result' => false),
+                 $template);
+        $month_result .= '</select>';
+    } 
+
+    if ($display_days) {
+        $field_separator_count++;
+        $days = array();
+        if (isset($day_empty)) {
+            $days[''] = $day_empty;
+            $day_values[''] = '';
+        } 
+        for ($i = 1; $i <= 31; $i++) {
+            $days[] = sprintf($day_format, $i);
+            $day_values[] = sprintf($day_value_format, $i);
+        } 
+
+        $day_result .= '<select name=';
+        if (null !== $field_array) {
+            $day_result .= '"' . $field_array . '[' . $prefix . 'Day]"';
+        } else {
+            $day_result .= '"' . $prefix . 'Day"';
+        } 
+        if (null !== $day_size) {
+            $day_result .= ' size="' . $day_size . '"';
+        } 
+        if (null !== $all_extra) {
+            $day_result .= ' ' . $all_extra;
+        } 
+        if (null !== $day_extra) {
+            $day_result .= ' ' . $day_extra;
+        } 
+        $day_result .= $extra_attrs . '>' . "\n";
+        $day_result .= smarty_function_html_options(array('output' => $days,
+                'values' => $day_values,
+                'selected' => $time[2],
+                'print_result' => false),
+             $template);
+        $day_result .= '</select>';
+    } 
+
+    if ($display_years) {
+        $field_separator_count++;
+        if (null !== $field_array) {
+            $year_name = $field_array . '[' . $prefix . 'Year]';
+        } else {
+            $year_name = $prefix . 'Year';
+        } 
+        if ($year_as_text) {
+            $year_result .= '<input type="text" name="' . $year_name . '" value="' . $time[0] . '" size="4" maxlength="4"';
+            if (null !== $all_extra) {
+                $year_result .= ' ' . $all_extra;
+            } 
+            if (null !== $year_extra) {
+                $year_result .= ' ' . $year_extra;
+            } 
+            $year_result .= ' />';
+        } else {
+            $years = range((int)$start_year, (int)$end_year);
+            if ($reverse_years) {
+                rsort($years, SORT_NUMERIC);
+            } else {
+                sort($years, SORT_NUMERIC);
+            } 
+            $yearvals = $years;
+            if (isset($year_empty)) {
+                array_unshift($years, $year_empty);
+                array_unshift($yearvals, '');
+            } 
+            $year_result .= '<select name="' . $year_name . '"';
+            if (null !== $year_size) {
+                $year_result .= ' size="' . $year_size . '"';
+            } 
+            if (null !== $all_extra) {
+                $year_result .= ' ' . $all_extra;
+            } 
+            if (null !== $year_extra) {
+                $year_result .= ' ' . $year_extra;
+            } 
+            $year_result .= $extra_attrs . '>' . "\n";
+            $year_result .= smarty_function_html_options(array('output' => $years,
+                    'values' => $yearvals,
+                    'selected' => $time[0],
+                    'print_result' => false),
+                   $template);
+            $year_result .= '</select>';
+        } 
+    } 
+    // Loop thru the field_order field
+    for ($i = 0; $i <= 2; $i++) {
+        $c = substr($field_order, $i, 1);
+        switch ($c) {
+            case 'D':
+                $html_result .= $day_result;
+                break;
+
+            case 'M':
+                $html_result .= $month_result;
+                break;
+
+            case 'Y':
+                $html_result .= $year_result;
+                break;
+        } 
+        // Add the field seperator
+        if ($i < $field_separator_count) {
+            $html_result .= $field_separator;
+        } 
+    } 
+
+    return $html_result;
+}
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/plugins/function.html_select_time.php b/onyx2/modules/templates/smarty/plugins/function.html_select_time.php
new file mode 100644
index 0000000..ddde4f5
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/function.html_select_time.php
@@ -0,0 +1,194 @@
+<?php
+/**
+ * Smarty plugin
+ * 
+ * @package Smarty
+ * @subpackage PluginsFunction
+ */
+
+/**
+ * Smarty {html_select_time} function plugin
+ * 
+ * Type:     function<br>
+ * Name:     html_select_time<br>
+ * Purpose:  Prints the dropdowns for time selection
+ * 
+ * @link http://smarty.php.net/manual/en/language.function.html.select.time.php {html_select_time}
+ *          (Smarty online manual)
+ * @author Roberto Berto <roberto@berto.net> 
+ * @credits Monte Ohrt <monte AT ohrt DOT com>
+ * @param array $params parameters
+ * @param object $template template object
+ * @return string 
+ * @uses smarty_make_timestamp()
+ */
+function smarty_function_html_select_time($params, $template)
+{
+    require_once(SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php');
+    require_once(SMARTY_PLUGINS_DIR . 'function.html_options.php');
+
+    /* Default values. */
+    $prefix = "Time_";
+    $time = time();
+    $display_hours = true;
+    $display_minutes = true;
+    $display_seconds = true;
+    $display_meridian = true;
+    $use_24_hours = true;
+    $minute_interval = 1;
+    $second_interval = 1;
+    /* Should the select boxes be part of an array when returned from PHP?
+       e.g. setting it to "birthday", would create "birthday[Hour]",
+       "birthday[Minute]", "birthday[Seconds]" & "birthday[Meridian]".
+       Can be combined with prefix. */
+    $field_array = null;
+    $all_extra = null;
+    $hour_extra = null;
+    $minute_extra = null;
+    $second_extra = null;
+    $meridian_extra = null;
+
+    foreach ($params as $_key => $_value) {
+        switch ($_key) {
+            case 'prefix':
+            case 'time':
+            case 'field_array':
+            case 'all_extra':
+            case 'hour_extra':
+            case 'minute_extra':
+            case 'second_extra':
+            case 'meridian_extra':
+                $$_key = (string)$_value;
+                break;
+
+            case 'display_hours':
+            case 'display_minutes':
+            case 'display_seconds':
+            case 'display_meridian':
+            case 'use_24_hours':
+                $$_key = (bool)$_value;
+                break;
+
+            case 'minute_interval':
+            case 'second_interval':
+                $$_key = (int)$_value;
+                break;
+
+            default:
+                trigger_error("[html_select_time] unknown parameter $_key", E_USER_WARNING);
+        } 
+    } 
+
+    $time = smarty_make_timestamp($time);
+
+    $html_result = '';
+
+    if ($display_hours) {
+        $hours = $use_24_hours ? range(0, 23) : range(1, 12);
+        $hour_fmt = $use_24_hours ? '%H' : '%I';
+        for ($i = 0, $for_max = count($hours); $i < $for_max; $i++)
+        $hours[$i] = sprintf('%02d', $hours[$i]);
+        $html_result .= '<select name=';
+        if (null !== $field_array) {
+            $html_result .= '"' . $field_array . '[' . $prefix . 'Hour]"';
+        } else {
+            $html_result .= '"' . $prefix . 'Hour"';
+        } 
+        if (null !== $hour_extra) {
+            $html_result .= ' ' . $hour_extra;
+        } 
+        if (null !== $all_extra) {
+            $html_result .= ' ' . $all_extra;
+        } 
+        $html_result .= '>' . "\n";
+        $html_result .= smarty_function_html_options(array('output' => $hours,
+                'values' => $hours,
+                'selected' => strftime($hour_fmt, $time),
+                'print_result' => false),
+            $template);
+        $html_result .= "</select>\n";
+    } 
+
+    if ($display_minutes) {
+        $all_minutes = range(0, 59);
+        for ($i = 0, $for_max = count($all_minutes); $i < $for_max; $i += $minute_interval)
+        $minutes[] = sprintf('%02d', $all_minutes[$i]);
+        $selected = intval(floor(strftime('%M', $time) / $minute_interval) * $minute_interval);
+        $html_result .= '<select name=';
+        if (null !== $field_array) {
+            $html_result .= '"' . $field_array . '[' . $prefix . 'Minute]"';
+        } else {
+            $html_result .= '"' . $prefix . 'Minute"';
+        } 
+        if (null !== $minute_extra) {
+            $html_result .= ' ' . $minute_extra;
+        } 
+        if (null !== $all_extra) {
+            $html_result .= ' ' . $all_extra;
+        } 
+        $html_result .= '>' . "\n";
+
+        $html_result .= smarty_function_html_options(array('output' => $minutes,
+                'values' => $minutes,
+                'selected' => $selected,
+                'print_result' => false),
+              $template);
+        $html_result .= "</select>\n";
+    } 
+
+    if ($display_seconds) {
+        $all_seconds = range(0, 59);
+        for ($i = 0, $for_max = count($all_seconds); $i < $for_max; $i += $second_interval)
+        $seconds[] = sprintf('%02d', $all_seconds[$i]);
+        $selected = intval(floor(strftime('%S', $time) / $second_interval) * $second_interval);
+        $html_result .= '<select name=';
+        if (null !== $field_array) {
+            $html_result .= '"' . $field_array . '[' . $prefix . 'Second]"';
+        } else {
+            $html_result .= '"' . $prefix . 'Second"';
+        } 
+
+        if (null !== $second_extra) {
+            $html_result .= ' ' . $second_extra;
+        } 
+        if (null !== $all_extra) {
+            $html_result .= ' ' . $all_extra;
+        } 
+        $html_result .= '>' . "\n";
+
+        $html_result .= smarty_function_html_options(array('output' => $seconds,
+                'values' => $seconds,
+                'selected' => $selected,
+                'print_result' => false),
+             $template);
+        $html_result .= "</select>\n";
+    } 
+
+    if ($display_meridian && !$use_24_hours) {
+        $html_result .= '<select name=';
+        if (null !== $field_array) {
+            $html_result .= '"' . $field_array . '[' . $prefix . 'Meridian]"';
+        } else {
+            $html_result .= '"' . $prefix . 'Meridian"';
+        } 
+
+        if (null !== $meridian_extra) {
+            $html_result .= ' ' . $meridian_extra;
+        } 
+        if (null !== $all_extra) {
+            $html_result .= ' ' . $all_extra;
+        } 
+        $html_result .= '>' . "\n";
+
+        $html_result .= smarty_function_html_options(array('output' => array('AM', 'PM'),
+                'values' => array('am', 'pm'),
+                'selected' => strtolower(strftime('%p', $time)),
+                'print_result' => false),
+            $template);
+        $html_result .= "</select>\n";
+    } 
+
+    return $html_result;
+} 
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/plugins/function.html_table.php b/onyx2/modules/templates/smarty/plugins/function.html_table.php
new file mode 100644
index 0000000..7986a9b
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/function.html_table.php
@@ -0,0 +1,177 @@
+<?php
+/**
+ * Smarty plugin
+ * 
+ * @package Smarty
+ * @subpackage PluginsFunction
+ */
+
+/**
+ * Smarty {html_table} function plugin
+ * 
+ * Type:     function<br>
+ * Name:     html_table<br>
+ * Date:     Feb 17, 2003<br>
+ * Purpose:  make an html table from an array of data<br>
+ * 
+ * 
+ * Examples:
+ * <pre>
+ * {table loop=$data}
+ * {table loop=$data cols=4 tr_attr='"bgcolor=red"'}
+ * {table loop=$data cols="first,second,third" tr_attr=$colors}
+ * </pre>
+ * 
+ * @author Monte Ohrt <monte at ohrt dot com> 
+ * @author credit to Messju Mohr <messju at lammfellpuschen dot de> 
+ * @author credit to boots <boots dot smarty at yahoo dot com> 
+ * @version 1.1
+ * @link http://smarty.php.net/manual/en/language.function.html.table.php {html_table}
+ *          (Smarty online manual)
+ * @param array $params parameters
+ * Input:<br>
+ *          - loop = array to loop through
+ *          - cols = number of columns, comma separated list of column names
+ *                   or array of column names
+ *          - rows = number of rows
+ *          - table_attr = table attributes
+ *          - th_attr = table heading attributes (arrays are cycled)
+ *          - tr_attr = table row attributes (arrays are cycled)
+ *          - td_attr = table cell attributes (arrays are cycled)
+ *          - trailpad = value to pad trailing cells with
+ *          - caption = text for caption element 
+ *          - vdir = vertical direction (default: "down", means top-to-bottom)
+ *          - hdir = horizontal direction (default: "right", means left-to-right)
+ *          - inner = inner loop (default "cols": print $loop line by line,
+ *                    $loop will be printed column by column otherwise)
+ * @param object $template template object
+ * @return string 
+ */
+function smarty_function_html_table($params, $template)
+{
+    $table_attr = 'border="1"';
+    $tr_attr = '';
+    $th_attr = '';
+    $td_attr = '';
+    $cols = $cols_count = 3;
+    $rows = 3;
+    $trailpad = '&nbsp;';
+    $vdir = 'down';
+    $hdir = 'right';
+    $inner = 'cols';
+    $caption = '';
+    $loop = null;
+
+    if (!isset($params['loop'])) {
+        trigger_error("html_table: missing 'loop' parameter",E_USER_WARNING);
+        return;
+    } 
+
+    foreach ($params as $_key => $_value) {
+        switch ($_key) {
+            case 'loop':
+                $$_key = (array)$_value;
+                break;
+
+            case 'cols':
+                if (is_array($_value) && !empty($_value)) {
+                    $cols = $_value;
+                    $cols_count = count($_value);
+                } elseif (!is_numeric($_value) && is_string($_value) && !empty($_value)) {
+                    $cols = explode(',', $_value);
+                    $cols_count = count($cols);
+                } elseif (!empty($_value)) {
+                    $cols_count = (int)$_value;
+                } else {
+                    $cols_count = $cols;
+                } 
+                break;
+
+            case 'rows':
+                $$_key = (int)$_value;
+                break;
+
+            case 'table_attr':
+            case 'trailpad':
+            case 'hdir':
+            case 'vdir':
+            case 'inner':
+            case 'caption':
+                $$_key = (string)$_value;
+                break;
+
+            case 'tr_attr':
+            case 'td_attr':
+            case 'th_attr':
+                $$_key = $_value;
+                break;
+        } 
+    } 
+
+    $loop_count = count($loop);
+    if (empty($params['rows'])) {
+        /* no rows specified */
+        $rows = ceil($loop_count / $cols_count);
+    } elseif (empty($params['cols'])) {
+        if (!empty($params['rows'])) {
+            /* no cols specified, but rows */
+            $cols_count = ceil($loop_count / $rows);
+        } 
+    } 
+
+    $output = "<table $table_attr>\n";
+
+    if (!empty($caption)) {
+        $output .= '<caption>' . $caption . "</caption>\n";
+    } 
+
+    if (is_array($cols)) {
+        $cols = ($hdir == 'right') ? $cols : array_reverse($cols);
+        $output .= "<thead><tr>\n";
+
+        for ($r = 0; $r < $cols_count; $r++) {
+            $output .= '<th' . smarty_function_html_table_cycle('th', $th_attr, $r) . '>';
+            $output .= $cols[$r];
+            $output .= "</th>\n";
+        } 
+        $output .= "</tr></thead>\n";
+    } 
+
+    $output .= "<tbody>\n";
+    for ($r = 0; $r < $rows; $r++) {
+        $output .= "<tr" . smarty_function_html_table_cycle('tr', $tr_attr, $r) . ">\n";
+        $rx = ($vdir == 'down') ? $r * $cols_count : ($rows-1 - $r) * $cols_count;
+
+        for ($c = 0; $c < $cols_count; $c++) {
+            $x = ($hdir == 'right') ? $rx + $c : $rx + $cols_count-1 - $c;
+            if ($inner != 'cols') {
+                /* shuffle x to loop over rows*/
+                $x = floor($x / $cols_count) + ($x % $cols_count) * $rows;
+            } 
+
+            if ($x < $loop_count) {
+                $output .= "<td" . smarty_function_html_table_cycle('td', $td_attr, $c) . ">" . $loop[$x] . "</td>\n";
+            } else {
+                $output .= "<td" . smarty_function_html_table_cycle('td', $td_attr, $c) . ">$trailpad</td>\n";
+            } 
+        } 
+        $output .= "</tr>\n";
+    } 
+    $output .= "</tbody>\n";
+    $output .= "</table>\n";
+
+    return $output;
+} 
+
+function smarty_function_html_table_cycle($name, $var, $no)
+{
+    if (!is_array($var)) {
+        $ret = $var;
+    } else {
+        $ret = $var[$no % count($var)];
+    } 
+
+    return ($ret) ? ' ' . $ret : '';
+}
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/plugins/function.mailto.php b/onyx2/modules/templates/smarty/plugins/function.mailto.php
new file mode 100644
index 0000000..976218f
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/function.mailto.php
@@ -0,0 +1,156 @@
+<?php
+/**
+ * Smarty plugin
+ * 
+ * @package Smarty
+ * @subpackage PluginsFunction
+ */
+
+/**
+ * Smarty {mailto} function plugin
+ * 
+ * Type:     function<br>
+ * Name:     mailto<br>
+ * Date:     May 21, 2002
+ * Purpose:  automate mailto address link creation, and optionally
+ *            encode them.<br>
+ * 
+ * Examples:
+ * <pre>
+ * {mailto address="me@domain.com"}
+ * {mailto address="me@domain.com" encode="javascript"}
+ * {mailto address="me@domain.com" encode="hex"}
+ * {mailto address="me@domain.com" subject="Hello to you!"}
+ * {mailto address="me@domain.com" cc="you@domain.com,they@domain.com"}
+ * {mailto address="me@domain.com" extra='class="mailto"'}
+ * </pre>
+ * 
+ * @link http://smarty.php.net/manual/en/language.function.mailto.php {mailto}
+ *          (Smarty online manual)
+ * @version 1.2
+ * @author Monte Ohrt <monte at ohrt dot com> 
+ * @author credits to Jason Sweat (added cc, bcc and subject functionality) 
+ * @param array $params parameters
+ * Input:<br>
+ *          - address = e-mail address
+ *          - text = (optional) text to display, default is address
+ *          - encode = (optional) can be one of:
+ *                 * none : no encoding (default)
+ *                 * javascript : encode with javascript
+ *                 * javascript_charcode : encode with javascript charcode
+ *                 * hex : encode with hexidecimal (no javascript)
+ *          - cc = (optional) address(es) to carbon copy
+ *          - bcc = (optional) address(es) to blind carbon copy
+ *          - subject = (optional) e-mail subject
+ *          - newsgroups = (optional) newsgroup(s) to post to
+ *          - followupto = (optional) address(es) to follow up to
+ *          - extra = (optional) extra tags for the href link
+ * @param object $template template object
+ * @return string 
+ */
+function smarty_function_mailto($params, $template)
+{
+    $extra = '';
+
+    if (empty($params['address'])) {
+        trigger_error("mailto: missing 'address' parameter",E_USER_WARNING);
+        return;
+    } else {
+        $address = $params['address'];
+    } 
+
+    $text = $address; 
+    // netscape and mozilla do not decode %40 (@) in BCC field (bug?)
+    // so, don't encode it.
+    $search = array('%40', '%2C');
+    $replace = array('@', ',');
+    $mail_parms = array();
+    foreach ($params as $var => $value) {
+        switch ($var) {
+            case 'cc':
+            case 'bcc':
+            case 'followupto':
+                if (!empty($value))
+                    $mail_parms[] = $var . '=' . str_replace($search, $replace, rawurlencode($value));
+                break;
+
+            case 'subject':
+            case 'newsgroups':
+                $mail_parms[] = $var . '=' . rawurlencode($value);
+                break;
+
+            case 'extra':
+            case 'text':
+                $$var = $value;
+
+            default:
+        } 
+    } 
+
+    $mail_parm_vals = '';
+    for ($i = 0; $i < count($mail_parms); $i++) {
+        $mail_parm_vals .= (0 == $i) ? '?' : '&';
+        $mail_parm_vals .= $mail_parms[$i];
+    } 
+    $address .= $mail_parm_vals;
+
+    $encode = (empty($params['encode'])) ? 'none' : $params['encode'];
+    if (!in_array($encode, array('javascript', 'javascript_charcode', 'hex', 'none'))) {
+        trigger_error("mailto: 'encode' parameter must be none, javascript or hex",E_USER_WARNING);
+        return;
+    } 
+
+    if ($encode == 'javascript') {
+        $string = 'document.write(\'<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>\');';
+
+        $js_encode = '';
+        for ($x = 0; $x < strlen($string); $x++) {
+            $js_encode .= '%' . bin2hex($string[$x]);
+        } 
+
+        return '<script type="text/javascript">eval(unescape(\'' . $js_encode . '\'))</script>';
+    } elseif ($encode == 'javascript_charcode') {
+        $string = '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>';
+
+        for($x = 0, $y = strlen($string); $x < $y; $x++) {
+            $ord[] = ord($string[$x]);
+        } 
+
+        $_ret = "<script type=\"text/javascript\" language=\"javascript\">\n";
+        $_ret .= "<!--\n";
+        $_ret .= "{document.write(String.fromCharCode(";
+        $_ret .= implode(',', $ord);
+        $_ret .= "))";
+        $_ret .= "}\n";
+        $_ret .= "//-->\n";
+        $_ret .= "</script>\n";
+
+        return $_ret;
+    } elseif ($encode == 'hex') {
+        preg_match('!^(.*)(\?.*)$!', $address, $match);
+        if (!empty($match[2])) {
+            trigger_error("mailto: hex encoding does not work with extra attributes. Try javascript.",E_USER_WARNING);
+            return;
+        } 
+        $address_encode = '';
+        for ($x = 0; $x < strlen($address); $x++) {
+            if (preg_match('!\w!', $address[$x])) {
+                $address_encode .= '%' . bin2hex($address[$x]);
+            } else {
+                $address_encode .= $address[$x];
+            } 
+        } 
+        $text_encode = '';
+        for ($x = 0; $x < strlen($text); $x++) {
+            $text_encode .= '&#x' . bin2hex($text[$x]) . ';';
+        } 
+
+        $mailto = "&#109;&#97;&#105;&#108;&#116;&#111;&#58;";
+        return '<a href="' . $mailto . $address_encode . '" ' . $extra . '>' . $text_encode . '</a>';
+    } else {
+        // no encoding
+        return '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>';
+    } 
+} 
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/plugins/function.math.php b/onyx2/modules/templates/smarty/plugins/function.math.php
new file mode 100644
index 0000000..cd90020
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/function.math.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * This plugin is only for Smarty2 BC
+ * @package Smarty
+ * @subpackage PluginsFunction
+ */
+
+/**
+ * Smarty {math} function plugin
+ *
+ * Type:     function<br>
+ * Name:     math<br>
+ * Purpose:  handle math computations in template<br>
+ * @link http://smarty.php.net/manual/en/language.function.math.php {math}
+ *          (Smarty online manual)
+ * @author   Monte Ohrt <monte at ohrt dot com>
+ * @param array $params parameters
+ * @param object $template template object
+ * @return string|null
+ */
+function smarty_function_math($params, $template)
+{
+    // be sure equation parameter is present
+    if (empty($params['equation'])) {
+        trigger_error("math: missing equation parameter",E_USER_WARNING);
+        return;
+    }
+
+    $equation = $params['equation'];
+
+    // make sure parenthesis are balanced
+    if (substr_count($equation,"(") != substr_count($equation,")")) {
+        trigger_error("math: unbalanced parenthesis",E_USER_WARNING);
+        return;
+    }
+
+    // match all vars in equation, make sure all are passed
+    preg_match_all("!(?:0x[a-fA-F0-9]+)|([a-zA-Z][a-zA-Z0-9_]*)!",$equation, $match);
+    $allowed_funcs = array('int','abs','ceil','cos','exp','floor','log','log10',
+                           'max','min','pi','pow','rand','round','sin','sqrt','srand','tan');
+    
+    foreach($match[1] as $curr_var) {
+        if ($curr_var && !in_array($curr_var, array_keys($params)) && !in_array($curr_var, $allowed_funcs)) {
+            trigger_error("math: function call $curr_var not allowed",E_USER_WARNING);
+            return;
+        }
+    }
+
+    foreach($params as $key => $val) {
+        if ($key != "equation" && $key != "format" && $key != "assign") {
+            // make sure value is not empty
+            if (strlen($val)==0) {
+                trigger_error("math: parameter $key is empty",E_USER_WARNING);
+                return;
+            }
+            if (!is_numeric($val)) {
+                trigger_error("math: parameter $key: is not numeric",E_USER_WARNING);
+                return;
+            }
+            $equation = preg_replace("/\b$key\b/", " \$params['$key'] ", $equation);
+        }
+    }
+    $smarty_math_result = null;
+    eval("\$smarty_math_result = ".$equation.";");
+
+    if (empty($params['format'])) {
+        if (empty($params['assign'])) {
+            return $smarty_math_result;
+        } else {
+            $template->assign($params['assign'],$smarty_math_result);
+        }
+    } else {
+        if (empty($params['assign'])){
+            printf($params['format'],$smarty_math_result);
+        } else {
+            $template->assign($params['assign'],sprintf($params['format'],$smarty_math_result));
+        }
+    }
+}
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/plugins/function.popup.php b/onyx2/modules/templates/smarty/plugins/function.popup.php
new file mode 100644
index 0000000..e683556
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/function.popup.php
@@ -0,0 +1,118 @@
+<?php
+/**
+ * Smarty plugin
+ * @package Smarty
+ * @subpackage PluginsFunction
+ */
+
+
+/**
+ * Smarty {popup} function plugin
+ *
+ * Type:     function<br>
+ * Name:     popup<br>
+ * Purpose:  make text pop up in windows via overlib
+ * @link http://smarty.php.net/manual/en/language.function.popup.php {popup}
+ *          (Smarty online manual)
+ * @author   Monte Ohrt <monte at ohrt dot com>
+ * @param array $params parameters
+ * @param object $smarty Smarty object
+ * @param object $template template object
+ * @return string
+ */
+function smarty_function_popup($params, $smarty, $template)
+{
+    $append = '';
+    foreach ($params as $_key=>$_value) {
+        switch ($_key) {
+            case 'text':
+            case 'trigger':
+            case 'function':
+            case 'inarray':
+                $$_key = (string)$_value;
+                if ($_key == 'function' || $_key == 'inarray')
+                    $append .= ',' . strtoupper($_key) . ",'$_value'";
+                break;
+
+            case 'caption':
+            case 'closetext':
+            case 'status':
+                $append .= ',' . strtoupper($_key) . ",'" . str_replace("'","\'",$_value) . "'";
+                break;
+
+            case 'fgcolor':
+            case 'bgcolor':
+            case 'textcolor':
+            case 'capcolor':
+            case 'closecolor':
+            case 'textfont':
+            case 'captionfont':
+            case 'closefont':
+            case 'fgbackground':
+            case 'bgbackground':
+            case 'caparray':
+            case 'capicon':
+            case 'background':
+            case 'frame':
+                $append .= ',' . strtoupper($_key) . ",'$_value'";
+                break;
+
+            case 'textsize':
+            case 'captionsize':
+            case 'closesize':
+            case 'width':
+            case 'height':
+            case 'border':
+            case 'offsetx':
+            case 'offsety':
+            case 'snapx':
+            case 'snapy':
+            case 'fixx':
+            case 'fixy':
+            case 'padx':
+            case 'pady':
+            case 'timeout':
+            case 'delay':
+                $append .= ',' . strtoupper($_key) . ",$_value";
+                break;
+
+            case 'sticky':
+            case 'left':
+            case 'right':
+            case 'center':
+            case 'above':
+            case 'below':
+            case 'noclose':
+            case 'autostatus':
+            case 'autostatuscap':
+            case 'fullhtml':
+            case 'hauto':
+            case 'vauto':
+            case 'mouseoff':
+            case 'followmouse':
+            case 'closeclick':
+            case 'wrap':
+                if ($_value) $append .= ',' . strtoupper($_key);
+                break;
+
+            default:
+                trigger_error("[popup] unknown parameter $_key", E_USER_WARNING);
+        }
+    }
+
+    if (empty($text) && !isset($inarray) && empty($function)) {
+        trigger_error("overlib: attribute 'text' or 'inarray' or 'function' required",E_USER_WARNING);
+        return false;
+    }
+
+    if (empty($trigger)) { $trigger = "onmouseover"; }
+
+    $retval = $trigger . '="return overlib(\''.preg_replace(array("!'!",'!"!',"![\r\n]!"),array("\'","\'",'\r'),$text).'\'';
+    $retval .= $append . ');"';
+    if ($trigger == 'onmouseover')
+       $retval .= ' onmouseout="nd();"';
+
+
+    return $retval;
+}
+?>
diff --git a/onyx2/modules/templates/smarty/plugins/function.popup_init.php b/onyx2/modules/templates/smarty/plugins/function.popup_init.php
new file mode 100644
index 0000000..dc5bbd7
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/function.popup_init.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Smarty plugin
+ * @package Smarty
+ * @subpackage PluginsFunction
+ */
+
+
+/**
+ * Smarty {popup_init} function plugin
+ *
+ * Type:     function<br>
+ * Name:     popup_init<br>
+ * Purpose:  initialize overlib
+ * @link http://smarty.php.net/manual/en/language.function.popup.init.php {popup_init}
+ *          (Smarty online manual)
+ * @author   Monte Ohrt <monte at ohrt dot com>
+ * @param array $params parameters
+ * @param object $smarty Smarty object
+ * @param object $template template object
+ * @return string 
+ */
+function smarty_function_popup_init($params, $smarty, $template)
+{
+    $zindex = 1000;
+    
+    if (!empty($params['zindex'])) {
+        $zindex = $params['zindex'];
+    }
+    
+    if (!empty($params['src'])) {
+        return '<div id="overDiv" style="position:absolute; visibility:hidden; z-index:'.$zindex.';"></div>' . "\n"
+         . '<script type="text/javascript" language="JavaScript" src="'.$params['src'].'"></script>' . "\n";
+    } else {
+        trigger_error("popup_init: missing src parameter",E_USER_WARNING);
+    }
+}
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/plugins/function.text.php b/onyx2/modules/templates/smarty/plugins/function.text.php
new file mode 100644
index 0000000..2dcf10b
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/function.text.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Smarty plugin
+ * @package Smarty
+ * @subpackage PluginsFunction
+ */
+
+/**
+ * Smarty {text} function plugin
+ *
+ * Type:     function<br>
+ * Name:     text<br>
+ * @author Némunaire <nemunaire@gmail.com>
+ */
+function smarty_function_text($params, &$template)
+{
+  if (empty($params["lang"]))
+    {
+      if (isset($params['assign']))
+	$template->assign($params['assign'], Lang::getText($params["file"], $params["path"]));
+      else
+	return Lang::getText($params["file"], $params["path"]);
+    }
+  else
+    {
+      if (isset($params['assign']))
+	$template->assign($params['assign'], Lang::getText($params["file"], $params["path"], $params["lang"]));
+      else
+	return Lang::getText($params["file"], $params["path"], $params["lang"]);
+    }
+}
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/plugins/modifier.capitalize.php b/onyx2/modules/templates/smarty/plugins/modifier.capitalize.php
new file mode 100644
index 0000000..cd24589
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/modifier.capitalize.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Smarty plugin
+ * 
+ * @package Smarty
+ * @subpackage PluginsModifier
+ */
+
+/**
+ * Smarty capitalize modifier plugin
+ * 
+ * Type:     modifier<br>
+ * Name:     capitalize<br>
+ * Purpose:  capitalize words in the string
+ * 
+ * @link 
+ * @author Monte Ohrt <monte at ohrt dot com> 
+ * @param string $ 
+ * @return string 
+ */
+function smarty_modifier_capitalize($string, $uc_digits = false)
+{ 
+    // uppercase with php function ucwords
+    $upper_string = ucwords($string); 
+    // check for any missed hyphenated words
+    $upper_string = preg_replace("!(^|[^\p{L}'])([\p{Ll}])!ue", "'\\1'.ucfirst('\\2')", $upper_string); 
+    // check uc_digits case
+    if (!$uc_digits) {
+        if (preg_match_all("!\b([\p{L}]*[\p{N}]+[\p{L}]*)\b!u", $string, $matches, PREG_OFFSET_CAPTURE)) {
+            foreach($matches[1] as $match)
+            $upper_string = substr_replace($upper_string, $match[0], $match[1], strlen($match[0]));
+        } 
+    } 
+    return $upper_string;
+} 
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/plugins/modifier.cat.php b/onyx2/modules/templates/smarty/plugins/modifier.cat.php
new file mode 100644
index 0000000..1b932d0
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/modifier.cat.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Smarty plugin
+ * @package Smarty
+ * @subpackage PluginsModifier
+ */
+
+
+/**
+ * Smarty cat modifier plugin
+ *
+ * Type:     modifier<br>
+ * Name:     cat<br>
+ * Date:     Feb 24, 2003
+ * Purpose:  catenate a value to a variable
+ * Input:    string to catenate
+ * Example:  {$var|cat:"foo"}
+ * @link http://smarty.php.net/manual/en/language.modifier.cat.php cat
+ *          (Smarty online manual)
+ * @author   Monte Ohrt <monte at ohrt dot com>
+ * @version 1.0
+ * @param string
+ * @param string
+ * @return string
+ */
+function smarty_modifier_cat($string, $cat)
+{
+    return $string . $cat;
+}
+
+?>
diff --git a/onyx2/modules/templates/smarty/plugins/modifier.count_characters.php b/onyx2/modules/templates/smarty/plugins/modifier.count_characters.php
new file mode 100644
index 0000000..6d52465
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/modifier.count_characters.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Smarty plugin
+ * @package Smarty
+ * @subpackage PluginsModifier
+ */
+
+
+/**
+ * Smarty count_characters modifier plugin
+ *
+ * Type:     modifier<br>
+ * Name:     count_characteres<br>
+ * Purpose:  count the number of characters in a text
+ * @link http://smarty.php.net/manual/en/language.modifier.count.characters.php
+ *          count_characters (Smarty online manual)
+ * @author   Monte Ohrt <monte at ohrt dot com>
+ * @param string $string input string
+ * @param boolean $include_spaces include whitespace in the character count
+ * @return integer number of characters
+ */
+function smarty_modifier_count_characters($string, $include_spaces = false)
+{
+    if ($include_spaces)
+       return(strlen($string));
+
+    return preg_match_all("/[^\s]/",$string, $match);
+}
+?>
diff --git a/onyx2/modules/templates/smarty/plugins/modifier.count_paragraphs.php b/onyx2/modules/templates/smarty/plugins/modifier.count_paragraphs.php
new file mode 100644
index 0000000..441da09
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/modifier.count_paragraphs.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Smarty plugin
+ * @package Smarty
+ * @subpackage PluginsModifier
+ */
+
+
+/**
+ * Smarty count_paragraphs modifier plugin
+ *
+ * Type:     modifier<br>
+ * Name:     count_paragraphs<br>
+ * Purpose:  count the number of paragraphs in a text
+ * @link http://smarty.php.net/manual/en/language.modifier.count.paragraphs.php
+ *          count_paragraphs (Smarty online manual)
+ * @author   Monte Ohrt <monte at ohrt dot com>
+ * @param string
+ * @return integer
+ */
+function smarty_modifier_count_paragraphs($string)
+{
+    // count \r or \n characters
+    return count(preg_split('/[\r\n]+/', $string));
+}
+?>
diff --git a/onyx2/modules/templates/smarty/plugins/modifier.count_sentences.php b/onyx2/modules/templates/smarty/plugins/modifier.count_sentences.php
new file mode 100644
index 0000000..7783c92
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/modifier.count_sentences.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Smarty plugin
+ * @package Smarty
+ * @subpackage PluginsModifier
+ */
+
+
+/**
+ * Smarty count_sentences modifier plugin
+ *
+ * Type:     modifier<br>
+ * Name:     count_sentences
+ * Purpose:  count the number of sentences in a text
+ * @link http://smarty.php.net/manual/en/language.modifier.count.paragraphs.php
+ *          count_sentences (Smarty online manual)
+ * @author   Monte Ohrt <monte at ohrt dot com>
+ * @param string
+ * @return integer
+ */
+function smarty_modifier_count_sentences($string)
+{
+    // find periods with a word before but not after.
+    return preg_match_all('/[^\s]\.(?!\w)/', $string, $match);
+}
+
+?>
diff --git a/onyx2/modules/templates/smarty/plugins/modifier.count_words.php b/onyx2/modules/templates/smarty/plugins/modifier.count_words.php
new file mode 100644
index 0000000..1079d8f
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/modifier.count_words.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Smarty plugin
+ * @package Smarty
+ * @subpackage PluginsModifier
+ */
+
+
+/**
+ * Smarty count_words modifier plugin
+ *
+ * Type:     modifier<br>
+ * Name:     count_words<br>
+ * Purpose:  count the number of words in a text
+ * @link http://smarty.php.net/manual/en/language.modifier.count.words.php
+ *          count_words (Smarty online manual)
+ * @author   Monte Ohrt <monte at ohrt dot com>
+ * @param string
+ * @return integer
+ */
+function smarty_modifier_count_words($string)
+{
+    return str_word_count($string);
+}
+?>
diff --git a/onyx2/modules/templates/smarty/plugins/modifier.countdown.php b/onyx2/modules/templates/smarty/plugins/modifier.countdown.php
new file mode 100644
index 0000000..2ea04db
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/modifier.countdown.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Smarty plugin
+ * @package Smarty
+ * @subpackage plugins
+ */
+
+
+/**
+ * Smarty countdown modifier plugin
+ *
+ * Type:     modifier<br>
+ * Name:     countdown<br>
+ * Date:     Apr 15, 2009
+ * Example:  {$seconds|countdown}
+ * @version  1.0
+ * @author   Nemunaire <nemunaire at gmail dot com>
+ * @param timestamp
+ * @return string
+ */
+function smarty_modifier_countdown($secondes)
+{
+    $heures = intval($secondes/3600);
+    if ($heures < 10) $heures = '0'.$heures;
+    $minutes = intval(($secondes%3600)/60);
+    if ($minutes < 10) $minutes = '0'.$minutes;
+    $secondes = $secondes%60;
+	if ($secondes < 10) $secondes = '0'.$secondes;
+
+    return $heures.':'.$minutes.':'.$secondes;
+}
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/plugins/modifier.date_format.php b/onyx2/modules/templates/smarty/plugins/modifier.date_format.php
new file mode 100644
index 0000000..3656c1c
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/modifier.date_format.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Smarty plugin
+ * 
+ * @package Smarty
+ * @subpackage PluginsModifier
+ */
+
+/**
+ * Smarty date_format modifier plugin
+ * 
+ * Type:     modifier<br>
+ * Name:     date_format<br>
+ * Purpose:  format datestamps via strftime<br>
+ * Input:<br>
+ *          - string: input date string
+ *          - format: strftime format for output
+ *          - default_date: default date if $string is empty
+ * 
+ * @link http://smarty.php.net/manual/en/language.modifier.date.format.php date_format (Smarty online manual)
+ * @author Monte Ohrt <monte at ohrt dot com> 
+ * @param string $ 
+ * @param string $ 
+ * @param string $ 
+ * @return string |void
+ * @uses smarty_make_timestamp()
+ */
+function smarty_modifier_date_format($string, $format = SMARTY_RESOURCE_DATE_FORMAT, $default_date = '',$formatter='auto')
+{
+    /**
+    * Include the {@link shared.make_timestamp.php} plugin
+    */
+    require_once(SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php');
+    if ($string != '') {
+        $timestamp = smarty_make_timestamp($string);
+    } elseif ($default_date != '') {
+        $timestamp = smarty_make_timestamp($default_date);
+    } else {
+        return;
+    } 
+    if($formatter=='strftime'||($formatter=='auto'&&strpos($format,'%')!==false)) {
+        if (DS == '\\') {
+            $_win_from = array('%D', '%h', '%n', '%r', '%R', '%t', '%T');
+            $_win_to = array('%m/%d/%y', '%b', "\n", '%I:%M:%S %p', '%H:%M', "\t", '%H:%M:%S');
+            if (strpos($format, '%e') !== false) {
+                $_win_from[] = '%e';
+                $_win_to[] = sprintf('%\' 2d', date('j', $timestamp));
+            } 
+            if (strpos($format, '%l') !== false) {
+                $_win_from[] = '%l';
+                $_win_to[] = sprintf('%\' 2d', date('h', $timestamp));
+            } 
+            $format = str_replace($_win_from, $_win_to, $format);
+        } 
+        return strftime($format, $timestamp);
+    } else {
+        return date($format, $timestamp);
+    }
+} 
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/plugins/modifier.debug_print_var.php b/onyx2/modules/templates/smarty/plugins/modifier.debug_print_var.php
new file mode 100644
index 0000000..013337a
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/modifier.debug_print_var.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Smarty plugin
+ * 
+ * @package Smarty
+ * @subpackage Debug
+ */
+
+/**
+ * Smarty debug_print_var modifier plugin
+ * 
+ * Type:     modifier<br>
+ * Name:     debug_print_var<br>
+ * Purpose:  formats variable contents for display in the console
+ * 
+ * @link http://smarty.php.net/manual/en/language.modifier.debug.print.var.php debug_print_var (Smarty online manual)
+ * @author Monte Ohrt <monte at ohrt dot com> 
+ * @param array $ |object
+ * @param integer $ 
+ * @param integer $ 
+ * @return string 
+ */
+function smarty_modifier_debug_print_var ($var, $depth = 0, $length = 40)
+{
+    $_replace = array("\n" => '<i>\n</i>',
+        "\r" => '<i>\r</i>',
+        "\t" => '<i>\t</i>'
+        );
+
+    switch (gettype($var)) {
+        case 'array' :
+            $results = '<b>Array (' . count($var) . ')</b>';
+            foreach ($var as $curr_key => $curr_val) {
+                $results .= '<br>' . str_repeat('&nbsp;', $depth * 2)
+                 . '<b>' . strtr($curr_key, $_replace) . '</b> =&gt; '
+                 . smarty_modifier_debug_print_var($curr_val, ++$depth, $length);
+                $depth--;
+            } 
+            break;
+        case 'object' :
+            $object_vars = get_object_vars($var);
+            $results = '<b>' . get_class($var) . ' Object (' . count($object_vars) . ')</b>';
+            foreach ($object_vars as $curr_key => $curr_val) {
+                $results .= '<br>' . str_repeat('&nbsp;', $depth * 2)
+                 . '<b> -&gt;' . strtr($curr_key, $_replace) . '</b> = '
+                 . smarty_modifier_debug_print_var($curr_val, ++$depth, $length);
+                $depth--;
+            } 
+            break;
+        case 'boolean' :
+        case 'NULL' :
+        case 'resource' :
+            if (true === $var) {
+                $results = 'true';
+            } elseif (false === $var) {
+                $results = 'false';
+            } elseif (null === $var) {
+                $results = 'null';
+            } else {
+                $results = htmlspecialchars((string) $var);
+            } 
+            $results = '<i>' . $results . '</i>';
+            break;
+        case 'integer' :
+        case 'float' :
+            $results = htmlspecialchars((string) $var);
+            break;
+        case 'string' :
+            $results = strtr($var, $_replace);
+            if (strlen($var) > $length) {
+                $results = substr($var, 0, $length - 3) . '...';
+            } 
+            $results = htmlspecialchars('"' . $results . '"');
+            break;
+        case 'unknown type' :
+        default :
+            $results = strtr((string) $var, $_replace);
+            if (strlen($results) > $length) {
+                $results = substr($results, 0, $length - 3) . '...';
+            } 
+            $results = htmlspecialchars($results);
+    } 
+
+    return $results;
+} 
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/plugins/modifier.default.php b/onyx2/modules/templates/smarty/plugins/modifier.default.php
new file mode 100644
index 0000000..2622d07
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/modifier.default.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Smarty plugin
+ * @package Smarty
+ * @subpackage PluginsModifier
+ */
+
+
+/**
+ * Smarty default modifier plugin
+ *
+ * Type:     modifier<br>
+ * Name:     default<br>
+ * Purpose:  designate default value for empty variables
+ * @link http://smarty.php.net/manual/en/language.modifier.default.php
+ *          default (Smarty online manual)
+ * @author   Monte Ohrt <monte at ohrt dot com>
+ * @param string
+ * @param string
+ * @return string
+ */
+function smarty_modifier_default($string, $default = '')
+{
+    if (!isset($string) || $string === '')
+        return $default;
+    else
+        return $string;
+}
+?>
diff --git a/onyx2/modules/templates/smarty/plugins/modifier.download.php b/onyx2/modules/templates/smarty/plugins/modifier.download.php
new file mode 100644
index 0000000..7eb8481
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/modifier.download.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Smarty plugin
+ * @package Smarty
+ * @subpackage plugins
+ */
+
+
+/**
+ * Smarty download modifier plugin
+ *
+ * Type:     modifier<br>
+ * Name:     download<br>
+ * Purpose:  convert string to lowercase
+ * @link http://smarty.php.net/manual/en/language.modifier.lower.php
+ *          lower (Smarty online manual)
+ * @author   Monte Ohrt <monte at ohrt dot com>
+ * @param string
+ * @return string
+ */
+function smarty_modifier_download($id)
+{
+    return strhex(cxor($id, "download"));
+}
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/plugins/modifier.ereg.php b/onyx2/modules/templates/smarty/plugins/modifier.ereg.php
new file mode 100644
index 0000000..7640b42
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/modifier.ereg.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Smarty plugin
+ * @package Smarty
+ * @subpackage plugins
+ */
+
+
+/**
+ * Smarty {counter} function plugin
+ *
+ * Type:     function<br>
+ * Name:     counter<br>
+ * Purpose:  print out a counter value
+ * @author Monte Ohrt <monte at ohrt dot com>
+ * @link http://smarty.php.net/manual/en/language.function.counter.php {counter}
+ *       (Smarty online manual)
+ * @param array parameters
+ * @param Smarty
+ * @return string|null
+ */
+function smarty_modifier_ereg($str, $params)
+{
+    return ereg($str, $params);
+
+}
+
+/* vim: set expandtab: */
+
+?>
diff --git a/onyx2/modules/templates/smarty/plugins/modifier.escape.php b/onyx2/modules/templates/smarty/plugins/modifier.escape.php
new file mode 100644
index 0000000..37bc0e3
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/modifier.escape.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Smarty plugin
+ * 
+ * @package Smarty
+ * @subpackage PluginsModifier
+ */
+ 
+/**
+ * Smarty escape modifier plugin
+ * 
+ * Type:     modifier<br>
+ * Name:     escape<br>
+ * Purpose:  escape string for output
+ * 
+ * @link http://smarty.php.net/manual/en/language.modifier.count.characters.php count_characters (Smarty online manual)
+ * @author Monte Ohrt <monte at ohrt dot com> 
+ * @param string $string input string
+ * @param string $esc_type escape type
+ * @param string $char_set character set
+ * @return string escaped input string
+ */
+function smarty_modifier_escape($string, $esc_type = 'html', $char_set = SMARTY_RESOURCE_CHAR_SET)
+{
+    switch ($esc_type) {
+        case 'html':
+            return htmlspecialchars($string, ENT_QUOTES, $char_set);
+
+        case 'htmlall':
+            return htmlentities($string, ENT_QUOTES, $char_set);
+
+        case 'url':
+            return rawurlencode($string);
+
+        case 'urlpathinfo':
+            return str_replace('%2F', '/', rawurlencode($string));
+
+        case 'quotes': 
+            // escape unescaped single quotes
+            return preg_replace("%(?<!\\\\)'%", "\\'", $string);
+
+        case 'hex': 
+            // escape every character into hex
+            $return = '';
+            for ($x = 0; $x < strlen($string); $x++) {
+                $return .= '%' . bin2hex($string[$x]);
+            } 
+            return $return;
+
+        case 'hexentity':
+            $return = '';
+            for ($x = 0; $x < strlen($string); $x++) {
+                $return .= '&#x' . bin2hex($string[$x]) . ';';
+            } 
+            return $return;
+
+        case 'decentity':
+            $return = '';
+            for ($x = 0; $x < strlen($string); $x++) {
+                $return .= '&#' . ord($string[$x]) . ';';
+            } 
+            return $return;
+
+        case 'javascript': 
+            // escape quotes and backslashes, newlines, etc.
+            return strtr($string, array('\\' => '\\\\', "'" => "\\'", '"' => '\\"', "\r" => '\\r', "\n" => '\\n', '</' => '<\/'));
+
+        case 'mail': 
+          require_once(SMARTY_PLUGINS_DIR . 'shared.mb_str_replace.php');
+          return smarty_mb_str_replace(array('@', '.'), array(' [AT] ', ' [DOT] '), $string);
+
+        case 'nonstd': 
+            // escape non-standard chars, such as ms document quotes
+            $_res = '';
+            for($_i = 0, $_len = strlen($string); $_i < $_len; $_i++) {
+                $_ord = ord(substr($string, $_i, 1)); 
+                // non-standard char, escape it
+                if ($_ord >= 126) {
+                    $_res .= '&#' . $_ord . ';';
+                } else {
+                    $_res .= substr($string, $_i, 1);
+                } 
+            } 
+            return $_res;
+
+        default:
+            return $string;
+    } 
+} 
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/plugins/modifier.exploderes.php b/onyx2/modules/templates/smarty/plugins/modifier.exploderes.php
new file mode 100644
index 0000000..1f8b6d6
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/modifier.exploderes.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Smarty plugin
+ * @package Smarty
+ * @subpackage plugins
+ */
+
+
+/**
+ * Smarty escape modifier plugin
+ *
+ * Type:     modifier<br>
+ * Name:     escape<br>
+ * Purpose:  Escape the string according to escapement type
+ * @link http://smarty.php.net/manual/en/language.modifier.escape.php
+ *          escape (Smarty online manual)
+ * @author   Monte Ohrt <monte at ohrt dot com>
+ * @param string
+ * @param html|htmlall|url|quotes|hex|hexentity|javascript
+ * @return string
+ */
+function smarty_modifier_exploderes($string, $glue = ";")
+{
+	if (ereg("{", $string))
+		return unserialize($string);
+	else
+    	return explode($glue, $string);
+}
+
+/* vim: set expandtab: */
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/plugins/modifier.gravatar.php b/onyx2/modules/templates/smarty/plugins/modifier.gravatar.php
new file mode 100644
index 0000000..e089bbb
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/modifier.gravatar.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Smarty plugin
+ * @package Smarty
+ * @subpackage plugins
+ */
+
+
+/**
+ * Smarty plugin
+ *
+ * Type:     modifier
+ * Name:     gravatar
+ * Date:     Feb 2, 2011
+ * Purpose:  print the url to the image for gravatar
+ * Example:  {$mail|gravatar}
+ * @version  1.0
+ * @author   Nemunaire <nemunaire at gmail dot com>
+ * @param int
+ * @return string
+ */
+function smarty_modifier_gravatar($mail, $comp = "")
+{
+  return "http://www.gravatar.com/avatar/".md5(strtolower(trim($mail))).$comp;
+}
+
+/* vim: set expandtab: */
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/plugins/modifier.indent.php b/onyx2/modules/templates/smarty/plugins/modifier.indent.php
new file mode 100644
index 0000000..4f2f9d8
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/modifier.indent.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Smarty plugin
+ * @package Smarty
+ * @subpackage PluginsModifier
+ */
+
+
+/**
+ * Smarty indent modifier plugin
+ *
+ * Type:     modifier<br>
+ * Name:     indent<br>
+ * Purpose:  indent lines of text
+ * @link http://smarty.php.net/manual/en/language.modifier.indent.php
+ *          indent (Smarty online manual)
+ * @author   Monte Ohrt <monte at ohrt dot com>
+ * @param string
+ * @param integer
+ * @param string
+ * @return string
+ */
+function smarty_modifier_indent($string,$chars=4,$char=" ")
+{
+    return preg_replace('!^!m',str_repeat($char,$chars),$string);
+}
+
+?>
diff --git a/onyx2/modules/templates/smarty/plugins/modifier.lower.php b/onyx2/modules/templates/smarty/plugins/modifier.lower.php
new file mode 100644
index 0000000..34a609e
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/modifier.lower.php
@@ -0,0 +1,30 @@
+<?php
+/**
+* Smarty plugin
+* 
+* @package Smarty
+* @subpackage PluginsModifier
+*/
+
+/**
+* Smarty lower modifier plugin
+* 
+* Type:     modifier<br>
+* Name:     lower<br>
+* Purpose:  convert string to lowercase
+* 
+* @link http://smarty.php.net/manual/en/language.modifier.lower.php lower (Smarty online manual)
+* @author Monte Ohrt <monte at ohrt dot com> 
+* @param string $ 
+* @return string 
+*/
+function smarty_modifier_lower($string)
+{
+    if (function_exists('mb_strtolower')) {
+        return mb_strtolower($string);
+    } else {
+        return strtolower($string);
+    } 
+} 
+
+?>
diff --git a/onyx2/modules/templates/smarty/plugins/modifier.nl2br.php b/onyx2/modules/templates/smarty/plugins/modifier.nl2br.php
new file mode 100644
index 0000000..d6fabff
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/modifier.nl2br.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Smarty plugin
+ * @package Smarty
+ * @subpackage plugins
+ */
+
+
+/**
+ * Smarty plugin
+ *
+ * Type:     modifier<br>
+ * Name:     nl2br<br>
+ * Date:     Feb 26, 2003
+ * Purpose:  convert \r\n, \r or \n to <<br>>
+ * Input:<br>
+ *         - contents = contents to replace
+ *         - preceed_test = if true, includes preceeding break tags
+ *           in replacement
+ * Example:  {$text|nl2br}
+ * @link http://smarty.php.net/manual/en/language.modifier.nl2br.php
+ *          nl2br (Smarty online manual)
+ * @version  1.0
+ * @author   Monte Ohrt <monte at ohrt dot com>
+ * @param string
+ * @return string
+ */
+function smarty_modifier_nl2br($string)
+{
+    return nl2br($string);
+}
+
+/* vim: set expandtab: */
+
+?>
diff --git a/onyx2/modules/templates/smarty/plugins/modifier.nom.php b/onyx2/modules/templates/smarty/plugins/modifier.nom.php
new file mode 100644
index 0000000..079e29d
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/modifier.nom.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Smarty plugin
+ * @package Smarty
+ * @subpackage plugins
+ */
+
+
+/**
+ * Smarty plugin
+ *
+ * Type:     modifier<br>
+ * Name:     separenombre<br>
+ * Date:     Aug 22, 2008
+ * Purpose:  separe number
+ * Example:  {$text|separenombre}
+ * @version  1.0
+ * @author   Nemunaire <nemunaire at gmail dot com>
+ * @param string
+ * @return string
+ */
+function smarty_modifier_nom($string, $type)
+{
+	global ${$type};
+    return ${$type}[$string];
+}
+
+/* vim: set expandtab: */
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/plugins/modifier.noprint.php b/onyx2/modules/templates/smarty/plugins/modifier.noprint.php
new file mode 100644
index 0000000..3e9df06
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/modifier.noprint.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Smarty plugin
+ * @package Smarty
+ * @subpackage PluginsModifier
+ */
+
+
+/**
+ * Smarty noprint modifier plugin
+ *
+ * Type:     modifier<br>
+ * Name:     noprint<br>
+ * Purpose:  return an empty string
+ * @author   Uwe Tews
+ * @param string
+ * @return string
+ */
+function smarty_modifier_noprint($string)
+{
+    return '';
+}
+
+?>
diff --git a/onyx2/modules/templates/smarty/plugins/modifier.regex_replace.php b/onyx2/modules/templates/smarty/plugins/modifier.regex_replace.php
new file mode 100644
index 0000000..9f14880
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/modifier.regex_replace.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package Smarty
+ * @subpackage PluginsModifier
+ */
+
+/**
+ * Smarty regex_replace modifier plugin
+ *
+ * Type:     modifier<br>
+ * Name:     regex_replace<br>
+ * Purpose:  regular expression search/replace
+ * @link http://smarty.php.net/manual/en/language.modifier.regex.replace.php
+ *          regex_replace (Smarty online manual)
+ * @author   Monte Ohrt <monte at ohrt dot com>
+ * @param string
+ * @param string|array
+ * @param string|array
+ * @return string
+ */
+function smarty_modifier_regex_replace($string, $search, $replace)
+{
+    if(is_array($search)) {
+      foreach($search as $idx => $s)
+        $search[$idx] = _smarty_regex_replace_check($s);
+    } else {
+      $search = _smarty_regex_replace_check($search);
+    }       
+
+    return preg_replace($search, $replace, $string);
+}
+
+function _smarty_regex_replace_check($search)
+{
+    if (($pos = strpos($search,"\0")) !== false)
+      $search = substr($search,0,$pos);
+    if (preg_match('!([a-zA-Z\s]+)$!s', $search, $match) && (strpos($match[1], 'e') !== false)) {
+        /* remove eval-modifier from $search */
+        $search = substr($search, 0, -strlen($match[1])) . preg_replace('![e\s]+!', '', $match[1]);
+    }
+    return $search;
+}
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/plugins/modifier.replace.php b/onyx2/modules/templates/smarty/plugins/modifier.replace.php
new file mode 100644
index 0000000..0636a19
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/modifier.replace.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Smarty plugin
+ * @package Smarty
+ * @subpackage PluginsModifier
+ */
+
+/**
+ * Smarty replace modifier plugin
+ * 
+ * Type:     modifier<br>
+ * Name:     replace<br>
+ * Purpose:  simple search/replace
+ * 
+ * @link http://smarty.php.net/manual/en/language.modifier.replace.php replace (Smarty online manual)
+ * @author Monte Ohrt <monte at ohrt dot com> 
+ * @author Uwe Tews 
+ * @param string $ 
+ * @param string $ 
+ * @param string $ 
+ * @return string 
+ */
+function smarty_modifier_replace($string, $search, $replace)
+{
+    require_once(SMARTY_PLUGINS_DIR . 'shared.mb_str_replace.php');
+    return smarty_mb_str_replace($search, $replace, $string);
+} 
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/plugins/modifier.separenombre.php b/onyx2/modules/templates/smarty/plugins/modifier.separenombre.php
new file mode 100644
index 0000000..4e44b8f
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/modifier.separenombre.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Smarty plugin
+ * @package Smarty
+ * @subpackage plugins
+ */
+
+
+/**
+ * Smarty plugin
+ *
+ * Type:     modifier<br>
+ * Name:     separenombre<br>
+ * Date:     Aug 22, 2008
+ * Purpose:  separe number
+ * Example:  {$text|separenombre}
+ * @version  1.0
+ * @author   Nemunaire <nemunaire at gmail dot com>
+ * @param string
+ * @return string
+ */
+function smarty_modifier_separenombre($string)
+{
+    return number_format(floor($string), 0, ',', ' ');
+}
+
+/* vim: set expandtab: */
+
+?>
diff --git a/onyx2/modules/templates/smarty/plugins/modifier.separerNombres.php b/onyx2/modules/templates/smarty/plugins/modifier.separerNombres.php
new file mode 100644
index 0000000..34f8299
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/modifier.separerNombres.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Smarty plugin
+ * @package Smarty
+ * @subpackage plugins
+ */
+
+
+/**
+ * Smarty separe number modifier plugin
+ *
+ * Type:     modifier<br>
+ * Name:     separenombre<br>
+ * Date:     Aug 22, 2008
+ * Purpose:  separe number
+ * Example:  {$int|separenombre}
+ *
+ * @version  1.0
+ * @author   Nemunaire <nemunaire at gmail dot com>
+ * @param float $
+ * @return string
+ */
+function smarty_modifier_separerNombres($int)
+{
+    return number_format(floor($int), 0, ',', ' ');
+}
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/plugins/modifier.separernombres.php b/onyx2/modules/templates/smarty/plugins/modifier.separernombres.php
new file mode 100644
index 0000000..34f8299
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/modifier.separernombres.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Smarty plugin
+ * @package Smarty
+ * @subpackage plugins
+ */
+
+
+/**
+ * Smarty separe number modifier plugin
+ *
+ * Type:     modifier<br>
+ * Name:     separenombre<br>
+ * Date:     Aug 22, 2008
+ * Purpose:  separe number
+ * Example:  {$int|separenombre}
+ *
+ * @version  1.0
+ * @author   Nemunaire <nemunaire at gmail dot com>
+ * @param float $
+ * @return string
+ */
+function smarty_modifier_separerNombres($int)
+{
+    return number_format(floor($int), 0, ',', ' ');
+}
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/plugins/modifier.spacify.php b/onyx2/modules/templates/smarty/plugins/modifier.spacify.php
new file mode 100644
index 0000000..f14e026
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/modifier.spacify.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Smarty plugin
+ * @package Smarty
+ * @subpackage PluginsModifier
+ */
+
+/**
+ * Smarty spacify modifier plugin
+ * 
+ * Type:     modifier<br>
+ * Name:     spacify<br>
+ * Purpose:  add spaces between characters in a string
+ * 
+ * @link http://smarty.php.net/manual/en/language.modifier.spacify.php spacify (Smarty online manual)
+ * @author Monte Ohrt <monte at ohrt dot com> 
+ * @param string $ 
+ * @param string $ 
+ * @return string 
+ */
+function smarty_modifier_spacify($string, $spacify_char = ' ')
+{ 
+    // mb_ functions available?
+    if (function_exists('mb_strlen') && mb_detect_encoding($string, 'UTF-8, ISO-8859-1') === 'UTF-8') {
+        $strlen = mb_strlen($string);
+        while ($strlen) {
+            $array[] = mb_substr($string, 0, 1, "UTF-8");
+            $string = mb_substr($string, 1, $strlen, "UTF-8");
+            $strlen = mb_strlen($string);
+        } 
+        return implode($spacify_char, $array);
+    } else {
+        return implode($spacify_char, preg_split('//', $string, -1));
+    } 
+} 
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/plugins/modifier.splitwords.php b/onyx2/modules/templates/smarty/plugins/modifier.splitwords.php
new file mode 100644
index 0000000..67eb0b7
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/modifier.splitwords.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Smarty plugin
+ * @package Smarty
+ * @subpackage PluginsModifier
+ */
+
+function smarty_modifier_splitwords($string, $max = 77)
+{
+  $words = preg_split('/\s/', $string);
+  $lines = array();
+  $line = '';
+  
+  foreach ($words as $k => $word)
+    {
+      $length = strlen($line . ' ' . $word);
+      if ($length <= $max)
+	$line .= ' ' . $word;
+      else if ($length > $max)
+	{
+	  if (!empty($line))
+	    $lines[] = trim($line);
+	  $line = $word;
+	}
+      else
+	{
+	  $lines[] = trim($line) . ' ' . $word;
+	  $line = '';
+	}
+    }
+  $lines[] = ($line = trim($line)) ? $line : $word;
+  
+  if (!empty($lines[1]))
+    return $lines[0]." ...";
+  else
+    return $lines[0];
+}
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/plugins/modifier.sprintf.php b/onyx2/modules/templates/smarty/plugins/modifier.sprintf.php
new file mode 100644
index 0000000..cf0b007
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/modifier.sprintf.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Smarty plugin
+ * @package Smarty
+ * @subpackage plugins
+ */
+
+
+/**
+ * Smarty plugin
+ *
+ * Type:     modifier<br>
+ * Name:     sprintf<br>
+ * Date:     Jan 29, 2009
+ * Purpose:  separe number
+ * Example:  {$text|sprintf:$LANG['test']}
+ * @version  1.0
+ * @author   Nemunaire <nemunaire at gmail dot com>
+ * @param string
+ * @return string
+ */
+function smarty_modifier_sprintf($string, $var0 = null, $var1 = null, $var2 = null, $var3 = null, $var4 = null, $var5 = null, $var6 = null, $var7 = null, $var8 = null, $var9 = null)
+{
+    for($i = -1; $i<9; $i++) {
+        if (empty(${'var'.($i+1)})) break;
+    }
+
+    if ($i == 0) return sprintf($string, $var0);
+    elseif ($i == 1) return sprintf($string, $var0, $var1);
+    elseif ($i == 2) return sprintf($string, $var0, $var1, $var2);
+    elseif ($i == 3) return sprintf($string, $var0, $var1, $var2, $var3);
+    elseif ($i == 4) return sprintf($string, $var0, $var1, $var2, $var3, $var4);
+    elseif ($i == 5) return sprintf($string, $var0, $var1, $var2, $var3, $var4, $var5);
+    elseif ($i == 6) return sprintf($string, $var0, $var1, $var2, $var3, $var4, $var5, $var6);
+    elseif ($i == 7) return sprintf($string, $var0, $var1, $var2, $var3, $var4, $var5, $var6, $var7);
+    elseif ($i == 8) return sprintf($string, $var0, $var1, $var2, $var3, $var4, $var5, $var6, $var7, $var8);
+    elseif ($i == 9) return sprintf($string, $var0, $var1, $var2, $var3, $var4, $var5, $var6, $var7, $var8, $var9);
+    else return $string;
+}
+
+/* vim: set expandtab: */
+
+?>
diff --git a/onyx2/modules/templates/smarty/plugins/modifier.status.php b/onyx2/modules/templates/smarty/plugins/modifier.status.php
new file mode 100644
index 0000000..13275b0
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/modifier.status.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * Smarty plugin
+ * @package Smarty
+ * @subpackage plugins
+ */
+
+
+/**
+ * Smarty plugin
+ *
+ * Type:     modifier
+ * Name:     status
+ * Date:     Feb 2, 2011
+ * Purpose:  print the text corresponding to the state
+ * Example:  {$int|status}
+ * @version  1.0
+ * @author   Nemunaire <nemunaire at gmail dot com>
+ * @param int
+ * @return string
+ */
+function smarty_modifier_status($int, $bool = false)
+{
+  if ($bool)
+    {
+      if ($int < 1)
+	{
+	  if ($int > -2)
+	    {
+	      if ($int == 0)
+		return "Nouveau document !";
+	      else //$int == -1
+		return "Document en cours de création/correction";
+	    }
+	  else
+	    {
+	      if ($int == -2)
+		return "Refusé";
+	      else //$int == -3
+		return "Supprimé";
+	    }
+	}
+      else
+	{
+	  if ($int > 3)
+	    {
+	      if ($int == 4)
+		return "Publié";
+	      else //$int == 5 || $int == 6
+		return "Mis en valeur";
+	    }
+	  else
+	    {
+	      if ($int == 2)
+		return "Corrigé";
+	      elseif ($int == 1)
+		return "En cours de correction";
+	      else //$int == 3
+		return "Contrôle";
+	    }
+	}
+    }
+  else
+    {
+      if ($int < 1)
+	{
+	  if ($int > -2)
+	    {
+	      if ($int == 0)
+		return "Document en attente de correction";
+	      else //$int == -1
+		return "Document à compléter";
+	    }
+	  else
+	    {
+	      if ($int == -2)
+		return "Document refusé";
+	      else //$int == -3
+		return "Document supprimé";
+	    }
+	}
+      else
+	{
+	  if ($int > 3)
+	    {
+	      if ($int == 4)
+		return "Document publié";
+	      else //$int == 5 || $int == 6
+		return "Document mis en valeur";
+	    }
+	  else
+	    {
+	      if ($int == 2)
+		return "Corrigé";
+	      elseif ($int == 1)
+		return "En cours de correction";
+	      else //$int == 3
+		return "En cours de contrôle";
+	    }
+	}
+    }
+}
+
+/* vim: set expandtab: */
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/plugins/modifier.string_format.php b/onyx2/modules/templates/smarty/plugins/modifier.string_format.php
new file mode 100644
index 0000000..fd96c8b
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/modifier.string_format.php
@@ -0,0 +1,27 @@
+<?php
+/**
+* Smarty plugin
+* 
+* @package Smarty
+* @subpackage PluginsModifier
+*/
+
+/**
+* Smarty string_format modifier plugin
+* 
+* Type:     modifier<br>
+* Name:     string_format<br>
+* Purpose:  format strings via sprintf
+* 
+* @link http://smarty.php.net/manual/en/language.modifier.string.format.php string_format (Smarty online manual)
+* @author Monte Ohrt <monte at ohrt dot com> 
+* @param string $string input string 
+* @param string $format format string 
+* @return string formatted string
+*/
+    function smarty_modifier_string_format($string, $format)
+    {
+        return sprintf($format, $string);
+    } 
+
+?>
diff --git a/onyx2/modules/templates/smarty/plugins/modifier.strip.php b/onyx2/modules/templates/smarty/plugins/modifier.strip.php
new file mode 100644
index 0000000..39f0f9f
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/modifier.strip.php
@@ -0,0 +1,31 @@
+<?php
+/**
+* Smarty plugin
+* 
+* @package Smarty
+* @subpackage PluginsModifier
+*/
+
+/**
+* Smarty strip modifier plugin
+* 
+* Type:     modifier<br>
+* Name:     strip<br>
+* Purpose:  Replace all repeated spaces, newlines, tabs
+*             with a single space or supplied replacement string.<br>
+* Example:  {$var|strip} {$var|strip:"&nbsp;"}
+* Date:     September 25th, 2002
+* 
+* @link http://smarty.php.net/manual/en/language.modifier.strip.php strip (Smarty online manual)
+* @author Monte Ohrt <monte at ohrt dot com> 
+* @version 1.0
+* @param string $ 
+* @param string $ 
+* @return string 
+*/
+function smarty_modifier_strip($text, $replace = ' ')
+{
+        return preg_replace('!\s+!', $replace, $text);
+} 
+
+?>
diff --git a/onyx2/modules/templates/smarty/plugins/modifier.strip_tags.php b/onyx2/modules/templates/smarty/plugins/modifier.strip_tags.php
new file mode 100644
index 0000000..6af08b2
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/modifier.strip_tags.php
@@ -0,0 +1,31 @@
+<?php
+/**
+* Smarty plugin
+* 
+* @package Smarty
+* @subpackage PluginsModifier
+*/
+
+/**
+* Smarty strip_tags modifier plugin
+* 
+* Type:     modifier<br>
+* Name:     strip_tags<br>
+* Purpose:  strip html tags from text
+* 
+* @link http://smarty.php.net/manual/en/language.modifier.strip.tags.php strip_tags (Smarty online manual)
+* @author Monte Ohrt <monte at ohrt dot com> 
+* @param string $ 
+* @param boolean $ 
+* @return string 
+*/
+function smarty_modifier_strip_tags($string, $replace_with_space = true)
+{
+    if ($replace_with_space) {
+            return preg_replace('!<[^>]*?>!', ' ', $string);
+    } else {
+        return strip_tags($string);
+    } 
+} 
+
+?>
diff --git a/onyx2/modules/templates/smarty/plugins/modifier.temps.php b/onyx2/modules/templates/smarty/plugins/modifier.temps.php
new file mode 100644
index 0000000..84bd479
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/modifier.temps.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Smarty plugin
+ * @package Smarty
+ * @subpackage plugins
+ */
+
+
+/**
+ * Smarty calc temps modifier plugin
+ *
+ * Type:     modifier<br>
+ * Name:     temps<br>
+ * Date:     Nov 01, 2009
+ * Purpose:  timestamp to string
+ * Example:  {$timestamp|separenombre}
+ *
+ * @version  1.0
+ * @author   Nemunaire <nemunaire at gmail dot com>
+ * @param timestamp $
+ * @return string
+ */
+function smarty_modifier_temps($time)
+{
+	$output = '';
+	$tab = array ('jour' => '86400', 'heure' => '3600', 'minute' => '60', 'seconde' => '1');
+	foreach ($tab as $key => $value) {
+		$compteur = 0;
+		while ($time > ($value-1)) {
+			$time = $time - $value;
+			$compteur++;
+		}
+		if ($compteur != 0) {
+			$output .= $compteur.' '.$key;
+			if ($compteur > 1) $output .= 's';
+			if ($value != 1) $output .= ' ';
+		}
+	}
+	if (empty($output)) return 'Instantané';
+	else return $output;
+}
+
+/* vim: set expandtab: */
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/plugins/modifier.translatedate.php b/onyx2/modules/templates/smarty/plugins/modifier.translatedate.php
new file mode 100644
index 0000000..0eff7ab
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/modifier.translatedate.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Smarty plugin
+ * @package Smarty
+ * @subpackage plugins
+ */
+
+function smarty_modifier_translatedate($string)
+{
+	$Mfr = array("janvier", "février", "mars", "avril", "mai", "juin", "juillet", "août", "septembre", "octobre", "novembre", "décembre");
+	$Men = array("January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December");
+	$Jfr = array("lundi", "mardi", "mercredi", "jeudi", "vendredi", "samedi", "dimanche");
+	$Jen = array("Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday");
+	return str_replace($Jfr, $Jen, str_replace($Mfr, $Men, $string));
+}
+
+/* vim: set expandtab: */
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/plugins/modifier.truncate.php b/onyx2/modules/templates/smarty/plugins/modifier.truncate.php
new file mode 100644
index 0000000..0e9d4b9
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/modifier.truncate.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package Smarty
+ * @subpackage PluginsModifier
+ */
+ 
+/**
+ * Smarty truncate modifier plugin
+ * 
+ * Type:     modifier<br>
+ * Name:     truncate<br>
+ * Purpose:  Truncate a string to a certain length if necessary,
+ *               optionally splitting in the middle of a word, and
+ *               appending the $etc string or inserting $etc into the middle.
+ * 
+ * @link http://smarty.php.net/manual/en/language.modifier.truncate.php truncate (Smarty online manual)
+ * @author Monte Ohrt <monte at ohrt dot com> 
+ * @param string $string input string
+ * @param integer $length lenght of truncated text
+ * @param string $etc end string
+ * @param boolean $break_words truncate at word boundary
+ * @param boolean $middle truncate in the middle of text
+ * @return string truncated string
+ */
+function smarty_modifier_truncate($string, $length = 80, $etc = '...',
+    $break_words = false, $middle = false)
+{
+    if ($length == 0)
+        return '';
+
+    if (is_callable('mb_strlen')) {
+        if (mb_detect_encoding($string, 'UTF-8, ISO-8859-1') === 'UTF-8') {
+            // $string has utf-8 encoding
+            if (mb_strlen($string) > $length) {
+                $length -= min($length, mb_strlen($etc));
+                if (!$break_words && !$middle) {
+                    $string = preg_replace('/\s+?(\S+)?$/u', '', mb_substr($string, 0, $length + 1));
+                } 
+                if (!$middle) {
+                    return mb_substr($string, 0, $length) . $etc;
+                } else {
+                    return mb_substr($string, 0, $length / 2) . $etc . mb_substr($string, - $length / 2);
+                } 
+            } else {
+                return $string;
+            } 
+        } 
+    } 
+    // $string has no utf-8 encoding
+    if (strlen($string) > $length) {
+        $length -= min($length, strlen($etc));
+        if (!$break_words && !$middle) {
+            $string = preg_replace('/\s+?(\S+)?$/', '', substr($string, 0, $length + 1));
+        } 
+        if (!$middle) {
+            return substr($string, 0, $length) . $etc;
+        } else {
+            return substr($string, 0, $length / 2) . $etc . substr($string, - $length / 2);
+        } 
+    } else {
+        return $string;
+    } 
+} 
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/plugins/modifier.txtcateg.php b/onyx2/modules/templates/smarty/plugins/modifier.txtcateg.php
new file mode 100644
index 0000000..c0bfaba
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/modifier.txtcateg.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Smarty plugin
+ * @package Smarty
+ * @subpackage plugins
+ */
+
+
+/**
+ * Smarty lower modifier plugin
+ *
+ * Type:     modifier<br>
+ * Name:     lower<br>
+ * Purpose:  convert string to lowercase
+ * @link http://smarty.php.net/manual/en/language.modifier.lower.php
+ *          lower (Smarty online manual)
+ * @author   Monte Ohrt <monte at ohrt dot com>
+ * @param string
+ * @return string
+ */
+function smarty_modifier_txtcateg($date, $sexe = "M")
+{
+    return determinTxtCateg($date, $sexe);
+}
+
+?>
diff --git a/onyx2/modules/templates/smarty/plugins/modifier.ucfirst.php b/onyx2/modules/templates/smarty/plugins/modifier.ucfirst.php
new file mode 100644
index 0000000..cd8b9d9
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/modifier.ucfirst.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Smarty plugin
+ * @package Smarty
+ * @subpackage plugins
+ */
+
+
+/**
+ * Smarty capitalize modifier plugin
+ *
+ * Type:     modifier<br>
+ * Name:     capitalize<br>
+ * Purpose:  capitalize words in the string
+ * @link http://smarty.php.net/manual/en/language.modifiers.php#LANGUAGE.MODIFIER.CAPITALIZE
+ *      capitalize (Smarty online manual)
+ * @author   Monte Ohrt <monte at ohrt dot com>
+ * @param string
+ * @return string
+ */
+function smarty_modifier_ucfirst($chaine)
+{
+    $chaineS = strtr($chaine, �äâàáåãéèëêòóôõöøìíîïùúûüýñçþÿæ�ðø�,�ÄÂÀÁÅÃÉÈËÊÒÓÔÕÖØÌÍÎÏÙÚÛÜÝÑÇÞÝÆ�ÐØ�);
+    if ($chaineS[0].$chaineS[1] != $chaine[0].$chaine[1])
+        return $chaineS[0].$chaineS[1].substr($chaine, 2);
+    else
+        return ucfirst($chaine);
+}
+
+
+?>
diff --git a/onyx2/modules/templates/smarty/plugins/modifier.upper.php b/onyx2/modules/templates/smarty/plugins/modifier.upper.php
new file mode 100644
index 0000000..fefa854
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/modifier.upper.php
@@ -0,0 +1,30 @@
+<?php
+/**
+* Smarty plugin
+* 
+* @package Smarty
+* @subpackage PluginsModifier
+*/
+
+/**
+* Smarty upper modifier plugin
+* 
+* Type:     modifier<br>
+* Name:     upper<br>
+* Purpose:  convert string to uppercase
+* 
+* @link http://smarty.php.net/manual/en/language.modifier.upper.php upper (Smarty online manual)
+* @author Monte Ohrt <monte at ohrt dot com> 
+* @param string $ 
+* @return string 
+*/
+function smarty_modifier_upper($string)
+{
+    if (function_exists('mb_strtoupper')) {
+        return mb_strtoupper($string);
+    } else {
+        return strtoupper($string);
+    } 
+} 
+
+?>
diff --git a/onyx2/modules/templates/smarty/plugins/modifier.url.php b/onyx2/modules/templates/smarty/plugins/modifier.url.php
new file mode 100644
index 0000000..4518b2b
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/modifier.url.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Smarty plugin
+ * @package Smarty
+ * @subpackage plugins
+ */
+
+
+/**
+ * Smarty plugin
+ *
+ * Type:     modifier
+ * Name:     url
+ * Date:     Feb 04, 2011
+ * Example:  {$text|url}
+ * @version  1.0
+ * @author   Nemunaire <nemunaire at gmail dot com>
+ * @param string
+ * @return string
+ */
+function smarty_modifier_url($string)
+{
+  $string = trim($string);
+  
+  if ( ctype_digit($string) )
+    {
+      return $string;
+    }
+  else
+    {     
+      // replace accented chars
+      $accents = '/&([A-Za-z]{1,2})(grave|acute|circ|cedil|uml|lig);/';
+      $string_encoded = htmlentities($string,ENT_NOQUOTES,'UTF-8');
+      
+      $string = preg_replace($accents,'$1',$string_encoded);
+      
+      // clean out the rest
+      $replace = array('([\40\'/])','([^a-zA-Z0-9-])','(-{2,})');
+      $with = array('-','','-');
+      $string = preg_replace($replace,$with,$string);
+    }
+  
+  return strtolower($string);
+}
+
+/* vim: set expandtab: */
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/plugins/modifier.wordwrap.php b/onyx2/modules/templates/smarty/plugins/modifier.wordwrap.php
new file mode 100644
index 0000000..92a79de
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/modifier.wordwrap.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Smarty plugin
+ * @package Smarty
+ * @subpackage PluginsModifier
+ */
+
+
+/**
+ * Smarty wordwrap modifier plugin
+ *
+ * Type:     modifier<br>
+ * Name:     wordwrap<br>
+ * Purpose:  wrap a string of text at a given length
+ * @link http://smarty.php.net/manual/en/language.modifier.wordwrap.php
+ *          wordwrap (Smarty online manual)
+ * @author   Monte Ohrt <monte at ohrt dot com>
+ * @param string
+ * @param integer
+ * @param string
+ * @param boolean
+ * @return string
+ */
+function smarty_modifier_wordwrap($string,$length=80,$break="\n",$cut=false)
+{
+    return wordwrap($string,$length,$break,$cut);
+}
+
+?>
diff --git a/onyx2/modules/templates/smarty/plugins/outputfilter.trimwhitespace.php b/onyx2/modules/templates/smarty/plugins/outputfilter.trimwhitespace.php
new file mode 100644
index 0000000..20e9bb6
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/outputfilter.trimwhitespace.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package Smarty
+ * @subpackage PluginsFilter
+ */
+
+/**
+ * Smarty trimwhitespace outputfilter plugin
+ *
+ * File:     outputfilter.trimwhitespace.php<br>
+ * Type:     outputfilter<br>
+ * Name:     trimwhitespace<br>
+ * Date:     Jan 25, 2003<br>
+ * Purpose:  trim leading white space and blank lines from
+ *           template source after it gets interpreted, cleaning
+ *           up code and saving bandwidth. Does not affect
+ *           <<PRE>></PRE> and <SCRIPT></SCRIPT> blocks.<br>
+ * Install:  Drop into the plugin directory, call
+ *           <code>$smarty->load_filter('output','trimwhitespace');</code>
+ *           from application.
+ * @author   Monte Ohrt <monte at ohrt dot com>
+ * @author Contributions from Lars Noschinski <lars@usenet.noschinski.de>
+ * @version  1.3
+ * @param string $source input string
+ * @param object &$smarty Smarty object
+ * @return string filtered output
+ */
+function smarty_outputfilter_trimwhitespace($source, $smarty)
+{
+    // Pull out the script blocks
+    preg_match_all("!<script[^>]*?>.*?</script>!is", $source, $match);
+    $_script_blocks = $match[0];
+    $source = preg_replace("!<script[^>]*?>.*?</script>!is",
+                           '@@@SMARTY:TRIM:SCRIPT@@@', $source);
+
+    // Pull out the pre blocks
+    preg_match_all("!<pre[^>]*?>.*?</pre>!is", $source, $match);
+    $_pre_blocks = $match[0];
+    $source = preg_replace("!<pre[^>]*?>.*?</pre>!is",
+                           '@@@SMARTY:TRIM:PRE@@@', $source);
+    
+    // Pull out the textarea blocks
+    preg_match_all("!<textarea[^>]*?>.*?</textarea>!is", $source, $match);
+    $_textarea_blocks = $match[0];
+    $source = preg_replace("!<textarea[^>]*?>.*?</textarea>!is",
+                           '@@@SMARTY:TRIM:TEXTAREA@@@', $source);
+
+    // remove all leading spaces, tabs and carriage returns NOT
+    // preceeded by a php close tag.
+    $source = trim(preg_replace('/((?<!\?>)\n)[\s]+/m', '\1', $source));
+
+    // replace textarea blocks
+    smarty_outputfilter_trimwhitespace_replace("@@@SMARTY:TRIM:TEXTAREA@@@",$_textarea_blocks, $source);
+
+    // replace pre blocks
+    smarty_outputfilter_trimwhitespace_replace("@@@SMARTY:TRIM:PRE@@@",$_pre_blocks, $source);
+
+    // replace script blocks
+    smarty_outputfilter_trimwhitespace_replace("@@@SMARTY:TRIM:SCRIPT@@@",$_script_blocks, $source);
+
+    return $source;
+}
+
+function smarty_outputfilter_trimwhitespace_replace($search_str, $replace, &$subject) {
+    $_len = strlen($search_str);
+    $_pos = 0;
+    for ($_i=0, $_count=count($replace); $_i<$_count; $_i++)
+        if (($_pos=strpos($subject, $search_str, $_pos))!==false)
+            $subject = substr_replace($subject, $replace[$_i], $_pos, $_len);
+        else
+            break;
+
+}
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/plugins/shared.escape_special_chars.php b/onyx2/modules/templates/smarty/plugins/shared.escape_special_chars.php
new file mode 100644
index 0000000..e36b2c8
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/shared.escape_special_chars.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Smarty shared plugin
+ *
+ * @package Smarty
+ * @subpackage PluginsShared
+ */
+
+/**
+ * escape_special_chars common function
+ *
+ * Function: smarty_function_escape_special_chars<br>
+ * Purpose:  used by other smarty functions to escape
+ *           special chars except for already escaped ones
+ * @author   Monte Ohrt <monte at ohrt dot com>
+ * @param string
+ * @return string
+ */
+function smarty_function_escape_special_chars($string)
+{
+    if(!is_array($string)) {
+        $string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string);
+        $string = htmlspecialchars($string);
+        $string = str_replace(array('%%%SMARTY_START%%%','%%%SMARTY_END%%%'), array('&',';'), $string);
+    }
+    return $string;
+}
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/plugins/shared.make_timestamp.php b/onyx2/modules/templates/smarty/plugins/shared.make_timestamp.php
new file mode 100644
index 0000000..9789f53
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/shared.make_timestamp.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Smarty shared plugin
+ *
+ * @package Smarty
+ * @subpackage PluginsShared
+ */
+
+/**
+ * Function: smarty_make_timestamp<br>
+ * Purpose:  used by other smarty functions to make a timestamp
+ *           from a string.
+ * @author   Monte Ohrt <monte at ohrt dot com>
+ * @param string $string
+ * @return string
+ */
+
+function smarty_make_timestamp($string)
+{
+    if(empty($string)) {
+        // use "now":
+        return time();
+    } elseif ($string instanceof DateTime) {
+        return $string->getTimestamp();
+    } elseif (strlen($string)==14 && ctype_digit($string)) {
+        // it is mysql timestamp format of YYYYMMDDHHMMSS?            
+        return mktime(substr($string, 8, 2),substr($string, 10, 2),substr($string, 12, 2),
+                       substr($string, 4, 2),substr($string, 6, 2),substr($string, 0, 4));
+    } elseif (is_numeric($string)) {
+        // it is a numeric string, we handle it as timestamp
+        return (int)$string;
+    } else {
+        // strtotime should handle it
+        $time = strtotime($string);
+        if ($time == -1 || $time === false) {
+            // strtotime() was not able to parse $string, use "now":
+            return time();
+        }
+        return $time;
+    }
+}
+
+?>
diff --git a/onyx2/modules/templates/smarty/plugins/shared.mb_str_replace.php b/onyx2/modules/templates/smarty/plugins/shared.mb_str_replace.php
new file mode 100644
index 0000000..8bc156f
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/shared.mb_str_replace.php
@@ -0,0 +1,38 @@
+<?php
+
+if(!function_exists('smarty_mb_str_replace')) {
+  function smarty_mb_str_replace($search, $replace, $subject, &$count=0) { 
+      if (!is_array($search) && is_array($replace)) { 
+          return false; 
+      } 
+      if (is_array($subject)) { 
+          // call mb_replace for each single string in $subject 
+          foreach ($subject as &$string) { 
+              $string = &smarty_mb_str_replace($search, $replace, $string, $c); 
+              $count += $c; 
+          } 
+      } elseif (is_array($search)) { 
+          if (!is_array($replace)) { 
+              foreach ($search as &$string) { 
+                  $subject = smarty_mb_str_replace($string, $replace, $subject, $c); 
+                  $count += $c; 
+              } 
+          } else { 
+              $n = max(count($search), count($replace)); 
+              while ($n--) { 
+                  $subject = smarty_mb_str_replace(current($search), current($replace), $subject, $c); 
+                  $count += $c; 
+                  next($search); 
+                  next($replace); 
+              } 
+          } 
+      } else { 
+          $parts = mb_split(preg_quote($search), $subject); 
+          $count = count($parts)-1; 
+          $subject = implode($replace, $parts); 
+      } 
+      return $subject; 
+  }
+}
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/plugins/variablefilter.htmlspecialchars.php b/onyx2/modules/templates/smarty/plugins/variablefilter.htmlspecialchars.php
new file mode 100644
index 0000000..4d3550c
--- /dev/null
+++ b/onyx2/modules/templates/smarty/plugins/variablefilter.htmlspecialchars.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Smarty plugin
+ * 
+ * @package Smarty
+ * @subpackage PluginsFilter
+ */
+
+/**
+ * Smarty htmlspecialchars variablefilter plugin
+ * 
+ * @param string $source input string
+ * @param object $ &$smarty Smarty object
+ * @return string filtered output
+ */
+
+function smarty_variablefilter_htmlspecialchars($source, $smarty)
+{
+    return htmlspecialchars($source, ENT_QUOTES);
+} 
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_cacheresource_file.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_cacheresource_file.php
new file mode 100644
index 0000000..c2f9a72
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_cacheresource_file.php
@@ -0,0 +1,205 @@
+<?php
+
+/**
+ * Smarty Internal Plugin CacheResource File
+ * 
+ * Implements the file system as resource for the HTML cache
+ * Version ussing nocache inserts
+ * 
+ * @package Smarty
+ * @subpackage Cacher
+ * @author Uwe Tews 
+ */
+
+/**
+ * This class does contain all necessary methods for the HTML cache on file system
+ */
+class Smarty_Internal_CacheResource_File {
+    function __construct($smarty)
+    {
+        $this->smarty = $smarty;
+    } 
+    /**
+     * Returns the filepath of the cached template output
+     * 
+     * @param object $_template current template
+     * @return string the cache filepath
+     */
+    public function getCachedFilepath($_template)
+    {
+        $_source_file_path = str_replace(':', '.', $_template->getTemplateFilepath());
+        $_cache_id = isset($_template->cache_id) ? preg_replace('![^\w\|]+!', '_', $_template->cache_id) : null;
+        $_compile_id = isset($_template->compile_id) ? preg_replace('![^\w\|]+!', '_', $_template->compile_id) : null;
+        $_filepath = $_template->templateUid; 
+        // if use_sub_dirs, break file into directories
+        if ($this->smarty->use_sub_dirs) {
+            $_filepath = substr($_filepath, 0, 2) . DS
+             . substr($_filepath, 2, 2) . DS
+             . substr($_filepath, 4, 2) . DS
+             . $_filepath;
+        } 
+        $_compile_dir_sep = $this->smarty->use_sub_dirs ? DS : '^';
+        if (isset($_cache_id)) {
+            $_cache_id = str_replace('|', $_compile_dir_sep, $_cache_id) . $_compile_dir_sep;
+        } else {
+            $_cache_id = '';
+        } 
+        if (isset($_compile_id)) {
+            $_compile_id = $_compile_id . $_compile_dir_sep;
+        } else {
+            $_compile_id = '';
+        } 
+        $_cache_dir = $this->smarty->cache_dir;
+        if (strpos('/\\', substr($_cache_dir, -1)) === false) {
+            $_cache_dir .= DS;
+        } 
+        return $_cache_dir . $_cache_id . $_compile_id . $_filepath . '.' . basename($_source_file_path) . '.php';
+    } 
+
+    /**
+     * Returns the timpestamp of the cached template output
+     * 
+     * @param object $_template current template
+     * @return integer |booelan the template timestamp or false if the file does not exist
+     */
+    public function getCachedTimestamp($_template)
+    { 
+        // return @filemtime ($_template->getCachedFilepath());
+        return ($_template->getCachedFilepath() && file_exists($_template->getCachedFilepath())) ? filemtime($_template->getCachedFilepath()) : false ;
+    } 
+
+    /**
+     * Returns the cached template output
+     * 
+     * @param object $_template current template
+     * @return string |booelan the template content or false if the file does not exist
+     */
+    public function getCachedContents($_template, $no_render = false)
+    {
+    	if (!$no_render) {
+        	ob_start();
+    	}
+        $_smarty_tpl = $_template;
+        include $_template->getCachedFilepath();
+        if ($no_render) {
+        	return null;
+        } else {
+          return ob_get_clean();
+        }
+    } 
+
+    /**
+     * Writes the rendered template output to cache file
+     * 
+     * @param object $_template current template
+     * @return boolean status
+     */
+    public function writeCachedContent($_template, $content)
+    {
+        if (!$_template->resource_object->isEvaluated) {
+            if (Smarty_Internal_Write_File::writeFile($_template->getCachedFilepath(), $content, $this->smarty) === true) {
+                $_template->cached_timestamp = filemtime($_template->getCachedFilepath());
+                return true;
+            } 
+        } 
+        return false;
+    } 
+
+    /**
+     * Empty cache folder
+     * 
+     * @param integer $exp_time expiration time
+     * @return integer number of cache files deleted
+     */
+    public function clearAll($exp_time = null)
+    {
+        return $this->clear(null, null, null, $exp_time);
+    } 
+    /**
+     * Empty cache for a specific template
+     * 
+     * @param string $resource_name template name
+     * @param string $cache_id cache id
+     * @param string $compile_id compile id
+     * @param integer $exp_time expiration time
+     * @return integer number of cache files deleted
+     */
+    public function clear($resource_name, $cache_id, $compile_id, $exp_time)
+    {
+        $_cache_id = isset($cache_id) ? preg_replace('![^\w\|]+!', '_', $cache_id) : null;
+        $_compile_id = isset($compile_id) ? preg_replace('![^\w\|]+!', '_', $compile_id) : null;
+        $_dir_sep = $this->smarty->use_sub_dirs ? '/' : '^';
+        $_compile_id_offset = $this->smarty->use_sub_dirs ? 3 : 0;
+        $_dir = rtrim($this->smarty->cache_dir, '/\\') . DS;
+        $_dir_length = strlen($_dir);
+        if (isset($_cache_id)) {
+            $_cache_id_parts = explode('|', $_cache_id);
+            $_cache_id_parts_count = count($_cache_id_parts);
+            if ($this->smarty->use_sub_dirs) {
+                foreach ($_cache_id_parts as $id_part) {
+                    $_dir .= $id_part . DS;
+                } 
+            } 
+        } 
+        if (isset($resource_name)) {
+            $_save_stat = $this->smarty->caching;
+            $this->smarty->caching = true;
+            $tpl = new $this->smarty->template_class($resource_name, $this->smarty); 
+            // remove from template cache
+            unset($this->smarty->template_objects[crc32($tpl->template_resource . $tpl->cache_id . $tpl->compile_id)]);
+            $this->smarty->caching = $_save_stat;
+            if ($tpl->isExisting()) {
+                $_resourcename_parts = basename(str_replace('^', '/', $tpl->getCachedFilepath()));
+            } else {
+                return 0;
+            } 
+        } 
+        $_count = 0;
+        if (file_exists($_dir)) {
+            $_cacheDirs = new RecursiveDirectoryIterator($_dir);
+            $_cache = new RecursiveIteratorIterator($_cacheDirs, RecursiveIteratorIterator::CHILD_FIRST);
+            foreach ($_cache as $_file) {
+                if (strpos($_file, '.svn') !== false) continue; 
+                // directory ?
+                if ($_file->isDir()) {
+                    if (!$_cache->isDot()) {
+                        // delete folder if empty
+                        @rmdir($_file->getPathname());
+                    } 
+                } else {
+                    $_parts = explode($_dir_sep, str_replace('\\', '/', substr((string)$_file, $_dir_length)));
+                    $_parts_count = count($_parts); 
+                    // check name
+                    if (isset($resource_name)) {
+                        if ($_parts[$_parts_count-1] != $_resourcename_parts) {
+                            continue;
+                        } 
+                    } 
+                    // check compile id
+                    if (isset($_compile_id) && (!isset($_parts[$_parts_count-2 - $_compile_id_offset]) || $_parts[$_parts_count-2 - $_compile_id_offset] != $_compile_id)) {
+                        continue;
+                    } 
+                    // check cache id
+                    if (isset($_cache_id)) {
+                        // count of cache id parts
+                        $_parts_count = (isset($_compile_id)) ? $_parts_count - 2 - $_compile_id_offset : $_parts_count - 1 - $_compile_id_offset;
+                        if ($_parts_count < $_cache_id_parts_count) {
+                            continue;
+                        } 
+                        for ($i = 0; $i < $_cache_id_parts_count; $i++) {
+                            if ($_parts[$i] != $_cache_id_parts[$i]) continue 2;
+                        } 
+                    } 
+                    // expired ?
+                    if (isset($exp_time) && time() - @filemtime($_file) < $exp_time) {
+                        continue;
+                    } 
+                    $_count += @unlink((string) $_file) ? 1 : 0;
+                } 
+            } 
+        } 
+        return $_count;
+    } 
+} 
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_append.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_append.php
new file mode 100644
index 0000000..98e696e
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_append.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * Smarty Internal Plugin Compile Append
+ * 
+ * Compiles the {append} tag
+ * 
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews 
+ */
+/**
+ * Smarty Internal Plugin Compile Append Class
+ */
+class Smarty_Internal_Compile_Append extends Smarty_Internal_Compile_Assign {
+
+    /**
+     * Compiles code for the {append} tag
+     * 
+     * @param array $args array with attributes from parser
+     * @param object $compiler compiler object
+     * @param array $parameter array with compilation parameter
+     * @return string compiled code
+     */
+    public function compile($args, $compiler, $parameter)
+    {
+        $this->compiler = $compiler;
+        // the following must be assigned at runtime because it will be overwritten in parent class
+        $this->required_attributes = array('var', 'value');
+        $this->shorttag_order = array('var', 'value');
+        $this->optional_attributes = array('scope','index');
+        // check and get attributes
+        $_attr = $this->_get_attributes($args); 
+        // map to compile assign attributes
+        if (isset($_attr['index'])) {
+            $_params['smarty_internal_index'] = '[' . $_attr['index'] . ']';
+            unset($_attr['index']);
+        } else {
+            $_params['smarty_internal_index'] = '[]';
+        }
+        $_new_attr = array();
+        foreach ($_attr as $key => $value) {
+            $_new_attr[] = array($key => $value);
+        } 
+        // call compile assign
+        return parent::compile($_new_attr, $compiler, $_params);
+    } 
+} 
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_assign.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_assign.php
new file mode 100644
index 0000000..8d8c643
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_assign.php
@@ -0,0 +1,64 @@
+<?php
+
+/**
+ * Smarty Internal Plugin Compile Assign
+ * 
+ * Compiles the {assign} tag
+ * 
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews 
+ */
+
+/**
+ * Smarty Internal Plugin Compile Assign Class
+ */
+class Smarty_Internal_Compile_Assign extends Smarty_Internal_CompileBase {
+    /**
+     * Compiles code for the {assign} tag
+     * 
+     * @param array $args array with attributes from parser
+     * @param object $compiler compiler object
+     * @param array $parameter array with compilation parameter
+     * @return string compiled code
+     */
+    public function compile($args, $compiler, $parameter)
+    {
+        $this->compiler = $compiler;
+        // the following must be assigned at runtime because it will be overwritten in Smarty_Internal_Compile_Append
+        $this->required_attributes = array('var', 'value');
+        $this->shorttag_order = array('var', 'value');
+        $this->optional_attributes = array('scope');
+        $_nocache = 'null';
+        $_scope = 'null'; 
+        // check and get attributes
+        $_attr = $this->_get_attributes($args); 
+		// nocache ?
+        if ($this->compiler->tag_nocache || $this->compiler->nocache) {
+            $_nocache = 'true'; 
+            // create nocache var to make it know for further compiling
+            $compiler->template->tpl_vars[trim($_attr['var'], "'")] = new Smarty_variable(null, true);
+        } 
+        // scope setup
+        if (isset($_attr['scope'])) {
+            $_attr['scope'] = trim($_attr['scope'], "'\"");
+            if ($_attr['scope'] == 'parent') {
+                $_scope = Smarty::SCOPE_PARENT;
+            } elseif ($_attr['scope'] == 'root') {
+                $_scope = Smarty::SCOPE_ROOT;
+            } elseif ($_attr['scope'] == 'global') {
+                $_scope = Smarty::SCOPE_GLOBAL;
+            } else {
+                $this->compiler->trigger_template_error('illegal value for "scope" attribute', $this->compiler->lex->taglineno);
+            } 
+        } 
+        // compiled output
+        if (isset($parameter['smarty_internal_index'])) {
+            return "<?php if (!isset(\$_smarty_tpl->tpl_vars[$_attr[var]]) || !is_array(\$_smarty_tpl->tpl_vars[$_attr[var]]->value)) \$_smarty_tpl->createLocalArrayVariable($_attr[var], $_nocache, $_scope);\n\$_smarty_tpl->tpl_vars[$_attr[var]]->value$parameter[smarty_internal_index] = $_attr[value];?>";
+        } else {
+            return "<?php \$_smarty_tpl->tpl_vars[$_attr[var]] = new Smarty_variable($_attr[value], $_nocache, $_scope);?>";
+        } 
+    } 
+} 
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_block.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_block.php
new file mode 100644
index 0000000..cd1ca28
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_block.php
@@ -0,0 +1,187 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Block
+ * 
+ * Compiles the {block}{/block} tags
+ * 
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews 
+ */
+
+/**
+ * Smarty Internal Plugin Compile Block Class
+ */
+class Smarty_Internal_Compile_Block extends Smarty_Internal_CompileBase {
+	// attribute definitions
+    public $required_attributes = array('name');
+    public $shorttag_order = array('name');
+    /**
+     * Compiles code for the {block} tag
+     * 
+     * @param array $args array with attributes from parser
+     * @param object $compiler compiler object
+     * @return boolean true
+     */
+    public function compile($args, $compiler)
+    {
+        $this->compiler = $compiler;
+        // check and get attributes
+        $_attr = $this->_get_attributes($args);
+        $save = array($_attr, $compiler->parser->current_buffer, $this->compiler->nocache, $this->compiler->smarty->merge_compiled_includes, $compiler->smarty->inheritance);
+        $this->_open_tag('block', $save);
+        if ($_attr['nocache'] == true) {
+            $compiler->nocache = true;
+        }
+        // set flag for {block} tag
+        $compiler->smarty->inheritance = true;
+        // must merge includes
+        $this->compiler->smarty->merge_compiled_includes = true; 
+
+        $compiler->parser->current_buffer = new _smarty_template_buffer($compiler->parser);
+        $compiler->has_code = false;
+        return true;
+    } 
+
+
+    static function saveBlockData($block_content, $block_tag, $template, $filepath)
+    {
+    	$_rdl = preg_quote($template->smarty->right_delimiter);
+        $_ldl = preg_quote($template->smarty->left_delimiter);
+
+        if (0 == preg_match("!({$_ldl}block\s+)(name=)?(\w+|'.*'|\".*\")(\s*?)?((append|prepend|nocache)(=true)?)?(\s*{$_rdl})!", $block_tag, $_match)) {
+            $error_text = 'Syntax Error in template "' . $template->getTemplateFilepath() . '"   "' . htmlspecialchars($block_tag) . '" illegal options';
+            throw new SmartyCompilerException($error_text);
+        } else {
+            $_name = trim($_match[3], '\'"'); 
+            // replace {$smarty.block.child}
+            if (strpos($block_content, $template->smarty->left_delimiter . '$smarty.block.child' . $template->smarty->right_delimiter) !== false) {
+                if (isset($template->block_data[$_name])) {
+                    $block_content = str_replace($template->smarty->left_delimiter . '$smarty.block.child' . $template->smarty->right_delimiter,
+                        $template->block_data[$_name]['source'], $block_content);
+                    unset($template->block_data[$_name]);
+                } else {
+                    $block_content = str_replace($template->smarty->left_delimiter . '$smarty.block.child' . $template->smarty->right_delimiter,
+                        '', $block_content);
+                } 
+            } 
+            if (isset($template->block_data[$_name])) {
+                if (strpos($template->block_data[$_name]['source'], '%%%%SMARTY_PARENT%%%%') !== false) {
+                    $template->block_data[$_name]['source'] =
+                    str_replace('%%%%SMARTY_PARENT%%%%', $block_content, $template->block_data[$_name]['source']);
+                } elseif ($template->block_data[$_name]['mode'] == 'prepend') {
+                    $template->block_data[$_name]['source'] .= $block_content;
+                } elseif ($template->block_data[$_name]['mode'] == 'append') {
+                    $template->block_data[$_name]['source'] = $block_content . $template->block_data[$_name]['source'];
+                } 
+            } else {
+                $template->block_data[$_name]['source'] = $block_content;
+            } 
+            if ($_match[6] == 'append') {
+                $template->block_data[$_name]['mode'] = 'append';
+            } elseif ($_match[6] == 'prepend') {
+                $template->block_data[$_name]['mode'] = 'prepend';
+            } else {
+                $template->block_data[$_name]['mode'] = 'replace';
+            } 
+            $template->block_data[$_name]['file'] = $filepath;
+        }
+    }
+
+	static function compileChildBlock ($compiler, $_name = null)
+	{
+		$_output = '';
+        // if called by {$smarty.block.child} we must search the name of enclosing {block}
+		if ($_name == null) {
+        	$stack_count = count($compiler->_tag_stack);
+            while (--$stack_count >= 0) {
+            	if ($compiler->_tag_stack[$stack_count][0] == 'block') {
+                	$_name = trim($compiler->_tag_stack[$stack_count][1][0]['name'] ,"'\"");
+                	break;
+                }
+            }
+		// flag that child is already compile by {$smarty.block.child} inclusion
+        $compiler->template->block_data[$_name]['compiled'] = true;
+        }
+		if ($_name == null) {
+       		$compiler->trigger_template_error('{$smarty.block.child} used out of context', $this->compiler->lex->taglineno);
+		}
+		// undefined child?
+		if (!isset($compiler->template->block_data[$_name])) {
+       		return '';
+		}
+		$_tpl = new Smarty_Internal_template ('eval:' . $compiler->template->block_data[$_name]['source'], $compiler->smarty, $compiler->template, $compiler->template->cache_id, 
+		               $compiler->template->compile_id = null, $compiler->template->caching, $compiler->template->cache_lifetime);
+		$_tpl->properties['nocache_hash'] = $compiler->template->properties['nocache_hash'];
+		$_tpl->template_filepath = $compiler->template->block_data[$_name]['file'];
+		if ($compiler->nocache) {
+			$_tpl->forceNocache = 2;
+		} else {
+			$_tpl->forceNocache = 1;
+		}
+		$_tpl->suppressHeader = true;
+		$_tpl->suppressFileDependency = true;
+		if (strpos($compiler->template->block_data[$_name]['source'], '%%%%SMARTY_PARENT%%%%') !== false) {
+			$_output = str_replace('%%%%SMARTY_PARENT%%%%', $compiler->parser->current_buffer->to_smarty_php(), $_tpl->getCompiledTemplate());
+		} elseif ($compiler->template->block_data[$_name]['mode'] == 'prepend') {
+			$_output = $_tpl->getCompiledTemplate() . $compiler->parser->current_buffer->to_smarty_php();
+		} elseif ($compiler->template->block_data[$_name]['mode'] == 'append') {
+			$_output = $compiler->parser->current_buffer->to_smarty_php() . $_tpl->getCompiledTemplate();
+		} elseif (!empty($compiler->template->block_data[$_name])) {
+			$_output = $_tpl->getCompiledTemplate();
+		}
+		$compiler->template->properties['file_dependency'] = array_merge($compiler->template->properties['file_dependency'], $_tpl->properties['file_dependency']);
+		$compiler->template->properties['function'] = array_merge($compiler->template->properties['function'], $_tpl->properties['function']);
+		if ($_tpl->has_nocache_code) {
+			$compiler->template->has_nocache_code = true;
+		}
+		foreach($_tpl->required_plugins as $code => $tmp1) {
+			foreach($tmp1 as $name => $tmp) {
+				foreach($tmp as $type => $data) {
+					$compiler->template->required_plugins[$code][$name][$type] = $data;
+				}
+			}
+		}
+		unset($_tpl);
+		return $_output;
+	}
+
+}
+
+/**
+ * Smarty Internal Plugin Compile BlockClose Class
+ */
+class Smarty_Internal_Compile_Blockclose extends Smarty_Internal_CompileBase {
+    /**
+     * Compiles code for the {/block} tag
+     * 
+     * @param array $args array with attributes from parser
+     * @param object $compiler compiler object
+     * @return string compiled code
+     */
+    public function compile($args, $compiler)
+    {
+        $this->compiler = $compiler;
+        $this->smarty = $compiler->smarty;
+        $this->compiler->has_code = true; 
+        // check and get attributes
+        $_attr = $this->_get_attributes($args);
+        $saved_data = $this->_close_tag(array('block'));
+        $_name = trim($saved_data[0]['name'], "\"'");
+        if (isset($compiler->template->block_data[$_name]) && !isset($compiler->template->block_data[$_name]['compiled'])) {
+        	$_output = Smarty_Internal_Compile_Block::compileChildBlock($compiler, $_name);
+        } else {
+            $_output = $compiler->parser->current_buffer->to_smarty_php();
+            unset ($compiler->template->block_data[$_name]['compiled']);
+        }
+        // reset flags
+        $compiler->parser->current_buffer = $saved_data[1];
+        $compiler->nocache = $saved_data[2];
+        $compiler->smarty->merge_compiled_includes = $saved_data[3];
+        $compiler->smarty->inheritance = $saved_data[4];
+        // $_output content has already nocache code processed
+        $compiler->suppressNocacheProcessing = true;
+        return $_output;
+    } 
+} 
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_break.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_break.php
new file mode 100644
index 0000000..0c0bee1
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_break.php
@@ -0,0 +1,65 @@
+<?php
+
+/**
+ * Smarty Internal Plugin Compile Break
+ * 
+ * Compiles the {break} tag
+ * 
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews 
+ */
+/**
+ * Smarty Internal Plugin Compile Break Class
+ */
+class Smarty_Internal_Compile_Break extends Smarty_Internal_CompileBase {
+	// attribute definitions
+    public $optional_attributes = array('levels'); 
+    public $shorttag_order = array('levels');
+
+
+    /**
+     * Compiles code for the {break} tag
+     * 
+     * @param array $args array with attributes from parser
+     * @param object $compiler compiler object
+     * @param array $parameter array with compilation parameter
+     * @return string compiled code
+     */
+    public function compile($args, $compiler, $parameter)
+    {    
+        $this->compiler = $compiler;
+        $this->smarty = $compiler->smarty;
+        // check and get attributes
+        $_attr = $this->_get_attributes($args);
+
+        if ($_attr['nocache'] === true) {
+        	$this->compiler->trigger_template_error('nocache option not allowed', $this->compiler->lex->taglineno);
+        }
+
+        if (isset($_attr['levels'])) {
+            if (!is_numeric($_attr['levels'])) {
+                $this->compiler->trigger_template_error('level attribute must be a numeric constant', $this->compiler->lex->taglineno);
+            } 
+            $_levels = $_attr['levels'];
+        } else {
+            $_levels = 1;
+        } 
+        $level_count = $_levels;
+        $stack_count = count($compiler->_tag_stack) - 1;
+        while ($level_count > 0 && $stack_count >= 0) {
+            if (in_array($compiler->_tag_stack[$stack_count][0], array('for', 'foreach', 'while', 'section'))) {
+                $level_count--;
+            } 
+            $stack_count--;
+        } 
+        if ($level_count != 0) {
+            $this->compiler->trigger_template_error("cannot break {$_levels} level(s)", $this->compiler->lex->taglineno);
+        } 
+        // this tag does not return compiled code
+        $this->compiler->has_code = true;
+        return "<?php break {$_levels}?>";
+    } 
+} 
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_call.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_call.php
new file mode 100644
index 0000000..50ba632
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_call.php
@@ -0,0 +1,108 @@
+<?php
+
+/**
+ * Smarty Internal Plugin Compile Function_Call
+ * 
+ * Compiles the calls of user defined tags defined by {function}
+ * 
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews 
+ */
+
+/**
+ * Smarty Internal Plugin Compile Function_Call Class
+ */
+class Smarty_Internal_Compile_Call extends Smarty_Internal_CompileBase {
+	// attribute definitions
+    public $required_attributes = array('name');
+    public $shorttag_order = array('name');
+    public $optional_attributes = array('_any'); 
+
+    /**
+     * Compiles the calls of user defined tags defined by {function}
+     * 
+     * @param array $args array with attributes from parser
+     * @param object $compiler compiler object
+     * @param array $parameter array with compilation parameter
+     * @return string compiled code
+     */
+    public function compile($args, $compiler)
+    {
+        $this->compiler = $compiler;
+        $this->smarty = $compiler->smarty;
+        // check and get attributes
+        $_attr = $this->_get_attributes($args); 
+        // save possible attributes
+        if (isset($_attr['assign'])) {
+            // output will be stored in a smarty variable instead of beind displayed
+            $_assign = $_attr['assign'];
+        } 
+        $_name = $_attr['name'];
+        unset($_attr['name'], $_attr['assign'], $_attr['nocache']); 
+        // set flag (compiled code of {function} must be included in cache file
+        if ($compiler->nocache || $compiler->tag_nocache) {
+            $_nocache = 'true';
+        } else {
+            $_nocache = 'false';
+        } 
+        $_paramsArray = array();
+        foreach ($_attr as $_key => $_value) {
+            if (is_int($_key)) {
+                $_paramsArray[] = "$_key=>$_value";
+            } else {
+                $_paramsArray[] = "'$_key'=>$_value";
+            } 
+        }
+        if (isset($compiler->template->properties['function'][$_name]['parameter'])) {
+            foreach ($compiler->template->properties['function'][$_name]['parameter'] as $_key => $_value) {
+                if (!isset($_attr[$_key])) {
+                    if (is_int($_key)) {
+                        $_paramsArray[] = "$_key=>$_value";
+                    } else {
+                        $_paramsArray[] = "'$_key'=>$_value";
+                    } 
+                } 
+            } 
+        } elseif (isset($this->smarty->template_functions[$_name]['parameter'])) {
+           foreach ($this->smarty->template_functions[$_name]['parameter'] as $_key => $_value) {
+                if (!isset($_attr[$_key])) {
+                    if (is_int($_key)) {
+                        $_paramsArray[] = "$_key=>$_value";
+                    } else {
+                        $_paramsArray[] = "'$_key'=>$_value";
+                    } 
+                } 
+            } 
+        }
+        //varibale name?
+        if (!(strpos($_name,'$')===false)) {
+        	$call_cache = $_name;
+        	$call_function = '$tmp = "smarty_template_function_".'.$_name.'; $tmp';
+       	} else {
+        	$_name = trim($_name, "'\"");
+       		$call_cache = "'{$_name}'";
+         	$call_function = 'smarty_template_function_'.$_name;
+        }
+      	
+        $_params = 'array(' . implode(",", $_paramsArray) . ')';
+    	$_hash = str_replace('-','_',$compiler->template->properties['nocache_hash']);
+        // was there an assign attribute
+        if (isset($_assign)) {
+            if ($compiler->template->caching) {
+                $_output = "<?php ob_start(); Smarty_Internal_Function_Call_Handler::call ({$call_cache},\$_smarty_tpl,{$_params},'{$_hash}',{$_nocache}); \$_smarty_tpl->assign({$_assign}, ob_get_clean());?>\n";
+            } else {
+                $_output = "<?php ob_start(); {$call_function}(\$_smarty_tpl,{$_params}); \$_smarty_tpl->assign({$_assign}, ob_get_clean());?>\n";
+            } 
+        } else {
+            if ($compiler->template->caching) {
+                $_output = "<?php Smarty_Internal_Function_Call_Handler::call ({$call_cache},\$_smarty_tpl,{$_params},'{$_hash}',{$_nocache});?>\n";
+            } else {
+                $_output = "<?php {$call_function}(\$_smarty_tpl,{$_params});?>\n";
+            } 
+        } 
+        return $_output;
+    } 
+} 
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_capture.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_capture.php
new file mode 100644
index 0000000..74ade68
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_capture.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Capture
+ * 
+ * Compiles the {capture} tag
+ * 
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews 
+ */
+
+/**
+ * Smarty Internal Plugin Compile Capture Class
+ */
+class Smarty_Internal_Compile_Capture extends Smarty_Internal_CompileBase {
+	// attribute definitions
+    public $shorttag_order = array('name');
+    public $optional_attributes = array('name', 'assign', 'append'); 
+
+    /**
+     * Compiles code for the {capture} tag
+     * 
+     * @param array $args array with attributes from parser
+     * @param object $compiler compiler object
+     * @return string compiled code
+     */
+    public function compile($args, $compiler)
+    {
+        $this->compiler = $compiler;
+        // check and get attributes
+        $_attr = $this->_get_attributes($args);
+
+        $buffer = isset($_attr['name']) ? $_attr['name'] : "'default'";
+        $assign = isset($_attr['assign']) ? $_attr['assign'] : null;
+        $append = isset($_attr['append']) ? $_attr['append'] : null;
+
+        $this->compiler->_capture_stack[] = array($buffer, $assign, $append, $this->compiler->nocache);
+        // maybe nocache because of nocache variables
+        $this->compiler->nocache = $this->compiler->nocache | $this->compiler->tag_nocache; 
+        $_output = "<?php ob_start(); ?>";
+
+        return $_output;
+    } 
+} 
+
+/**
+ * Smarty Internal Plugin Compile Captureclose Class
+ */
+class Smarty_Internal_Compile_CaptureClose extends Smarty_Internal_CompileBase {
+    /**
+     * Compiles code for the {/capture} tag
+     * 
+     * @param array $args array with attributes from parser
+     * @param object $compiler compiler object
+     * @return string compiled code
+     */
+    public function compile($args, $compiler)
+    {
+        $this->compiler = $compiler; 
+        // check and get attributes
+        $_attr = $this->_get_attributes($args);
+        // must endblock be nocache?
+        if ($this->compiler->nocache) {
+            $this->compiler->tag_nocache = true;
+        } 
+
+        list($buffer, $assign, $append, $this->compiler->nocache) = array_pop($this->compiler->_capture_stack);
+
+        $_output = "<?php ";
+        if (isset($assign)) {
+            $_output .= " \$_smarty_tpl->assign($assign, ob_get_contents());";
+        } 
+        if (isset($append)) {
+            $_output .= " \$_smarty_tpl->append($append, ob_get_contents());";
+        } 
+        $_output .= " Smarty::\$_smarty_vars['capture'][$buffer]=ob_get_clean();?>";
+        return $_output;
+    } 
+} 
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_config_load.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_config_load.php
new file mode 100644
index 0000000..733e1ac
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_config_load.php
@@ -0,0 +1,64 @@
+<?php
+
+/**
+ * Smarty Internal Plugin Compile Config Load
+ * 
+ * Compiles the {config load} tag
+ * 
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews 
+ */
+
+/**
+ * Smarty Internal Plugin Compile Config Load Class
+ */
+class Smarty_Internal_Compile_Config_Load extends Smarty_Internal_CompileBase {
+	// attribute definitions
+    public $required_attributes = array('file');
+    public $shorttag_order = array('file','section');
+    public $optional_attributes = array('section', 'scope'); 
+
+    /**
+     * Compiles code for the {config_load} tag
+     * 
+     * @param array $args array with attributes from parser
+     * @param object $compiler compiler object
+     * @return string compiled code
+     */
+    public function compile($args, $compiler)
+    {
+        $this->compiler = $compiler;
+        // check and get attributes
+        $_attr = $this->_get_attributes($args);
+        
+        if ($_attr['nocache'] === true) {
+        	$this->compiler->trigger_template_error('nocache option not allowed', $this->compiler->lex->taglineno);
+        }
+
+         
+        // save posible attributes
+        $conf_file = $_attr['file'];
+        if (isset($_attr['section'])) {
+            $section = $_attr['section'];
+        } else {
+            $section = 'null';
+        } 
+        $scope = 'local';
+        // scope setup
+        if (isset($_attr['scope'])) {
+            $_attr['scope'] = trim($_attr['scope'], "'\"");
+            if (in_array($_attr['scope'],array('local','parent','root','global'))) {
+                $scope = $_attr['scope'];
+           } else {
+                $this->compiler->trigger_template_error('illegal value for "scope" attribute', $this->compiler->lex->taglineno);
+           } 
+        } 
+        // create config object
+        $_output = "<?php  \$_config = new Smarty_Internal_Config($conf_file, \$_smarty_tpl->smarty, \$_smarty_tpl);";
+        $_output .= "\$_config->loadConfigVars($section, '$scope'); ?>";
+        return $_output;
+    } 
+} 
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_continue.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_continue.php
new file mode 100644
index 0000000..ddbbc81
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_continue.php
@@ -0,0 +1,64 @@
+<?php
+
+/**
+ * Smarty Internal Plugin Compile Continue
+ * 
+ * Compiles the {continue} tag
+ * 
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews 
+ */
+/**
+ * Smarty Internal Plugin Compile Continue Class
+ */
+class Smarty_Internal_Compile_Continue extends Smarty_Internal_CompileBase {
+	// attribute definitions
+    public $optional_attributes = array('levels'); 
+    public $shorttag_order = array('levels');
+
+    /**
+     * Compiles code for the {continue} tag
+     * 
+     * @param array $args array with attributes from parser
+     * @param object $compiler compiler object
+     * @param array $parameter array with compilation parameter
+     * @return string compiled code
+     */
+    public function compile($args, $compiler, $parameter)
+    {
+        $this->compiler = $compiler;
+        $this->smarty = $compiler->smarty;
+        // check and get attributes
+        $_attr = $this->_get_attributes($args);
+
+        if ($_attr['nocache'] === true) {
+        	$this->compiler->trigger_template_error('nocache option not allowed', $this->compiler->lex->taglineno);
+        }
+
+        if (isset($_attr['levels'])) {
+            if (!is_numeric($_attr['levels'])) {
+                $this->compiler->trigger_template_error('level attribute must be a numeric constant', $this->compiler->lex->taglineno);
+            } 
+            $_levels = $_attr['levels'];
+        } else {
+            $_levels = 1;
+        } 
+        $level_count = $_levels;
+        $stack_count = count($compiler->_tag_stack) - 1;
+        while ($level_count > 0 && $stack_count >= 0) {
+            if (in_array($compiler->_tag_stack[$stack_count][0], array('for', 'foreach', 'while', 'section'))) {
+                $level_count--;
+            } 
+            $stack_count--;
+        } 
+        if ($level_count != 0) {
+            $this->compiler->trigger_template_error("cannot continue {$_levels} level(s)", $this->compiler->lex->taglineno);
+        } 
+        // this tag does not return compiled code
+        $this->compiler->has_code = true;
+        return "<?php continue {$_levels}?>";
+    } 
+} 
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_debug.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_debug.php
new file mode 100644
index 0000000..f6189e7
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_debug.php
@@ -0,0 +1,38 @@
+<?php 
+/**
+ * Smarty Internal Plugin Compile Debug
+ *
+ * Compiles the {debug} tag 
+ * It opens a window the the Smarty Debugging Console
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Debug Class
+ */ 
+class Smarty_Internal_Compile_Debug extends Smarty_Internal_CompileBase {
+    /**
+     * Compiles code for the {debug} tag
+     * 
+     * @param array $args array with attributes from parser
+     * @param object $compiler compiler object
+     * @return string compiled code
+     */
+    public function compile($args, $compiler)
+    {
+        $this->compiler = $compiler; 
+        // check and get attributes
+        $_attr = $this->_get_attributes($args);
+
+		// compile always as nocache
+		$this->compiler->tag_nocache = true;
+
+        // display debug template
+        $_output = "<?php \$_smarty_tpl->smarty->loadPlugin('Smarty_Internal_Debug'); Smarty_Internal_Debug::display_debug(\$_smarty_tpl); ?>";
+        return $_output;
+    } 
+} 
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_eval.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_eval.php
new file mode 100644
index 0000000..aa3c258
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_eval.php
@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * Smarty Internal Plugin Compile Eval
+ *
+ * Compiles the {eval} tag 
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Eval Class
+ */ 
+class Smarty_Internal_Compile_Eval extends Smarty_Internal_CompileBase {
+    public $required_attributes = array('var');
+    public $optional_attributes = array('assign'); 
+    public $shorttag_order = array('var','assign');
+
+    /**
+     * Compiles code for the {eval} tag
+     * 
+     * @param array $args array with attributes from parser
+     * @param object $compiler compiler object
+     * @return string compiled code
+     */
+    public function compile($args, $compiler)
+    {
+        $this->compiler = $compiler; 
+        $this->required_attributes = array('var');
+        $this->optional_attributes = array('assign'); 
+        // check and get attributes
+        $_attr = $this->_get_attributes($args); 
+        if (isset($_attr['assign'])) {
+              // output will be stored in a smarty variable instead of beind displayed
+            $_assign = $_attr['assign'];
+        }
+  
+        // create template object
+        $_output = "\$_template = new {$compiler->smarty->template_class}('eval:'.".$_attr['var'].", \$_smarty_tpl->smarty, \$_smarty_tpl);"; 
+        //was there an assign attribute? 
+        if (isset($_assign)) {
+            $_output .= "\$_smarty_tpl->assign($_assign,\$_template->getRenderedTemplate());";
+        } else {
+            $_output .= "echo \$_template->getRenderedTemplate();";
+        } 
+        return "<?php $_output ?>";
+    } 
+} 
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_extends.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_extends.php
new file mode 100644
index 0000000..b62b531
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_extends.php
@@ -0,0 +1,90 @@
+<?php
+
+/**
+ * Smarty Internal Plugin Compile extend
+ * 
+ * Compiles the {extends} tag
+ * 
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews 
+ */
+
+/**
+ * Smarty Internal Plugin Compile extend Class
+ */
+class Smarty_Internal_Compile_Extends extends Smarty_Internal_CompileBase {
+	// attribute definitions
+    public $required_attributes = array('file');
+    public $shorttag_order = array('file');
+
+    /**
+     * Compiles code for the {extends} tag
+     * 
+     * @param array $args array with attributes from parser
+     * @param object $compiler compiler object
+     * @return string compiled code
+     */
+    public function compile($args, $compiler)
+    {
+        $this->compiler = $compiler;
+        $this->smarty = $compiler->smarty;
+        $this->_rdl = preg_quote($this->smarty->right_delimiter);
+        $this->_ldl = preg_quote($this->smarty->left_delimiter);
+        $filepath = $compiler->template->getTemplateFilepath();
+        // check and get attributes
+        $_attr = $this->_get_attributes($args);
+        if ($_attr['nocache'] === true) {
+        	$this->compiler->trigger_template_error('nocache option not allowed', $this->compiler->lex->taglineno);
+        }
+
+        $_smarty_tpl = $compiler->template; 
+        $include_file = null;
+        if (strpos($_attr['file'],'$_tmp') !== false) {
+        	$this->compiler->trigger_template_error('illegal value for file attribute', $this->compiler->lex->taglineno);
+        }
+        eval('$include_file = ' . $_attr['file'] . ';'); 
+        // create template object
+        $_template = new $compiler->smarty->template_class($include_file, $this->smarty, $compiler->template); 
+        // save file dependency
+        if (in_array($_template->resource_type,array('eval','string'))) {
+        	$template_sha1 = sha1($include_file);
+    	} else {
+        	$template_sha1 = sha1($_template->getTemplateFilepath());
+    	}
+        if (isset($compiler->template->properties['file_dependency'][$template_sha1])) {
+            $this->compiler->trigger_template_error("illegal recursive call of \"{$include_file}\"",$compiler->lex->line-1);
+        } 
+        $compiler->template->properties['file_dependency'][$template_sha1] = array($_template->getTemplateFilepath(), $_template->getTemplateTimestamp(),$_template->resource_type);
+        $_content = substr($compiler->template->template_source,$compiler->lex->counter-1);
+        if (preg_match_all("!({$this->_ldl}block\s(.+?){$this->_rdl})!", $_content, $s) !=
+                preg_match_all("!({$this->_ldl}/block{$this->_rdl})!", $_content, $c)) {
+            $this->compiler->trigger_template_error('unmatched {block} {/block} pairs');
+        } 
+        preg_match_all("!{$this->_ldl}block\s(.+?){$this->_rdl}|{$this->_ldl}/block{$this->_rdl}!", $_content, $_result, PREG_OFFSET_CAPTURE);
+        $_result_count = count($_result[0]);
+        $_start = 0;
+        while ($_start < $_result_count) {
+            $_end = 0;
+            $_level = 1;
+            while ($_level != 0) {
+                $_end++;
+                if (!strpos($_result[0][$_start + $_end][0], '/')) {
+                    $_level++;
+                } else {
+                    $_level--;
+                } 
+            } 
+            $_block_content = str_replace($this->smarty->left_delimiter . '$smarty.block.parent' . $this->smarty->right_delimiter, '%%%%SMARTY_PARENT%%%%',
+                substr($_content, $_result[0][$_start][1] + strlen($_result[0][$_start][0]), $_result[0][$_start + $_end][1] - $_result[0][$_start][1] - + strlen($_result[0][$_start][0])));
+            Smarty_Internal_Compile_Block::saveBlockData($_block_content, $_result[0][$_start][0], $compiler->template, $filepath);
+            $_start = $_start + $_end + 1;
+        } 
+        $compiler->template->template_source = $_template->getTemplateSource();
+        $compiler->template->template_filepath = $_template->getTemplateFilepath();
+        $compiler->abort_and_recompile = true;
+        return '';
+    } 
+
+} 
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_for.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_for.php
new file mode 100644
index 0000000..2e5d0a1
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_for.php
@@ -0,0 +1,147 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile For
+ * 
+ * Compiles the {for} {forelse} {/for} tags
+ * 
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews 
+ */
+
+/**
+ * Smarty Internal Plugin Compile For Class
+ */
+class Smarty_Internal_Compile_For extends Smarty_Internal_CompileBase {
+    /**
+     * Compiles code for the {for} tag
+     * 
+     * Smarty 3 does implement two different sytaxes:
+     * 
+     * - {for $var in $array}
+     * For looping over arrays or iterators
+     * 
+     * - {for $x=0; $x<$y; $x++}
+     * For general loops
+     * 
+     * The parser is gereration different sets of attribute by which this compiler can 
+     * determin which syntax is used.
+     * 
+     * @param array $args array with attributes from parser
+     * @param object $compiler compiler object
+     * @param array $parameter array with compilation parameter
+     * @return string compiled code
+     */
+    public function compile($args, $compiler, $parameter)
+    {
+        $this->compiler = $compiler; 
+        if ($parameter == 0) {
+        	$this->required_attributes = array('start','to');
+        	$this->optional_attributes = array('max','step');
+        } else {
+        	$this->required_attributes = array('start','ifexp','var','step');
+        	$this->optional_attributes = array();
+        }
+        // check and get attributes
+        $_attr = $this->_get_attributes($args);
+
+        $local_vars = array();
+
+        $output = "<?php ";
+        if ($parameter == 1) {
+            foreach ($_attr['start'] as $_statement) {
+                $output .= " \$_smarty_tpl->tpl_vars[$_statement[var]] = new Smarty_Variable;";
+                $output .= " \$_smarty_tpl->tpl_vars[$_statement[var]]->value = $_statement[value];\n";
+                $compiler->local_var[$_statement['var']] = true;
+                $local_vars[] = $_statement['var'];
+            } 
+            $output .= "  if ($_attr[ifexp]){ for (\$_foo=true;$_attr[ifexp]; \$_smarty_tpl->tpl_vars[$_attr[var]]->value$_attr[step]){\n";
+        } else {
+            $_statement = $_attr['start'];
+            $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]] = new Smarty_Variable;";
+            $compiler->local_var[$_statement['var']] = true;
+            $local_vars[] = $_statement['var'];
+            if (isset($_attr['step'])) {
+                $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->step = $_attr[step];";
+            } else {
+                $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->step = 1;";
+            } 
+            if (isset($_attr['max'])) {
+                $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->total = (int)min(ceil((\$_smarty_tpl->tpl_vars[$_statement[var]]->step > 0 ? $_attr[to]+1 - ($_statement[value]) : $_statement[value]-($_attr[to])+1)/abs(\$_smarty_tpl->tpl_vars[$_statement[var]]->step)),$_attr[max]);\n";
+            } else {
+                $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->total = (int)ceil((\$_smarty_tpl->tpl_vars[$_statement[var]]->step > 0 ? $_attr[to]+1 - ($_statement[value]) : $_statement[value]-($_attr[to])+1)/abs(\$_smarty_tpl->tpl_vars[$_statement[var]]->step));\n";
+            } 
+            $output .= "if (\$_smarty_tpl->tpl_vars[$_statement[var]]->total > 0){\n";
+            $output .= "for (\$_smarty_tpl->tpl_vars[$_statement[var]]->value = $_statement[value], \$_smarty_tpl->tpl_vars[$_statement[var]]->iteration = 1;\$_smarty_tpl->tpl_vars[$_statement[var]]->iteration <= \$_smarty_tpl->tpl_vars[$_statement[var]]->total;\$_smarty_tpl->tpl_vars[$_statement[var]]->value += \$_smarty_tpl->tpl_vars[$_statement[var]]->step, \$_smarty_tpl->tpl_vars[$_statement[var]]->iteration++){\n";
+            $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->first = \$_smarty_tpl->tpl_vars[$_statement[var]]->iteration == 1;";
+            $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->last = \$_smarty_tpl->tpl_vars[$_statement[var]]->iteration == \$_smarty_tpl->tpl_vars[$_statement[var]]->total;";
+        } 
+        $output .= "?>";
+
+        $this->_open_tag('for', array('for', $this->compiler->nocache, $local_vars)); 
+        // maybe nocache because of nocache variables
+        $this->compiler->nocache = $this->compiler->nocache | $this->compiler->tag_nocache; 
+        // return compiled code
+        return $output;
+    } 
+} 
+
+/**
+ * Smarty Internal Plugin Compile Forelse Class
+ */
+class Smarty_Internal_Compile_Forelse extends Smarty_Internal_CompileBase {
+    /**
+     * Compiles code for the {forelse} tag
+     * 
+     * @param array $args array with attributes from parser
+     * @param object $compiler compiler object
+     * @param array $parameter array with compilation parameter
+     * @return string compiled code
+     */
+    public function compile($args, $compiler, $parameter)
+    {
+        $this->compiler = $compiler; 
+        // check and get attributes
+        $_attr  = $this->_get_attributes($args);
+
+        list($_open_tag, $nocache, $local_vars) = $this->_close_tag(array('for'));
+        $this->_open_tag('forelse', array('forelse', $nocache, $local_vars));
+        return "<?php }} else { ?>";
+    } 
+} 
+
+/**
+ * Smarty Internal Plugin Compile Forclose Class
+ */
+class Smarty_Internal_Compile_Forclose extends Smarty_Internal_CompileBase {
+    /**
+     * Compiles code for the {/for} tag
+     * 
+     * @param array $args array with attributes from parser
+     * @param object $compiler compiler object
+     * @param array $parameter array with compilation parameter
+     * @return string compiled code
+     */
+    public function compile($args, $compiler, $parameter)
+    {
+        $this->compiler = $compiler; 
+        // check and get attributes
+        $_attr  = $this->_get_attributes($args); 
+        // must endblock be nocache?
+        if ($this->compiler->nocache) {
+            $this->compiler->tag_nocache = true;
+        } 
+
+        list($_open_tag, $this->compiler->nocache, $local_vars) = $this->_close_tag(array('for', 'forelse'));
+
+        foreach ($local_vars as $var) {
+            unset($compiler->local_var[$var]);
+        } 
+        if ($_open_tag == 'forelse')
+            return "<?php }  ?>";
+        else
+            return "<?php }} ?>";
+    } 
+} 
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_foreach.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_foreach.php
new file mode 100644
index 0000000..6ad1e07
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_foreach.php
@@ -0,0 +1,219 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Foreach
+ * 
+ * Compiles the {foreach} {foreachelse} {/foreach} tags
+ * 
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews 
+ */
+
+/**
+ * Smarty Internal Plugin Compile Foreach Class
+ */
+class Smarty_Internal_Compile_Foreach extends Smarty_Internal_CompileBase {
+	// attribute definitions
+    public $required_attributes = array('from', 'item');
+    public $optional_attributes = array('name', 'key'); 
+    public $shorttag_order = array('from','item','key','name');
+
+    /**
+     * Compiles code for the {foreach} tag
+     * 
+     * @param array $args array with attributes from parser
+     * @param object $compiler compiler object
+     * @param array $parameter array with compilation parameter
+     * @return string compiled code
+     */
+    public function compile($args, $compiler, $parameter)
+    {
+        $this->compiler = $compiler;
+        $tpl = $compiler->template; 
+        // check and get attributes
+        $_attr = $this->_get_attributes($args);
+
+        $from = $_attr['from'];
+        $item = $_attr['item'];
+
+        if (substr_compare("\$_smarty_tpl->getVariable($item)", $from,0, strlen("\$_smarty_tpl->getVariable($item)")) == 0) {
+            $this->compiler->trigger_template_error("item variable {$item} may not be the same variable as at 'from'", $this->compiler->lex->taglineno);
+        } 
+
+        if (isset($_attr['key'])) {
+            $key = $_attr['key'];
+        } else {
+            $key = null;
+        } 
+
+        $this->_open_tag('foreach', array('foreach', $this->compiler->nocache, $item, $key)); 
+        // maybe nocache because of nocache variables
+        $this->compiler->nocache = $this->compiler->nocache | $this->compiler->tag_nocache;
+
+        if (isset($_attr['name'])) {
+            $name = $_attr['name'];
+            $has_name = true;
+            $SmartyVarName = '$smarty.foreach.' . trim($name, '\'"') . '.';
+        } else {
+            $name = null;
+            $has_name = false;
+        } 
+        $ItemVarName = '$' . trim($item, '\'"') . '@'; 
+        // evaluates which Smarty variables and properties have to be computed
+        if ($has_name) {
+            $usesSmartyFirst = strpos($tpl->template_source, $SmartyVarName . 'first') !== false;
+            $usesSmartyLast = strpos($tpl->template_source, $SmartyVarName . 'last') !== false;
+            $usesSmartyIndex = strpos($tpl->template_source, $SmartyVarName . 'index') !== false;
+            $usesSmartyIteration = strpos($tpl->template_source, $SmartyVarName . 'iteration') !== false;
+            $usesSmartyShow = strpos($tpl->template_source, $SmartyVarName . 'show') !== false;
+            $usesSmartyTotal = strpos($tpl->template_source, $SmartyVarName . 'total') !== false;
+        } else {
+            $usesSmartyFirst = false;
+            $usesSmartyLast = false;
+            $usesSmartyTotal = false;
+            $usesSmartyShow = false;
+        } 
+
+        $usesPropFirst = $usesSmartyFirst || strpos($tpl->template_source, $ItemVarName . 'first') !== false;
+        $usesPropLast = $usesSmartyLast || strpos($tpl->template_source, $ItemVarName . 'last') !== false;
+        $usesPropIndex = $usesPropFirst || strpos($tpl->template_source, $ItemVarName . 'index') !== false;
+        $usesPropIteration = $usesPropLast || strpos($tpl->template_source, $ItemVarName . 'iteration') !== false;
+        $usesPropShow = strpos($tpl->template_source, $ItemVarName . 'show') !== false;
+        $usesPropTotal = $usesSmartyTotal || $usesSmartyShow || $usesPropShow || $usesPropLast || strpos($tpl->template_source, $ItemVarName . 'total') !== false; 
+        // generate output code
+        $output = "<?php ";
+        $output .= " \$_smarty_tpl->tpl_vars[$item] = new Smarty_Variable;\n";
+        $compiler->local_var[$item] = true;
+        if ($key != null) {
+            $output .= " \$_smarty_tpl->tpl_vars[$key] = new Smarty_Variable;\n";
+            $compiler->local_var[$key] = true;
+        } 
+        $output .= " \$_from = $from; if (!is_array(\$_from) && !is_object(\$_from)) { settype(\$_from, 'array');}\n";
+        if ($usesPropTotal) {
+            $output .= " \$_smarty_tpl->tpl_vars[$item]->total= \$_smarty_tpl->_count(\$_from);\n";
+        } 
+        if ($usesPropIteration) {
+            $output .= " \$_smarty_tpl->tpl_vars[$item]->iteration=0;\n";
+        } 
+        if ($usesPropIndex) {
+            $output .= " \$_smarty_tpl->tpl_vars[$item]->index=-1;\n";
+        } 
+        if ($usesPropShow) {
+            $output .= " \$_smarty_tpl->tpl_vars[$item]->show = (\$_smarty_tpl->tpl_vars[$item]->total > 0);\n";
+        } 
+        if ($has_name) {
+            if ($usesSmartyTotal) {
+                $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['total'] = \$_smarty_tpl->tpl_vars[$item]->total;\n";
+            } 
+            if ($usesSmartyIteration) {
+                $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['iteration']=0;\n";
+            } 
+            if ($usesSmartyIndex) {
+                $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['index']=-1;\n";
+            } 
+            if ($usesSmartyShow) {
+                $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['show']=(\$_smarty_tpl->tpl_vars[$item]->total > 0);\n";
+            } 
+        } 
+        if ($usesPropTotal) {
+			$output .= "if (\$_smarty_tpl->tpl_vars[$item]->total > 0){\n";
+        } else {
+			$output .= "if (\$_smarty_tpl->_count(\$_from) > 0){\n";
+		}
+		$output .= "    foreach (\$_from as \$_smarty_tpl->tpl_vars[$item]->key => \$_smarty_tpl->tpl_vars[$item]->value){\n";
+        if ($key != null) {
+            $output .= " \$_smarty_tpl->tpl_vars[$key]->value = \$_smarty_tpl->tpl_vars[$item]->key;\n";
+        } 
+        if ($usesPropIteration) {
+            $output .= " \$_smarty_tpl->tpl_vars[$item]->iteration++;\n";
+        } 
+        if ($usesPropIndex) {
+            $output .= " \$_smarty_tpl->tpl_vars[$item]->index++;\n";
+        } 
+        if ($usesPropFirst) {
+            $output .= " \$_smarty_tpl->tpl_vars[$item]->first = \$_smarty_tpl->tpl_vars[$item]->index === 0;\n";
+        } 
+        if ($usesPropLast) {
+            $output .= " \$_smarty_tpl->tpl_vars[$item]->last = \$_smarty_tpl->tpl_vars[$item]->iteration === \$_smarty_tpl->tpl_vars[$item]->total;\n";
+        } 
+        if ($has_name) {
+            if ($usesSmartyFirst) {
+                $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['first'] = \$_smarty_tpl->tpl_vars[$item]->first;\n";
+            } 
+            if ($usesSmartyIteration) {
+                $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['iteration']++;\n";
+            } 
+            if ($usesSmartyIndex) {
+                $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['index']++;\n";
+            } 
+            if ($usesSmartyLast) {
+                $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['last'] = \$_smarty_tpl->tpl_vars[$item]->last;\n";
+            } 
+        } 
+        $output .= "?>";
+
+        return $output;
+    } 
+} 
+
+/**
+ * Smarty Internal Plugin Compile Foreachelse Class
+ */
+class Smarty_Internal_Compile_Foreachelse extends Smarty_Internal_CompileBase {
+    /**
+     * Compiles code for the {foreachelse} tag
+     * 
+     * @param array $args array with attributes from parser
+     * @param object $compiler compiler object
+     * @param array $parameter array with compilation parameter
+     * @return string compiled code
+     */
+    public function compile($args, $compiler, $parameter)
+    {
+        $this->compiler = $compiler; 
+        // check and get attributes
+        $_attr = $this->_get_attributes($args);
+
+        list($_open_tag, $nocache, $item, $key) = $this->_close_tag(array('foreach'));
+        $this->_open_tag('foreachelse', array('foreachelse', $nocache, $item, $key));
+
+        return "<?php }} else { ?>";
+    } 
+} 
+
+/**
+ * Smarty Internal Plugin Compile Foreachclose Class
+ */
+class Smarty_Internal_Compile_Foreachclose extends Smarty_Internal_CompileBase {
+    /**
+     * Compiles code for the {/foreach} tag
+     * 
+     * @param array $args array with attributes from parser
+     * @param object $compiler compiler object
+     * @param array $parameter array with compilation parameter
+     * @return string compiled code
+     */
+    public function compile($args, $compiler, $parameter)
+    {
+        $this->compiler = $compiler; 
+        // check and get attributes
+        $_attr = $this->_get_attributes($args); 
+        // must endblock be nocache?
+        if ($this->compiler->nocache) {
+            $this->compiler->tag_nocache = true;
+        } 
+
+        list($_open_tag, $this->compiler->nocache, $item, $key) = $this->_close_tag(array('foreach', 'foreachelse'));
+        unset($compiler->local_var[$item]);
+        if ($key != null) {
+            unset($compiler->local_var[$key]);
+        } 
+
+        if ($_open_tag == 'foreachelse')
+            return "<?php } ?>";
+        else
+            return "<?php }} ?>";
+    } 
+} 
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_function.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_function.php
new file mode 100644
index 0000000..db2409a
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_function.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Function
+ * 
+ * Compiles the {function} {/function} tags
+ * 
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews 
+ */
+
+/**
+ * Smarty Internal Plugin Compile Function Class
+ */
+class Smarty_Internal_Compile_Function extends Smarty_Internal_CompileBase {
+	// attribute definitions
+    public $required_attributes = array('name');
+    public $shorttag_order = array('name');
+    public $optional_attributes = array('_any'); 
+
+    /**
+     * Compiles code for the {function} tag
+     * 
+     * @param array $args array with attributes from parser
+     * @param object $compiler compiler object
+      * @param array $parameter array with compilation parameter
+    * @return boolean true
+     */
+    public function compile($args, $compiler, $parameter)
+    {
+        $this->compiler = $compiler;
+        // check and get attributes
+        $_attr = $this->_get_attributes($args);
+
+        if ($_attr['nocache'] === true) {
+        	$this->compiler->trigger_template_error('nocache option not allowed', $this->compiler->lex->taglineno);
+        }
+		unset($_attr['nocache']);
+        $save = array($_attr, $compiler->parser->current_buffer,
+            $compiler->template->has_nocache_code, $compiler->template->required_plugins);
+        $this->_open_tag('function', $save);
+        $_name = trim($_attr['name'], "'\"");
+        unset($_attr['name']);
+        $compiler->template->properties['function'][$_name]['parameter'] = array();
+		$_smarty_tpl = $compiler->template;
+        foreach ($_attr as $_key => $_data) {
+        	eval ('$tmp='.$_data.';');
+            $compiler->template->properties['function'][$_name]['parameter'][$_key] = $tmp;
+        } 
+        $compiler->smarty->template_functions[$_name]['parameter'] = $compiler->template->properties['function'][$_name]['parameter'];
+        if ($compiler->template->caching) {
+            $output = '';
+        } else {
+            $output = "<?php if (!function_exists('smarty_template_function_{$_name}')) {
+    function smarty_template_function_{$_name}(\$_smarty_tpl,\$params) {
+    \$saved_tpl_vars = \$_smarty_tpl->tpl_vars;
+    foreach (\$_smarty_tpl->template_functions['{$_name}']['parameter'] as \$key => \$value) {\$_smarty_tpl->tpl_vars[\$key] = new Smarty_variable(\$value);};
+    foreach (\$params as \$key => \$value) {\$_smarty_tpl->tpl_vars[\$key] = new Smarty_variable(\$value);}?>";
+        } 
+        // Init temporay context
+        $compiler->template->required_plugins = array('compiled' => array(), 'nocache' => array());
+        $compiler->parser->current_buffer = new _smarty_template_buffer($compiler->parser);
+        $compiler->parser->current_buffer->append_subtree(new _smarty_tag($compiler->parser, $output));
+        $compiler->template->has_nocache_code = false;
+        $compiler->has_code = false;
+        $compiler->template->properties['function'][$_name]['compiled'] = '';
+        return true;
+    } 
+} 
+
+/**
+ * Smarty Internal Plugin Compile Functionclose Class
+ */
+class Smarty_Internal_Compile_Functionclose extends Smarty_Internal_CompileBase {
+    /**
+     * Compiles code for the {/function} tag
+     * 
+     * @param array $args array with attributes from parser
+     * @param object $compiler compiler object
+     * @param array $parameter array with compilation parameter
+     * @return boolean true
+     */
+    public function compile($args, $compiler, $parameter)
+    {
+        $this->compiler = $compiler;
+        $_attr = $this->_get_attributes($args);
+        $saved_data = $this->_close_tag(array('function'));
+        $_name = trim($saved_data[0]['name'], "'\""); 
+        // build plugin include code
+        $plugins_string = '';
+        if (!empty($compiler->template->required_plugins['compiled'])) {
+            $plugins_string = '<?php ';
+            foreach($compiler->template->required_plugins['compiled'] as $tmp) {
+                foreach($tmp as $data) {
+                    $plugins_string .= "if (!is_callable('{$data['function']}')) include '{$data['file']}';\n";
+                } 
+            } 
+            $plugins_string .= '?>';
+        } 
+        if (!empty($compiler->template->required_plugins['nocache'])) {
+            $plugins_string .= "<?php echo '/*%%SmartyNocache:{$compiler->template->properties['nocache_hash']}%%*/<?php ";
+            foreach($compiler->template->required_plugins['nocache'] as $tmp) {
+                foreach($tmp as $data) {
+                    $plugins_string .= "if (!is_callable(\'{$data['function']}\')) include \'{$data['file']}\';\n";
+                } 
+            } 
+            $plugins_string .= "?>/*/%%SmartyNocache:{$compiler->template->properties['nocache_hash']}%%*/';?>\n";
+        } 
+ 		// remove last line break from function definition
+ 		$last = count($compiler->parser->current_buffer->subtrees) - 1;
+ 		if ($compiler->parser->current_buffer->subtrees[$last] instanceof _smarty_linebreak) {
+ 			unset($compiler->parser->current_buffer->subtrees[$last]);
+ 		}
+        // if caching save template function for possible nocache call
+        if ($compiler->template->caching) {
+            $compiler->template->properties['function'][$_name]['compiled'] .= $plugins_string
+             . $compiler->parser->current_buffer->to_smarty_php();
+            $compiler->template->properties['function'][$_name]['nocache_hash'] = $compiler->template->properties['nocache_hash'];
+            $compiler->template->properties['function'][$_name]['has_nocache_code'] = $compiler->template->has_nocache_code;
+            $compiler->smarty->template_functions[$_name] = $compiler->template->properties['function'][$_name];
+            $compiler->has_code = false;
+            $output = true;
+        } else {
+            $output = $plugins_string . $compiler->parser->current_buffer->to_smarty_php() . "<?php \$_smarty_tpl->tpl_vars = \$saved_tpl_vars;}}?>\n";
+        } 
+        // restore old compiler status
+        $compiler->parser->current_buffer = $saved_data[1];
+        $compiler->template->has_nocache_code = $compiler->template->has_nocache_code | $saved_data[2];
+        $compiler->template->required_plugins = $saved_data[3];
+        return $output;
+    } 
+} 
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_if.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_if.php
new file mode 100644
index 0000000..41e6597
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_if.php
@@ -0,0 +1,179 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile If
+ * 
+ * Compiles the {if} {else} {elseif} {/if} tags
+ * 
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews 
+ */
+
+/**
+ * Smarty Internal Plugin Compile If Class
+ */
+class Smarty_Internal_Compile_If extends Smarty_Internal_CompileBase {
+    /**
+     * Compiles code for the {if} tag
+     * 
+     * @param array $args array with attributes from parser
+     * @param object $compiler compiler object
+     * @param array $parameter array with compilation parameter
+     * @return string compiled code
+     */
+    public function compile($args, $compiler, $parameter)
+    {
+        $this->compiler = $compiler;
+        // check and get attributes
+        $_attr = $this->_get_attributes($args);
+        $this->_open_tag('if',array(1,$this->compiler->nocache));
+        // must whole block be nocache ?
+        $this->compiler->nocache = $this->compiler->nocache | $this->compiler->tag_nocache; 
+        if (is_array($parameter['if condition'])) {
+        	if ($this->compiler->nocache) {
+        		$_nocache = ',true';
+            	// create nocache var to make it know for further compiling
+            	if (is_array($parameter['if condition']['var'])) {
+            		$this->compiler->template->tpl_vars[trim($parameter['if condition']['var']['var'], "'")] = new Smarty_variable(null, true);
+            	} else {
+            		$this->compiler->template->tpl_vars[trim($parameter['if condition']['var'], "'")] = new Smarty_variable(null, true);
+            	}
+        	} else {
+        		$_nocache = '';
+        	}
+            if (is_array($parameter['if condition']['var'])) {
+            	$_output = "<?php if (!isset(\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']['var']."]) || !is_array(\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']['var']."]->value)) \$_smarty_tpl->createLocalArrayVariable(".$parameter['if condition']['var']['var']."$_nocache);\n";
+	            $_output .= "if (\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']['var']."]->value".$parameter['if condition']['var']['smarty_internal_index']." = ".$parameter['if condition']['value']."){?>";
+            } else {
+	            $_output = "<?php \$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']."] = new Smarty_Variable(\$_smarty_tpl->getVariable(".$parameter['if condition']['var'].",null,true,false)->value{$_nocache});";           
+	            $_output .= "if (\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']."]->value = ".$parameter['if condition']['value']."){?>";
+	        }
+            return $_output;
+        } else {
+            return "<?php if ({$parameter['if condition']}){?>";
+        } 
+    } 
+} 
+
+/**
+ * Smarty Internal Plugin Compile Else Class
+ */
+class Smarty_Internal_Compile_Else extends Smarty_Internal_CompileBase {
+    /**
+     * Compiles code for the {else} tag
+     * 
+     * @param array $args array with attributes from parser
+     * @param object $compiler compiler object
+     * @param array $parameter array with compilation parameter
+     * @return string compiled code
+     */
+    public function compile($args, $compiler, $parameter)
+    {
+        $this->compiler = $compiler; 
+        list($nesting, $compiler->tag_nocache) = $this->_close_tag(array('if', 'elseif'));
+        $this->_open_tag('else',array($nesting,$compiler->tag_nocache));
+
+        return "<?php }else{ ?>";
+    } 
+} 
+
+/**
+ * Smarty Internal Plugin Compile ElseIf Class
+ */
+class Smarty_Internal_Compile_Elseif extends Smarty_Internal_CompileBase {
+    /**
+     * Compiles code for the {elseif} tag
+     * 
+     * @param array $args array with attributes from parser
+     * @param object $compiler compiler object
+     * @param array $parameter array with compilation parameter
+     * @return string compiled code
+     */
+    public function compile($args, $compiler, $parameter)
+    {
+        $this->compiler = $compiler;
+        // check and get attributes
+        $_attr = $this->_get_attributes($args);
+
+        list($nesting, $compiler->tag_nocache) = $this->_close_tag(array('if', 'elseif'));
+
+		if (is_array($parameter['if condition'])) {
+			$condition_by_assign = true;
+			if ($this->compiler->nocache) {
+        		$_nocache = ',true';
+				// create nocache var to make it know for further compiling
+				if (is_array($parameter['if condition']['var'])) {
+					$this->compiler->template->tpl_vars[trim($parameter['if condition']['var']['var'], "'")] = new Smarty_variable(null, true);
+				} else {
+					$this->compiler->template->tpl_vars[trim($parameter['if condition']['var'], "'")] = new Smarty_variable(null, true);
+				}
+			} else {
+				$_nocache = '';
+			}
+		} else {
+			$condition_by_assign = false;
+		}
+
+        if (empty($this->compiler->prefix_code)) {
+        	if ($condition_by_assign) {
+            	$this->_open_tag('elseif', array($nesting + 1, $compiler->tag_nocache));
+            	if (is_array($parameter['if condition']['var'])) {
+            		$_output = "<?php }else{ if (!isset(\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']['var']."]) || !is_array(\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']['var']."]->value)) \$_smarty_tpl->createLocalArrayVariable(".$parameter['if condition']['var']['var']."$_nocache);\n";
+	            	$_output .= "if (\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']['var']."]->value".$parameter['if condition']['var']['smarty_internal_index']." = ".$parameter['if condition']['value']."){?>";
+            	} else {
+	            	$_output = "<?php }else{ \$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']."] = new Smarty_Variable(\$_smarty_tpl->getVariable(".$parameter['if condition']['var'].",null,true,false)->value{$_nocache});";          
+	            	$_output .= "if (\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']."]->value = ".$parameter['if condition']['value']."){?>";
+				}
+            	return $_output;
+        	} else {
+            	$this->_open_tag('elseif', array($nesting, $compiler->tag_nocache));
+            	return "<?php }elseif({$parameter['if condition']}){?>";
+        	}
+        } else {
+            $tmp = '';
+            foreach ($this->compiler->prefix_code as $code) $tmp .= $code;
+            $this->compiler->prefix_code = array();
+            $this->_open_tag('elseif', array($nesting + 1, $compiler->tag_nocache));
+        	if ($condition_by_assign) {
+            	if (is_array($parameter['if condition']['var'])) {
+            		$_output = "<?php }else{?>{$tmp}<?php  if (!isset(\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']['var']."]) || !is_array(\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']['var']."]->value)) \$_smarty_tpl->createLocalArrayVariable(".$parameter['if condition']['var']['var']."$_nocache);\n";
+	            	$_output .= "if (\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']['var']."]->value".$parameter['if condition']['var']['smarty_internal_index']." = ".$parameter['if condition']['value']."){?>";
+            	} else {
+	            	$_output = "<?php }else{?>{$tmp}<?php \$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']."] = new Smarty_Variable(\$_smarty_tpl->getVariable(".$parameter['if condition']['var'].",null,true,false)->value{$_nocache});";           
+	            	$_output .= "if (\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']."]->value = ".$parameter['if condition']['value']."){?>";
+				}
+            	return $_output;
+        	} else {
+            	return "<?php }else{?>{$tmp}<?php if ({$parameter['if condition']}){?>";
+        	}
+        } 
+    } 
+} 
+
+/**
+* Smarty Internal Plugin Compile Ifclose Class
+*/
+class Smarty_Internal_Compile_Ifclose extends Smarty_Internal_CompileBase {
+    /**
+    * Compiles code for the {/if} tag
+    * 
+    * @param array $args array with attributes from parser
+    * @param object $compiler compiler object
+     * @param array $parameter array with compilation parameter
+    * @return string compiled code
+    */
+    public function compile($args, $compiler, $parameter)
+    {
+        $this->compiler = $compiler; 
+            // must endblock be nocache?
+            if ($this->compiler->nocache) {
+                $this->compiler->tag_nocache = true;
+            } 
+        list($nesting, $this->compiler->nocache) = $this->_close_tag(array('if', 'else', 'elseif'));
+        $tmp = '';
+        for ($i = 0; $i < $nesting ; $i++) $tmp .= '}';
+        return "<?php {$tmp}?>";
+    } 
+} 
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_include.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_include.php
new file mode 100644
index 0000000..01d260e
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_include.php
@@ -0,0 +1,176 @@
+<?php
+
+/**
+ * Smarty Internal Plugin Compile Include
+ * 
+ * Compiles the {include} tag
+ * 
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews 
+ */
+
+/**
+ * Smarty Internal Plugin Compile Include Class
+ */
+class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase {
+	// caching mode to create nocache code but no cache file
+	const CACHING_NOCACHE_CODE = 9999;
+	// attribute definitions
+    public $required_attributes = array('file');
+   	public $shorttag_order = array('file');
+    public $option_flags = array('nocache','inline','caching');
+    public $optional_attributes = array('_any'); 
+
+    /**
+     * Compiles code for the {include} tag
+     * 
+     * @param array $args array with attributes from parser
+     * @param object $compiler compiler object
+     * @return string compiled code
+     */
+    public function compile($args, $compiler)
+    {
+        $this->compiler = $compiler;
+        // check and get attributes
+        $_attr = $this->_get_attributes($args); 
+        // save posible attributes
+        $include_file = $_attr['file'];
+        $has_compiled_template = false;
+        if ($compiler->smarty->merge_compiled_includes || $_attr['inline'] === true) {
+            // check if compiled code can be merged (contains no variable part)
+            if (!$compiler->has_variable_string && (substr_count($include_file, '"') == 2 or substr_count($include_file, "'") == 2) and substr_count($include_file, '(') == 0) {
+             $tmp = null;
+	    eval("\$tmp = $include_file;");
+                if ($this->compiler->template->template_resource != $tmp) {
+                    $tpl = new $compiler->smarty->template_class ($tmp, $compiler->smarty, $compiler->template, $compiler->template->cache_id, $compiler->template->compile_id);
+                    // suppress writing of compiled file
+                    $tpl->write_compiled_code = false;
+                    if ($this->compiler->template->caching) {
+                        // needs code for cached page but no cache file
+                        $tpl->caching = self::CACHING_NOCACHE_CODE;
+                    } 
+//                    if ($this->compiler->template->mustCompile) {
+                        // make sure whole chain gest compiled
+                        $tpl->mustCompile = true;
+//                    } 
+                    if ($tpl->resource_object->usesCompiler && $tpl->isExisting()) {
+                        // get compiled code
+                        $compiled_tpl = $tpl->getCompiledTemplate(); 
+                        // merge compiled code for {function} tags
+                        $compiler->template->properties['function'] = array_merge($compiler->template->properties['function'], $tpl->properties['function']); 
+                        // merge filedependency by evaluating header code
+                        preg_match_all("/(<\?php \/\*%%SmartyHeaderCode:{$tpl->properties['nocache_hash']}%%\*\/(.+?)\/\*\/%%SmartyHeaderCode%%\*\/\?>\n)/s", $compiled_tpl, $result);
+                        $saved_has_nocache_code = $compiler->template->has_nocache_code;
+                        $saved_nocache_hash = $compiler->template->properties['nocache_hash'];
+                        $_smarty_tpl = $compiler->template;
+                        eval($result[2][0]);
+                        $compiler->template->properties['nocache_hash'] = $saved_nocache_hash;
+                        $compiler->template->has_nocache_code = $saved_has_nocache_code; 
+                        // remove header code
+                        $compiled_tpl = preg_replace("/(<\?php \/\*%%SmartyHeaderCode:{$tpl->properties['nocache_hash']}%%\*\/(.+?)\/\*\/%%SmartyHeaderCode%%\*\/\?>\n)/s", '', $compiled_tpl);
+                        if ($tpl->has_nocache_code) {
+                            // replace nocache_hash
+                            $compiled_tpl = preg_replace("/{$tpl->properties['nocache_hash']}/", $compiler->template->properties['nocache_hash'], $compiled_tpl);
+                            $compiler->template->has_nocache_code = true;
+                        } 
+                        $has_compiled_template = true;
+                    } 
+                } 
+            } 
+        } 
+
+        if (isset($_attr['assign'])) {
+            // output will be stored in a smarty variable instead of beind displayed
+            $_assign = $_attr['assign'];
+        } 
+
+        $_parent_scope = Smarty::SCOPE_LOCAL;
+        if (isset($_attr['scope'])) {
+            $_attr['scope'] = trim($_attr['scope'], "'\"");
+            if ($_attr['scope'] == 'parent') {
+                $_parent_scope = Smarty::SCOPE_PARENT;
+            } elseif ($_attr['scope'] == 'root') {
+                $_parent_scope = Smarty::SCOPE_ROOT;
+            } elseif ($_attr['scope'] == 'global') {
+                $_parent_scope = Smarty::SCOPE_GLOBAL;
+            } 
+        } 
+        $_caching = 'null';
+        if ($this->compiler->nocache || $this->compiler->tag_nocache) {
+            $_caching = Smarty::CACHING_OFF;
+        } 
+        // default for included templates
+        if ($this->compiler->template->caching && !$this->compiler->nocache && !$this->compiler->tag_nocache) {
+            $_caching = self::CACHING_NOCACHE_CODE;
+        } 
+        /*
+        * if the {include} tag provides individual parameter for caching
+        * it will not be included into the common cache file and treated like
+        * a nocache section
+        */
+        if (isset($_attr['cache_lifetime'])) {
+            $_cache_lifetime = $_attr['cache_lifetime'];
+            $this->compiler->tag_nocache = true;
+            $_caching = Smarty::CACHING_LIFETIME_CURRENT;
+        } else {
+            $_cache_lifetime = 'null';
+        } 
+        if (isset($_attr['cache_id'])) {
+            $_cache_id = $_attr['cache_id'];
+            $this->compiler->tag_nocache = true;
+            $_caching = Smarty::CACHING_LIFETIME_CURRENT;
+        } else {
+            $_cache_id = '$_smarty_tpl->cache_id';
+        } 
+        if (isset($_attr['compile_id'])) {
+            $_compile_id = $_attr['compile_id'];
+        } else {
+            $_compile_id = '$_smarty_tpl->compile_id';
+        } 
+        if ($_attr['caching'] === true) {
+            $_caching = Smarty::CACHING_LIFETIME_CURRENT;
+        } 
+        if ($_attr['nocache'] === true) {
+            $this->compiler->tag_nocache = true;
+            $_caching = Smarty::CACHING_OFF;
+        } 
+        // create template object
+        $_output = "<?php \$_template = new {$compiler->smarty->template_class}($include_file, \$_smarty_tpl->smarty, \$_smarty_tpl, $_cache_id, $_compile_id, $_caching, $_cache_lifetime);\n"; 
+        // delete {include} standard attributes
+        unset($_attr['file'], $_attr['assign'], $_attr['cache_id'], $_attr['compile_id'], $_attr['cache_lifetime'], $_attr['nocache'], $_attr['caching'], $_attr['scope'], $_attr['inline']); 
+        // remaining attributes must be assigned as smarty variable
+        if (!empty($_attr)) {
+            if ($_parent_scope == Smarty::SCOPE_LOCAL) {
+                // create variables
+                foreach ($_attr as $_key => $_value) {
+                    $_output .= "\$_template->assign('$_key',$_value);";
+                } 
+            } else {
+                $this->compiler->trigger_template_error('variable passing not allowed in parent/global scope', $this->compiler->lex->taglineno);
+            } 
+        } 
+        // was there an assign attribute
+        if (isset($_assign)) {
+            $_output .= "\$_smarty_tpl->assign($_assign,\$_template->getRenderedTemplate());?>";
+        } else {
+            if ($has_compiled_template && !($compiler->template->caching && ($this->compiler->tag_nocache || $this->compiler->nocache))) {
+                $_output .= "\$_template->properties['nocache_hash']  = '{$compiler->template->properties['nocache_hash']}';\n";
+                $_output .= "\$_tpl_stack[] = \$_smarty_tpl; \$_smarty_tpl = \$_template;?>\n";
+                $_output .= $compiled_tpl;
+                $_output .= "<?php \$_smarty_tpl->updateParentVariables($_parent_scope);?>\n";
+                $_output .= "<?php /*  End of included template \"" . $tpl->getTemplateFilepath() . "\" */ ?>\n";
+                $_output .= "<?php \$_smarty_tpl = array_pop(\$_tpl_stack);?>";
+            } else {
+                $_output .= " echo \$_template->getRenderedTemplate();?>";
+                if ($_parent_scope != Smarty::SCOPE_LOCAL) {
+                	$_output .= "<?php \$_template->updateParentVariables($_parent_scope);?>";
+            	}
+            } 
+        } 
+        $_output .= "<?php unset(\$_template);?>";
+        return $_output;
+    } 
+} 
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_include_php.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_include_php.php
new file mode 100644
index 0000000..19ee186
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_include_php.php
@@ -0,0 +1,90 @@
+<?php
+
+/**
+ * Smarty Internal Plugin Compile Include PHP
+ * 
+ * Compiles the {include_php} tag
+ * 
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews 
+ */
+
+/**
+ * Smarty Internal Plugin Compile Insert Class
+ */
+class Smarty_Internal_Compile_Include_Php extends Smarty_Internal_CompileBase {
+	// attribute definitions
+    public $required_attributes = array('file');
+   	public $shorttag_order = array('file');
+    public $optional_attributes = array('once', 'assign'); 
+
+    /**
+     * Compiles code for the {include_php} tag
+     * 
+     * @param array $args array with attributes from parser
+     * @param object $compiler compiler object
+     * @return string compiled code
+     */
+    public function compile($args, $compiler)
+    {
+    	if (!$compiler->smarty->allow_php_tag) {
+        	throw new SmartyException("{include_php} is deprecated, set allow_php_tag = true to enable");
+    	} 
+        $this->compiler = $compiler;
+        // check and get attributes
+        $_attr = $this->_get_attributes($args);
+
+        $_output = '<?php '; 
+
+        $_smarty_tpl = $compiler->template; 
+        $_filepath = false;
+        eval('$_file = ' . $_attr['file'] . ';'); 
+        if (!isset($this->compiler->smarty->security_policy) && file_exists($_file)) {
+        	$_filepath = $_file;
+        } else {
+            if (isset($this->compiler->smarty->security_policy)) {
+                $_dir = $this->compiler->smarty->security_policy->trusted_dir;
+            } else {
+                $_dir = $this->compiler->smarty->trusted_dir;
+            } 
+            if (!empty($_dir)) {
+                foreach((array)$_dir as $_script_dir) {
+                    if (strpos('/\\', substr($_script_dir, -1)) === false) {
+                        $_script_dir .= DS;
+                    } 
+                    if (file_exists($_script_dir . $_file)) {
+                        $_filepath = $_script_dir .  $_file;
+                        break;
+                    } 
+                } 
+            } 
+        } 
+        if ($_filepath == false) {
+            $this->compiler->trigger_template_error("{include_php} file '{$_file}' is not readable", $this->compiler->lex->taglineno);
+        } 
+
+        if (isset($this->compiler->smarty->security_policy)) {
+            $this->compiler->smarty->security_policy->isTrustedPHPDir($_filepath);
+        } 
+
+        if (isset($_attr['assign'])) {
+            // output will be stored in a smarty variable instead of being displayed
+            $_assign = $_attr['assign'];
+        } 
+        $_once = '_once';
+        if (isset($_attr['once'])) {
+            if ($_attr['once'] == 'false') {
+                $_once = '';
+            } 
+        } 
+
+        if (isset($_assign)) {
+            return "<?php ob_start(); include{$_once} ('{$_filepath}'); \$_smarty_tpl->assign({$_assign},ob_get_contents()); ob_end_clean();?>";
+        } else {
+            return "<?php include{$_once} ('{$_filepath}');?>\n";
+        } 
+    } 
+} 
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_insert.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_insert.php
new file mode 100644
index 0000000..898e531
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_insert.php
@@ -0,0 +1,123 @@
+<?php
+
+/**
+ * Smarty Internal Plugin Compile Insert
+ * 
+ * Compiles the {insert} tag
+ * 
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews 
+ */
+
+/**
+ * Smarty Internal Plugin Compile Insert Class
+ */
+class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase {
+	// attribute definitions
+    public $required_attributes = array('name');
+   	public $shorttag_order = array('name');
+    public $optional_attributes = array('_any'); 
+
+    /**
+     * Compiles code for the {insert} tag
+     * 
+     * @param array $args array with attributes from parser
+     * @param object $compiler compiler object
+     * @return string compiled code
+     */
+    public function compile($args, $compiler)
+    {
+        $this->compiler = $compiler;
+        // check and get attributes
+        $_attr = $this->_get_attributes($args); 
+        // never compile as nocache code
+        $this->compiler->suppressNocacheProcessing = true;
+        $this->compiler->tag_nocache = true;
+        $_smarty_tpl = $compiler->template;
+        $_name = null;
+        $_script = null;
+
+        $_output = '<?php '; 
+        // save posible attributes
+        eval('$_name = ' . $_attr['name'] . ';');
+        if (isset($_attr['assign'])) {
+            // output will be stored in a smarty variable instead of being displayed
+            $_assign = $_attr['assign']; 
+            // create variable to make shure that the compiler knows about its nocache status
+            $this->compiler->template->tpl_vars[trim($_attr['assign'], "'")] = new Smarty_Variable(null, true);
+        } 
+        if (isset($_attr['script'])) {
+            // script which must be included
+            $_function = "smarty_insert_{$_name}";
+            $_smarty_tpl = $compiler->template;
+            $_filepath = false;
+            eval('$_script = ' . $_attr['script'] . ';');
+            if (!isset($this->compiler->smarty->security_policy) && file_exists($_script)) {
+                $_filepath = $_script;
+            } else {
+                if (isset($this->compiler->smarty->security_policy)) {
+                    $_dir = $this->compiler->smarty->security_policy->trusted_dir;
+                } else {
+                    $_dir = $this->compiler->smarty->trusted_dir;
+                } 
+                if (!empty($_dir)) {
+                    foreach((array)$_dir as $_script_dir) {
+                        if (strpos('/\\', substr($_script_dir, -1)) === false) {
+                            $_script_dir .= DS;
+                        } 
+                        if (file_exists($_script_dir . $_script)) {
+                            $_filepath = $_script_dir . $_script;
+                            break;
+                        } 
+                    } 
+                } 
+            } 
+            if ($_filepath == false) {
+                $this->compiler->trigger_template_error("{insert} missing script file '{$_script}'", $this->compiler->lex->taglineno);
+            } 
+            // code for script file loading
+            $_output .= "require_once '{$_filepath}' ;";
+            require_once $_filepath;
+            if (!is_callable($_function)) {
+                $this->compiler->trigger_template_error(" {insert} function '{$_function}' is not callable in script file '{$_script}'", $this->compiler->lex->taglineno);
+            } 
+        } else {
+            $_filepath = 'null';
+            $_function = "insert_{$_name}"; 
+            // function in PHP script ?
+            if (!is_callable($_function)) {
+                // try plugin
+                if (!$_function = $this->compiler->getPlugin($_name, 'insert')) {
+                    $this->compiler->trigger_template_error("{insert} no function or plugin found for '{$_name}'", $this->compiler->lex->taglineno);
+                } 
+            } 
+        } 
+        // delete {insert} standard attributes
+        unset($_attr['name'], $_attr['assign'], $_attr['script'], $_attr['nocache']); 
+        // convert attributes into parameter array string
+        $_paramsArray = array();
+        foreach ($_attr as $_key => $_value) {
+            $_paramsArray[] = "'$_key' => $_value";
+        } 
+        $_params = 'array(' . implode(", ", $_paramsArray) . ')'; 
+        // call insert
+        if (isset($_assign)) {
+            if ($_smarty_tpl->caching) {
+                $_output .= "echo Smarty_Internal_Nocache_Insert::compile ('{$_function}',{$_params}, \$_smarty_tpl, '{$_filepath}',{$_assign});?>";
+            } else {
+                $_output .= "\$_smarty_tpl->assign({$_assign} , {$_function} ({$_params},\$_smarty_tpl), true);?>";
+            } 
+        } else {
+            $this->compiler->has_output = true;
+            if ($_smarty_tpl->caching) {
+                $_output .= "echo Smarty_Internal_Nocache_Insert::compile ('{$_function}',{$_params}, \$_smarty_tpl, '{$_filepath}');?>";
+            } else {
+                $_output .= "echo {$_function}({$_params},\$_smarty_tpl);?>";
+            } 
+        } 
+        return $_output;
+    } 
+} 
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_ldelim.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_ldelim.php
new file mode 100644
index 0000000..bdf86de
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_ldelim.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * Smarty Internal Plugin Compile Ldelim
+ *
+ * Compiles the {ldelim} tag 
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Ldelim Class
+ */ 
+class Smarty_Internal_Compile_Ldelim extends Smarty_Internal_CompileBase {
+    /**
+     * Compiles code for the {ldelim} tag
+     *
+     * This tag does output the left delimiter 
+     * @param array $args array with attributes from parser
+     * @param object $compiler compiler object
+     * @return string compiled code
+     */
+    public function compile($args, $compiler)
+    {
+        $this->compiler = $compiler; 
+        $_attr = $this->_get_attributes($args);
+        if ($_attr['nocache'] === true) {
+        	$this->compiler->trigger_template_error('nocache option not allowed', $this->compiler->lex->taglineno);
+        }
+        // this tag does not return compiled code
+        $this->compiler->has_code = true;
+        return $this->compiler->smarty->left_delimiter;
+    } 
+}
+
+?>
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_nocache.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_nocache.php
new file mode 100644
index 0000000..0c88b14
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_nocache.php
@@ -0,0 +1,63 @@
+<?php
+
+/**
+ * Smarty Internal Plugin Compile Nocache
+ *
+ * Compiles the {nocache} {/nocache} tags 
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Nocache Class
+ */ 
+class Smarty_Internal_Compile_Nocache extends Smarty_Internal_CompileBase {
+    /**
+     * Compiles code for the {nocache} tag
+     *
+     * This tag does not generate compiled output. It only sets a compiler flag 
+     * @param array $args array with attributes from parser
+     * @param object $compiler compiler object
+     * @return string compiled code
+     */
+    public function compile($args, $compiler)
+    {
+        $this->compiler = $compiler; 
+        $_attr = $this->_get_attributes($args);
+        if ($_attr['nocache'] === true) {
+        	$this->compiler->trigger_template_error('nocache option not allowed', $this->compiler->lex->taglineno);
+        }
+        // enter nocache mode
+        $this->compiler->nocache = true;
+        // this tag does not return compiled code
+        $this->compiler->has_code = false;
+        return true;
+    } 
+} 
+
+/**
+ * Smarty Internal Plugin Compile Nocacheclose Class
+ */ 
+class Smarty_Internal_Compile_Nocacheclose extends Smarty_Internal_CompileBase {
+    /**
+     * Compiles code for the {/nocache} tag
+     *
+     * This tag does not generate compiled output. It only sets a compiler flag 
+     * @param array $args array with attributes from parser
+     * @param object $compiler compiler object
+     * @return string compiled code
+     */
+    public function compile($args, $compiler)
+    {
+        $this->compiler = $compiler; 
+        $_attr = $this->_get_attributes($args);
+        // leave nocache mode
+        $this->compiler->nocache = false;
+        // this tag does not return compiled code
+        $this->compiler->has_code = false;
+        return true;
+    } 
+} 
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_private_block_plugin.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_private_block_plugin.php
new file mode 100644
index 0000000..f61ff49
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_private_block_plugin.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Block Plugin
+ * 
+ * Compiles code for the execution of block plugin
+ * 
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews 
+ */
+
+/**
+ * Smarty Internal Plugin Compile Block Plugin Class
+ */
+class Smarty_Internal_Compile_Private_Block_Plugin extends Smarty_Internal_CompileBase {
+	// attribute definitions
+    public $optional_attributes = array('_any'); 
+
+    /**
+     * Compiles code for the execution of block plugin
+     * 
+     * @param array $args array with attributes from parser
+     * @param object $compiler compiler object
+     * @param array $parameter array with compilation parameter
+     * @param string $tag name of block plugin
+     * @param string $function PHP function name
+     * @return string compiled code
+     */
+    public function compile($args, $compiler, $parameter, $tag, $function)
+    {
+        $this->compiler = $compiler;
+        if (strlen($tag) < 6 || substr($tag, -5) != 'close') {
+            // opening tag of block plugin
+        	// check and get attributes
+        	$_attr = $this->_get_attributes($args); 
+        	if ($_attr['nocache'] === true) {
+            	$this->compiler->tag_nocache = true;
+        	}
+       		unset($_attr['nocache']);
+            // convert attributes into parameter array string
+            $_paramsArray = array();
+            foreach ($_attr as $_key => $_value) {
+                if (is_int($_key)) {
+                    $_paramsArray[] = "$_key=>$_value";
+                } else {
+                    $_paramsArray[] = "'$_key'=>$_value";
+                } 
+            } 
+            $_params = 'array(' . implode(",", $_paramsArray) . ')';
+
+            $this->_open_tag($tag, array($_params, $this->compiler->nocache)); 
+            // maybe nocache because of nocache variables or nocache plugin
+            $this->compiler->nocache = $this->compiler->nocache | $this->compiler->tag_nocache; 
+            // compile code
+            $output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; {$function}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
+        } else {
+            // must endblock be nocache?
+            if ($this->compiler->nocache) {
+                $this->compiler->tag_nocache = true;
+            } 
+            // closing tag of block plugin, restore nocache
+            list($_params, $this->compiler->nocache) = $this->_close_tag(substr($tag, 0, -5)); 
+            // This tag does create output
+            $this->compiler->has_output = true; 
+            // compile code
+            if (!isset($parameter['modifier_list'])) {
+            	$mod_pre = $mod_post ='';
+            } else {
+            	$mod_pre = ' ob_start(); ';
+            	$mod_post = 'echo '.$this->compiler->compileTag('private_modifier',array(),array('modifierlist'=>$parameter['modifier_list'],'value'=>'ob_get_clean()')).';';
+            }
+            $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;".$mod_pre." echo {$function}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); ".$mod_post." } array_pop(\$_smarty_tpl->smarty->_tag_stack);?>";
+        } 
+        return $output . "\n";
+    } 
+} 
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_private_function_plugin.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_private_function_plugin.php
new file mode 100644
index 0000000..965d696
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_private_function_plugin.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Function Plugin
+ * 
+ * Compiles code for the execution of function plugin
+ * 
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews 
+ */
+
+/**
+ * Smarty Internal Plugin Compile Function Plugin Class
+ */
+class Smarty_Internal_Compile_Private_Function_Plugin extends Smarty_Internal_CompileBase {
+	// attribute definitions
+    public $required_attributes = array();
+    public $optional_attributes = array('_any'); 
+
+    /**
+     * Compiles code for the execution of function plugin
+     * 
+     * @param array $args array with attributes from parser
+     * @param object $compiler compiler object
+     * @param array $parameter array with compilation parameter
+     * @param string $tag name of function plugin
+     * @param string $function PHP function name
+     * @return string compiled code
+     */
+    public function compile($args, $compiler, $parameter, $tag, $function)
+    {
+        $this->compiler = $compiler; 
+        // This tag does create output
+        $this->compiler->has_output = true;
+
+        // check and get attributes
+        $_attr = $this->_get_attributes($args); 
+        if ($_attr['nocache'] === true) {
+            $this->compiler->tag_nocache = true;
+        }
+        unset($_attr['nocache']);
+        // convert attributes into parameter array string
+        $_paramsArray = array();
+        foreach ($_attr as $_key => $_value) {
+            if (is_int($_key)) {
+                $_paramsArray[] = "$_key=>$_value";
+            } else {
+                $_paramsArray[] = "'$_key'=>$_value";
+            } 
+        } 
+        $_params = 'array(' . implode(",", $_paramsArray) . ')'; 
+        // compile code
+        $output = "<?php echo {$function}({$_params},\$_smarty_tpl);?>\n";
+        return $output;
+    } 
+} 
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_private_modifier.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_private_modifier.php
new file mode 100644
index 0000000..49daf9e
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_private_modifier.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Modifier
+ * 
+ * Compiles code for modifier execution
+ * 
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews 
+ */
+
+/**
+ * Smarty Internal Plugin Compile Modifier Class
+ */
+class Smarty_Internal_Compile_Private_Modifier extends Smarty_Internal_CompileBase {
+    /**
+     * Compiles code for modifier execution
+     * 
+     * @param array $args array with attributes from parser
+     * @param object $compiler compiler object
+     * @param array $parameter array with compilation parameter
+     * @return string compiled code
+     */
+    public function compile($args, $compiler, $parameter)
+    {
+        $this->compiler = $compiler;
+        $this->smarty = $this->compiler->smarty;
+        // check and get attributes
+        $_attr = $this->_get_attributes($args);
+        $output = $parameter['value']; 
+        // loop over list of modifiers
+        foreach ($parameter['modifierlist'] as $single_modifier) {
+            $modifier = $single_modifier[0];
+	   $single_modifier[0] = $output;
+            $params = implode(',', $single_modifier); 
+            // check for registered modifier
+            if (isset($compiler->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][$modifier])) {
+                $function = $compiler->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][$modifier][0];
+                if (!is_array($function)) {
+                    $output = "{$function}({$params})";
+                } else {
+                    if (is_object($function[0])) {
+                        $output = '$_smarty_tpl->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][\'' . $modifier . '\'][0][0]->' . $function[1] . '(' . $params . ')';
+                    } else {
+                        $output = $function[0] . '::' . $function[1] . '(' . $params . ')';
+                    } 
+                } 
+                // check for plugin modifiercompiler
+            } else if ($compiler->smarty->loadPlugin('smarty_modifiercompiler_' . $modifier)) {
+                $plugin = 'smarty_modifiercompiler_' . $modifier;
+                $output = $plugin($single_modifier, $compiler); 
+                // check for plugin modifier
+            } else if ($function = $this->compiler->getPlugin($modifier, Smarty::PLUGIN_MODIFIER)) {
+                $output = "{$function}({$params})"; 
+                // check if trusted PHP function
+            } else if (is_callable($modifier)) {
+                // check if modifier allowed
+                if (!is_object($this->smarty->security_policy) || $this->smarty->security_policy->isTrustedModifier($modifier, $this->compiler)) {
+                    $output = "{$modifier}({$params})";
+                } 
+            } else {
+                $this->compiler->trigger_template_error ("unknown modifier \"" . $modifier . "\"", $this->compiler->lex->taglineno);
+            } 
+        } 
+        return $output;
+    } 
+} 
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_private_object_block_function.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_private_object_block_function.php
new file mode 100644
index 0000000..97737e8
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_private_object_block_function.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Object Block Function
+ * 
+ * Compiles code for registered objects as block function
+ * 
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews 
+ */
+
+/**
+ * Smarty Internal Plugin Compile Object Block Function Class
+ */
+class Smarty_Internal_Compile_Private_Object_Block_Function extends Smarty_Internal_CompileBase {
+	// attribute definitions
+    public $required_attributes = array();
+    public $optional_attributes = array('_any'); 
+
+    /**
+     * Compiles code for the execution of block plugin
+     * 
+     * @param array $args array with attributes from parser
+     * @param object $compiler compiler object
+     * @param array $parameter array with compilation parameter
+     * @param string $tag name of block object
+     * @param string $methode name of methode to call
+     * @return string compiled code
+     */
+    public function compile($args, $compiler, $parameter, $tag, $methode)
+    {
+        $this->compiler = $compiler;
+        if (strlen($tag) < 5 || substr($tag, -5) != 'close') {
+            // opening tag of block plugin
+        	// check and get attributes
+        	$_attr = $this->_get_attributes($args); 
+        	if ($_attr['nocache'] === true) {
+            	$this->compiler->tag_nocache = true;
+        	}
+       		unset($_attr['nocache']);
+            // convert attributes into parameter array string
+            $_paramsArray = array();
+            foreach ($_attr as $_key => $_value) {
+                if (is_int($_key)) {
+                    $_paramsArray[] = "$_key=>$_value";
+                } else {
+                    $_paramsArray[] = "'$_key'=>$_value";
+                } 
+            } 
+            $_params = 'array(' . implode(",", $_paramsArray) . ')';
+
+            $this->_open_tag($tag . '->' . $methode, array($_params, $this->compiler->nocache)); 
+            // maybe nocache because of nocache variables or nocache plugin
+            $this->compiler->nocache = $this->compiler->nocache | $this->compiler->tag_nocache; 
+            // compile code
+            $output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}->{$methode}', {$_params}); \$_block_repeat=true; \$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$methode}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
+        } else {
+            $base_tag = substr($tag, 0, -5); 
+            // must endblock be nocache?
+            if ($this->compiler->nocache) {
+                $this->compiler->tag_nocache = true;
+            } 
+            // closing tag of block plugin, restore nocache
+            list($_params, $this->compiler->nocache) = $this->_close_tag($base_tag . '->' . $methode); 
+            // This tag does create output
+            $this->compiler->has_output = true; 
+            // compile code
+            if (!isset($parameter['modifier_list'])) {
+            	$mod_pre = $mod_post ='';
+            } else {
+            	$mod_pre = ' ob_start(); ';
+            	$mod_post = 'echo '.$this->compiler->compileTag('private_modifier',array(),array('modifierlist'=>$parameter['modifier_list'],'value'=>'ob_get_clean()')).';';
+            }
+            $output = "<?php \$_block_content = ob_get_contents(); ob_end_clean(); \$_block_repeat=false;".$mod_pre." echo \$_smarty_tpl->smarty->registered_objects['{$base_tag}'][0]->{$methode}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); ".$mod_post."  } array_pop(\$_smarty_tpl->smarty->_tag_stack);?>";
+        } 
+        return $output."\n";
+    } 
+} 
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_private_object_function.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_private_object_function.php
new file mode 100644
index 0000000..f0755f0
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_private_object_function.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Object Funtion
+ * 
+ * Compiles code for registered objects as function
+ * 
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews 
+ */
+
+/**
+ * Smarty Internal Plugin Compile Object Function Class
+ */
+class Smarty_Internal_Compile_Private_Object_Function extends Smarty_Internal_CompileBase {
+	// attribute definitions
+    public $required_attributes = array();
+    public $optional_attributes = array('_any'); 
+
+    /**
+     * Compiles code for the execution of function plugin
+     * 
+     * @param array $args array with attributes from parser
+     * @param object $compiler compiler object
+     * @param array $parameter array with compilation parameter
+     * @param string $tag name of function
+     * @param string $methode name of methode to call
+     * @return string compiled code
+     */
+    public function compile($args, $compiler, $parameter, $tag, $methode)
+    {
+        $this->compiler = $compiler;
+        // check and get attributes
+        $_attr = $this->_get_attributes($args); 
+        if ($_attr['nocache'] === true) {
+            $this->compiler->tag_nocache = true;
+        }
+        unset($_attr['nocache']);
+        $_assign = null;
+        if (isset($_attr['assign'])) {
+            $_assign = $_attr['assign'];
+            unset($_attr['assign']);
+        } 
+        // convert attributes into parameter array string
+        if ($this->compiler->smarty->registered_objects[$tag][2]) {
+            $_paramsArray = array();
+            foreach ($_attr as $_key => $_value) {
+                if (is_int($_key)) {
+                    $_paramsArray[] = "$_key=>$_value";
+                } else {
+                    $_paramsArray[] = "'$_key'=>$_value";
+                } 
+            } 
+            $_params = 'array(' . implode(",", $_paramsArray) . ')';
+            $return = "\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$methode}({$_params},\$_smarty_tpl)";
+        } else {
+            $_params = implode(",", $_attr);
+            $return = "\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$methode}({$_params})";
+        } 
+        if (empty($_assign)) {
+            // This tag does create output
+            $this->compiler->has_output = true;
+            $output = "<?php echo {$return};?>\n";
+        } else {
+            $output = "<?php \$_smarty_tpl->assign({$_assign},{$return});?>\n";
+    }
+        return $output;
+    } 
+}
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_private_print_expression.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_private_print_expression.php
new file mode 100644
index 0000000..5a9c931
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_private_print_expression.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Print Expression
+ * 
+ * Compiles any tag which will output an expression or variable
+ * 
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews 
+ */
+
+/**
+ * Smarty Internal Plugin Compile Print Expression Class
+ */
+class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_CompileBase {
+	// attribute definitions
+    public $optional_attributes = array('assign'); 
+    public $option_flags = array('nocache', 'nofilter'); 
+
+    /**
+     * Compiles code for gererting output from any expression
+     * 
+     * @param array $args array with attributes from parser
+     * @param object $compiler compiler object
+     * @param array $parameter array with compilation parameter
+     * @return string compiled code
+     */
+    public function compile($args, $compiler, $parameter)
+    {
+        $this->compiler = $compiler;
+        // check and get attributes
+        $_attr = $this->_get_attributes($args); 
+        // nocache option
+        if ($_attr['nocache'] === true) {
+            $this->compiler->tag_nocache = true;
+        } 
+        // filter handling
+        if ($_attr['nofilter'] === true) {
+            $_filter = 'false';
+        } else {
+            $_filter = 'true';
+        } 
+        // compiled output
+        // compiled output
+        if (isset($_attr['assign'])) {
+            // assign output to variable
+            $output = "<?php \$_smarty_tpl->assign({$_attr['assign']},{$parameter['value']});?>";
+        } else {
+            // display value
+            if (!$_attr['nofilter'] && isset($this->compiler->smarty->registered_filters['variable'])) {
+                $output = "Smarty_Internal_Filter_Handler::runFilter('variable', {$parameter['value']}, \$_smarty_tpl, {$_filter})";
+            } else {
+                $output = $parameter['value'];
+            } 
+            if (!$_attr['nofilter'] && !empty($this->compiler->smarty->default_modifiers)) {
+                $modifierlist = array();
+                foreach ($this->compiler->smarty->default_modifiers as $key => $single_default_modifier) {
+                    preg_match_all('/(\'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\'|"[^"\\\\]*(?:\\\\.[^"\\\\]*)*"|:|[^:]+)/', $single_default_modifier, $mod_array);
+                    for ($i = 0, $count = count($mod_array[0]);$i < $count;$i++) {
+                        if ($mod_array[0][$i] != ':') {
+                            $modifierlist[$key][] = $mod_array[0][$i];
+                        } 
+                    } 
+                } 
+                $output = $this->compiler->compileTag('private_modifier', array(), array('modifierlist' => $modifierlist, 'value' => $output));
+            } 
+            if (!empty($parameter['modifierlist'])) {
+                $output = $this->compiler->compileTag('private_modifier', array(), array('modifierlist' => $parameter['modifierlist'], 'value' => $output));
+            } 
+            $this->compiler->has_output = true;
+            $output = "<?php echo {$output};?>";
+        } 
+        return $output;
+    } 
+} 
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_private_registered_block.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_private_registered_block.php
new file mode 100644
index 0000000..b8f239d
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_private_registered_block.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Registered Block
+ * 
+ * Compiles code for the execution of a registered block function
+ * 
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews 
+ */
+
+/**
+ * Smarty Internal Plugin Compile Registered Block Class
+ */
+class Smarty_Internal_Compile_Private_Registered_Block extends Smarty_Internal_CompileBase {
+	// attribute definitions
+    public $optional_attributes = array('_any'); 
+
+    /**
+     * Compiles code for the execution of a block function
+     * 
+     * @param array $args array with attributes from parser
+     * @param object $compiler compiler object
+     * @param array $parameter array with compilation parameter
+     * @param string $tag name of block function
+     * @return string compiled code
+     */
+    public function compile($args, $compiler, $parameter, $tag)
+    {
+        $this->compiler = $compiler;
+        if (strlen($tag) < 6 || substr($tag,-5) != 'close') {
+            // opening tag of block plugin
+        	// check and get attributes
+        	$_attr = $this->_get_attributes($args); 
+        	if ($_attr['nocache']) {
+            	$this->compiler->tag_nocache = true;
+        	}
+       		unset($_attr['nocache']);
+            // convert attributes into parameter array string
+            $_paramsArray = array();
+            foreach ($_attr as $_key => $_value) {
+                if (is_int($_key)) {
+                    $_paramsArray[] = "$_key=>$_value";
+            	} elseif ($this->compiler->template->caching && in_array($_key,$compiler->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$tag][2])) {
+					$_value = str_replace("'","^#^",$_value);
+                	$_paramsArray[] = "'$_key'=>^#^.var_export($_value,true).^#^";
+                } else {
+                    $_paramsArray[] = "'$_key'=>$_value";
+                } 
+            } 
+            $_params = 'array(' . implode(",", $_paramsArray) . ')';
+
+            $this->_open_tag($tag, array($_params, $this->compiler->nocache)); 
+            // maybe nocache because of nocache variables or nocache plugin
+            $this->compiler->nocache = !$compiler->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$tag][1] | $this->compiler->nocache | $this->compiler->tag_nocache;
+            $function = $compiler->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$tag][0]; 
+            // compile code
+            if (!is_array($function)) {
+                $output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; {$function}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
+            } else if (is_object($function[0])) {
+                $output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; \$_smarty_tpl->smarty->registered_plugins['block']['{$tag}'][0][0]->{$function[1]}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
+            } else {
+                $output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; {$function[0]}::{$function[1]}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
+            } 
+        } else {
+            // must endblock be nocache?
+            if ($this->compiler->nocache) {
+                $this->compiler->tag_nocache = true;
+            } 
+            $base_tag = substr($tag, 0, -5); 
+            // closing tag of block plugin, restore nocache
+            list($_params, $this->compiler->nocache) = $this->_close_tag($base_tag); 
+            // This tag does create output
+            $this->compiler->has_output = true;
+            $function = $compiler->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$base_tag][0]; 
+            // compile code
+            if (!isset($parameter['modifier_list'])) {
+            	$mod_pre = $mod_post ='';
+            } else {
+            	$mod_pre = ' ob_start(); ';
+            	$mod_post = 'echo '.$this->compiler->compileTag('private_modifier',array(),array('modifierlist'=>$parameter['modifier_list'],'value'=>'ob_get_clean()')).';';
+            }
+            if (!is_array($function)) {
+                $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;".$mod_pre." echo {$function}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat);".$mod_post." } array_pop(\$_smarty_tpl->smarty->_tag_stack);?>";
+            } else if (is_object($function[0])) {
+                $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;".$mod_pre." echo \$_smarty_tpl->smarty->registered_plugins['block']['{$base_tag}'][0][0]->{$function[1]}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); ".$mod_post."} array_pop(\$_smarty_tpl->smarty->_tag_stack);?>";
+            } else {
+                $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;".$mod_pre." echo {$function[0]}::{$function[1]}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); ".$mod_post."} array_pop(\$_smarty_tpl->smarty->_tag_stack);?>";
+            } 
+        } 
+        return $output."\n";
+    } 
+} 
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_private_registered_function.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_private_registered_function.php
new file mode 100644
index 0000000..96236fa
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_private_registered_function.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Registered Function
+ * 
+ * Compiles code for the execution of a registered function
+ * 
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews 
+ */
+ 
+/**
+ * Smarty Internal Plugin Compile Registered Function Class
+ */
+class Smarty_Internal_Compile_Private_Registered_Function extends Smarty_Internal_CompileBase {
+	// attribute definitions
+    public $optional_attributes = array('_any'); 
+
+    /**
+     * Compiles code for the execution of a registered function
+     * 
+     * @param array $args array with attributes from parser
+     * @param object $compiler compiler object
+     * @param array $parameter array with compilation parameter
+     * @param string $tag name of function
+     * @return string compiled code
+     */
+    public function compile($args, $compiler, $parameter, $tag)
+    {
+        $this->compiler = $compiler; 
+        // This tag does create output
+        $this->compiler->has_output = true;
+        // check and get attributes
+        $_attr = $this->_get_attributes($args); 
+        if ($_attr['nocache']) {
+            $this->compiler->tag_nocache = true;
+        }
+        unset($_attr['nocache']);
+        // not cachable?
+        $this->compiler->tag_nocache =  $this->compiler->tag_nocache || !$compiler->smarty->registered_plugins[Smarty::PLUGIN_FUNCTION][$tag][1]; 
+        // convert attributes into parameter array string
+        $_paramsArray = array();
+        foreach ($_attr as $_key => $_value) {
+            if (is_int($_key)) {
+                $_paramsArray[] = "$_key=>$_value";
+            } elseif ($this->compiler->template->caching && in_array($_key,$compiler->smarty->registered_plugins[Smarty::PLUGIN_FUNCTION][$tag][2])) {
+				$_value = str_replace("'","^#^",$_value);
+                $_paramsArray[] = "'$_key'=>^#^.var_export($_value,true).^#^";
+            } else {
+                $_paramsArray[] = "'$_key'=>$_value";
+            } 
+        } 
+        $_params = 'array(' . implode(",", $_paramsArray) . ')'; 
+        $function = $compiler->smarty->registered_plugins[Smarty::PLUGIN_FUNCTION][$tag][0]; 
+        // compile code
+        if (!is_array($function)) {
+            $output = "<?php echo {$function}({$_params},\$_smarty_tpl);?>\n";
+        } else if (is_object($function[0])) {
+            $output = "<?php echo \$_smarty_tpl->smarty->registered_plugins[Smarty::PLUGIN_FUNCTION]['{$tag}'][0][0]->{$function[1]}({$_params},\$_smarty_tpl);?>\n";
+        } else {
+            $output = "<?php echo {$function[0]}::{$function[1]}({$_params},\$_smarty_tpl);?>\n";
+        } 
+        return $output;
+    } 
+} 
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_private_special_variable.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_private_special_variable.php
new file mode 100644
index 0000000..5d6ae80
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_private_special_variable.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Special Smarty Variable
+ * 
+ * Compiles the special $smarty variables
+ * 
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews 
+ */
+
+/**
+ * Smarty Internal Plugin Compile special Smarty Variable Class
+ */
+class Smarty_Internal_Compile_Private_Special_Variable extends Smarty_Internal_CompileBase {
+    /**
+     * Compiles code for the speical $smarty variables
+     * 
+     * @param array $args array with attributes from parser
+     * @param object $compiler compiler object
+     * @return string compiled code
+     */
+    public function compile($args, $compiler, $parameter)
+    {
+        $_index = preg_split("/\]\[/",substr($parameter, 1, strlen($parameter)-2));
+        $compiled_ref = ' ';
+        $variable = trim($_index[0], "'");
+        switch ($variable) {
+            case 'foreach':
+                return "\$_smarty_tpl->getVariable('smarty')->value$parameter";
+            case 'section':
+                return "\$_smarty_tpl->getVariable('smarty')->value$parameter";
+            case 'capture':
+                return "Smarty::\$_smarty_vars$parameter";
+            case 'now':
+                return 'time()';
+            case 'cookies':
+                if (isset($compiler->smarty->security_policy) && !$compiler->smarty->security_policy->allow_super_globals) {
+                    $compiler->trigger_template_error("(secure mode) super globals not permitted");
+                    break;
+                } 
+                $compiled_ref = '$_COOKIE';
+                break;
+
+            case 'get':
+            case 'post':
+            case 'env':
+            case 'server':
+            case 'session':
+            case 'request':
+                if (isset($compiler->smarty->security_policy) && !$compiler->smarty->security_policy->allow_super_globals) {
+                    $compiler->trigger_template_error("(secure mode) super globals not permitted");
+                    break;
+                } 
+                $compiled_ref = '$_'.strtoupper($variable);
+                break;
+
+            case 'template':
+                return 'basename($_smarty_tpl->getTemplateFilepath())';
+
+            case 'current_dir':
+                return 'dirname($_smarty_tpl->getTemplateFilepath())';
+
+            case 'version':
+                $_version = Smarty::SMARTY_VERSION;
+                return "'$_version'";
+
+            case 'const':
+                if (isset($compiler->smarty->security_policy) && !$compiler->smarty->security_policy->allow_constants) {
+                    $compiler->trigger_template_error("(secure mode) constants not permitted");
+                    break;
+                } 
+                return '@' . trim($_index[1], "'");
+
+            case 'config':
+                return "\$_smarty_tpl->getConfigVariable($_index[1])";
+            case 'ldelim':
+                $_ldelim = $compiler->smarty->left_delimiter;
+                return "'$_ldelim'";
+
+            case 'rdelim':
+                $_rdelim = $compiler->smarty->right_delimiter;
+                return "'$_rdelim'";
+
+            default:
+                $compiler->trigger_template_error('$smarty.' . trim($_index[0], "'") . ' is invalid');
+                break;
+        } 
+        if (isset($_index[1])) {
+            array_shift($_index);
+            foreach ($_index as $_ind) {
+                $compiled_ref = $compiled_ref . "[$_ind]";
+            } 
+        } 
+        return $compiled_ref;
+    } 
+} 
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_rdelim.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_rdelim.php
new file mode 100644
index 0000000..6436bfd
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_rdelim.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * Smarty Internal Plugin Compile Rdelim
+ *
+ * Compiles the {rdelim} tag 
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Rdelim Class
+ */ 
+class Smarty_Internal_Compile_Rdelim extends Smarty_Internal_CompileBase {
+    /**
+     * Compiles code for the {rdelim} tag
+     *
+     * This tag does output the right delimiter 
+     * @param array $args array with attributes from parser
+     * @param object $compiler compiler object
+     * @return string compiled code
+     */
+    public function compile($args, $compiler)
+    {
+        $this->compiler = $compiler; 
+        $_attr = $this->_get_attributes($args);
+        if ($_attr['nocache'] === true) {
+        	$this->compiler->trigger_template_error('nocache option not allowed', $this->compiler->lex->taglineno);
+        }
+        // this tag does not return compiled code
+        $this->compiler->has_code = true;
+        return $this->compiler->smarty->right_delimiter;
+    } 
+}
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_section.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_section.php
new file mode 100644
index 0000000..0768b02
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_section.php
@@ -0,0 +1,173 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Section
+ * 
+ * Compiles the {section} {sectionelse} {/section} tags
+ * 
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews 
+ */
+
+/**
+ * Smarty Internal Plugin Compile Section Class
+ */
+class Smarty_Internal_Compile_Section extends Smarty_Internal_CompileBase {
+	// attribute definitions
+    public $required_attributes = array('name', 'loop');
+   	public $shorttag_order = array('name', 'loop');
+    public $optional_attributes = array('start', 'step', 'max', 'show'); 
+
+    /**
+     * Compiles code for the {section} tag
+     * 
+     * @param array $args array with attributes from parser
+     * @param object $compiler compiler object
+     * @return string compiled code
+     */
+    public function compile($args, $compiler)
+    {
+        $this->compiler = $compiler;
+        // check and get attributes
+        $_attr = $this->_get_attributes($args);
+
+        $this->_open_tag('section', array('section',$this->compiler->nocache));
+        // maybe nocache because of nocache variables
+        $this->compiler->nocache = $this->compiler->nocache | $this->compiler->tag_nocache;
+
+        $output = "<?php ";
+
+        $section_name = $_attr['name'];
+        
+        $output .= "unset(\$_smarty_tpl->tpl_vars['smarty']->value['section'][$section_name]);\n";
+        $section_props = "\$_smarty_tpl->tpl_vars['smarty']->value['section'][$section_name]";
+
+        foreach ($_attr as $attr_name => $attr_value) {
+            switch ($attr_name) {
+                case 'loop':
+                    $output .= "{$section_props}['loop'] = is_array(\$_loop=$attr_value) ? count(\$_loop) : max(0, (int)\$_loop); unset(\$_loop);\n";
+                    break;
+
+                case 'show':
+                    if (is_bool($attr_value))
+                        $show_attr_value = $attr_value ? 'true' : 'false';
+                    else
+                        $show_attr_value = "(bool)$attr_value";
+                    $output .= "{$section_props}['show'] = $show_attr_value;\n";
+                    break;
+
+                case 'name':
+                    $output .= "{$section_props}['$attr_name'] = $attr_value;\n";
+                    break;
+
+                case 'max':
+                case 'start':
+                    $output .= "{$section_props}['$attr_name'] = (int)$attr_value;\n";
+                    break;
+
+                case 'step':
+                    $output .= "{$section_props}['$attr_name'] = ((int)$attr_value) == 0 ? 1 : (int)$attr_value;\n";
+                    break;
+            } 
+        } 
+
+        if (!isset($_attr['show']))
+            $output .= "{$section_props}['show'] = true;\n";
+
+        if (!isset($_attr['loop']))
+            $output .= "{$section_props}['loop'] = 1;\n";
+
+        if (!isset($_attr['max']))
+            $output .= "{$section_props}['max'] = {$section_props}['loop'];\n";
+        else
+            $output .= "if ({$section_props}['max'] < 0)\n" . "    {$section_props}['max'] = {$section_props}['loop'];\n";
+
+        if (!isset($_attr['step']))
+            $output .= "{$section_props}['step'] = 1;\n";
+
+        if (!isset($_attr['start']))
+            $output .= "{$section_props}['start'] = {$section_props}['step'] > 0 ? 0 : {$section_props}['loop']-1;\n";
+        else {
+            $output .= "if ({$section_props}['start'] < 0)\n" . "    {$section_props}['start'] = max({$section_props}['step'] > 0 ? 0 : -1, {$section_props}['loop'] + {$section_props}['start']);\n" . "else\n" . "    {$section_props}['start'] = min({$section_props}['start'], {$section_props}['step'] > 0 ? {$section_props}['loop'] : {$section_props}['loop']-1);\n";
+        } 
+
+        $output .= "if ({$section_props}['show']) {\n";
+        if (!isset($_attr['start']) && !isset($_attr['step']) && !isset($_attr['max'])) {
+            $output .= "    {$section_props}['total'] = {$section_props}['loop'];\n";
+        } else {
+            $output .= "    {$section_props}['total'] = min(ceil(({$section_props}['step'] > 0 ? {$section_props}['loop'] - {$section_props}['start'] : {$section_props}['start']+1)/abs({$section_props}['step'])), {$section_props}['max']);\n";
+        } 
+        $output .= "    if ({$section_props}['total'] == 0)\n" . "        {$section_props}['show'] = false;\n" . "} else\n" . "    {$section_props}['total'] = 0;\n";
+
+        $output .= "if ({$section_props}['show']):\n";
+        $output .= "
+            for ({$section_props}['index'] = {$section_props}['start'], {$section_props}['iteration'] = 1;
+                 {$section_props}['iteration'] <= {$section_props}['total'];
+                 {$section_props}['index'] += {$section_props}['step'], {$section_props}['iteration']++):\n";
+        $output .= "{$section_props}['rownum'] = {$section_props}['iteration'];\n";
+        $output .= "{$section_props}['index_prev'] = {$section_props}['index'] - {$section_props}['step'];\n";
+        $output .= "{$section_props}['index_next'] = {$section_props}['index'] + {$section_props}['step'];\n";
+        $output .= "{$section_props}['first']      = ({$section_props}['iteration'] == 1);\n";
+        $output .= "{$section_props}['last']       = ({$section_props}['iteration'] == {$section_props}['total']);\n";
+
+        $output .= "?>";
+        return $output;
+    } 
+} 
+
+/**
+* Smarty Internal Plugin Compile Sectionelse Class
+*/
+class Smarty_Internal_Compile_Sectionelse extends Smarty_Internal_CompileBase {
+    /**
+     * Compiles code for the {sectionelse} tag
+     * 
+     * @param array $args array with attributes from parser
+     * @param object $compiler compiler object
+     * @return string compiled code
+     */
+    public function compile($args, $compiler)
+    {
+        $this->compiler = $compiler; 
+        // check and get attributes
+        $_attr = $this->_get_attributes($args);
+
+        list($_open_tag, $nocache) = $this->_close_tag(array('section'));
+        $this->_open_tag('sectionelse',array('sectionelse', $nocache));
+
+        return "<?php endfor; else: ?>";
+    } 
+} 
+
+/**
+ * Smarty Internal Plugin Compile Sectionclose Class
+ */
+class Smarty_Internal_Compile_Sectionclose extends Smarty_Internal_CompileBase {
+    /**
+     * Compiles code for the {/section} tag
+     * 
+     * @param array $args array with attributes from parser
+     * @param object $compiler compiler object
+     * @return string compiled code
+     */
+    public function compile($args, $compiler)
+    {
+        $this->compiler = $compiler; 
+        // check and get attributes
+        $_attr = $this->_get_attributes($args);
+
+        // must endblock be nocache?
+        if ($this->compiler->nocache) {
+                 $this->compiler->tag_nocache = true;
+        }
+
+        list($_open_tag, $this->compiler->nocache) = $this->_close_tag(array('section', 'sectionelse'));
+
+        if ($_open_tag == 'sectionelse')
+            return "<?php endif; ?>";
+        else
+            return "<?php endfor; endif; ?>";
+    } 
+} 
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_while.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_while.php
new file mode 100644
index 0000000..7e87a22
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compile_while.php
@@ -0,0 +1,82 @@
+<?php
+/**
+* Smarty Internal Plugin Compile While
+* 
+* Compiles the {while} tag
+* 
+* @package Smarty
+* @subpackage Compiler
+* @author Uwe Tews 
+*/
+
+/**
+* Smarty Internal Plugin Compile While Class
+*/
+class Smarty_Internal_Compile_While extends Smarty_Internal_CompileBase {
+    /**
+    * Compiles code for the {while} tag
+    * 
+    * @param array $args array with attributes from parser
+    * @param object $compiler compiler object
+    * @param array $parameter array with compilation parameter
+    * @return string compiled code
+    */
+    public function compile($args, $compiler, $parameter)
+    {
+        $this->compiler = $compiler;
+        // check and get attributes
+        $_attr = $this->_get_attributes($args);
+        $this->_open_tag('while', $this->compiler->nocache);
+
+        // maybe nocache because of nocache variables
+        $this->compiler->nocache = $this->compiler->nocache | $this->compiler->tag_nocache;
+        if (is_array($parameter['if condition'])) {
+        	if ($this->compiler->nocache) {
+        		$_nocache = ',true';
+            	// create nocache var to make it know for further compiling
+            	if (is_array($parameter['if condition']['var'])) {
+            		$this->compiler->template->tpl_vars[trim($parameter['if condition']['var']['var'], "'")] = new Smarty_variable(null, true);
+            	} else {
+            		$this->compiler->template->tpl_vars[trim($parameter['if condition']['var'], "'")] = new Smarty_variable(null, true);
+            	}
+        	} else {
+        		$_nocache = '';
+        	}
+            if (is_array($parameter['if condition']['var'])) {
+            	$_output = "<?php if (!isset(\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']['var']."]) || !is_array(\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']['var']."]->value)) \$_smarty_tpl->createLocalArrayVariable(".$parameter['if condition']['var']['var']."$_nocache);\n";
+	            $_output .= "while (\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']['var']."]->value".$parameter['if condition']['var']['smarty_internal_index']." = ".$parameter['if condition']['value']."){?>";
+            } else {
+	            $_output = "<?php \$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']."] = new Smarty_Variable(\$_smarty_tpl->getVariable(".$parameter['if condition']['var'].",null,true,false)->value{$_nocache});";            
+	            $_output .= "while (\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']."]->value = ".$parameter['if condition']['value']."){?>";
+	        }
+            return $_output;
+        } else {
+            return "<?php while ({$parameter['if condition']}){?>";
+        } 
+    } 
+} 
+
+/**
+* Smarty Internal Plugin Compile Whileclose Class
+*/
+class Smarty_Internal_Compile_Whileclose extends Smarty_Internal_CompileBase {
+    /**
+    * Compiles code for the {/while} tag
+    * 
+    * @param array $args array with attributes from parser
+    * @param object $compiler compiler object
+    * @return string compiled code
+    */
+    public function compile($args, $compiler)
+    {
+        $this->compiler = $compiler; 
+        // must endblock be nocache?
+        if ($this->compiler->nocache) {
+                 $this->compiler->tag_nocache = true;
+        }
+        $this->compiler->nocache = $this->_close_tag(array('while'));
+        return "<?php }?>";
+    } 
+} 
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compilebase.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compilebase.php
new file mode 100644
index 0000000..6418acc
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_compilebase.php
@@ -0,0 +1,150 @@
+<?php
+
+/**
+ * Smarty Internal Plugin CompileBase
+ * 
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews 
+ */
+
+/**
+ * This class does extend all internal compile plugins
+ */
+// abstract class Smarty_Internal_CompileBase implements TagCompilerInterface
+class Smarty_Internal_CompileBase {
+	public $required_attributes = array();
+    public $optional_attributes = array();
+    public $shorttag_order = array();
+    public $option_flags = array('nocache');
+
+
+    /**
+     * This function checks if the attributes passed are valid
+     * 
+     * The attributes passed for the tag to compile are checked against the list of required and 
+     * optional attributes. Required attributes must be present. Optional attributes are check against
+     * against the corresponding list. The keyword '_any' specifies that any attribute will be accepted 
+     * as valid
+     * 
+     * @param array $attributes attributes applied to the tag
+     * @return array of mapped attributes for further processing
+     */
+    function _get_attributes ($attributes)
+    {
+        $_indexed_attr = array(); 
+        // loop over attributes
+        foreach ($attributes as $key => $mixed) {
+            // shorthand ?
+            if (!is_array($mixed)) {
+                // option flag ?
+                if (in_array(trim($mixed, '\'"'), $this->option_flags)) {
+                    $_indexed_attr[trim($mixed, '\'"')] = true; 
+                    // shorthand attribute ?
+                } else if (isset($this->shorttag_order[$key])) {
+                    $_indexed_attr[$this->shorttag_order[$key]] = $mixed;
+                } else {
+                    // too many shorthands
+                    $this->compiler->trigger_template_error('too many shorthand attributes', $this->compiler->lex->taglineno);
+                } 
+                // named attribute
+            } else {
+                $kv = each($mixed); 
+                // option flag?
+                if (in_array($kv['key'], $this->option_flags)) {
+                    if (is_bool($kv['value'])) {
+                        $_indexed_attr[$kv['key']] = $kv['value'];
+                    } else if (is_string($kv['value']) && in_array(trim($kv['value'], '\'"'), array('true', 'false'))) {
+                        if (trim($kv['value']) == 'true') {
+                            $_indexed_attr[$kv['key']] = true;
+                        } else {
+                            $_indexed_attr[$kv['key']] = false;
+                        } 
+                    } else if (is_numeric($kv['value']) && in_array($kv['value'], array(0, 1))) {
+                        if ($kv['value'] == 1) {
+                            $_indexed_attr[$kv['key']] = true;
+                        } else {
+                            $_indexed_attr[$kv['key']] = false;
+                        } 
+                    } else {
+                        $this->compiler->trigger_template_error("illegal value of option flag \"{$kv['key']}\"", $this->compiler->lex->taglineno);
+                    } 
+                    // must be named attribute
+                } else {
+                	reset($mixed);
+                    $_indexed_attr[key($mixed)] = $mixed[key($mixed)];
+                } 
+            } 
+        } 
+        // check if all required attributes present
+        foreach ($this->required_attributes as $attr) {
+            if (!array_key_exists($attr, $_indexed_attr)) {
+                $this->compiler->trigger_template_error("missing \"" . $attr . "\" attribute", $this->compiler->lex->taglineno);
+            } 
+        } 
+        // check for unallowed attributes
+        if ($this->optional_attributes != array('_any')) {
+            $tmp_array = array_merge($this->required_attributes, $this->optional_attributes, $this->option_flags);
+            foreach ($_indexed_attr as $key => $dummy) {
+                if (!in_array($key, $tmp_array) && $key !== 0) {
+                    $this->compiler->trigger_template_error("unexpected \"" . $key . "\" attribute", $this->compiler->lex->taglineno);
+                } 
+            } 
+        } 
+        // default 'false' for all option flags not set
+        foreach ($this->option_flags as $flag) {
+            if (!isset($_indexed_attr[$flag])) {
+                $_indexed_attr[$flag] = false;
+            } 
+        } 
+
+        return $_indexed_attr;
+    } 
+
+    /**
+     * Push opening tag name on stack
+     * 
+     * Optionally additional data can be saved on stack
+     * 
+     * @param string $open_tag the opening tag's name
+     * @param anytype $data optional data which shall be saved on stack
+     */
+    function _open_tag($open_tag, $data = null)
+    {
+        array_push($this->compiler->_tag_stack, array($open_tag, $data));
+    } 
+
+    /**
+     * Pop closing tag
+     * 
+     * Raise an error if this stack-top doesn't match with expected opening tags
+     * 
+     * @param array $ |string $expected_tag the expected opening tag names
+     * @return anytype the opening tag's name or saved data
+     */
+    function _close_tag($expected_tag)
+    {
+        if (count($this->compiler->_tag_stack) > 0) {
+            // get stacked info
+            list($_open_tag, $_data) = array_pop($this->compiler->_tag_stack); 
+            // open tag must match with the expected ones
+            if (in_array($_open_tag, (array)$expected_tag)) {
+                if (is_null($_data)) {
+                    // return opening tag
+                    return $_open_tag;
+                } else {
+                    // return restored data
+                    return $_data;
+                } 
+            } 
+            // wrong nesting of tags
+            $this->compiler->trigger_template_error("unclosed {" . $_open_tag . "} tag");
+            return;
+        } 
+        // wrong nesting of tags
+        $this->compiler->trigger_template_error("unexpected closing tag", $this->compiler->lex->taglineno);
+        return;
+    } 
+} 
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_config.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_config.php
new file mode 100644
index 0000000..06ae70b
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_config.php
@@ -0,0 +1,288 @@
+<?php
+/**
+ * Smarty Internal Plugin Config
+ * 
+ * Main class for config variables
+ * 
+ * @ignore 
+ * @package Smarty
+ * @subpackage Config
+ * @author Uwe Tews 
+ */
+class Smarty_Internal_Config {
+    static $config_objects = array();
+
+    public function __construct($config_resource, $smarty, $data = null)
+    {
+        $this->data = $data;
+        $this->smarty = $smarty;
+        $this->config_resource = $config_resource;
+        $this->config_resource_type = null;
+        $this->config_resource_name = null;
+        $this->config_filepath = null;
+        $this->config_timestamp = null;
+        $this->config_source = null;
+        $this->compiled_config = null;
+        $this->compiled_filepath = null;
+        $this->compiled_timestamp = null;
+        $this->mustCompile = null;
+        $this->compiler_object = null; 
+        // parse config resource name
+        if (!$this->parseConfigResourceName ($config_resource)) {
+            throw new SmartyException ("Unable to parse config resource '{$config_resource}'");
+        } 
+    } 
+
+    public function getConfigFilepath ()
+    {
+        return $this->config_filepath === null ?
+        $this->config_filepath = $this->buildConfigFilepath() :
+        $this->config_filepath;
+    } 
+
+    public function getTimestamp ()
+    {
+        return $this->config_timestamp === null ?
+        $this->config_timestamp = filemtime($this->getConfigFilepath()) :
+        $this->config_timestamp;
+    } 
+
+    private function parseConfigResourceName($config_resource)
+    {
+        if (empty($config_resource))
+            return false;
+        if (strpos($config_resource, ':') === false) {
+            // no resource given, use default
+            $this->config_resource_type = $this->smarty->default_config_type;
+            $this->config_resource_name = $config_resource;
+        } else {
+            // get type and name from path
+            list($this->config_resource_type, $this->config_resource_name) = explode(':', $config_resource, 2);
+            if (strlen($this->config_resource_type) == 1) {
+                // 1 char is not resource type, but part of filepath
+                $this->config_resource_type = $this->smarty->default_config_type;
+                $this->config_resource_name = $config_resource;
+            } else {
+                $this->config_resource_type = strtolower($this->config_resource_type);
+            } 
+        } 
+        return true;
+    } 
+
+    /*
+     * get system filepath to config
+     */
+    public function buildConfigFilepath ()
+    {
+        foreach((array)$this->smarty->config_dir as $_config_dir) {
+            if (strpos('/\\', substr($_config_dir, -1)) === false) {
+                $_config_dir .= DS;
+            } 
+
+            $_filepath = $_config_dir . $this->config_resource_name;
+            if (file_exists($_filepath))
+                return $_filepath;
+        } 
+        // check for absolute path
+        if (file_exists($this->config_resource_name))
+            return $this->config_resource_name; 
+        // no tpl file found
+        throw new SmartyException("Unable to load config file \"{$this->config_resource_name}\"");
+        return false;
+    } 
+    /**
+     * Read config file source
+     * 
+     * @return string content of source file
+     */
+    /**
+     * Returns the template source code
+     * 
+     * The template source is being read by the actual resource handler
+     * 
+     * @return string the template source
+     */
+    public function getConfigSource ()
+    {
+        if ($this->config_source === null) {
+            if ($this->readConfigSource($this) === false) {
+                throw new SmartyException("Unable to load config file \"{$this->config_resource_name}\"");
+            } 
+        } 
+        return $this->config_source;
+    } 
+    public function readConfigSource()
+    { 
+        // read source file
+        if (file_exists($this->getConfigFilepath())) {
+            $this->config_source = file_get_contents($this->getConfigFilepath());
+            return true;
+        } else {
+            return false;
+        } 
+    } 
+
+    /**
+     * Returns the compiled  filepath
+     * 
+     * @return string the compiled filepath
+     */
+    public function getCompiledFilepath ()
+    {
+        return $this->compiled_filepath === null ?
+        ($this->compiled_filepath = $this->buildCompiledFilepath()) :
+        $this->compiled_filepath;
+    } 
+    public function buildCompiledFilepath()
+    {
+        $_compile_id = isset($this->smarty->compile_id) ? preg_replace('![^\w\|]+!', '_', $this->smarty->compile_id) : null;
+        $_flag = (int)$this->smarty->config_read_hidden + (int)$this->smarty->config_booleanize * 2 +
+        (int)$this->smarty->config_overwrite * 4;
+        $_filepath = sha1($this->config_resource_name . $_flag); 
+        // if use_sub_dirs, break file into directories
+        if ($this->smarty->use_sub_dirs) {
+            $_filepath = substr($_filepath, 0, 2) . DS
+             . substr($_filepath, 2, 2) . DS
+             . substr($_filepath, 4, 2) . DS
+             . $_filepath;
+        } 
+        $_compile_dir_sep = $this->smarty->use_sub_dirs ? DS : '^';
+        if (isset($_compile_id)) {
+            $_filepath = $_compile_id . $_compile_dir_sep . $_filepath;
+        } 
+        $_compile_dir = $this->smarty->compile_dir;
+        if (substr($_compile_dir, -1) != DS) {
+            $_compile_dir .= DS;
+        } 
+        return $_compile_dir . $_filepath . '.' . basename($this->config_resource_name) . '.config' . '.php';
+    } 
+    /**
+     * Returns the timpestamp of the compiled file
+     * 
+     * @return integer the file timestamp
+     */
+    public function getCompiledTimestamp ()
+    {
+        return $this->compiled_timestamp === null ?
+        ($this->compiled_timestamp = (file_exists($this->getCompiledFilepath())) ? filemtime($this->getCompiledFilepath()) : false) :
+        $this->compiled_timestamp;
+    } 
+    /**
+     * Returns if the current config file must be compiled 
+     * 
+     * It does compare the timestamps of config source and the compiled config and checks the force compile configuration
+     * 
+     * @return boolean true if the file must be compiled
+     */
+    public function mustCompile ()
+    {
+        return $this->mustCompile === null ?
+        $this->mustCompile = ($this->smarty->force_compile || $this->getCompiledTimestamp () === false || $this->smarty->compile_check && $this->getCompiledTimestamp () < $this->getTimestamp ()):
+        $this->mustCompile;
+    } 
+    /**
+     * Returns the compiled config file 
+     * 
+     * It checks if the config file must be compiled or just read the compiled version
+     * 
+     * @return string the compiled config file
+     */
+    public function getCompiledConfig ()
+    {
+        if ($this->compiled_config === null) {
+            // see if template needs compiling.
+            if ($this->mustCompile()) {
+                $this->compileConfigSource();
+            } else {
+                $this->compiled_config = file_get_contents($this->getCompiledFilepath());
+            } 
+        } 
+        return $this->compiled_config;
+    } 
+
+    /**
+     * Compiles the config files
+     */
+    public function compileConfigSource ()
+    { 
+        // compile template
+        if (!is_object($this->compiler_object)) {
+            // load compiler
+            $this->compiler_object = new Smarty_Internal_Config_File_Compiler($this->smarty);
+        } 
+        // compile locking
+        if ($this->smarty->compile_locking) {
+            if ($saved_timestamp = $this->getCompiledTimestamp()) {
+                touch($this->getCompiledFilepath());
+            } 
+        } 
+        // call compiler
+        try {
+            $this->compiler_object->compileSource($this);
+        } 
+        catch (Exception $e) {
+            // restore old timestamp in case of error
+            if ($this->smarty->compile_locking && $saved_timestamp) {
+                touch($this->getCompiledFilepath(), $saved_timestamp);
+            } 
+            throw $e;
+        } 
+        // compiling succeded
+        // write compiled template
+        Smarty_Internal_Write_File::writeFile($this->getCompiledFilepath(), $this->getCompiledConfig(), $this->smarty);
+    } 
+
+    /*
+     * load config variables
+    *
+    * @param mixed $sections array of section names, single section or null
+    * @param object $scope global,parent or local
+    */
+    public function loadConfigVars ($sections = null, $scope = 'local')
+    {
+        if ($this->data instanceof Smarty_Internal_Template) {
+            $this->data->properties['file_dependency'][sha1($this->getConfigFilepath())] = array($this->getConfigFilepath(), $this->getTimestamp(),'file');
+        } 
+        if ($this->mustCompile()) {
+            $this->compileConfigSource();
+        }
+        // pointer to scope
+        if ($scope == 'local') {
+        	$scope_ptr = $this->data;
+        } elseif ($scope == 'parent') {
+        	if (isset($this->data->parent)) {
+        		$scope_ptr = $this->data->parent;
+        	} else {
+        		$scope_ptr = $this->data;
+        	}        		
+        } elseif ($scope == 'root' || $scope == 'global') {
+        	$scope_ptr = $this->data;
+        	while (isset($scope_ptr->parent)) {
+        		$scope_ptr = $scope_ptr->parent;
+        	} 
+        }
+        $_config_vars = array();
+        include($this->getCompiledFilepath ());
+        // copy global config vars
+        foreach ($_config_vars['vars'] as $variable => $value) {
+            if ($this->smarty->config_overwrite || !isset($scope_ptr->config_vars[$variable])) {
+                $scope_ptr->config_vars[$variable] = $value;
+            } else {
+                $scope_ptr->config_vars[$variable] = array_merge((array)$scope_ptr->config_vars[$variable], (array)$value);
+            } 
+        } 
+        // scan sections
+        foreach ($_config_vars['sections'] as $this_section => $dummy) {
+            if ($sections == null || in_array($this_section, (array)$sections)) {
+                foreach ($_config_vars['sections'][$this_section]['vars'] as $variable => $value) {
+                    if ($this->smarty->config_overwrite || !isset($scope_ptr->config_vars[$variable])) {
+                        $scope_ptr->config_vars[$variable] = $value;
+                    } else {
+                        $scope_ptr->config_vars[$variable] = array_merge((array)$scope_ptr->config_vars[$variable], (array)$value);
+                    } 
+                } 
+            } 
+        }
+    } 
+} 
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_config_file_compiler.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_config_file_compiler.php
new file mode 100644
index 0000000..e9dfbdb
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_config_file_compiler.php
@@ -0,0 +1,106 @@
+<?php
+
+/**
+ * Smarty Internal Plugin Config File Compiler
+ * 
+ * This is the config file compiler class. It calls the lexer and parser to
+ * perform the compiling.
+ * 
+ * @package Smarty
+ * @subpackage Config
+ * @author Uwe Tews 
+ */
+ 
+/**
+ * Main config file compiler class
+ */
+class Smarty_Internal_Config_File_Compiler {
+    /**
+     * Initialize compiler
+     */
+    public function __construct($smarty)
+    {
+        $this->smarty = $smarty; 
+        // get required plugins
+        $this->smarty->loadPlugin('Smarty_Internal_Configfilelexer');
+		$this->smarty->loadPlugin('Smarty_Internal_Configfileparser');
+        $this->config_data['sections'] = array();
+        $this->config_data['vars'] = array();
+    } 
+
+    /**
+     * Methode to compile a Smarty template
+     * 
+     * @param  $template template object to compile
+     * @return bool true if compiling succeeded, false if it failed
+     */
+    public function compileSource($config)
+    {
+        /* here is where the compiling takes place. Smarty
+       tags in the templates are replaces with PHP code,
+       then written to compiled files. */
+        $this->config = $config; 
+        // get config file source
+        $_content = $config->getConfigSource() . "\n"; 
+        // on empty template just return
+        if ($_content == '') {
+            return true;
+        } 
+        // init the lexer/parser to compile the config file
+        $lex = new Smarty_Internal_Configfilelexer($_content, $this->smarty);
+        $parser = new Smarty_Internal_Configfileparser($lex, $this);
+        if (isset($this->smarty->_parserdebug)) $parser->PrintTrace(); 
+        // get tokens from lexer and parse them
+        while ($lex->yylex()) {
+            if (isset($this->smarty->_parserdebug)) echo "<br>Parsing  {$parser->yyTokenName[$lex->token]} Token {$lex->value} Line {$lex->line} \n";
+            $parser->doParse($lex->token, $lex->value);
+        } 
+        // finish parsing process
+        $parser->doParse(0, 0);
+        $config->compiled_config = '<?php $_config_vars = ' . var_export($this->config_data, true) . '; ?>';
+    } 
+    /**
+     * display compiler error messages without dying
+     * 
+     * If parameter $args is empty it is a parser detected syntax error.
+     * In this case the parser is called to obtain information about exspected tokens.
+     * 
+     * If parameter $args contains a string this is used as error message
+     * 
+     * @todo output exact position of parse error in source line
+     * @param  $args string individual error message or null
+     */
+    public function trigger_config_file_error($args = null)
+    {
+        $this->lex = Smarty_Internal_Configfilelexer::instance();
+        $this->parser = Smarty_Internal_Configfileparser::instance(); 
+        // get template source line which has error
+        $line = $this->lex->line;
+        if (isset($args)) {
+            // $line--;
+        } 
+        $match = preg_split("/\n/", $this->lex->data);
+        $error_text = "Syntax error in config file '{$this->config->getConfigFilepath()}' on line {$line} '{$match[$line-1]}' ";
+        if (isset($args)) {
+            // individual error message
+            $error_text .= $args;
+        } else {
+            // exspected token from parser
+            foreach ($this->parser->yy_get_expected_tokens($this->parser->yymajor) as $token) {
+                $exp_token = $this->parser->yyTokenName[$token];
+                if (isset($this->lex->smarty_token_names[$exp_token])) {
+                    // token type from lexer
+                    $expect[] = '"' . $this->lex->smarty_token_names[$exp_token] . '"';
+                } else {
+                    // otherwise internal token name
+                    $expect[] = $this->parser->yyTokenName[$token];
+                } 
+            } 
+            // output parser error message
+            $error_text .= ' - Unexpected "' . $this->lex->value . '", expected one of: ' . implode(' , ', $expect);
+        } 
+        throw new SmartyCompilerException($error_text);
+    } 
+} 
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_configfilelexer.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_configfilelexer.php
new file mode 100644
index 0000000..9186fe2
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_configfilelexer.php
@@ -0,0 +1,526 @@
+<?php
+/**
+* Smarty Internal Plugin Configfilelexer
+*
+* This is the lexer to break the config file source into tokens 
+* @package Smarty
+* @subpackage Config
+* @author Uwe Tews 
+*/
+/**
+* Smarty Internal Plugin Configfilelexer
+*/
+class Smarty_Internal_Configfilelexer
+{
+
+    public $data;
+    public $counter;
+    public $token;
+    public $value;
+    public $node;
+    public $line;
+    private $state = 1;
+    public $smarty_token_names = array (		// Text for parser error messages
+   				);
+    				
+    				
+    function __construct($data, $smarty)
+    {
+        // set instance object
+        self::instance($this); 
+        $this->data = $data . "\n"; //now all lines are \n-terminated
+        $this->counter = 0;
+        $this->line = 1;
+        $this->smarty = $smarty; 
+     }
+    public static function &instance($new_instance = null)
+    {
+        static $instance = null;
+        if (isset($new_instance) && is_object($new_instance))
+            $instance = $new_instance;
+        return $instance;
+    } 
+
+
+
+    private $_yy_state = 1;
+    private $_yy_stack = array();
+
+    function yylex()
+    {
+        return $this->{'yylex' . $this->_yy_state}();
+    }
+
+    function yypushstate($state)
+    {
+        array_push($this->_yy_stack, $this->_yy_state);
+        $this->_yy_state = $state;
+    }
+
+    function yypopstate()
+    {
+        $this->_yy_state = array_pop($this->_yy_stack);
+    }
+
+    function yybegin($state)
+    {
+        $this->_yy_state = $state;
+    }
+
+
+
+
+    function yylex1()
+    {
+        $tokenMap = array (
+              1 => 0,
+              2 => 0,
+              3 => 0,
+              4 => 0,
+              5 => 0,
+              6 => 0,
+              7 => 0,
+            );
+        if ($this->counter >= strlen($this->data)) {
+            return false; // end of input
+        }
+        $yy_global_pattern = "/^(#)|^(\\[)|^(\\])|^(=)|^([ \t\r]+)|^(\n)|^([0-9]*[a-zA-Z_]\\w*)/iS";
+
+        do {
+            if (preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches)) {
+                $yysubmatches = $yymatches;
+                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
+                if (!count($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' .
+                        'an empty string.  Input "' . substr($this->data,
+                        $this->counter, 5) . '... state START');
+                }
+                next($yymatches); // skip global match
+                $this->token = key($yymatches); // token number
+                if ($tokenMap[$this->token]) {
+                    // extract sub-patterns for passing to lex function
+                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
+                        $tokenMap[$this->token]);
+                } else {
+                    $yysubmatches = array();
+                }
+                $this->value = current($yymatches); // token value
+                $r = $this->{'yy_r1_' . $this->token}($yysubmatches);
+                if ($r === null) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    // accept this token
+                    return true;
+                } elseif ($r === true) {
+                    // we have changed state
+                    // process this token in the new state
+                    return $this->yylex();
+                } elseif ($r === false) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    if ($this->counter >= strlen($this->data)) {
+                        return false; // end of input
+                    }
+                    // skip this token
+                    continue;
+                }            } else {
+                throw new Exception('Unexpected input at line' . $this->line .
+                    ': ' . $this->data[$this->counter]);
+            }
+            break;
+        } while (true);
+
+    } // end function
+
+
+    const START = 1;
+    function yy_r1_1($yy_subpatterns)
+    {
+
+    $this->token = Smarty_Internal_Configfileparser::TPC_COMMENTSTART;
+    $this->yypushstate(self::COMMENT);
+    }
+    function yy_r1_2($yy_subpatterns)
+    {
+
+    $this->token = Smarty_Internal_Configfileparser::TPC_OPENB;
+    $this->yypushstate(self::SECTION);
+    }
+    function yy_r1_3($yy_subpatterns)
+    {
+
+    $this->token = Smarty_Internal_Configfileparser::TPC_CLOSEB;
+    }
+    function yy_r1_4($yy_subpatterns)
+    {
+
+    $this->token = Smarty_Internal_Configfileparser::TPC_EQUAL;
+    $this->yypushstate(self::VALUE);
+    }
+    function yy_r1_5($yy_subpatterns)
+    {
+
+    return false;
+    }
+    function yy_r1_6($yy_subpatterns)
+    {
+
+    $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE;
+    }
+    function yy_r1_7($yy_subpatterns)
+    {
+
+    $this->token = Smarty_Internal_Configfileparser::TPC_ID;
+    }
+
+
+
+    function yylex2()
+    {
+        $tokenMap = array (
+              1 => 0,
+              2 => 0,
+              3 => 0,
+              4 => 0,
+              5 => 0,
+              6 => 0,
+              7 => 0,
+              8 => 0,
+              9 => 0,
+            );
+        if ($this->counter >= strlen($this->data)) {
+            return false; // end of input
+        }
+        $yy_global_pattern = "/^([ \t\r]+)|^(\\d+\\.\\d+(?=[ \t\r]*[\n#]))|^(\\d+(?=[ \t\r]*[\n#]))|^('[^'\\\\]*(?:\\\\.[^'\\\\]*)*'(?=[ \t\r]*[\n#]))|^(\"[^\"\\\\]*(?:\\\\.[^\"\\\\]*)*\"(?=[ \t\r]*[\n#]))|^(\"\"\"[^\"\\\\]*(?:\\\\.[^\"\\\\]*)*\"\"\"(?=[ \t\r]*[\n#]))|^([a-zA-Z]+(?=[ \t\r]*[\n#]))|^([^\n]+?(?=[ \t\r]*\n))|^(\n)/iS";
+
+        do {
+            if (preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches)) {
+                $yysubmatches = $yymatches;
+                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
+                if (!count($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' .
+                        'an empty string.  Input "' . substr($this->data,
+                        $this->counter, 5) . '... state VALUE');
+                }
+                next($yymatches); // skip global match
+                $this->token = key($yymatches); // token number
+                if ($tokenMap[$this->token]) {
+                    // extract sub-patterns for passing to lex function
+                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
+                        $tokenMap[$this->token]);
+                } else {
+                    $yysubmatches = array();
+                }
+                $this->value = current($yymatches); // token value
+                $r = $this->{'yy_r2_' . $this->token}($yysubmatches);
+                if ($r === null) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    // accept this token
+                    return true;
+                } elseif ($r === true) {
+                    // we have changed state
+                    // process this token in the new state
+                    return $this->yylex();
+                } elseif ($r === false) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    if ($this->counter >= strlen($this->data)) {
+                        return false; // end of input
+                    }
+                    // skip this token
+                    continue;
+                }            } else {
+                throw new Exception('Unexpected input at line' . $this->line .
+                    ': ' . $this->data[$this->counter]);
+            }
+            break;
+        } while (true);
+
+    } // end function
+
+
+    const VALUE = 2;
+    function yy_r2_1($yy_subpatterns)
+    {
+
+    return false;
+    }
+    function yy_r2_2($yy_subpatterns)
+    {
+
+    $this->token = Smarty_Internal_Configfileparser::TPC_FLOAT;
+    $this->yypopstate();
+    }
+    function yy_r2_3($yy_subpatterns)
+    {
+
+    $this->token = Smarty_Internal_Configfileparser::TPC_INT;
+    $this->yypopstate();
+    }
+    function yy_r2_4($yy_subpatterns)
+    {
+
+    $this->token = Smarty_Internal_Configfileparser::TPC_SINGLE_QUOTED_STRING;
+    $this->yypopstate();
+    }
+    function yy_r2_5($yy_subpatterns)
+    {
+
+    $this->token = Smarty_Internal_Configfileparser::TPC_DOUBLE_QUOTED_STRING;
+    $this->yypopstate();
+    }
+    function yy_r2_6($yy_subpatterns)
+    {
+
+    $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_DOUBLE_QUOTED_STRING;
+    $this->yypopstate();
+    }
+    function yy_r2_7($yy_subpatterns)
+    {
+
+    if (!$this->smarty->config_booleanize || !in_array(strtolower($this->value), Array("true", "false", "on", "off", "yes", "no")) ) {
+        $this->yypopstate();
+        $this->yypushstate(self::NAKED_STRING_VALUE);
+        return true; //reprocess in new state
+    } else {
+        $this->token = Smarty_Internal_Configfileparser::TPC_BOOL;
+        $this->yypopstate();
+    }
+    }
+    function yy_r2_8($yy_subpatterns)
+    {
+
+    $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
+    $this->yypopstate();
+    }
+    function yy_r2_9($yy_subpatterns)
+    {
+
+    $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
+    $this->value = "";
+    $this->yypopstate();
+    }
+
+
+
+    function yylex3()
+    {
+        $tokenMap = array (
+              1 => 0,
+            );
+        if ($this->counter >= strlen($this->data)) {
+            return false; // end of input
+        }
+        $yy_global_pattern = "/^([^\n]+?(?=[ \t\r]*\n))/iS";
+
+        do {
+            if (preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches)) {
+                $yysubmatches = $yymatches;
+                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
+                if (!count($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' .
+                        'an empty string.  Input "' . substr($this->data,
+                        $this->counter, 5) . '... state NAKED_STRING_VALUE');
+                }
+                next($yymatches); // skip global match
+                $this->token = key($yymatches); // token number
+                if ($tokenMap[$this->token]) {
+                    // extract sub-patterns for passing to lex function
+                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
+                        $tokenMap[$this->token]);
+                } else {
+                    $yysubmatches = array();
+                }
+                $this->value = current($yymatches); // token value
+                $r = $this->{'yy_r3_' . $this->token}($yysubmatches);
+                if ($r === null) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    // accept this token
+                    return true;
+                } elseif ($r === true) {
+                    // we have changed state
+                    // process this token in the new state
+                    return $this->yylex();
+                } elseif ($r === false) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    if ($this->counter >= strlen($this->data)) {
+                        return false; // end of input
+                    }
+                    // skip this token
+                    continue;
+                }            } else {
+                throw new Exception('Unexpected input at line' . $this->line .
+                    ': ' . $this->data[$this->counter]);
+            }
+            break;
+        } while (true);
+
+    } // end function
+
+
+    const NAKED_STRING_VALUE = 3;
+    function yy_r3_1($yy_subpatterns)
+    {
+
+    $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
+    $this->yypopstate();
+    }
+
+
+
+    function yylex4()
+    {
+        $tokenMap = array (
+              1 => 0,
+              2 => 0,
+              3 => 0,
+            );
+        if ($this->counter >= strlen($this->data)) {
+            return false; // end of input
+        }
+        $yy_global_pattern = "/^([ \t\r]+)|^([^\n]+?(?=[ \t\r]*\n))|^(\n)/iS";
+
+        do {
+            if (preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches)) {
+                $yysubmatches = $yymatches;
+                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
+                if (!count($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' .
+                        'an empty string.  Input "' . substr($this->data,
+                        $this->counter, 5) . '... state COMMENT');
+                }
+                next($yymatches); // skip global match
+                $this->token = key($yymatches); // token number
+                if ($tokenMap[$this->token]) {
+                    // extract sub-patterns for passing to lex function
+                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
+                        $tokenMap[$this->token]);
+                } else {
+                    $yysubmatches = array();
+                }
+                $this->value = current($yymatches); // token value
+                $r = $this->{'yy_r4_' . $this->token}($yysubmatches);
+                if ($r === null) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    // accept this token
+                    return true;
+                } elseif ($r === true) {
+                    // we have changed state
+                    // process this token in the new state
+                    return $this->yylex();
+                } elseif ($r === false) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    if ($this->counter >= strlen($this->data)) {
+                        return false; // end of input
+                    }
+                    // skip this token
+                    continue;
+                }            } else {
+                throw new Exception('Unexpected input at line' . $this->line .
+                    ': ' . $this->data[$this->counter]);
+            }
+            break;
+        } while (true);
+
+    } // end function
+
+
+    const COMMENT = 4;
+    function yy_r4_1($yy_subpatterns)
+    {
+
+    return false;
+    }
+    function yy_r4_2($yy_subpatterns)
+    {
+
+    $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
+    }
+    function yy_r4_3($yy_subpatterns)
+    {
+
+    $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE;
+    $this->yypopstate();
+    }
+
+
+
+    function yylex5()
+    {
+        $tokenMap = array (
+              1 => 0,
+              2 => 0,
+            );
+        if ($this->counter >= strlen($this->data)) {
+            return false; // end of input
+        }
+        $yy_global_pattern = "/^(\\.)|^(.*?(?=[\.=[\]\r\n]))/iS";
+
+        do {
+            if (preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches)) {
+                $yysubmatches = $yymatches;
+                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
+                if (!count($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' .
+                        'an empty string.  Input "' . substr($this->data,
+                        $this->counter, 5) . '... state SECTION');
+                }
+                next($yymatches); // skip global match
+                $this->token = key($yymatches); // token number
+                if ($tokenMap[$this->token]) {
+                    // extract sub-patterns for passing to lex function
+                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
+                        $tokenMap[$this->token]);
+                } else {
+                    $yysubmatches = array();
+                }
+                $this->value = current($yymatches); // token value
+                $r = $this->{'yy_r5_' . $this->token}($yysubmatches);
+                if ($r === null) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    // accept this token
+                    return true;
+                } elseif ($r === true) {
+                    // we have changed state
+                    // process this token in the new state
+                    return $this->yylex();
+                } elseif ($r === false) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    if ($this->counter >= strlen($this->data)) {
+                        return false; // end of input
+                    }
+                    // skip this token
+                    continue;
+                }            } else {
+                throw new Exception('Unexpected input at line' . $this->line .
+                    ': ' . $this->data[$this->counter]);
+            }
+            break;
+        } while (true);
+
+    } // end function
+
+
+    const SECTION = 5;
+    function yy_r5_1($yy_subpatterns)
+    {
+
+    $this->token = Smarty_Internal_Configfileparser::TPC_DOT;
+    }
+    function yy_r5_2($yy_subpatterns)
+    {
+
+    $this->token = Smarty_Internal_Configfileparser::TPC_SECTION;
+    $this->yypopstate();
+    }
+
+
+}
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_configfileparser.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_configfileparser.php
new file mode 100644
index 0000000..0b5a573
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_configfileparser.php
@@ -0,0 +1,870 @@
+<?php
+/**
+* Smarty Internal Plugin Configfileparser
+*
+* This is the config file parser.
+* It is generated from the internal.configfileparser.y file
+* @package Smarty
+* @subpackage Compiler
+* @author Uwe Tews
+*/
+
+class TPC_yyToken implements ArrayAccess
+{
+    public $string = '';
+    public $metadata = array();
+
+    function __construct($s, $m = array())
+    {
+        if ($s instanceof TPC_yyToken) {
+            $this->string = $s->string;
+            $this->metadata = $s->metadata;
+        } else {
+            $this->string = (string) $s;
+            if ($m instanceof TPC_yyToken) {
+                $this->metadata = $m->metadata;
+            } elseif (is_array($m)) {
+                $this->metadata = $m;
+            }
+        }
+    }
+
+    function __toString()
+    {
+        return $this->_string;
+    }
+
+    function offsetExists($offset)
+    {
+        return isset($this->metadata[$offset]);
+    }
+
+    function offsetGet($offset)
+    {
+        return $this->metadata[$offset];
+    }
+
+    function offsetSet($offset, $value)
+    {
+        if ($offset === null) {
+            if (isset($value[0])) {
+                $x = ($value instanceof TPC_yyToken) ?
+                    $value->metadata : $value;
+                $this->metadata = array_merge($this->metadata, $x);
+                return;
+            }
+            $offset = count($this->metadata);
+        }
+        if ($value === null) {
+            return;
+        }
+        if ($value instanceof TPC_yyToken) {
+            if ($value->metadata) {
+                $this->metadata[$offset] = $value->metadata;
+            }
+        } elseif ($value) {
+            $this->metadata[$offset] = $value;
+        }
+    }
+
+    function offsetUnset($offset)
+    {
+        unset($this->metadata[$offset]);
+    }
+}
+
+class TPC_yyStackEntry
+{
+    public $stateno;       /* The state-number */
+    public $major;         /* The major token value.  This is the code
+                     ** number for the token at this stack level */
+    public $minor; /* The user-supplied minor token value.  This
+                     ** is the value of the token  */
+};
+
+
+#line 12 "smarty_internal_configfileparser.y"
+class Smarty_Internal_Configfileparser#line 79 "smarty_internal_configfileparser.php"
+{
+#line 14 "smarty_internal_configfileparser.y"
+
+    // states whether the parse was successful or not
+    public $successful = true;
+    public $retvalue = 0;
+    private $lex;
+    private $internalError = false;
+
+    function __construct($lex, $compiler) {
+        // set instance object
+        self::instance($this); 
+        $this->lex = $lex;
+        $this->smarty = $compiler->smarty; 
+        $this->compiler = $compiler;
+    }
+    public static function &instance($new_instance = null)
+    {
+        static $instance = null;
+        if (isset($new_instance) && is_object($new_instance))
+            $instance = $new_instance;
+        return $instance;
+    }
+
+    private function parse_bool($str) {
+        if (in_array(strtolower($str) ,array('on','yes','true'))) {
+            $res = true;
+        } else {
+            $res = false;
+        }
+        return $res;
+    }
+
+    private static $escapes_single = Array('\\' => '\\',
+                                          '\'' => '\'');
+    private static function parse_single_quoted_string($qstr) {
+        $escaped_string = substr($qstr, 1, strlen($qstr)-2); //remove outer quotes
+
+        $ss = preg_split('/(\\\\.)/', $escaped_string, -1, PREG_SPLIT_DELIM_CAPTURE);
+
+        $str = "";
+        foreach ($ss as $s) {
+            if (strlen($s) === 2 && $s[0] === '\\') {
+                if (isset(self::$escapes_single[$s[1]])) {
+                    $s = self::$escapes_single[$s[1]];
+                }
+             }
+
+             $str .= $s;
+        }
+
+        return $str;
+    }
+
+    private static function parse_double_quoted_string($qstr) {
+        $inner_str = substr($qstr, 1, strlen($qstr)-2);
+        return stripcslashes($inner_str);
+    }
+
+    private static function parse_tripple_double_quoted_string($qstr) {
+        $inner_str = substr($qstr, 3, strlen($qstr)-6);
+        return stripcslashes($inner_str);
+    }
+
+    private function set_var(Array $var, Array &$target_array) {
+        $key = $var["key"];
+        $value = $var["value"];
+
+        if ($this->smarty->config_overwrite || !isset($target_array['vars'][$key])) {
+            $target_array['vars'][$key] = $value;
+        } else {
+            settype($target_array['vars'][$key], 'array');
+            $target_array['vars'][$key][] = $value;
+        }
+    }
+
+    private function add_global_vars(Array $vars) {
+        if (!isset($this->compiler->config_data['vars'])) {
+	    $this->compiler->config_data['vars'] = Array();
+        }
+        foreach ($vars as $var) {
+            $this->set_var($var, $this->compiler->config_data);
+        }
+    }
+
+    private function add_section_vars($section_name, Array $vars) {
+        if (!isset($this->compiler->config_data['sections'][$section_name]['vars'])) {
+            $this->compiler->config_data['sections'][$section_name]['vars'] = Array();
+        }
+        foreach ($vars as $var) {
+            $this->set_var($var, $this->compiler->config_data['sections'][$section_name]);
+        }
+    }
+#line 174 "smarty_internal_configfileparser.php"
+
+    const TPC_OPENB                          =  1;
+    const TPC_SECTION                        =  2;
+    const TPC_CLOSEB                         =  3;
+    const TPC_DOT                            =  4;
+    const TPC_ID                             =  5;
+    const TPC_EQUAL                          =  6;
+    const TPC_FLOAT                          =  7;
+    const TPC_INT                            =  8;
+    const TPC_BOOL                           =  9;
+    const TPC_SINGLE_QUOTED_STRING           = 10;
+    const TPC_DOUBLE_QUOTED_STRING           = 11;
+    const TPC_TRIPPLE_DOUBLE_QUOTED_STRING   = 12;
+    const TPC_NAKED_STRING                   = 13;
+    const TPC_NEWLINE                        = 14;
+    const TPC_COMMENTSTART                   = 15;
+    const YY_NO_ACTION = 54;
+    const YY_ACCEPT_ACTION = 53;
+    const YY_ERROR_ACTION = 52;
+
+    const YY_SZ_ACTTAB = 35;
+static public $yy_action = array(
+ /*     0 */    26,   27,   21,   30,   29,   28,   31,   16,   53,    8,
+ /*    10 */    19,    2,   20,   11,   24,   23,   20,   11,   17,   15,
+ /*    20 */     3,   14,   13,   18,    4,    6,    5,    1,   12,   22,
+ /*    30 */     9,   47,   10,   25,    7,
+    );
+    static public $yy_lookahead = array(
+ /*     0 */     7,    8,    9,   10,   11,   12,   13,    5,   17,   18,
+ /*    10 */    14,   20,   14,   15,   22,   23,   14,   15,    2,    2,
+ /*    20 */    20,    4,   13,   14,    6,    3,    3,   20,    1,   24,
+ /*    30 */    22,   25,   22,   21,   19,
+);
+    const YY_SHIFT_USE_DFLT = -8;
+    const YY_SHIFT_MAX = 17;
+    static public $yy_shift_ofst = array(
+ /*     0 */    -8,    2,    2,    2,   -7,   -2,   -2,   27,   -8,   -8,
+ /*    10 */    -8,    9,   17,   -4,   16,   23,   18,   22,
+);
+    const YY_REDUCE_USE_DFLT = -10;
+    const YY_REDUCE_MAX = 10;
+    static public $yy_reduce_ofst = array(
+ /*     0 */    -9,   -8,   -8,   -8,    5,   10,    8,   12,   15,    0,
+ /*    10 */     7,
+);
+    static public $yyExpectedTokens = array(
+        /* 0 */ array(),
+        /* 1 */ array(5, 14, 15, ),
+        /* 2 */ array(5, 14, 15, ),
+        /* 3 */ array(5, 14, 15, ),
+        /* 4 */ array(7, 8, 9, 10, 11, 12, 13, ),
+        /* 5 */ array(14, 15, ),
+        /* 6 */ array(14, 15, ),
+        /* 7 */ array(1, ),
+        /* 8 */ array(),
+        /* 9 */ array(),
+        /* 10 */ array(),
+        /* 11 */ array(13, 14, ),
+        /* 12 */ array(2, 4, ),
+        /* 13 */ array(14, ),
+        /* 14 */ array(2, ),
+        /* 15 */ array(3, ),
+        /* 16 */ array(6, ),
+        /* 17 */ array(3, ),
+        /* 18 */ array(),
+        /* 19 */ array(),
+        /* 20 */ array(),
+        /* 21 */ array(),
+        /* 22 */ array(),
+        /* 23 */ array(),
+        /* 24 */ array(),
+        /* 25 */ array(),
+        /* 26 */ array(),
+        /* 27 */ array(),
+        /* 28 */ array(),
+        /* 29 */ array(),
+        /* 30 */ array(),
+        /* 31 */ array(),
+);
+    static public $yy_default = array(
+ /*     0 */    40,   36,   33,   37,   52,   52,   52,   32,   35,   40,
+ /*    10 */    40,   52,   52,   52,   52,   52,   52,   52,   50,   51,
+ /*    20 */    49,   44,   41,   39,   38,   34,   42,   43,   47,   46,
+ /*    30 */    45,   48,
+);
+    const YYNOCODE = 26;
+    const YYSTACKDEPTH = 100;
+    const YYNSTATE = 32;
+    const YYNRULE = 20;
+    const YYERRORSYMBOL = 16;
+    const YYERRSYMDT = 'yy0';
+    const YYFALLBACK = 0;
+    static public $yyFallback = array(
+    );
+    static function Trace($TraceFILE, $zTracePrompt)
+    {
+        if (!$TraceFILE) {
+            $zTracePrompt = 0;
+        } elseif (!$zTracePrompt) {
+            $TraceFILE = 0;
+        }
+        self::$yyTraceFILE = $TraceFILE;
+        self::$yyTracePrompt = $zTracePrompt;
+    }
+
+    static function PrintTrace()
+    {
+        self::$yyTraceFILE = fopen('php://output', 'w');
+        self::$yyTracePrompt = '<br>';
+    }
+
+    static public $yyTraceFILE;
+    static public $yyTracePrompt;
+    public $yyidx;                    /* Index of top element in stack */
+    public $yyerrcnt;                 /* Shifts left before out of the error */
+    public $yystack = array();  /* The parser's stack */
+
+    public $yyTokenName = array( 
+  '$',             'OPENB',         'SECTION',       'CLOSEB',      
+  'DOT',           'ID',            'EQUAL',         'FLOAT',       
+  'INT',           'BOOL',          'SINGLE_QUOTED_STRING',  'DOUBLE_QUOTED_STRING',
+  'TRIPPLE_DOUBLE_QUOTED_STRING',  'NAKED_STRING',  'NEWLINE',       'COMMENTSTART',
+  'error',         'start',         'global_vars',   'sections',    
+  'var_list',      'section',       'newline',       'var',         
+  'value',       
+    );
+
+    static public $yyRuleName = array(
+ /*   0 */ "start ::= global_vars sections",
+ /*   1 */ "global_vars ::= var_list",
+ /*   2 */ "sections ::= sections section",
+ /*   3 */ "sections ::=",
+ /*   4 */ "section ::= OPENB SECTION CLOSEB newline var_list",
+ /*   5 */ "section ::= OPENB DOT SECTION CLOSEB newline var_list",
+ /*   6 */ "var_list ::= var_list newline",
+ /*   7 */ "var_list ::= var_list var",
+ /*   8 */ "var_list ::=",
+ /*   9 */ "var ::= ID EQUAL value",
+ /*  10 */ "value ::= FLOAT",
+ /*  11 */ "value ::= INT",
+ /*  12 */ "value ::= BOOL",
+ /*  13 */ "value ::= SINGLE_QUOTED_STRING",
+ /*  14 */ "value ::= DOUBLE_QUOTED_STRING",
+ /*  15 */ "value ::= TRIPPLE_DOUBLE_QUOTED_STRING",
+ /*  16 */ "value ::= NAKED_STRING",
+ /*  17 */ "newline ::= NEWLINE",
+ /*  18 */ "newline ::= COMMENTSTART NEWLINE",
+ /*  19 */ "newline ::= COMMENTSTART NAKED_STRING NEWLINE",
+    );
+
+    function tokenName($tokenType)
+    {
+        if ($tokenType === 0) {
+            return 'End of Input';
+        }
+        if ($tokenType > 0 && $tokenType < count($this->yyTokenName)) {
+            return $this->yyTokenName[$tokenType];
+        } else {
+            return "Unknown";
+        }
+    }
+
+    static function yy_destructor($yymajor, $yypminor)
+    {
+        switch ($yymajor) {
+            default:  break;   /* If no destructor action specified: do nothing */
+        }
+    }
+
+    function yy_pop_parser_stack()
+    {
+        if (!count($this->yystack)) {
+            return;
+        }
+        $yytos = array_pop($this->yystack);
+        if (self::$yyTraceFILE && $this->yyidx >= 0) {
+            fwrite(self::$yyTraceFILE,
+                self::$yyTracePrompt . 'Popping ' . $this->yyTokenName[$yytos->major] .
+                    "\n");
+        }
+        $yymajor = $yytos->major;
+        self::yy_destructor($yymajor, $yytos->minor);
+        $this->yyidx--;
+        return $yymajor;
+    }
+
+    function __destruct()
+    {
+        while ($this->yystack !== Array()) {
+            $this->yy_pop_parser_stack();
+        }
+        if (is_resource(self::$yyTraceFILE)) {
+            fclose(self::$yyTraceFILE);
+        }
+    }
+
+    function yy_get_expected_tokens($token)
+    {
+        $state = $this->yystack[$this->yyidx]->stateno;
+        $expected = self::$yyExpectedTokens[$state];
+        if (in_array($token, self::$yyExpectedTokens[$state], true)) {
+            return $expected;
+        }
+        $stack = $this->yystack;
+        $yyidx = $this->yyidx;
+        do {
+            $yyact = $this->yy_find_shift_action($token);
+            if ($yyact >= self::YYNSTATE && $yyact < self::YYNSTATE + self::YYNRULE) {
+                // reduce action
+                $done = 0;
+                do {
+                    if ($done++ == 100) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        // too much recursion prevents proper detection
+                        // so give up
+                        return array_unique($expected);
+                    }
+                    $yyruleno = $yyact - self::YYNSTATE;
+                    $this->yyidx -= self::$yyRuleInfo[$yyruleno]['rhs'];
+                    $nextstate = $this->yy_find_reduce_action(
+                        $this->yystack[$this->yyidx]->stateno,
+                        self::$yyRuleInfo[$yyruleno]['lhs']);
+                    if (isset(self::$yyExpectedTokens[$nextstate])) {
+		        $expected = array_merge($expected, self::$yyExpectedTokens[$nextstate]);
+                            if (in_array($token,
+                                  self::$yyExpectedTokens[$nextstate], true)) {
+                            $this->yyidx = $yyidx;
+                            $this->yystack = $stack;
+                            return array_unique($expected);
+                        }
+                    }
+                    if ($nextstate < self::YYNSTATE) {
+                        // we need to shift a non-terminal
+                        $this->yyidx++;
+                        $x = new TPC_yyStackEntry;
+                        $x->stateno = $nextstate;
+                        $x->major = self::$yyRuleInfo[$yyruleno]['lhs'];
+                        $this->yystack[$this->yyidx] = $x;
+                        continue 2;
+                    } elseif ($nextstate == self::YYNSTATE + self::YYNRULE + 1) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        // the last token was just ignored, we can't accept
+                        // by ignoring input, this is in essence ignoring a
+                        // syntax error!
+                        return array_unique($expected);
+                    } elseif ($nextstate === self::YY_NO_ACTION) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        // input accepted, but not shifted (I guess)
+                        return $expected;
+                    } else {
+                        $yyact = $nextstate;
+                    }
+                } while (true);
+            }
+            break;
+        } while (true);
+	$this->yyidx = $yyidx;
+	$this->yystack = $stack;
+        return array_unique($expected);
+    }
+
+    function yy_is_expected_token($token)
+    {
+        if ($token === 0) {
+            return true; // 0 is not part of this
+        }
+        $state = $this->yystack[$this->yyidx]->stateno;
+        if (in_array($token, self::$yyExpectedTokens[$state], true)) {
+            return true;
+        }
+        $stack = $this->yystack;
+        $yyidx = $this->yyidx;
+        do {
+            $yyact = $this->yy_find_shift_action($token);
+            if ($yyact >= self::YYNSTATE && $yyact < self::YYNSTATE + self::YYNRULE) {
+                // reduce action
+                $done = 0;
+                do {
+                    if ($done++ == 100) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        // too much recursion prevents proper detection
+                        // so give up
+                        return true;
+                    }
+                    $yyruleno = $yyact - self::YYNSTATE;
+                    $this->yyidx -= self::$yyRuleInfo[$yyruleno]['rhs'];
+                    $nextstate = $this->yy_find_reduce_action(
+                        $this->yystack[$this->yyidx]->stateno,
+                        self::$yyRuleInfo[$yyruleno]['lhs']);
+                    if (isset(self::$yyExpectedTokens[$nextstate]) &&
+                          in_array($token, self::$yyExpectedTokens[$nextstate], true)) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        return true;
+                    }
+                    if ($nextstate < self::YYNSTATE) {
+                        // we need to shift a non-terminal
+                        $this->yyidx++;
+                        $x = new TPC_yyStackEntry;
+                        $x->stateno = $nextstate;
+                        $x->major = self::$yyRuleInfo[$yyruleno]['lhs'];
+                        $this->yystack[$this->yyidx] = $x;
+                        continue 2;
+                    } elseif ($nextstate == self::YYNSTATE + self::YYNRULE + 1) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        if (!$token) {
+                            // end of input: this is valid
+                            return true;
+                        }
+                        // the last token was just ignored, we can't accept
+                        // by ignoring input, this is in essence ignoring a
+                        // syntax error!
+                        return false;
+                    } elseif ($nextstate === self::YY_NO_ACTION) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        // input accepted, but not shifted (I guess)
+                        return true;
+                    } else {
+                        $yyact = $nextstate;
+                    }
+                } while (true);
+            }
+            break;
+        } while (true);
+        $this->yyidx = $yyidx;
+        $this->yystack = $stack;
+        return true;
+    }
+
+   function yy_find_shift_action($iLookAhead)
+    {
+        $stateno = $this->yystack[$this->yyidx]->stateno;
+     
+        /* if ($this->yyidx < 0) return self::YY_NO_ACTION;  */
+        if (!isset(self::$yy_shift_ofst[$stateno])) {
+            // no shift actions
+            return self::$yy_default[$stateno];
+        }
+        $i = self::$yy_shift_ofst[$stateno];
+        if ($i === self::YY_SHIFT_USE_DFLT) {
+            return self::$yy_default[$stateno];
+        }
+        if ($iLookAhead == self::YYNOCODE) {
+            return self::YY_NO_ACTION;
+        }
+        $i += $iLookAhead;
+        if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
+              self::$yy_lookahead[$i] != $iLookAhead) {
+            if (count(self::$yyFallback) && $iLookAhead < count(self::$yyFallback)
+                   && ($iFallback = self::$yyFallback[$iLookAhead]) != 0) {
+                if (self::$yyTraceFILE) {
+                    fwrite(self::$yyTraceFILE, self::$yyTracePrompt . "FALLBACK " .
+                        $this->yyTokenName[$iLookAhead] . " => " .
+                        $this->yyTokenName[$iFallback] . "\n");
+                }
+                return $this->yy_find_shift_action($iFallback);
+            }
+            return self::$yy_default[$stateno];
+        } else {
+            return self::$yy_action[$i];
+        }
+    }
+
+    function yy_find_reduce_action($stateno, $iLookAhead)
+    {
+        /* $stateno = $this->yystack[$this->yyidx]->stateno; */
+
+        if (!isset(self::$yy_reduce_ofst[$stateno])) {
+            return self::$yy_default[$stateno];
+        }
+        $i = self::$yy_reduce_ofst[$stateno];
+        if ($i == self::YY_REDUCE_USE_DFLT) {
+            return self::$yy_default[$stateno];
+        }
+        if ($iLookAhead == self::YYNOCODE) {
+            return self::YY_NO_ACTION;
+        }
+        $i += $iLookAhead;
+        if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
+              self::$yy_lookahead[$i] != $iLookAhead) {
+            return self::$yy_default[$stateno];
+        } else {
+            return self::$yy_action[$i];
+        }
+    }
+
+    function yy_shift($yyNewState, $yyMajor, $yypMinor)
+    {
+        $this->yyidx++;
+        if ($this->yyidx >= self::YYSTACKDEPTH) {
+            $this->yyidx--;
+            if (self::$yyTraceFILE) {
+                fprintf(self::$yyTraceFILE, "%sStack Overflow!\n", self::$yyTracePrompt);
+            }
+            while ($this->yyidx >= 0) {
+                $this->yy_pop_parser_stack();
+            }
+#line 126 "smarty_internal_configfileparser.y"
+
+    $this->internalError = true;
+    $this->compiler->trigger_config_file_error("Stack overflow in configfile parser");
+#line 585 "smarty_internal_configfileparser.php"
+            return;
+        }
+        $yytos = new TPC_yyStackEntry;
+        $yytos->stateno = $yyNewState;
+        $yytos->major = $yyMajor;
+        $yytos->minor = $yypMinor;
+        array_push($this->yystack, $yytos);
+        if (self::$yyTraceFILE && $this->yyidx > 0) {
+            fprintf(self::$yyTraceFILE, "%sShift %d\n", self::$yyTracePrompt,
+                $yyNewState);
+            fprintf(self::$yyTraceFILE, "%sStack:", self::$yyTracePrompt);
+            for($i = 1; $i <= $this->yyidx; $i++) {
+                fprintf(self::$yyTraceFILE, " %s",
+                    $this->yyTokenName[$this->yystack[$i]->major]);
+            }
+            fwrite(self::$yyTraceFILE,"\n");
+        }
+    }
+
+    static public $yyRuleInfo = array(
+  array( 'lhs' => 17, 'rhs' => 2 ),
+  array( 'lhs' => 18, 'rhs' => 1 ),
+  array( 'lhs' => 19, 'rhs' => 2 ),
+  array( 'lhs' => 19, 'rhs' => 0 ),
+  array( 'lhs' => 21, 'rhs' => 5 ),
+  array( 'lhs' => 21, 'rhs' => 6 ),
+  array( 'lhs' => 20, 'rhs' => 2 ),
+  array( 'lhs' => 20, 'rhs' => 2 ),
+  array( 'lhs' => 20, 'rhs' => 0 ),
+  array( 'lhs' => 23, 'rhs' => 3 ),
+  array( 'lhs' => 24, 'rhs' => 1 ),
+  array( 'lhs' => 24, 'rhs' => 1 ),
+  array( 'lhs' => 24, 'rhs' => 1 ),
+  array( 'lhs' => 24, 'rhs' => 1 ),
+  array( 'lhs' => 24, 'rhs' => 1 ),
+  array( 'lhs' => 24, 'rhs' => 1 ),
+  array( 'lhs' => 24, 'rhs' => 1 ),
+  array( 'lhs' => 22, 'rhs' => 1 ),
+  array( 'lhs' => 22, 'rhs' => 2 ),
+  array( 'lhs' => 22, 'rhs' => 3 ),
+    );
+
+    static public $yyReduceMap = array(
+        0 => 0,
+        2 => 0,
+        3 => 0,
+        17 => 0,
+        18 => 0,
+        19 => 0,
+        1 => 1,
+        4 => 4,
+        5 => 5,
+        6 => 6,
+        7 => 7,
+        8 => 8,
+        9 => 9,
+        10 => 10,
+        11 => 11,
+        12 => 12,
+        13 => 13,
+        14 => 14,
+        15 => 15,
+        16 => 16,
+    );
+#line 132 "smarty_internal_configfileparser.y"
+    function yy_r0(){ $this->_retvalue = null;     }
+#line 652 "smarty_internal_configfileparser.php"
+#line 135 "smarty_internal_configfileparser.y"
+    function yy_r1(){ $this->add_global_vars($this->yystack[$this->yyidx + 0]->minor); $this->_retvalue = null;     }
+#line 655 "smarty_internal_configfileparser.php"
+#line 141 "smarty_internal_configfileparser.y"
+    function yy_r4(){ $this->add_section_vars($this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + 0]->minor); $this->_retvalue = null;     }
+#line 658 "smarty_internal_configfileparser.php"
+#line 142 "smarty_internal_configfileparser.y"
+    function yy_r5(){ if ($this->smarty->config_read_hidden) { $this->add_section_vars($this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + 0]->minor); } $this->_retvalue = null;     }
+#line 661 "smarty_internal_configfileparser.php"
+#line 145 "smarty_internal_configfileparser.y"
+    function yy_r6(){ $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;     }
+#line 664 "smarty_internal_configfileparser.php"
+#line 146 "smarty_internal_configfileparser.y"
+    function yy_r7(){ $this->_retvalue = array_merge($this->yystack[$this->yyidx + -1]->minor, Array($this->yystack[$this->yyidx + 0]->minor));     }
+#line 667 "smarty_internal_configfileparser.php"
+#line 147 "smarty_internal_configfileparser.y"
+    function yy_r8(){ $this->_retvalue = Array();     }
+#line 670 "smarty_internal_configfileparser.php"
+#line 151 "smarty_internal_configfileparser.y"
+    function yy_r9(){ $this->_retvalue = Array("key" => $this->yystack[$this->yyidx + -2]->minor, "value" => $this->yystack[$this->yyidx + 0]->minor);     }
+#line 673 "smarty_internal_configfileparser.php"
+#line 153 "smarty_internal_configfileparser.y"
+    function yy_r10(){ $this->_retvalue = (float) $this->yystack[$this->yyidx + 0]->minor;     }
+#line 676 "smarty_internal_configfileparser.php"
+#line 154 "smarty_internal_configfileparser.y"
+    function yy_r11(){ $this->_retvalue = (int) $this->yystack[$this->yyidx + 0]->minor;     }
+#line 679 "smarty_internal_configfileparser.php"
+#line 155 "smarty_internal_configfileparser.y"
+    function yy_r12(){ $this->_retvalue = $this->parse_bool($this->yystack[$this->yyidx + 0]->minor);     }
+#line 682 "smarty_internal_configfileparser.php"
+#line 156 "smarty_internal_configfileparser.y"
+    function yy_r13(){ $this->_retvalue = self::parse_single_quoted_string($this->yystack[$this->yyidx + 0]->minor);     }
+#line 685 "smarty_internal_configfileparser.php"
+#line 157 "smarty_internal_configfileparser.y"
+    function yy_r14(){ $this->_retvalue = self::parse_double_quoted_string($this->yystack[$this->yyidx + 0]->minor);     }
+#line 688 "smarty_internal_configfileparser.php"
+#line 158 "smarty_internal_configfileparser.y"
+    function yy_r15(){ $this->_retvalue = self::parse_tripple_double_quoted_string($this->yystack[$this->yyidx + 0]->minor);     }
+#line 691 "smarty_internal_configfileparser.php"
+#line 159 "smarty_internal_configfileparser.y"
+    function yy_r16(){ $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;     }
+#line 694 "smarty_internal_configfileparser.php"
+
+    private $_retvalue;
+
+    function yy_reduce($yyruleno)
+    {
+        $yymsp = $this->yystack[$this->yyidx];
+        if (self::$yyTraceFILE && $yyruleno >= 0 
+              && $yyruleno < count(self::$yyRuleName)) {
+            fprintf(self::$yyTraceFILE, "%sReduce (%d) [%s].\n",
+                self::$yyTracePrompt, $yyruleno,
+                self::$yyRuleName[$yyruleno]);
+        }
+
+        $this->_retvalue = $yy_lefthand_side = null;
+        if (array_key_exists($yyruleno, self::$yyReduceMap)) {
+            // call the action
+            $this->_retvalue = null;
+            $this->{'yy_r' . self::$yyReduceMap[$yyruleno]}();
+            $yy_lefthand_side = $this->_retvalue;
+        }
+        $yygoto = self::$yyRuleInfo[$yyruleno]['lhs'];
+        $yysize = self::$yyRuleInfo[$yyruleno]['rhs'];
+        $this->yyidx -= $yysize;
+        for($i = $yysize; $i; $i--) {
+            // pop all of the right-hand side parameters
+            array_pop($this->yystack);
+        }
+        $yyact = $this->yy_find_reduce_action($this->yystack[$this->yyidx]->stateno, $yygoto);
+        if ($yyact < self::YYNSTATE) {
+            if (!self::$yyTraceFILE && $yysize) {
+                $this->yyidx++;
+                $x = new TPC_yyStackEntry;
+                $x->stateno = $yyact;
+                $x->major = $yygoto;
+                $x->minor = $yy_lefthand_side;
+                $this->yystack[$this->yyidx] = $x;
+            } else {
+                $this->yy_shift($yyact, $yygoto, $yy_lefthand_side);
+            }
+        } elseif ($yyact == self::YYNSTATE + self::YYNRULE + 1) {
+            $this->yy_accept();
+        }
+    }
+
+    function yy_parse_failed()
+    {
+        if (self::$yyTraceFILE) {
+            fprintf(self::$yyTraceFILE, "%sFail!\n", self::$yyTracePrompt);
+        }
+        while ($this->yyidx >= 0) {
+            $this->yy_pop_parser_stack();
+        }
+    }
+
+    function yy_syntax_error($yymajor, $TOKEN)
+    {
+#line 119 "smarty_internal_configfileparser.y"
+
+    $this->internalError = true;
+    $this->yymajor = $yymajor;
+    $this->compiler->trigger_config_file_error();
+#line 757 "smarty_internal_configfileparser.php"
+    }
+
+    function yy_accept()
+    {
+        if (self::$yyTraceFILE) {
+            fprintf(self::$yyTraceFILE, "%sAccept!\n", self::$yyTracePrompt);
+        }
+        while ($this->yyidx >= 0) {
+            $stack = $this->yy_pop_parser_stack();
+        }
+#line 111 "smarty_internal_configfileparser.y"
+
+    $this->successful = !$this->internalError;
+    $this->internalError = false;
+    $this->retvalue = $this->_retvalue;
+    //echo $this->retvalue."\n\n";
+#line 775 "smarty_internal_configfileparser.php"
+    }
+
+    function doParse($yymajor, $yytokenvalue)
+    {
+        $yyerrorhit = 0;   /* True if yymajor has invoked an error */
+        
+        if ($this->yyidx === null || $this->yyidx < 0) {
+            $this->yyidx = 0;
+            $this->yyerrcnt = -1;
+            $x = new TPC_yyStackEntry;
+            $x->stateno = 0;
+            $x->major = 0;
+            $this->yystack = array();
+            array_push($this->yystack, $x);
+        }
+        $yyendofinput = ($yymajor==0);
+        
+        if (self::$yyTraceFILE) {
+            fprintf(self::$yyTraceFILE, "%sInput %s\n",
+                self::$yyTracePrompt, $this->yyTokenName[$yymajor]);
+        }
+        
+        do {
+            $yyact = $this->yy_find_shift_action($yymajor);
+            if ($yymajor < self::YYERRORSYMBOL &&
+                  !$this->yy_is_expected_token($yymajor)) {
+                // force a syntax error
+                $yyact = self::YY_ERROR_ACTION;
+            }
+            if ($yyact < self::YYNSTATE) {
+                $this->yy_shift($yyact, $yymajor, $yytokenvalue);
+                $this->yyerrcnt--;
+                if ($yyendofinput && $this->yyidx >= 0) {
+                    $yymajor = 0;
+                } else {
+                    $yymajor = self::YYNOCODE;
+                }
+            } elseif ($yyact < self::YYNSTATE + self::YYNRULE) {
+                $this->yy_reduce($yyact - self::YYNSTATE);
+            } elseif ($yyact == self::YY_ERROR_ACTION) {
+                if (self::$yyTraceFILE) {
+                    fprintf(self::$yyTraceFILE, "%sSyntax Error!\n",
+                        self::$yyTracePrompt);
+                }
+                if (self::YYERRORSYMBOL) {
+                    if ($this->yyerrcnt < 0) {
+                        $this->yy_syntax_error($yymajor, $yytokenvalue);
+                    }
+                    $yymx = $this->yystack[$this->yyidx]->major;
+                    if ($yymx == self::YYERRORSYMBOL || $yyerrorhit ){
+                        if (self::$yyTraceFILE) {
+                            fprintf(self::$yyTraceFILE, "%sDiscard input token %s\n",
+                                self::$yyTracePrompt, $this->yyTokenName[$yymajor]);
+                        }
+                        $this->yy_destructor($yymajor, $yytokenvalue);
+                        $yymajor = self::YYNOCODE;
+                    } else {
+                        while ($this->yyidx >= 0 &&
+                                 $yymx != self::YYERRORSYMBOL &&
+        ($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE
+                              ){
+                            $this->yy_pop_parser_stack();
+                        }
+                        if ($this->yyidx < 0 || $yymajor==0) {
+                            $this->yy_destructor($yymajor, $yytokenvalue);
+                            $this->yy_parse_failed();
+                            $yymajor = self::YYNOCODE;
+                        } elseif ($yymx != self::YYERRORSYMBOL) {
+                            $u2 = 0;
+                            $this->yy_shift($yyact, self::YYERRORSYMBOL, $u2);
+                        }
+                    }
+                    $this->yyerrcnt = 3;
+                    $yyerrorhit = 1;
+                } else {
+                    if ($this->yyerrcnt <= 0) {
+                        $this->yy_syntax_error($yymajor, $yytokenvalue);
+                    }
+                    $this->yyerrcnt = 3;
+                    $this->yy_destructor($yymajor, $yytokenvalue);
+                    if ($yyendofinput) {
+                        $this->yy_parse_failed();
+                    }
+                    $yymajor = self::YYNOCODE;
+                }
+            } else {
+                $this->yy_accept();
+                $yymajor = self::YYNOCODE;
+            }            
+        } while ($yymajor != self::YYNOCODE && $this->yyidx >= 0);
+    }
+}
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_data.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_data.php
new file mode 100644
index 0000000..609376e
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_data.php
@@ -0,0 +1,479 @@
+<?php
+
+/**
+ * Smarty Internal Plugin Data
+ * 
+ * This file contains the basic classes and methodes for template and variable creation
+ * 
+ * @package Smarty
+ * @subpackage Templates
+ * @author Uwe Tews 
+ */
+
+/**
+ * Base class with template and variable methodes
+ */
+class Smarty_Internal_Data {
+    // class used for templates
+    public $template_class = 'Smarty_Internal_Template';
+
+    /**
+     * assigns a Smarty variable
+     * 
+     * @param array $ |string $tpl_var the template variable name(s)
+     * @param mixed $value the value to assign
+     * @param boolean $nocache if true any output of this variable will be not cached
+     * @param boolean $scope the scope the variable will have  (local,parent or root)
+     */
+    public function assign($tpl_var, $value = null, $nocache = false)
+    {
+        if (is_array($tpl_var)) {
+            foreach ($tpl_var as $_key => $_val) {
+                if ($_key != '') {
+                    $this->tpl_vars[$_key] = new Smarty_variable($_val, $nocache);
+                } 
+            } 
+        } else {
+            if ($tpl_var != '') {
+                $this->tpl_vars[$tpl_var] = new Smarty_variable($value, $nocache);
+            } 
+        } 
+    } 
+    /**
+     * assigns a global Smarty variable
+     * 
+     * @param string $varname the global variable name
+     * @param mixed $value the value to assign
+     * @param boolean $nocache if true any output of this variable will be not cached
+     */
+    public function assignGlobal($varname, $value = null, $nocache = false)
+    {
+        if ($varname != '') {
+            Smarty::$global_tpl_vars[$varname] = new Smarty_variable($value, $nocache);
+        } 
+    } 
+    /**
+     * assigns values to template variables by reference
+     * 
+     * @param string $tpl_var the template variable name
+     * @param mixed $ &$value the referenced value to assign
+     * @param boolean $nocache if true any output of this variable will be not cached
+     */
+    public function assignByRef($tpl_var, &$value, $nocache = false)
+    {
+        if ($tpl_var != '') {
+            $this->tpl_vars[$tpl_var] = new Smarty_variable(null, $nocache);
+            $this->tpl_vars[$tpl_var]->value = &$value;
+        } 
+    } 
+
+    /**
+     * wrapper function for Smarty 2 BC
+     * 
+     * @param string $tpl_var the template variable name
+     * @param mixed $ &$value the referenced value to assign
+     */
+    public function assign_by_ref($tpl_var, &$value)
+    {
+       	if($this->smarty->deprecation_notices)
+        	trigger_error("function call 'assign_by_ref' is unknown or deprecated, use 'assignByRef'", E_USER_NOTICE);
+        $this->assignByRef($tpl_var, $value);
+    } 
+    /**
+     * appends values to template variables
+     * 
+     * @param array $ |string $tpl_var the template variable name(s)
+     * @param mixed $value the value to append
+     * @param boolean $merge flag if array elements shall be merged
+     * @param boolean $nocache if true any output of this variable will be not cached
+     */
+    public function append($tpl_var, $value = null, $merge = false, $nocache = false)
+    {
+        if (is_array($tpl_var)) {
+            // $tpl_var is an array, ignore $value
+            foreach ($tpl_var as $_key => $_val) {
+                if ($_key != '') {
+                    if (!isset($this->tpl_vars[$_key])) {
+                        $tpl_var_inst = $this->getVariable($_key, null, true, false);
+                        if ($tpl_var_inst instanceof Undefined_Smarty_Variable) {
+                            $this->tpl_vars[$_key] = new Smarty_variable(null, $nocache);
+                        } else {
+                            $this->tpl_vars[$_key] = clone $tpl_var_inst;
+                        } 
+                    } 
+                    if (!(is_array($this->tpl_vars[$_key]->value) || $this->tpl_vars[$_key]->value instanceof ArrayAccess)) {
+                        settype($this->tpl_vars[$_key]->value, 'array');
+                    } 
+                    if ($merge && is_array($_val)) {
+                        foreach($_val as $_mkey => $_mval) {
+                            $this->tpl_vars[$_key]->value[$_mkey] = $_mval;
+                        } 
+                    } else {
+                        $this->tpl_vars[$_key]->value[] = $_val;
+                    } 
+                } 
+            } 
+        } else {
+            if ($tpl_var != '' && isset($value)) {
+                if (!isset($this->tpl_vars[$tpl_var])) {
+                    $tpl_var_inst = $this->getVariable($tpl_var, null, true, false);
+                    if ($tpl_var_inst instanceof Undefined_Smarty_Variable) {
+                        $this->tpl_vars[$tpl_var] = new Smarty_variable(null, $nocache);
+                    } else {
+                        $this->tpl_vars[$tpl_var] = clone $tpl_var_inst;
+                    } 
+                } 
+                if (!(is_array($this->tpl_vars[$tpl_var]->value) || $this->tpl_vars[$tpl_var]->value instanceof ArrayAccess)) {
+                    settype($this->tpl_vars[$tpl_var]->value, 'array');
+                } 
+                if ($merge && is_array($value)) {
+                    foreach($value as $_mkey => $_mval) {
+                        $this->tpl_vars[$tpl_var]->value[$_mkey] = $_mval;
+                    } 
+                } else {
+                    $this->tpl_vars[$tpl_var]->value[] = $value;
+                } 
+            } 
+        } 
+    } 
+
+    /**
+     * appends values to template variables by reference
+     * 
+     * @param string $tpl_var the template variable name
+     * @param mixed $ &$value the referenced value to append
+     * @param boolean $merge flag if array elements shall be merged
+     */
+    public function appendByRef($tpl_var, &$value, $merge = false)
+    {
+        if ($tpl_var != '' && isset($value)) {
+            if (!isset($this->tpl_vars[$tpl_var])) {
+                $this->tpl_vars[$tpl_var] = new Smarty_variable();
+            } 
+            if (!@is_array($this->tpl_vars[$tpl_var]->value)) {
+                settype($this->tpl_vars[$tpl_var]->value, 'array');
+            } 
+            if ($merge && is_array($value)) {
+                foreach($value as $_key => $_val) {
+                    $this->tpl_vars[$tpl_var]->value[$_key] = &$value[$_key];
+                } 
+            } else {
+                $this->tpl_vars[$tpl_var]->value[] = &$value;
+            } 
+        } 
+    } 
+ 
+     /**
+     * 
+     * @param string $tpl_var the template variable name
+     * @param mixed $ &$value the referenced value to append
+     * @param boolean $merge flag if array elements shall be merged
+     */
+    public function append_by_ref($tpl_var, &$value, $merge = false)
+    {
+       	if($this->smarty->deprecation_notices)
+        	trigger_error("function call 'append_by_ref' is unknown or deprecated, use 'appendByRef'", E_USER_NOTICE);
+        $this->appendByRef($tpl_var, $value, $merge);
+    } 
+    /**
+     * Returns a single or all template variables
+     * 
+     * @param string $varname variable name or null
+     * @return string variable value or or array of variables
+     */
+    function getTemplateVars($varname = null, $_ptr = null, $search_parents = true)
+    {
+        if (isset($varname)) {
+            $_var = $this->getVariable($varname, $_ptr, $search_parents, false);
+            if (is_object($_var)) {
+                return $_var->value;
+            } else {
+                return null;
+            } 
+        } else {
+            $_result = array();
+            if ($_ptr === null) {
+                $_ptr = $this;
+            } while ($_ptr !== null) {
+                foreach ($_ptr->tpl_vars AS $key => $var) {
+                    if (!array_key_exists($key, $_result)) {
+                        $_result[$key] = $var->value;
+                    }
+                } 
+                // not found, try at parent
+                if ($search_parents) {
+                    $_ptr = $_ptr->parent;
+                } else {
+                    $_ptr = null;
+                } 
+            } 
+            if ($search_parents && isset(Smarty::$global_tpl_vars)) {
+                foreach (Smarty::$global_tpl_vars AS $key => $var) {
+                    if (!array_key_exists($key, $_result)) {
+                        $_result[$key] = $var->value;
+                    }
+                } 
+            } 
+            return $_result;
+        } 
+    } 
+
+    /**
+     * clear the given assigned template variable.
+     * 
+     * @param string $ |array $tpl_var the template variable(s) to clear
+     */
+    public function clearAssign($tpl_var)
+    {
+        if (is_array($tpl_var)) {
+            foreach ($tpl_var as $curr_var) {
+                unset($this->tpl_vars[$curr_var]);
+            } 
+        } else {
+            unset($this->tpl_vars[$tpl_var]);
+        } 
+    } 
+
+    /**
+     * clear all the assigned template variables.
+     */
+    public function clearAllAssign()
+    {
+        $this->tpl_vars = array();
+    } 
+
+    /**
+     * load a config file, optionally load just selected sections
+     * 
+     * @param string $config_file filename
+     * @param mixed $sections array of section names, single section or null
+     */
+    public function configLoad($config_file, $sections = null)
+    { 
+        // load Config class
+        $config = new Smarty_Internal_Config($config_file, $this->smarty, $this);
+        $config->loadConfigVars($sections);
+    } 
+
+    /**
+     * gets the object of a Smarty variable
+     * 
+     * @param string $variable the name of the Smarty variable
+     * @param object $_ptr optional pointer to data object
+     * @param boolean $search_parents search also in parent data
+     * @return object the object of the variable
+     */
+    public function getVariable($_variable, $_ptr = null, $search_parents = true, $error_enable = true)
+    {
+        if ($_ptr === null) {
+            $_ptr = $this;
+        } while ($_ptr !== null) {
+            if (isset($_ptr->tpl_vars[$_variable])) {
+                // found it, return it
+                return $_ptr->tpl_vars[$_variable];
+            } 
+            // not found, try at parent
+            if ($search_parents) {
+                $_ptr = $_ptr->parent;
+            } else {
+                $_ptr = null;
+            } 
+        } 
+        if (isset(Smarty::$global_tpl_vars[$_variable])) {
+            // found it, return it
+            return Smarty::$global_tpl_vars[$_variable];
+        } 
+        if ($this->smarty->error_unassigned && $error_enable) {
+            throw new SmartyException('Undefined Smarty variable "' . $_variable . '"');
+        } else {
+        	if ($error_enable) {
+				// force a notice
+				$x = $$_variable;
+        	}
+            return new Undefined_Smarty_Variable;
+        } 
+    } 
+    /**
+     * gets  a config variable
+     * 
+     * @param string $variable the name of the config variable
+     * @return mixed the value of the config variable
+     */
+    public function getConfigVariable($_variable)
+    {
+        $_ptr = $this;
+        while ($_ptr !== null) {
+            if (isset($_ptr->config_vars[$_variable])) {
+                // found it, return it
+                return $_ptr->config_vars[$_variable];
+            } 
+            // not found, try at parent
+            $_ptr = $_ptr->parent;
+        } 
+        if ($this->smarty->error_unassigned) {
+            throw new SmartyException('Undefined config variable "' . $_variable . '"');
+        } else {
+			// force a notice
+			$x = $$_variable;
+            return null;
+        } 
+    } 
+
+    /**
+     * gets  a stream variable
+     * 
+     * @param string $variable the stream of the variable
+     * @return mixed the value of the stream variable
+     */
+    public function getStreamVariable($variable)
+    {
+        $_result = '';
+        if ($fp = fopen($variable, 'r+')) {
+            while (!feof($fp)) {
+                $_result .= fgets($fp);
+            } 
+            fclose($fp);
+            return $_result;
+        } 
+
+        if ($this->smarty->error_unassigned) {
+            throw new SmartyException('Undefined stream variable "' . $variable . '"');
+        } else {
+            return null;
+        } 
+    } 
+
+    /**
+     * Returns a single or all config variables
+     * 
+     * @param string $varname variable name or null
+     * @return string variable value or or array of variables
+     */
+    function getConfigVars($varname = null, $search_parents = true)
+    {
+ //   	var_dump($this);
+        $_ptr = $this;
+        $var_array = array();
+        while ($_ptr !== null) {
+        	if (isset($varname)) {
+            	if (isset($_ptr->config_vars[$varname])) {
+                	return $_ptr->config_vars[$varname];
+                }
+            } else {
+            	$var_array = array_merge($_ptr->config_vars, $var_array);
+        	} 
+             // not found, try at parent
+            if ($search_parents) {
+                $_ptr = $_ptr->parent;
+            } else {
+                $_ptr = null;
+            } 
+    	} 
+        if (isset($varname)) {
+    		return '';
+        } else {
+            return $var_array;
+        } 
+    } 
+
+    /**
+     * Deassigns a single or all config variables
+     * 
+     * @param string $varname variable name or null
+     */
+    function clearConfig($varname = null)
+    {
+        if (isset($varname)) {
+            unset($this->config_vars[$varname]);
+            return;
+        } else {
+            $this->config_vars = array();
+            return;
+        } 
+    } 
+
+} 
+
+/**
+ * class for the Smarty data object
+ * 
+ * The Smarty data object will hold Smarty variables in the current scope
+ * 
+ * @param object $parent tpl_vars next higher level of Smarty variables
+ */
+class Smarty_Data extends Smarty_Internal_Data {
+    // array of variable objects
+    public $tpl_vars = array(); 
+    // back pointer to parent object
+    public $parent = null; 
+    // config vars
+    public $config_vars = array(); 
+    // Smarty object
+    public $smarty = null;
+    /**
+     * create Smarty data object
+     */
+    public function __construct ($_parent = null, $smarty = null)
+    {
+        $this->smarty = $smarty;
+        if (is_object($_parent)) {
+            // when object set up back pointer
+            $this->parent = $_parent;
+        } elseif (is_array($_parent)) {
+            // set up variable values
+            foreach ($_parent as $_key => $_val) {
+                $this->tpl_vars[$_key] = new Smarty_variable($_val);
+            } 
+        } elseif ($_parent != null) {
+            throw new SmartyException("Wrong type for template variables");
+        } 
+    } 
+} 
+/**
+ * class for the Smarty variable object
+ * 
+ * This class defines the Smarty variable object
+ */
+class Smarty_Variable {
+    // template variable
+    public $value;
+    public $nocache;
+    public $scope;
+    /**
+     * create Smarty variable object
+     * 
+     * @param mixed $value the value to assign
+     * @param boolean $nocache if true any output of this variable will be not cached
+     * @param boolean $scope the scope the variable will have  (local,parent or root)
+     */
+    public function __construct ($value = null, $nocache = false, $scope = Smarty::SCOPE_LOCAL)
+    {
+        $this->value = $value;
+        $this->nocache = $nocache;
+        $this->scope = $scope;
+    } 
+
+    public function __toString ()
+    {
+        return $this->value;
+    } 
+} 
+
+/**
+ * class for undefined variable object
+ * 
+ * This class defines an object for undefined variable handling
+ */
+class Undefined_Smarty_Variable {
+    // return always false
+    public function __get ($name)
+    {
+        if ($name == 'nocache') {
+            return false;
+        } else {
+            return null;
+        } 
+    } 
+} 
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_debug.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_debug.php
new file mode 100644
index 0000000..0fd22a6
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_debug.php
@@ -0,0 +1,170 @@
+<?php
+
+/**
+* Smarty Internal Plugin Debug
+*
+* Class to collect data for the Smarty Debugging Consol
+*
+* @package Smarty
+* @subpackage Debug
+* @author Uwe Tews
+*/
+
+/**
+* Smarty Internal Plugin Debug Class
+*/
+class Smarty_Internal_Debug extends Smarty_Internal_Data {
+	// template data
+	static $template_data = array();
+
+	/**
+	* Start logging of compile time
+	*/
+	public static function start_compile($template)
+	{
+		$key = self::get_key($template);
+		self::$template_data[$key]['start_time'] = microtime(true);
+	}
+
+	/**
+	* End logging of compile time
+	*/
+	public static function end_compile($template)
+	{
+		$key = self::get_key($template);
+		self::$template_data[$key]['compile_time'] += microtime(true) - self::$template_data[$key]['start_time'];
+	}
+
+	/**
+	* Start logging of render time
+	*/
+	public static function start_render($template)
+	{
+		$key = self::get_key($template);
+		self::$template_data[$key]['start_time'] = microtime(true);
+	}
+
+	/**
+	* End logging of compile time
+	*/
+	public static function end_render($template)
+	{
+		$key = self::get_key($template);
+		self::$template_data[$key]['render_time'] += microtime(true) - self::$template_data[$key]['start_time'];
+	}
+
+	/**
+	* Start logging of cache time
+	*/
+	public static function start_cache($template)
+	{
+		$key = self::get_key($template);
+		self::$template_data[$key]['start_time'] = microtime(true);
+	}
+
+	/**
+	* End logging of cache time
+	*/
+	public static function end_cache($template)
+	{
+		$key = self::get_key($template);
+		self::$template_data[$key]['cache_time'] += microtime(true) - self::$template_data[$key]['start_time'];
+	}
+	/**
+	* Opens a window for the Smarty Debugging Consol and display the data
+	*/
+	public static function display_debug($obj)
+	{
+		// prepare information of assigned variables
+		$ptr = self::get_debug_vars($obj);
+		if ($obj instanceof Smarty) {
+			$smarty = $obj;
+		} else {
+			$smarty = $obj->smarty;
+		}
+		$_assigned_vars = $ptr->tpl_vars;
+		ksort($_assigned_vars);
+		$_config_vars = $ptr->config_vars;
+		ksort($_config_vars);
+		$ldelim = $smarty->left_delimiter;
+		$rdelim = $smarty->right_delimiter;
+		$smarty->left_delimiter = '{';
+		$smarty->right_delimiter = '}';
+		$_template = new Smarty_Internal_Template ($smarty->debug_tpl, $smarty);
+		$_template->caching = false;
+		$_template->force_compile = false;
+		$_template->disableSecurity();
+		$_template->cache_id = null;
+		$_template->compile_id = null;
+		if ($obj instanceof Smarty_Internal_Template) {
+			$_template->assign('template_name',$obj->resource_type.':'.$obj->resource_name);
+		}
+		if ($obj instanceof Smarty) {
+			$_template->assign('template_data', self::$template_data);
+		} else {
+			$_template->assign('template_data', null);
+		}
+		$_template->assign('assigned_vars', $_assigned_vars);
+		$_template->assign('config_vars', $_config_vars);
+		$_template->assign('execution_time', microtime(true) - $smarty->start_time);
+		echo $_template->getRenderedTemplate();
+		$smarty->left_delimiter = $ldelim;
+		$smarty->right_delimiter = $rdelim;
+	}
+	/*
+	* Recursively gets variables from all template/data scopes
+	*/
+	public static function get_debug_vars($obj)
+	{
+		$config_vars = $obj->config_vars;
+		$tpl_vars = array();
+		foreach ($obj->tpl_vars as $key => $var) {
+			$tpl_vars[$key] = clone $var;
+			if ($obj instanceof Smarty_Internal_Template) {
+				$tpl_vars[$key]->scope = $obj->resource_type.':'.$obj->resource_name;
+			} elseif ($obj instanceof Smarty_Data) {
+				$tpl_vars[$key]->scope = 'Data object';
+			} else {
+				$tpl_vars[$key]->scope = 'Smarty root';
+			}
+		}
+
+		if (isset($obj->parent)) {
+			$parent = self::get_debug_vars($obj->parent);
+			$tpl_vars = array_merge($parent->tpl_vars, $tpl_vars);
+			$config_vars = array_merge($parent->config_vars, $config_vars);
+		} else {
+			foreach (Smarty::$global_tpl_vars as $name => $var) {
+				if (!array_key_exists($name, $tpl_vars)) {
+					$clone = clone $var;
+					$clone->scope = 'Global';
+					$tpl_vars[$name] = $clone;
+				}
+			}
+		}
+		return (object) array('tpl_vars' => $tpl_vars, 'config_vars' => $config_vars);
+	}
+
+	/**
+	* get_key
+	*/
+	static function get_key($template)
+	{
+		// calculate Uid if not already done
+		if ($template->templateUid == '') {
+			$template->getTemplateFilepath();
+		}
+		$key = $template->templateUid;
+		if (isset(self::$template_data[$key])) {
+			return $key;
+		} else {
+			self::$template_data[$key]['name'] = $template->getTemplateFilepath();
+			self::$template_data[$key]['compile_time'] = 0;
+			self::$template_data[$key]['render_time'] = 0;
+			self::$template_data[$key]['cache_time'] = 0;
+			return $key;
+		}
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_filter.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_filter.php
new file mode 100644
index 0000000..90214ad
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_filter.php
@@ -0,0 +1,89 @@
+<?php
+
+/**
+ * Smarty Internal Plugin Filter
+ * 
+ * External Smarty filter methods
+ * 
+ * @package Smarty
+ * @author Uwe Tews 
+ */
+
+/**
+ * Class for filter methods
+ */
+class Smarty_Internal_Filter {
+
+    function __construct($smarty)
+    {
+        $this->smarty = $smarty;
+    } 
+    /**
+     * Registers a filter function
+     * 
+     * @param string $type filter type
+     * @param callback $callback 
+     */
+	public function registerFilter($type, $callback)
+	{
+   		$this->smarty->registered_filters[$type][$this->_get_filter_name($callback)] = $callback;
+	}
+
+    /**
+     * Unregisters a filter function
+     * 
+     * @param string $type filter type
+     * @param callback $callback 
+     */
+	public function unregisterFilter($type, $callback)
+	{
+   		$name = $this->_get_filter_name($callback);
+   		if(isset($this->smarty->registered_filters[$type][$name])) {
+      		unset($this->smarty->registered_filters[$type][$name]);
+   		}
+	}
+
+
+    /**
+     * Return internal filter name
+     * 
+     * @param callback $function_name 
+     */
+    public function _get_filter_name($function_name)
+    {
+        if (is_array($function_name)) {
+            $_class_name = (is_object($function_name[0]) ?
+                get_class($function_name[0]) : $function_name[0]);
+            return $_class_name . '_' . $function_name[1];
+        } else {
+            return $function_name;
+        } 
+    } 
+
+
+    /**
+     * load a filter of specified type and name
+     * 
+     * @param string $type filter type
+     * @param string $name filter name
+     * @return bool 
+     */
+    function loadFilter($type, $name)
+    {
+        $_plugin = "smarty_{$type}filter_{$name}";
+        $_filter_name = $_plugin;
+        if ($this->smarty->loadPlugin($_plugin)) {
+            if (class_exists($_plugin, false)) {
+                $_plugin = array($_plugin, 'execute');
+            } 
+            if (is_callable($_plugin)) {
+                return $this->smarty->registered_filters[$type][$_filter_name] = $_plugin;
+            } 
+        } 
+        throw new SmartyException("{$type}filter \"{$name}\" not callable");
+        return false;
+    } 
+
+
+}
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_filter_handler.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_filter_handler.php
new file mode 100644
index 0000000..fbd8846
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_filter_handler.php
@@ -0,0 +1,67 @@
+<?php
+
+/**
+ * Smarty Internal Plugin Filter Handler
+ * 
+ * Smarty filter handler class
+ * 
+ * @package Smarty
+ * @subpackage PluginsInternal
+ * @author Uwe Tews 
+ */
+
+/**
+ * Class for filter processing
+ */
+class Smarty_Internal_Filter_Handler {
+    /**
+     * Run filters over content
+     * 
+     * The filters will be lazy loaded if required
+     * class name format: Smarty_FilterType_FilterName
+     * plugin filename format: filtertype.filtername.php
+     * Smarty2 filter plugins could be used
+     * 
+     * @param string $type the type of filter ('pre','post','output' or 'variable') which shall run
+     * @param string $content the content which shall be processed by the filters
+     * @return string the filtered content
+     */
+    static function runFilter($type, $content, $template, $flag = null)
+    {
+        $output = $content;
+        if ($type != 'variable' || ($template->smarty->variable_filter && $flag !== false) || $flag === true) {
+            // loop over autoload filters of specified type
+            if (!empty($template->smarty->autoload_filters[$type])) {
+                foreach ((array)$template->smarty->autoload_filters[$type] as $name) {
+                    $plugin_name = "Smarty_{$type}filter_{$name}";
+                    if ($template->smarty->loadPlugin($plugin_name)) {
+                        if (function_exists($plugin_name)) {
+                            // use loaded Smarty2 style plugin
+                            $output = $plugin_name($output, $template);
+                        } elseif (class_exists($plugin_name, false)) {
+                            // loaded class of filter plugin
+                            $output = call_user_func(array($plugin_name, 'execute'), $output, $template);
+                        } 
+                    } else {
+                        // nothing found, throw exception
+                        throw new SmartyException("Unable to load filter {$plugin_name}");
+                    } 
+                } 
+            } 
+            // loop over registerd filters of specified type
+            if (!empty($template->smarty->registered_filters[$type])) {
+                foreach ($template->smarty->registered_filters[$type] as $key => $name) {
+                    if (is_array($template->smarty->registered_filters[$type][$key])) {
+                        $output = call_user_func($template->smarty->registered_filters[$type][$key], $output, $template);
+                    } else {
+                        $output = $template->smarty->registered_filters[$type][$key]($output, $template);
+                    } 
+                } 
+            } 
+        } 
+        // return filtered output
+        return $output;
+    } 
+} 
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_function_call_handler.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_function_call_handler.php
new file mode 100644
index 0000000..f9860dc
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_function_call_handler.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Smarty Internal Plugin Function Call Handler
+ * 
+ * @package Smarty
+ * @subpackage PluginsInternal
+ * @author Uwe Tews 
+ */
+
+/**
+ * This class does call function defined with the {function} tag
+ */
+class Smarty_Internal_Function_Call_Handler extends Smarty_Internal_Template {
+    static function call ($_name, $_template, $_params, $_hash, $_nocache)
+    {
+        if ($_nocache) {
+            $_function = "smarty_template_function_{$_name}_nocache";
+            $_template->smarty->template_functions[$_name]['called_nocache'] = true;
+        } else {
+            $_function = "smarty_template_function_{$_hash}_{$_name}";
+        } 
+        if (!is_callable($_function)) {
+            $_code = "function {$_function}(\$_smarty_tpl,\$params) {
+    \$saved_tpl_vars = \$_smarty_tpl->tpl_vars;
+    foreach (\$_smarty_tpl->template_functions['{$_name}']['parameter'] as \$key => \$value) {\$_smarty_tpl->tpl_vars[\$key] = new Smarty_variable(trim(\$value,'\''));};
+    foreach (\$params as \$key => \$value) {\$_smarty_tpl->tpl_vars[\$key] = new Smarty_variable(\$value);}?>";
+            if ($_nocache) {
+                $_code .= preg_replace(array("!<\?php echo \\'/\*%%SmartyNocache:{$_template->smarty->template_functions[$_name]['nocache_hash']}%%\*/|/\*/%%SmartyNocache:{$_template->smarty->template_functions[$_name]['nocache_hash']}%%\*/\\';\?>!",
+                        "!\\\'!"), array('', "'"), $_template->smarty->template_functions[$_name]['compiled']);
+            } else {
+                $_code .= preg_replace("/{$_template->smarty->template_functions[$_name]['nocache_hash']}/", $_template->properties['nocache_hash'], $_template->smarty->template_functions[$_name]['compiled']);
+            } 
+            $_code .= "<?php \$_smarty_tpl->tpl_vars = \$saved_tpl_vars;}";
+            eval($_code);
+        } 
+        $_function($_template, $_params);
+    } 
+} 
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_get_include_path.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_get_include_path.php
new file mode 100644
index 0000000..23c85a2
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_get_include_path.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * Smarty read include path plugin
+ * 
+ * @package Smarty
+ * @subpackage PluginsInternal
+ * @author Monte Ohrt 
+ */
+
+/**
+ * Smarty Internal Read Include Path Class
+ */
+class Smarty_Internal_Get_Include_Path {
+    /**
+     * Return full file path from PHP include_path
+     * 
+     * @param string $filepath filepath
+     * @return mixed full filepath or false
+     */
+    public static function getIncludePath($filepath)
+    {
+    static $_path_array = null;
+
+    if(!isset($_path_array)) {
+        $_ini_include_path = ini_get('include_path');
+
+        if(strstr($_ini_include_path,';')) {
+            // windows pathnames
+            $_path_array = explode(';',$_ini_include_path);
+        } else {
+            $_path_array = explode(':',$_ini_include_path);
+        }
+    }
+    foreach ($_path_array as $_include_path) {
+        if (file_exists($_include_path . DS . $filepath)) {
+            return $_include_path . DS . $filepath;
+        }
+    }
+    return false;
+    } 
+} 
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_nocache_insert.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_nocache_insert.php
new file mode 100644
index 0000000..1b25e80
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_nocache_insert.php
@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * Smarty Internal Plugin Nocache Insert
+ * 
+ * Compiles the {insert} tag into the cache file
+ * 
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews 
+ */
+
+/**
+ * Smarty Internal Plugin Compile Insert Class
+ */
+class Smarty_Internal_Nocache_Insert {
+    /**
+     * Compiles code for the {insert} tag into cache file
+     * 
+     * @param string $_function insert function name
+     * @param array $_attr array with paramter
+     * @param object $template template object
+     * @param string $_script script name to load or 'null'
+     * @param string $_assign soptinal variable name
+     * @return string compiled code
+     */
+    static function compile($_function, $_attr, $_template, $_script, $_assign = null)
+    {
+        $_output = '<?php ';
+        if ($_script != 'null') {
+            // script which must be included
+            // code for script file loading
+            $_output .= "require_once '{$_script}';";
+        } 
+        // call insert
+        if (isset($_assign)) {
+            $_output .= "\$_smarty_tpl->assign('{$_assign}' , {$_function} (" . var_export($_attr, true) . ",\$_smarty_tpl), true);?>";
+        } else {
+            $_output .= "echo {$_function}(" . var_export($_attr, true) . ",\$_smarty_tpl);?>";
+        } 
+        $_tpl = $_template;
+        while ($_tpl->parent instanceof Smarty_Internal_Template) {
+            $_tpl = $_tpl->parent;
+        } 
+        return "/*%%SmartyNocache:{$_tpl->properties['nocache_hash']}%%*/" . $_output . "/*/%%SmartyNocache:{$_tpl->properties['nocache_hash']}%%*/";
+    } 
+} 
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_parsetree.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_parsetree.php
new file mode 100644
index 0000000..9eba594
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_parsetree.php
@@ -0,0 +1,236 @@
+<?php
+/**
+ * Smarty Internal Plugin Templateparser Parsetrees
+ * 
+ * These are classes to build parsetrees in the template parser
+ * 
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Thue Kristensen 
+ * @author Uwe Tews 
+ */
+ 
+abstract class _smarty_parsetree {
+  abstract public function to_smarty_php();
+}
+
+/**
+ * A complete smarty tag.
+ */
+class _smarty_tag extends _smarty_parsetree
+{
+    public $parser;
+    public $data;
+    public $saved_block_nesting;
+    function __construct($parser, $data)
+    {
+        $this->parser = $parser;
+        $this->data = $data;
+        $this->saved_block_nesting = $parser->block_nesting_level;
+    } 
+
+    public function to_smarty_php()
+    {
+        return $this->data;
+    } 
+
+    public function assign_to_var()
+    {
+        $var = sprintf('$_tmp%d', ++$this->parser->prefix_number);
+        $this->parser->compiler->prefix_code[] = sprintf('<?php ob_start();?>%s<?php %s=ob_get_clean();?>',
+            $this->data, $var);
+        return $var;
+    } 
+} 
+
+/**
+ * Code fragment inside a tag.
+ */
+class _smarty_code extends _smarty_parsetree {
+    public $parser;
+    public $data;
+    function __construct($parser, $data)
+    {
+        $this->parser = $parser;
+        $this->data = $data;
+    } 
+
+    public function to_smarty_php()
+    {
+        return sprintf("(%s)", $this->data);
+    } 
+} 
+
+/**
+ * Double quoted string inside a tag.
+ */
+class _smarty_doublequoted extends _smarty_parsetree {
+    public $parser;
+    public $subtrees = Array();
+    function __construct($parser, _smarty_parsetree $subtree)
+    {
+        $this->parser = $parser;
+        $this->subtrees[] = $subtree;
+        if ($subtree instanceof _smarty_tag) {
+            $this->parser->block_nesting_level = count($this->parser->compiler->_tag_stack);
+        } 
+    } 
+
+    function append_subtree(_smarty_parsetree $subtree)
+    {
+        $last_subtree = count($this->subtrees)-1;
+        if ($last_subtree >= 0 && $this->subtrees[$last_subtree] instanceof _smarty_tag && $this->subtrees[$last_subtree]->saved_block_nesting < $this->parser->block_nesting_level) {
+            if ($subtree instanceof _smarty_code) {
+                $this->subtrees[$last_subtree]->data .= '<?php echo ' . $subtree->data . ';?>';
+            } elseif ($subtree instanceof _smarty_dq_content) {
+                $this->subtrees[$last_subtree]->data .= '<?php echo "' . $subtree->data . '";?>';
+            } else {
+                $this->subtrees[$last_subtree]->data .= $subtree->data;
+            } 
+        } else {
+            $this->subtrees[] = $subtree;
+        } 
+        if ($subtree instanceof _smarty_tag) {
+            $this->parser->block_nesting_level = count($this->parser->compiler->_tag_stack);
+        } 
+    } 
+
+    public function to_smarty_php()
+    {
+        $code = '';
+        foreach ($this->subtrees as $subtree) {
+            if ($code !== "") {
+                $code .= ".";
+            } 
+            if ($subtree instanceof _smarty_tag) {
+                $more_php = $subtree->assign_to_var();
+            } else {
+                $more_php = $subtree->to_smarty_php();
+            } 
+
+            $code .= $more_php;
+
+            if (!$subtree instanceof _smarty_dq_content) {
+                $this->parser->compiler->has_variable_string = true;
+            } 
+        } 
+        return $code;
+    } 
+} 
+
+/**
+ * Raw chars as part of a double quoted string.
+ */
+class _smarty_dq_content extends _smarty_parsetree {
+    public $data;
+    function __construct($parser, $data)
+    {
+        $this->parser = $parser;
+        $this->data = $data;
+    } 
+
+    public function to_smarty_php()
+    {
+        return '"' . $this->data . '"';
+    } 
+} 
+
+/**
+ * Template element
+ */
+class _smarty_template_buffer extends _smarty_parsetree {
+    public $subtrees = Array();
+    function __construct($parser)
+    {
+        $this->parser = $parser;
+    } 
+
+    function append_subtree(_smarty_parsetree $subtree)
+    {
+        $this->subtrees[] = $subtree;
+    } 
+
+    public function to_smarty_php()
+    {
+        $code = '';
+        for ($key = 0, $cnt = count($this->subtrees); $key < $cnt; $key++) {
+            if ($key + 2 < $cnt) {
+                if ($this->subtrees[$key] instanceof _smarty_linebreak && $this->subtrees[$key + 1] instanceof _smarty_tag && $this->subtrees[$key + 1]->data == '' && $this->subtrees[$key + 2] instanceof _smarty_linebreak) {
+                    $key = $key + 1;
+                    continue;
+                } 
+                if (substr($this->subtrees[$key]->data, -1) == '<' && $this->subtrees[$key + 1]->data == '' && substr($this->subtrees[$key + 2]->data, -1) == '?') {
+                    $key = $key + 2;
+                    continue;
+                } 
+            } 
+            if (substr($code, -1) == '<') {
+                $subtree = $this->subtrees[$key]->to_smarty_php();
+                if (substr($subtree, 0, 1) == '?') {
+                    $code = substr($code, 0, strlen($code)-1) . '<<?php ?>?' . substr($subtree, 1);
+                } elseif ($this->parser->asp_tags && substr($subtree, 0, 1) == '%') {
+                    $code = substr($code, 0, strlen($code)-1) . '<<?php ?>%' . substr($subtree, 1);
+           } else {
+                    $code .= $subtree;
+                } 
+                continue;
+            } 
+            if ($this->parser->asp_tags && substr($code, -1) == '%') {
+                $subtree = $this->subtrees[$key]->to_smarty_php();
+                if (substr($subtree, 0, 1) == '>') {
+                    $code = substr($code, 0, strlen($code)-1) . '%<?php ?>>' . substr($subtree, 1);
+           } else {
+                    $code .= $subtree;
+                } 
+                continue;
+            } 
+            if (substr($code, -1) == '?') {
+                $subtree = $this->subtrees[$key]->to_smarty_php();
+                if (substr($subtree, 0, 1) == '>') {
+                    $code = substr($code, 0, strlen($code)-1) . '?<?php ?>>' . substr($subtree, 1);
+           } else {
+                    $code .= $subtree;
+                } 
+                continue;
+            } 
+            $code .= $this->subtrees[$key]->to_smarty_php();
+        } 
+        return $code;
+    } 
+}
+
+/**
+ * template text
+ */
+class _smarty_text extends _smarty_parsetree {
+    public $data;
+    function __construct($parser, $data)
+    {
+        $this->parser = $parser;
+        $this->data = $data;
+    } 
+
+    public function to_smarty_php()
+    {
+        return $this->data;
+    } 
+} 
+
+/**
+ * template linebreaks
+ */
+class _smarty_linebreak extends _smarty_parsetree {
+    public $data;
+    function __construct($parser, $data)
+    {
+        $this->parser = $parser;
+        $this->data = $data;
+    } 
+
+    public function to_smarty_php()
+    {
+        return $this->data;
+    } 
+} 
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_register.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_register.php
new file mode 100644
index 0000000..edaa7ff
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_register.php
@@ -0,0 +1,156 @@
+<?php
+
+/**
+ * Smarty Internal Plugin Register
+ * 
+ * External Smarty methods register/unregister
+ * 
+ * @package Smarty
+ * @author Uwe Tews 
+ */
+
+/**
+ * Class for register/unregister methods
+ */
+class Smarty_Internal_Register {
+
+    function __construct($smarty)
+    {
+        $this->smarty = $smarty;
+    } 
+    /**
+     * Registers plugin to be used in templates
+     * 
+     * @param string $type plugin type
+     * @param string $tag name of template tag
+     * @param callback $callback PHP callback to register
+     * @param boolean $cacheable if true (default) this fuction is cachable
+     * @param array $cache_attr caching attributes if any
+     */
+
+	public function registerPlugin($type, $tag, $callback, $cacheable = true, $cache_attr = null)
+	{
+		if (isset($this->smarty->registered_plugins[$type][$tag])) {
+        	throw new Exception("Plugin tag \"{$tag}\" already registered");
+    	} elseif (!is_callable($callback)) {
+        	throw new Exception("Plugin \"{$tag}\" not callable");
+    	} else {
+       		$this->smarty->registered_plugins[$type][$tag] = array($callback, (bool) $cacheable, (array) $cache_attr);
+    	}
+	} 
+
+    /**
+     * Unregister Plugin
+     * 
+     * @param string $type of plugin
+     * @param string $tag name of plugin
+     */
+    function unregisterPlugin($type, $tag)
+    {
+        if (isset($this->smarty->registered_plugins[$type][$tag])) {
+            unset($this->smarty->registered_plugins[$type][$tag]);
+        } 
+    } 
+ 
+    /**
+     * Registers a resource to fetch a template
+     * 
+     * @param string $type name of resource type
+     * @param array $callback array of callbacks to handle resource
+     */
+ 	public function registerResource($type, $callback)
+	{
+       	$this->smarty->registered_resources[$type] = array($callback, false);
+    }
+
+    /**
+     * Unregisters a resource 
+     * 
+     * @param string $type name of resource type
+     */
+   function unregisterResource($type)
+    {
+        if (isset($this->smarty->registered_resources[$type])) {
+            unset($this->smarty->registered_resources[$type]);
+        } 
+    } 
+
+
+    /**
+     * Registers object to be used in templates
+     * 
+     * @param string $object name of template object
+     * @param object $ &$object_impl the referenced PHP object to register
+     * @param mixed $ null | array $allowed list of allowed methods (empty = all)
+     * @param boolean $smarty_args smarty argument format, else traditional
+     * @param mixed $ null | array $block_functs list of methods that are block format
+     */
+    function registerObject($object_name, $object_impl, $allowed = array(), $smarty_args = true, $block_methods = array())
+    { 
+        // test if allowed methodes callable
+        if (!empty($allowed)) {
+            foreach ((array)$allowed as $method) {
+                if (!is_callable(array($object_impl, $method))) {
+                    throw new SmartyException("Undefined method '$method' in registered object");
+                } 
+            } 
+        } 
+        // test if block methodes callable
+        if (!empty($block_methods)) {
+            foreach ((array)$block_methods as $method) {
+                if (!is_callable(array($object_impl, $method))) {
+                    throw new SmartyException("Undefined method '$method' in registered object");
+                } 
+            } 
+        } 
+        // register the object
+        $this->smarty->registered_objects[$object_name] =
+        array($object_impl, (array)$allowed, (boolean)$smarty_args, (array)$block_methods);
+    } 
+
+    /**
+     * Registers static classes to be used in templates
+     * 
+     * @param string $class name of template class
+     * @param string $class_impl the referenced PHP class to register
+     */
+    function registerClass($class_name, $class_impl)
+    { 
+        // test if exists
+        if (!class_exists($class_impl)) {
+            throw new SmartyException("Undefined class '$class_impl' in register template class");
+        } 
+        // register the class
+        $this->smarty->registered_classes[$class_name] = $class_impl;
+    } 
+
+    /**
+     * Registers a default plugin handler
+     * 
+     * @param  $callback mixed string | array $plugin class/methode name
+     */
+    function registerDefaultPluginHandler($callback)
+    {
+        if (is_callable($callback)) {
+            $this->smarty->default_plugin_handler_func = $callback;
+        } else {
+            throw new SmartyException("Default plugin handler '$callback' not callable");
+        } 
+    } 
+
+    /**
+     * Registers a default template handler
+     * 
+     * @param  $callback mixed string | array class/method name
+     */
+    function registerDefaultTemplateHandler($callback)
+    {
+        if (is_callable($callback)) {
+            $this->smarty->default_template_handler_func = $callback;
+        } else {
+            throw new SmartyException("Default template handler '$callback' not callable");
+        } 
+    } 
+
+}
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_resource_eval.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_resource_eval.php
new file mode 100644
index 0000000..a3acf71
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_resource_eval.php
@@ -0,0 +1,89 @@
+<?php
+
+/**
+ * Smarty Internal Plugin Resource Eval
+ * 
+ * Implements the strings as resource for Smarty template
+ * 
+ * @package Smarty
+ * @subpackage TemplateResources
+ * @author Uwe Tews 
+ */
+ 
+/**
+ * Smarty Internal Plugin Resource Eval
+ */
+class Smarty_Internal_Resource_Eval {
+    public function __construct($smarty)
+    {
+        $this->smarty = $smarty;
+    } 
+    // classes used for compiling Smarty templates from file resource
+    public $compiler_class = 'Smarty_Internal_SmartyTemplateCompiler';
+    public $template_lexer_class = 'Smarty_Internal_Templatelexer';
+    public $template_parser_class = 'Smarty_Internal_Templateparser';
+    // properties
+    public $usesCompiler = true;
+    public $isEvaluated = true;
+
+    /**
+     * Return flag if template source is existing
+     * 
+     * @return boolean true
+     */
+    public function isExisting($template)
+    {
+        return true;
+    } 
+
+    /**
+     * Get filepath to template source
+     * 
+     * @param object $_template template object
+     * @return string return 'string' as template source is not a file
+     */
+    public function getTemplateFilepath($_template)
+    { 
+        // no filepath for evaluated strings
+        // return "string" for compiler error messages
+        return 'eval:';
+    } 
+
+    /**
+     * Get timestamp to template source
+     * 
+     * @param object $_template template object
+     * @return boolean false as string resources have no timestamp
+     */
+    public function getTemplateTimestamp($_template)
+    { 
+        // evaluated strings must always be compiled and have no timestamp
+        return false;
+    } 
+
+    /**
+     * Retuen template source from resource name
+     * 
+     * @param object $_template template object
+     * @return string content of template source
+     */
+    public function getTemplateSource($_template)
+    { 
+        // return template string
+        $_template->template_source = $_template->resource_name;
+        return true;
+    } 
+
+    /**
+     * Get filepath to compiled template
+     * 
+     * @param object $_template template object
+     * @return boolean return false as compiled template is not stored
+     */
+    public function getCompiledFilepath($_template)
+    { 
+        // no filepath for strings
+        return false;
+    } 
+} 
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_resource_extends.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_resource_extends.php
new file mode 100644
index 0000000..74dc0f9
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_resource_extends.php
@@ -0,0 +1,176 @@
+<?php
+
+/**
+ * Smarty Internal Plugin Resource Extends
+ * 
+ * Implements the file system as resource for Smarty which does extend a chain of template files templates
+ * 
+ * @package Smarty
+ * @subpackage TemplateResources
+ * @author Uwe Tews 
+ */
+
+/**
+ * Smarty Internal Plugin Resource Extends
+ */
+class Smarty_Internal_Resource_Extends {
+    public function __construct($smarty)
+    {
+        $this->smarty = $smarty;
+        $this->_rdl = preg_quote($smarty->right_delimiter);
+        $this->_ldl = preg_quote($smarty->left_delimiter);
+    } 
+    // classes used for compiling Smarty templates from file resource
+    public $compiler_class = 'Smarty_Internal_SmartyTemplateCompiler';
+    public $template_lexer_class = 'Smarty_Internal_Templatelexer';
+    public $template_parser_class = 'Smarty_Internal_Templateparser'; 
+    // properties
+    public $usesCompiler = true;
+    public $isEvaluated = false;
+    public $allFilepaths = array();
+
+    /**
+     * Return flag if template source is existing
+     * 
+     * @param object $_template template object
+     * @return boolean result
+     */
+    public function isExisting($_template)
+    {
+    	  $_template->getTemplateFilepath();
+    	  foreach ($this->allFilepaths as $_filepath) {
+        	if ($_filepath === false) {
+            return false;
+          }
+        }
+        return true;
+    } 
+    /**
+     * Get filepath to template source
+     * 
+     * @param object $_template template object
+     * @return string filepath to template source file
+     */
+    public function getTemplateFilepath($_template)
+    {
+        $sha1String = '';
+        $_files = explode('|', $_template->resource_name);
+        foreach ($_files as $_file) {
+            $_filepath = $_template->buildTemplateFilepath ($_file);
+            if ($_filepath !== false) {
+            	if (is_object($_template->smarty->security_policy)) {
+                	$_template->smarty->security_policy->isTrustedResourceDir($_filepath);
+            	} 
+            } 
+            $sha1String .= $_filepath;
+            $this->allFilepaths[$_file] = $_filepath;
+        } 
+        $_template->templateUid = sha1($sha1String);
+        return $_filepath;
+    } 
+
+    /**
+     * Get timestamp to template source
+     * 
+     * @param object $_template template object
+     * @return integer timestamp of template source file
+     */
+    public function getTemplateTimestamp($_template)
+    {
+        return filemtime($_template->getTemplateFilepath());
+    } 
+
+    /**
+     * Read template source from file
+     * 
+     * @param object $_template template object
+     * @return string content of template source file
+     */
+    public function getTemplateSource($_template)
+    {
+        $this->template = $_template;
+        $_files = array_reverse($this->allFilepaths);
+    		$_first = reset($_files);
+    		$_last = end($_files);
+        foreach ($_files as $_file => $_filepath) {
+        		if ($_filepath === false) {
+            		throw new SmartyException("Unable to load template 'file : {$_file}'");
+        		}
+            // read template file
+            if ($_filepath != $_first) {
+                $_template->properties['file_dependency'][sha1($_filepath)] = array($_filepath, filemtime($_filepath),'file');
+            } 
+            $_template->template_filepath = $_filepath;
+            $_content = file_get_contents($_filepath);
+            if ($_filepath != $_last) {
+                if (preg_match_all("!({$this->_ldl}block\s(.+?){$this->_rdl})!", $_content, $_open) !=
+                        preg_match_all("!({$this->_ldl}/block{$this->_rdl})!", $_content, $_close)) {
+                    $this->smarty->triggerError("unmatched {block} {/block} pairs in file '$_filepath'");
+                } 
+                preg_match_all("!{$this->_ldl}block\s(.+?){$this->_rdl}|{$this->_ldl}/block{$this->_rdl}!", $_content, $_result, PREG_OFFSET_CAPTURE);
+                $_result_count = count($_result[0]);
+                $_start = 0;
+                while ($_start < $_result_count) {
+                    $_end = 0;
+                    $_level = 1;
+                    while ($_level != 0) {
+                        $_end++;
+                        if (!strpos($_result[0][$_start + $_end][0], '/')) {
+                            $_level++;
+                        } else {
+                            $_level--;
+                        } 
+                    } 
+                    $_block_content = str_replace($this->smarty->left_delimiter . '$smarty.block.parent' . $this->smarty->right_delimiter, '%%%%SMARTY_PARENT%%%%',
+                        substr($_content, $_result[0][$_start][1] + strlen($_result[0][$_start][0]), $_result[0][$_start + $_end][1] - $_result[0][$_start][1] - + strlen($_result[0][$_start][0])));
+                    Smarty_Internal_Compile_Block::saveBlockData($_block_content, $_result[0][$_start][0], $_template, $_filepath);
+                    $_start = $_start + $_end + 1;
+                } 
+            } else {
+                $_template->template_source = $_content;
+                return true;
+            } 
+        } 
+    }
+    
+
+    /**
+     * Get filepath to compiled template
+     * 
+     * @param object $_template template object
+     * @return string return path to compiled template
+     */
+    public function getCompiledFilepath($_template)
+    {
+        $_compile_id = isset($_template->compile_id) ? preg_replace('![^\w\|]+!', '_', $_template->compile_id) : null;
+        $_files = explode('|', $_template->resource_name); 
+        // calculate Uid if not already done
+        if ($_template->templateUid == '') {
+            $_template->getTemplateFilepath();
+        } 
+        $_filepath = $_template->templateUid; 
+        // if use_sub_dirs, break file into directories
+        if ($_template->smarty->use_sub_dirs) {
+            $_filepath = substr($_filepath, 0, 2) . DS
+             . substr($_filepath, 2, 2) . DS
+             . substr($_filepath, 4, 2) . DS
+             . $_filepath;
+        } 
+        $_compile_dir_sep = $_template->smarty->use_sub_dirs ? DS : '^';
+        if (isset($_compile_id)) {
+            $_filepath = $_compile_id . $_compile_dir_sep . $_filepath;
+        } 
+        if ($_template->caching) {
+            $_cache = '.cache';
+        } else {
+            $_cache = '';
+        } 
+        $_compile_dir = $_template->smarty->compile_dir;
+        if (substr($_compile_dir, -1) != DS) {
+            $_compile_dir .= DS;
+        } 
+        return $_compile_dir . $_filepath . '.' . $_template->resource_type . '.' . basename($_files[count($_files)-1]) . $_cache . '.php';
+    } 
+} 
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_resource_file.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_resource_file.php
new file mode 100644
index 0000000..79decc5
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_resource_file.php
@@ -0,0 +1,128 @@
+<?php
+
+/**
+ * Smarty Internal Plugin Resource File
+ * 
+ * Implements the file system as resource for Smarty templates
+ * 
+ * @package Smarty
+ * @subpackage TemplateResources
+ * @author Uwe Tews 
+ */
+
+/** 
+ * Smarty Internal Plugin Resource File
+ */
+class Smarty_Internal_Resource_File {
+    public function __construct($smarty)
+    {
+        $this->smarty = $smarty;
+    } 
+    // classes used for compiling Smarty templates from file resource
+    public $compiler_class = 'Smarty_Internal_SmartyTemplateCompiler';
+    public $template_lexer_class = 'Smarty_Internal_Templatelexer';
+    public $template_parser_class = 'Smarty_Internal_Templateparser'; 
+    // properties
+    public $usesCompiler = true;
+    public $isEvaluated = false;
+
+    /**
+     * Return flag if template source is existing
+     * 
+     * @return boolean true
+     */
+    public function isExisting($template)
+    {
+        if ($template->getTemplateFilepath() === false) {
+            return false;
+        } else {
+            return true;
+        } 
+    } 
+
+    /**
+     * Get filepath to template source
+     * 
+     * @param object $_template template object
+     * @return string filepath to template source file
+     */
+    public function getTemplateFilepath($_template)
+    {
+        $_filepath = $_template->buildTemplateFilepath ();
+
+        if ($_filepath !== false) {
+            if (is_object($_template->smarty->security_policy)) {
+                $_template->smarty->security_policy->isTrustedResourceDir($_filepath);
+            } 
+        } 
+        $_template->templateUid = sha1($_filepath);
+        return $_filepath;
+    } 
+
+    /**
+     * Get timestamp to template source
+     * 
+     * @param object $_template template object
+     * @return integer timestamp of template source file
+     */
+    public function getTemplateTimestamp($_template)
+    {
+        return filemtime($_template->getTemplateFilepath());
+    } 
+
+    /**
+     * Read template source from file
+     * 
+     * @param object $_template template object
+     * @return string content of template source file
+     */
+    public function getTemplateSource($_template)
+    { 
+        // read template file
+        if (file_exists($_tfp = $_template->getTemplateFilepath())) {
+            $_template->template_source = file_get_contents($_tfp);
+            return true;
+        } else {
+            return false;
+        } 
+    } 
+
+    /**
+     * Get filepath to compiled template
+     * 
+     * @param object $_template template object
+     * @return string return path to compiled template
+     */
+    public function getCompiledFilepath($_template)
+    {
+        $_compile_id = isset($_template->compile_id) ? preg_replace('![^\w\|]+!', '_', $_template->compile_id) : null;
+        // calculate Uid if not already done
+        if ($_template->templateUid == '') {
+            $_template->getTemplateFilepath();
+        } 
+        $_filepath = $_template->templateUid; 
+        // if use_sub_dirs, break file into directories
+        if ($_template->smarty->use_sub_dirs) {
+            $_filepath = substr($_filepath, 0, 2) . DS
+             . substr($_filepath, 2, 2) . DS
+             . substr($_filepath, 4, 2) . DS
+             . $_filepath;
+        } 
+        $_compile_dir_sep = $_template->smarty->use_sub_dirs ? DS : '^';
+        if (isset($_compile_id)) {
+            $_filepath = $_compile_id . $_compile_dir_sep . $_filepath;
+        } 
+        if ($_template->caching) {
+            $_cache = '.cache';
+        } else {
+            $_cache = '';
+        } 
+        $_compile_dir = $_template->smarty->compile_dir;
+        if (strpos('/\\', substr($_compile_dir, -1)) === false) {
+            $_compile_dir .= DS;
+        } 
+        return $_compile_dir . $_filepath . '.' . $_template->resource_type . '.' . basename($_template->resource_name) . $_cache . '.php';
+    } 
+} 
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_resource_php.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_resource_php.php
new file mode 100644
index 0000000..16c7744
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_resource_php.php
@@ -0,0 +1,127 @@
+<?php
+
+/**
+ * Smarty Internal Plugin Resource PHP
+ * 
+ * Implements the file system as resource for PHP templates
+ * 
+ * @package Smarty
+ * @subpackage TemplateResources
+ * @author Uwe Tews 
+ */
+
+/**
+ * Smarty Internal Plugin Resource PHP
+ */
+class Smarty_Internal_Resource_PHP {
+    /**
+     * Class constructor, enable short open tags
+     */
+    public function __construct($smarty)
+    {
+        $this->smarty = $smarty;
+        ini_set('short_open_tag', '1');
+    } 
+    // properties
+    public $usesCompiler = false;
+    public $isEvaluated = false;
+
+    /**
+     * Return flag if template source is existing
+     * 
+     * @return boolean true
+     */
+    public function isExisting($template)
+    {
+        if ($template->getTemplateFilepath() === false) {
+            return false;
+        } else {
+            return true;
+        } 
+    } 
+
+    /**
+     * Get filepath to template source
+     * 
+     * @param object $_template template object
+     * @return string filepath to template source file
+     */
+    public function getTemplateFilepath($_template)
+    {
+        $_filepath = $_template->buildTemplateFilepath ();
+
+        if (is_object($_template->smarty->security_policy)) {
+            $_template->smarty->security_policy->isTrustedResourceDir($_filepath);
+        } 
+        $_template->templateUid = sha1($_filepath);
+        return $_filepath;
+    } 
+
+    /**
+     * Get timestamp to template source
+     * 
+     * @param object $_template template object
+     * @return integer timestamp of template source file
+     */
+    public function getTemplateTimestamp($_template)
+    {
+        return filemtime($_template->getTemplateFilepath());
+    } 
+
+    /**
+     * Read template source from file
+     * 
+     * @param object $_template template object
+     * @return string content of template source file
+     */
+    public function getTemplateSource($_template)
+    {
+        if (file_exists($_tfp = $_template->getTemplateFilepath())) {
+            $_template->template_source = file_get_contents($_tfp);
+            return true;
+        } else {
+            return false;
+        } 
+    } 
+
+    /**
+     * Get filepath to compiled template
+     * 
+     * @param object $_template template object
+     * @return boolean return false as compiled template is not stored
+     */
+    public function getCompiledFilepath($_template)
+    { 
+        // no filepath for PHP templates
+        return false;
+    } 
+
+    /**
+     * renders the PHP template
+     */
+    public function renderUncompiled($_smarty_template)
+    {
+        if (!$this->smarty->allow_php_templates) {
+            throw new SmartyException("PHP templates are disabled");
+        } 
+        if ($this->getTemplateFilepath($_smarty_template) === false) {
+            throw new SmartyException("Unable to load template \"{$_smarty_template->resource_type} : {$_smarty_template->resource_name}\"");
+        } 
+        // prepare variables
+        $_smarty_ptr = $_smarty_template;
+        do {
+            foreach ($_smarty_ptr->tpl_vars as $_smarty_var => $_smarty_var_object) {
+                if (isset($_smarty_var_object->value)) {
+                    $$_smarty_var = $_smarty_var_object->value;
+                } 
+            } 
+            $_smarty_ptr = $_smarty_ptr->parent;
+        } while ($_smarty_ptr != null);
+        unset ($_smarty_var, $_smarty_var_object, $_smarty_ptr); 
+        // include PHP template
+        include($this->getTemplateFilepath($_smarty_template));
+        return;
+    } 
+} 
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_resource_registered.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_resource_registered.php
new file mode 100644
index 0000000..467da11
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_resource_registered.php
@@ -0,0 +1,143 @@
+<?php
+
+/**
+ * Smarty Internal Plugin Resource Registered
+ * 
+ * Implements the registered resource for Smarty template
+ * 
+ * @package Smarty
+ * @subpackage TemplateResources
+ * @author Uwe Tews 
+ */
+ 
+/**
+ * Smarty Internal Plugin Resource Registered
+ */
+class Smarty_Internal_Resource_Registered {
+    public function __construct($template, $resource_type = null)
+    {
+        $this->smarty = $template->smarty;
+        if (isset($resource_type)) {
+        	$template->smarty->registerResource($resource_type,
+        		array("smarty_resource_{$resource_type}_source",
+            		"smarty_resource_{$resource_type}_timestamp",
+                	"smarty_resource_{$resource_type}_secure",
+                	"smarty_resource_{$resource_type}_trusted"));
+        }
+    } 
+    // classes used for compiling Smarty templates from file resource
+    public $compiler_class = 'Smarty_Internal_SmartyTemplateCompiler';
+    public $template_lexer_class = 'Smarty_Internal_Templatelexer';
+    public $template_parser_class = 'Smarty_Internal_Templateparser';
+    // properties
+    public $usesCompiler = true;
+    public $isEvaluated = false;
+
+    /**
+     * Return flag if template source is existing
+     * 
+     * @return boolean true
+     */
+    public function isExisting($_template)
+    {
+        if (is_integer($_template->getTemplateTimestamp())) {
+            return true;
+        } else {
+            return false;
+        } 
+    } 
+    /**
+     * Get filepath to template source
+     * 
+     * @param object $_template template object
+     * @return string return 'string' as template source is not a file
+     */
+    public function getTemplateFilepath($_template)
+    { 
+        $_filepath = $_template->resource_type .':'.$_template->resource_name;
+        $_template->templateUid = sha1($_filepath);
+        return $_filepath;
+    } 
+
+    /**
+     * Get timestamp of template source
+     * 
+     * @param object $_template template object
+     * @return int  timestamp
+     */
+    public function getTemplateTimestamp($_template)
+    { 
+        // return timestamp
+        $time_stamp = false;
+        call_user_func_array($this->smarty->registered_resources[$_template->resource_type][0][1],
+            array($_template->resource_name, &$time_stamp, $this->smarty));
+        return is_numeric($time_stamp) ? (int)$time_stamp : $time_stamp;
+    }
+     
+    /**
+     * Get timestamp of template source by type and name
+     * 
+     * @param object $_template template object
+     * @return int  timestamp
+     */
+    public function getTemplateTimestampTypeName($_resource_type, $_resource_name)
+    { 
+        // return timestamp
+        $time_stamp = false;
+        call_user_func_array($this->smarty->registered_resources[$_resource_type][0][1],
+            array($_resource_name, &$time_stamp, $this->smarty));
+        return is_numeric($time_stamp) ? (int)$time_stamp : $time_stamp;
+    } 
+
+    /**
+     * Retuen template source from resource name
+     * 
+     * @param object $_template template object
+     * @return string content of template source
+     */
+    public function getTemplateSource($_template)
+    { 
+        // return template string
+        return call_user_func_array($this->smarty->registered_resources[$_template->resource_type][0][0],
+            array($_template->resource_name, &$_template->template_source, $this->smarty));
+    } 
+
+    /**
+     * Get filepath to compiled template
+     * 
+     * @param object $_template template object
+     * @return boolean return false as compiled template is not stored
+     */
+    public function getCompiledFilepath($_template)
+    { 
+        $_compile_id =  isset($_template->compile_id) ? preg_replace('![^\w\|]+!','_',$_template->compile_id) : null;
+        // calculate Uid if not already done
+        if ($_template->templateUid == '') {
+            $_template->getTemplateFilepath();
+        } 
+        $_filepath = $_template->templateUid; 
+        // if use_sub_dirs, break file into directories
+        if ($_template->smarty->use_sub_dirs) {
+            $_filepath = substr($_filepath, 0, 2) . DS
+             . substr($_filepath, 2, 2) . DS
+             . substr($_filepath, 4, 2) . DS
+             . $_filepath;
+        } 
+        $_compile_dir_sep = $_template->smarty->use_sub_dirs ? DS : '^';
+        if (isset($_compile_id)) {
+            $_filepath = $_compile_id . $_compile_dir_sep . $_filepath;
+        } 
+        if ($_template->caching) {
+            $_cache = '.cache';
+        } else {
+            $_cache = '';
+        } 
+        $_compile_dir = $_template->smarty->compile_dir;
+        if (strpos('/\\', substr($_compile_dir, -1)) === false) {
+            $_compile_dir .= DS;
+        } 
+        return $_compile_dir . $_filepath . '.' . $_template->resource_type . '.' . basename($_template->resource_name) . $_cache . '.php';
+    } 
+} 
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_resource_stream.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_resource_stream.php
new file mode 100644
index 0000000..de2996e
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_resource_stream.php
@@ -0,0 +1,99 @@
+<?php
+
+/**
+ * Smarty Internal Plugin Resource Stream
+ * 
+ * Implements the streams as resource for Smarty template
+ * 
+ * @package Smarty
+ * @subpackage TemplateResources
+ * @author Uwe Tews 
+ */
+ 
+/**
+ * Smarty Internal Plugin Resource Stream
+ */
+class Smarty_Internal_Resource_Stream {
+    public function __construct($smarty)
+    {
+        $this->smarty = $smarty;
+    } 
+    // classes used for compiling Smarty templates from file resource
+    public $compiler_class = 'Smarty_Internal_SmartyTemplateCompiler';
+    public $template_lexer_class = 'Smarty_Internal_Templatelexer';
+    public $template_parser_class = 'Smarty_Internal_Templateparser';
+    // properties
+    public $usesCompiler = true;
+    public $isEvaluated = true;
+
+    /**
+     * Return flag if template source is existing
+     * 
+     * @return boolean true
+     */
+    public function isExisting($template)
+    {
+        if ($template->getTemplateSource() == '') {
+            return false;
+        } else {
+            return true;
+        } 
+    } 
+    /**
+     * Get filepath to template source
+     * 
+     * @param object $_template template object
+     * @return string return 'string' as template source is not a file
+     */
+    public function getTemplateFilepath($_template)
+    { 
+        // no filepath for strings
+        // return resource name for compiler error messages
+        return str_replace(':', '://', $_template->template_resource);
+    } 
+
+    /**
+     * Get timestamp to template source
+     * 
+     * @param object $_template template object
+     * @return boolean false as string resources have no timestamp
+     */
+    public function getTemplateTimestamp($_template)
+    { 
+        // strings must always be compiled and have no timestamp
+        return false;
+    } 
+
+    /**
+     * Retuen template source from resource name
+     * 
+     * @param object $_template template object
+     * @return string content of template source
+     */
+    public function getTemplateSource($_template)
+    { 
+        // return template string
+        $_template->template_source = '';
+        $fp = fopen(str_replace(':', '://', $_template->template_resource),'r+');
+        while (!feof($fp)) {
+            $_template->template_source .= fgets($fp);
+        } 
+        fclose($fp);
+
+        return true;
+    } 
+
+    /**
+     * Get filepath to compiled template
+     * 
+     * @param object $_template template object
+     * @return boolean return false as compiled template is not stored
+     */
+    public function getCompiledFilepath($_template)
+    { 
+        // no filepath for strings
+        return false;
+    } 
+} 
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_resource_string.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_resource_string.php
new file mode 100644
index 0000000..9368f04
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_resource_string.php
@@ -0,0 +1,133 @@
+<?php
+
+/**
+ * Smarty Internal Plugin Resource String
+ * 
+ * Implements the strings as resource for Smarty template
+ * 
+ * @package Smarty
+ * @subpackage TemplateResources
+ * @author Uwe Tews 
+ */
+ 
+/**
+ * Smarty Internal Plugin Resource String
+ */
+class Smarty_Internal_Resource_String {
+    public function __construct($smarty)
+    {
+        $this->smarty = $smarty;
+    } 
+    // classes used for compiling Smarty templates from file resource
+    public $compiler_class = 'Smarty_Internal_SmartyTemplateCompiler';
+    public $template_lexer_class = 'Smarty_Internal_Templatelexer';
+    public $template_parser_class = 'Smarty_Internal_Templateparser';
+    // properties
+    public $usesCompiler = true;
+    public $isEvaluated = false;
+
+    /**
+     * Return flag if template source is existing
+     * 
+     * @return boolean true
+     */
+    public function isExisting($template)
+    {
+        return true;
+    } 
+
+    /**
+     * Get filepath to template source
+     * 
+     * @param object $_template template object
+     * @return string return 'string' as template source is not a file
+     */
+    public function getTemplateFilepath($_template)
+    { 
+        $_template->templateUid = sha1($_template->resource_name);
+        // no filepath for strings
+        // return "string" for compiler error messages
+        return 'string:';
+    } 
+
+    /**
+     * Get timestamp to template source
+     * 
+     * @param object $_template template object
+     * @return boolean false as string resources have no timestamp
+     */
+    public function getTemplateTimestamp($_template)
+    { 
+        if ($this->isEvaluated) {
+        	//must always be compiled and have no timestamp
+        	return false;
+        } else {
+        	return 0;
+        }
+    } 
+
+    /**
+     * Get timestamp of template source by type and name
+     * 
+     * @param object $_template template object
+     * @return int  timestamp (always 0)
+     */
+    public function getTemplateTimestampTypeName($_resource_type, $_resource_name)
+    { 
+        // return timestamp 0
+        return 0;
+    } 
+
+
+    /**
+     * Retuen template source from resource name
+     * 
+     * @param object $_template template object
+     * @return string content of template source
+     */
+    public function getTemplateSource($_template)
+    { 
+        // return template string
+        $_template->template_source = $_template->resource_name;
+        return true;
+    } 
+
+    /**
+     * Get filepath to compiled template
+     * 
+     * @param object $_template template object
+     * @return boolean return false as compiled template is not stored
+     */
+    public function getCompiledFilepath($_template)
+    {
+        $_compile_id = isset($_template->compile_id) ? preg_replace('![^\w\|]+!', '_', $_template->compile_id) : null;
+        // calculate Uid if not already done
+        if ($_template->templateUid == '') {
+            $_template->getTemplateFilepath();
+        } 
+        $_filepath = $_template->templateUid; 
+        // if use_sub_dirs, break file into directories
+        if ($_template->smarty->use_sub_dirs) {
+            $_filepath = substr($_filepath, 0, 2) . DS
+             . substr($_filepath, 2, 2) . DS
+             . substr($_filepath, 4, 2) . DS
+             . $_filepath;
+        } 
+        $_compile_dir_sep = $_template->smarty->use_sub_dirs ? DS : '^';
+        if (isset($_compile_id)) {
+            $_filepath = $_compile_id . $_compile_dir_sep . $_filepath;
+        } 
+        if ($_template->caching) {
+            $_cache = '.cache';
+        } else {
+            $_cache = '';
+        } 
+        $_compile_dir = $_template->smarty->compile_dir;
+        if (strpos('/\\', substr($_compile_dir, -1)) === false) {
+            $_compile_dir .= DS;
+        } 
+        return $_compile_dir . $_filepath . '.' . $_template->resource_type . $_cache . '.php';
+    } 
+} 
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_smartytemplatecompiler.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_smartytemplatecompiler.php
new file mode 100644
index 0000000..dcc89c6
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_smartytemplatecompiler.php
@@ -0,0 +1,72 @@
+<?php
+
+/**
+ * Smarty Internal Plugin Smarty Template Compiler Base
+ * 
+ * This file contains the basic classes and methodes for compiling Smarty templates with lexer/parser
+ * 
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews 
+ */
+
+require_once("smarty_internal_parsetree.php");
+
+/**
+ * Class SmartyTemplateCompiler
+ */
+class Smarty_Internal_SmartyTemplateCompiler extends Smarty_Internal_TemplateCompilerBase {
+    // array of vars which can be compiled in local scope
+    public $local_var = array();
+    /**
+     * Initialize compiler
+     */
+    public function __construct($lexer_class, $parser_class, $smarty)
+    {
+        $this->smarty = $smarty;
+        parent::__construct(); 
+        // get required plugins
+        $this->lexer_class = $lexer_class;
+        $this->parser_class = $parser_class;
+    } 
+
+    /**
+     * Methode to compile a Smarty template
+     * 
+     * @param  $_content template source
+     * @return bool true if compiling succeeded, false if it failed
+     */
+    protected function doCompile($_content)
+    {
+        /* here is where the compiling takes place. Smarty
+       tags in the templates are replaces with PHP code,
+       then written to compiled files. */ 
+        // init the lexer/parser to compile the template
+        $this->lex = new $this->lexer_class($_content, $this);
+        $this->parser = new $this->parser_class($this->lex, $this);
+        if (isset($this->smarty->_parserdebug)) $this->parser->PrintTrace(); 
+        // get tokens from lexer and parse them
+        while ($this->lex->yylex() && !$this->abort_and_recompile) {
+            if (isset($this->smarty->_parserdebug)) echo "<pre>Line {$this->lex->line} Parsing  {$this->parser->yyTokenName[$this->lex->token]} Token " . htmlentities($this->lex->value) . "</pre>";
+            $this->parser->doParse($this->lex->token, $this->lex->value);
+        } 
+
+        if ($this->abort_and_recompile) {
+            // exit here on abort
+            return false;
+        } 
+        // finish parsing process
+        $this->parser->doParse(0, 0); 
+        // check for unclosed tags
+        if (count($this->_tag_stack) > 0) {
+            // get stacked info
+            list($_open_tag, $_data) = array_pop($this->_tag_stack);
+            $this->trigger_template_error("unclosed {" . $_open_tag . "} tag");
+        } 
+        // return compiled code
+        // return str_replace(array("? >\n<?php","? ><?php"), array('',''), $this->parser->retvalue);
+        return $this->parser->retvalue;
+    } 
+} 
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_template.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_template.php
new file mode 100644
index 0000000..070fb84
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_template.php
@@ -0,0 +1,998 @@
+<?php
+
+/**
+ * Smarty Internal Plugin Template
+ * 
+ * This file contains the Smarty template engine
+ * 
+ * @package Smarty
+ * @subpackage Templates
+ * @author Uwe Tews 
+ */
+
+/**
+ * Main class with template data structures and methods
+ */
+class Smarty_Internal_Template extends Smarty_Internal_Data {
+    // object cache
+    public $compiler_object = null;
+    public $cacher_object = null; 
+    // Smarty parameter
+    public $cache_id = null;
+    public $compile_id = null;
+    public $caching = null;
+    public $cache_lifetime = null;
+    public $cacher_class = null;
+    public $caching_type = null;
+    public $forceNocache = false; 
+    // Template resource
+    public $template_resource = null;
+    public $resource_type = null;
+    public $resource_name = null;
+//    public $resource_object = null;
+    private $isExisting = null;
+    public $templateUid = ''; 
+    // Template source
+    public $template_filepath = null;
+    public $template_source = null;
+    private $template_timestamp = null; 
+    // Compiled template
+    private $compiled_filepath = null;
+    public $compiled_template = null;
+    private $compiled_timestamp = null;
+    public $mustCompile = null;
+    public $suppressHeader = false;
+    public $suppressFileDependency = false;
+    public $has_nocache_code = false; 
+    public $write_compiled_code = true; 
+    // Rendered content
+    public $rendered_content = null; 
+    // Cache file
+    private $cached_filepath = null;
+    public $cached_timestamp = null;
+    private $isCached = null;
+//    private $cache_resource_object = null;
+    private $cacheFileChecked = false; 
+    // template variables
+    public $tpl_vars = array();
+    public $parent = null;
+    public $config_vars = array(); 
+    // storage for plugin
+    public $plugin_data = array(); 
+    // special properties
+    public $properties = array ('file_dependency' => array(),
+        'nocache_hash' => '',
+        'function' => array()); 
+    // required plugins
+    public $required_plugins = array('compiled' => array(), 'nocache' => array());
+    public $saved_modifier = null;
+    public $smarty = null;
+    // blocks for template inheritance
+    public $block_data = array();
+    public $wrapper = null;
+    /**
+     * Create template data object
+     * 
+     * Some of the global Smarty settings copied to template scope
+     * It load the required template resources and cacher plugins
+     * 
+     * @param string $template_resource template resource string
+     * @param object $_parent back pointer to parent object with variables or null
+     * @param mixed $_cache_id cache id or null
+     * @param mixed $_compile_id compile id or null
+     */
+    public function __construct($template_resource, $smarty, $_parent = null, $_cache_id = null, $_compile_id = null, $_caching = null, $_cache_lifetime = null)
+    {
+        $this->smarty = &$smarty; 
+        // Smarty parameter
+        $this->cache_id = $_cache_id === null ? $this->smarty->cache_id : $_cache_id;
+        $this->compile_id = $_compile_id === null ? $this->smarty->compile_id : $_compile_id;
+        $this->caching = $_caching === null ? $this->smarty->caching : $_caching;
+        if ($this->caching === true) $this->caching =  Smarty::CACHING_LIFETIME_CURRENT;
+        $this->cache_lifetime = $_cache_lifetime === null ?$this->smarty->cache_lifetime : $_cache_lifetime;
+        $this->parent = $_parent; 
+        // dummy local smarty variable
+        $this->tpl_vars['smarty'] = new Smarty_Variable; 
+        // Template resource
+        $this->template_resource = $template_resource; 
+        // copy block data of template inheritance
+        if ($this->parent instanceof Smarty_Internal_Template) {
+        	$this->block_data = $this->parent->block_data;
+        }
+ 
+    } 
+
+    /**
+     * Returns the template filepath
+     * 
+     * The template filepath is determined by the actual resource handler
+     * 
+     * @return string the template filepath
+     */
+    public function getTemplateFilepath ()
+    {
+        return $this->template_filepath === null ?
+        $this->template_filepath = $this->resource_object->getTemplateFilepath($this) :
+        $this->template_filepath;
+    } 
+
+    /**
+     * Returns the timpestamp of the template source
+     * 
+     * The template timestamp is determined by the actual resource handler
+     * 
+     * @return integer the template timestamp
+     */
+    public function getTemplateTimestamp ()
+    {
+        return $this->template_timestamp === null ?
+        $this->template_timestamp = $this->resource_object->getTemplateTimestamp($this) :
+        $this->template_timestamp;
+    } 
+
+    /**
+     * Returns the template source code
+     * 
+     * The template source is being read by the actual resource handler
+     * 
+     * @return string the template source
+     */
+    public function getTemplateSource ()
+    {
+        if ($this->template_source === null) {
+            if (!$this->resource_object->getTemplateSource($this)) {
+                throw new SmartyException("Unable to read template {$this->resource_type} '{$this->resource_name}'");
+            } 
+        } 
+        return $this->template_source;
+    } 
+
+    /**
+     * Returns if the  template is existing
+     * 
+     * The status is determined by the actual resource handler
+     * 
+     * @return boolean true if the template exists
+     */
+    public function isExisting ($error = false)
+    {
+        if ($this->isExisting === null) {
+            $this->isExisting = $this->resource_object->isExisting($this);
+        } 
+        if (!$this->isExisting && $error) {
+            throw new SmartyException("Unable to load template {$this->resource_type} '{$this->resource_name}'");
+        } 
+        return $this->isExisting;
+    } 
+
+    /**
+     * Returns if the current template must be compiled by the Smarty compiler
+     * 
+     * It does compare the timestamps of template source and the compiled templates and checks the force compile configuration
+     * 
+     * @return boolean true if the template must be compiled
+     */
+    public function mustCompile ()
+    {
+        $this->isExisting(true);
+        if ($this->mustCompile === null) {
+            $this->mustCompile = ($this->resource_object->usesCompiler && ($this->smarty->force_compile || $this->resource_object->isEvaluated || $this->getCompiledTimestamp () === false || 
+                    // ($this->smarty->compile_check && $this->getCompiledTimestamp () !== $this->getTemplateTimestamp ())));
+                    ($this->smarty->compile_check && $this->getCompiledTimestamp () < $this->getTemplateTimestamp ())));
+        } 
+        return $this->mustCompile;
+    } 
+
+    /**
+     * Returns the compiled template filepath
+     * 
+     * @return string the template filepath
+     */
+    public function getCompiledFilepath ()
+    {
+        return $this->compiled_filepath === null ?
+        ($this->compiled_filepath = !$this->resource_object->isEvaluated ? $this->resource_object->getCompiledFilepath($this) : false) :
+        $this->compiled_filepath;
+    } 
+
+    /**
+     * Returns the timpestamp of the compiled template
+     * 
+     * @return integer the template timestamp
+     */
+    public function getCompiledTimestamp ()
+    {
+        return $this->compiled_timestamp === null ?
+        ($this->compiled_timestamp = (!$this->resource_object->isEvaluated && file_exists($this->getCompiledFilepath())) ? filemtime($this->getCompiledFilepath()) : false) :
+        $this->compiled_timestamp;
+    } 
+
+    /**
+     * Returns the compiled template 
+     * 
+     * It checks if the template must be compiled or just read from the template resource
+     * 
+     * @return string the compiled template
+     */
+    public function getCompiledTemplate ()
+    {
+        if ($this->compiled_template === null) {
+            // see if template needs compiling.
+            if ($this->mustCompile()) {
+                $this->compileTemplateSource();
+            } else {
+                if ($this->compiled_template === null) {
+                    $this->compiled_template = !$this->resource_object->isEvaluated && $this->resource_object->usesCompiler ? file_get_contents($this->getCompiledFilepath()) : false;
+                } 
+            } 
+        } 
+        return $this->compiled_template;
+    } 
+
+    /**
+     * Compiles the template
+     * 
+     * If the template is not evaluated the compiled template is saved on disk
+     */
+    public function compileTemplateSource ()
+    {
+        if (!$this->resource_object->isEvaluated) {
+            $this->properties['file_dependency'] = array();
+            $this->properties['file_dependency'][$this->templateUid] = array($this->getTemplateFilepath(), $this->getTemplateTimestamp(),$this->resource_type);
+        } 
+        if ($this->smarty->debugging) {
+            Smarty_Internal_Debug::start_compile($this);
+        } 
+        // compile template
+        if (!is_object($this->compiler_object)) {
+            // load compiler
+            $this->smarty->loadPlugin($this->resource_object->compiler_class);
+            $this->compiler_object = new $this->resource_object->compiler_class($this->resource_object->template_lexer_class, $this->resource_object->template_parser_class, $this->smarty);
+        } 
+        // compile locking
+        if ($this->smarty->compile_locking && !$this->resource_object->isEvaluated) {
+            if ($saved_timestamp = $this->getCompiledTimestamp()) {
+                touch($this->getCompiledFilepath());
+            } 
+        } 
+        // call compiler
+        try {
+            $this->compiler_object->compileTemplate($this);
+        } 
+        catch (Exception $e) {
+            // restore old timestamp in case of error
+            if ($this->smarty->compile_locking && !$this->resource_object->isEvaluated && $saved_timestamp) {
+                touch($this->getCompiledFilepath(), $saved_timestamp);
+            } 
+            throw $e;
+        } 
+        // compiling succeded
+        if (!$this->resource_object->isEvaluated && $this->write_compiled_code) {
+            // write compiled template
+            Smarty_Internal_Write_File::writeFile($this->getCompiledFilepath(), $this->compiled_template, $this->smarty);
+        } 
+        if ($this->smarty->debugging) {
+            Smarty_Internal_Debug::end_compile($this);
+        }
+        // release objects to free memory
+		Smarty_Internal_TemplateCompilerBase::$_tag_objects = array();	
+        unset($this->compiler_object->parser->root_buffer,
+        	$this->compiler_object->parser->current_buffer,
+        	$this->compiler_object->parser,
+        	$this->compiler_object->lex,
+        	$this->compiler_object->template,
+        	$this->compiler_object
+        	); 
+    } 
+
+    /**
+     * Returns the filepath of the cached template output
+     * 
+     * The filepath is determined by the actual cache resource
+     * 
+     * @return string the cache filepath
+     */
+    public function getCachedFilepath ()
+    {
+        return $this->cached_filepath === null ?
+        $this->cached_filepath = ($this->resource_object->isEvaluated || !($this->caching == Smarty::CACHING_LIFETIME_CURRENT || $this->caching == Smarty::CACHING_LIFETIME_SAVED)) ? false : $this->cache_resource_object->getCachedFilepath($this) :
+        $this->cached_filepath;
+    } 
+
+    /**
+     * Returns the timpestamp of the cached template output
+     * 
+     * The timestamp is determined by the actual cache resource
+     * 
+     * @return integer the template timestamp
+     */
+    public function getCachedTimestamp ()
+    {
+        return $this->cached_timestamp === null ?
+        $this->cached_timestamp = ($this->resource_object->isEvaluated || !($this->caching == Smarty::CACHING_LIFETIME_CURRENT || $this->caching == Smarty::CACHING_LIFETIME_SAVED)) ? false : $this->cache_resource_object->getCachedTimestamp($this) :
+        $this->cached_timestamp;
+    } 
+
+    /**
+     * Returns the cached template output
+     * 
+     * @return string |booelan the template content or false if the file does not exist
+     */
+    public function getCachedContent ()
+    {
+        return $this->rendered_content === null ?
+        $this->rendered_content = ($this->resource_object->isEvaluated || !($this->caching == Smarty::CACHING_LIFETIME_CURRENT || $this->caching == Smarty::CACHING_LIFETIME_SAVED)) ? false : $this->cache_resource_object->getCachedContents($this) :
+        $this->rendered_content;
+    } 
+
+    /**
+     * Writes the cached template output
+     */
+    public function writeCachedContent ($content)
+    {
+        if ($this->resource_object->isEvaluated || !($this->caching == Smarty::CACHING_LIFETIME_CURRENT || $this->caching == Smarty::CACHING_LIFETIME_SAVED)) {
+            // don't write cache file
+            return false;
+        } 
+        $this->properties['cache_lifetime'] = $this->cache_lifetime;
+        return $this->cache_resource_object->writeCachedContent($this, $this->createPropertyHeader(true) .$content);
+    } 
+
+    /**
+     * Checks of a valid version redered HTML output is in the cache
+     * 
+     * If the cache is valid the contents is stored in the template object
+     * 
+     * @return boolean true if cache is valid
+     */
+    public function isCached ($template = null, $cache_id = null, $compile_id = null, $parent = null)
+    {
+    	if ($template === null) {    		
+ 			$no_render = true;
+ 		} elseif ($template === false) {
+			$no_render = false;
+  		} else {
+  			if ($parent === null) {
+  				$parent = $this;
+  			}
+			$this->smarty->isCached ($template, $cache_id, $compile_id, $parent);
+  		}
+        if ($this->isCached === null) {
+            $this->isCached = false;
+            if (($this->caching == Smarty::CACHING_LIFETIME_CURRENT || $this->caching == Smarty::CACHING_LIFETIME_SAVED) && !$this->resource_object->isEvaluated) {
+                $cachedTimestamp = $this->getCachedTimestamp();
+                if ($cachedTimestamp === false || $this->smarty->force_compile || $this->smarty->force_cache) {
+                    return $this->isCached;
+                } 
+                if ($this->caching === Smarty::CACHING_LIFETIME_SAVED || ($this->caching == Smarty::CACHING_LIFETIME_CURRENT && (time() <= ($cachedTimestamp + $this->cache_lifetime) || $this->cache_lifetime < 0))) {
+                    if ($this->smarty->debugging) {
+                        Smarty_Internal_Debug::start_cache($this);
+                    } 
+                    $this->rendered_content = $this->cache_resource_object->getCachedContents($this, $no_render);
+                    if ($this->smarty->debugging) {
+                        Smarty_Internal_Debug::end_cache($this);
+                    } 
+                    if ($this->cacheFileChecked) {
+                        $this->isCached = true;
+                        return $this->isCached;
+                    } 
+                    $this->cacheFileChecked = true;
+                    if ($this->caching === Smarty::CACHING_LIFETIME_SAVED && $this->properties['cache_lifetime'] >= 0 && (time() > ($this->getCachedTimestamp() + $this->properties['cache_lifetime']))) {
+                        $this->tpl_vars = array();
+                        $this->rendered_content = null;
+                        return $this->isCached;
+                    } 
+                    if (!empty($this->properties['file_dependency']) && $this->smarty->compile_check) {
+                        $resource_type = null;
+                        $resource_name = null;
+                        foreach ($this->properties['file_dependency'] as $_file_to_check) {
+                            If ($_file_to_check[2] == 'file' || $_file_to_check[2] == 'extends' || $_file_to_check[2] == 'php') {
+                                $mtime = filemtime($_file_to_check[0]);
+                            } else {
+                                $this->getResourceTypeName($_file_to_check[0], $resource_type, $resource_name);
+                                $resource_handler = $this->loadTemplateResourceHandler($resource_type);
+                                $mtime = $resource_handler->getTemplateTimestampTypeName($resource_type, $resource_name);
+                            } 
+                            // If ($mtime > $this->getCachedTimestamp()) {
+                            If ($mtime > $_file_to_check[1]) {
+                                $this->tpl_vars = array();
+                                $this->rendered_content = null;
+                                return $this->isCached;
+                            } 
+                        } 
+                    } 
+                    $this->isCached = true;
+                } 
+            } 
+        } 
+        return $this->isCached;
+    } 
+
+    /**
+     * Render the output using the compiled template or the PHP template source
+     * 
+     * The rendering process is accomplished by just including the PHP files.
+     * The only exceptions are evaluated templates (string template). Their code has 
+     * to be evaluated
+     */
+    public function renderTemplate ()
+    {
+        if ($this->resource_object->usesCompiler) {
+            if ($this->mustCompile() && $this->compiled_template === null) {
+                $this->compileTemplateSource();
+            } 
+            if ($this->smarty->debugging) {
+                Smarty_Internal_Debug::start_render($this);
+            } 
+            $_smarty_tpl = $this;
+            ob_start();
+            if ($this->resource_object->isEvaluated) {
+                eval("?>" . $this->compiled_template);
+            } else {
+                include($this->getCompiledFilepath ()); 
+                // check file dependencies at compiled code
+                if ($this->smarty->compile_check) {
+                    if (!empty($this->properties['file_dependency'])) {
+                        $this->mustCompile = false;
+                        $resource_type = null;
+                        $resource_name = null;
+                        foreach ($this->properties['file_dependency'] as $_file_to_check) {
+                            If ($_file_to_check[2] == 'file' || $_file_to_check[2] == 'extends' || $_file_to_check[2] == 'php') {
+                                $mtime = filemtime($_file_to_check[0]);
+                            } else {
+                            	$this->getResourceTypeName($_file_to_check[0], $resource_type, $resource_name);
+                                $resource_handler = $this->loadTemplateResourceHandler($resource_type);
+                                $mtime = $resource_handler->getTemplateTimestampTypeName($resource_type, $resource_name);
+                            } 
+                            // If ($mtime != $_file_to_check[1]) {
+                            If ($mtime > $_file_to_check[1]) {
+                                $this->mustCompile = true;
+                                break;
+                            } 
+                        } 
+                        if ($this->mustCompile) {
+                            // recompile and render again
+                            ob_get_clean();
+                            $this->compileTemplateSource();
+                            ob_start();
+                            include($this->getCompiledFilepath ());
+                        } 
+                    } 
+                } 
+            } 
+        } else {
+            if (is_callable(array($this->resource_object, 'renderUncompiled'))) {
+                if ($this->smarty->debugging) {
+                    Smarty_Internal_Debug::start_render($this);
+                } 
+                ob_start();
+                $this->resource_object->renderUncompiled($this);
+            } else {
+                throw new SmartyException("Resource '$this->resource_type' must have 'renderUncompiled' methode");
+            } 
+        } 
+        $this->rendered_content = ob_get_clean();
+        if (!$this->resource_object->isEvaluated && empty($this->properties['file_dependency'][$this->templateUid])) {
+            $this->properties['file_dependency'][$this->templateUid] = array($this->getTemplateFilepath(), $this->getTemplateTimestamp(),$this->resource_type);
+        } 
+        if ($this->parent instanceof Smarty_Internal_Template) {
+            $this->parent->properties['file_dependency'] = array_merge($this->parent->properties['file_dependency'], $this->properties['file_dependency']);
+            foreach($this->required_plugins as $code => $tmp1) {
+                foreach($tmp1 as $name => $tmp) {
+                    foreach($tmp as $type => $data) {
+                        $this->parent->required_plugins[$code][$name][$type] = $data;
+                    } 
+                } 
+            } 
+        } 
+        if ($this->smarty->debugging) {
+            Smarty_Internal_Debug::end_render($this);
+        } 
+        // write to cache when nessecary
+        if (!$this->resource_object->isEvaluated && ($this->caching == Smarty::CACHING_LIFETIME_SAVED || $this->caching == Smarty::CACHING_LIFETIME_CURRENT)) {
+            if ($this->smarty->debugging) {
+                Smarty_Internal_Debug::start_cache($this);
+            } 
+            $this->properties['has_nocache_code'] = false; 
+            // get text between non-cached items
+            $cache_split = preg_split("!/\*%%SmartyNocache:{$this->properties['nocache_hash']}%%\*\/(.+?)/\*/%%SmartyNocache:{$this->properties['nocache_hash']}%%\*/!s", $this->rendered_content); 
+            // get non-cached items
+            preg_match_all("!/\*%%SmartyNocache:{$this->properties['nocache_hash']}%%\*\/(.+?)/\*/%%SmartyNocache:{$this->properties['nocache_hash']}%%\*/!s", $this->rendered_content, $cache_parts);
+            $output = ''; 
+            // loop over items, stitch back together
+            foreach($cache_split as $curr_idx => $curr_split) {
+                // escape PHP tags in template content
+                $output .= preg_replace('/(<%|%>|<\?php|<\?|\?>)/', '<?php echo \'$1\'; ?>', $curr_split);
+                if (isset($cache_parts[0][$curr_idx])) {
+                    $this->properties['has_nocache_code'] = true; 
+                    // remove nocache tags from cache output
+                    $output .= preg_replace("!/\*/?%%SmartyNocache:{$this->properties['nocache_hash']}%%\*/!", '', $cache_parts[0][$curr_idx]);
+                } 
+            } 
+            if (isset($this->smarty->autoload_filters['output']) || isset($this->smarty->registered_filters['output'])) {
+            	$output = Smarty_Internal_Filter_Handler::runFilter('output', $output, $this);
+        	}
+            // rendering (must be done before writing cache file because of {function} nocache handling)
+            $_smarty_tpl = $this;
+            ob_start();
+            eval("?>" . $output);
+            $this->rendered_content = ob_get_clean(); 
+            // write cache file content
+            $this->writeCachedContent('<?php if (!$no_render) {?>'. $output. '<?php } ?>');
+            if ($this->smarty->debugging) {
+                Smarty_Internal_Debug::end_cache($this);
+            } 
+        } else {
+            // var_dump('renderTemplate', $this->has_nocache_code, $this->template_resource, $this->properties['nocache_hash'], $this->parent->properties['nocache_hash'], $this->rendered_content);
+            if ($this->has_nocache_code && !empty($this->properties['nocache_hash']) && !empty($this->parent->properties['nocache_hash'])) {
+                // replace nocache_hash
+                $this->rendered_content = preg_replace("/{$this->properties['nocache_hash']}/", $this->parent->properties['nocache_hash'], $this->rendered_content);
+                $this->parent->has_nocache_code = $this->has_nocache_code;
+            } 
+        } 
+    } 
+
+    /**
+     * Returns the rendered HTML output 
+     * 
+     * If the cache is valid the cached content is used, otherwise
+     * the output is rendered from the compiled template or PHP template source
+     * 
+     * @return string rendered HTML output
+     */
+    public function getRenderedTemplate ()
+    { 
+        // disable caching for evaluated code
+        if ($this->resource_object->isEvaluated) {
+            $this->caching = false;
+        } 
+        // checks if template exists
+        $this->isExisting(true); 
+        // read from cache or render
+        if ($this->rendered_content === null) {
+        	if ($this->isCached) {
+        		if ($this->smarty->debugging) {
+            	Smarty_Internal_Debug::start_cache($this);
+            } 
+            $this->rendered_content = $this->cache_resource_object->getCachedContents($this, false);
+            if ($this->smarty->debugging) {
+            	Smarty_Internal_Debug::end_cache($this);
+            }
+          } 
+          if ($this->isCached === null) { 
+            $this->isCached(false); 
+          }
+          if (!$this->isCached) {          
+            // render template (not loaded and not in cache)
+            $this->renderTemplate();
+          }
+        } 
+        $this->updateParentVariables();
+        $this->isCached = null;
+        return $this->rendered_content;
+    } 
+
+    /**
+     * Parse a template resource in its name and type
+     * Load required resource handler
+     * 
+     * @param string $template_resource template resource specification
+     * @param string $resource_type return resource type
+     * @param string $resource_name return resource name
+     * @param object $resource_handler return resource handler object
+     */
+    public function parseResourceName($template_resource, &$resource_type, &$resource_name, &$resource_handler)
+    {
+        if (empty($template_resource))
+            return false;
+        $this->getResourceTypeName($template_resource, $resource_type, $resource_name);
+        $resource_handler = $this->loadTemplateResourceHandler($resource_type); 
+        // cache template object under a unique ID
+        // do not cache eval resources
+        if ($resource_type != 'eval') {
+            $this->smarty->template_objects[sha1($this->template_resource . $this->cache_id . $this->compile_id)] = $this;
+        } 
+        return true;
+    } 
+
+    /**
+     * get system filepath to template
+     */
+    public function buildTemplateFilepath ($file = null)
+    {
+        if ($file == null) {
+            $file = $this->resource_name;
+        }
+        // relative file name? 
+        if (!preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $file)) {
+	        foreach((array)$this->smarty->template_dir as $_template_dir) {
+           		if (strpos('/\\', substr($_template_dir, -1)) === false) {
+                	$_template_dir .= DS;
+            	} 
+            	$_filepath = $_template_dir . $file;
+            	if (file_exists($_filepath)) {
+                	return $_filepath;
+            	}
+        		if (!preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_template_dir)) {
+        			// try PHP include_path
+        			if (($_filepath = Smarty_Internal_Get_Include_Path::getIncludePath($_filepath)) !== false) {
+        				return $_filepath;
+        			}
+        		}
+       		}
+       	}
+        // try absolute filepath
+        if (file_exists($file)) return $file;
+        // no tpl file found
+        if (!empty($this->smarty->default_template_handler_func)) {
+            if (!is_callable($this->smarty->default_template_handler_func)) {
+                throw new SmartyException("Default template handler not callable");
+            } else {
+                $_return = call_user_func_array($this->smarty->default_template_handler_func,
+                    array($this->resource_type, $this->resource_name, &$this->template_source, &$this->template_timestamp, $this));
+                if (is_string($_return)) {
+                    return $_return;
+                } elseif ($_return === true) {
+                    return $file;
+                } 
+            } 
+        } 
+        return false;
+    } 
+
+    /**
+     * Update Smarty variables in other scopes
+     */
+    public function updateParentVariables ($scope = Smarty::SCOPE_LOCAL)
+    {
+        $has_root = false;
+        foreach ($this->tpl_vars as $_key => $_variable) {
+            $_variable_scope = $this->tpl_vars[$_key]->scope;
+            if ($scope == Smarty::SCOPE_LOCAL && $_variable_scope == Smarty::SCOPE_LOCAL) {
+                continue;
+            } 
+            if (isset($this->parent) && ($scope == Smarty::SCOPE_PARENT || $_variable_scope == Smarty::SCOPE_PARENT)) {
+                if (isset($this->parent->tpl_vars[$_key])) {
+                    // variable is already defined in parent, copy value
+                    $this->parent->tpl_vars[$_key]->value = $this->tpl_vars[$_key]->value;
+                } else {
+                    // create variable in parent
+                    $this->parent->tpl_vars[$_key] = clone $_variable;
+                    $this->parent->tpl_vars[$_key]->scope = Smarty::SCOPE_LOCAL;
+                } 
+            } 
+            if ($scope == Smarty::SCOPE_ROOT || $_variable_scope == Smarty::SCOPE_ROOT) {
+                if ($this->parent == null) {
+                    continue;
+                } 
+                if (!$has_root) {
+                    // find  root
+                    $root_ptr = $this;
+                    while ($root_ptr->parent != null) {
+                        $root_ptr = $root_ptr->parent;
+                        $has_root = true;
+                    } 
+                } 
+                if (isset($root_ptr->tpl_vars[$_key])) {
+                    // variable is already defined in root, copy value
+                    $root_ptr->tpl_vars[$_key]->value = $this->tpl_vars[$_key]->value;
+                } else {
+                    // create variable in root
+                    $root_ptr->tpl_vars[$_key] = clone $_variable;
+                    $root_ptr->tpl_vars[$_key]->scope = Smarty::SCOPE_LOCAL;
+                } 
+            } 
+            if ($scope == Smarty::SCOPE_GLOBAL || $_variable_scope == Smarty::SCOPE_GLOBAL) {
+                if (isset(Smarty::$global_tpl_vars[$_key])) {
+                    // variable is already defined in root, copy value
+                    Smarty::$global_tpl_vars[$_key]->value = $this->tpl_vars[$_key]->value;
+                } else {
+                    // create global variable
+                   Smarty::$global_tpl_vars[$_key] = clone $_variable;
+                } 
+               Smarty::$global_tpl_vars[$_key]->scope = Smarty::SCOPE_LOCAL;
+            } 
+        } 
+    } 
+
+    /**
+     * Split a template resource in its name and type
+     * 
+     * @param string $template_resource template resource specification
+     * @param string $resource_type return resource type
+     * @param string $resource_name return resource name
+     */
+    protected function getResourceTypeName ($template_resource, &$resource_type, &$resource_name)
+    {
+        if (strpos($template_resource, ':') === false) {
+            // no resource given, use default
+            $resource_type = $this->smarty->default_resource_type;
+            $resource_name = $template_resource;
+        } else {
+            // get type and name from path
+            list($resource_type, $resource_name) = explode(':', $template_resource, 2);
+            if (strlen($resource_type) == 1) {
+                // 1 char is not resource type, but part of filepath
+                $resource_type = 'file';
+                $resource_name = $template_resource;
+            }
+        } 
+    } 
+
+    /**
+     * Load template resource handler by type
+     * 
+     * @param string $resource_type template resource type
+     * @return object resource handler object
+     */
+    protected function loadTemplateResourceHandler ($resource_type)
+    { 
+        // try registered resource
+        if (isset($this->smarty->registered_resources[$resource_type])) {
+            return new Smarty_Internal_Resource_Registered($this);
+        } else {
+            // try sysplugins dir
+            if (in_array($resource_type, array('file', 'string', 'extends', 'php', 'stream', 'eval'))) {
+                $_resource_class = 'Smarty_Internal_Resource_' . ucfirst($resource_type);
+                return new $_resource_class($this->smarty);
+            } else {
+                // try plugins dir
+                $_resource_class = 'Smarty_Resource_' . ucfirst($resource_type);
+                if ($this->smarty->loadPlugin($_resource_class)) {
+                    if (class_exists($_resource_class, false)) {
+                        return new $_resource_class($this->smarty);
+                    } else {
+                        return new Smarty_Internal_Resource_Registered($this, $resource_type);
+                    } 
+                } else {
+                    // try streams
+                    $_known_stream = stream_get_wrappers();
+                    if (in_array($resource_type, $_known_stream)) {
+                        // is known stream
+                        if (is_object($this->smarty->security_policy)) {
+                            $this->smarty->security_policy->isTrustedStream($resource_type);
+                        } 
+                        return new Smarty_Internal_Resource_Stream($this->smarty);
+                    } else {
+                        throw new SmartyException('Unkown resource type \'' . $resource_type . '\'');
+                    } 
+                } 
+            } 
+        } 
+    } 
+
+    /**
+     * Create property header
+     */
+    public function createPropertyHeader ($cache = false)
+    {
+        $plugins_string = ''; 
+        // include code for plugins
+        if (!$cache) {
+            if (!empty($this->required_plugins['compiled'])) {
+                $plugins_string = '<?php ';
+                foreach($this->required_plugins['compiled'] as $tmp) {
+                    foreach($tmp as $data) {
+                        $plugins_string .= "if (!is_callable('{$data['function']}')) include '{$data['file']}';\n";
+                    } 
+                } 
+                $plugins_string .= '?>';
+            } 
+            if (!empty($this->required_plugins['nocache'])) {
+                $this->has_nocache_code = true;
+                $plugins_string .= "<?php echo '/*%%SmartyNocache:{$this->properties['nocache_hash']}%%*/<?php ";
+                foreach($this->required_plugins['nocache'] as $tmp) {
+                    foreach($tmp as $data) {
+                        $plugins_string .= "if (!is_callable(\'{$data['function']}\')) include \'{$data['file']}\';\n";
+                    } 
+                } 
+                $plugins_string .= "?>/*/%%SmartyNocache:{$this->properties['nocache_hash']}%%*/';?>\n";
+            } 
+        } 
+        // build property code
+        $this->properties['has_nocache_code'] = $this->has_nocache_code;
+        $properties_string = "<?php /*%%SmartyHeaderCode:{$this->properties['nocache_hash']}%%*/" ;
+        if ($this->smarty->direct_access_security) {
+            $properties_string .= "if(!defined('SMARTY_DIR')) exit('no direct access allowed');\n";
+        } 
+        if ($cache) {
+            // remove compiled code of{function} definition
+            unset($this->properties['function']);
+            if (!empty($this->smarty->template_functions)) {
+                // copy code of {function} tags called in nocache mode
+                foreach ($this->smarty->template_functions as $name => $function_data) {
+                    if (isset($function_data['called_nocache'])) {
+                        unset($function_data['called_nocache'], $this->smarty->template_functions[$name]['called_nocache']);
+                        $this->properties['function'][$name] = $function_data;
+                    } 
+                } 
+            } 
+        } 
+        $properties_string .= "\$_smarty_tpl->decodeProperties(" . var_export($this->properties, true) . "); /*/%%SmartyHeaderCode%%*/?>\n";
+        return $properties_string . $plugins_string;
+    } 
+
+    /**
+     * Decode saved properties from compiled template and cache files
+     */
+    public function decodeProperties ($properties)
+    {
+        $this->has_nocache_code = $properties['has_nocache_code'];
+        $this->properties['nocache_hash'] = $properties['nocache_hash'];
+        if (isset($properties['cache_lifetime'])) {
+            $this->properties['cache_lifetime'] = $properties['cache_lifetime'];
+        } 
+        if (isset($properties['file_dependency'])) {
+            $this->properties['file_dependency'] = array_merge($this->properties['file_dependency'], $properties['file_dependency']);
+        } 
+        if (!empty($properties['function'])) {
+            $this->properties['function'] = array_merge($this->properties['function'], $properties['function']);
+            $this->smarty->template_functions = array_merge($this->smarty->template_functions, $properties['function']);
+        } 
+    } 
+
+    /**
+     * creates a local Smarty variable for array assignments
+     */
+    public function createLocalArrayVariable($tpl_var, $nocache = false, $scope = Smarty::SCOPE_LOCAL)
+    {
+        if (!isset($this->tpl_vars[$tpl_var])) {
+            $tpl_var_inst = $this->getVariable($tpl_var, null, true, false);
+            if ($tpl_var_inst instanceof Undefined_Smarty_Variable) {
+                $this->tpl_vars[$tpl_var] = new Smarty_variable(array(), $nocache, $scope);
+            } else {
+                $this->tpl_vars[$tpl_var] = clone $tpl_var_inst;
+                if ($scope != Smarty::SCOPE_LOCAL) {
+                    $this->tpl_vars[$tpl_var]->scope = $scope;
+                } 
+            } 
+        } 
+        if (!(is_array($this->tpl_vars[$tpl_var]->value) || $this->tpl_vars[$tpl_var]->value instanceof ArrayAccess)) {
+            settype($this->tpl_vars[$tpl_var]->value, 'array');
+        } 
+    } 
+
+    /**
+     * [util function] counts an array, arrayaccess/traversable or PDOStatement object
+     * @param mixed $value
+     * @return int the count for arrays and objects that implement countable, 1 for other objects that don't, and 0 for empty elements
+     */
+    public function _count($value)
+    {
+        if (is_array($value) === true || $value instanceof Countable) {
+            return count($value);
+        } elseif ($value instanceof Iterator) {
+            $value->rewind();
+            if ($value->valid()) {
+                return iterator_count($value);
+            }
+        } elseif ($value instanceof PDOStatement) {
+            return $value->rowCount();
+        } elseif ($value instanceof Traversable) {
+            return iterator_count($value);
+        } elseif ($value instanceof ArrayAccess) {
+            if ($value->offsetExists(0)) {
+                return 1;
+            }
+       } elseif (is_object($value)) {
+            return count($value);
+       }
+       return 0;
+    }
+
+    /**
+     * wrapper for fetch
+     */
+    public function fetch ($template = null, $cache_id = null, $compile_id = null, $parent = null, $display = false)
+    {
+ 		if ($template == null) {
+        	return $this->smarty->fetch($this);
+        } else {
+        	if (!isset($parent)) {
+        		$parent = $this;
+        	}
+         	return $this->smarty->fetch($template, $cache_id, $compile_id, $parent, $display);
+        }
+        
+    } 
+ 
+     /**
+     * wrapper for display
+     */
+    public function display ($template = null, $cache_id = null, $compile_id = null, $parent = null)
+    {
+ 		if ($template == null) {
+        	return $this->smarty->display($this);
+        } else {
+        	if (!isset($parent)) {
+        		$parent = $this;
+        	}
+       		return $this->smarty->display($template, $cache_id, $compile_id, $parent);
+        }
+       
+    } 
+
+    /**
+     * set Smarty property in template context      
+     * @param string $property_name property name
+     * @param mixed $value value
+     */
+    public function __set($property_name, $value)
+    {
+    	if ($property_name == 'resource_object' || $property_name == 'cache_resource_object') {
+    		$this->$property_name = $value;
+    	} elseif (property_exists($this->smarty, $property_name)) {
+    		$this->smarty->$property_name = $value;
+    	} else {
+        	throw new SmartyException("invalid template property '$property_name'.");
+        }
+    }
+
+    /**
+     * get Smarty property in template context      
+     * @param string $property_name property name
+     */
+    public function __get($property_name)
+    {
+    	if ($property_name == 'resource_object') {
+    		// load template resource
+    		$this->resource_object = null;
+        	if (!$this->parseResourceName ($this->template_resource, $this->resource_type, $this->resource_name, $this->resource_object)) {
+            	throw new SmartyException ("Unable to parse resource name \"{$template_resource}\"");
+        	}
+        	return $this->resource_object;
+        }
+        if ($property_name == 'cache_resource_object') { 
+        	// load cache resource
+            $this->cache_resource_object = $this->loadCacheResource();
+            return $this->cache_resource_object;
+    	}
+    	if (property_exists($this->smarty, $property_name)) {
+    		return $this->smarty->$property_name;
+    	} else {
+        	throw new SmartyException("template property '$property_name' does not exist.");
+        }
+    }
+
+
+    /**
+     * Takes unknown class methods and lazy loads sysplugin files for them
+     * class name format: Smarty_Method_MethodName
+     * plugin filename format: method.methodname.php
+     * 
+     * @param string $name unknown methode name
+     * @param array $args aurgument array
+     */
+    public function __call($name, $args)
+    {
+        static $camel_func;
+        if (!isset($camel_func))
+            $camel_func = create_function('$c', 'return "_" . strtolower($c[1]);'); 
+        // see if this is a set/get for a property
+        $first3 = strtolower(substr($name, 0, 3));
+        if (in_array($first3, array('set', 'get')) && substr($name, 3, 1) !== '_') {
+            // try to keep case correct for future PHP 6.0 case-sensitive class methods
+            // lcfirst() not available < PHP 5.3.0, so improvise
+            $property_name = strtolower(substr($name, 3, 1)) . substr($name, 4); 
+            // convert camel case to underscored name
+            $property_name = preg_replace_callback('/([A-Z])/', $camel_func, $property_name);
+    		if (property_exists($this, $property_name)) {
+            	if ($first3 == 'get')
+                	return $this->$property_name;
+            	else
+                	return $this->$property_name = $args[0];
+        	}
+        }
+        // Smarty Backward Compatible wrapper
+		if (strpos($name,'_') !== false) {
+        	if (!isset($this->wrapper)) {
+           	 $this->wrapper = new Smarty_Internal_Wrapper($this);
+        	} 
+        	return $this->wrapper->convert($name, $args);
+        }
+        // pass call to Smarty object 	
+        return call_user_func_array(array($this->smarty,$name),$args);
+    } 
+
+}
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_templatecompilerbase.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_templatecompilerbase.php
new file mode 100644
index 0000000..2a95eca
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_templatecompilerbase.php
@@ -0,0 +1,435 @@
+<?php
+/**
+ * Smarty Internal Plugin Smarty Template Compiler Base
+ * 
+ * This file contains the basic classes and methodes for compiling Smarty templates with lexer/parser
+ * 
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews 
+ */
+
+/**
+ * Main compiler class
+ */
+class Smarty_Internal_TemplateCompilerBase {
+    // hash for nocache sections
+    private $nocache_hash = null; 
+    // suppress generation of nocache code
+    public $suppressNocacheProcessing = false; 
+    // compile tag objects
+    static $_tag_objects = array(); 
+    // tag stack
+    public $_tag_stack = array(); 
+    // current template
+    public $template = null;
+    // optional log of tag/attributes
+    public $used_tags = array();
+
+    /**
+     * Initialize compiler
+     */
+    public function __construct()
+    {
+        $this->nocache_hash = str_replace('.', '-', uniqid(rand(), true));
+    } 
+
+    /**
+     * Methode to compile a Smarty template
+     * 
+     * @param  $template template object to compile
+     * @return bool true if compiling succeeded, false if it failed
+     */
+    public function compileTemplate($template)
+    {
+        if (empty($template->properties['nocache_hash'])) {
+            $template->properties['nocache_hash'] = $this->nocache_hash;
+        } else {
+            $this->nocache_hash = $template->properties['nocache_hash'];
+        } 
+        // flag for nochache sections
+        $this->nocache = false;
+        $this->tag_nocache = false; 
+        // save template object in compiler class
+        $this->template = $template;
+        $this->smarty->_current_file = $this->template->getTemplateFilepath(); 
+        // template header code
+        $template_header = '';
+        if (!$template->suppressHeader) {
+            $template_header .= "<?php /* Smarty version " . Smarty::SMARTY_VERSION . ", created on " . strftime("%Y-%m-%d %H:%M:%S") . "\n";
+            $template_header .= "         compiled from \"" . $this->template->getTemplateFilepath() . "\" */ ?>\n";
+        } 
+
+        do {
+            // flag for aborting current and start recompile
+            $this->abort_and_recompile = false; 
+            // get template source
+            $_content = $template->getTemplateSource(); 
+            // run prefilter if required
+            if (isset($this->smarty->autoload_filters['pre']) || isset($this->smarty->registered_filters['pre'])) {
+                $template->template_source = $_content = Smarty_Internal_Filter_Handler::runFilter('pre', $_content, $template);
+            } 
+            // on empty template just return header
+            if ($_content == '') {
+                if ($template->suppressFileDependency) {
+                    $template->compiled_template = '';
+                } else {
+                    $template->compiled_template = $template_header . $template->createPropertyHeader();
+                } 
+                return true;
+            } 
+            // call compiler
+            $_compiled_code = $this->doCompile($_content);
+        } while ($this->abort_and_recompile); 
+        // return compiled code to template object
+        if ($template->suppressFileDependency) {
+            $template->compiled_template = $_compiled_code;
+        } else {
+            $template->compiled_template = $template_header . $template->createPropertyHeader() . $_compiled_code;
+        } 
+        // run postfilter if required
+        if (isset($this->smarty->autoload_filters['post']) || isset($this->smarty->registered_filters['post'])) {
+            $template->compiled_template = Smarty_Internal_Filter_Handler::runFilter('post', $template->compiled_template, $template);
+        } 
+    } 
+
+    /**
+     * Compile Tag
+     * 
+     * This is a call back from the lexer/parser
+     * It executes the required compile plugin for the Smarty tag
+     * 
+     * @param string $tag tag name
+     * @param array $args array with tag attributes
+     * @param array $parameter array with compilation parameter
+     * @return string compiled code
+     */
+    public function compileTag($tag, $args, $parameter = array())
+    { 
+        // $args contains the attributes parsed and compiled by the lexer/parser
+        // assume that tag does compile into code, but creates no HTML output
+        $this->has_code = true;
+        $this->has_output = false;
+        // log tag/attributes
+        if (isset($this->smarty->get_used_tags) && $this->smarty->get_used_tags) {
+        	$this->used_tags[] = array($tag,$args);
+        } 
+		// check nocache option flag
+        if (in_array("'nocache'",$args) || in_array(array('nocache'=>'true'),$args)
+        		|| in_array(array('nocache'=>'"true"'),$args) || in_array(array('nocache'=>"'true'"),$args)) {
+        	$this->tag_nocache = true;
+        }
+        // compile the smarty tag (required compile classes to compile the tag are autoloaded)
+        if (($_output = $this->callTagCompiler($tag, $args, $parameter)) === false) {
+            if (isset($this->smarty->template_functions[$tag])) {
+                // template defined by {template} tag
+                $args['_attr']['name'] = "'" . $tag . "'";
+                $_output = $this->callTagCompiler('call', $args, $parameter);
+            } 
+        } 
+        if ($_output !== false) {
+            if ($_output !== true) {
+                // did we get compiled code
+                if ($this->has_code) {
+                    // Does it create output?
+                    if ($this->has_output) {
+                        $_output .= "\n";
+                    } 
+                    // return compiled code
+                    return $_output;
+                } 
+            } 
+            // tag did not produce compiled code
+            return '';
+        } else {
+            // map_named attributes
+            if (isset($args['_attr'])) {
+                foreach ($args['_attr'] as $key => $attribute) {
+                    if (is_array($attribute)) {
+                        $args = array_merge($args, $attribute);
+                    } 
+                } 
+            } 
+            // not an internal compiler tag
+            if (strlen($tag) < 6 || substr($tag, -5) != 'close') {
+                // check if tag is a registered object
+                if (isset($this->smarty->registered_objects[$tag]) && isset($parameter['object_methode'])) {
+                    $methode = $parameter['object_methode'];
+                    if (!in_array($methode, $this->smarty->registered_objects[$tag][3]) &&
+                            (empty($this->smarty->registered_objects[$tag][1]) || in_array($methode, $this->smarty->registered_objects[$tag][1]))) {
+                        return $this->callTagCompiler('private_object_function', $args, $parameter, $tag, $methode);
+                    } elseif (in_array($methode, $this->smarty->registered_objects[$tag][3])) {
+                        return $this->callTagCompiler('private_object_block_function', $args, $parameter, $tag, $methode);
+                    } else {
+                        return $this->trigger_template_error ('unallowed methode "' . $methode . '" in registered object "' . $tag . '"', $this->lex->taglineno);
+                    } 
+                } 
+                // check if tag is registered
+                foreach (array(Smarty::PLUGIN_COMPILER, Smarty::PLUGIN_FUNCTION, Smarty::PLUGIN_BLOCK) as $type) {
+                    if (isset($this->smarty->registered_plugins[$type][$tag])) {
+                        // if compiler function plugin call it now
+                        if ($type == Smarty::PLUGIN_COMPILER) {
+                            $new_args = array();
+                            foreach ($args as $mixed) {
+                                $new_args = array_merge($new_args, $mixed);
+                            } 
+                            if (!$this->smarty->registered_plugins[$type][$tag][1]) {
+                                $this->tag_nocache = true;
+                            } 
+                            $function = $this->smarty->registered_plugins[$type][$tag][0];
+                            if (!is_array($function)) {
+                                return $function($new_args, $this);
+                            } else if (is_object($function[0])) {
+                                return $this->smarty->registered_plugins[$type][$tag][0][0]->$function[1]($new_args, $this);
+                            } else {
+                                return call_user_func_array($this->smarty->registered_plugins[$type][$tag][0], array($new_args, $this));
+                            } 
+                        } 
+                        // compile registered function or block function
+                        if ($type == Smarty::PLUGIN_FUNCTION || $type == Smarty::PLUGIN_BLOCK) {
+                            return $this->callTagCompiler('private_registered_' . $type, $args, $parameter, $tag);
+                        } 
+                    } 
+                } 
+                // check plugins from plugins folder
+                foreach ($this->smarty->plugin_search_order as $plugin_type) {
+                    if ($plugin_type == Smarty::PLUGIN_BLOCK && $this->smarty->loadPlugin('smarty_compiler_' . $tag)) {
+                        $plugin = 'smarty_compiler_' . $tag;
+                        if (is_callable($plugin)) {
+                        	// convert arguments format for old compiler plugins
+                            $new_args = array();
+                            foreach ($args as $mixed) {
+                                $new_args = array_merge($new_args, $mixed);
+                            } 
+                            return $plugin($new_args, $this->smarty);
+                        } 
+                        if (class_exists($plugin, false)) {
+                            $plugin_object = new $plugin;
+                            if (method_exists($plugin_object, 'compile')) {
+                                return $plugin_object->compile($args, $this);
+                            } 
+                        } 
+                        throw new SmartyException("Plugin \"{$tag}\" not callable");
+                    } else {
+                        if ($function = $this->getPlugin($tag, $plugin_type)) {
+                            return $this->callTagCompiler('private_' . $plugin_type . '_plugin', $args, $parameter, $tag, $function);
+                        } 
+                    } 
+                } 
+            } else {
+                // compile closing tag of block function
+                $base_tag = substr($tag, 0, -5); 
+                // check if closing tag is a registered object
+                if (isset($this->smarty->registered_objects[$base_tag]) && isset($parameter['object_methode'])) {
+                    $methode = $parameter['object_methode'];
+                    if (in_array($methode, $this->smarty->registered_objects[$base_tag][3])) {
+                        return $this->callTagCompiler('private_object_block_function', $args, $parameter, $tag, $methode);
+                    } else {
+                        return $this->trigger_template_error ('unallowed closing tag methode "' . $methode . '" in registered object "' . $base_tag . '"', $this->lex->taglineno);
+                    } 
+                } 
+                // registered block tag ?
+                if (isset($this->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$base_tag])) {
+                    return $this->callTagCompiler('private_registered_block', $args, $parameter, $tag);
+                } 
+                // block plugin?
+                if ($function = $this->getPlugin($base_tag, Smarty::PLUGIN_BLOCK)) {
+                    return $this->callTagCompiler('private_block_plugin', $args, $parameter, $tag, $function);
+                } 
+                if ($this->smarty->loadPlugin('smarty_compiler_' . $tag)) {
+                    $plugin = 'smarty_compiler_' . $tag;
+                    if (is_callable($plugin)) {
+                        return $plugin($args, $this->smarty);
+                    } 
+                    if (class_exists($plugin, false)) {
+                        $plugin_object = new $plugin;
+                        if (method_exists($plugin_object, 'compile')) {
+                            return $plugin_object->compile($args, $this);
+                        } 
+                    } 
+                    throw new SmartyException("Plugin \"{$tag}\" not callable");
+                } 
+            } 
+            $this->trigger_template_error ("unknown tag \"" . $tag . "\"", $this->lex->taglineno);
+        } 
+    } 
+
+    /**
+     * lazy loads internal compile plugin for tag and calls the compile methode
+     * 
+     * compile objects cached for reuse.
+     * class name format:  Smarty_Internal_Compile_TagName
+     * plugin filename format: Smarty_Internal_Tagname.php
+     * 
+     * @param  $tag string tag name
+     * @param  $args array with tag attributes
+     * @param  $param1 optional parameter
+     * @param  $param2 optional parameter
+     * @param  $param3 optional parameter
+     * @return string compiled code
+     */
+    public function callTagCompiler($tag, $args, $param1 = null, $param2 = null, $param3 = null)
+    { 
+        // re-use object if already exists
+        if (isset(self::$_tag_objects[$tag])) {
+            // compile this tag
+            return self::$_tag_objects[$tag]->compile($args, $this, $param1, $param2, $param3);
+        } 
+        // lazy load internal compiler plugin
+        $class_name = 'Smarty_Internal_Compile_' . $tag;
+        if ($this->smarty->loadPlugin($class_name)) {
+            // use plugin if found
+            self::$_tag_objects[$tag] = new $class_name; 
+            // compile this tag
+            return self::$_tag_objects[$tag]->compile($args, $this, $param1, $param2, $param3);
+        } 
+        // no internal compile plugin for this tag
+        return false;
+    } 
+
+    /**
+     * Check for plugins and return function name
+     * 
+     * @param  $pugin_name string name of plugin or function
+     * @param  $type string type of plugin
+     * @return string call name of function
+     */
+    public function getPlugin($plugin_name, $type)
+    {
+        $function = null;
+        if ($this->template->caching && ($this->nocache || $this->tag_nocache)) {
+            if (isset($this->template->required_plugins['nocache'][$plugin_name][$type])) {
+                $function = $this->template->required_plugins['nocache'][$plugin_name][$type]['function'];
+            } else if (isset($this->template->required_plugins['compiled'][$plugin_name][$type])) {
+                $this->template->required_plugins['nocache'][$plugin_name][$type] = $this->template->required_plugins['compiled'][$plugin_name][$type];
+                $function = $this->template->required_plugins['nocache'][$plugin_name][$type]['function'];
+            } 
+        } else {
+            if (isset($this->template->required_plugins['compiled'][$plugin_name][$type])) {
+                $function = $this->template->required_plugins['compiled'][$plugin_name][$type]['function'];
+            } else if (isset($this->template->required_plugins['compiled'][$plugin_name][$type])) {
+                $this->template->required_plugins['compiled'][$plugin_name][$type] = $this->template->required_plugins['nocache'][$plugin_name][$type];
+                $function = $this->template->required_plugins['compiled'][$plugin_name][$type]['function'];
+            } 
+        } 
+        if (isset($function)) {
+            if ($type == 'modifier') {
+                $this->template->saved_modifier[$plugin_name] = true;
+            } 
+            return $function;
+        } 
+        // loop through plugin dirs and find the plugin
+        $function = 'smarty_' . $type . '_' . $plugin_name;
+        $found = false;
+        foreach((array)$this->smarty->plugins_dir as $_plugin_dir) {
+            $file = rtrim($_plugin_dir, '/\\') . DS . $type . '.' . $plugin_name . '.php';
+            if (file_exists($file)) {
+                // require_once($file);
+                $found = true;
+                break;
+            } 
+        } 
+        if ($found) {
+            if ($this->template->caching && ($this->nocache || $this->tag_nocache)) {
+                $this->template->required_plugins['nocache'][$plugin_name][$type]['file'] = $file;
+                $this->template->required_plugins['nocache'][$plugin_name][$type]['function'] = $function;
+            } else {
+                $this->template->required_plugins['compiled'][$plugin_name][$type]['file'] = $file;
+                $this->template->required_plugins['compiled'][$plugin_name][$type]['function'] = $function;
+            } 
+            if ($type == 'modifier') {
+                $this->template->saved_modifier[$plugin_name] = true;
+            } 
+            return $function;
+        } 
+        if (is_callable($function)) {
+            // plugin function is defined in the script
+            return $function;
+        } 
+        return false;
+    } 
+    /**
+     * Inject inline code for nocache template sections
+     * 
+     * This method gets the content of each template element from the parser.
+     * If the content is compiled code and it should be not cached the code is injected
+     * into the rendered output.
+     * 
+     * @param string $content content of template element
+     * @param boolean $tag_nocache true if the parser detected a nocache situation
+     * @param boolean $is_code true if content is compiled code
+     * @return string content
+     */
+    public function processNocacheCode ($content, $is_code)
+    { 
+        // If the template is not evaluated and we have a nocache section and or a nocache tag
+        if ($is_code && !empty($content)) {
+            // generate replacement code
+            if ((!$this->template->resource_object->isEvaluated || $this->template->forceNocache) && $this->template->caching && !$this->suppressNocacheProcessing &&
+                    ($this->nocache || $this->tag_nocache || $this->template->forceNocache == 2)) {
+                $this->template->has_nocache_code = true;
+                $_output = str_replace("'", "\'", $content);
+                $_output = str_replace("^#^", "'", $_output);
+                $_output = "<?php echo '/*%%SmartyNocache:{$this->nocache_hash}%%*/" . $_output . "/*/%%SmartyNocache:{$this->nocache_hash}%%*/';?>"; 
+                // make sure we include modifer plugins for nocache code
+                if (isset($this->template->saved_modifier)) {
+                    foreach ($this->template->saved_modifier as $plugin_name => $dummy) {
+                        if (isset($this->template->required_plugins['compiled'][$plugin_name]['modifier'])) {
+                            $this->template->required_plugins['nocache'][$plugin_name]['modifier'] = $this->template->required_plugins['compiled'][$plugin_name]['modifier'];
+                        } 
+                    } 
+                    $this->template->saved_modifier = null;
+                } 
+            } else {
+                $_output = $content;
+            } 
+        } else {
+            $_output = $content;
+        } 
+        $this->suppressNocacheProcessing = false;
+        $this->tag_nocache = false;
+        return $_output;
+    } 
+    /**
+     * display compiler error messages without dying
+     * 
+     * If parameter $args is empty it is a parser detected syntax error.
+     * In this case the parser is called to obtain information about expected tokens.
+     * 
+     * If parameter $args contains a string this is used as error message
+     * 
+     * @param  $args string individual error message or null
+     */
+    public function trigger_template_error($args = null, $line = null)
+    { 
+        // get template source line which has error
+        if (!isset($line)) {
+            $line = $this->lex->line;
+        } 
+        $match = preg_split("/\n/", $this->lex->data);
+        $error_text = 'Syntax Error in template "' . $this->template->getTemplateFilepath() . '"  on line ' . $line . ' "' . htmlspecialchars(trim(preg_replace('![\t\r\n]+!',' ',$match[$line-1]))) . '" ';
+        if (isset($args)) {
+            // individual error message
+            $error_text .= $args;
+        } else {
+            // expected token from parser
+            $error_text .= ' - Unexpected "' . $this->lex->value.'"';
+            if (count($this->parser->yy_get_expected_tokens($this->parser->yymajor)) <= 4 ) {
+            	foreach ($this->parser->yy_get_expected_tokens($this->parser->yymajor) as $token) {
+            	    $exp_token = $this->parser->yyTokenName[$token];
+            	    if (isset($this->lex->smarty_token_names[$exp_token])) {
+            	        // token type from lexer
+            	        $expect[] = '"' . $this->lex->smarty_token_names[$exp_token] . '"';
+            	    } else {
+            	        // otherwise internal token name
+            	        $expect[] = $this->parser->yyTokenName[$token];
+            	    } 
+            	} 
+            	$error_text .= ', expected one of: ' . implode(' , ', $expect);
+        	}
+        } 
+        throw new SmartyCompilerException($error_text);
+    } 
+} 
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_templatelexer.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_templatelexer.php
new file mode 100644
index 0000000..5e0e496
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_templatelexer.php
@@ -0,0 +1,1182 @@
+<?php
+/**
+* Smarty Internal Plugin Templatelexer
+*
+* This is the lexer to break the template source into tokens 
+* @package Smarty
+* @subpackage Compiler
+* @author Uwe Tews 
+*/
+/**
+* Smarty Internal Plugin Templatelexer
+*/
+class Smarty_Internal_Templatelexer
+{
+    public $data;
+    public $counter;
+    public $token;
+    public $value;
+    public $node;
+    public $line;
+    public $taglineno;
+    public $state = 1;
+    public $strip = false;
+    private $heredoc_id_stack = Array();
+    public $smarty_token_names = array (		// Text for parser error messages
+    				'IDENTITY'	=> '===',
+    				'NONEIDENTITY'	=> '!==',
+    				'EQUALS'	=> '==',
+    				'NOTEQUALS'	=> '!=',
+    				'GREATEREQUAL' => '(>=,ge)',
+    				'LESSEQUAL' => '(<=,le)',
+    				'GREATERTHAN' => '(>,gt)',
+    				'LESSTHAN' => '(<,lt)',
+    				'MOD' => '(%,mod)',
+    				'NOT'			=> '(!,not)',
+    				'LAND'		=> '(&&,and)',
+    				'LOR'			=> '(||,or)',
+    				'LXOR'			=> 'xor',
+    				'OPENP'		=> '(',
+    				'CLOSEP'	=> ')',
+    				'OPENB'		=> '[',
+    				'CLOSEB'	=> ']',
+    				'PTR'			=> '->',
+    				'APTR'		=> '=>',
+    				'EQUAL'		=> '=',
+    				'NUMBER'	=> 'number',
+    				'UNIMATH'	=> '+" , "-',
+    				'MATH'		=> '*" , "/" , "%',
+    				'INCDEC'	=> '++" , "--',
+    				'SPACE'		=> ' ',
+    				'DOLLAR'	=> '$',
+    				'SEMICOLON' => ';',
+    				'COLON'		=> ':',
+    				'DOUBLECOLON'		=> '::',
+    				'AT'		=> '@',
+    				'HATCH'		=> '#',
+    				'QUOTE'		=> '"',
+    				'BACKTICK'		=> '`',
+    				'VERT'		=> '|',
+    				'DOT'			=> '.',
+    				'COMMA'		=> '","',
+    				'ANDSYM'		=> '"&"',
+    				'QMARK'		=> '"?"',
+    				'ID'			=> 'identifier',
+    				'OTHER'		=> 'text',
+    				'LINEBREAK'		=> 'newline',
+     				'FAKEPHPSTARTTAG'	=> 'Fake PHP start tag',
+     				'PHPSTARTTAG'	=> 'PHP start tag',
+     				'PHPENDTAG'	=> 'PHP end tag',
+ 						'LITERALSTART'  => 'Literal start',
+ 						'LITERALEND'    => 'Literal end',
+    				'LDELSLASH' => 'closing tag',
+    				'COMMENT' => 'comment',
+     				'LITERALEND' => 'literal close',
+    				'AS' => 'as',
+    				'TO' => 'to',
+    				);
+    				
+    				
+    function __construct($data,$compiler)
+    {
+//        $this->data = preg_replace("/(\r\n|\r|\n)/", "\n", $data);
+        $this->data = $data;
+        $this->counter = 0;
+        $this->line = 1;
+        $this->smarty = $compiler->smarty;
+        $this->compiler = $compiler;
+        $this->ldel = preg_quote($this->smarty->left_delimiter,'/'); 
+        $this->ldel_length = strlen($this->smarty->left_delimiter); 
+        $this->rdel = preg_quote($this->smarty->right_delimiter,'/');
+        $this->smarty_token_names['LDEL'] =	$this->smarty->left_delimiter;
+        $this->smarty_token_names['RDEL'] =	$this->smarty->right_delimiter;
+     }
+
+
+    private $_yy_state = 1;
+    private $_yy_stack = array();
+
+    function yylex()
+    {
+        return $this->{'yylex' . $this->_yy_state}();
+    }
+
+    function yypushstate($state)
+    {
+        array_push($this->_yy_stack, $this->_yy_state);
+        $this->_yy_state = $state;
+    }
+
+    function yypopstate()
+    {
+        $this->_yy_state = array_pop($this->_yy_stack);
+    }
+
+    function yybegin($state)
+    {
+        $this->_yy_state = $state;
+    }
+
+
+
+    function yylex1()
+    {
+        $tokenMap = array (
+              1 => 0,
+              2 => 0,
+              3 => 1,
+              5 => 0,
+              6 => 0,
+              7 => 0,
+              8 => 0,
+              9 => 0,
+              10 => 0,
+              11 => 0,
+              12 => 1,
+              14 => 0,
+              15 => 0,
+              16 => 0,
+              17 => 0,
+              18 => 0,
+              19 => 0,
+              20 => 0,
+              21 => 0,
+              22 => 0,
+              23 => 2,
+              26 => 0,
+              27 => 0,
+            );
+        if ($this->counter >= strlen($this->data)) {
+            return false; // end of input
+        }
+        $yy_global_pattern = "/^(".$this->ldel."[$]smarty\\.block\\.child".$this->rdel.")|^(\\{\\})|^(".$this->ldel."\\*([\S\s]*?)\\*".$this->rdel.")|^([\t ]*[\r\n]+[\t ]*)|^(".$this->ldel."strip".$this->rdel.")|^(".$this->ldel."\\s{1,}strip\\s{1,}".$this->rdel.")|^(".$this->ldel."\/strip".$this->rdel.")|^(".$this->ldel."\\s{1,}\/strip\\s{1,}".$this->rdel.")|^(".$this->ldel."\\s*literal\\s*".$this->rdel.")|^(".$this->ldel."\\s{1,}\/)|^(".$this->ldel."\\s*(if|elseif|else if|while)(?![^\s]))|^(".$this->ldel."\\s*for(?![^\s]))|^(".$this->ldel."\\s*foreach(?![^\s]))|^(".$this->ldel."\\s{1,})|^(".$this->ldel."\/)|^(".$this->ldel.")|^(<\\?(?:php\\w+|=|[a-zA-Z]+)?)|^(\\?>)|^(<%)|^(%>)|^(([\S\s]*?)(?=([\t ]*[\r\n]+[\t ]*|".$this->ldel."|<\\?|\\?>|<%|%>)))|^([\S\s]+)|^(.)/iS";
+
+        do {
+            if (preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches)) {
+                $yysubmatches = $yymatches;
+                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
+                if (!count($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' .
+                        'an empty string.  Input "' . substr($this->data,
+                        $this->counter, 5) . '... state TEXT');
+                }
+                next($yymatches); // skip global match
+                $this->token = key($yymatches); // token number
+                if ($tokenMap[$this->token]) {
+                    // extract sub-patterns for passing to lex function
+                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
+                        $tokenMap[$this->token]);
+                } else {
+                    $yysubmatches = array();
+                }
+                $this->value = current($yymatches); // token value
+                $r = $this->{'yy_r1_' . $this->token}($yysubmatches);
+                if ($r === null) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    // accept this token
+                    return true;
+                } elseif ($r === true) {
+                    // we have changed state
+                    // process this token in the new state
+                    return $this->yylex();
+                } elseif ($r === false) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    if ($this->counter >= strlen($this->data)) {
+                        return false; // end of input
+                    }
+                    // skip this token
+                    continue;
+                }            } else {
+                throw new Exception('Unexpected input at line' . $this->line .
+                    ': ' . $this->data[$this->counter]);
+            }
+            break;
+        } while (true);
+
+    } // end function
+
+
+    const TEXT = 1;
+    function yy_r1_1($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_SMARTYBLOCKCHILD;
+    }
+    function yy_r1_2($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_OTHER;
+    }
+    function yy_r1_3($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_COMMENT;
+    }
+    function yy_r1_5($yy_subpatterns)
+    {
+
+  if ($this->strip) {
+     return false;
+  } else {
+     $this->token = Smarty_Internal_Templateparser::TP_LINEBREAK;
+  }
+    }
+    function yy_r1_6($yy_subpatterns)
+    {
+
+  $this->strip = true;
+  return false;
+    }
+    function yy_r1_7($yy_subpatterns)
+    {
+
+  if ($this->smarty->auto_literal) {
+     $this->token = Smarty_Internal_Templateparser::TP_OTHER;
+  } else {
+    $this->strip = true;
+    return false;
+  }
+    }
+    function yy_r1_8($yy_subpatterns)
+    {
+
+  $this->strip = false;
+  return false;
+    }
+    function yy_r1_9($yy_subpatterns)
+    {
+
+  if ($this->smarty->auto_literal) {
+     $this->token = Smarty_Internal_Templateparser::TP_OTHER;
+  } else {
+    $this->strip = false;
+    return false;
+  }
+    }
+    function yy_r1_10($yy_subpatterns)
+    {
+
+   $this->token = Smarty_Internal_Templateparser::TP_LITERALSTART;
+   $this->yypushstate(self::LITERAL);
+    }
+    function yy_r1_11($yy_subpatterns)
+    {
+
+  if ($this->smarty->auto_literal) {
+     $this->token = Smarty_Internal_Templateparser::TP_OTHER;
+  } else {
+     $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
+     $this->yypushstate(self::SMARTY);
+     $this->taglineno = $this->line;
+  }
+    }
+    function yy_r1_12($yy_subpatterns)
+    {
+
+  if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
+     $this->token = Smarty_Internal_Templateparser::TP_OTHER;
+  } else {
+     $this->token = Smarty_Internal_Templateparser::TP_LDELIF;
+     $this->yypushstate(self::SMARTY);
+     $this->taglineno = $this->line;
+  }
+    }
+    function yy_r1_14($yy_subpatterns)
+    {
+
+  if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
+     $this->token = Smarty_Internal_Templateparser::TP_OTHER;
+  } else {
+     $this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
+     $this->yypushstate(self::SMARTY);
+     $this->taglineno = $this->line;
+  }
+    }
+    function yy_r1_15($yy_subpatterns)
+    {
+
+  if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
+     $this->token = Smarty_Internal_Templateparser::TP_OTHER;
+  } else {
+     $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
+     $this->yypushstate(self::SMARTY);
+     $this->taglineno = $this->line;
+  }
+    }
+    function yy_r1_16($yy_subpatterns)
+    {
+
+  if ($this->smarty->auto_literal) {
+     $this->token = Smarty_Internal_Templateparser::TP_OTHER;
+  } else {
+     $this->token = Smarty_Internal_Templateparser::TP_LDEL;
+     $this->yypushstate(self::SMARTY);
+     $this->taglineno = $this->line;
+  }
+    }
+    function yy_r1_17($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
+     $this->yypushstate(self::SMARTY);
+     $this->taglineno = $this->line;
+    }
+    function yy_r1_18($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_LDEL;
+     $this->yypushstate(self::SMARTY);
+     $this->taglineno = $this->line;
+    }
+    function yy_r1_19($yy_subpatterns)
+    {
+
+  if (in_array($this->value, Array('<?', '<?=', '<?php'))) {
+    $this->token = Smarty_Internal_Templateparser::TP_PHPSTARTTAG;
+  } elseif ($this->value == '<?xml') {
+      $this->token = Smarty_Internal_Templateparser::TP_XMLTAG;
+  } else {
+    $this->token = Smarty_Internal_Templateparser::TP_FAKEPHPSTARTTAG;
+    $this->value = substr($this->value, 0, 2);
+  }
+     }
+    function yy_r1_20($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_PHPENDTAG;
+    }
+    function yy_r1_21($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_ASPSTARTTAG;
+    }
+    function yy_r1_22($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_ASPENDTAG;
+    }
+    function yy_r1_23($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_OTHER;
+    }
+    function yy_r1_26($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_OTHER;
+    }
+    function yy_r1_27($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_OTHER;
+    }
+
+
+    function yylex2()
+    {
+        $tokenMap = array (
+              1 => 0,
+              2 => 0,
+              3 => 1,
+              5 => 0,
+              6 => 0,
+              7 => 0,
+              8 => 0,
+              9 => 0,
+              10 => 0,
+              11 => 0,
+              12 => 0,
+              13 => 0,
+              14 => 0,
+              15 => 0,
+              16 => 0,
+              17 => 0,
+              18 => 0,
+              19 => 0,
+              20 => 1,
+              22 => 1,
+              24 => 1,
+              26 => 0,
+              27 => 0,
+              28 => 0,
+              29 => 0,
+              30 => 0,
+              31 => 0,
+              32 => 0,
+              33 => 0,
+              34 => 0,
+              35 => 0,
+              36 => 0,
+              37 => 0,
+              38 => 0,
+              39 => 0,
+              40 => 0,
+              41 => 0,
+              42 => 0,
+              43 => 3,
+              47 => 0,
+              48 => 0,
+              49 => 0,
+              50 => 0,
+              51 => 0,
+              52 => 0,
+              53 => 0,
+              54 => 0,
+              55 => 1,
+              57 => 1,
+              59 => 0,
+              60 => 0,
+              61 => 0,
+              62 => 0,
+              63 => 0,
+              64 => 0,
+              65 => 0,
+              66 => 0,
+              67 => 0,
+              68 => 0,
+              69 => 0,
+              70 => 0,
+              71 => 0,
+              72 => 0,
+              73 => 0,
+              74 => 0,
+              75 => 0,
+              76 => 0,
+            );
+        if ($this->counter >= strlen($this->data)) {
+            return false; // end of input
+        }
+        $yy_global_pattern = "/^('[^'\\\\]*(?:\\\\.[^'\\\\]*)*')|^(".$this->ldel."\\s{1,}\/)|^(".$this->ldel."\\s*(if|elseif|else if|while)(?![^\s]))|^(".$this->ldel."\\s*for(?![^\s]))|^(".$this->ldel."\\s*foreach(?![^\s]))|^(".$this->ldel."\\s{1,})|^(\\s{1,}".$this->rdel.")|^(".$this->ldel."\/)|^(".$this->ldel.")|^(".$this->rdel.")|^(\\s+is\\s+in\\s+)|^(\\s+as\\s+)|^(\\s+to\\s+)|^(\\s+step\\s+)|^(\\s+instanceof\\s+)|^(\\s*===\\s*)|^(\\s*!==\\s*)|^(\\s*==\\s*|\\s+eq\\s+)|^(\\s*!=\\s*|\\s*<>\\s*|\\s+(ne|neq)\\s+)|^(\\s*>=\\s*|\\s+(ge|gte)\\s+)|^(\\s*<=\\s*|\\s+(le|lte)\\s+)|^(\\s*>\\s*|\\s+gt\\s+)|^(\\s*<\\s*|\\s+lt\\s+)|^(\\s+mod\\s+)|^(!\\s*|not\\s+)|^(\\s*&&\\s*|\\s*and\\s+)|^(\\s*\\|\\|\\s*|\\s*or\\s+)|^(\\s*xor\\s+)|^(\\s+is\\s+odd\\s+by\\s+)|^(\\s+is\\s+not\\s+odd\\s+by\\s+)|^(\\s+is\\s+odd)|^(\\s+is\\s+not\\s+odd)|^(\\s+is\\s+even\\s+by\\s+)|^(\\s+is\\s+not\\s+even\\s+by\\s+)|^(\\s+is\\s+even)|^(\\s+is\\s+not\\s+even)|^(\\s+is\\s+div\\s+by\\s+)|^(\\s+is\\s+not\\s+div\\s+by\\s+)|^(\\((int(eger)?|bool(ean)?|float|double|real|string|binary|array|object)\\)\\s*)|^(\\(\\s*)|^(\\s*\\))|^(\\[\\s*)|^(\\s*\\])|^(\\s*->\\s*)|^(\\s*=>\\s*)|^(\\s*=\\s*)|^(\\+\\+|--)|^(\\s*(\\+|-)\\s*)|^(\\s*(\\*|\/|%)\\s*)|^(\\$)|^(\\s*;)|^(::)|^(\\s*:\\s*)|^(@)|^(#)|^(\")|^(`)|^(\\|)|^(\\.)|^(\\s*,\\s*)|^(\\s*&\\s*)|^(\\s*\\?\\s*)|^(0[xX][0-9a-fA-F]+)|^([0-9]*[a-zA-Z_]\\w*)|^(\\d+)|^(\\s+)|^(.)/iS";
+
+        do {
+            if (preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches)) {
+                $yysubmatches = $yymatches;
+                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
+                if (!count($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' .
+                        'an empty string.  Input "' . substr($this->data,
+                        $this->counter, 5) . '... state SMARTY');
+                }
+                next($yymatches); // skip global match
+                $this->token = key($yymatches); // token number
+                if ($tokenMap[$this->token]) {
+                    // extract sub-patterns for passing to lex function
+                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
+                        $tokenMap[$this->token]);
+                } else {
+                    $yysubmatches = array();
+                }
+                $this->value = current($yymatches); // token value
+                $r = $this->{'yy_r2_' . $this->token}($yysubmatches);
+                if ($r === null) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    // accept this token
+                    return true;
+                } elseif ($r === true) {
+                    // we have changed state
+                    // process this token in the new state
+                    return $this->yylex();
+                } elseif ($r === false) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    if ($this->counter >= strlen($this->data)) {
+                        return false; // end of input
+                    }
+                    // skip this token
+                    continue;
+                }            } else {
+                throw new Exception('Unexpected input at line' . $this->line .
+                    ': ' . $this->data[$this->counter]);
+            }
+            break;
+        } while (true);
+
+    } // end function
+
+
+    const SMARTY = 2;
+    function yy_r2_1($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_SINGLEQUOTESTRING;
+    }
+    function yy_r2_2($yy_subpatterns)
+    {
+
+  if ($this->smarty->auto_literal) {
+     $this->token = Smarty_Internal_Templateparser::TP_OTHER;
+  } else {
+     $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
+     $this->yypushstate(self::SMARTY);
+     $this->taglineno = $this->line;
+  }
+    }
+    function yy_r2_3($yy_subpatterns)
+    {
+
+  if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
+     $this->token = Smarty_Internal_Templateparser::TP_OTHER;
+  } else {
+     $this->token = Smarty_Internal_Templateparser::TP_LDELIF;
+     $this->yypushstate(self::SMARTY);
+     $this->taglineno = $this->line;
+  }
+    }
+    function yy_r2_5($yy_subpatterns)
+    {
+
+  if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
+     $this->token = Smarty_Internal_Templateparser::TP_OTHER;
+  } else {
+     $this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
+     $this->yypushstate(self::SMARTY);
+     $this->taglineno = $this->line;
+  }
+    }
+    function yy_r2_6($yy_subpatterns)
+    {
+
+  if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
+     $this->token = Smarty_Internal_Templateparser::TP_OTHER;
+  } else {
+     $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
+     $this->yypushstate(self::SMARTY);
+     $this->taglineno = $this->line;
+  }
+    }
+    function yy_r2_7($yy_subpatterns)
+    {
+
+  if ($this->smarty->auto_literal) {
+     $this->token = Smarty_Internal_Templateparser::TP_OTHER;
+  } else {
+     $this->token = Smarty_Internal_Templateparser::TP_LDEL;
+     $this->yypushstate(self::SMARTY);
+     $this->taglineno = $this->line;
+  }
+    }
+    function yy_r2_8($yy_subpatterns)
+    {
+
+  if ($this->smarty->auto_literal) {
+     $this->token = Smarty_Internal_Templateparser::TP_OTHER;
+  } else {
+     $this->token = Smarty_Internal_Templateparser::TP_RDEL;
+     $this->yypopstate();
+  }
+    }
+    function yy_r2_9($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
+     $this->yypushstate(self::SMARTY);
+     $this->taglineno = $this->line;
+    }
+    function yy_r2_10($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_LDEL;
+     $this->yypushstate(self::SMARTY);
+     $this->taglineno = $this->line;
+    }
+    function yy_r2_11($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_RDEL;
+     $this->yypopstate();
+    }
+    function yy_r2_12($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_ISIN;
+    }
+    function yy_r2_13($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_AS;
+    }
+    function yy_r2_14($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_TO;
+    }
+    function yy_r2_15($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_STEP;
+    }
+    function yy_r2_16($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_INSTANCEOF;
+    }
+    function yy_r2_17($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_IDENTITY;
+    }
+    function yy_r2_18($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_NONEIDENTITY;
+    }
+    function yy_r2_19($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_EQUALS;
+    }
+    function yy_r2_20($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_NOTEQUALS;
+    }
+    function yy_r2_22($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_GREATEREQUAL;
+    }
+    function yy_r2_24($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_LESSEQUAL;
+    }
+    function yy_r2_26($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_GREATERTHAN;
+    }
+    function yy_r2_27($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_LESSTHAN;
+    }
+    function yy_r2_28($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_MOD;
+    }
+    function yy_r2_29($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_NOT;
+    }
+    function yy_r2_30($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_LAND;
+    }
+    function yy_r2_31($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_LOR;
+    }
+    function yy_r2_32($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_LXOR;
+    }
+    function yy_r2_33($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_ISODDBY;
+    }
+    function yy_r2_34($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_ISNOTODDBY;
+    }
+    function yy_r2_35($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_ISODD;
+    }
+    function yy_r2_36($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_ISNOTODD;
+    }
+    function yy_r2_37($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_ISEVENBY;
+    }
+    function yy_r2_38($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_ISNOTEVENBY;
+    }
+    function yy_r2_39($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_ISEVEN;
+    }
+    function yy_r2_40($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_ISNOTEVEN;
+    }
+    function yy_r2_41($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_ISDIVBY;
+    }
+    function yy_r2_42($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_ISNOTDIVBY;
+    }
+    function yy_r2_43($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_TYPECAST;
+    }
+    function yy_r2_47($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_OPENP;
+    }
+    function yy_r2_48($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_CLOSEP;
+    }
+    function yy_r2_49($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_OPENB;
+    }
+    function yy_r2_50($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_CLOSEB;
+    }
+    function yy_r2_51($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_PTR; 
+    }
+    function yy_r2_52($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_APTR;
+    }
+    function yy_r2_53($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_EQUAL;
+    }
+    function yy_r2_54($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_INCDEC;
+    }
+    function yy_r2_55($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_UNIMATH;
+    }
+    function yy_r2_57($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_MATH;
+    }
+    function yy_r2_59($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_DOLLAR;
+    }
+    function yy_r2_60($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_SEMICOLON;
+    }
+    function yy_r2_61($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_DOUBLECOLON;
+    }
+    function yy_r2_62($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_COLON;
+    }
+    function yy_r2_63($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_AT;
+    }
+    function yy_r2_64($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_HATCH;
+    }
+    function yy_r2_65($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
+  $this->yypushstate(self::DOUBLEQUOTEDSTRING);
+    }
+    function yy_r2_66($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
+  $this->yypopstate();
+    }
+    function yy_r2_67($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_VERT;
+    }
+    function yy_r2_68($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_DOT;
+    }
+    function yy_r2_69($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_COMMA;
+    }
+    function yy_r2_70($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_ANDSYM;
+    }
+    function yy_r2_71($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_QMARK;
+    }
+    function yy_r2_72($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_HEX;
+    }
+    function yy_r2_73($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_ID;
+    }
+    function yy_r2_74($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_INTEGER;
+    }
+    function yy_r2_75($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_SPACE;
+    }
+    function yy_r2_76($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_OTHER;
+    }
+
+
+
+    function yylex3()
+    {
+        $tokenMap = array (
+              1 => 0,
+              2 => 0,
+              3 => 0,
+              4 => 0,
+              5 => 0,
+              6 => 0,
+              7 => 0,
+              8 => 2,
+              11 => 0,
+            );
+        if ($this->counter >= strlen($this->data)) {
+            return false; // end of input
+        }
+        $yy_global_pattern = "/^(".$this->ldel."\\s*literal\\s*".$this->rdel.")|^(".$this->ldel."\\s*\/literal\\s*".$this->rdel.")|^([\t ]*[\r\n]+[\t ]*)|^(<\\?(?:php\\w+|=|[a-zA-Z]+)?)|^(\\?>)|^(<%)|^(%>)|^(([\S\s]*?)(?=([\t ]*[\r\n]+[\t ]*|".$this->ldel."\/?literal".$this->rdel."|<\\?|<%)))|^(.)/iS";
+
+        do {
+            if (preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches)) {
+                $yysubmatches = $yymatches;
+                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
+                if (!count($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' .
+                        'an empty string.  Input "' . substr($this->data,
+                        $this->counter, 5) . '... state LITERAL');
+                }
+                next($yymatches); // skip global match
+                $this->token = key($yymatches); // token number
+                if ($tokenMap[$this->token]) {
+                    // extract sub-patterns for passing to lex function
+                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
+                        $tokenMap[$this->token]);
+                } else {
+                    $yysubmatches = array();
+                }
+                $this->value = current($yymatches); // token value
+                $r = $this->{'yy_r3_' . $this->token}($yysubmatches);
+                if ($r === null) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    // accept this token
+                    return true;
+                } elseif ($r === true) {
+                    // we have changed state
+                    // process this token in the new state
+                    return $this->yylex();
+                } elseif ($r === false) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    if ($this->counter >= strlen($this->data)) {
+                        return false; // end of input
+                    }
+                    // skip this token
+                    continue;
+                }            } else {
+                throw new Exception('Unexpected input at line' . $this->line .
+                    ': ' . $this->data[$this->counter]);
+            }
+            break;
+        } while (true);
+
+    } // end function
+
+
+    const LITERAL = 3;
+    function yy_r3_1($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_LITERALSTART;
+  $this->yypushstate(self::LITERAL);
+    }
+    function yy_r3_2($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_LITERALEND;
+  $this->yypopstate();
+    }
+    function yy_r3_3($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
+    }
+    function yy_r3_4($yy_subpatterns)
+    {
+
+  if (in_array($this->value, Array('<?', '<?=', '<?php'))) {
+    $this->token = Smarty_Internal_Templateparser::TP_PHPSTARTTAG;
+   } else {
+    $this->token = Smarty_Internal_Templateparser::TP_FAKEPHPSTARTTAG;
+    $this->value = substr($this->value, 0, 2);
+   }
+    }
+    function yy_r3_5($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_PHPENDTAG;
+    }
+    function yy_r3_6($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_ASPSTARTTAG;
+    }
+    function yy_r3_7($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_ASPENDTAG;
+    }
+    function yy_r3_8($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
+    }
+    function yy_r3_11($yy_subpatterns)
+    {
+
+  $this->compiler->trigger_template_error ("missing or misspelled literal closing tag");
+    }
+
+
+    function yylex4()
+    {
+        $tokenMap = array (
+              1 => 0,
+              2 => 1,
+              4 => 0,
+              5 => 0,
+              6 => 0,
+              7 => 0,
+              8 => 0,
+              9 => 0,
+              10 => 0,
+              11 => 0,
+              12 => 0,
+              13 => 3,
+              17 => 0,
+              18 => 0,
+            );
+        if ($this->counter >= strlen($this->data)) {
+            return false; // end of input
+        }
+        $yy_global_pattern = "/^(".$this->ldel."\\s{1,}\/)|^(".$this->ldel."\\s*(if|elseif|else if|while)(?![^\s]))|^(".$this->ldel."\\s*for(?![^\s]))|^(".$this->ldel."\\s*foreach(?![^\s]))|^(".$this->ldel."\\s{1,})|^(".$this->ldel."\/)|^(".$this->ldel.")|^(\")|^(`\\$)|^(\\$[0-9]*[a-zA-Z_]\\w*)|^(\\$)|^(([^\"\\\\]*?)((?:\\\\.[^\"\\\\]*?)*?)(?=(".$this->ldel."|\\$|`\\$|\")))|^([\S\s]+)|^(.)/iS";
+
+        do {
+            if (preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches)) {
+                $yysubmatches = $yymatches;
+                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
+                if (!count($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' .
+                        'an empty string.  Input "' . substr($this->data,
+                        $this->counter, 5) . '... state DOUBLEQUOTEDSTRING');
+                }
+                next($yymatches); // skip global match
+                $this->token = key($yymatches); // token number
+                if ($tokenMap[$this->token]) {
+                    // extract sub-patterns for passing to lex function
+                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
+                        $tokenMap[$this->token]);
+                } else {
+                    $yysubmatches = array();
+                }
+                $this->value = current($yymatches); // token value
+                $r = $this->{'yy_r4_' . $this->token}($yysubmatches);
+                if ($r === null) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    // accept this token
+                    return true;
+                } elseif ($r === true) {
+                    // we have changed state
+                    // process this token in the new state
+                    return $this->yylex();
+                } elseif ($r === false) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    if ($this->counter >= strlen($this->data)) {
+                        return false; // end of input
+                    }
+                    // skip this token
+                    continue;
+                }            } else {
+                throw new Exception('Unexpected input at line' . $this->line .
+                    ': ' . $this->data[$this->counter]);
+            }
+            break;
+        } while (true);
+
+    } // end function
+
+
+    const DOUBLEQUOTEDSTRING = 4;
+    function yy_r4_1($yy_subpatterns)
+    {
+
+  if ($this->smarty->auto_literal) {
+     $this->token = Smarty_Internal_Templateparser::TP_OTHER;
+  } else {
+     $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
+     $this->yypushstate(self::SMARTY);
+     $this->taglineno = $this->line;
+  }
+    }
+    function yy_r4_2($yy_subpatterns)
+    {
+
+  if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
+     $this->token = Smarty_Internal_Templateparser::TP_OTHER;
+  } else {
+     $this->token = Smarty_Internal_Templateparser::TP_LDELIF;
+     $this->yypushstate(self::SMARTY);
+     $this->taglineno = $this->line;
+  }
+    }
+    function yy_r4_4($yy_subpatterns)
+    {
+
+  if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
+     $this->token = Smarty_Internal_Templateparser::TP_OTHER;
+  } else {
+     $this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
+     $this->yypushstate(self::SMARTY);
+     $this->taglineno = $this->line;
+  }
+    }
+    function yy_r4_5($yy_subpatterns)
+    {
+
+  if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
+     $this->token = Smarty_Internal_Templateparser::TP_OTHER;
+  } else {
+     $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
+     $this->yypushstate(self::SMARTY);
+     $this->taglineno = $this->line;
+  }
+    }
+    function yy_r4_6($yy_subpatterns)
+    {
+
+  if ($this->smarty->auto_literal) {
+     $this->token = Smarty_Internal_Templateparser::TP_OTHER;
+  } else {
+     $this->token = Smarty_Internal_Templateparser::TP_LDEL;
+     $this->yypushstate(self::SMARTY);
+     $this->taglineno = $this->line;
+  }
+    }
+    function yy_r4_7($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
+     $this->yypushstate(self::SMARTY);
+     $this->taglineno = $this->line;
+    }
+    function yy_r4_8($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_LDEL;
+     $this->yypushstate(self::SMARTY);
+     $this->taglineno = $this->line;
+    }
+    function yy_r4_9($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
+  $this->yypopstate();
+    }
+    function yy_r4_10($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
+  $this->value = substr($this->value,0,-1);
+  $this->yypushstate(self::SMARTY);
+  $this->taglineno = $this->line;
+    }
+    function yy_r4_11($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
+    }
+    function yy_r4_12($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_OTHER;
+    }
+    function yy_r4_13($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_OTHER;
+    }
+    function yy_r4_17($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_OTHER;
+    }
+    function yy_r4_18($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_OTHER;
+    }
+
+}
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_templateparser.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_templateparser.php
new file mode 100644
index 0000000..90e1c97
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_templateparser.php
@@ -0,0 +1,2966 @@
+<?php
+/**
+* Smarty Internal Plugin Templateparser
+*
+* This is the template parser.
+* It is generated from the internal.templateparser.y file
+* @package Smarty
+* @subpackage Compiler
+* @author Uwe Tews
+*/
+
+class TP_yyToken implements ArrayAccess
+{
+    public $string = '';
+    public $metadata = array();
+
+    function __construct($s, $m = array())
+    {
+        if ($s instanceof TP_yyToken) {
+            $this->string = $s->string;
+            $this->metadata = $s->metadata;
+        } else {
+            $this->string = (string) $s;
+            if ($m instanceof TP_yyToken) {
+                $this->metadata = $m->metadata;
+            } elseif (is_array($m)) {
+                $this->metadata = $m;
+            }
+        }
+    }
+
+    function __toString()
+    {
+        return $this->_string;
+    }
+
+    function offsetExists($offset)
+    {
+        return isset($this->metadata[$offset]);
+    }
+
+    function offsetGet($offset)
+    {
+        return $this->metadata[$offset];
+    }
+
+    function offsetSet($offset, $value)
+    {
+        if ($offset === null) {
+            if (isset($value[0])) {
+                $x = ($value instanceof TP_yyToken) ?
+                    $value->metadata : $value;
+                $this->metadata = array_merge($this->metadata, $x);
+                return;
+            }
+            $offset = count($this->metadata);
+        }
+        if ($value === null) {
+            return;
+        }
+        if ($value instanceof TP_yyToken) {
+            if ($value->metadata) {
+                $this->metadata[$offset] = $value->metadata;
+            }
+        } elseif ($value) {
+            $this->metadata[$offset] = $value;
+        }
+    }
+
+    function offsetUnset($offset)
+    {
+        unset($this->metadata[$offset]);
+    }
+}
+
+class TP_yyStackEntry
+{
+    public $stateno;       /* The state-number */
+    public $major;         /* The major token value.  This is the code
+                     ** number for the token at this stack level */
+    public $minor; /* The user-supplied minor token value.  This
+                     ** is the value of the token  */
+};
+
+
+#line 12 "smarty_internal_templateparser.y"
+class Smarty_Internal_Templateparser#line 79 "smarty_internal_templateparser.php"
+{
+#line 14 "smarty_internal_templateparser.y"
+
+	  const Err1 = "Security error: Call to private object member not allowed";
+	  const Err2 = "Security error: Call to dynamic object member not allowed";
+    // states whether the parse was successful or not
+    public $successful = true;
+    public $retvalue = 0;
+    private $lex;
+    private $internalError = false;
+
+    function __construct($lex, $compiler) {
+        $this->lex = $lex;
+        $this->compiler = $compiler;
+        $this->smarty = $this->compiler->smarty;
+        $this->template = $this->compiler->template;
+        $this->compiler->has_variable_string = false;
+				$this->compiler->prefix_code = array();
+				$this->prefix_number = 0;
+				$this->block_nesting_level = 0;
+				if ($this->security = isset($this->smarty->security_policy)) {
+              $this->php_handling = $this->smarty->security_policy->php_handling;
+        } else {
+              $this->php_handling = $this->smarty->php_handling;
+        }
+				$this->is_xml = false;
+				$this->asp_tags = (ini_get('asp_tags') != '0');
+				$this->current_buffer = $this->root_buffer = new _smarty_template_buffer($this);
+    }
+
+    public static function escape_start_tag($tag_text) {
+       $tag = preg_replace('/\A<\?(.*)\z/', '<<?php ?>?\1', $tag_text, -1 , $count); //Escape tag
+       return $tag;
+    }
+
+    public static function escape_end_tag($tag_text) {
+       return '?<?php ?>>';
+    }
+
+    
+#line 121 "smarty_internal_templateparser.php"
+
+    const TP_VERT                           =  1;
+    const TP_COLON                          =  2;
+    const TP_COMMENT                        =  3;
+    const TP_PHPSTARTTAG                    =  4;
+    const TP_PHPENDTAG                      =  5;
+    const TP_ASPSTARTTAG                    =  6;
+    const TP_ASPENDTAG                      =  7;
+    const TP_FAKEPHPSTARTTAG                =  8;
+    const TP_XMLTAG                         =  9;
+    const TP_OTHER                          = 10;
+    const TP_LINEBREAK                      = 11;
+    const TP_LITERALSTART                   = 12;
+    const TP_LITERALEND                     = 13;
+    const TP_LITERAL                        = 14;
+    const TP_LDEL                           = 15;
+    const TP_RDEL                           = 16;
+    const TP_DOLLAR                         = 17;
+    const TP_ID                             = 18;
+    const TP_EQUAL                          = 19;
+    const TP_PTR                            = 20;
+    const TP_LDELIF                         = 21;
+    const TP_SPACE                          = 22;
+    const TP_LDELFOR                        = 23;
+    const TP_SEMICOLON                      = 24;
+    const TP_INCDEC                         = 25;
+    const TP_TO                             = 26;
+    const TP_STEP                           = 27;
+    const TP_LDELFOREACH                    = 28;
+    const TP_AS                             = 29;
+    const TP_APTR                           = 30;
+    const TP_SMARTYBLOCKCHILD               = 31;
+    const TP_LDELSLASH                      = 32;
+    const TP_INTEGER                        = 33;
+    const TP_COMMA                          = 34;
+    const TP_OPENP                          = 35;
+    const TP_CLOSEP                         = 36;
+    const TP_MATH                           = 37;
+    const TP_UNIMATH                        = 38;
+    const TP_ANDSYM                         = 39;
+    const TP_ISIN                           = 40;
+    const TP_ISDIVBY                        = 41;
+    const TP_ISNOTDIVBY                     = 42;
+    const TP_ISEVEN                         = 43;
+    const TP_ISNOTEVEN                      = 44;
+    const TP_ISEVENBY                       = 45;
+    const TP_ISNOTEVENBY                    = 46;
+    const TP_ISODD                          = 47;
+    const TP_ISNOTODD                       = 48;
+    const TP_ISODDBY                        = 49;
+    const TP_ISNOTODDBY                     = 50;
+    const TP_INSTANCEOF                     = 51;
+    const TP_QMARK                          = 52;
+    const TP_NOT                            = 53;
+    const TP_TYPECAST                       = 54;
+    const TP_HEX                            = 55;
+    const TP_DOT                            = 56;
+    const TP_SINGLEQUOTESTRING              = 57;
+    const TP_DOUBLECOLON                    = 58;
+    const TP_AT                             = 59;
+    const TP_HATCH                          = 60;
+    const TP_OPENB                          = 61;
+    const TP_CLOSEB                         = 62;
+    const TP_EQUALS                         = 63;
+    const TP_NOTEQUALS                      = 64;
+    const TP_GREATERTHAN                    = 65;
+    const TP_LESSTHAN                       = 66;
+    const TP_GREATEREQUAL                   = 67;
+    const TP_LESSEQUAL                      = 68;
+    const TP_IDENTITY                       = 69;
+    const TP_NONEIDENTITY                   = 70;
+    const TP_MOD                            = 71;
+    const TP_LAND                           = 72;
+    const TP_LOR                            = 73;
+    const TP_LXOR                           = 74;
+    const TP_QUOTE                          = 75;
+    const TP_BACKTICK                       = 76;
+    const TP_DOLLARID                       = 77;
+    const YY_NO_ACTION = 584;
+    const YY_ACCEPT_ACTION = 583;
+    const YY_ERROR_ACTION = 582;
+
+    const YY_SZ_ACTTAB = 2566;
+static public $yy_action = array(
+ /*     0 */   218,  272,  271,  275,  274,  278,  277,  276,  270,  262,
+ /*    10 */   260,  264,  268,  196,  298,  285,   42,   22,  159,  265,
+ /*    20 */    19,   29,  222,  374,  237,   29,  294,   29,  280,  149,
+ /*    30 */   243,   19,  378,  225,  374,  244,   52,   47,   50,   45,
+ /*    40 */    38,   37,  331,  332,   40,   39,  340,  337,   30,   25,
+ /*    50 */   292,  299,  291,  290,  295,  190,  123,  342,  196,  279,
+ /*    60 */   293,  135,  335,  322,  321,  308,  309,  310,  307,  306,
+ /*    70 */   302,  303,  304,  305,  218,  242,  319,  175,  199,  133,
+ /*    80 */   138,   19,  248,   72,  374,  124,   19,  288,  448,  374,
+ /*    90 */    41,   14,  339,  311,  448,   29,  348,  329,  376,  320,
+ /*   100 */    34,  583,   95,  273,  271,  275,  219,    3,  301,    3,
+ /*   110 */    52,   47,   50,   45,   38,   37,  331,  332,   40,   39,
+ /*   120 */   340,  337,   30,   25,    7,  231,   17,  108,  134,  167,
+ /*   130 */   140,   35,  140,  143,  336,  192,  335,  322,  321,  308,
+ /*   140 */   309,  310,  307,  306,  302,  303,  304,  305,  218,  334,
+ /*   150 */   319,  193,  353,   10,  138,    3,  248,   55,    3,  119,
+ /*   160 */   136,   36,   31,  371,  218,   19,  339,  311,  374,   29,
+ /*   170 */   348,  329,   29,  320,  199,   27,  223,  258,  140,  372,
+ /*   180 */   224,  140,  254,  220,   52,   47,   50,   45,   38,   37,
+ /*   190 */   331,  332,   40,   39,  340,  337,   30,   25,  341,  179,
+ /*   200 */    32,  159,  106,  323,   29,  194,  379,  342,  218,  288,
+ /*   210 */   335,  322,  321,  308,  309,  310,  307,  306,  302,  303,
+ /*   220 */   304,  305,  218,  366,  319,  199,  186,  218,  138,  190,
+ /*   230 */   248,   72,  445,  124,  218,  266,  288,  364,  445,  123,
+ /*   240 */   339,  311,  447,   29,  348,  329,   19,  320,  447,  374,
+ /*   250 */    23,    3,  199,   16,  211,   29,  297,  170,   52,   47,
+ /*   260 */    50,   45,   38,   37,  331,  332,   40,   39,  340,  337,
+ /*   270 */    30,   25,  218,  172,  140,  183,  104,   46,   19,  189,
+ /*   280 */   379,  374,   41,  288,  335,  322,  321,  308,  309,  310,
+ /*   290 */   307,  306,  302,  303,  304,  305,  344,  188,  444,  199,
+ /*   300 */   218,  235,  249,  216,   29,  191,  379,  342,   52,   47,
+ /*   310 */    50,   45,   38,   37,  331,  332,   40,   39,  340,  337,
+ /*   320 */    30,   25,  242,   19,  142,   43,  374,  130,  245,   28,
+ /*   330 */    29,  159,  107,  346,  335,  322,  321,  308,  309,  310,
+ /*   340 */   307,  306,  302,  303,  304,  305,  218,  347,  319,   27,
+ /*   350 */    46,  257,  138,  198,  248,   62,  164,  119,  240,  218,
+ /*   360 */   267,  252,  228,  126,  339,  311,  288,  205,  348,  329,
+ /*   370 */   103,  320,    8,  261,  444,  357,  180,  376,  376,   29,
+ /*   380 */    29,   29,   52,   47,   50,   45,   38,   37,  331,  332,
+ /*   390 */    40,   39,  340,  337,   30,   25,  184,  349,  361,  365,
+ /*   400 */    27,  284,  358,   29,   29,   29,  288,   29,  335,  322,
+ /*   410 */   321,  308,  309,  310,  307,  306,  302,  303,  304,  305,
+ /*   420 */   218,  319,  202,  221,  181,  138,  154,  248,   72,  171,
+ /*   430 */   124,  313,    9,  162,  288,  289,  163,  339,  311,  288,
+ /*   440 */   320,  348,  329,  288,  320,  376,  288,  281,  269,  370,
+ /*   450 */   376,  214,    6,   29,   29,   29,   52,   47,   50,   45,
+ /*   460 */    38,   37,  331,  332,   40,   39,  340,  337,   30,   25,
+ /*   470 */   218,  178,  239,  283,  373,   19,  226,  238,  374,   29,
+ /*   480 */    29,  288,  335,  322,  321,  308,  309,  310,  307,  306,
+ /*   490 */   302,  303,  304,  305,  177,  205,  286,  202,  227,  377,
+ /*   500 */     8,  166,   29,  376,  288,   29,   52,   47,   50,   45,
+ /*   510 */    38,   37,  331,  332,   40,   39,  340,  337,   30,   25,
+ /*   520 */   202,  218,  363,  375,  380,  315,  235,  296,   29,   29,
+ /*   530 */    29,   29,  335,  322,  321,  308,  309,  310,  307,  306,
+ /*   540 */   302,  303,  304,  305,  197,  369,  352,   19,  327,  218,
+ /*   550 */   236,   29,   29,  165,  234,  156,  174,   52,   47,   50,
+ /*   560 */    45,   38,   37,  331,  332,   40,   39,  340,  337,   30,
+ /*   570 */    25,   26,  344,    5,   19,  314,  199,  212,   19,  199,
+ /*   580 */   159,  241,  218,  335,  322,  321,  308,  309,  310,  307,
+ /*   590 */   306,  302,  303,  304,  305,  218,  319,  300,  100,   46,
+ /*   600 */   138,   19,  248,   76,  233,  124,    6,  218,  110,  351,
+ /*   610 */   201,  338,  339,  311,  115,  168,  348,  329,  123,  320,
+ /*   620 */   182,  338,  287,  234,  105,  288,  324,  338,  235,  240,
+ /*   630 */   288,   52,   47,   50,   45,   38,   37,  331,  332,   40,
+ /*   640 */    39,  340,  337,   30,   25,  218,  333,  144,  263,   33,
+ /*   650 */    13,  342,  312,  156,   29,  355,   97,  335,  322,  321,
+ /*   660 */   308,  309,  310,  307,  306,  302,  303,  304,  305,  338,
+ /*   670 */   141,   32,  325,  121,  195,  131,  356,  229,  127,    2,
+ /*   680 */   250,   52,   47,   50,   45,   38,   37,  331,  332,   40,
+ /*   690 */    39,  340,  337,   30,   25,  318,  228,   11,  330,   94,
+ /*   700 */   129,  282,  218,  253,  159,   29,  323,  335,  322,  321,
+ /*   710 */   308,  309,  310,  307,  306,  302,  303,  304,  305,  218,
+ /*   720 */   218,  319,   18,  101,  148,  122,  114,  248,   54,   44,
+ /*   730 */   124,  202,   99,  158,  316,  367,  376,  339,  311,  338,
+ /*   740 */    29,  348,  329,  376,  320,  338,  338,  354,  169,  368,
+ /*   750 */   321,  321,  321,  321,  321,   52,   47,   50,   45,   38,
+ /*   760 */    37,  331,  332,   40,   39,  340,  337,   30,   25,  218,
+ /*   770 */    46,  321,  321,  321,  321,  321,  321,  321,  321,  321,
+ /*   780 */   113,  335,  322,  321,  308,  309,  310,  307,  306,  302,
+ /*   790 */   303,  304,  305,  338,  321,  321,  321,  321,  321,  321,
+ /*   800 */   321,  321,  321,  321,  256,   52,   47,   50,   45,   38,
+ /*   810 */    37,  331,  332,   40,   39,  340,  337,   30,   25,  218,
+ /*   820 */   321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
+ /*   830 */   321,  335,  322,  321,  308,  309,  310,  307,  306,  302,
+ /*   840 */   303,  304,  305,  321,  321,  321,  321,  321,  321,  321,
+ /*   850 */   321,  321,  321,  321,  321,   52,   47,   50,   45,   38,
+ /*   860 */    37,  331,  332,   40,   39,  340,  337,   30,   25,  218,
+ /*   870 */    12,  321,  321,  321,  321,  321,  321,  321,  321,  321,
+ /*   880 */   382,  335,  322,  321,  308,  309,  310,  307,  306,  302,
+ /*   890 */   303,  304,  305,  321,  321,  321,  321,  321,  321,  321,
+ /*   900 */   321,  321,  321,  321,  321,   52,   47,   50,   45,   38,
+ /*   910 */    37,  331,  332,   40,   39,  340,  337,   30,   25,  321,
+ /*   920 */   321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
+ /*   930 */   321,  335,  322,  321,  308,  309,  310,  307,  306,  302,
+ /*   940 */   303,  304,  305,  218,  319,  321,  321,  321,  138,  321,
+ /*   950 */   248,   61,  321,  124,  321,   98,  132,  321,  200,  321,
+ /*   960 */   339,  311,  321,  321,  348,  329,  321,  320,  338,  338,
+ /*   970 */   321,  321,  321,  321,  321,  321,  321,  321,  321,   52,
+ /*   980 */    47,   50,   45,   38,   37,  331,  332,   40,   39,  340,
+ /*   990 */   337,   30,   25,  218,  321,  321,  321,  321,  321,  321,
+ /*  1000 */   321,  321,  321,  321,  321,  335,  322,  321,  308,  309,
+ /*  1010 */   310,  307,  306,  302,  303,  304,  305,  321,  321,  321,
+ /*  1020 */   321,  321,  321,  321,  321,  321,  321,  321,  321,   52,
+ /*  1030 */    47,   50,   45,   38,   37,  331,  332,   40,   39,  340,
+ /*  1040 */   337,   30,   25,  321,  321,  321,  321,  321,  321,  321,
+ /*  1050 */   321,  321,  321,  321,  321,  335,  322,  321,  308,  309,
+ /*  1060 */   310,  307,  306,  302,  303,  304,  305,   52,   47,   50,
+ /*  1070 */    45,   38,   37,  331,  332,   40,   39,  340,  337,   30,
+ /*  1080 */    25,  321,  321,  321,  321,  321,  321,  321,  321,  321,
+ /*  1090 */   321,  321,  321,  335,  322,  321,  308,  309,  310,  307,
+ /*  1100 */   306,  302,  303,  304,  305,  321,  321,  321,  321,   42,
+ /*  1110 */   321,  139,  207,  321,  319,  222,  321,  237,  138,  321,
+ /*  1120 */   248,   78,  149,  124,  321,  378,  225,  232,  321,   15,
+ /*  1130 */   339,  311,   49,  321,  348,  329,  321,  320,  321,  321,
+ /*  1140 */   321,  321,  321,  321,  321,  321,  321,   51,   48,  317,
+ /*  1150 */   247,  328,  321,  319,  103,    1,  255,  145,  321,  248,
+ /*  1160 */   321,  321,  124,  321,   42,  321,  139,  209,  321,   96,
+ /*  1170 */   222,  321,  237,  348,  329,  321,  320,  149,  345,  321,
+ /*  1180 */   378,  225,  232,   24,   15,  321,  321,   49,  321,  222,
+ /*  1190 */   321,  237,  321,  321,  321,  321,  149,  321,  321,  378,
+ /*  1200 */   225,  321,   51,   48,  317,  247,  328,  321,  319,  103,
+ /*  1210 */     1,  321,  146,  321,  248,  321,  321,  124,  321,   42,
+ /*  1220 */   161,  130,  209,  193,   96,  222,  321,  237,  348,  329,
+ /*  1230 */   288,  320,  149,   36,   31,  378,  225,  232,  321,   21,
+ /*  1240 */   321,  321,   49,  350,   20,  343,  199,  319,  218,  321,
+ /*  1250 */   321,  155,  321,  248,  321,  321,  124,   51,   48,  317,
+ /*  1260 */   247,  328,  321,  450,  103,    1,  321,  348,  329,  450,
+ /*  1270 */   320,  321,  321,  321,   42,  321,  125,  209,  321,   96,
+ /*  1280 */   222,  321,  237,  321,  321,  321,  321,  149,  345,  321,
+ /*  1290 */   378,  225,  232,   24,    4,  321,  321,   49,   46,  222,
+ /*  1300 */   321,  237,  321,  321,  321,  321,  149,  321,  321,  378,
+ /*  1310 */   225,  321,   51,   48,  317,  247,  328,  321,  319,  103,
+ /*  1320 */     1,  321,  151,  321,  248,  321,  321,  124,  321,   42,
+ /*  1330 */   176,  139,  204,  193,   96,  222,  321,  237,  348,  329,
+ /*  1340 */   288,  320,  149,   36,   31,  378,  225,  215,  321,   15,
+ /*  1350 */   321,  321,   49,  362,   20,  343,  199,  319,  218,  321,
+ /*  1360 */   321,  150,  321,  248,  321,  321,  124,   51,   48,  317,
+ /*  1370 */   247,  328,  321,  259,  103,    1,  321,  348,  329,   29,
+ /*  1380 */   320,  321,  321,  321,   42,  173,  128,   92,  193,   96,
+ /*  1390 */   222,  321,  237,  321,  218,  288,  321,  149,   36,   31,
+ /*  1400 */   378,  225,  232,  321,   15,  321,  321,   49,   46,  381,
+ /*  1410 */   321,  199,  319,  230,  321,   29,  152,  321,  248,  321,
+ /*  1420 */   321,  124,   51,   48,  317,  247,  328,  321,    3,  103,
+ /*  1430 */     1,  321,  348,  329,  321,  320,  321,  321,  321,   42,
+ /*  1440 */   185,  139,  208,  102,   96,  222,  321,  237,  321,  321,
+ /*  1450 */   288,  140,  149,   36,   31,  378,  225,  232,  321,   15,
+ /*  1460 */   321,  321,   49,  321,  321,  321,  199,  319,  321,  321,
+ /*  1470 */   321,  147,  321,  248,  321,  321,  124,   51,   48,  317,
+ /*  1480 */   247,  328,  321,  321,  103,    1,  321,  348,  329,  321,
+ /*  1490 */   320,  321,  321,  321,   42,  187,  139,  203,  193,   96,
+ /*  1500 */   222,  321,  237,  321,  321,  288,  321,  149,   36,   31,
+ /*  1510 */   378,  225,  232,  321,   15,  321,  160,   49,  321,  193,
+ /*  1520 */   321,  199,  321,  321,  321,  321,  288,  321,  321,   36,
+ /*  1530 */    31,  321,   51,   48,  317,  247,  328,  321,  321,  103,
+ /*  1540 */     1,  321,  199,  321,  321,  321,  321,  321,  321,   42,
+ /*  1550 */   321,  139,  206,  218,   96,  222,  321,  237,  321,  321,
+ /*  1560 */   321,  321,  149,  321,  321,  378,  225,  232,  450,   15,
+ /*  1570 */   321,  321,   49,  321,  450,  321,  321,  321,  321,  321,
+ /*  1580 */   321,  246,  321,  321,  321,  321,  321,   51,   48,  317,
+ /*  1590 */   247,  328,  321,  321,  103,    1,  321,  321,  321,  321,
+ /*  1600 */   321,  321,  321,   46,   42,  321,  137,  209,  321,   96,
+ /*  1610 */   222,  321,  237,  321,  321,  321,  321,  149,  321,  321,
+ /*  1620 */   378,  225,  232,  321,   15,  321,  321,   49,  321,  321,
+ /*  1630 */   321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
+ /*  1640 */   321,  321,   51,   48,  317,  247,  328,  321,  321,  103,
+ /*  1650 */     1,  321,  321,  321,  321,  321,  321,  321,  321,   42,
+ /*  1660 */   321,  130,  210,  321,   96,  222,  321,  237,  321,  321,
+ /*  1670 */   321,  321,  149,  321,  321,  378,  225,  232,  321,   21,
+ /*  1680 */   321,  321,   49,  321,  321,  321,  321,  321,  321,  321,
+ /*  1690 */   321,  321,  321,  321,  321,  321,  321,   51,   48,  317,
+ /*  1700 */   247,  328,  321,  321,  103,  321,  321,  321,  321,  321,
+ /*  1710 */   321,  321,  321,  321,   42,  321,  130,  209,  321,   96,
+ /*  1720 */   222,  321,  237,  321,  321,  321,  321,  149,  321,  321,
+ /*  1730 */   378,  225,  232,  321,   21,  321,  321,   49,  321,  321,
+ /*  1740 */   321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
+ /*  1750 */   321,  321,   51,   48,  317,  247,  328,  321,  321,  103,
+ /*  1760 */   321,  321,  321,  321,  321,  321,  321,  321,  321,  493,
+ /*  1770 */   321,  321,  321,  321,   96,  493,  321,  493,  321,  493,
+ /*  1780 */   493,  321,  493,  321,  321,  321,  321,  493,    3,  493,
+ /*  1790 */   321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
+ /*  1800 */   321,  321,  321,  319,  493,  321,  321,  117,  321,  248,
+ /*  1810 */    82,  140,  124,  321,  321,  493,  321,  321,  321,  339,
+ /*  1820 */   311,  321,  321,  348,  329,  321,  320,  321,  321,  493,
+ /*  1830 */   321,  321,  321,  321,  321,  321,  319,  217,  360,  321,
+ /*  1840 */   117,  321,  248,   82,  321,  124,  321,  321,  321,  321,
+ /*  1850 */   321,  321,  339,  311,  321,  321,  348,  329,  319,  320,
+ /*  1860 */   321,  321,  138,  321,  248,   90,  321,  124,  321,  321,
+ /*  1870 */   321,  359,  321,  321,  339,  311,  321,  321,  348,  329,
+ /*  1880 */   321,  320,  321,  321,  321,  321,  319,  321,  321,  321,
+ /*  1890 */   138,  321,  248,   69,  321,  124,  321,  321,  321,  321,
+ /*  1900 */   321,  321,  339,  311,  321,  321,  348,  329,  321,  320,
+ /*  1910 */   321,  321,  319,  321,  321,  321,  138,  321,  248,   67,
+ /*  1920 */   321,  124,  321,  321,  321,  321,  321,  321,  339,  311,
+ /*  1930 */   321,  321,  348,  329,  321,  320,  319,  321,  321,  321,
+ /*  1940 */   138,  321,  248,   58,  321,  124,  321,  321,  321,  321,
+ /*  1950 */   321,  321,  339,  311,  319,  321,  348,  329,  138,  320,
+ /*  1960 */   248,   62,  321,  124,  321,  321,  321,  321,  321,  321,
+ /*  1970 */   339,  311,  321,  321,  348,  329,  319,  320,  321,  321,
+ /*  1980 */   138,  321,  248,   56,  321,  124,  321,  321,  321,  321,
+ /*  1990 */   321,  321,  339,  311,  321,  321,  348,  329,  321,  320,
+ /*  2000 */   321,  319,  321,  321,  321,  112,  321,  248,   71,  321,
+ /*  2010 */   124,  321,  321,  321,  321,  321,  321,  339,  311,  319,
+ /*  2020 */   321,  348,  329,  111,  320,  248,   81,  321,  124,  321,
+ /*  2030 */   321,  321,  321,  321,  321,  339,  311,  319,  321,  348,
+ /*  2040 */   329,  138,  320,  248,   74,  321,  124,  321,  321,  321,
+ /*  2050 */   321,  321,  321,  339,  311,  321,  321,  348,  329,  319,
+ /*  2060 */   320,  321,  321,  138,  321,  248,   91,  321,  124,  321,
+ /*  2070 */   321,  321,  321,  321,  321,  339,  311,  321,  321,  348,
+ /*  2080 */   329,  321,  320,  321,  319,  321,  321,  321,  138,  321,
+ /*  2090 */   248,   64,  321,  124,  321,  321,  321,  321,  321,  321,
+ /*  2100 */   339,  311,  319,  321,  348,  329,  138,  320,  248,   63,
+ /*  2110 */   321,  124,  321,  321,  321,  321,  321,  321,  339,  311,
+ /*  2120 */   319,  321,  348,  329,  138,  320,  248,   83,  321,  124,
+ /*  2130 */   321,  321,  321,  321,  321,  321,  339,  311,  321,  321,
+ /*  2140 */   348,  329,  319,  320,  321,  321,  138,  321,  248,   79,
+ /*  2150 */   321,  124,  321,  321,  321,  321,  321,  321,  339,  311,
+ /*  2160 */   321,  321,  348,  329,  321,  320,  321,  319,  321,  321,
+ /*  2170 */   321,  138,  321,  248,   75,  321,  124,  321,  321,  321,
+ /*  2180 */   321,  321,  321,  339,  311,  319,  321,  348,  329,  138,
+ /*  2190 */   320,  248,   70,  321,  124,  321,  321,  321,  321,  321,
+ /*  2200 */   321,  339,  311,  319,  321,  348,  329,  109,  320,  248,
+ /*  2210 */    68,  321,  124,  321,  321,  321,  321,  321,  321,  339,
+ /*  2220 */   311,  321,  321,  348,  329,  319,  320,  321,  321,  138,
+ /*  2230 */   321,  248,   77,  321,  124,  321,  321,  321,  321,  321,
+ /*  2240 */   321,  339,  311,  321,  321,  348,  329,  321,  320,  321,
+ /*  2250 */   319,  321,  321,  321,  138,  321,  248,   73,  321,  124,
+ /*  2260 */   321,  321,  321,  321,  321,  321,  339,  311,  319,  321,
+ /*  2270 */   348,  329,  138,  320,  213,   65,  321,  124,  321,  321,
+ /*  2280 */   321,  321,  321,  321,  339,  311,  319,  321,  348,  329,
+ /*  2290 */   138,  320,  248,   86,  321,  124,  321,  321,  321,  321,
+ /*  2300 */   321,  321,  339,  311,  321,  321,  348,  329,  319,  320,
+ /*  2310 */   321,  321,  138,  321,  248,   88,  321,  124,  321,  321,
+ /*  2320 */   321,  321,  321,  321,  339,  311,  321,  321,  348,  329,
+ /*  2330 */   321,  320,  321,  319,  321,  321,  321,   93,  321,  120,
+ /*  2340 */    59,  321,  116,  321,  321,  321,  321,  321,  321,  339,
+ /*  2350 */   311,  319,  321,  348,  329,  138,  320,  248,   57,  321,
+ /*  2360 */   124,  321,  321,  321,  321,  321,  321,  339,  311,  319,
+ /*  2370 */   321,  348,  329,  138,  320,  248,   60,  321,  124,  321,
+ /*  2380 */   321,  321,  321,  321,  321,  339,  311,  321,  321,  348,
+ /*  2390 */   329,  319,  320,  321,  321,  138,  321,  248,   89,  321,
+ /*  2400 */   124,  321,  321,  321,  321,  321,  321,  339,  311,  321,
+ /*  2410 */   321,  348,  329,  321,  320,  321,  319,  321,  321,  321,
+ /*  2420 */   138,  321,  248,   85,  321,  124,  321,  321,  321,  321,
+ /*  2430 */   321,  321,  339,  311,  319,  321,  348,  329,  138,  320,
+ /*  2440 */   248,   80,  321,  124,  321,  321,  321,  321,  321,  321,
+ /*  2450 */   339,  311,  319,  321,  348,  329,  138,  320,  248,   84,
+ /*  2460 */   321,  124,  321,  321,  321,  321,  321,  321,  339,  311,
+ /*  2470 */   321,  321,  348,  329,  319,  320,  321,  321,  138,  321,
+ /*  2480 */   248,   66,  321,  124,  321,  321,  321,  321,  321,  321,
+ /*  2490 */   339,  311,  321,  321,  348,  329,  321,  320,  321,  319,
+ /*  2500 */   321,  321,  321,  138,  321,  248,   87,  321,  124,  321,
+ /*  2510 */   321,  321,  321,  321,  321,  339,  311,  319,  321,  348,
+ /*  2520 */   329,   93,  320,  118,   53,  321,  116,  321,  321,  321,
+ /*  2530 */   321,  321,  321,  339,  311,  319,  321,  348,  329,  153,
+ /*  2540 */   320,  248,  319,  321,  124,  321,  157,  321,  248,  321,
+ /*  2550 */   321,  124,  326,  321,  321,  348,  329,  321,  320,  251,
+ /*  2560 */   321,  321,  348,  329,  321,  320,
+    );
+    static public $yy_lookahead = array(
+ /*     0 */     1,   81,   82,   83,    3,    4,    5,    6,    7,    8,
+ /*    10 */     9,   10,   11,   12,   22,   16,   15,   19,   20,   16,
+ /*    20 */    15,   22,   21,   18,   23,   22,   83,   22,   85,   28,
+ /*    30 */    94,   15,   31,   32,   18,   30,   37,   38,   39,   40,
+ /*    40 */    41,   42,   43,   44,   45,   46,   47,   48,   49,   50,
+ /*    50 */     4,    5,    6,    7,    8,   90,   58,   25,   12,   13,
+ /*    60 */    14,   17,   63,   64,   65,   66,   67,   68,   69,   70,
+ /*    70 */    71,   72,   73,   74,    1,   59,   82,   87,  113,   35,
+ /*    80 */    86,   15,   88,   89,   18,   91,   15,   97,   16,   18,
+ /*    90 */    19,   19,   98,   99,   22,   22,  102,  103,  108,  105,
+ /*   100 */    27,   79,   80,   81,   82,   83,  112,   35,   76,   35,
+ /*   110 */    37,   38,   39,   40,   41,   42,   43,   44,   45,   46,
+ /*   120 */    47,   48,   49,   50,   34,   59,   15,   84,   17,   18,
+ /*   130 */    58,   15,   58,   17,   18,  114,   63,   64,   65,   66,
+ /*   140 */    67,   68,   69,   70,   71,   72,   73,   74,    1,   33,
+ /*   150 */    82,   90,   62,   30,   86,   35,   88,   89,   35,   91,
+ /*   160 */    92,  100,  101,   16,    1,   15,   98,   99,   18,   22,
+ /*   170 */   102,  103,   22,  105,  113,   34,   56,   36,   58,   16,
+ /*   180 */    30,   58,   62,   20,   37,   38,   39,   40,   41,   42,
+ /*   190 */    43,   44,   45,   46,   47,   48,   49,   50,   16,   87,
+ /*   200 */    19,   20,   90,  107,   22,  109,  110,   25,    1,   97,
+ /*   210 */    63,   64,   65,   66,   67,   68,   69,   70,   71,   72,
+ /*   220 */    73,   74,    1,   16,   82,  113,   87,    1,   86,   90,
+ /*   230 */    88,   89,   16,   91,    1,   13,   97,   16,   22,   58,
+ /*   240 */    98,   99,   16,   22,  102,  103,   15,  105,   22,   18,
+ /*   250 */    19,   35,  113,   94,  112,   22,   25,  106,   37,   38,
+ /*   260 */    39,   40,   41,   42,   43,   44,   45,   46,   47,   48,
+ /*   270 */    49,   50,    1,   87,   58,  106,   90,   51,   15,  109,
+ /*   280 */   110,   18,   19,   97,   63,   64,   65,   66,   67,   68,
+ /*   290 */    69,   70,   71,   72,   73,   74,   82,  114,   16,  113,
+ /*   300 */     1,   91,   92,   93,   22,  109,  110,   25,   37,   38,
+ /*   310 */    39,   40,   41,   42,   43,   44,   45,   46,   47,   48,
+ /*   320 */    49,   50,   59,   15,   17,   19,   18,   17,   18,   30,
+ /*   330 */    22,   20,  118,  119,   63,   64,   65,   66,   67,   68,
+ /*   340 */    69,   70,   71,   72,   73,   74,    1,   76,   82,   34,
+ /*   350 */    51,   36,   86,   24,   88,   89,   87,   91,   92,    1,
+ /*   360 */    36,   16,   56,   34,   98,   99,   97,   56,  102,  103,
+ /*   370 */    60,  105,   61,   16,   16,   16,  106,  108,  108,   22,
+ /*   380 */    22,   22,   37,   38,   39,   40,   41,   42,   43,   44,
+ /*   390 */    45,   46,   47,   48,   49,   50,   87,   16,   16,   16,
+ /*   400 */    34,   16,   36,   22,   22,   22,   97,   22,   63,   64,
+ /*   410 */    65,   66,   67,   68,   69,   70,   71,   72,   73,   74,
+ /*   420 */     1,   82,  113,   88,   87,   86,   91,   88,   89,   87,
+ /*   430 */    91,   18,   15,   87,   97,   16,   87,   98,   99,   97,
+ /*   440 */   105,  102,  103,   97,  105,  108,   97,   16,   16,   16,
+ /*   450 */   108,  112,   35,   22,   22,   22,   37,   38,   39,   40,
+ /*   460 */    41,   42,   43,   44,   45,   46,   47,   48,   49,   50,
+ /*   470 */     1,   87,   59,   16,   16,   15,   17,   18,   18,   22,
+ /*   480 */    22,   97,   63,   64,   65,   66,   67,   68,   69,   70,
+ /*   490 */    71,   72,   73,   74,   87,   56,   16,  113,   29,   16,
+ /*   500 */    61,  106,   22,  108,   97,   22,   37,   38,   39,   40,
+ /*   510 */    41,   42,   43,   44,   45,   46,   47,   48,   49,   50,
+ /*   520 */   113,    1,   16,   16,   16,   16,   91,   92,   22,   22,
+ /*   530 */    22,   22,   63,   64,   65,   66,   67,   68,   69,   70,
+ /*   540 */    71,   72,   73,   74,   24,   16,   16,   15,  104,    1,
+ /*   550 */    18,   22,   22,   90,    2,  111,   90,   37,   38,   39,
+ /*   560 */    40,   41,   42,   43,   44,   45,   46,   47,   48,   49,
+ /*   570 */    50,   19,   82,   35,   15,   18,  113,   18,   15,  113,
+ /*   580 */    20,   18,    1,   63,   64,   65,   66,   67,   68,   69,
+ /*   590 */    70,   71,   72,   73,   74,    1,   82,   16,   95,   51,
+ /*   600 */    86,   15,   88,   89,   18,   91,   35,    1,   95,  119,
+ /*   610 */    16,  108,   98,   99,   95,   87,  102,  103,   58,  105,
+ /*   620 */    87,  108,   16,    2,   22,   97,   18,  108,   91,   92,
+ /*   630 */    97,   37,   38,   39,   40,   41,   42,   43,   44,   45,
+ /*   640 */    46,   47,   48,   49,   50,    1,  104,   17,   16,   26,
+ /*   650 */    52,   25,   33,  111,   22,   60,   95,   63,   64,   65,
+ /*   660 */    66,   67,   68,   69,   70,   71,   72,   73,   74,  108,
+ /*   670 */    17,   19,   18,   18,   18,   17,   60,   18,   17,   22,
+ /*   680 */    36,   37,   38,   39,   40,   41,   42,   43,   44,   45,
+ /*   690 */    46,   47,   48,   49,   50,   33,   56,    2,   18,   18,
+ /*   700 */    18,   97,    1,   62,   20,   22,  107,   63,   64,   65,
+ /*   710 */    66,   67,   68,   69,   70,   71,   72,   73,   74,    1,
+ /*   720 */     1,   82,   22,  106,   96,   86,   95,   88,   89,    2,
+ /*   730 */    91,  113,   95,   95,  110,   16,  108,   98,   99,  108,
+ /*   740 */    22,  102,  103,  108,  105,  108,  108,  111,  106,  115,
+ /*   750 */   120,  120,  120,  120,  120,   37,   38,   39,   40,   41,
+ /*   760 */    42,   43,   44,   45,   46,   47,   48,   49,   50,    1,
+ /*   770 */    51,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+ /*   780 */    95,   63,   64,   65,   66,   67,   68,   69,   70,   71,
+ /*   790 */    72,   73,   74,  108,  120,  120,  120,  120,  120,  120,
+ /*   800 */   120,  120,  120,  120,   36,   37,   38,   39,   40,   41,
+ /*   810 */    42,   43,   44,   45,   46,   47,   48,   49,   50,    1,
+ /*   820 */   120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+ /*   830 */   120,   63,   64,   65,   66,   67,   68,   69,   70,   71,
+ /*   840 */    72,   73,   74,  120,  120,  120,  120,  120,  120,  120,
+ /*   850 */   120,  120,  120,  120,  120,   37,   38,   39,   40,   41,
+ /*   860 */    42,   43,   44,   45,   46,   47,   48,   49,   50,    1,
+ /*   870 */     2,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+ /*   880 */    62,   63,   64,   65,   66,   67,   68,   69,   70,   71,
+ /*   890 */    72,   73,   74,  120,  120,  120,  120,  120,  120,  120,
+ /*   900 */   120,  120,  120,  120,  120,   37,   38,   39,   40,   41,
+ /*   910 */    42,   43,   44,   45,   46,   47,   48,   49,   50,  120,
+ /*   920 */   120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+ /*   930 */   120,   63,   64,   65,   66,   67,   68,   69,   70,   71,
+ /*   940 */    72,   73,   74,    1,   82,  120,  120,  120,   86,  120,
+ /*   950 */    88,   89,  120,   91,  120,   95,   95,  120,   16,  120,
+ /*   960 */    98,   99,  120,  120,  102,  103,  120,  105,  108,  108,
+ /*   970 */   120,  120,  120,  120,  120,  120,  120,  120,  120,   37,
+ /*   980 */    38,   39,   40,   41,   42,   43,   44,   45,   46,   47,
+ /*   990 */    48,   49,   50,    1,  120,  120,  120,  120,  120,  120,
+ /*  1000 */   120,  120,  120,  120,  120,   63,   64,   65,   66,   67,
+ /*  1010 */    68,   69,   70,   71,   72,   73,   74,  120,  120,  120,
+ /*  1020 */   120,  120,  120,  120,  120,  120,  120,  120,  120,   37,
+ /*  1030 */    38,   39,   40,   41,   42,   43,   44,   45,   46,   47,
+ /*  1040 */    48,   49,   50,  120,  120,  120,  120,  120,  120,  120,
+ /*  1050 */   120,  120,  120,  120,  120,   63,   64,   65,   66,   67,
+ /*  1060 */    68,   69,   70,   71,   72,   73,   74,   37,   38,   39,
+ /*  1070 */    40,   41,   42,   43,   44,   45,   46,   47,   48,   49,
+ /*  1080 */    50,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+ /*  1090 */   120,  120,  120,   63,   64,   65,   66,   67,   68,   69,
+ /*  1100 */    70,   71,   72,   73,   74,  120,  120,  120,  120,   15,
+ /*  1110 */   120,   17,   18,  120,   82,   21,  120,   23,   86,  120,
+ /*  1120 */    88,   89,   28,   91,  120,   31,   32,   33,  120,   35,
+ /*  1130 */    98,   99,   38,  120,  102,  103,  120,  105,  120,  120,
+ /*  1140 */   120,  120,  120,  120,  120,  120,  120,   53,   54,   55,
+ /*  1150 */    56,   57,  120,   82,   60,   61,   62,   86,  120,   88,
+ /*  1160 */   120,  120,   91,  120,   15,  120,   17,   18,  120,   75,
+ /*  1170 */    21,  120,   23,  102,  103,  120,  105,   28,   10,  120,
+ /*  1180 */    31,   32,   33,   15,   35,  120,  120,   38,  120,   21,
+ /*  1190 */   120,   23,  120,  120,  120,  120,   28,  120,  120,   31,
+ /*  1200 */    32,  120,   53,   54,   55,   56,   57,  120,   82,   60,
+ /*  1210 */    61,  120,   86,  120,   88,  120,  120,   91,  120,   15,
+ /*  1220 */    87,   17,   18,   90,   75,   21,  120,   23,  102,  103,
+ /*  1230 */    97,  105,   28,  100,  101,   31,   32,   33,  120,   35,
+ /*  1240 */   120,  120,   38,   75,   76,   77,  113,   82,    1,  120,
+ /*  1250 */   120,   86,  120,   88,  120,  120,   91,   53,   54,   55,
+ /*  1260 */    56,   57,  120,   16,   60,   61,  120,  102,  103,   22,
+ /*  1270 */   105,  120,  120,  120,   15,  120,   17,   18,  120,   75,
+ /*  1280 */    21,  120,   23,  120,  120,  120,  120,   28,   10,  120,
+ /*  1290 */    31,   32,   33,   15,   35,  120,  120,   38,   51,   21,
+ /*  1300 */   120,   23,  120,  120,  120,  120,   28,  120,  120,   31,
+ /*  1310 */    32,  120,   53,   54,   55,   56,   57,  120,   82,   60,
+ /*  1320 */    61,  120,   86,  120,   88,  120,  120,   91,  120,   15,
+ /*  1330 */    87,   17,   18,   90,   75,   21,  120,   23,  102,  103,
+ /*  1340 */    97,  105,   28,  100,  101,   31,   32,   33,  120,   35,
+ /*  1350 */   120,  120,   38,   75,   76,   77,  113,   82,    1,  120,
+ /*  1360 */   120,   86,  120,   88,  120,  120,   91,   53,   54,   55,
+ /*  1370 */    56,   57,  120,   16,   60,   61,  120,  102,  103,   22,
+ /*  1380 */   105,  120,  120,  120,   15,   87,   17,   18,   90,   75,
+ /*  1390 */    21,  120,   23,  120,    1,   97,  120,   28,  100,  101,
+ /*  1400 */    31,   32,   33,  120,   35,  120,  120,   38,   51,   16,
+ /*  1410 */   120,  113,   82,   20,  120,   22,   86,  120,   88,  120,
+ /*  1420 */   120,   91,   53,   54,   55,   56,   57,  120,   35,   60,
+ /*  1430 */    61,  120,  102,  103,  120,  105,  120,  120,  120,   15,
+ /*  1440 */    87,   17,   18,   90,   75,   21,  120,   23,  120,  120,
+ /*  1450 */    97,   58,   28,  100,  101,   31,   32,   33,  120,   35,
+ /*  1460 */   120,  120,   38,  120,  120,  120,  113,   82,  120,  120,
+ /*  1470 */   120,   86,  120,   88,  120,  120,   91,   53,   54,   55,
+ /*  1480 */    56,   57,  120,  120,   60,   61,  120,  102,  103,  120,
+ /*  1490 */   105,  120,  120,  120,   15,   87,   17,   18,   90,   75,
+ /*  1500 */    21,  120,   23,  120,  120,   97,  120,   28,  100,  101,
+ /*  1510 */    31,   32,   33,  120,   35,  120,   87,   38,  120,   90,
+ /*  1520 */   120,  113,  120,  120,  120,  120,   97,  120,  120,  100,
+ /*  1530 */   101,  120,   53,   54,   55,   56,   57,  120,  120,   60,
+ /*  1540 */    61,  120,  113,  120,  120,  120,  120,  120,  120,   15,
+ /*  1550 */   120,   17,   18,    1,   75,   21,  120,   23,  120,  120,
+ /*  1560 */   120,  120,   28,  120,  120,   31,   32,   33,   16,   35,
+ /*  1570 */   120,  120,   38,  120,   22,  120,  120,  120,  120,  120,
+ /*  1580 */   120,   29,  120,  120,  120,  120,  120,   53,   54,   55,
+ /*  1590 */    56,   57,  120,  120,   60,   61,  120,  120,  120,  120,
+ /*  1600 */   120,  120,  120,   51,   15,  120,   17,   18,  120,   75,
+ /*  1610 */    21,  120,   23,  120,  120,  120,  120,   28,  120,  120,
+ /*  1620 */    31,   32,   33,  120,   35,  120,  120,   38,  120,  120,
+ /*  1630 */   120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+ /*  1640 */   120,  120,   53,   54,   55,   56,   57,  120,  120,   60,
+ /*  1650 */    61,  120,  120,  120,  120,  120,  120,  120,  120,   15,
+ /*  1660 */   120,   17,   18,  120,   75,   21,  120,   23,  120,  120,
+ /*  1670 */   120,  120,   28,  120,  120,   31,   32,   33,  120,   35,
+ /*  1680 */   120,  120,   38,  120,  120,  120,  120,  120,  120,  120,
+ /*  1690 */   120,  120,  120,  120,  120,  120,  120,   53,   54,   55,
+ /*  1700 */    56,   57,  120,  120,   60,  120,  120,  120,  120,  120,
+ /*  1710 */   120,  120,  120,  120,   15,  120,   17,   18,  120,   75,
+ /*  1720 */    21,  120,   23,  120,  120,  120,  120,   28,  120,  120,
+ /*  1730 */    31,   32,   33,  120,   35,  120,  120,   38,  120,  120,
+ /*  1740 */   120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+ /*  1750 */   120,  120,   53,   54,   55,   56,   57,  120,  120,   60,
+ /*  1760 */   120,  120,  120,  120,  120,  120,  120,  120,  120,   16,
+ /*  1770 */   120,  120,  120,  120,   75,   22,  120,   24,  120,   26,
+ /*  1780 */    27,  120,   29,  120,  120,  120,  120,   34,   35,   36,
+ /*  1790 */   120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+ /*  1800 */   120,  120,  120,   82,   51,  120,  120,   86,  120,   88,
+ /*  1810 */    89,   58,   91,  120,  120,   62,  120,  120,  120,   98,
+ /*  1820 */    99,  120,  120,  102,  103,  120,  105,  120,  120,   76,
+ /*  1830 */   120,  120,  120,  120,  120,  120,   82,  116,  117,  120,
+ /*  1840 */    86,  120,   88,   89,  120,   91,  120,  120,  120,  120,
+ /*  1850 */   120,  120,   98,   99,  120,  120,  102,  103,   82,  105,
+ /*  1860 */   120,  120,   86,  120,   88,   89,  120,   91,  120,  120,
+ /*  1870 */   120,  117,  120,  120,   98,   99,  120,  120,  102,  103,
+ /*  1880 */   120,  105,  120,  120,  120,  120,   82,  120,  120,  120,
+ /*  1890 */    86,  120,   88,   89,  120,   91,  120,  120,  120,  120,
+ /*  1900 */   120,  120,   98,   99,  120,  120,  102,  103,  120,  105,
+ /*  1910 */   120,  120,   82,  120,  120,  120,   86,  120,   88,   89,
+ /*  1920 */   120,   91,  120,  120,  120,  120,  120,  120,   98,   99,
+ /*  1930 */   120,  120,  102,  103,  120,  105,   82,  120,  120,  120,
+ /*  1940 */    86,  120,   88,   89,  120,   91,  120,  120,  120,  120,
+ /*  1950 */   120,  120,   98,   99,   82,  120,  102,  103,   86,  105,
+ /*  1960 */    88,   89,  120,   91,  120,  120,  120,  120,  120,  120,
+ /*  1970 */    98,   99,  120,  120,  102,  103,   82,  105,  120,  120,
+ /*  1980 */    86,  120,   88,   89,  120,   91,  120,  120,  120,  120,
+ /*  1990 */   120,  120,   98,   99,  120,  120,  102,  103,  120,  105,
+ /*  2000 */   120,   82,  120,  120,  120,   86,  120,   88,   89,  120,
+ /*  2010 */    91,  120,  120,  120,  120,  120,  120,   98,   99,   82,
+ /*  2020 */   120,  102,  103,   86,  105,   88,   89,  120,   91,  120,
+ /*  2030 */   120,  120,  120,  120,  120,   98,   99,   82,  120,  102,
+ /*  2040 */   103,   86,  105,   88,   89,  120,   91,  120,  120,  120,
+ /*  2050 */   120,  120,  120,   98,   99,  120,  120,  102,  103,   82,
+ /*  2060 */   105,  120,  120,   86,  120,   88,   89,  120,   91,  120,
+ /*  2070 */   120,  120,  120,  120,  120,   98,   99,  120,  120,  102,
+ /*  2080 */   103,  120,  105,  120,   82,  120,  120,  120,   86,  120,
+ /*  2090 */    88,   89,  120,   91,  120,  120,  120,  120,  120,  120,
+ /*  2100 */    98,   99,   82,  120,  102,  103,   86,  105,   88,   89,
+ /*  2110 */   120,   91,  120,  120,  120,  120,  120,  120,   98,   99,
+ /*  2120 */    82,  120,  102,  103,   86,  105,   88,   89,  120,   91,
+ /*  2130 */   120,  120,  120,  120,  120,  120,   98,   99,  120,  120,
+ /*  2140 */   102,  103,   82,  105,  120,  120,   86,  120,   88,   89,
+ /*  2150 */   120,   91,  120,  120,  120,  120,  120,  120,   98,   99,
+ /*  2160 */   120,  120,  102,  103,  120,  105,  120,   82,  120,  120,
+ /*  2170 */   120,   86,  120,   88,   89,  120,   91,  120,  120,  120,
+ /*  2180 */   120,  120,  120,   98,   99,   82,  120,  102,  103,   86,
+ /*  2190 */   105,   88,   89,  120,   91,  120,  120,  120,  120,  120,
+ /*  2200 */   120,   98,   99,   82,  120,  102,  103,   86,  105,   88,
+ /*  2210 */    89,  120,   91,  120,  120,  120,  120,  120,  120,   98,
+ /*  2220 */    99,  120,  120,  102,  103,   82,  105,  120,  120,   86,
+ /*  2230 */   120,   88,   89,  120,   91,  120,  120,  120,  120,  120,
+ /*  2240 */   120,   98,   99,  120,  120,  102,  103,  120,  105,  120,
+ /*  2250 */    82,  120,  120,  120,   86,  120,   88,   89,  120,   91,
+ /*  2260 */   120,  120,  120,  120,  120,  120,   98,   99,   82,  120,
+ /*  2270 */   102,  103,   86,  105,   88,   89,  120,   91,  120,  120,
+ /*  2280 */   120,  120,  120,  120,   98,   99,   82,  120,  102,  103,
+ /*  2290 */    86,  105,   88,   89,  120,   91,  120,  120,  120,  120,
+ /*  2300 */   120,  120,   98,   99,  120,  120,  102,  103,   82,  105,
+ /*  2310 */   120,  120,   86,  120,   88,   89,  120,   91,  120,  120,
+ /*  2320 */   120,  120,  120,  120,   98,   99,  120,  120,  102,  103,
+ /*  2330 */   120,  105,  120,   82,  120,  120,  120,   86,  120,   88,
+ /*  2340 */    89,  120,   91,  120,  120,  120,  120,  120,  120,   98,
+ /*  2350 */    99,   82,  120,  102,  103,   86,  105,   88,   89,  120,
+ /*  2360 */    91,  120,  120,  120,  120,  120,  120,   98,   99,   82,
+ /*  2370 */   120,  102,  103,   86,  105,   88,   89,  120,   91,  120,
+ /*  2380 */   120,  120,  120,  120,  120,   98,   99,  120,  120,  102,
+ /*  2390 */   103,   82,  105,  120,  120,   86,  120,   88,   89,  120,
+ /*  2400 */    91,  120,  120,  120,  120,  120,  120,   98,   99,  120,
+ /*  2410 */   120,  102,  103,  120,  105,  120,   82,  120,  120,  120,
+ /*  2420 */    86,  120,   88,   89,  120,   91,  120,  120,  120,  120,
+ /*  2430 */   120,  120,   98,   99,   82,  120,  102,  103,   86,  105,
+ /*  2440 */    88,   89,  120,   91,  120,  120,  120,  120,  120,  120,
+ /*  2450 */    98,   99,   82,  120,  102,  103,   86,  105,   88,   89,
+ /*  2460 */   120,   91,  120,  120,  120,  120,  120,  120,   98,   99,
+ /*  2470 */   120,  120,  102,  103,   82,  105,  120,  120,   86,  120,
+ /*  2480 */    88,   89,  120,   91,  120,  120,  120,  120,  120,  120,
+ /*  2490 */    98,   99,  120,  120,  102,  103,  120,  105,  120,   82,
+ /*  2500 */   120,  120,  120,   86,  120,   88,   89,  120,   91,  120,
+ /*  2510 */   120,  120,  120,  120,  120,   98,   99,   82,  120,  102,
+ /*  2520 */   103,   86,  105,   88,   89,  120,   91,  120,  120,  120,
+ /*  2530 */   120,  120,  120,   98,   99,   82,  120,  102,  103,   86,
+ /*  2540 */   105,   88,   82,  120,   91,  120,   86,  120,   88,  120,
+ /*  2550 */   120,   91,   99,  120,  120,  102,  103,  120,  105,   99,
+ /*  2560 */   120,  120,  102,  103,  120,  105,
+);
+    const YY_SHIFT_USE_DFLT = -9;
+    const YY_SHIFT_MAX = 250;
+    static public $yy_shift_ofst = array(
+ /*     0 */     1, 1424, 1259, 1149, 1259, 1149, 1149, 1424, 1094, 1149,
+ /*    10 */  1149, 1479, 1149, 1589, 1534, 1149, 1149, 1149, 1314, 1149,
+ /*    20 */  1149, 1149, 1149, 1149, 1369, 1149, 1149, 1149, 1149, 1314,
+ /*    30 */  1149, 1149, 1149, 1149, 1149, 1149, 1149, 1149, 1149, 1149,
+ /*    40 */  1149, 1149, 1369, 1149, 1204, 1204, 1644, 1699, 1699, 1699,
+ /*    50 */  1699, 1699, 1699,  147,  221,   -1,   73,  718,  718,  718,
+ /*    60 */   768,  818,  644,  594,  345,  271,  419,  942,  469,  520,
+ /*    70 */   868,  992,  992,  992,  992,  992,  992,  992,  992,  992,
+ /*    80 */   992,  992,  992,  992,  992,  992,  992,  992,  992,  992,
+ /*    90 */  1030, 1030, 1393, 1357,  233,    1, 1278,  150,    5,  308,
+ /*   100 */   308,  311,  358,  310,  233,   44,  233, 1168,   46, 1552,
+ /*   110 */   263, 1247,  226,  231,   71,   16,   -2,  299,  182,  181,
+ /*   120 */   282,  163,  719,  459,  560,  532,   44,  460,  559,  581,
+ /*   130 */   460,  460,  460,   44,  563,  460,  632,  586,  548,  532,
+ /*   140 */   459,  460,  460,  460,  460,  701,  701,  701,  683,  700,
+ /*   150 */   701,  701,  701,  701,  684,  701,  684,   -9,   66,  111,
+ /*   160 */     3,  357,  359,  382,  381,  606,  439,  417,  509,  439,
+ /*   170 */   439,  530,  508,  458,  207,  431,  480,  507,  506,  483,
+ /*   180 */   439,  457,  432,  439,  529,  433,  385,  383,  727,  684,
+ /*   190 */   701,  684,  727,  701,  684,  538,  222,   -8,   -8,   -9,
+ /*   200 */    -9,   -9,   -9, 1753,   72,  116,  216,  120,  123,   74,
+ /*   210 */    74,  141,  552,   32,  315,  306,  329,   90,  413,  366,
+ /*   220 */   682,  616,  657,  659,  658,  655,  656,  661,  662,  641,
+ /*   230 */   681,  680,  640,  695,  654,  652,  621,  602,  571,  557,
+ /*   240 */   324,  538,  608,  307,  630,  595,  653,  619,  626,  623,
+ /*   250 */   598,
+);
+    const YY_REDUCE_USE_DFLT = -81;
+    const YY_REDUCE_MAX = 202;
+    static public $yy_reduce_ofst = array(
+ /*     0 */    22, 1721,   68,  339,  266,   -6,  142, 1754,  862, 2020,
+ /*    10 */   514, 1977, 1776, 2103, 1919, 1872, 1804, 1830, 2121, 2392,
+ /*    20 */  2186, 2287, 2269, 2168, 2435, 2143,  639, 1955, 2085, 1937,
+ /*    30 */  1032, 2060, 2038, 1894, 1854, 2002, 2352, 2417, 2370, 2334,
+ /*    40 */  2204, 2226, 2251, 2309, 2460, 2453, 1071, 1126, 1275, 1385,
+ /*    50 */  1330, 1236, 1165, 1353, 1408, 1243, 1429, 1298, 1133, 1353,
+ /*    60 */    61,   61,   61,   61,   61,   61,   61,   61,   61,   61,
+ /*    70 */    61,   61,   61,   61,   61,   61,   61,   61,   61,   61,
+ /*    80 */    61,   61,   61,   61,   61,   61,   61,   61,   61,   61,
+ /*    90 */    61,   61,  186,  139,  112,  -80,  214,  -10,  342,  337,
+ /*   100 */   269,   96,  309,  335,  384,  210,  407,  490,  -57,  -35,
+ /*   110 */   270,  -35,  -35,  628,  270,  270,  170,  -35,  528,  170,
+ /*   120 */   528,  466,  -35,  444,  170,  513,  435,  561,  519,  463,
+ /*   130 */   519,  637,  395,  537,  861,  631,  533,  519,  -35,  519,
+ /*   140 */   542,  860,  685,  638,  503,  -35,  -35,  -35,  346,  349,
+ /*   150 */   -35,  -35,  -35,  -35,  170,  -35,  196,  -35,  635,  636,
+ /*   160 */   604,  604,  604,  604,  604,  618,  599,  642,  604,  599,
+ /*   170 */   599,  604,  604,  604,  618,  604,  604,  604,  604,  604,
+ /*   180 */   599,  604,  604,  599,  604,  604,  604,  604,  634,  624,
+ /*   190 */   618,  624,  634,  618,  624,  617,   43,  -64,  159,   21,
+ /*   200 */   169,  151,  183,
+);
+    static public $yyExpectedTokens = array(
+        /* 0 */ array(3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 15, 21, 23, 28, 31, 32, ),
+        /* 1 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
+        /* 2 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
+        /* 3 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
+        /* 4 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
+        /* 5 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
+        /* 6 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
+        /* 7 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
+        /* 8 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 62, 75, ),
+        /* 9 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
+        /* 10 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
+        /* 11 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
+        /* 12 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
+        /* 13 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
+        /* 14 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
+        /* 15 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
+        /* 16 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
+        /* 17 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
+        /* 18 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
+        /* 19 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
+        /* 20 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
+        /* 21 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
+        /* 22 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
+        /* 23 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
+        /* 24 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
+        /* 25 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
+        /* 26 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
+        /* 27 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
+        /* 28 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
+        /* 29 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
+        /* 30 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
+        /* 31 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
+        /* 32 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
+        /* 33 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
+        /* 34 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
+        /* 35 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
+        /* 36 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
+        /* 37 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
+        /* 38 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
+        /* 39 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
+        /* 40 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
+        /* 41 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
+        /* 42 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
+        /* 43 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
+        /* 44 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
+        /* 45 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
+        /* 46 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 75, ),
+        /* 47 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 75, ),
+        /* 48 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 75, ),
+        /* 49 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 75, ),
+        /* 50 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 75, ),
+        /* 51 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 75, ),
+        /* 52 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 75, ),
+        /* 53 */ array(1, 16, 22, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
+        /* 54 */ array(1, 16, 22, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
+        /* 55 */ array(1, 16, 22, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
+        /* 56 */ array(1, 22, 27, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
+        /* 57 */ array(1, 22, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
+        /* 58 */ array(1, 22, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
+        /* 59 */ array(1, 22, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
+        /* 60 */ array(1, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
+        /* 61 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
+        /* 62 */ array(1, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
+        /* 63 */ array(1, 16, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
+        /* 64 */ array(1, 16, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
+        /* 65 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 76, ),
+        /* 66 */ array(1, 16, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
+        /* 67 */ array(1, 16, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
+        /* 68 */ array(1, 29, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
+        /* 69 */ array(1, 24, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
+        /* 70 */ array(1, 2, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
+        /* 71 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
+        /* 72 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
+        /* 73 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
+        /* 74 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
+        /* 75 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
+        /* 76 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
+        /* 77 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
+        /* 78 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
+        /* 79 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
+        /* 80 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
+        /* 81 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
+        /* 82 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
+        /* 83 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
+        /* 84 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
+        /* 85 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
+        /* 86 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
+        /* 87 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
+        /* 88 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
+        /* 89 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
+        /* 90 */ array(37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
+        /* 91 */ array(37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
+        /* 92 */ array(1, 16, 20, 22, 35, 58, ),
+        /* 93 */ array(1, 16, 22, 51, ),
+        /* 94 */ array(1, 22, ),
+        /* 95 */ array(3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 15, 21, 23, 28, 31, 32, ),
+        /* 96 */ array(10, 15, 21, 23, 28, 31, 32, 75, 76, 77, ),
+        /* 97 */ array(15, 18, 22, 30, ),
+        /* 98 */ array(15, 18, 22, 30, ),
+        /* 99 */ array(15, 18, 22, ),
+        /* 100 */ array(15, 18, 22, ),
+        /* 101 */ array(20, 56, 61, ),
+        /* 102 */ array(1, 16, 22, ),
+        /* 103 */ array(17, 18, 60, ),
+        /* 104 */ array(1, 22, ),
+        /* 105 */ array(17, 35, ),
+        /* 106 */ array(1, 22, ),
+        /* 107 */ array(10, 15, 21, 23, 28, 31, 32, 75, 76, 77, ),
+        /* 108 */ array(4, 5, 6, 7, 8, 12, 13, 14, ),
+        /* 109 */ array(1, 16, 22, 29, 51, ),
+        /* 110 */ array(15, 18, 19, 59, ),
+        /* 111 */ array(1, 16, 22, 51, ),
+        /* 112 */ array(1, 16, 22, 51, ),
+        /* 113 */ array(15, 18, 19, 25, ),
+        /* 114 */ array(15, 18, 19, ),
+        /* 115 */ array(15, 18, 59, ),
+        /* 116 */ array(19, 20, 58, ),
+        /* 117 */ array(1, 30, 51, ),
+        /* 118 */ array(16, 22, 25, ),
+        /* 119 */ array(19, 20, 58, ),
+        /* 120 */ array(16, 22, 25, ),
+        /* 121 */ array(1, 16, 20, ),
+        /* 122 */ array(1, 16, 51, ),
+        /* 123 */ array(17, 18, ),
+        /* 124 */ array(20, 58, ),
+        /* 125 */ array(15, 18, ),
+        /* 126 */ array(17, 35, ),
+        /* 127 */ array(15, 18, ),
+        /* 128 */ array(15, 18, ),
+        /* 129 */ array(1, 16, ),
+        /* 130 */ array(15, 18, ),
+        /* 131 */ array(15, 18, ),
+        /* 132 */ array(15, 18, ),
+        /* 133 */ array(17, 35, ),
+        /* 134 */ array(15, 18, ),
+        /* 135 */ array(15, 18, ),
+        /* 136 */ array(16, 22, ),
+        /* 137 */ array(15, 18, ),
+        /* 138 */ array(1, 51, ),
+        /* 139 */ array(15, 18, ),
+        /* 140 */ array(17, 18, ),
+        /* 141 */ array(15, 18, ),
+        /* 142 */ array(15, 18, ),
+        /* 143 */ array(15, 18, ),
+        /* 144 */ array(15, 18, ),
+        /* 145 */ array(1, ),
+        /* 146 */ array(1, ),
+        /* 147 */ array(1, ),
+        /* 148 */ array(22, ),
+        /* 149 */ array(22, ),
+        /* 150 */ array(1, ),
+        /* 151 */ array(1, ),
+        /* 152 */ array(1, ),
+        /* 153 */ array(1, ),
+        /* 154 */ array(20, ),
+        /* 155 */ array(1, ),
+        /* 156 */ array(20, ),
+        /* 157 */ array(),
+        /* 158 */ array(15, 18, 59, ),
+        /* 159 */ array(15, 17, 18, ),
+        /* 160 */ array(16, 22, ),
+        /* 161 */ array(16, 22, ),
+        /* 162 */ array(16, 22, ),
+        /* 163 */ array(16, 22, ),
+        /* 164 */ array(16, 22, ),
+        /* 165 */ array(1, 16, ),
+        /* 166 */ array(56, 61, ),
+        /* 167 */ array(15, 35, ),
+        /* 168 */ array(16, 22, ),
+        /* 169 */ array(56, 61, ),
+        /* 170 */ array(56, 61, ),
+        /* 171 */ array(16, 22, ),
+        /* 172 */ array(16, 22, ),
+        /* 173 */ array(16, 22, ),
+        /* 174 */ array(1, 16, ),
+        /* 175 */ array(16, 22, ),
+        /* 176 */ array(16, 22, ),
+        /* 177 */ array(16, 22, ),
+        /* 178 */ array(16, 22, ),
+        /* 179 */ array(16, 22, ),
+        /* 180 */ array(56, 61, ),
+        /* 181 */ array(16, 22, ),
+        /* 182 */ array(16, 22, ),
+        /* 183 */ array(56, 61, ),
+        /* 184 */ array(16, 22, ),
+        /* 185 */ array(16, 22, ),
+        /* 186 */ array(16, 22, ),
+        /* 187 */ array(16, 22, ),
+        /* 188 */ array(2, ),
+        /* 189 */ array(20, ),
+        /* 190 */ array(1, ),
+        /* 191 */ array(20, ),
+        /* 192 */ array(2, ),
+        /* 193 */ array(1, ),
+        /* 194 */ array(20, ),
+        /* 195 */ array(35, ),
+        /* 196 */ array(13, ),
+        /* 197 */ array(22, ),
+        /* 198 */ array(22, ),
+        /* 199 */ array(),
+        /* 200 */ array(),
+        /* 201 */ array(),
+        /* 202 */ array(),
+        /* 203 */ array(16, 22, 24, 26, 27, 29, 34, 35, 36, 51, 58, 62, 76, ),
+        /* 204 */ array(16, 19, 22, 35, 58, ),
+        /* 205 */ array(15, 17, 18, 33, ),
+        /* 206 */ array(16, 22, 35, 58, ),
+        /* 207 */ array(35, 56, 58, 62, ),
+        /* 208 */ array(30, 35, 58, ),
+        /* 209 */ array(35, 58, ),
+        /* 210 */ array(35, 58, ),
+        /* 211 */ array(34, 36, ),
+        /* 212 */ array(2, 19, ),
+        /* 213 */ array(25, 76, ),
+        /* 214 */ array(34, 36, ),
+        /* 215 */ array(19, 56, ),
+        /* 216 */ array(24, 34, ),
+        /* 217 */ array(34, 62, ),
+        /* 218 */ array(18, 59, ),
+        /* 219 */ array(34, 36, ),
+        /* 220 */ array(18, ),
+        /* 221 */ array(60, ),
+        /* 222 */ array(22, ),
+        /* 223 */ array(18, ),
+        /* 224 */ array(17, ),
+        /* 225 */ array(18, ),
+        /* 226 */ array(18, ),
+        /* 227 */ array(17, ),
+        /* 228 */ array(33, ),
+        /* 229 */ array(62, ),
+        /* 230 */ array(18, ),
+        /* 231 */ array(18, ),
+        /* 232 */ array(56, ),
+        /* 233 */ array(2, ),
+        /* 234 */ array(18, ),
+        /* 235 */ array(19, ),
+        /* 236 */ array(2, ),
+        /* 237 */ array(22, ),
+        /* 238 */ array(35, ),
+        /* 239 */ array(18, ),
+        /* 240 */ array(36, ),
+        /* 241 */ array(35, ),
+        /* 242 */ array(18, ),
+        /* 243 */ array(17, ),
+        /* 244 */ array(17, ),
+        /* 245 */ array(60, ),
+        /* 246 */ array(17, ),
+        /* 247 */ array(33, ),
+        /* 248 */ array(25, ),
+        /* 249 */ array(26, ),
+        /* 250 */ array(52, ),
+        /* 251 */ array(),
+        /* 252 */ array(),
+        /* 253 */ array(),
+        /* 254 */ array(),
+        /* 255 */ array(),
+        /* 256 */ array(),
+        /* 257 */ array(),
+        /* 258 */ array(),
+        /* 259 */ array(),
+        /* 260 */ array(),
+        /* 261 */ array(),
+        /* 262 */ array(),
+        /* 263 */ array(),
+        /* 264 */ array(),
+        /* 265 */ array(),
+        /* 266 */ array(),
+        /* 267 */ array(),
+        /* 268 */ array(),
+        /* 269 */ array(),
+        /* 270 */ array(),
+        /* 271 */ array(),
+        /* 272 */ array(),
+        /* 273 */ array(),
+        /* 274 */ array(),
+        /* 275 */ array(),
+        /* 276 */ array(),
+        /* 277 */ array(),
+        /* 278 */ array(),
+        /* 279 */ array(),
+        /* 280 */ array(),
+        /* 281 */ array(),
+        /* 282 */ array(),
+        /* 283 */ array(),
+        /* 284 */ array(),
+        /* 285 */ array(),
+        /* 286 */ array(),
+        /* 287 */ array(),
+        /* 288 */ array(),
+        /* 289 */ array(),
+        /* 290 */ array(),
+        /* 291 */ array(),
+        /* 292 */ array(),
+        /* 293 */ array(),
+        /* 294 */ array(),
+        /* 295 */ array(),
+        /* 296 */ array(),
+        /* 297 */ array(),
+        /* 298 */ array(),
+        /* 299 */ array(),
+        /* 300 */ array(),
+        /* 301 */ array(),
+        /* 302 */ array(),
+        /* 303 */ array(),
+        /* 304 */ array(),
+        /* 305 */ array(),
+        /* 306 */ array(),
+        /* 307 */ array(),
+        /* 308 */ array(),
+        /* 309 */ array(),
+        /* 310 */ array(),
+        /* 311 */ array(),
+        /* 312 */ array(),
+        /* 313 */ array(),
+        /* 314 */ array(),
+        /* 315 */ array(),
+        /* 316 */ array(),
+        /* 317 */ array(),
+        /* 318 */ array(),
+        /* 319 */ array(),
+        /* 320 */ array(),
+        /* 321 */ array(),
+        /* 322 */ array(),
+        /* 323 */ array(),
+        /* 324 */ array(),
+        /* 325 */ array(),
+        /* 326 */ array(),
+        /* 327 */ array(),
+        /* 328 */ array(),
+        /* 329 */ array(),
+        /* 330 */ array(),
+        /* 331 */ array(),
+        /* 332 */ array(),
+        /* 333 */ array(),
+        /* 334 */ array(),
+        /* 335 */ array(),
+        /* 336 */ array(),
+        /* 337 */ array(),
+        /* 338 */ array(),
+        /* 339 */ array(),
+        /* 340 */ array(),
+        /* 341 */ array(),
+        /* 342 */ array(),
+        /* 343 */ array(),
+        /* 344 */ array(),
+        /* 345 */ array(),
+        /* 346 */ array(),
+        /* 347 */ array(),
+        /* 348 */ array(),
+        /* 349 */ array(),
+        /* 350 */ array(),
+        /* 351 */ array(),
+        /* 352 */ array(),
+        /* 353 */ array(),
+        /* 354 */ array(),
+        /* 355 */ array(),
+        /* 356 */ array(),
+        /* 357 */ array(),
+        /* 358 */ array(),
+        /* 359 */ array(),
+        /* 360 */ array(),
+        /* 361 */ array(),
+        /* 362 */ array(),
+        /* 363 */ array(),
+        /* 364 */ array(),
+        /* 365 */ array(),
+        /* 366 */ array(),
+        /* 367 */ array(),
+        /* 368 */ array(),
+        /* 369 */ array(),
+        /* 370 */ array(),
+        /* 371 */ array(),
+        /* 372 */ array(),
+        /* 373 */ array(),
+        /* 374 */ array(),
+        /* 375 */ array(),
+        /* 376 */ array(),
+        /* 377 */ array(),
+        /* 378 */ array(),
+        /* 379 */ array(),
+        /* 380 */ array(),
+        /* 381 */ array(),
+        /* 382 */ array(),
+);
+    static public $yy_default = array(
+ /*     0 */   386,  565,  582,  536,  582,  536,  536,  582,  582,  582,
+ /*    10 */   582,  582,  582,  582,  582,  582,  582,  582,  582,  582,
+ /*    20 */   582,  582,  582,  582,  582,  582,  582,  582,  582,  582,
+ /*    30 */   582,  582,  582,  582,  582,  582,  582,  582,  582,  582,
+ /*    40 */   582,  582,  582,  582,  582,  582,  582,  582,  582,  582,
+ /*    50 */   582,  582,  582,  582,  582,  582,  444,  444,  444,  444,
+ /*    60 */   582,  582,  582,  582,  582,  582,  582,  582,  449,  582,
+ /*    70 */   582,  446,  535,  428,  534,  566,  567,  478,  477,  468,
+ /*    80 */   465,  449,  568,  455,  469,  474,  473,  470,  454,  451,
+ /*    90 */   482,  481,  493,  457,  444,  383,  582,  444,  444,  444,
+ /*   100 */   444,  548,  464,  582,  444,  582,  444,  582,  582,  457,
+ /*   110 */   509,  457,  457,  582,  509,  509,  502,  457,  483,  502,
+ /*   120 */   483,  582,  457,  582,  502,  582,  582,  582,  582,  582,
+ /*   130 */   582,  582,  509,  582,  582,  582,  582,  582,  457,  582,
+ /*   140 */   582,  582,  582,  582,  582,  480,  461,  484,  444,  444,
+ /*   150 */   486,  485,  462,  467,  502,  460,  545,  543,  510,  582,
+ /*   160 */   582,  582,  582,  582,  582,  582,  527,  509,  582,  526,
+ /*   170 */   529,  582,  582,  582,  582,  582,  582,  582,  582,  582,
+ /*   180 */   507,  582,  582,  528,  582,  582,  582,  582,  537,  523,
+ /*   190 */   501,  546,  538,  464,  549,  509,  401,  581,  581,  542,
+ /*   200 */   509,  509,  542,  459,  493,  582,  493,  493,  493,  493,
+ /*   210 */   479,  582,  521,  483,  582,  489,  582,  582,  582,  582,
+ /*   220 */   582,  582,  582,  582,  582,  582,  582,  582,  491,  582,
+ /*   230 */   582,  582,  489,  521,  582,  582,  521,  582,  547,  582,
+ /*   240 */   582,  521,  582,  582,  582,  582,  582,  582,  483,  452,
+ /*   250 */   495,  544,  514,  516,  515,  518,  495,  531,  532,  409,
+ /*   260 */   395,  431,  394,  425,  396,  430,  398,  456,  397,  426,
+ /*   270 */   393,  387,  385,  384,  388,  389,  392,  391,  390,  399,
+ /*   280 */   400,  435,  442,  436,  410,  423,  424,  441,  443,  522,
+ /*   290 */   408,  407,  404,  403,  402,  405,  453,  429,  580,  406,
+ /*   300 */   440,  573,  558,  559,  560,  561,  557,  556,  553,  554,
+ /*   310 */   555,  463,  492,  540,  539,  411,  525,  488,  490,  500,
+ /*   320 */   504,  552,  551,  508,  503,  459,  466,  499,  496,  497,
+ /*   330 */   511,  471,  472,  498,  513,  550,  512,  476,  519,  458,
+ /*   340 */   475,  576,  487,  575,  578,  579,  572,  574,  494,  434,
+ /*   350 */   570,  571,  433,  562,  530,  505,  506,  427,  533,  564,
+ /*   360 */   563,  432,  569,  421,  415,  416,  439,  414,  541,  412,
+ /*   370 */   413,  577,  438,  417,  521,  422,  520,  420,  437,  524,
+ /*   380 */   418,  419,  517,
+);
+    const YYNOCODE = 121;
+    const YYSTACKDEPTH = 100;
+    const YYNSTATE = 383;
+    const YYNRULE = 199;
+    const YYERRORSYMBOL = 78;
+    const YYERRSYMDT = 'yy0';
+    const YYFALLBACK = 0;
+    static public $yyFallback = array(
+    );
+    static function Trace($TraceFILE, $zTracePrompt)
+    {
+        if (!$TraceFILE) {
+            $zTracePrompt = 0;
+        } elseif (!$zTracePrompt) {
+            $TraceFILE = 0;
+        }
+        self::$yyTraceFILE = $TraceFILE;
+        self::$yyTracePrompt = $zTracePrompt;
+    }
+
+    static function PrintTrace()
+    {
+        self::$yyTraceFILE = fopen('php://output', 'w');
+        self::$yyTracePrompt = '<br>';
+    }
+
+    static public $yyTraceFILE;
+    static public $yyTracePrompt;
+    public $yyidx;                    /* Index of top element in stack */
+    public $yyerrcnt;                 /* Shifts left before out of the error */
+    public $yystack = array();  /* The parser's stack */
+
+    public $yyTokenName = array( 
+  '$',             'VERT',          'COLON',         'COMMENT',     
+  'PHPSTARTTAG',   'PHPENDTAG',     'ASPSTARTTAG',   'ASPENDTAG',   
+  'FAKEPHPSTARTTAG',  'XMLTAG',        'OTHER',         'LINEBREAK',   
+  'LITERALSTART',  'LITERALEND',    'LITERAL',       'LDEL',        
+  'RDEL',          'DOLLAR',        'ID',            'EQUAL',       
+  'PTR',           'LDELIF',        'SPACE',         'LDELFOR',     
+  'SEMICOLON',     'INCDEC',        'TO',            'STEP',        
+  'LDELFOREACH',   'AS',            'APTR',          'SMARTYBLOCKCHILD',
+  'LDELSLASH',     'INTEGER',       'COMMA',         'OPENP',       
+  'CLOSEP',        'MATH',          'UNIMATH',       'ANDSYM',      
+  'ISIN',          'ISDIVBY',       'ISNOTDIVBY',    'ISEVEN',      
+  'ISNOTEVEN',     'ISEVENBY',      'ISNOTEVENBY',   'ISODD',       
+  'ISNOTODD',      'ISODDBY',       'ISNOTODDBY',    'INSTANCEOF',  
+  'QMARK',         'NOT',           'TYPECAST',      'HEX',         
+  'DOT',           'SINGLEQUOTESTRING',  'DOUBLECOLON',   'AT',          
+  'HATCH',         'OPENB',         'CLOSEB',        'EQUALS',      
+  'NOTEQUALS',     'GREATERTHAN',   'LESSTHAN',      'GREATEREQUAL',
+  'LESSEQUAL',     'IDENTITY',      'NONEIDENTITY',  'MOD',         
+  'LAND',          'LOR',           'LXOR',          'QUOTE',       
+  'BACKTICK',      'DOLLARID',      'error',         'start',       
+  'template',      'template_element',  'smartytag',     'literal',     
+  'literal_elements',  'literal_element',  'value',         'attributes',  
+  'variable',      'expr',          'modifierlist',  'varindexed',  
+  'statement',     'statements',    'optspace',      'varvar',      
+  'foraction',     'attribute',     'ternary',       'array',       
+  'ifcond',        'lop',           'function',      'doublequoted_with_quotes',
+  'static_class_access',  'object',        'arrayindex',    'indexdef',    
+  'varvarele',     'objectchain',   'objectelement',  'method',      
+  'params',        'modifier',      'modparameters',  'modparameter',
+  'arrayelements',  'arrayelement',  'doublequoted',  'doublequotedcontent',
+    );
+
+    static public $yyRuleName = array(
+ /*   0 */ "start ::= template",
+ /*   1 */ "template ::= template_element",
+ /*   2 */ "template ::= template template_element",
+ /*   3 */ "template ::=",
+ /*   4 */ "template_element ::= smartytag",
+ /*   5 */ "template_element ::= COMMENT",
+ /*   6 */ "template_element ::= literal",
+ /*   7 */ "template_element ::= PHPSTARTTAG",
+ /*   8 */ "template_element ::= PHPENDTAG",
+ /*   9 */ "template_element ::= ASPSTARTTAG",
+ /*  10 */ "template_element ::= ASPENDTAG",
+ /*  11 */ "template_element ::= FAKEPHPSTARTTAG",
+ /*  12 */ "template_element ::= XMLTAG",
+ /*  13 */ "template_element ::= OTHER",
+ /*  14 */ "template_element ::= LINEBREAK",
+ /*  15 */ "literal ::= LITERALSTART LITERALEND",
+ /*  16 */ "literal ::= LITERALSTART literal_elements LITERALEND",
+ /*  17 */ "literal_elements ::= literal_elements literal_element",
+ /*  18 */ "literal_elements ::=",
+ /*  19 */ "literal_element ::= literal",
+ /*  20 */ "literal_element ::= LITERAL",
+ /*  21 */ "literal_element ::= PHPSTARTTAG",
+ /*  22 */ "literal_element ::= FAKEPHPSTARTTAG",
+ /*  23 */ "literal_element ::= PHPENDTAG",
+ /*  24 */ "literal_element ::= ASPSTARTTAG",
+ /*  25 */ "literal_element ::= ASPENDTAG",
+ /*  26 */ "smartytag ::= LDEL value RDEL",
+ /*  27 */ "smartytag ::= LDEL value attributes RDEL",
+ /*  28 */ "smartytag ::= LDEL variable attributes RDEL",
+ /*  29 */ "smartytag ::= LDEL expr modifierlist attributes RDEL",
+ /*  30 */ "smartytag ::= LDEL expr attributes RDEL",
+ /*  31 */ "smartytag ::= LDEL DOLLAR ID EQUAL value RDEL",
+ /*  32 */ "smartytag ::= LDEL DOLLAR ID EQUAL expr RDEL",
+ /*  33 */ "smartytag ::= LDEL DOLLAR ID EQUAL expr attributes RDEL",
+ /*  34 */ "smartytag ::= LDEL varindexed EQUAL expr attributes RDEL",
+ /*  35 */ "smartytag ::= LDEL ID attributes RDEL",
+ /*  36 */ "smartytag ::= LDEL ID RDEL",
+ /*  37 */ "smartytag ::= LDEL ID PTR ID attributes RDEL",
+ /*  38 */ "smartytag ::= LDEL ID modifierlist attributes RDEL",
+ /*  39 */ "smartytag ::= LDEL ID PTR ID modifierlist attributes RDEL",
+ /*  40 */ "smartytag ::= LDELIF SPACE expr RDEL",
+ /*  41 */ "smartytag ::= LDELIF SPACE expr attributes RDEL",
+ /*  42 */ "smartytag ::= LDELIF SPACE statement RDEL",
+ /*  43 */ "smartytag ::= LDELIF SPACE statement attributes RDEL",
+ /*  44 */ "smartytag ::= LDELFOR SPACE statements SEMICOLON optspace expr SEMICOLON optspace DOLLAR varvar foraction attributes RDEL",
+ /*  45 */ "foraction ::= EQUAL expr",
+ /*  46 */ "foraction ::= INCDEC",
+ /*  47 */ "smartytag ::= LDELFOR SPACE statement TO expr attributes RDEL",
+ /*  48 */ "smartytag ::= LDELFOR SPACE statement TO expr STEP expr attributes RDEL",
+ /*  49 */ "smartytag ::= LDELFOREACH attributes RDEL",
+ /*  50 */ "smartytag ::= LDELFOREACH SPACE value AS DOLLAR varvar attributes RDEL",
+ /*  51 */ "smartytag ::= LDELFOREACH SPACE value AS DOLLAR varvar APTR DOLLAR varvar attributes RDEL",
+ /*  52 */ "smartytag ::= LDELFOREACH SPACE expr AS DOLLAR varvar attributes RDEL",
+ /*  53 */ "smartytag ::= LDELFOREACH SPACE expr AS DOLLAR varvar APTR DOLLAR varvar attributes RDEL",
+ /*  54 */ "smartytag ::= SMARTYBLOCKCHILD",
+ /*  55 */ "smartytag ::= LDELSLASH ID RDEL",
+ /*  56 */ "smartytag ::= LDELSLASH ID modifierlist RDEL",
+ /*  57 */ "smartytag ::= LDELSLASH ID PTR ID RDEL",
+ /*  58 */ "smartytag ::= LDELSLASH ID PTR ID modifierlist RDEL",
+ /*  59 */ "attributes ::= attributes attribute",
+ /*  60 */ "attributes ::= attribute",
+ /*  61 */ "attributes ::=",
+ /*  62 */ "attribute ::= SPACE ID EQUAL ID",
+ /*  63 */ "attribute ::= SPACE ID EQUAL expr",
+ /*  64 */ "attribute ::= SPACE ID EQUAL value",
+ /*  65 */ "attribute ::= SPACE ID",
+ /*  66 */ "attribute ::= SPACE expr",
+ /*  67 */ "attribute ::= SPACE value",
+ /*  68 */ "attribute ::= SPACE INTEGER EQUAL expr",
+ /*  69 */ "statements ::= statement",
+ /*  70 */ "statements ::= statements COMMA statement",
+ /*  71 */ "statement ::= DOLLAR varvar EQUAL expr",
+ /*  72 */ "statement ::= varindexed EQUAL expr",
+ /*  73 */ "statement ::= OPENP statement CLOSEP",
+ /*  74 */ "expr ::= value",
+ /*  75 */ "expr ::= ternary",
+ /*  76 */ "expr ::= DOLLAR ID COLON ID",
+ /*  77 */ "expr ::= expr MATH value",
+ /*  78 */ "expr ::= expr UNIMATH value",
+ /*  79 */ "expr ::= expr ANDSYM value",
+ /*  80 */ "expr ::= array",
+ /*  81 */ "expr ::= expr modifierlist",
+ /*  82 */ "expr ::= expr ifcond expr",
+ /*  83 */ "expr ::= expr ISIN array",
+ /*  84 */ "expr ::= expr ISIN value",
+ /*  85 */ "expr ::= expr lop expr",
+ /*  86 */ "expr ::= expr ISDIVBY expr",
+ /*  87 */ "expr ::= expr ISNOTDIVBY expr",
+ /*  88 */ "expr ::= expr ISEVEN",
+ /*  89 */ "expr ::= expr ISNOTEVEN",
+ /*  90 */ "expr ::= expr ISEVENBY expr",
+ /*  91 */ "expr ::= expr ISNOTEVENBY expr",
+ /*  92 */ "expr ::= expr ISODD",
+ /*  93 */ "expr ::= expr ISNOTODD",
+ /*  94 */ "expr ::= expr ISODDBY expr",
+ /*  95 */ "expr ::= expr ISNOTODDBY expr",
+ /*  96 */ "expr ::= value INSTANCEOF ID",
+ /*  97 */ "expr ::= value INSTANCEOF value",
+ /*  98 */ "ternary ::= OPENP expr CLOSEP QMARK DOLLAR ID COLON expr",
+ /*  99 */ "ternary ::= OPENP expr CLOSEP QMARK expr COLON expr",
+ /* 100 */ "value ::= variable",
+ /* 101 */ "value ::= UNIMATH value",
+ /* 102 */ "value ::= NOT value",
+ /* 103 */ "value ::= TYPECAST value",
+ /* 104 */ "value ::= variable INCDEC",
+ /* 105 */ "value ::= HEX",
+ /* 106 */ "value ::= INTEGER",
+ /* 107 */ "value ::= INTEGER DOT INTEGER",
+ /* 108 */ "value ::= INTEGER DOT",
+ /* 109 */ "value ::= DOT INTEGER",
+ /* 110 */ "value ::= ID",
+ /* 111 */ "value ::= function",
+ /* 112 */ "value ::= OPENP expr CLOSEP",
+ /* 113 */ "value ::= SINGLEQUOTESTRING",
+ /* 114 */ "value ::= doublequoted_with_quotes",
+ /* 115 */ "value ::= ID DOUBLECOLON static_class_access",
+ /* 116 */ "value ::= varindexed DOUBLECOLON static_class_access",
+ /* 117 */ "value ::= smartytag",
+ /* 118 */ "value ::= value modifierlist",
+ /* 119 */ "variable ::= varindexed",
+ /* 120 */ "variable ::= DOLLAR varvar AT ID",
+ /* 121 */ "variable ::= object",
+ /* 122 */ "variable ::= HATCH ID HATCH",
+ /* 123 */ "variable ::= HATCH variable HATCH",
+ /* 124 */ "varindexed ::= DOLLAR varvar arrayindex",
+ /* 125 */ "arrayindex ::= arrayindex indexdef",
+ /* 126 */ "arrayindex ::=",
+ /* 127 */ "indexdef ::= DOT DOLLAR varvar",
+ /* 128 */ "indexdef ::= DOT DOLLAR varvar AT ID",
+ /* 129 */ "indexdef ::= DOT ID",
+ /* 130 */ "indexdef ::= DOT INTEGER",
+ /* 131 */ "indexdef ::= DOT LDEL expr RDEL",
+ /* 132 */ "indexdef ::= OPENB ID CLOSEB",
+ /* 133 */ "indexdef ::= OPENB ID DOT ID CLOSEB",
+ /* 134 */ "indexdef ::= OPENB expr CLOSEB",
+ /* 135 */ "indexdef ::= OPENB CLOSEB",
+ /* 136 */ "varvar ::= varvarele",
+ /* 137 */ "varvar ::= varvar varvarele",
+ /* 138 */ "varvarele ::= ID",
+ /* 139 */ "varvarele ::= LDEL expr RDEL",
+ /* 140 */ "object ::= varindexed objectchain",
+ /* 141 */ "objectchain ::= objectelement",
+ /* 142 */ "objectchain ::= objectchain objectelement",
+ /* 143 */ "objectelement ::= PTR ID arrayindex",
+ /* 144 */ "objectelement ::= PTR DOLLAR varvar arrayindex",
+ /* 145 */ "objectelement ::= PTR LDEL expr RDEL arrayindex",
+ /* 146 */ "objectelement ::= PTR ID LDEL expr RDEL arrayindex",
+ /* 147 */ "objectelement ::= PTR method",
+ /* 148 */ "function ::= ID OPENP params CLOSEP",
+ /* 149 */ "method ::= ID OPENP params CLOSEP",
+ /* 150 */ "method ::= DOLLAR ID OPENP params CLOSEP",
+ /* 151 */ "params ::= params COMMA expr",
+ /* 152 */ "params ::= expr",
+ /* 153 */ "params ::=",
+ /* 154 */ "modifierlist ::= modifierlist modifier modparameters",
+ /* 155 */ "modifierlist ::= modifier modparameters",
+ /* 156 */ "modifier ::= VERT AT ID",
+ /* 157 */ "modifier ::= VERT ID",
+ /* 158 */ "modparameters ::= modparameters modparameter",
+ /* 159 */ "modparameters ::=",
+ /* 160 */ "modparameter ::= COLON value",
+ /* 161 */ "modparameter ::= COLON array",
+ /* 162 */ "static_class_access ::= method",
+ /* 163 */ "static_class_access ::= method objectchain",
+ /* 164 */ "static_class_access ::= ID",
+ /* 165 */ "static_class_access ::= DOLLAR ID arrayindex",
+ /* 166 */ "static_class_access ::= DOLLAR ID arrayindex objectchain",
+ /* 167 */ "ifcond ::= EQUALS",
+ /* 168 */ "ifcond ::= NOTEQUALS",
+ /* 169 */ "ifcond ::= GREATERTHAN",
+ /* 170 */ "ifcond ::= LESSTHAN",
+ /* 171 */ "ifcond ::= GREATEREQUAL",
+ /* 172 */ "ifcond ::= LESSEQUAL",
+ /* 173 */ "ifcond ::= IDENTITY",
+ /* 174 */ "ifcond ::= NONEIDENTITY",
+ /* 175 */ "ifcond ::= MOD",
+ /* 176 */ "lop ::= LAND",
+ /* 177 */ "lop ::= LOR",
+ /* 178 */ "lop ::= LXOR",
+ /* 179 */ "array ::= OPENB arrayelements CLOSEB",
+ /* 180 */ "arrayelements ::= arrayelement",
+ /* 181 */ "arrayelements ::= arrayelements COMMA arrayelement",
+ /* 182 */ "arrayelements ::=",
+ /* 183 */ "arrayelement ::= value APTR expr",
+ /* 184 */ "arrayelement ::= ID APTR expr",
+ /* 185 */ "arrayelement ::= expr",
+ /* 186 */ "doublequoted_with_quotes ::= QUOTE QUOTE",
+ /* 187 */ "doublequoted_with_quotes ::= QUOTE doublequoted QUOTE",
+ /* 188 */ "doublequoted ::= doublequoted doublequotedcontent",
+ /* 189 */ "doublequoted ::= doublequotedcontent",
+ /* 190 */ "doublequotedcontent ::= BACKTICK variable BACKTICK",
+ /* 191 */ "doublequotedcontent ::= BACKTICK expr BACKTICK",
+ /* 192 */ "doublequotedcontent ::= DOLLARID",
+ /* 193 */ "doublequotedcontent ::= LDEL variable RDEL",
+ /* 194 */ "doublequotedcontent ::= LDEL expr RDEL",
+ /* 195 */ "doublequotedcontent ::= smartytag",
+ /* 196 */ "doublequotedcontent ::= OTHER",
+ /* 197 */ "optspace ::= SPACE",
+ /* 198 */ "optspace ::=",
+    );
+
+    function tokenName($tokenType)
+    {
+        if ($tokenType === 0) {
+            return 'End of Input';
+        }
+        if ($tokenType > 0 && $tokenType < count($this->yyTokenName)) {
+            return $this->yyTokenName[$tokenType];
+        } else {
+            return "Unknown";
+        }
+    }
+
+    static function yy_destructor($yymajor, $yypminor)
+    {
+        switch ($yymajor) {
+            default:  break;   /* If no destructor action specified: do nothing */
+        }
+    }
+
+    function yy_pop_parser_stack()
+    {
+        if (!count($this->yystack)) {
+            return;
+        }
+        $yytos = array_pop($this->yystack);
+        if (self::$yyTraceFILE && $this->yyidx >= 0) {
+            fwrite(self::$yyTraceFILE,
+                self::$yyTracePrompt . 'Popping ' . $this->yyTokenName[$yytos->major] .
+                    "\n");
+        }
+        $yymajor = $yytos->major;
+        self::yy_destructor($yymajor, $yytos->minor);
+        $this->yyidx--;
+        return $yymajor;
+    }
+
+    function __destruct()
+    {
+        while ($this->yystack !== Array()) {
+            $this->yy_pop_parser_stack();
+        }
+        if (is_resource(self::$yyTraceFILE)) {
+            fclose(self::$yyTraceFILE);
+        }
+    }
+
+    function yy_get_expected_tokens($token)
+    {
+        $state = $this->yystack[$this->yyidx]->stateno;
+        $expected = self::$yyExpectedTokens[$state];
+        if (in_array($token, self::$yyExpectedTokens[$state], true)) {
+            return $expected;
+        }
+        $stack = $this->yystack;
+        $yyidx = $this->yyidx;
+        do {
+            $yyact = $this->yy_find_shift_action($token);
+            if ($yyact >= self::YYNSTATE && $yyact < self::YYNSTATE + self::YYNRULE) {
+                // reduce action
+                $done = 0;
+                do {
+                    if ($done++ == 100) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        // too much recursion prevents proper detection
+                        // so give up
+                        return array_unique($expected);
+                    }
+                    $yyruleno = $yyact - self::YYNSTATE;
+                    $this->yyidx -= self::$yyRuleInfo[$yyruleno]['rhs'];
+                    $nextstate = $this->yy_find_reduce_action(
+                        $this->yystack[$this->yyidx]->stateno,
+                        self::$yyRuleInfo[$yyruleno]['lhs']);
+                    if (isset(self::$yyExpectedTokens[$nextstate])) {
+		        $expected = array_merge($expected, self::$yyExpectedTokens[$nextstate]);
+                            if (in_array($token,
+                                  self::$yyExpectedTokens[$nextstate], true)) {
+                            $this->yyidx = $yyidx;
+                            $this->yystack = $stack;
+                            return array_unique($expected);
+                        }
+                    }
+                    if ($nextstate < self::YYNSTATE) {
+                        // we need to shift a non-terminal
+                        $this->yyidx++;
+                        $x = new TP_yyStackEntry;
+                        $x->stateno = $nextstate;
+                        $x->major = self::$yyRuleInfo[$yyruleno]['lhs'];
+                        $this->yystack[$this->yyidx] = $x;
+                        continue 2;
+                    } elseif ($nextstate == self::YYNSTATE + self::YYNRULE + 1) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        // the last token was just ignored, we can't accept
+                        // by ignoring input, this is in essence ignoring a
+                        // syntax error!
+                        return array_unique($expected);
+                    } elseif ($nextstate === self::YY_NO_ACTION) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        // input accepted, but not shifted (I guess)
+                        return $expected;
+                    } else {
+                        $yyact = $nextstate;
+                    }
+                } while (true);
+            }
+            break;
+        } while (true);
+	$this->yyidx = $yyidx;
+	$this->yystack = $stack;
+        return array_unique($expected);
+    }
+
+    function yy_is_expected_token($token)
+    {
+        if ($token === 0) {
+            return true; // 0 is not part of this
+        }
+        $state = $this->yystack[$this->yyidx]->stateno;
+        if (in_array($token, self::$yyExpectedTokens[$state], true)) {
+            return true;
+        }
+        $stack = $this->yystack;
+        $yyidx = $this->yyidx;
+        do {
+            $yyact = $this->yy_find_shift_action($token);
+            if ($yyact >= self::YYNSTATE && $yyact < self::YYNSTATE + self::YYNRULE) {
+                // reduce action
+                $done = 0;
+                do {
+                    if ($done++ == 100) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        // too much recursion prevents proper detection
+                        // so give up
+                        return true;
+                    }
+                    $yyruleno = $yyact - self::YYNSTATE;
+                    $this->yyidx -= self::$yyRuleInfo[$yyruleno]['rhs'];
+                    $nextstate = $this->yy_find_reduce_action(
+                        $this->yystack[$this->yyidx]->stateno,
+                        self::$yyRuleInfo[$yyruleno]['lhs']);
+                    if (isset(self::$yyExpectedTokens[$nextstate]) &&
+                          in_array($token, self::$yyExpectedTokens[$nextstate], true)) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        return true;
+                    }
+                    if ($nextstate < self::YYNSTATE) {
+                        // we need to shift a non-terminal
+                        $this->yyidx++;
+                        $x = new TP_yyStackEntry;
+                        $x->stateno = $nextstate;
+                        $x->major = self::$yyRuleInfo[$yyruleno]['lhs'];
+                        $this->yystack[$this->yyidx] = $x;
+                        continue 2;
+                    } elseif ($nextstate == self::YYNSTATE + self::YYNRULE + 1) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        if (!$token) {
+                            // end of input: this is valid
+                            return true;
+                        }
+                        // the last token was just ignored, we can't accept
+                        // by ignoring input, this is in essence ignoring a
+                        // syntax error!
+                        return false;
+                    } elseif ($nextstate === self::YY_NO_ACTION) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        // input accepted, but not shifted (I guess)
+                        return true;
+                    } else {
+                        $yyact = $nextstate;
+                    }
+                } while (true);
+            }
+            break;
+        } while (true);
+        $this->yyidx = $yyidx;
+        $this->yystack = $stack;
+        return true;
+    }
+
+   function yy_find_shift_action($iLookAhead)
+    {
+        $stateno = $this->yystack[$this->yyidx]->stateno;
+     
+        /* if ($this->yyidx < 0) return self::YY_NO_ACTION;  */
+        if (!isset(self::$yy_shift_ofst[$stateno])) {
+            // no shift actions
+            return self::$yy_default[$stateno];
+        }
+        $i = self::$yy_shift_ofst[$stateno];
+        if ($i === self::YY_SHIFT_USE_DFLT) {
+            return self::$yy_default[$stateno];
+        }
+        if ($iLookAhead == self::YYNOCODE) {
+            return self::YY_NO_ACTION;
+        }
+        $i += $iLookAhead;
+        if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
+              self::$yy_lookahead[$i] != $iLookAhead) {
+            if (count(self::$yyFallback) && $iLookAhead < count(self::$yyFallback)
+                   && ($iFallback = self::$yyFallback[$iLookAhead]) != 0) {
+                if (self::$yyTraceFILE) {
+                    fwrite(self::$yyTraceFILE, self::$yyTracePrompt . "FALLBACK " .
+                        $this->yyTokenName[$iLookAhead] . " => " .
+                        $this->yyTokenName[$iFallback] . "\n");
+                }
+                return $this->yy_find_shift_action($iFallback);
+            }
+            return self::$yy_default[$stateno];
+        } else {
+            return self::$yy_action[$i];
+        }
+    }
+
+    function yy_find_reduce_action($stateno, $iLookAhead)
+    {
+        /* $stateno = $this->yystack[$this->yyidx]->stateno; */
+
+        if (!isset(self::$yy_reduce_ofst[$stateno])) {
+            return self::$yy_default[$stateno];
+        }
+        $i = self::$yy_reduce_ofst[$stateno];
+        if ($i == self::YY_REDUCE_USE_DFLT) {
+            return self::$yy_default[$stateno];
+        }
+        if ($iLookAhead == self::YYNOCODE) {
+            return self::YY_NO_ACTION;
+        }
+        $i += $iLookAhead;
+        if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
+              self::$yy_lookahead[$i] != $iLookAhead) {
+            return self::$yy_default[$stateno];
+        } else {
+            return self::$yy_action[$i];
+        }
+    }
+
+    function yy_shift($yyNewState, $yyMajor, $yypMinor)
+    {
+        $this->yyidx++;
+        if ($this->yyidx >= self::YYSTACKDEPTH) {
+            $this->yyidx--;
+            if (self::$yyTraceFILE) {
+                fprintf(self::$yyTraceFILE, "%sStack Overflow!\n", self::$yyTracePrompt);
+            }
+            while ($this->yyidx >= 0) {
+                $this->yy_pop_parser_stack();
+            }
+#line 73 "smarty_internal_templateparser.y"
+
+    $this->internalError = true;
+    $this->compiler->trigger_template_error("Stack overflow in template parser");
+#line 1731 "smarty_internal_templateparser.php"
+            return;
+        }
+        $yytos = new TP_yyStackEntry;
+        $yytos->stateno = $yyNewState;
+        $yytos->major = $yyMajor;
+        $yytos->minor = $yypMinor;
+        array_push($this->yystack, $yytos);
+        if (self::$yyTraceFILE && $this->yyidx > 0) {
+            fprintf(self::$yyTraceFILE, "%sShift %d\n", self::$yyTracePrompt,
+                $yyNewState);
+            fprintf(self::$yyTraceFILE, "%sStack:", self::$yyTracePrompt);
+            for($i = 1; $i <= $this->yyidx; $i++) {
+                fprintf(self::$yyTraceFILE, " %s",
+                    $this->yyTokenName[$this->yystack[$i]->major]);
+            }
+            fwrite(self::$yyTraceFILE,"\n");
+        }
+    }
+
+    static public $yyRuleInfo = array(
+  array( 'lhs' => 79, 'rhs' => 1 ),
+  array( 'lhs' => 80, 'rhs' => 1 ),
+  array( 'lhs' => 80, 'rhs' => 2 ),
+  array( 'lhs' => 80, 'rhs' => 0 ),
+  array( 'lhs' => 81, 'rhs' => 1 ),
+  array( 'lhs' => 81, 'rhs' => 1 ),
+  array( 'lhs' => 81, 'rhs' => 1 ),
+  array( 'lhs' => 81, 'rhs' => 1 ),
+  array( 'lhs' => 81, 'rhs' => 1 ),
+  array( 'lhs' => 81, 'rhs' => 1 ),
+  array( 'lhs' => 81, 'rhs' => 1 ),
+  array( 'lhs' => 81, 'rhs' => 1 ),
+  array( 'lhs' => 81, 'rhs' => 1 ),
+  array( 'lhs' => 81, 'rhs' => 1 ),
+  array( 'lhs' => 81, 'rhs' => 1 ),
+  array( 'lhs' => 83, 'rhs' => 2 ),
+  array( 'lhs' => 83, 'rhs' => 3 ),
+  array( 'lhs' => 84, 'rhs' => 2 ),
+  array( 'lhs' => 84, 'rhs' => 0 ),
+  array( 'lhs' => 85, 'rhs' => 1 ),
+  array( 'lhs' => 85, 'rhs' => 1 ),
+  array( 'lhs' => 85, 'rhs' => 1 ),
+  array( 'lhs' => 85, 'rhs' => 1 ),
+  array( 'lhs' => 85, 'rhs' => 1 ),
+  array( 'lhs' => 85, 'rhs' => 1 ),
+  array( 'lhs' => 85, 'rhs' => 1 ),
+  array( 'lhs' => 82, 'rhs' => 3 ),
+  array( 'lhs' => 82, 'rhs' => 4 ),
+  array( 'lhs' => 82, 'rhs' => 4 ),
+  array( 'lhs' => 82, 'rhs' => 5 ),
+  array( 'lhs' => 82, 'rhs' => 4 ),
+  array( 'lhs' => 82, 'rhs' => 6 ),
+  array( 'lhs' => 82, 'rhs' => 6 ),
+  array( 'lhs' => 82, 'rhs' => 7 ),
+  array( 'lhs' => 82, 'rhs' => 6 ),
+  array( 'lhs' => 82, 'rhs' => 4 ),
+  array( 'lhs' => 82, 'rhs' => 3 ),
+  array( 'lhs' => 82, 'rhs' => 6 ),
+  array( 'lhs' => 82, 'rhs' => 5 ),
+  array( 'lhs' => 82, 'rhs' => 7 ),
+  array( 'lhs' => 82, 'rhs' => 4 ),
+  array( 'lhs' => 82, 'rhs' => 5 ),
+  array( 'lhs' => 82, 'rhs' => 4 ),
+  array( 'lhs' => 82, 'rhs' => 5 ),
+  array( 'lhs' => 82, 'rhs' => 13 ),
+  array( 'lhs' => 96, 'rhs' => 2 ),
+  array( 'lhs' => 96, 'rhs' => 1 ),
+  array( 'lhs' => 82, 'rhs' => 7 ),
+  array( 'lhs' => 82, 'rhs' => 9 ),
+  array( 'lhs' => 82, 'rhs' => 3 ),
+  array( 'lhs' => 82, 'rhs' => 8 ),
+  array( 'lhs' => 82, 'rhs' => 11 ),
+  array( 'lhs' => 82, 'rhs' => 8 ),
+  array( 'lhs' => 82, 'rhs' => 11 ),
+  array( 'lhs' => 82, 'rhs' => 1 ),
+  array( 'lhs' => 82, 'rhs' => 3 ),
+  array( 'lhs' => 82, 'rhs' => 4 ),
+  array( 'lhs' => 82, 'rhs' => 5 ),
+  array( 'lhs' => 82, 'rhs' => 6 ),
+  array( 'lhs' => 87, 'rhs' => 2 ),
+  array( 'lhs' => 87, 'rhs' => 1 ),
+  array( 'lhs' => 87, 'rhs' => 0 ),
+  array( 'lhs' => 97, 'rhs' => 4 ),
+  array( 'lhs' => 97, 'rhs' => 4 ),
+  array( 'lhs' => 97, 'rhs' => 4 ),
+  array( 'lhs' => 97, 'rhs' => 2 ),
+  array( 'lhs' => 97, 'rhs' => 2 ),
+  array( 'lhs' => 97, 'rhs' => 2 ),
+  array( 'lhs' => 97, 'rhs' => 4 ),
+  array( 'lhs' => 93, 'rhs' => 1 ),
+  array( 'lhs' => 93, 'rhs' => 3 ),
+  array( 'lhs' => 92, 'rhs' => 4 ),
+  array( 'lhs' => 92, 'rhs' => 3 ),
+  array( 'lhs' => 92, 'rhs' => 3 ),
+  array( 'lhs' => 89, 'rhs' => 1 ),
+  array( 'lhs' => 89, 'rhs' => 1 ),
+  array( 'lhs' => 89, 'rhs' => 4 ),
+  array( 'lhs' => 89, 'rhs' => 3 ),
+  array( 'lhs' => 89, 'rhs' => 3 ),
+  array( 'lhs' => 89, 'rhs' => 3 ),
+  array( 'lhs' => 89, 'rhs' => 1 ),
+  array( 'lhs' => 89, 'rhs' => 2 ),
+  array( 'lhs' => 89, 'rhs' => 3 ),
+  array( 'lhs' => 89, 'rhs' => 3 ),
+  array( 'lhs' => 89, 'rhs' => 3 ),
+  array( 'lhs' => 89, 'rhs' => 3 ),
+  array( 'lhs' => 89, 'rhs' => 3 ),
+  array( 'lhs' => 89, 'rhs' => 3 ),
+  array( 'lhs' => 89, 'rhs' => 2 ),
+  array( 'lhs' => 89, 'rhs' => 2 ),
+  array( 'lhs' => 89, 'rhs' => 3 ),
+  array( 'lhs' => 89, 'rhs' => 3 ),
+  array( 'lhs' => 89, 'rhs' => 2 ),
+  array( 'lhs' => 89, 'rhs' => 2 ),
+  array( 'lhs' => 89, 'rhs' => 3 ),
+  array( 'lhs' => 89, 'rhs' => 3 ),
+  array( 'lhs' => 89, 'rhs' => 3 ),
+  array( 'lhs' => 89, 'rhs' => 3 ),
+  array( 'lhs' => 98, 'rhs' => 8 ),
+  array( 'lhs' => 98, 'rhs' => 7 ),
+  array( 'lhs' => 86, 'rhs' => 1 ),
+  array( 'lhs' => 86, 'rhs' => 2 ),
+  array( 'lhs' => 86, 'rhs' => 2 ),
+  array( 'lhs' => 86, 'rhs' => 2 ),
+  array( 'lhs' => 86, 'rhs' => 2 ),
+  array( 'lhs' => 86, 'rhs' => 1 ),
+  array( 'lhs' => 86, 'rhs' => 1 ),
+  array( 'lhs' => 86, 'rhs' => 3 ),
+  array( 'lhs' => 86, 'rhs' => 2 ),
+  array( 'lhs' => 86, 'rhs' => 2 ),
+  array( 'lhs' => 86, 'rhs' => 1 ),
+  array( 'lhs' => 86, 'rhs' => 1 ),
+  array( 'lhs' => 86, 'rhs' => 3 ),
+  array( 'lhs' => 86, 'rhs' => 1 ),
+  array( 'lhs' => 86, 'rhs' => 1 ),
+  array( 'lhs' => 86, 'rhs' => 3 ),
+  array( 'lhs' => 86, 'rhs' => 3 ),
+  array( 'lhs' => 86, 'rhs' => 1 ),
+  array( 'lhs' => 86, 'rhs' => 2 ),
+  array( 'lhs' => 88, 'rhs' => 1 ),
+  array( 'lhs' => 88, 'rhs' => 4 ),
+  array( 'lhs' => 88, 'rhs' => 1 ),
+  array( 'lhs' => 88, 'rhs' => 3 ),
+  array( 'lhs' => 88, 'rhs' => 3 ),
+  array( 'lhs' => 91, 'rhs' => 3 ),
+  array( 'lhs' => 106, 'rhs' => 2 ),
+  array( 'lhs' => 106, 'rhs' => 0 ),
+  array( 'lhs' => 107, 'rhs' => 3 ),
+  array( 'lhs' => 107, 'rhs' => 5 ),
+  array( 'lhs' => 107, 'rhs' => 2 ),
+  array( 'lhs' => 107, 'rhs' => 2 ),
+  array( 'lhs' => 107, 'rhs' => 4 ),
+  array( 'lhs' => 107, 'rhs' => 3 ),
+  array( 'lhs' => 107, 'rhs' => 5 ),
+  array( 'lhs' => 107, 'rhs' => 3 ),
+  array( 'lhs' => 107, 'rhs' => 2 ),
+  array( 'lhs' => 95, 'rhs' => 1 ),
+  array( 'lhs' => 95, 'rhs' => 2 ),
+  array( 'lhs' => 108, 'rhs' => 1 ),
+  array( 'lhs' => 108, 'rhs' => 3 ),
+  array( 'lhs' => 105, 'rhs' => 2 ),
+  array( 'lhs' => 109, 'rhs' => 1 ),
+  array( 'lhs' => 109, 'rhs' => 2 ),
+  array( 'lhs' => 110, 'rhs' => 3 ),
+  array( 'lhs' => 110, 'rhs' => 4 ),
+  array( 'lhs' => 110, 'rhs' => 5 ),
+  array( 'lhs' => 110, 'rhs' => 6 ),
+  array( 'lhs' => 110, 'rhs' => 2 ),
+  array( 'lhs' => 102, 'rhs' => 4 ),
+  array( 'lhs' => 111, 'rhs' => 4 ),
+  array( 'lhs' => 111, 'rhs' => 5 ),
+  array( 'lhs' => 112, 'rhs' => 3 ),
+  array( 'lhs' => 112, 'rhs' => 1 ),
+  array( 'lhs' => 112, 'rhs' => 0 ),
+  array( 'lhs' => 90, 'rhs' => 3 ),
+  array( 'lhs' => 90, 'rhs' => 2 ),
+  array( 'lhs' => 113, 'rhs' => 3 ),
+  array( 'lhs' => 113, 'rhs' => 2 ),
+  array( 'lhs' => 114, 'rhs' => 2 ),
+  array( 'lhs' => 114, 'rhs' => 0 ),
+  array( 'lhs' => 115, 'rhs' => 2 ),
+  array( 'lhs' => 115, 'rhs' => 2 ),
+  array( 'lhs' => 104, 'rhs' => 1 ),
+  array( 'lhs' => 104, 'rhs' => 2 ),
+  array( 'lhs' => 104, 'rhs' => 1 ),
+  array( 'lhs' => 104, 'rhs' => 3 ),
+  array( 'lhs' => 104, 'rhs' => 4 ),
+  array( 'lhs' => 100, 'rhs' => 1 ),
+  array( 'lhs' => 100, 'rhs' => 1 ),
+  array( 'lhs' => 100, 'rhs' => 1 ),
+  array( 'lhs' => 100, 'rhs' => 1 ),
+  array( 'lhs' => 100, 'rhs' => 1 ),
+  array( 'lhs' => 100, 'rhs' => 1 ),
+  array( 'lhs' => 100, 'rhs' => 1 ),
+  array( 'lhs' => 100, 'rhs' => 1 ),
+  array( 'lhs' => 100, 'rhs' => 1 ),
+  array( 'lhs' => 101, 'rhs' => 1 ),
+  array( 'lhs' => 101, 'rhs' => 1 ),
+  array( 'lhs' => 101, 'rhs' => 1 ),
+  array( 'lhs' => 99, 'rhs' => 3 ),
+  array( 'lhs' => 116, 'rhs' => 1 ),
+  array( 'lhs' => 116, 'rhs' => 3 ),
+  array( 'lhs' => 116, 'rhs' => 0 ),
+  array( 'lhs' => 117, 'rhs' => 3 ),
+  array( 'lhs' => 117, 'rhs' => 3 ),
+  array( 'lhs' => 117, 'rhs' => 1 ),
+  array( 'lhs' => 103, 'rhs' => 2 ),
+  array( 'lhs' => 103, 'rhs' => 3 ),
+  array( 'lhs' => 118, 'rhs' => 2 ),
+  array( 'lhs' => 118, 'rhs' => 1 ),
+  array( 'lhs' => 119, 'rhs' => 3 ),
+  array( 'lhs' => 119, 'rhs' => 3 ),
+  array( 'lhs' => 119, 'rhs' => 1 ),
+  array( 'lhs' => 119, 'rhs' => 3 ),
+  array( 'lhs' => 119, 'rhs' => 3 ),
+  array( 'lhs' => 119, 'rhs' => 1 ),
+  array( 'lhs' => 119, 'rhs' => 1 ),
+  array( 'lhs' => 94, 'rhs' => 1 ),
+  array( 'lhs' => 94, 'rhs' => 0 ),
+    );
+
+    static public $yyReduceMap = array(
+        0 => 0,
+        1 => 1,
+        2 => 1,
+        4 => 4,
+        5 => 5,
+        6 => 6,
+        7 => 7,
+        8 => 8,
+        9 => 9,
+        10 => 10,
+        11 => 11,
+        12 => 12,
+        13 => 13,
+        14 => 14,
+        15 => 15,
+        18 => 15,
+        16 => 16,
+        17 => 17,
+        101 => 17,
+        103 => 17,
+        104 => 17,
+        163 => 17,
+        19 => 19,
+        20 => 19,
+        74 => 19,
+        75 => 19,
+        100 => 19,
+        105 => 19,
+        106 => 19,
+        111 => 19,
+        113 => 19,
+        114 => 19,
+        121 => 19,
+        162 => 19,
+        180 => 19,
+        21 => 21,
+        22 => 21,
+        23 => 23,
+        24 => 24,
+        25 => 25,
+        26 => 26,
+        27 => 27,
+        28 => 27,
+        30 => 27,
+        29 => 29,
+        31 => 31,
+        32 => 31,
+        33 => 33,
+        34 => 34,
+        35 => 35,
+        36 => 36,
+        37 => 37,
+        38 => 38,
+        39 => 39,
+        40 => 40,
+        42 => 40,
+        41 => 41,
+        43 => 41,
+        44 => 44,
+        45 => 45,
+        46 => 46,
+        66 => 46,
+        67 => 46,
+        164 => 46,
+        185 => 46,
+        47 => 47,
+        48 => 48,
+        49 => 49,
+        50 => 50,
+        51 => 51,
+        52 => 52,
+        53 => 53,
+        54 => 54,
+        55 => 55,
+        56 => 56,
+        57 => 57,
+        58 => 58,
+        59 => 59,
+        60 => 60,
+        69 => 60,
+        152 => 60,
+        156 => 60,
+        61 => 61,
+        153 => 61,
+        62 => 62,
+        63 => 63,
+        64 => 63,
+        65 => 65,
+        68 => 68,
+        70 => 70,
+        71 => 71,
+        72 => 71,
+        73 => 73,
+        76 => 76,
+        77 => 77,
+        78 => 77,
+        79 => 77,
+        80 => 80,
+        136 => 80,
+        197 => 80,
+        81 => 81,
+        118 => 81,
+        82 => 82,
+        85 => 82,
+        96 => 82,
+        83 => 83,
+        84 => 84,
+        86 => 86,
+        87 => 87,
+        88 => 88,
+        93 => 88,
+        89 => 89,
+        92 => 89,
+        90 => 90,
+        95 => 90,
+        91 => 91,
+        94 => 91,
+        97 => 97,
+        98 => 98,
+        99 => 99,
+        102 => 102,
+        107 => 107,
+        108 => 108,
+        109 => 109,
+        110 => 110,
+        112 => 112,
+        115 => 115,
+        116 => 116,
+        117 => 117,
+        119 => 119,
+        120 => 120,
+        122 => 122,
+        123 => 123,
+        124 => 124,
+        125 => 125,
+        126 => 126,
+        127 => 127,
+        128 => 128,
+        129 => 129,
+        130 => 130,
+        131 => 131,
+        134 => 131,
+        132 => 132,
+        133 => 133,
+        135 => 135,
+        137 => 137,
+        138 => 138,
+        139 => 139,
+        140 => 140,
+        141 => 141,
+        142 => 142,
+        143 => 143,
+        144 => 144,
+        145 => 145,
+        146 => 146,
+        147 => 147,
+        148 => 148,
+        149 => 149,
+        150 => 150,
+        151 => 151,
+        154 => 154,
+        155 => 155,
+        157 => 157,
+        158 => 158,
+        159 => 159,
+        160 => 160,
+        161 => 160,
+        165 => 165,
+        166 => 166,
+        167 => 167,
+        168 => 168,
+        169 => 169,
+        170 => 170,
+        171 => 171,
+        172 => 172,
+        173 => 173,
+        174 => 174,
+        175 => 175,
+        176 => 176,
+        177 => 177,
+        178 => 178,
+        179 => 179,
+        181 => 181,
+        182 => 182,
+        183 => 183,
+        184 => 184,
+        186 => 186,
+        187 => 187,
+        188 => 188,
+        189 => 189,
+        190 => 190,
+        191 => 190,
+        193 => 190,
+        192 => 192,
+        194 => 194,
+        195 => 195,
+        196 => 196,
+        198 => 198,
+    );
+#line 84 "smarty_internal_templateparser.y"
+    function yy_r0(){ $this->_retvalue = $this->root_buffer->to_smarty_php();     }
+#line 2155 "smarty_internal_templateparser.php"
+#line 90 "smarty_internal_templateparser.y"
+    function yy_r1(){ $this->current_buffer->append_subtree($this->yystack[$this->yyidx + 0]->minor);     }
+#line 2158 "smarty_internal_templateparser.php"
+#line 102 "smarty_internal_templateparser.y"
+    function yy_r4(){
+                                          if ($this->compiler->has_code) {
+                                            $tmp =''; foreach ($this->compiler->prefix_code as $code) {$tmp.=$code;} $this->compiler->prefix_code=array();
+                                            $this->_retvalue = new _smarty_tag($this, $this->compiler->processNocacheCode($tmp.$this->yystack[$this->yyidx + 0]->minor,true));
+                                         } else { 
+                                           $this->_retvalue = new _smarty_tag($this, $this->yystack[$this->yyidx + 0]->minor);
+                                         }  
+                                         $this->compiler->has_variable_string = false;
+                                         $this->block_nesting_level = count($this->compiler->_tag_stack);
+                                            }
+#line 2170 "smarty_internal_templateparser.php"
+#line 114 "smarty_internal_templateparser.y"
+    function yy_r5(){ $this->_retvalue = new _smarty_tag($this, '');    }
+#line 2173 "smarty_internal_templateparser.php"
+#line 117 "smarty_internal_templateparser.y"
+    function yy_r6(){ $this->_retvalue = new _smarty_text($this, $this->yystack[$this->yyidx + 0]->minor);     }
+#line 2176 "smarty_internal_templateparser.php"
+#line 120 "smarty_internal_templateparser.y"
+    function yy_r7(){
+                                      if ($this->php_handling == Smarty::PHP_PASSTHRU) {
+					                             $this->_retvalue = new _smarty_text($this, self::escape_start_tag($this->yystack[$this->yyidx + 0]->minor));
+                                      } elseif ($this->php_handling == Smarty::PHP_QUOTE) {
+                                       $this->_retvalue = new _smarty_text($this, htmlspecialchars($this->yystack[$this->yyidx + 0]->minor, ENT_QUOTES));
+                                      }elseif ($this->php_handling == Smarty::PHP_ALLOW) {
+                                       $this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode('<?php', true));
+                                      }elseif ($this->php_handling == Smarty::PHP_REMOVE) {
+                                       $this->_retvalue = new _smarty_text($this, '');
+                                      }
+                                         }
+#line 2189 "smarty_internal_templateparser.php"
+#line 132 "smarty_internal_templateparser.y"
+    function yy_r8(){if ($this->is_xml) {
+                                       $this->compiler->tag_nocache = true; 
+                                       $this->is_xml = true; 
+                                       $this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode("<?php echo '?>';?>", $this->compiler, true));
+                                      }elseif ($this->php_handling == Smarty::PHP_PASSTHRU) {
+					                             $this->_retvalue = new _smarty_text($this, '?<?php ?>>');
+                                      } elseif ($this->php_handling == Smarty::PHP_QUOTE) {
+                                       $this->_retvalue = new _smarty_text($this, htmlspecialchars('?>', ENT_QUOTES));
+                                      }elseif ($this->php_handling == Smarty::PHP_ALLOW) {
+                                       $this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode('?>', true));
+                                      }elseif ($this->php_handling == Smarty::PHP_REMOVE) {
+                                       $this->_retvalue = new _smarty_text($this, '');
+                                      }
+                                         }
+#line 2205 "smarty_internal_templateparser.php"
+#line 148 "smarty_internal_templateparser.y"
+    function yy_r9(){
+                                      if ($this->php_handling == Smarty::PHP_PASSTHRU) {
+					                             $this->_retvalue = new _smarty_text($this, '<<?php ?>%');
+                                      } elseif ($this->php_handling == Smarty::PHP_QUOTE) {
+                                       $this->_retvalue = new _smarty_text($this, htmlspecialchars($this->yystack[$this->yyidx + 0]->minor, ENT_QUOTES));
+                                      }elseif ($this->php_handling == Smarty::PHP_ALLOW) {
+                                        if ($this->asp_tags) {
+                                          $this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode('<%', true));
+                                        } else {
+                                         $this->_retvalue = new _smarty_text($this, '<<?php ?>%');
+                                        }
+                                      }elseif ($this->php_handling == Smarty::PHP_REMOVE) {
+                                        if ($this->asp_tags) {
+                                         $this->_retvalue = new _smarty_text($this, '');
+                                        } else {
+                                         $this->_retvalue = new _smarty_text($this, '<<?php ?>%');
+                                        }
+                                      }
+                                        }
+#line 2226 "smarty_internal_templateparser.php"
+#line 169 "smarty_internal_templateparser.y"
+    function yy_r10(){
+                                      if ($this->php_handling == Smarty::PHP_PASSTHRU) {
+					                             $this->_retvalue = new _smarty_text($this, '%<?php ?>>');
+                                      } elseif ($this->php_handling == Smarty::PHP_QUOTE) {
+                                       $this->_retvalue = new _smarty_text($this, htmlspecialchars('%>', ENT_QUOTES));
+                                      }elseif ($this->php_handling == Smarty::PHP_ALLOW) {
+                                        if ($this->asp_tags) {
+                                          $this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode('%>', true));
+                                        } else {
+                                         $this->_retvalue = new _smarty_text($this, '%<?php ?>>');
+                                        }
+                                      }elseif ($this->php_handling == Smarty::PHP_REMOVE) {
+                                        if ($this->asp_tags) {
+                                         $this->_retvalue = new _smarty_text($this, '');
+                                        } else {
+                                         $this->_retvalue = new _smarty_text($this, '%<?php ?>>');
+                                        }
+                                      }
+                                        }
+#line 2247 "smarty_internal_templateparser.php"
+#line 189 "smarty_internal_templateparser.y"
+    function yy_r11(){if ($this->lex->strip) {
+                                       $this->_retvalue = new _smarty_text($this, preg_replace('![\$this->yystack[$this->yyidx + 0]->minor ]*[\r\n]+[\$this->yystack[$this->yyidx + 0]->minor ]*!', '', self::escape_start_tag($this->yystack[$this->yyidx + 0]->minor)));	
+                                     } else {
+                                       $this->_retvalue = new _smarty_text($this, self::escape_start_tag($this->yystack[$this->yyidx + 0]->minor));	
+                                     }
+                                        }
+#line 2255 "smarty_internal_templateparser.php"
+#line 197 "smarty_internal_templateparser.y"
+    function yy_r12(){ $this->compiler->tag_nocache = true; $this->is_xml = true; $this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode("<?php echo '<?xml';?>", $this->compiler, true));    }
+#line 2258 "smarty_internal_templateparser.php"
+#line 200 "smarty_internal_templateparser.y"
+    function yy_r13(){if ($this->lex->strip) {
+                                       $this->_retvalue = new _smarty_text($this, preg_replace('![\t ]*[\r\n]+[\t ]*!', '', $this->yystack[$this->yyidx + 0]->minor));	
+                                     } else {
+                                       $this->_retvalue = new _smarty_text($this, $this->yystack[$this->yyidx + 0]->minor);	
+                                     }
+                                        }
+#line 2266 "smarty_internal_templateparser.php"
+#line 206 "smarty_internal_templateparser.y"
+    function yy_r14(){
+                                     $this->_retvalue = new _smarty_linebreak($this, $this->yystack[$this->yyidx + 0]->minor);
+                                       }
+#line 2271 "smarty_internal_templateparser.php"
+#line 211 "smarty_internal_templateparser.y"
+    function yy_r15(){ $this->_retvalue = '';     }
+#line 2274 "smarty_internal_templateparser.php"
+#line 212 "smarty_internal_templateparser.y"
+    function yy_r16(){ $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;     }
+#line 2277 "smarty_internal_templateparser.php"
+#line 214 "smarty_internal_templateparser.y"
+    function yy_r17(){ $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;     }
+#line 2280 "smarty_internal_templateparser.php"
+#line 217 "smarty_internal_templateparser.y"
+    function yy_r19(){ $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;     }
+#line 2283 "smarty_internal_templateparser.php"
+#line 219 "smarty_internal_templateparser.y"
+    function yy_r21(){ $this->_retvalue = self::escape_start_tag($this->yystack[$this->yyidx + 0]->minor);     }
+#line 2286 "smarty_internal_templateparser.php"
+#line 221 "smarty_internal_templateparser.y"
+    function yy_r23(){ $this->_retvalue = self::escape_end_tag($this->yystack[$this->yyidx + 0]->minor);     }
+#line 2289 "smarty_internal_templateparser.php"
+#line 222 "smarty_internal_templateparser.y"
+    function yy_r24(){ $this->_retvalue = '<<?php ?>%';     }
+#line 2292 "smarty_internal_templateparser.php"
+#line 223 "smarty_internal_templateparser.y"
+    function yy_r25(){ $this->_retvalue = '%<?php ?>>';     }
+#line 2295 "smarty_internal_templateparser.php"
+#line 231 "smarty_internal_templateparser.y"
+    function yy_r26(){ $this->_retvalue = $this->compiler->compileTag('private_print_expression',array(),array('value'=>$this->yystack[$this->yyidx + -1]->minor));    }
+#line 2298 "smarty_internal_templateparser.php"
+#line 232 "smarty_internal_templateparser.y"
+    function yy_r27(){ $this->_retvalue = $this->compiler->compileTag('private_print_expression',$this->yystack[$this->yyidx + -1]->minor,array('value'=>$this->yystack[$this->yyidx + -2]->minor));    }
+#line 2301 "smarty_internal_templateparser.php"
+#line 234 "smarty_internal_templateparser.y"
+    function yy_r29(){ $this->_retvalue = $this->compiler->compileTag('private_print_expression',$this->yystack[$this->yyidx + -1]->minor,array('value'=>$this->yystack[$this->yyidx + -3]->minor,'modifierlist'=>$this->yystack[$this->yyidx + -2]->minor));    }
+#line 2304 "smarty_internal_templateparser.php"
+#line 242 "smarty_internal_templateparser.y"
+    function yy_r31(){ $this->_retvalue = $this->compiler->compileTag('assign',array(array('value'=>$this->yystack[$this->yyidx + -1]->minor),array('var'=>"'".$this->yystack[$this->yyidx + -3]->minor."'")));    }
+#line 2307 "smarty_internal_templateparser.php"
+#line 244 "smarty_internal_templateparser.y"
+    function yy_r33(){ $this->_retvalue = $this->compiler->compileTag('assign',array_merge(array(array('value'=>$this->yystack[$this->yyidx + -2]->minor),array('var'=>"'".$this->yystack[$this->yyidx + -4]->minor."'")),$this->yystack[$this->yyidx + -1]->minor));    }
+#line 2310 "smarty_internal_templateparser.php"
+#line 245 "smarty_internal_templateparser.y"
+    function yy_r34(){ $this->_retvalue = $this->compiler->compileTag('assign',array_merge(array(array('value'=>$this->yystack[$this->yyidx + -2]->minor),array('var'=>$this->yystack[$this->yyidx + -4]->minor['var'])),$this->yystack[$this->yyidx + -1]->minor),array('smarty_internal_index'=>$this->yystack[$this->yyidx + -4]->minor['smarty_internal_index']));    }
+#line 2313 "smarty_internal_templateparser.php"
+#line 247 "smarty_internal_templateparser.y"
+    function yy_r35(){ $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -2]->minor,$this->yystack[$this->yyidx + -1]->minor);    }
+#line 2316 "smarty_internal_templateparser.php"
+#line 248 "smarty_internal_templateparser.y"
+    function yy_r36(){ $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -1]->minor,array());    }
+#line 2319 "smarty_internal_templateparser.php"
+#line 250 "smarty_internal_templateparser.y"
+    function yy_r37(){ $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -4]->minor,$this->yystack[$this->yyidx + -1]->minor,array('object_methode'=>$this->yystack[$this->yyidx + -2]->minor));    }
+#line 2322 "smarty_internal_templateparser.php"
+#line 252 "smarty_internal_templateparser.y"
+    function yy_r38(){  $this->_retvalue = '<?php ob_start();?>'.$this->compiler->compileTag($this->yystack[$this->yyidx + -3]->minor,$this->yystack[$this->yyidx + -1]->minor).'<?php echo ';
+                                                                                    $this->_retvalue .= $this->compiler->compileTag('private_modifier',array(),array('modifierlist'=>$this->yystack[$this->yyidx + -2]->minor,'value'=>'ob_get_clean()')).'?>';
+                                                                                     }
+#line 2327 "smarty_internal_templateparser.php"
+#line 256 "smarty_internal_templateparser.y"
+    function yy_r39(){  $this->_retvalue = '<?php ob_start();?>'.$this->compiler->compileTag($this->yystack[$this->yyidx + -5]->minor,$this->yystack[$this->yyidx + -1]->minor,array('object_methode'=>$this->yystack[$this->yyidx + -3]->minor)).'<?php echo ';
+                                                                                               $this->_retvalue .= $this->compiler->compileTag('private_modifier',array(),array('modifierlist'=>$this->yystack[$this->yyidx + -2]->minor,'value'=>'ob_get_clean()')).'?>';
+                                                                                                }
+#line 2332 "smarty_internal_templateparser.php"
+#line 260 "smarty_internal_templateparser.y"
+    function yy_r40(){ $tag = trim(substr($this->yystack[$this->yyidx + -3]->minor,$this->lex->ldel_length)); $this->_retvalue = $this->compiler->compileTag(($tag == 'else if')? 'elseif' : $tag,array(),array('if condition'=>$this->yystack[$this->yyidx + -1]->minor));    }
+#line 2335 "smarty_internal_templateparser.php"
+#line 261 "smarty_internal_templateparser.y"
+    function yy_r41(){ $tag = trim(substr($this->yystack[$this->yyidx + -4]->minor,$this->lex->ldel_length)); $this->_retvalue = $this->compiler->compileTag(($tag == 'else if')? 'elseif' : $tag,$this->yystack[$this->yyidx + -1]->minor,array('if condition'=>$this->yystack[$this->yyidx + -2]->minor));    }
+#line 2338 "smarty_internal_templateparser.php"
+#line 265 "smarty_internal_templateparser.y"
+    function yy_r44(){
+                                                             $this->_retvalue = $this->compiler->compileTag('for',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('start'=>$this->yystack[$this->yyidx + -10]->minor),array('ifexp'=>$this->yystack[$this->yyidx + -7]->minor),array('var'=>$this->yystack[$this->yyidx + -3]->minor),array('step'=>$this->yystack[$this->yyidx + -2]->minor))),1);    }
+#line 2342 "smarty_internal_templateparser.php"
+#line 268 "smarty_internal_templateparser.y"
+    function yy_r45(){ $this->_retvalue = '='.$this->yystack[$this->yyidx + 0]->minor;    }
+#line 2345 "smarty_internal_templateparser.php"
+#line 269 "smarty_internal_templateparser.y"
+    function yy_r46(){ $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;    }
+#line 2348 "smarty_internal_templateparser.php"
+#line 270 "smarty_internal_templateparser.y"
+    function yy_r47(){ $this->_retvalue = $this->compiler->compileTag('for',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('start'=>$this->yystack[$this->yyidx + -4]->minor),array('to'=>$this->yystack[$this->yyidx + -2]->minor))),0);    }
+#line 2351 "smarty_internal_templateparser.php"
+#line 271 "smarty_internal_templateparser.y"
+    function yy_r48(){ $this->_retvalue = $this->compiler->compileTag('for',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('start'=>$this->yystack[$this->yyidx + -6]->minor),array('to'=>$this->yystack[$this->yyidx + -4]->minor),array('step'=>$this->yystack[$this->yyidx + -2]->minor))),0);    }
+#line 2354 "smarty_internal_templateparser.php"
+#line 273 "smarty_internal_templateparser.y"
+    function yy_r49(){ $this->_retvalue = $this->compiler->compileTag('foreach',$this->yystack[$this->yyidx + -1]->minor);    }
+#line 2357 "smarty_internal_templateparser.php"
+#line 275 "smarty_internal_templateparser.y"
+    function yy_r50(){
+                                                            $this->_retvalue = $this->compiler->compileTag('foreach',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('from'=>$this->yystack[$this->yyidx + -5]->minor),array('item'=>$this->yystack[$this->yyidx + -2]->minor))));    }
+#line 2361 "smarty_internal_templateparser.php"
+#line 277 "smarty_internal_templateparser.y"
+    function yy_r51(){
+                                                            $this->_retvalue = $this->compiler->compileTag('foreach',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('from'=>$this->yystack[$this->yyidx + -8]->minor),array('item'=>$this->yystack[$this->yyidx + -2]->minor),array('key'=>$this->yystack[$this->yyidx + -5]->minor))));    }
+#line 2365 "smarty_internal_templateparser.php"
+#line 279 "smarty_internal_templateparser.y"
+    function yy_r52(){ 
+                                                            $this->_retvalue = $this->compiler->compileTag('foreach',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('from'=>$this->yystack[$this->yyidx + -5]->minor),array('item'=>$this->yystack[$this->yyidx + -2]->minor))));    }
+#line 2369 "smarty_internal_templateparser.php"
+#line 281 "smarty_internal_templateparser.y"
+    function yy_r53(){ 
+                                                            $this->_retvalue = $this->compiler->compileTag('foreach',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('from'=>$this->yystack[$this->yyidx + -8]->minor),array('item'=>$this->yystack[$this->yyidx + -2]->minor),array('key'=>$this->yystack[$this->yyidx + -5]->minor))));    }
+#line 2373 "smarty_internal_templateparser.php"
+#line 285 "smarty_internal_templateparser.y"
+    function yy_r54(){ $this->_retvalue = SMARTY_INTERNAL_COMPILE_BLOCK::compileChildBlock($this->compiler);    }
+#line 2376 "smarty_internal_templateparser.php"
+#line 289 "smarty_internal_templateparser.y"
+    function yy_r55(){ $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -1]->minor.'close',array());    }
+#line 2379 "smarty_internal_templateparser.php"
+#line 291 "smarty_internal_templateparser.y"
+    function yy_r56(){  $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -2]->minor.'close',array(),array('modifier_list'=>$this->yystack[$this->yyidx + -1]->minor));
+                                                                                          }
+#line 2383 "smarty_internal_templateparser.php"
+#line 294 "smarty_internal_templateparser.y"
+    function yy_r57(){  $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -3]->minor.'close',array(),array('object_methode'=>$this->yystack[$this->yyidx + -1]->minor));    }
+#line 2386 "smarty_internal_templateparser.php"
+#line 295 "smarty_internal_templateparser.y"
+    function yy_r58(){  $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -4]->minor.'close',array(),array('object_methode'=>$this->yystack[$this->yyidx + -2]->minor, 'modifier_list'=>$this->yystack[$this->yyidx + -1]->minor));    }
+#line 2389 "smarty_internal_templateparser.php"
+#line 301 "smarty_internal_templateparser.y"
+    function yy_r59(){ $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor; $this->_retvalue[] = $this->yystack[$this->yyidx + 0]->minor;    }
+#line 2392 "smarty_internal_templateparser.php"
+#line 303 "smarty_internal_templateparser.y"
+    function yy_r60(){ $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor);    }
+#line 2395 "smarty_internal_templateparser.php"
+#line 305 "smarty_internal_templateparser.y"
+    function yy_r61(){ $this->_retvalue = array();    }
+#line 2398 "smarty_internal_templateparser.php"
+#line 308 "smarty_internal_templateparser.y"
+    function yy_r62(){ if (preg_match('~^true$~i', $this->yystack[$this->yyidx + 0]->minor)) {
+                                                  $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>'true');
+                                                 } elseif (preg_match('~^false$~i', $this->yystack[$this->yyidx + 0]->minor)) {
+                                                  $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>'false');
+                                                 } elseif (preg_match('~^null$~i', $this->yystack[$this->yyidx + 0]->minor)) {
+                                                  $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>'null');
+                                                 } else
+                                                  $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>"'".$this->yystack[$this->yyidx + 0]->minor."'");    }
+#line 2408 "smarty_internal_templateparser.php"
+#line 316 "smarty_internal_templateparser.y"
+    function yy_r63(){ $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>$this->yystack[$this->yyidx + 0]->minor);    }
+#line 2411 "smarty_internal_templateparser.php"
+#line 318 "smarty_internal_templateparser.y"
+    function yy_r65(){ $this->_retvalue = "'".$this->yystack[$this->yyidx + 0]->minor."'";    }
+#line 2414 "smarty_internal_templateparser.php"
+#line 321 "smarty_internal_templateparser.y"
+    function yy_r68(){$this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>$this->yystack[$this->yyidx + 0]->minor);    }
+#line 2417 "smarty_internal_templateparser.php"
+#line 328 "smarty_internal_templateparser.y"
+    function yy_r70(){ $this->yystack[$this->yyidx + -2]->minor[]=$this->yystack[$this->yyidx + 0]->minor; $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor;    }
+#line 2420 "smarty_internal_templateparser.php"
+#line 330 "smarty_internal_templateparser.y"
+    function yy_r71(){ $this->_retvalue = array('var' => $this->yystack[$this->yyidx + -2]->minor, 'value'=>$this->yystack[$this->yyidx + 0]->minor);    }
+#line 2423 "smarty_internal_templateparser.php"
+#line 332 "smarty_internal_templateparser.y"
+    function yy_r73(){ $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;    }
+#line 2426 "smarty_internal_templateparser.php"
+#line 343 "smarty_internal_templateparser.y"
+    function yy_r76(){$this->_retvalue = '$_smarty_tpl->getStreamVariable(\''. $this->yystack[$this->yyidx + -2]->minor .'://'. $this->yystack[$this->yyidx + 0]->minor . '\')';    }
+#line 2429 "smarty_internal_templateparser.php"
+#line 345 "smarty_internal_templateparser.y"
+    function yy_r77(){ $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor . trim($this->yystack[$this->yyidx + -1]->minor) . $this->yystack[$this->yyidx + 0]->minor;     }
+#line 2432 "smarty_internal_templateparser.php"
+#line 351 "smarty_internal_templateparser.y"
+    function yy_r80(){$this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;    }
+#line 2435 "smarty_internal_templateparser.php"
+#line 354 "smarty_internal_templateparser.y"
+    function yy_r81(){  $this->_retvalue = $this->compiler->compileTag('private_modifier',array(),array('value'=>$this->yystack[$this->yyidx + -1]->minor,'modifierlist'=>$this->yystack[$this->yyidx + 0]->minor));     }
+#line 2438 "smarty_internal_templateparser.php"
+#line 358 "smarty_internal_templateparser.y"
+    function yy_r82(){$this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;    }
+#line 2441 "smarty_internal_templateparser.php"
+#line 359 "smarty_internal_templateparser.y"
+    function yy_r83(){$this->_retvalue = 'in_array('.$this->yystack[$this->yyidx + -2]->minor.','.$this->yystack[$this->yyidx + 0]->minor.')';    }
+#line 2444 "smarty_internal_templateparser.php"
+#line 360 "smarty_internal_templateparser.y"
+    function yy_r84(){$this->_retvalue = 'in_array('.$this->yystack[$this->yyidx + -2]->minor.',(array)'.$this->yystack[$this->yyidx + 0]->minor.')';    }
+#line 2447 "smarty_internal_templateparser.php"
+#line 362 "smarty_internal_templateparser.y"
+    function yy_r86(){$this->_retvalue = '!('.$this->yystack[$this->yyidx + -2]->minor.' % '.$this->yystack[$this->yyidx + 0]->minor.')';    }
+#line 2450 "smarty_internal_templateparser.php"
+#line 363 "smarty_internal_templateparser.y"
+    function yy_r87(){$this->_retvalue = '('.$this->yystack[$this->yyidx + -2]->minor.' % '.$this->yystack[$this->yyidx + 0]->minor.')';    }
+#line 2453 "smarty_internal_templateparser.php"
+#line 364 "smarty_internal_templateparser.y"
+    function yy_r88(){$this->_retvalue = '!(1 & '.$this->yystack[$this->yyidx + -1]->minor.')';    }
+#line 2456 "smarty_internal_templateparser.php"
+#line 365 "smarty_internal_templateparser.y"
+    function yy_r89(){$this->_retvalue = '(1 & '.$this->yystack[$this->yyidx + -1]->minor.')';    }
+#line 2459 "smarty_internal_templateparser.php"
+#line 366 "smarty_internal_templateparser.y"
+    function yy_r90(){$this->_retvalue = '!(1 & '.$this->yystack[$this->yyidx + -2]->minor.' / '.$this->yystack[$this->yyidx + 0]->minor.')';    }
+#line 2462 "smarty_internal_templateparser.php"
+#line 367 "smarty_internal_templateparser.y"
+    function yy_r91(){$this->_retvalue = '(1 & '.$this->yystack[$this->yyidx + -2]->minor.' / '.$this->yystack[$this->yyidx + 0]->minor.')';    }
+#line 2465 "smarty_internal_templateparser.php"
+#line 373 "smarty_internal_templateparser.y"
+    function yy_r97(){$this->prefix_number++; $this->compiler->prefix_code[] = '<?php $_tmp'.$this->prefix_number.'='.$this->yystack[$this->yyidx + 0]->minor.';?>'; $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor.'$_tmp'.$this->prefix_number;    }
+#line 2468 "smarty_internal_templateparser.php"
+#line 379 "smarty_internal_templateparser.y"
+    function yy_r98(){ $this->_retvalue = $this->yystack[$this->yyidx + -6]->minor.' ? $_smarty_tpl->getVariable(\''. $this->yystack[$this->yyidx + -2]->minor .'\')->value : '.$this->yystack[$this->yyidx + 0]->minor;  $this->compiler->tag_nocache=$this->compiler->tag_nocache|$this->template->getVariable('$this->yystack[$this->yyidx + -2]->minor', null, true, false)->nocache;    }
+#line 2471 "smarty_internal_templateparser.php"
+#line 380 "smarty_internal_templateparser.y"
+    function yy_r99(){ $this->_retvalue = $this->yystack[$this->yyidx + -5]->minor.' ? '.$this->yystack[$this->yyidx + -2]->minor.' : '.$this->yystack[$this->yyidx + 0]->minor;    }
+#line 2474 "smarty_internal_templateparser.php"
+#line 387 "smarty_internal_templateparser.y"
+    function yy_r102(){ $this->_retvalue = '!'.$this->yystack[$this->yyidx + 0]->minor;     }
+#line 2477 "smarty_internal_templateparser.php"
+#line 393 "smarty_internal_templateparser.y"
+    function yy_r107(){ $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'.'.$this->yystack[$this->yyidx + 0]->minor;     }
+#line 2480 "smarty_internal_templateparser.php"
+#line 394 "smarty_internal_templateparser.y"
+    function yy_r108(){ $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.'.';     }
+#line 2483 "smarty_internal_templateparser.php"
+#line 395 "smarty_internal_templateparser.y"
+    function yy_r109(){ $this->_retvalue = '.'.$this->yystack[$this->yyidx + 0]->minor;     }
+#line 2486 "smarty_internal_templateparser.php"
+#line 397 "smarty_internal_templateparser.y"
+    function yy_r110(){ if (preg_match('~^true$~i', $this->yystack[$this->yyidx + 0]->minor)) {
+                                $this->_retvalue = 'true';
+                               } elseif (preg_match('~^false$~i', $this->yystack[$this->yyidx + 0]->minor)) {
+                                $this->_retvalue = 'false';
+                               } elseif (preg_match('~^null$~i', $this->yystack[$this->yyidx + 0]->minor)) {
+                                $this->_retvalue = 'null';
+                               } else
+                               $this->_retvalue = "'".$this->yystack[$this->yyidx + 0]->minor."'";     }
+#line 2496 "smarty_internal_templateparser.php"
+#line 408 "smarty_internal_templateparser.y"
+    function yy_r112(){ $this->_retvalue = "(". $this->yystack[$this->yyidx + -1]->minor .")";     }
+#line 2499 "smarty_internal_templateparser.php"
+#line 414 "smarty_internal_templateparser.y"
+    function yy_r115(){if (!$this->security || isset($this->smarty->registered_classes[$this->yystack[$this->yyidx + -2]->minor]) || $this->smarty->security_policy->isTrustedStaticClass($this->yystack[$this->yyidx + -2]->minor, $this->compiler)) {
+                      																				   if (isset($this->smarty->registered_classes[$this->yystack[$this->yyidx + -2]->minor])) {
+                                                                  $this->_retvalue = $this->smarty->registered_classes[$this->yystack[$this->yyidx + -2]->minor].'::'.$this->yystack[$this->yyidx + 0]->minor;
+                      																				   } else {
+                                                                  $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'::'.$this->yystack[$this->yyidx + 0]->minor;
+                                                                 } 
+                                                                } else {
+                                                                 $this->compiler->trigger_template_error ("static class '".$this->yystack[$this->yyidx + -2]->minor."' is undefined or not allowed by security setting");
+                                                                }
+                                                                   }
+#line 2511 "smarty_internal_templateparser.php"
+#line 424 "smarty_internal_templateparser.y"
+    function yy_r116(){ if ($this->yystack[$this->yyidx + -2]->minor['var'] == '\'smarty\'') { $this->_retvalue =  $this->compiler->compileTag('private_special_variable',array(),$this->yystack[$this->yyidx + -2]->minor['smarty_internal_index']).'::'.$this->yystack[$this->yyidx + 0]->minor;} else {
+                                                         $this->_retvalue = '$_smarty_tpl->getVariable('. $this->yystack[$this->yyidx + -2]->minor['var'] .')->value'.$this->yystack[$this->yyidx + -2]->minor['smarty_internal_index'].'::'.$this->yystack[$this->yyidx + 0]->minor; $this->compiler->tag_nocache=$this->compiler->tag_nocache|$this->template->getVariable(trim($this->yystack[$this->yyidx + -2]->minor['var'],"'"), null, true, false)->nocache;}    }
+#line 2515 "smarty_internal_templateparser.php"
+#line 427 "smarty_internal_templateparser.y"
+    function yy_r117(){ $this->prefix_number++; $this->compiler->prefix_code[] = '<?php ob_start();?>'.$this->yystack[$this->yyidx + 0]->minor.'<?php $_tmp'.$this->prefix_number.'=ob_get_clean();?>'; $this->_retvalue = '$_tmp'.$this->prefix_number;     }
+#line 2518 "smarty_internal_templateparser.php"
+#line 437 "smarty_internal_templateparser.y"
+    function yy_r119(){if ($this->yystack[$this->yyidx + 0]->minor['var'] == '\'smarty\'') {
+																				$smarty_var = $this->compiler->compileTag('private_special_variable',array(),$this->yystack[$this->yyidx + 0]->minor['smarty_internal_index']);
+																				$this->_retvalue = $smarty_var;
+                                      } else {
+                                      	// used for array reset,next,prev,end,current 
+                                      	$this->last_variable = $this->yystack[$this->yyidx + 0]->minor['var'];
+                                      	$this->last_index = $this->yystack[$this->yyidx + 0]->minor['smarty_internal_index'];
+                                      	if (isset($this->compiler->local_var[$this->yystack[$this->yyidx + 0]->minor['var']])) {
+                                          $this->_retvalue = '$_smarty_tpl->tpl_vars['. $this->yystack[$this->yyidx + 0]->minor['var'] .']->value'.$this->yystack[$this->yyidx + 0]->minor['smarty_internal_index'];
+                                      	} else {
+                                          $this->_retvalue = '$_smarty_tpl->getVariable('. $this->yystack[$this->yyidx + 0]->minor['var'] .')->value'.$this->yystack[$this->yyidx + 0]->minor['smarty_internal_index'];
+                                      	}
+                                      	$this->compiler->tag_nocache=$this->compiler->tag_nocache|$this->template->getVariable(trim($this->yystack[$this->yyidx + 0]->minor['var'],"'"), null, true, false)->nocache;
+                                     }
+                                        }
+#line 2535 "smarty_internal_templateparser.php"
+#line 453 "smarty_internal_templateparser.y"
+    function yy_r120(){if (isset($this->compiler->local_var[$this->yystack[$this->yyidx + -2]->minor])) {
+                                                  $this->_retvalue = '$_smarty_tpl->tpl_vars['. $this->yystack[$this->yyidx + -2]->minor .']->'.$this->yystack[$this->yyidx + 0]->minor;
+                                                 } else {
+                                                  $this->_retvalue = '$_smarty_tpl->getVariable('. $this->yystack[$this->yyidx + -2]->minor .')->'.$this->yystack[$this->yyidx + 0]->minor;
+                                                 }
+                                                  $this->compiler->tag_nocache=$this->compiler->tag_nocache|$this->template->getVariable(trim($this->yystack[$this->yyidx + -2]->minor,"'"), null, true, false)->nocache;    }
+#line 2543 "smarty_internal_templateparser.php"
+#line 462 "smarty_internal_templateparser.y"
+    function yy_r122(){$this->_retvalue = '$_smarty_tpl->getConfigVariable(\''. $this->yystack[$this->yyidx + -1]->minor .'\')';    }
+#line 2546 "smarty_internal_templateparser.php"
+#line 463 "smarty_internal_templateparser.y"
+    function yy_r123(){$this->_retvalue = '$_smarty_tpl->getConfigVariable('. $this->yystack[$this->yyidx + -1]->minor .')';    }
+#line 2549 "smarty_internal_templateparser.php"
+#line 466 "smarty_internal_templateparser.y"
+    function yy_r124(){$this->_retvalue = array('var'=>$this->yystack[$this->yyidx + -1]->minor, 'smarty_internal_index'=>$this->yystack[$this->yyidx + 0]->minor);    }
+#line 2552 "smarty_internal_templateparser.php"
+#line 472 "smarty_internal_templateparser.y"
+    function yy_r125(){$this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;    }
+#line 2555 "smarty_internal_templateparser.php"
+#line 474 "smarty_internal_templateparser.y"
+    function yy_r126(){return;    }
+#line 2558 "smarty_internal_templateparser.php"
+#line 478 "smarty_internal_templateparser.y"
+    function yy_r127(){ $this->_retvalue = '[$_smarty_tpl->getVariable('. $this->yystack[$this->yyidx + 0]->minor .')->value]'; $this->compiler->tag_nocache=$this->compiler->tag_nocache|$this->template->getVariable('$this->yystack[$this->yyidx + 0]->minor', null, true, false)->nocache;    }
+#line 2561 "smarty_internal_templateparser.php"
+#line 479 "smarty_internal_templateparser.y"
+    function yy_r128(){ $this->_retvalue = '[$_smarty_tpl->getVariable('. $this->yystack[$this->yyidx + -2]->minor .')->'.$this->yystack[$this->yyidx + 0]->minor.']'; $this->compiler->tag_nocache=$this->compiler->tag_nocache|$this->template->getVariable(trim($this->yystack[$this->yyidx + -2]->minor,"'"), null, true, false)->nocache;    }
+#line 2564 "smarty_internal_templateparser.php"
+#line 480 "smarty_internal_templateparser.y"
+    function yy_r129(){ $this->_retvalue = "['". $this->yystack[$this->yyidx + 0]->minor ."']";    }
+#line 2567 "smarty_internal_templateparser.php"
+#line 481 "smarty_internal_templateparser.y"
+    function yy_r130(){ $this->_retvalue = "[". $this->yystack[$this->yyidx + 0]->minor ."]";    }
+#line 2570 "smarty_internal_templateparser.php"
+#line 482 "smarty_internal_templateparser.y"
+    function yy_r131(){ $this->_retvalue = "[". $this->yystack[$this->yyidx + -1]->minor ."]";    }
+#line 2573 "smarty_internal_templateparser.php"
+#line 484 "smarty_internal_templateparser.y"
+    function yy_r132(){ $this->_retvalue = '['.$this->compiler->compileTag('private_special_variable',array(),'[\'section\'][\''.$this->yystack[$this->yyidx + -1]->minor.'\'][\'index\']').']';    }
+#line 2576 "smarty_internal_templateparser.php"
+#line 485 "smarty_internal_templateparser.y"
+    function yy_r133(){ $this->_retvalue = '['.$this->compiler->compileTag('private_special_variable',array(),'[\'section\'][\''.$this->yystack[$this->yyidx + -3]->minor.'\'][\''.$this->yystack[$this->yyidx + -1]->minor.'\']').']';    }
+#line 2579 "smarty_internal_templateparser.php"
+#line 489 "smarty_internal_templateparser.y"
+    function yy_r135(){$this->_retvalue = '[]';    }
+#line 2582 "smarty_internal_templateparser.php"
+#line 497 "smarty_internal_templateparser.y"
+    function yy_r137(){$this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.'.'.$this->yystack[$this->yyidx + 0]->minor;    }
+#line 2585 "smarty_internal_templateparser.php"
+#line 499 "smarty_internal_templateparser.y"
+    function yy_r138(){$this->_retvalue = '\''.$this->yystack[$this->yyidx + 0]->minor.'\'';    }
+#line 2588 "smarty_internal_templateparser.php"
+#line 501 "smarty_internal_templateparser.y"
+    function yy_r139(){$this->_retvalue = '('.$this->yystack[$this->yyidx + -1]->minor.')';    }
+#line 2591 "smarty_internal_templateparser.php"
+#line 506 "smarty_internal_templateparser.y"
+    function yy_r140(){ if ($this->yystack[$this->yyidx + -1]->minor['var'] == '\'smarty\'') { $this->_retvalue =  $this->compiler->compileTag('private_special_variable',array(),$this->yystack[$this->yyidx + -1]->minor['smarty_internal_index']).$this->yystack[$this->yyidx + 0]->minor;} else {
+                                                         $this->_retvalue = '$_smarty_tpl->getVariable('. $this->yystack[$this->yyidx + -1]->minor['var'] .')->value'.$this->yystack[$this->yyidx + -1]->minor['smarty_internal_index'].$this->yystack[$this->yyidx + 0]->minor; $this->compiler->tag_nocache=$this->compiler->tag_nocache|$this->template->getVariable(trim($this->yystack[$this->yyidx + -1]->minor['var'],"'"), null, true, false)->nocache;}    }
+#line 2595 "smarty_internal_templateparser.php"
+#line 509 "smarty_internal_templateparser.y"
+    function yy_r141(){$this->_retvalue  = $this->yystack[$this->yyidx + 0]->minor;     }
+#line 2598 "smarty_internal_templateparser.php"
+#line 511 "smarty_internal_templateparser.y"
+    function yy_r142(){$this->_retvalue  = $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;     }
+#line 2601 "smarty_internal_templateparser.php"
+#line 513 "smarty_internal_templateparser.y"
+    function yy_r143(){if ($this->security && substr($this->yystack[$this->yyidx + -1]->minor,0,1) == '_') {
+                                                      $this->compiler->trigger_template_error (self::Err1);
+																									   }
+                                                     $this->_retvalue = '->'.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
+                                                         }
+#line 2608 "smarty_internal_templateparser.php"
+#line 518 "smarty_internal_templateparser.y"
+    function yy_r144(){if ($this->security) {
+                                                                 $this->compiler->trigger_template_error (self::Err2);
+																															 }
+                                                               $this->_retvalue = '->{$_smarty_tpl->getVariable('. $this->yystack[$this->yyidx + -1]->minor .')->value'.$this->yystack[$this->yyidx + 0]->minor.'}'; $this->compiler->tag_nocache=$this->compiler->tag_nocache|$this->template->getVariable(trim($this->yystack[$this->yyidx + -1]->minor,"'"), null, true, false)->nocache;
+                                                                   }
+#line 2615 "smarty_internal_templateparser.php"
+#line 523 "smarty_internal_templateparser.y"
+    function yy_r145(){if ($this->security) {
+                                                                 $this->compiler->trigger_template_error (self::Err2);
+																															   }
+                     																						 $this->_retvalue = '->{'.$this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + 0]->minor.'}';
+                     																						    }
+#line 2622 "smarty_internal_templateparser.php"
+#line 528 "smarty_internal_templateparser.y"
+    function yy_r146(){if ($this->security) {
+                                                                         $this->compiler->trigger_template_error (self::Err2);
+																															         }
+                                                                       $this->_retvalue = '->{\''.$this->yystack[$this->yyidx + -4]->minor.'\'.'.$this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + 0]->minor.'}';
+                                                                          }
+#line 2629 "smarty_internal_templateparser.php"
+#line 534 "smarty_internal_templateparser.y"
+    function yy_r147(){ $this->_retvalue = '->'.$this->yystack[$this->yyidx + 0]->minor;    }
+#line 2632 "smarty_internal_templateparser.php"
+#line 540 "smarty_internal_templateparser.y"
+    function yy_r148(){if (!$this->security || $this->smarty->security_policy->isTrustedPhpFunction($this->yystack[$this->yyidx + -3]->minor, $this->compiler)) {
+																					            if (strcasecmp($this->yystack[$this->yyidx + -3]->minor,'isset') === 0 || strcasecmp($this->yystack[$this->yyidx + -3]->minor,'empty') === 0 || strcasecmp($this->yystack[$this->yyidx + -3]->minor,'array') === 0 || is_callable($this->yystack[$this->yyidx + -3]->minor)) {
+																					                $func_name = strtolower($this->yystack[$this->yyidx + -3]->minor);
+																					                if ($func_name == 'isset') {
+																					                  if (count($this->yystack[$this->yyidx + -1]->minor) == 0) {
+																					                   $this->compiler->trigger_template_error ('Illegal number of paramer in "isset()"');
+																					                  }
+																					                  $isset_par=str_replace("')->value","',null,true,false)->value",implode(',',$this->yystack[$this->yyidx + -1]->minor));
+																					                  $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor . "(". $isset_par .")";
+																						              } elseif (in_array($func_name,array('empty','reset','current','end','prev','next'))){
+																					                  if (count($this->yystack[$this->yyidx + -1]->minor) != 1) {
+																					                   $this->compiler->trigger_template_error ('Illegal number of paramer in "empty()"');
+																					                  }
+																					                  if ($func_name == 'empty') {
+																					                  	$this->_retvalue = $func_name.'('.str_replace("')->value","',null,true,false)->value",$this->yystack[$this->yyidx + -1]->minor[0]).')';
+																					                  } else {
+																					                  	$this->_retvalue = $func_name.'('.$this->yystack[$this->yyidx + -1]->minor[0].')';
+																					                  }
+																					                } else {
+																					                  $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor . "(". implode(',',$this->yystack[$this->yyidx + -1]->minor) .")";
+																					                }
+																					            } else {
+                                                       $this->compiler->trigger_template_error ("unknown function \"" . $this->yystack[$this->yyidx + -3]->minor . "\"");
+                                                      }
+                                                     }
+                                                        }
+#line 2660 "smarty_internal_templateparser.php"
+#line 570 "smarty_internal_templateparser.y"
+    function yy_r149(){if ($this->security && substr($this->yystack[$this->yyidx + -3]->minor,0,1) == '_') {
+                                                      $this->compiler->trigger_template_error (self::Err1);
+																									 }
+                                                   $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor . "(". implode(',',$this->yystack[$this->yyidx + -1]->minor) .")";
+                                                      }
+#line 2667 "smarty_internal_templateparser.php"
+#line 575 "smarty_internal_templateparser.y"
+    function yy_r150(){if ($this->security) {
+                                                              $this->compiler->trigger_template_error (self::Err2);
+																													 }
+                                                           $this->prefix_number++; $this->compiler->prefix_code[] = '<?php $_tmp'.$this->prefix_number.'=$_smarty_tpl->getVariable(\''. $this->yystack[$this->yyidx + -3]->minor .'\')->value;?>'; $this->_retvalue = '$_tmp'.$this->prefix_number.'('. implode(',',$this->yystack[$this->yyidx + -1]->minor) .')';
+                                                              }
+#line 2674 "smarty_internal_templateparser.php"
+#line 583 "smarty_internal_templateparser.y"
+    function yy_r151(){ $this->_retvalue = array_merge($this->yystack[$this->yyidx + -2]->minor,array($this->yystack[$this->yyidx + 0]->minor));    }
+#line 2677 "smarty_internal_templateparser.php"
+#line 592 "smarty_internal_templateparser.y"
+    function yy_r154(){$this->_retvalue = array_merge($this->yystack[$this->yyidx + -2]->minor,array(array_merge($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor)));    }
+#line 2680 "smarty_internal_templateparser.php"
+#line 593 "smarty_internal_templateparser.y"
+    function yy_r155(){$this->_retvalue = array(array_merge($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor));    }
+#line 2683 "smarty_internal_templateparser.php"
+#line 596 "smarty_internal_templateparser.y"
+    function yy_r157(){ $this->_retvalue =  array($this->yystack[$this->yyidx + 0]->minor);    }
+#line 2686 "smarty_internal_templateparser.php"
+#line 601 "smarty_internal_templateparser.y"
+    function yy_r158(){ $this->_retvalue = array_merge($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor);    }
+#line 2689 "smarty_internal_templateparser.php"
+#line 603 "smarty_internal_templateparser.y"
+    function yy_r159(){$this->_retvalue = array();    }
+#line 2692 "smarty_internal_templateparser.php"
+#line 605 "smarty_internal_templateparser.y"
+    function yy_r160(){$this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor);    }
+#line 2695 "smarty_internal_templateparser.php"
+#line 615 "smarty_internal_templateparser.y"
+    function yy_r165(){ $this->_retvalue = '$'.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;    }
+#line 2698 "smarty_internal_templateparser.php"
+#line 617 "smarty_internal_templateparser.y"
+    function yy_r166(){ $this->_retvalue = '$'.$this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;    }
+#line 2701 "smarty_internal_templateparser.php"
+#line 626 "smarty_internal_templateparser.y"
+    function yy_r167(){$this->_retvalue = '==';    }
+#line 2704 "smarty_internal_templateparser.php"
+#line 627 "smarty_internal_templateparser.y"
+    function yy_r168(){$this->_retvalue = '!=';    }
+#line 2707 "smarty_internal_templateparser.php"
+#line 628 "smarty_internal_templateparser.y"
+    function yy_r169(){$this->_retvalue = '>';    }
+#line 2710 "smarty_internal_templateparser.php"
+#line 629 "smarty_internal_templateparser.y"
+    function yy_r170(){$this->_retvalue = '<';    }
+#line 2713 "smarty_internal_templateparser.php"
+#line 630 "smarty_internal_templateparser.y"
+    function yy_r171(){$this->_retvalue = '>=';    }
+#line 2716 "smarty_internal_templateparser.php"
+#line 631 "smarty_internal_templateparser.y"
+    function yy_r172(){$this->_retvalue = '<=';    }
+#line 2719 "smarty_internal_templateparser.php"
+#line 632 "smarty_internal_templateparser.y"
+    function yy_r173(){$this->_retvalue = '===';    }
+#line 2722 "smarty_internal_templateparser.php"
+#line 633 "smarty_internal_templateparser.y"
+    function yy_r174(){$this->_retvalue = '!==';    }
+#line 2725 "smarty_internal_templateparser.php"
+#line 634 "smarty_internal_templateparser.y"
+    function yy_r175(){$this->_retvalue = '%';    }
+#line 2728 "smarty_internal_templateparser.php"
+#line 636 "smarty_internal_templateparser.y"
+    function yy_r176(){$this->_retvalue = '&&';    }
+#line 2731 "smarty_internal_templateparser.php"
+#line 637 "smarty_internal_templateparser.y"
+    function yy_r177(){$this->_retvalue = '||';    }
+#line 2734 "smarty_internal_templateparser.php"
+#line 638 "smarty_internal_templateparser.y"
+    function yy_r178(){$this->_retvalue = ' XOR ';    }
+#line 2737 "smarty_internal_templateparser.php"
+#line 643 "smarty_internal_templateparser.y"
+    function yy_r179(){ $this->_retvalue = 'array('.$this->yystack[$this->yyidx + -1]->minor.')';    }
+#line 2740 "smarty_internal_templateparser.php"
+#line 645 "smarty_internal_templateparser.y"
+    function yy_r181(){ $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.','.$this->yystack[$this->yyidx + 0]->minor;     }
+#line 2743 "smarty_internal_templateparser.php"
+#line 646 "smarty_internal_templateparser.y"
+    function yy_r182(){ return;     }
+#line 2746 "smarty_internal_templateparser.php"
+#line 647 "smarty_internal_templateparser.y"
+    function yy_r183(){ $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'=>'.$this->yystack[$this->yyidx + 0]->minor;    }
+#line 2749 "smarty_internal_templateparser.php"
+#line 648 "smarty_internal_templateparser.y"
+    function yy_r184(){ $this->_retvalue = '\''.$this->yystack[$this->yyidx + -2]->minor.'\'=>'.$this->yystack[$this->yyidx + 0]->minor;    }
+#line 2752 "smarty_internal_templateparser.php"
+#line 655 "smarty_internal_templateparser.y"
+    function yy_r186(){ $this->_retvalue = "''";     }
+#line 2755 "smarty_internal_templateparser.php"
+#line 656 "smarty_internal_templateparser.y"
+    function yy_r187(){ $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor->to_smarty_php();     }
+#line 2758 "smarty_internal_templateparser.php"
+#line 658 "smarty_internal_templateparser.y"
+    function yy_r188(){ $this->yystack[$this->yyidx + -1]->minor->append_subtree($this->yystack[$this->yyidx + 0]->minor); $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;     }
+#line 2761 "smarty_internal_templateparser.php"
+#line 659 "smarty_internal_templateparser.y"
+    function yy_r189(){ $this->_retvalue = new _smarty_doublequoted($this, $this->yystack[$this->yyidx + 0]->minor);     }
+#line 2764 "smarty_internal_templateparser.php"
+#line 661 "smarty_internal_templateparser.y"
+    function yy_r190(){ $this->_retvalue = new _smarty_code($this, $this->yystack[$this->yyidx + -1]->minor);     }
+#line 2767 "smarty_internal_templateparser.php"
+#line 663 "smarty_internal_templateparser.y"
+    function yy_r192(){if (isset($this->compiler->local_var["'".substr($this->yystack[$this->yyidx + 0]->minor,1)."'"])) {
+                                                       $this->_retvalue = new _smarty_code($this, '$_smarty_tpl->tpl_vars[\''. substr($this->yystack[$this->yyidx + 0]->minor,1) .'\']->value');
+                                                      } else {
+                                                       $this->_retvalue = new _smarty_code($this, '$_smarty_tpl->getVariable(\''. substr($this->yystack[$this->yyidx + 0]->minor,1) .'\')->value');
+                                                      }
+                                                      $this->compiler->tag_nocache = $this->compiler->tag_nocache | $this->template->getVariable(trim($this->yystack[$this->yyidx + 0]->minor,"'"), null, true, false)->nocache;
+      }
+#line 2776 "smarty_internal_templateparser.php"
+#line 671 "smarty_internal_templateparser.y"
+    function yy_r194(){ $this->_retvalue = new _smarty_code($this, '('.$this->yystack[$this->yyidx + -1]->minor.')');     }
+#line 2779 "smarty_internal_templateparser.php"
+#line 672 "smarty_internal_templateparser.y"
+    function yy_r195(){
+   $this->_retvalue = new _smarty_tag($this, $this->yystack[$this->yyidx + 0]->minor);
+      }
+#line 2784 "smarty_internal_templateparser.php"
+#line 675 "smarty_internal_templateparser.y"
+    function yy_r196(){ $this->_retvalue = new _smarty_dq_content($this, $this->yystack[$this->yyidx + 0]->minor);     }
+#line 2787 "smarty_internal_templateparser.php"
+#line 682 "smarty_internal_templateparser.y"
+    function yy_r198(){$this->_retvalue = '';    }
+#line 2790 "smarty_internal_templateparser.php"
+
+    private $_retvalue;
+
+    function yy_reduce($yyruleno)
+    {
+        $yymsp = $this->yystack[$this->yyidx];
+        if (self::$yyTraceFILE && $yyruleno >= 0 
+              && $yyruleno < count(self::$yyRuleName)) {
+            fprintf(self::$yyTraceFILE, "%sReduce (%d) [%s].\n",
+                self::$yyTracePrompt, $yyruleno,
+                self::$yyRuleName[$yyruleno]);
+        }
+
+        $this->_retvalue = $yy_lefthand_side = null;
+        if (array_key_exists($yyruleno, self::$yyReduceMap)) {
+            // call the action
+            $this->_retvalue = null;
+            $this->{'yy_r' . self::$yyReduceMap[$yyruleno]}();
+            $yy_lefthand_side = $this->_retvalue;
+        }
+        $yygoto = self::$yyRuleInfo[$yyruleno]['lhs'];
+        $yysize = self::$yyRuleInfo[$yyruleno]['rhs'];
+        $this->yyidx -= $yysize;
+        for($i = $yysize; $i; $i--) {
+            // pop all of the right-hand side parameters
+            array_pop($this->yystack);
+        }
+        $yyact = $this->yy_find_reduce_action($this->yystack[$this->yyidx]->stateno, $yygoto);
+        if ($yyact < self::YYNSTATE) {
+            if (!self::$yyTraceFILE && $yysize) {
+                $this->yyidx++;
+                $x = new TP_yyStackEntry;
+                $x->stateno = $yyact;
+                $x->major = $yygoto;
+                $x->minor = $yy_lefthand_side;
+                $this->yystack[$this->yyidx] = $x;
+            } else {
+                $this->yy_shift($yyact, $yygoto, $yy_lefthand_side);
+            }
+        } elseif ($yyact == self::YYNSTATE + self::YYNRULE + 1) {
+            $this->yy_accept();
+        }
+    }
+
+    function yy_parse_failed()
+    {
+        if (self::$yyTraceFILE) {
+            fprintf(self::$yyTraceFILE, "%sFail!\n", self::$yyTracePrompt);
+        }
+        while ($this->yyidx >= 0) {
+            $this->yy_pop_parser_stack();
+        }
+    }
+
+    function yy_syntax_error($yymajor, $TOKEN)
+    {
+#line 66 "smarty_internal_templateparser.y"
+
+    $this->internalError = true;
+    $this->yymajor = $yymajor;
+    $this->compiler->trigger_template_error();
+#line 2853 "smarty_internal_templateparser.php"
+    }
+
+    function yy_accept()
+    {
+        if (self::$yyTraceFILE) {
+            fprintf(self::$yyTraceFILE, "%sAccept!\n", self::$yyTracePrompt);
+        }
+        while ($this->yyidx >= 0) {
+            $stack = $this->yy_pop_parser_stack();
+        }
+#line 58 "smarty_internal_templateparser.y"
+
+    $this->successful = !$this->internalError;
+    $this->internalError = false;
+    $this->retvalue = $this->_retvalue;
+    //echo $this->retvalue."\n\n";
+#line 2871 "smarty_internal_templateparser.php"
+    }
+
+    function doParse($yymajor, $yytokenvalue)
+    {
+        $yyerrorhit = 0;   /* True if yymajor has invoked an error */
+        
+        if ($this->yyidx === null || $this->yyidx < 0) {
+            $this->yyidx = 0;
+            $this->yyerrcnt = -1;
+            $x = new TP_yyStackEntry;
+            $x->stateno = 0;
+            $x->major = 0;
+            $this->yystack = array();
+            array_push($this->yystack, $x);
+        }
+        $yyendofinput = ($yymajor==0);
+        
+        if (self::$yyTraceFILE) {
+            fprintf(self::$yyTraceFILE, "%sInput %s\n",
+                self::$yyTracePrompt, $this->yyTokenName[$yymajor]);
+        }
+        
+        do {
+            $yyact = $this->yy_find_shift_action($yymajor);
+            if ($yymajor < self::YYERRORSYMBOL &&
+                  !$this->yy_is_expected_token($yymajor)) {
+                // force a syntax error
+                $yyact = self::YY_ERROR_ACTION;
+            }
+            if ($yyact < self::YYNSTATE) {
+                $this->yy_shift($yyact, $yymajor, $yytokenvalue);
+                $this->yyerrcnt--;
+                if ($yyendofinput && $this->yyidx >= 0) {
+                    $yymajor = 0;
+                } else {
+                    $yymajor = self::YYNOCODE;
+                }
+            } elseif ($yyact < self::YYNSTATE + self::YYNRULE) {
+                $this->yy_reduce($yyact - self::YYNSTATE);
+            } elseif ($yyact == self::YY_ERROR_ACTION) {
+                if (self::$yyTraceFILE) {
+                    fprintf(self::$yyTraceFILE, "%sSyntax Error!\n",
+                        self::$yyTracePrompt);
+                }
+                if (self::YYERRORSYMBOL) {
+                    if ($this->yyerrcnt < 0) {
+                        $this->yy_syntax_error($yymajor, $yytokenvalue);
+                    }
+                    $yymx = $this->yystack[$this->yyidx]->major;
+                    if ($yymx == self::YYERRORSYMBOL || $yyerrorhit ){
+                        if (self::$yyTraceFILE) {
+                            fprintf(self::$yyTraceFILE, "%sDiscard input token %s\n",
+                                self::$yyTracePrompt, $this->yyTokenName[$yymajor]);
+                        }
+                        $this->yy_destructor($yymajor, $yytokenvalue);
+                        $yymajor = self::YYNOCODE;
+                    } else {
+                        while ($this->yyidx >= 0 &&
+                                 $yymx != self::YYERRORSYMBOL &&
+        ($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE
+                              ){
+                            $this->yy_pop_parser_stack();
+                        }
+                        if ($this->yyidx < 0 || $yymajor==0) {
+                            $this->yy_destructor($yymajor, $yytokenvalue);
+                            $this->yy_parse_failed();
+                            $yymajor = self::YYNOCODE;
+                        } elseif ($yymx != self::YYERRORSYMBOL) {
+                            $u2 = 0;
+                            $this->yy_shift($yyact, self::YYERRORSYMBOL, $u2);
+                        }
+                    }
+                    $this->yyerrcnt = 3;
+                    $yyerrorhit = 1;
+                } else {
+                    if ($this->yyerrcnt <= 0) {
+                        $this->yy_syntax_error($yymajor, $yytokenvalue);
+                    }
+                    $this->yyerrcnt = 3;
+                    $this->yy_destructor($yymajor, $yytokenvalue);
+                    if ($yyendofinput) {
+                        $this->yy_parse_failed();
+                    }
+                    $yymajor = self::YYNOCODE;
+                }
+            } else {
+                $this->yy_accept();
+                $yymajor = self::YYNOCODE;
+            }            
+        } while ($yymajor != self::YYNOCODE && $this->yyidx >= 0);
+    }
+}
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_utility.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_utility.php
new file mode 100644
index 0000000..b532e4a
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_utility.php
@@ -0,0 +1,300 @@
+<?php
+
+/**
+ * Project:     Smarty: the PHP compiling template engine
+ * File:        smarty_internal_utility.php
+ * SVN:         $Id: $
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * 
+ * For questions, help, comments, discussion, etc., please join the
+ * Smarty mailing list. Send a blank e-mail to
+ * smarty-discussion-subscribe@googlegroups.com
+ * 
+ * @link http://www.smarty.net/
+ * @copyright 2008 New Digital Group, Inc.
+ * @author Monte Ohrt <monte at ohrt dot com> 
+ * @author Uwe Tews 
+ * @package Smarty
+ * @subpackage PluginsInternal
+ * @version 3-SVN$Rev: 3286 $
+ */
+
+class Smarty_Internal_Utility {
+    protected $smarty;
+
+    function __construct($smarty)
+    {
+        $this->smarty = $smarty;
+    } 
+
+    /**
+     * Compile all template files
+     * 
+     * @param string $extension file extension
+     * @param bool $force_compile force all to recompile
+     * @param int $time_limit 
+     * @param int $max_errors 
+     * @return integer number of template files recompiled
+     */
+    function compileAllTemplates($extention = '.tpl', $force_compile = false, $time_limit = 0, $max_errors = null)
+    { 
+        // switch off time limit
+        if (function_exists('set_time_limit')) {
+            @set_time_limit($time_limit);
+        } 
+        $this->smarty->force_compile = $force_compile;
+        $_count = 0;
+        $_error_count = 0; 
+        // loop over array of template directories
+        foreach((array)$this->smarty->template_dir as $_dir) {
+            if (strpos('/\\', substr($_dir, -1)) === false) {
+                $_dir .= DS;
+            } 
+            $_compileDirs = new RecursiveDirectoryIterator($_dir);
+            $_compile = new RecursiveIteratorIterator($_compileDirs);
+            foreach ($_compile as $_fileinfo) {
+                if (strpos($_fileinfo, '.svn') !== false) continue;
+                $_file = $_fileinfo->getFilename();
+                if (!substr_compare($_file, $extention, - strlen($extention)) == 0) continue;
+                if ($_fileinfo->getPath() == substr($_dir, 0, -1)) {
+                   $_template_file = $_file;
+                } else {
+                   $_template_file = substr($_fileinfo->getPath(), strlen($_dir)) . DS . $_file;
+                }
+                echo '<br>', $_dir, '---', $_template_file;
+                flush();
+                $_start_time = microtime(true);
+                try {
+                    $_tpl = $this->smarty->createTemplate($_template_file,null,null,null,false);
+                    if ($_tpl->mustCompile()) {
+                        $_tpl->compileTemplateSource();
+                        echo ' compiled in  ', microtime(true) - $_start_time, ' seconds';
+                        flush();
+                    } else {
+                        echo ' is up to date';
+                        flush();
+                    }
+                }
+                catch (Exception $e) {
+                    echo 'Error: ', $e->getMessage(), "<br><br>";
+                    $_error_count++;
+                } 
+				// free memory
+                $this->smarty->template_objects = array();
+                $_tpl->smarty->template_objects = array();
+                $_tpl = null;
+                if ($max_errors !== null && $_error_count == $max_errors) {
+                    echo '<br><br>too many errors';
+                    exit();
+                } 
+            } 
+        } 
+        return $_count;
+    } 
+
+    /**
+     * Compile all config files
+     * 
+     * @param string $extension file extension
+     * @param bool $force_compile force all to recompile
+     * @param int $time_limit 
+     * @param int $max_errors 
+     * @return integer number of template files recompiled
+     */
+    function compileAllConfig($extention = '.conf', $force_compile = false, $time_limit = 0, $max_errors = null)
+    { 
+        // switch off time limit
+        if (function_exists('set_time_limit')) {
+            @set_time_limit($time_limit);
+        } 
+        $this->smarty->force_compile = $force_compile;
+        $_count = 0;
+        $_error_count = 0; 
+        // loop over array of template directories
+        foreach((array)$this->smarty->config_dir as $_dir) {
+            if (strpos('/\\', substr($_dir, -1)) === false) {
+                $_dir .= DS;
+            } 
+            $_compileDirs = new RecursiveDirectoryIterator($_dir);
+            $_compile = new RecursiveIteratorIterator($_compileDirs);
+            foreach ($_compile as $_fileinfo) {
+                if (strpos($_fileinfo, '.svn') !== false) continue;
+                $_file = $_fileinfo->getFilename();
+                if (!substr_compare($_file, $extention, - strlen($extention)) == 0) continue;
+                if ($_fileinfo->getPath() == substr($_dir, 0, -1)) {
+                    $_config_file = $_file;
+                } else {
+                    $_config_file = substr($_fileinfo->getPath(), strlen($_dir)) . DS . $_file;
+                } 
+                echo '<br>', $_dir, '---', $_config_file;
+                flush();
+                $_start_time = microtime(true);
+                try {
+                    $_config = new Smarty_Internal_Config($_config_file, $this->smarty);
+                    if ($_config->mustCompile()) {
+                        $_config->compileConfigSource();
+                        echo ' compiled in  ', microtime(true) - $_start_time, ' seconds';
+                        flush();
+                    } else {
+                        echo ' is up to date';
+                        flush();
+                    } 
+                } 
+                catch (Exception $e) {
+                    echo 'Error: ', $e->getMessage(), "<br><br>";
+                    $_error_count++;
+                } 
+                if ($max_errors !== null && $_error_count == $max_errors) {
+                    echo '<br><br>too many errors';
+                    exit();
+                } 
+            } 
+        } 
+        return $_count;
+    } 
+
+    /**
+     * Delete compiled template file
+     * 
+     * @param string $resource_name template name
+     * @param string $compile_id compile id
+     * @param integer $exp_time expiration time
+     * @return integer number of template files deleted
+     */
+    function clearCompiledTemplate($resource_name = null, $compile_id = null, $exp_time = null)
+    {
+        $_compile_id = isset($compile_id) ? preg_replace('![^\w\|]+!', '_', $compile_id) : null;
+        $_dir_sep = $this->smarty->use_sub_dirs ? DS : '^';
+        if (isset($resource_name)) {
+            $_resource_part_1 = $resource_name . '.php';
+            $_resource_part_2 = $resource_name . '.cache' . '.php';
+        } else {
+            $_resource_part = '';
+        } 
+        $_dir = $this->smarty->compile_dir;
+        if ($this->smarty->use_sub_dirs && isset($_compile_id)) {
+            $_dir .= $_compile_id . $_dir_sep;
+        } 
+        if (isset($_compile_id)) {
+            $_compile_id_part = $this->smarty->compile_dir . $_compile_id . $_dir_sep;
+        } 
+        $_count = 0;
+        $_compileDirs = new RecursiveDirectoryIterator($_dir);
+        $_compile = new RecursiveIteratorIterator($_compileDirs, RecursiveIteratorIterator::CHILD_FIRST);
+        foreach ($_compile as $_file) {
+            if (strpos($_file, '.svn') !== false) continue;
+            if ($_file->isDir()) {
+                if (!$_compile->isDot()) {
+                    // delete folder if empty
+                    @rmdir($_file->getPathname());
+                } 
+            } else {
+                if ((!isset($_compile_id) || (strlen((string)$_file) > strlen($_compile_id_part) && substr_compare((string)$_file, $_compile_id_part, 0, strlen($_compile_id_part)) == 0)) &&
+                        (!isset($resource_name) || (strlen((string)$_file) > strlen($_resource_part_1) && substr_compare((string)$_file, $_resource_part_1, - strlen($_resource_part_1), strlen($_resource_part_1)) == 0) ||
+                            (strlen((string)$_file) > strlen($_resource_part_2) && substr_compare((string)$_file, $_resource_part_2, - strlen($_resource_part_2), strlen($_resource_part_2)) == 0))) {
+                    if (isset($exp_time)) {
+                        if (time() - @filemtime($_file) >= $exp_time) {
+                            $_count += @unlink((string) $_file) ? 1 : 0;
+                        } 
+                    } else {
+                        $_count += @unlink((string) $_file) ? 1 : 0;
+                    } 
+                } 
+            } 
+        } 
+        return $_count;
+    } 
+
+    /**
+     * Return array of tag/attributes of all tags used by an template
+     * 
+     * @param object $templae template object
+     * @return array of tag/attributes
+     */
+	function getTags(Smarty_Internal_Template $template) 
+	{
+		$template->smarty->get_used_tags = true;
+		$template->compileTemplateSource();
+		return $template->compiler_object->used_tags;
+	}	
+	
+    function testInstall()
+    {
+        echo "<PRE>\n";
+
+        echo "Smarty Installation test...\n";
+
+        echo "Testing template directory...\n";
+
+        foreach((array)$this->smarty->template_dir as $template_dir) {
+            if (!is_dir($template_dir))
+                echo "FAILED: $template_dir is not a directory.\n";
+            elseif (!is_readable($template_dir))
+                echo "FAILED: $template_dir is not readable.\n";
+            else
+                echo "$template_dir is OK.\n";
+        } 
+
+        echo "Testing compile directory...\n";
+
+        if (!is_dir($this->smarty->compile_dir))
+            echo "FAILED: {$this->smarty->compile_dir} is not a directory.\n";
+        elseif (!is_readable($this->smarty->compile_dir))
+            echo "FAILED: {$this->smarty->compile_dir} is not readable.\n";
+        elseif (!is_writable($this->smarty->compile_dir))
+            echo "FAILED: {$this->smarty->compile_dir} is not writable.\n";
+        else
+            echo "{$this->smarty->compile_dir} is OK.\n";
+
+        echo "Testing plugins directory...\n";
+
+        foreach((array)$this->smarty->plugins_dir as $plugin_dir) {
+            if (!is_dir($plugin_dir))
+                echo "FAILED: $plugin_dir is not a directory.\n";
+            elseif (!is_readable($plugin_dir))
+                echo "FAILED: $plugin_dir is not readable.\n";
+            else
+                echo "$plugin_dir is OK.\n";
+        } 
+
+        echo "Testing cache directory...\n";
+
+        if (!is_dir($this->smarty->cache_dir))
+            echo "FAILED: {$this->smarty->cache_dir} is not a directory.\n";
+        elseif (!is_readable($this->smarty->cache_dir))
+            echo "FAILED: {$this->smarty->cache_dir} is not readable.\n";
+        elseif (!is_writable($this->smarty->cache_dir))
+            echo "FAILED: {$this->smarty->cache_dir} is not writable.\n";
+        else
+            echo "{$this->smarty->cache_dir} is OK.\n";
+
+        echo "Testing configs directory...\n";
+
+        if (!is_dir($this->smarty->config_dir))
+            echo "FAILED: {$this->smarty->config_dir} is not a directory.\n";
+        elseif (!is_readable($this->smarty->config_dir))
+            echo "FAILED: {$this->smarty->config_dir} is not readable.\n";
+        else
+            echo "{$this->smarty->config_dir} is OK.\n";
+
+        echo "Tests complete.\n";
+
+        echo "</PRE>\n";
+
+        return true;
+    } 
+}
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_wrapper.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_wrapper.php
new file mode 100644
index 0000000..f45153c
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_wrapper.php
@@ -0,0 +1,131 @@
+<?php
+
+/**
+ * Project:     Smarty: the PHP compiling template engine
+ * File:        smarty_internal_wrapper.php
+ * SVN:         $Id: $
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * 
+ * For questions, help, comments, discussion, etc., please join the
+ * Smarty mailing list. Send a blank e-mail to
+ * smarty-discussion-subscribe@googlegroups.com
+ * 
+ * @link http://www.smarty.net/
+ * @copyright 2008 New Digital Group, Inc.
+ * @author Monte Ohrt <monte at ohrt dot com> 
+ * @author Uwe Tews 
+ * @package Smarty
+ * @subpackage PluginsInternal
+ * @version 3-SVN$Rev: 3286 $
+ */
+
+/*
+ * Smarty Backward Compatability Wrapper
+ */
+
+class Smarty_Internal_Wrapper {
+  
+    protected $smarty;
+
+    function __construct($smarty) {
+      $this->smarty = $smarty;
+    }
+    
+    /**
+     * Converts smarty2-style function call to smarty 3-style function call
+     * This is expensive, be sure to port your code to Smarty 3!
+     * 
+     * @param string $name Smarty 2 function name
+     * @param array $args Smarty 2 function args
+     */
+    function convert($name, $args) {
+       // throw notice about deprecated function
+       if($this->smarty->deprecation_notices)
+         trigger_error("function call '$name' is unknown or deprecated.",E_USER_NOTICE);
+       // get first and last part of function name
+       $name_parts = explode('_',$name,2);
+       switch($name_parts[0]) {
+         case 'register':
+         case 'unregister':
+           switch($name_parts[1]) {
+              case 'object':
+                 return call_user_func_array(array($this->smarty,"{$name_parts[0]}Object"),$args);
+              case 'compiler_function':
+                 return call_user_func_array(array($this->smarty,"{$name_parts[0]}Plugin"),array_merge(array('compiler'),$args));
+              case 'prefilter':
+                 return call_user_func_array(array($this->smarty,"{$name_parts[0]}Filter"),array_merge(array('pre'),$args));
+              case 'postfilter':
+                 return call_user_func_array(array($this->smarty,"{$name_parts[0]}Filter"),array_merge(array('post'),$args));
+              case 'outputfilter':
+                 return call_user_func_array(array($this->smarty,"{$name_parts[0]}Filter"),array_merge(array('output'),$args));
+             case 'resource':
+                 return call_user_func_array(array($this->smarty,"{$name_parts[0]}Resource"),$args);
+              default:
+                 return call_user_func_array(array($this->smarty,"{$name_parts[0]}Plugin"),array_merge(array($name_parts[1]),$args));
+           }
+           case 'get':
+           switch($name_parts[1]) {
+              case 'template_vars':
+                 return call_user_func_array(array($this->smarty,'getTemplateVars'),$args);
+              case 'config_vars':
+                 return call_user_func_array(array($this->smarty,'getConfigVars'),$args);
+              default:
+                 return call_user_func_array(array($myobj,$name_parts[1]),$args);
+           }
+           case 'clear':
+           switch($name_parts[1]) {
+              case 'all_assign':
+                 return call_user_func_array(array($this->smarty,'clearAllAssign'),$args);
+              case 'assign':
+                 return call_user_func_array(array($this->smarty,'clearAssign'),$args);
+              case 'all_cache':
+                 return call_user_func_array(array($this->smarty,'clearAllCache'),$args);
+              case 'cache':
+                 return call_user_func_array(array($this->smarty,'clearCache'),$args);
+              case 'compiled_template':
+                 return call_user_func_array(array($this->smarty,'clearCompiledTemplate'),$args);
+           }
+           case 'config':
+           switch($name_parts[1]) {
+              case 'load':
+                 return call_user_func_array(array($this->smarty,'configLoad'),$args);
+           }
+           case 'trigger':
+           switch($name_parts[1]) {
+              case 'error':
+                 return call_user_func_array('trigger_error',$args);
+           }
+           case 'load':
+           switch($name_parts[1]) {
+              case 'filter':
+                 return call_user_func_array(array($this->smarty,'loadFilter'),$args);
+           }
+       }
+       throw new SmartyException("unknown method '$name'");
+    }
+
+    /**
+     * trigger Smarty error
+     *
+     * @param string $error_msg
+     * @param integer $error_type
+     */
+    function trigger_error($error_msg, $error_type = E_USER_WARNING)
+    {
+        trigger_error("Smarty error: $error_msg", $error_type);
+    }
+}
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_internal_write_file.php b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_write_file.php
new file mode 100644
index 0000000..4e34335
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_internal_write_file.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * Smarty write file plugin
+ * 
+ * @package Smarty
+ * @subpackage PluginsInternal
+ * @author Monte Ohrt 
+ */
+
+/**
+ * Smarty Internal Write File Class
+ */
+class Smarty_Internal_Write_File {
+    /**
+     * Writes file in a save way to disk
+     * 
+     * @param string $_filepath complete filepath
+     * @param string $_contents file content
+     * @return boolean true
+     */
+    public static function writeFile($_filepath, $_contents, $smarty)
+    {
+        $old_umask = umask(0);
+        $_dirpath = dirname($_filepath); 
+        // if subdirs, create dir structure
+        if ($_dirpath !== '.' && !file_exists($_dirpath)) {
+            mkdir($_dirpath, $smarty->_dir_perms, true);
+        } 
+        // write to tmp file, then move to overt file lock race condition
+        $_tmp_file = tempnam($_dirpath, 'wrt');
+
+	    if (!($fd = @fopen($_tmp_file, 'wb'))) {
+        	$_tmp_file = $_dirpath . DS . uniqid('wrt');
+        	if (!($fd = @fopen($_tmp_file, 'wb'))) {
+            throw new SmartyException("unable to write file {$_tmp_file}");
+            return false;
+        	}
+   		 }
+
+    	fwrite($fd, $_contents);
+    	fclose($fd);
+
+        // remove original file
+        if (file_exists($_filepath))
+            @unlink($_filepath); 
+        // rename tmp file
+        rename($_tmp_file, $_filepath); 
+        // set file permissions
+        chmod($_filepath, $smarty->_file_perms);
+        umask($old_umask);
+        return true;
+    } 
+} 
+
+?>
\ No newline at end of file
diff --git a/onyx2/modules/templates/smarty/sysplugins/smarty_security.php b/onyx2/modules/templates/smarty/sysplugins/smarty_security.php
new file mode 100644
index 0000000..cd066fb
--- /dev/null
+++ b/onyx2/modules/templates/smarty/sysplugins/smarty_security.php
@@ -0,0 +1,229 @@
+<?php
+/**
+ * Smarty plugin
+ * 
+ * @package Smarty
+ * @subpackage Security
+ * @author Uwe Tews 
+ */ 
+
+/**
+ * This class does contain the security settings
+ */
+class Smarty_Security {
+    /**
+     * This determines how Smarty handles "<?php ... ?>" tags in templates.
+     * possible values:
+     * <ul>
+     *   <li>Smarty::PHP_PASSTHRU -> echo PHP tags as they are</li>
+     *   <li>Smarty::PHP_QUOTE    -> escape tags as entities</li>
+     *   <li>Smarty::PHP_REMOVE   -> remove php tags</li>
+     *   <li>Smarty::PHP_ALLOW    -> execute php tags</li>
+     * </ul>
+     * 
+     * @var integer 
+     */
+    public $php_handling = Smarty::PHP_PASSTHRU;
+
+    /**
+     * This is the list of template directories that are considered secure.
+     * $template_dir is in this list implicitly.
+     * 
+     * @var array 
+     */
+    public $secure_dir = array();
+
+
+    /**
+     * This is an array of directories where trusted php scripts reside.
+     * {@link $security} is disabled during their inclusion/execution.
+     * 
+     * @var array 
+     */
+    public $trusted_dir = array();
+
+
+    /**
+     * This is an array of trusted static classes.
+     *
+     * If empty access to all static classes is allowed.
+     * If set to 'none' none is allowed.
+     * @var array 
+     */
+    public $static_classes = array();
+
+    /**
+     * This is an array of trusted PHP functions.
+     *
+     * If empty all functions are allowed.
+     * To disable all PHP functions set $php_functions = null.
+     * @var array 
+     */
+    public $php_functions = array('isset', 'empty',
+            'count', 'sizeof','in_array', 'is_array','time','nl2br');
+
+    /**
+     * This is an array of trusted PHP modifers.
+     *
+     * If empty all modifiers are allowed.
+     * To disable all modifier set $modifiers = null.
+     * @var array 
+     */
+    public $php_modifiers = array('escape','count');
+
+    /**
+     * This is an array of trusted streams.
+     *
+     * If empty all streams are allowed.
+     * To disable all streams set $streams = null.
+     * @var array 
+     */
+    public $streams = array('file');
+    /**
+     * + flag if constants can be accessed from template
+     */
+    public $allow_constants = true;
+    /**
+     * + flag if super globals can be accessed from template
+     */
+    public $allow_super_globals = true;
+    /**
+     * + flag if the {php} and {include_php} tag can be executed
+     */
+    public $allow_php_tag = false;
+
+    public function __construct($smarty)
+    {
+        $this->smarty = $smarty; 
+	}
+    /**
+     * Check if PHP function is trusted.
+     * 
+     * @param string $function_name 
+     * @param object $compiler compiler object
+     * @return boolean true if function is trusted
+     */
+    function isTrustedPhpFunction($function_name, $compiler)
+    {
+        if (isset($this->php_functions) && (empty($this->php_functions) || in_array($function_name, $this->php_functions))) {
+            return true;
+        } else {
+            $compiler->trigger_template_error ("PHP function '{$function_name}' not allowed by security setting");
+            return false;
+        } 
+    } 
+
+    /**
+     * Check if static class is trusted.
+     * 
+     * @param string $class_name 
+     * @param object $compiler compiler object
+     * @return boolean true if class is trusted
+     */
+    function isTrustedStaticClass($class_name, $compiler)
+    {
+        if (isset($this->static_classes) && (empty($this->static_classes) || in_array($class_name, $this->static_classes))) {
+            return true;
+        } else {
+            $compiler->trigger_template_error ("access to static class '{$class_name}' not allowed by security setting");
+            return false;
+        } 
+    } 
+    /**
+     * Check if modifier is trusted.
+     * 
+     * @param string $modifier_name 
+     * @param object $compiler compiler object
+     * @return boolean true if modifier is trusted
+     */
+    function isTrustedModifier($modifier_name, $compiler)
+    {
+        if (isset($this->php_modifiers) && (empty($this->php_modifiers) || in_array($modifier_name, $this->php_modifiers))) {
+            return true;
+        } else {
+            $compiler->trigger_template_error ("modifier '{$modifier_name}' not allowed by security setting");
+            return false;
+        } 
+    } 
+    /**
+     * Check if stream is trusted.
+     * 
+     * @param string $stream_name 
+     * @param object $compiler compiler object
+     * @return boolean true if stream is trusted
+     */
+    function isTrustedStream($stream_name)
+    {
+        if (isset($this->streams) && (empty($this->streams) || in_array($stream_name, $this->streams))) {
+            return true;
+        } else {
+            throw new SmartyException ("stream '{$stream_name}' not allowed by security setting");
+            return false;
+        } 
+    } 
+
+    /**
+     * Check if directory of file resource is trusted.
+     * 
+     * @param string $filepath 
+     * @param object $compiler compiler object
+     * @return boolean true if directory is trusted
+     */
+    function isTrustedResourceDir($filepath)
+    {
+        $_rp = realpath($filepath);
+        if (isset($this->smarty->template_dir)) {
+            foreach ((array)$this->smarty->template_dir as $curr_dir) {
+                if (($_cd = realpath($curr_dir)) !== false &&
+                        strncmp($_rp, $_cd, strlen($_cd)) == 0 &&
+                        (strlen($_rp) == strlen($_cd) || substr($_rp, strlen($_cd), 1) == DS)) {
+                    return true;
+                } 
+            } 
+        } 
+        if (!empty($this->smarty->security_policy->secure_dir)) {
+            foreach ((array)$this->smarty->security_policy->secure_dir as $curr_dir) {
+                if (($_cd = realpath($curr_dir)) !== false) {
+                    if ($_cd == $_rp) {
+                        return true;
+                    } elseif (strncmp($_rp, $_cd, strlen($_cd)) == 0 &&
+                            (strlen($_rp) == strlen($_cd) || substr($_rp, strlen($_cd), 1) == DS)) {
+                        return true;
+                    } 
+                } 
+            } 
+        } 
+
+        throw new SmartyException ("directory '{$_rp}' not allowed by security setting");
+        return false;
+    } 
+    
+    /**
+     * Check if directory of file resource is trusted.
+     * 
+     * @param string $filepath 
+     * @param object $compiler compiler object
+     * @return boolean true if directory is trusted
+     */
+    function isTrustedPHPDir($filepath)
+    {
+        $_rp = realpath($filepath);
+        if (!empty($this->trusted_dir)) {
+            foreach ((array)$this->trusted_dir as $curr_dir) {
+                if (($_cd = realpath($curr_dir)) !== false) {
+                    if ($_cd == $_rp) {
+                        return true;
+                    } elseif (strncmp($_rp, $_cd, strlen($_cd)) == 0 &&
+                            substr($_rp, strlen($_cd), 1) == DS) {
+                        return true;
+                    } 
+                } 
+            } 
+        } 
+
+        throw new SmartyException ("directory '{$_rp}' not allowed by security setting");
+        return false;
+    } 
+} 
+
+?>
\ No newline at end of file
diff --git a/onyx2/require/cache.php b/onyx2/require/cache.php
new file mode 100644
index 0000000..7056415
--- /dev/null
+++ b/onyx2/require/cache.php
@@ -0,0 +1,35 @@
+<?php
+
+class Cache
+    {
+    
+        static function set($id,$var)
+            {
+                $file = '<?php $cache = '.var_export($var,TRUE).'; ?>';
+                
+                file_put_contents(ONYX.'cache/'.md5($id).'.cache.php',$file) or trigger_error('dossier cache inaccessible en écriture.',E_USER_ERROR);
+            }
+        
+        static function read($id)
+            {
+                if(!is_readable(ONYX.'cache/'.md5($id).'.cache.php')) return FALSE;
+                
+                include(ONYX.'cache/'.md5($id).'.cache.php');
+                if(!$cache) return FALSE;
+                return $cache;
+            }
+        
+        static function del($id)
+            {
+                if(!is_file(ONYX.'cache/'.md5($id).'.cache.php')) return FALSE;
+                return unlink(ONYX.'cache/'.md5($id).'.cache.php');
+            }
+        
+        static function flush()
+            {
+                foreach(glob(ONYX.'cache/*.cache.php') as $file) unlink($file);
+            }
+    
+    }
+
+?>
\ No newline at end of file
diff --git a/onyx2/require/env.php b/onyx2/require/env.php
new file mode 100644
index 0000000..d73556f
--- /dev/null
+++ b/onyx2/require/env.php
@@ -0,0 +1,49 @@
+<?php
+
+function elog($message,$level = 0,$dir = NULL,$file = NULL)
+	{
+		$dir = empty($dir) ? ONYX."log" : $dir;
+		$file = empty($file) ? strftime('%d-%m-%y').".log" : $file;
+		
+		if($fichier = fopen("$dir/$file",'a+'))
+			{
+				switch($level)
+					{
+						default:
+						case 0: $level = 'MESSAGE'; break;
+						case 1: $level = 'AVERTISSEMENT'; break;
+						case 2: $level = 'ERREUR'; break;
+					}
+				$time = strftime('%d/%m/%y %H:%M:%S');
+				$req = isset($_SERVER['REQUEST_METHOD']) ? $_SERVER['REQUEST_METHOD']: '';
+				$arg = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI']: '';
+				$remote = isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR']: '';
+				$ua = isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT']: '';
+				$referer = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER']: '';
+				$line = "[$time] $level : $message  [$remote] [$req] [$arg] [$ua] [$referer]\r\n";
+				fwrite($fichier,$line);
+				fclose($fichier);
+			}
+		else trigger_error('Log non accessible en ecriture',E_USER_ERROR);
+	}
+
+function gpc($name,$method='get')
+	{
+		switch($method)
+			{
+				default:
+				case 'get': $var = isset($_GET[$name]) ? $_GET[$name] : NULL; break;
+				case 'post': $var = isset($_POST[$name]) ? $_POST[$name] : NULL; break;
+				case 'cookie': $var = isset($_COOKIE[$name]) ? $_COOKIE[$name] : NULL; break;
+			}
+		
+		if(get_magic_quotes_gpc()) $var = stripslashes($var);
+		return $var;
+	}
+
+/*function cookie($name,$value,$time = 3600)
+	{
+		setcookie($name,$value,$time);
+	}*/
+
+?>
\ No newline at end of file
diff --git a/onyx2/require/parse.php b/onyx2/require/parse.php
new file mode 100644
index 0000000..34fe3c2
--- /dev/null
+++ b/onyx2/require/parse.php
@@ -0,0 +1,73 @@
+<?php
+
+function parse_config($node,$name = 'var',$attribut = 'name')
+    {
+        @$configs = $node->childNodes;
+        if($configs)
+            {
+                $array = array();
+                
+                foreach($configs as $value)
+                    {
+                        if($value->nodeName == $name)
+                            {
+                                if($value->getElementsByTagName($name)->length == 0)
+                                    {
+                                        $array[$value->getAttribute($attribut)] = trim($value->textContent);
+                                    }
+                                else $array[$value->getAttribute($attribut)] = parse_config($value,$name,$attribut);
+                            }
+                    }
+                return $array;
+            }
+        else return array();
+    }
+
+/*function parse($file)
+    {
+        $xml = new DOMDocument();
+        
+        $xml->load($file);
+        #$xml->validate();
+        
+        if($root = $xml->documentElement->getAttribute('root'))
+            {
+                if($root == substr(FILE,0,strlen($root)))
+                    {
+                        $search = substr(FILE,strlen($root));
+                        
+                        $paths = explode('/',$search);
+                        $paths2 = $paths;
+                        foreach($paths as $key => $path)
+                            {
+                                for($i = $key - 1; $i >= 0; $i--)
+                                    {
+                                        $paths2[$key] = $paths[$i] . '/' . $paths2[$key];
+                                    }
+                                if($key != count($paths) - 1) $paths2[$key] .= '/';
+                            }
+                        
+                        foreach($xml->getElementsByTagName('config') as $value)
+                            {
+                                $config[$value->getAttribute('match')] = $value;
+                            }
+                        
+                        $parsed = array();
+                        array_unshift($paths2,'*');
+                        
+                        foreach($paths2 as $path)
+                            {
+                                if($config[$path]) $parsed = array_merge($parsed,parse_config($config[$path]));
+                            }
+                        
+                        return $parsed;
+                }
+            }
+        else return FALSE;
+    }
+
+define('FILE','/var/www/site/test/test.php');
+
+print_r(parse('../config/root.xml'));*/
+
+?>
\ No newline at end of file
diff --git a/onyx2/require/str.php b/onyx2/require/str.php
new file mode 100644
index 0000000..8ad65d6
--- /dev/null
+++ b/onyx2/require/str.php
@@ -0,0 +1,107 @@
+<?php
+function hexstr($var)
+	{
+            return pack('H*',$var);
+	}
+
+function strhex($var)
+	{
+            $tab = unpack('H*',$var);
+            return $tab[1];
+	}
+
+function bitstr($var)
+    {
+        $r = NULL;
+        for($i = 0; $i < strlen($var); $i += 8) $r .= chr(bindec(substr($var,$i,8)));
+        return $r;
+    }
+
+function bithex($var)
+    {
+        $r = NULL;
+        for($i = 0; $i < strlen($var); $i += 4) $r .= base_convert(substr($var,$i,4),2,16);
+        return $r;
+    }
+
+
+function hex2bin($str)
+    {
+        $bin = "";
+        $i = 0;
+        do
+    	    {
+	        $bin .= chr(hexdec($str{$i}.$str{($i + 1)}));
+		$i += 2;
+            }
+        while ($i < strlen($str));
+        return $bin;
+    }
+
+function cxor($msg,$cle)
+	{	
+            $xor = NULL;
+            for($i = 0; $i < strlen($msg);$i++) $xor .= substr($msg,$i,1) ^ substr($cle,$i % strlen($cle),1);
+            return $xor;
+	}
+
+function random($l=128)
+	{
+            $r = NULL;
+            for($i = 1;$i <= $l/128 && $l/128 <= 32; $i++)
+                    {
+                            $var = time().microtime().mt_rand().md5(time()).md5(microtime()).md5(mt_rand()).sha1(time()).sha1(microtime()).sha1(mt_rand());
+                            $r .= md5(cxor(md5($var,TRUE),sha1($var,TRUE)));
+                    }
+            return $r;
+	}
+
+function uniquehash($var,$length=128,$raw=FALSE)
+    {
+        $hashs = array('tiger192,4','haval256,5','md5','snefru','gost','ripemd160','whirlpool');
+        $r = hash('sha512',$var,TRUE);
+        
+        foreach($hashs as $algo) $r = cxor(strrev($r),hash($algo,strrev($r),TRUE));
+        
+        if($length % 8 == 0 && $length >=128 && $length <= 512) $r = substr($r,0,$length/8);
+        if(!$raw) $r = strhex($r);
+        
+        return $r;
+    }
+
+function temphash($var,$length=128,$raw=FALSE)
+    {
+        if(!$val = Cache::read('_temphash')) Cache::set('_temphash',$val = hexstr(random()));
+        
+        return uniquehash(cxor($var,$val),$length,$raw);
+    }
+
+function decode_ip($int_ip)
+    {
+	return inet_ntop(hex2bin($int_ip));
+    }
+
+function encode_ip($ip=FALSE)
+    {
+        if(!$ip)
+            $ip = $_SERVER['REMOTE_ADDR'];
+
+	return bin2hex(inet_pton($ip));            
+    }
+
+function url($string,$external=FALSE)
+	{
+            if($external) return htmlspecialchars($string);
+            
+            global $VAR;
+        
+            if(!empty($VAR['rewrite_url']))
+                    {
+                            $masque = $VAR['rewrite_url']['masque'];
+                            $replace = $VAR['rewrite_url']['replace'];
+                            $var = preg_replace($masque,$replace,$string);
+                            return htmlspecialchars($var);
+                    }
+            else return htmlspecialchars($string);
+	}
+?>
\ No newline at end of file
diff --git a/onyx2/tpl/tpl b/onyx2/tpl/tpl
new file mode 100644
index 0000000..e69de29
diff --git a/style.css b/style.css
new file mode 100644
index 0000000..48f0c0d
--- /dev/null
+++ b/style.css
@@ -0,0 +1,160 @@
+a {
+	color: #8a77a1;
+	text-decoration: none;
+}
+a:hover {
+	color: #816e99;
+	text-decoration: underline;
+}
+
+body {
+	background-color: #E1E2E4;
+	background-image: url('images/background.jpg');
+	background-attachment: fixed;
+	font-family: sans-serif;
+	text-align: center;
+}
+
+@font-face
+{
+	font-family: title;
+	src: url('fonts/kidprint.ttf');
+}
+
+h1 {
+	color: #75903b;
+}
+h2 {
+	color: #7f9a48;
+}
+h3 {
+	color: #89a355;
+}
+h4, h5, h6 {
+	color: #95ae64;
+}
+
+label {
+	color: #e9802c;
+	font-weight: bold;
+	margin-right: 5px;
+}
+label:hover {
+	text-decoration: underline;
+}
+
+input[type=text], input[type=password], select {
+	transition: background 0.75s;
+	-moz-transition: background 0.75s;
+	-webkit-transition: background 0.75s; 
+	-o-transition: background 0.75s;
+}
+input, select {
+	background: #558dd4;
+	border: #2f588b solid 1px;
+	border-radius: 5px;
+	margin-top: 5px;
+}
+input:hover, input:focus, select:hover, select:focus {
+	background: #95cdff;
+}
+input.erreur, select.erreur {
+	background: #df0009;
+	border: #f7000b solid 1px;
+}
+input.erreur:hover, select.erreur:hover {
+	background: #ff2029;
+}
+
+div#logo {
+	background: transparent url('images/logog.png') no-repeat 0 0;
+	display: block;
+	height: 312px;
+	text-align: right;
+	margin: auto;
+	width: 999px;
+}
+div#logo img#etatAvance {
+	display: block;
+	float: right;
+	margin-top: 80px;
+	margin-right: 170px;
+}
+div#logo img#titre {
+	clear: right;
+	display: block;
+	float: right;
+	margin-top: 79px;
+	margin-right: 127px;
+}
+
+#erreur {
+	color: #FF0000;
+	font-weight: bold;
+	text-decoration: blink;
+}
+
+
+/* Pages */
+fieldset.connexion {
+	background: #e3e3e3;
+	border-radius: 10px;
+	box-shadow: 0px 0px 11px #555;
+	margin: auto;
+	min-width: 200px;
+	width: 200px;
+}
+
+dl.application {
+    background: -webkit-gradient(
+	linear,
+	left bottom,
+	left top,
+	color-stop(0.31, #15DD47),
+	color-stop(0.66, #31FF64)
+    );
+    background: -moz-linear-gradient(
+	center bottom,
+	#15DD47 31%,
+	#31FF64 66%
+    );
+
+    border: 2px solid black;
+    border-radius: 10px;
+    box-shadow: 0px 0px 11px #11CC99;
+    padding: 5px;
+    text-align: left;
+	
+    transition: background 0.5s;
+    -moz-transition: background 0.5s;
+    -webkit-transition: background 0.5s; 
+    -o-transition: background 0.5s;
+}
+dl.application.construction {
+	box-shadow: 0px 0px 11px #e9771a;
+}
+dl.application.alpha {
+	box-shadow: 0px 0px 11px #db302d;
+}
+dl.application.beta {
+	box-shadow: 0px 0px 11px #8c9c4a;
+}
+dl.application:hover {
+	background-image: -webkit-gradient(
+	    linear,
+	    left bottom,
+	    left top,
+	    color-stop(0.2, #3082E2),
+	    color-stop(0.6, #4D9CFF)
+	);
+	background-image: -moz-linear-gradient(
+	    center bottom,
+	    #3082E2 20%,
+	    #4D9CFF 60%
+	);
+}
+
+dl.application dt {
+	font-weight: bold;
+	font-size: 130%;
+}
\ No newline at end of file