No OneTemporary
Actions

Size

83 KB

Subscribers

None

View Options

This document is not UTF8. It was detected as ISO-8859-1 (Latin 1) and converted to UTF8 for display.

	diff --git a/controllers/profile.php b/controllers/profile.php
	--- a/controllers/profile.php
	+++ b/controllers/profile.php
	@@ -1,346 +1,346 @@
	<?php

	/**
	* User profile
	*
	* Zed. The immensity of stars. The HyperShip. The people.
	*
	* (c) 2010, Dereckson, some rights reserved.
	* Released under BSD license.
	*
	* This is a controller allowing user profile view and edit.
	*
	* It handles the following URLs:
	* /who/<perso nickname> views the nickname's profile,
	* /who/random views a random profile,
	* /who/edit/profile edits its profileq
	* /who/edit/account edits its account (disabled on Zed, cf. settings),
	* /who/edit/photo(s) manages its profile's photos,
	* /who/edit/photo/edit/<photo id> edits a photo properties,
	* /who/edit/photo/delete/<photo id> deletes a photo,
	* /who/edit/photo/avatar/<photo id> promotes a photo to avatar.
	*
	* The following views are used:
	* profile.tpl,
	* profile_edit.tpl,
	* user_account.tpl,
	* profile_photo.tpl,
	* profile_photo_edit.tpl.
	*
	* The following models are used:
	* Profile,
	* ProfilePhoto,
	* ProfileComment.
	*
	* The view profile_tags.tpl is indirectly used by the Profile model.
	*
	* This code is maintained in // with AzhÃ r.
	*
	* @package Zed
	* @subpackage Controllers
	* @author SÃ©bastien Santoro aka Dereckson <dereckson@espace-win.org>
	* @copyright 2010 SÃ©bastien Santoro aka Dereckson
	* @license http://www.opensource.org/licenses/bsd-license.php BSD
	* @version 0.1
	* @link http://scherzo.dereckson.be/doc/zed
	* @link http://zed.dereckson.be/
	* @filesource
	*/

	//Loads language file
	lang_load('profile.conf');

	//Gets perso nickname from URL
	$who = $url[1];

	switch ($who) {
	case 'edit':
	$mode = 'edit';
	$who = $CurrentPerso->nickname;
	break;

	case 'random':
	$mode = 'view';
	$who = $db->sql_query_express("SELECT perso_id FROM " . TABLE_PROFILES . " ORDER BY rand() LIMIT 1");
	break;

	default:
	$mode = 'view';
	}

	if (!$who) {
	message_die(GENERAL_ERROR, "Who?", "URL error");
	}

	//Libs
	require_once('includes/objects/profile.php');
	require_once('includes/objects/profilecomment.php');
	require_once('includes/objects/profilephoto.php');

	//Gets perso information
	require_once('includes/objects/perso.php');
	$perso = Perso::get($who);
	if ($perso->lastError) {
	message_die(GENERAL_ERROR, $perso->lastError, "Error");
	}
	$smarty->assign('perso', $perso);

	//Gets profile
	$profile = new Profile($perso->id);

	//Handles form
	if ($_POST['EditProfile']) {
	$profile->load_from_form();
	$profile->updated = time();
	$profile->save_to_database();
	$mode = 'view';
	} elseif ($_POST['UserAccount']) {
	$smarty->assign('WAP', "This form have been deprecated. You can write instead settings in the SmartLine");
	} elseif ($_POST['message_type'] == 'private_message') {
	//Sends a message
	require_once('includes/objects/message.php');
	$msg = new Message();
	$msg->from = $CurrentPerso->id;
	$msg->to = $perso->id;
	$msg->text = $_POST['message'];
	$msg->send();
	if ($msg->from == $msg->to) {
	$smarty->assign('NOTIFY', lang_get('MessageSentSelf'));
	} else {
	$smarty->assign('NOTIFY', lang_get('MessageSent'));
	}
	} elseif ($_POST['message_type'] == 'profile_comment') {
	//New profile comment
	$comment = new ProfileComment();
	$comment->author = $CurrentPerso->id;
	$comment->perso_id = $perso->id;
	$comment->text = $_POST['message'];
	$comment->publish();
	$smarty->assign('NOTIFY', lang_get('CommentPublished'));
	} elseif ($_FILES['photo']) {
	#We've a file !

	$hash = md5(microtime() . serialize($_FILES));
	$extension = get_extension($_FILES['photo']['name']);
	$filename = $CurrentPerso->id . '_' . $hash . '.' . $extension;

	#We ignore $_FILES[photo][error] 4, this means no file has been uploaded
	#(so user doesn't want upload a new file)
	#See http:/www.php.net/features.file-upload and http://www.php.net/manual/en/features.file-upload.errors.php about common errors
	#Not valid before PHP 4.2.0
	switch ($_FILES['photo']['error']) {
	case 0:
	#There is no error, the file uploaded with success.

	if (!move_uploaded_file($_FILES['photo']['tmp_name'], PHOTOS_DIR . '/' . $filename)) {
	$errors[] = "Upload successful, but error saving it.";
	} else {
	//Attaches the picture to the profile
	$photo = new ProfilePhoto();
	$photo->name = $filename;
	$photo->perso_id = $CurrentPerso->id;
	$photo->description = $_POST['description'];
	if ($photo->avatar) $photo->promote_to_avatar();
	$photo->save_to_database();

	//Generates thumbnail
	if (!$photo->generate_thumbnail()) {
	$smarty->assign('WAP', "Error generating thumbnail.");
	}

	$smarty->assign('NOTIFY', lang_get('PhotoUploaded'));
	$mode = 'view';
	}
	break;

	case 1:
	$errors[] = "The file is too large.";
	break;

	#TODO : more explicit error messages

	default:
	$errors[] = "Unknown error (#" . $_FILES['photo']['error'] . ")";
	break;
	}

	if (count($errors)) {
	$smarty->assign('WAP', join($errors, '<br />'));
	}
	} elseif ($_POST['id']) {
	//Edits photo properties
	$photo = new ProfilePhoto($_POST['id']);
	if ($photo->lastError) {
	$smarty->assign('WAP', $photo->lastError);
	$mode = 'view';
	} elseif ($photo->perso_id != $CurrentPerso->id) {
	$smarty->assign('WAP', lang_get('NotYourPic'));
	$mode = 'view';
	} else {
	//OK
	$wereAvatar = $photo->avatar;
	$photo->load_from_form();
	if (!$wereAvatar && $photo->avatar) {
	//Promote to avatar
	$photo->promote_to_avatar();
	}
	$photo->save_to_database();
	}
	}

	//Prepares output
	if ($profile->text) {
	//Profile
	$smarty->assign('PROFILE_TEXT', $profile->text);
	$smarty->assign('PROFILE_FIXEDWIDTH', $profile->fixedwidth);
	}

	if ($mode == 'view') {
	require_once('includes/objects/profilephoto.php');

	//Self profile?
	$self = $CurrentPerso->id == $profile->perso_id;

	//Gets profiles comments, photos, tags
	$comments = ProfileComment::get_comments($profile->perso_id);
	$photos = ProfilePhoto::get_photos($profile->perso_id);
	$tags = $profile->get_cached_tags();

	//Records timestamp, to be able to track new comments
	if ($self) $CurrentPerso->set_flag('profile.lastvisit', time());

	//Template
	$smarty->assign('PROFILE_COMMENTS', $comments);
	$smarty->assign('PROFILE_SELF', $self);
	if ($tags) $smarty->assign('PROFILE_TAGS', $tags);
	$smarty->assign('USERNAME', $perso->username);
	$smarty->assign('NAME', $perso->name ? $perso->name : $perso->nickname);
	$template = 'profile.tpl';
	} elseif ($mode == 'edit') {
	switch ($url[2]) {
	case 'profile':
	$smarty->assign('USERNAME', $perso->name);
	$smarty->assign('DIJIT', true);
	$css[] = THEME . '/forms.css';
	$template = 'profile_edit.tpl';
	break;

	case 'account':
	$smarty->assign('user', $CurrentUser);
	$smarty->assign('DIJIT', true);
	$css[] = THEME . '/forms.css';
	$template = 'user_account.tpl';
	break;

	case '':
	$smarty->assign('NOTIFY', "What do you want to edit ? Append /profile, /account or /photos to the URL");
	break;

	case 'photo':
	case 'photos':
	$smarty->assign('USERNAME', $perso->name);
	switch ($action = $url[3]) {
	case '':
	//Nothing to do
	break;

	case 'delete':
	//Deletes a picture
	if (!$id = $url[4]) {
	$smarty->assign('WAP', "URL error. Parameter missing: picture id.");
	} else {
	$photo = new ProfilePhoto($id);
	if ($photo->lastError) {
	//Probably an non existent id (e.g. double F5, photo already deleted)
	$smarty->assign('WAP', $photo->lastError);
	} elseif ($photo->perso_id != $CurrentPerso->id) {
	$smarty->assign('WAP', lang_get('NotYourPic'));
	} else {
	//OK we can delete it
	$photo->delete();
	$smarty->assign('NOTIFY', lang_get('PictureDeleted'));
	}
	}
	break;

	case 'edit':
	if (!$id = $url[4]) {
	$smarty->assign('WAP', "URL error. Parameter missing: picture id.");
	} else {
	$photo = new ProfilePhoto($id);
	if ($photo->lastError) {
	//Probably an non existent id (e.g. double F5, photo already deleted)
	$smarty->assign('WAP', $photo->lastError);
	} elseif ($photo->perso_id != $CurrentPerso->id) {
	$smarty->assign('WAP', lang_get('NotYourPic'));
	} else {
	//Photo information edit form
	$smarty->assign('photo', $photo);
	$template = 'profile_photo_edit.tpl';
	}
	}
	break;

	case 'avatar':
	//Promotes a picture to avatar
	if (!$id = $url[4]) {
	$smarty->assign('WAP', "URL error. Parameter missing: picture id.");
	} else {
	$photo = new ProfilePhoto($id);
	if ($photo->lastError) {
	$smarty->assign('WAP', $photo->lastError);
	} elseif ($photo->perso_id != $CurrentPerso->id) {
	$smarty->assign('WAP', lang_get('NotYourPic'));
	} else {
	//OK, promote it to avatar
	$photo->promote_to_avatar();
	$photo->save_to_database();
	$smarty->assign('NOTIFY', lang_get('PromotedToAvatar'));
	}
	}
	break;

	default:
	$smarty->assign('WAP', "Unknown URL. To delete a picture it's /delete/<picture id>. To edit it /edit/<picture id>");
	break;
	}
	-
	+
	if (!$template) {
	$photos = ProfilePhoto::get_photos($profile->perso_id);
	- if (!$smarty->_tpl_vars['NOTIFY'])
	+ if (!$smarty->tpl_vars['NOTIFY'])
	$smarty->assign('NOTIFY', "Your feedback is valued. Report any bug or suggestion on the graffiti wall.");
	$template = 'profile_photo.tpl';
	}
	break;

	default:
	$smarty->assign('WAP', "URL error. You can use /edit with profile, account or photos.");
	break;
	}
	}

	//
	// HTML output
	//

	//Photos
	if (count($photos) \|\| $photo) {
	$smarty->assign('URL_PICS', PHOTOS_URL);
	$css[] = 'lightbox.css';
	$smarty->assign('PAGE_JS', array('prototype.js', 'effects.js', 'lightbox.js'));
	$smarty->assign('PICS', $photos);
	}

	//Serves header
	$css[] = THEME . "/profile.css";
	$smarty->assign('PAGE_CSS', $css);
	$smarty->assign('PAGE_TITLE', $perso->name);
	include('header.php');

	//Serves content
	if ($template) $smarty->display($template);

	//Serves footer
	include('footer.php');

	?>
	\ No newline at end of file
	diff --git a/controllers/settings.php b/controllers/settings.php
	--- a/controllers/settings.php
	+++ b/controllers/settings.php
	@@ -1,97 +1,97 @@
	<?php

	/**
	* Settings
	*
	* Zed. The immensity of stars. The HyperShip. The people.
	*
	* (c) 2010, Dereckson, some rights reserved.
	* Released under BSD license.
	*
	* This controller allows user to set its preferences, according the Settings
	* classes and the preferences.xml document.
	*
	* It handles the /settings URL.
	*
	* @package Zed
	* @subpackage Controllers
	* @author SÃ©bastien Santoro aka Dereckson <dereckson@espace-win.org>
	* @copyright 2010 SÃ©bastien Santoro aka Dereckson
	* @license http://www.opensource.org/licenses/bsd-license.php BSD
	* @version 0.1
	* @link http://scherzo.dereckson.be/doc/zed
	* @link http://zed.dereckson.be/
	* @filesource
	*
	* @todo replace the on the fly preferences.xml code generation by a cached code generation
	* @todo reduce the number of for loops in this controller
	*/

	//
	// Loads settings
	//

	lang_load('settings.conf');

	include('includes/settings/settings.php');
	$settings = new Settings('includes/settings/preferences.xml');

	//Selects relevant settings page
	$pages = $settings->pages;
	if (count($url) > 1) {
	//From url: /settings/account -> page account
	if (array_key_exists($url[1], $settings->pages)) {
	$page = $pages[$url[1]];
	} else {
	message_die(GENERAL_ERROR, "/settings/$url[1] isn't a valid setting page");
	}
	} else {
	//Default page
	$page = array_shift($pages);
	}

	//Pages links
	foreach ($settings->pages as $tmppage) {
	$pagesLinks[$tmppage->id] = $tmppage->title;
	}

	//
	// Handles form
	//
	if (array_key_exists('settings_page', $_POST)) {
	if ($_POST['settings_page'] == $page->id) {
	//Updates settings
	$errors = array();
	$page->handle_form($errors);
	if (count($errors)) {
	//Prints error message
	$smarty->assign('WAP', implode('<br />', $errors));
	}
	} else {
	//The field settings.page isn't the current page
	//Prints an HACK_ERROR to avoid to save properties with the same names.
	$id_current = $page->id;
	$id_toSave = $_POST['settings_page'];
	message_die(HACK_ERROR, "You're on /settings/$id_current but you want to update /settings/$id_toSave");
	}
	}

	//
	// HTML output
	//

	//Serves header
	define('DIJIT', true);
	$title = lang_get('Settings');
	$smarty->assign('PAGE_TITLE', $title);
	include('header.php');

	//Serves settings page;
	$smarty->assign('page', $page);
	$smarty->assign('pages', $pagesLinks);
	$smarty->display('settings_page.tpl');

	//Servers footer
	include('footer.php');
	-
	+
	?>
	\ No newline at end of file
	diff --git a/includes/SmartLine/SmartLine.php b/includes/SmartLine/SmartLine.php
	old mode 100644
	new mode 100755
	diff --git a/includes/SmartLine/ZedCommands.php b/includes/SmartLine/ZedCommands.php
	old mode 100644
	new mode 100755
	diff --git a/includes/SmartLine/ZedSmartLine.php b/includes/SmartLine/ZedSmartLine.php
	old mode 100644
	new mode 100755
	diff --git a/includes/api/BeautyXML.class.php b/includes/api/BeautyXML.class.php
	old mode 100644
	new mode 100755
	diff --git a/includes/api/api_helpers.php b/includes/api/api_helpers.php
	old mode 100644
	new mode 100755
	diff --git a/includes/api/cerbere.php b/includes/api/cerbere.php
	old mode 100644
	new mode 100755
	diff --git a/includes/autoload.php b/includes/autoload.php
	old mode 100644
	new mode 100755
	diff --git a/includes/cache/cache.php b/includes/cache/cache.php
	old mode 100644
	new mode 100755
	diff --git a/includes/cache/memcached.php b/includes/cache/memcached.php
	old mode 100644
	new mode 100755
	diff --git a/includes/cache/void.php b/includes/cache/void.php
	old mode 100644
	new mode 100755
	diff --git a/includes/config.php b/includes/config.php
	old mode 100644
	new mode 100755
	diff --git a/includes/content/file.php b/includes/content/file.php
	old mode 100644
	new mode 100755
	diff --git a/includes/content/location.php b/includes/content/location.php
	old mode 100644
	new mode 100755
	diff --git a/includes/content/zone.php b/includes/content/zone.php
	old mode 100644
	new mode 100755
	diff --git a/includes/core.php b/includes/core.php
	old mode 100644
	new mode 100755
	--- a/includes/core.php
	+++ b/includes/core.php
	@@ -1,666 +1,666 @@
	<?php

	/**
	* Core: helper methods and main libraries loader
	*
	* Zed. The immensity of stars. The HyperShip. The people.
	*
	* (c) 2010, Dereckson, some rights reserved.
	* Released under BSD license.
	*
	* @package Zed
	* @subpackage Keruald
	* @author SÃ©bastien Santoro aka Dereckson <dereckson@espace-win.org>
	* @copyright 2010 SÃ©bastien Santoro aka Dereckson
	* @license http://www.opensource.org/licenses/bsd-license.php BSD
	* @version 0.1
	* @link http://scherzo.dereckson.be/doc/zed
	* @link http://zed.dereckson.be/
	* @filesource
	*/

	////////////////////////////////////////////////////////////////////////////////
	/// ///
	/// Configures PHP and loads site-wide used libraries ///
	/// ///
	////////////////////////////////////////////////////////////////////////////////

	//No register globals
	ini_set('register_globals', 'off');
	error_reporting(E_ALL & ~E_NOTICE);

	//Load libraries
	include_once("config.php"); //Site config
	include_once("error.php"); //Error management
	include_once("mysql.php"); //MySQL layer
	include_once("sessions.php"); //Sessions handler
	include_once("autoload.php"); //__autoload()

	////////////////////////////////////////////////////////////////////////////////
	/// ///
	/// Information helper methods ///
	/// ///
	////////////////////////////////////////////////////////////////////////////////

	/**
	* Gets the nickname from the specified perso ID
	*
	* @param integer $perso_id The specified perso ID
	* @return string The perso's nickname
	*/
	function get_name ($perso_id) {
	global $db;
	$perso_id = $db->sql_escape($perso_id);
	$sql = 'SELECT perso_nickname FROM '. TABLE_PERSOS . " WHERE perso_id = '$perso_id'";
	if (!$result = $db->sql_query($sql)) message_die(SQL_ERROR, "Can't query persos table.", '', __LINE__, __FILE__, $sql);
	$row = $db->sql_fetchrow($result);
	return $row['perso_nickname'];
	}

	/**
	* Gets the user ID from the specified username
	*
	* @param string $username The username
	* @return integer the user ID
	*/
	function get_userid ($username) {
	global $db;
	$username = $db->sql_escape($username);
	$sql = 'SELECT user_id FROM '. TABLE_USERS . " WHERE username LIKE '$username'";
	if (!$result = $db->sql_query($sql)) message_die(SQL_ERROR, "Can't query users table.", '', __LINE__, __FILE__, $sql);
	$row = $db->sql_fetchrow($result);
	return $row['user_id'];
	}

	/**
	* Gets an information from the application global registry
	*
	* @param string $key the registry's key
	* @return string The key value
	*/
	function registry_get ($key) {
	global $db;
	$key = $db->sql_escape($key);
	$sql = "SELECT registry_value FROM " . TABLE_REGISTRY . " WHERE registry_key = '$key'";
	if (!$result = $db->sql_query($sql)) message_die(SQL_ERROR, "Can't read registry.", '', __LINE__, __FILE__, $sql);

	$row = $db->sql_fetchrow($result);
	return $row['registry_value'];
	}

	/**
	* Sets an information in the application global registry
	*
	* @param string $key the registry key
	* @param string $value the value to store at the specified registry key
	*/
	function registry_set ($key, $value) {
	global $db;
	$key = $db->sql_escape($key);
	$value = $db->sql_escape($value);
	$sql = "REPLACE INTO " . TABLE_REGISTRY . " (registry_key, registry_value) VALUES ('$key', '$value')";
	if (!$db->sql_query($sql))
	message_die(SQL_ERROR, "Can't update registry", '', __LINE__, __FILE__, $sql);
	}

	////////////////////////////////////////////////////////////////////////////////
	/// ///
	/// Misc helper methods ///
	/// ///
	////////////////////////////////////////////////////////////////////////////////

	/**
	* Generates a random string, according the specified format.
	*
	* <code>
	* echo generate_random_string('AAA111'); //this could output SDQ245.
	* </code>
	*
	* @author Pierre Habart <p.habart@ifrance.com>
	*
	* @param string $format The format e.g. AAA111
	* @return string a random string
	*/
	function generate_random_string ($format) {
	mt_srand((double)microtime()*1000000);
	$str_to_return="";

	$t_alphabet=explode(",","A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z");
	$t_number=explode(",","1,2,3,4,5,6,7,8,9,0");

	for ($i=0;$i<strlen($format);$i++)
	{
	if (preg_match("/^[a-zA-Z]/",$format[$i]))
	{
	$add=$t_alphabet[mt_rand() % sizeof($t_alphabet)];
	if (preg_match("/^[a-z]/",$format[$i]))
	$add=strtolower($add);
	}
	elseif(preg_match("/^[0-9]/",$format[$i]))
	$add=$t_number[mt_rand() % sizeof($t_number)];
	else $add="?";

	$str_to_return.=$add;
	}
	return $str_to_return;
	}

	//Plural management

	/**
	* Returns "s" when the $amount request a plural
	* This function is a French plural helper.
	*
	* @param $amount the amount of objects
	* @return string 's' if $amount implies a plural ; '' if it implies a singular.
	*/
	function s ($amount) {
	if ($amount >= 2 \|\| $amount <= -2) return "s";
	}

	/**
	* Returns "x" when the $amount request a plural
	* This function is a French plural helper.
	*
	* @param $amount the amount of objects
	* @return string 'x' if $amount implies a plural ; '' if it implies a singular.
	*/
	function x ($amount) {
	if ($amount >= 2 \|\| $amount <= -2) return "x";
	}

	//Debug

	/**
	* Prints human-readable information about a variable.
	*
	* It behaves like the print_r command, but the output is enclosed in pre tags,
	* to have a preformatted HTML output.
	*
	* @param mixed The expression to be printed
	*/
	function dprint_r ($expression) {
	echo '<pre>';
	print_r($expression);
	echo '</pre>';
	}

	//GUID

	/**
	* Generates a GUID, or more precisely an UUID
	* @link http://en.wikipedia.org/wiki/Universally_Unique_Identifier Wikipedia, Universally Unique Identifier.
	*
	* A UUID is a 36 chars string of 32 hexadecimal and 4 dashes, with a
	* very high probability to be unique.
	*
	* @return string the UUID
	*/
	function new_guid() {
	$characters = explode(",","a,b,c,d,e,f,0,1,2,3,4,5,6,7,8,9");
	$guid = "";
	for ($i = 0 ; $i < 36 ; $i++) {
	if ($i == 8 \|\| $i == 13 \|\| $i == 18 \|\| $i == 23) {
	$guid .= "-";
	} else {
	$guid .= $characters[mt_rand() % sizeof($characters)];
	}
	}
	return $guid;
	}

	/**
	* Determines if the expression is a valid UUID (a guid without {}).
	* @see new_guid
	*
	* @param string $expression the expression to chjeck
	* @return boolean true if the specified expression is a valid UUID ; otherwise, false.
	*/
	function is_guid ($expression) {
	//We avoid regexp to speed up the check
	//A guid is a 36 characters string
	if (strlen($expression) != 36) return false;

	$expression = strtolower($expression);
	for ($i = 0 ; $i < 36 ; $i++) {
	if ($i == 8 \|\| $i == 13 \|\| $i == 18 \|\| $i == 23) {
	//with dashes
	if ($expression[$i] != "-") return false;
	} else {
	//and numbers
	if (!is_numeric($expression[$i]) && $expression[$i] != 'a' && $expression[$i] != 'b' && $expression[$i] != 'c' && $expression[$i] != 'd' && $expression[$i] != 'e' && $expression[$i] != 'f' ) return false;
	}
	}
	return true;
	}

	/**
	* Gets file extension
	*
	* @param string $file the file to get the extension
	* @return string the extension froÃ¹m the specified tfile
	*/
	function get_extension ($file) {
	$dotPosition = strrpos($file, ".");
	return substr($file, $dotPosition + 1);
	}

	/**
	* Determines if a string starts with specified substring
	*
	* @param string $haystack the string to check
	* @param string $needle the substring to determines if it's the start
	* @param boolean $case_sensitive determines if the search must be case sensitive
	* @return boolean true if $haystack starts with $needle ; otherwise, false.
	*/
	function string_starts_with ($haystack, $needle, $case_sensitive = true) {
	if (!$case_sensitive) {
	$haystack = strtoupper($haystack);
	$needle = strtoupper($needle);
	}
	if ($haystack == $needle) return true;
	return strpos($haystack, $needle) === 0;
	}

	/**
	* Inserts a message into the supralog
	*
	* @param string $category the entry category
	* @param string $message the message to log
	* @param string $source the entry source.
	*/
	function supralog ($category, $message, $source = null) {
	global $db, $CurrentUser, $CurrentPerso;
	$category = $db->sql_query_express($category);
	$message = $db->sql_query_express($message);
	$source = $db->sql_query_express($source ? $source : $_SERVER['SERVER_ADDR']);
	$ip = $_SERVER['REMOTE_ADDR'];
	$sql = "INSERT INTO " . TABLE_LOG .
	" (entry_ip, user_id, perso_id, entry_category, entry_message, entry_source) VALUES
	('$ip', $CurrentUser->id, $CurrentPerso->id, '$category', '$message', '$source')";
	if ( !($result = $db->sql_query($sql)) )
	message_die(SQL_ERROR, "Can't log this entry.", '', __LINE__, __FILE__, $sql);
	}

	////////////////////////////////////////////////////////////////////////////////
	/// ///
	/// Localization (l10n) ///
	/// ///
	////////////////////////////////////////////////////////////////////////////////

	/**
	* Defines the LANG constant, to lang to print
	*
	* This information is contained in the session, or if not yet defined,
	* it's to determine according the user's browser preferences.
	* @see find_lang
	*/
	function initialize_lang () {
	//If $_SESSION['lang'] doesn't exist yet, find a common language
	if (!array_key_exists('lang', $_SESSION)) {
	$lang = find_lang();
	$_SESSION['lang'] = $lang ? $lang : '-';
	}

	if ($_SESSION['lang'] != '-')
	define('LANG', $_SESSION['lang']);
	}

	/**
	* Gets a common lang spoken by the site and the user's browser
	* @see get_http_accept_languages
	*
	* @return string the language
	*/
	function find_lang () {
	if (file_exists('lang') && is_dir('lang')) {
	//Gets lang/ subdirectories: this is the list of available languages
	$handle = opendir('lang');
	while ($file = readdir($handle)) {
	if ($file != '.' && $file != '..' && is_dir("lang/$file")) {
	$langs[] = $file;
	}
	}

	//The array $langs contains now the language available.
	//Gets the langs the user should want:
	if (!$userlangs = get_http_accept_languages())
	return;

	//Gets the intersection between the both languages arrays
	//If it matches, returns first result
	$intersect = array_intersect($userlangs, $langs);
	if (count($intersect)) {
	return $intersect[0];
	}

	//Now it's okay with Opera and Firefox but Internet Explorer will
	//by default return en-US and not en or fr-BE and not fr, so second pass
	foreach ($userlangs as $userlang) {
	$lang = explode('-', $userlang);
	if (count($lang) > 1)
	$userlangs2[] = $lang[0];
	}
	$intersect = array_intersect($userlangs2, $langs);
	if (count($intersect)) {
	return $intersect[0];
	}
	}
	}

	/**
	* Gets the languages accepted by the browser, by order of priority.
	*
	* This will read the HTTP_ACCEPT_LANGUAGE variable sent by the browser in the
	* HTTP request.
	*
	* @return Array an array of string, each item a language accepted by browser
	*/
	function get_http_accept_languages () {
	//What language to print is sent by browser in HTTP_ACCEPT_LANGUAGE var.
	//This will be something like en,fr;q=0.8,fr-fr;q=0.5,en-us;q=0.3

	if (!array_key_exists('HTTP_ACCEPT_LANGUAGE', $_SERVER)) {
	return null;
	}

	$http_accept_language = explode(',', $_SERVER["HTTP_ACCEPT_LANGUAGE"]);
	foreach ($http_accept_language as $language) {
	$userlang = explode(';q=', $language);
	if (count($userlang) == 1) {
	$userlangs[] = array(1, $language);
	} else {
	$userlangs[] = array($userlang[1], $userlang[0]);
	}
	}
	rsort($userlangs);
	foreach ($userlangs as $userlang) {
	$result[] = $userlang[1];
	}
	return $result;
	}

	/**
	* Loads specified language Smarty configuration file
	*
	* @param string $file the file to load
	* @param mixed $sections array of section names, single section or null
	*/
	function lang_load ($file, $sections = null) {
	global $smarty;
	-
	+
	//Loads English file as fallback if some parameters are missing
	if (file_exists("lang/en/$file"))
	- $smarty->config_load("lang/en/$file", $sections);
	-
	+ $smarty->configLoad("lang/en/$file", $sections);
	+
	//Loads wanted file (if it exists and a language have been defined)
	if (defined('LANG') && LANG != 'en' && file_exists('lang/' . LANG . '/' . $file))
	- $smarty->config_load('lang/' . LANG . '/' . $file, $sections);
	+ $smarty->configLoad('lang/' . LANG . '/' . $file, $sections);
	}

	/**
	* Gets a specified language expression defined in configuration file
	*
	* @param string $key the configuration key matching the value to get
	* @return string The value in the configuration file
	*/
	function lang_get ($key) {
	global $smarty;

	$smartyConfValue = $smarty->config_vars[$key];
	return $smartyConfValue ? $smartyConfValue : "#$key#";
	}

	////////////////////////////////////////////////////////////////////////////////
	/// ///
	/// Zed date and time helper methods ///
	/// ///
	////////////////////////////////////////////////////////////////////////////////

	/**
	* Converts a YYYYMMDD or YYYY-MM-DD timestamp to unixtime
	* @link http://en.wikipedia.org/wiki/Unix_time Unix time
	*
	* @param string $timestamp the timestamp to convert
	* @return inteeger the unixtime
	*/
	function to_unixtime ($timestamp) {
	switch (strlen($timestamp)) {
	case 8:
	//YYYYMMDD
	return mktime(0, 0, 0, substr($timestamp, 4, 2), substr($timestamp, 6, 2), substr($timestamp, 0, 4));

	case 10:
	//YYYY-MM-DD
	return mktime(0, 0, 0, substr($timestamp, 5, 2), substr($timestamp, 8, 2), substr($timestamp, 0, 4));

	default:
	throw new Exception("timestamp is not a valid YYYYMMDD or YYYY-MM-DD timestamp: $timestamp");
	}
	}

	/**
	* Converts a unixtime to the YYYYMMDD or YYYY-MM-DD timestamp format
	* @see to_unixtime
	*
	* @param int $unixtime the time to convert
	* @param int $format 8 or 10. If 8 (default), will output YYYYMMDD. If 10, YYYY-MM-DD.
	* @return string the timestamp
	*/
	function to_timestamp ($unixtime = null, $format = 8) {
	//If no parameter is specified (or null, or false), current time is used
	//==== allows to_timestamp(0) to return correct 1970-1-1 value.
	if ($unixtime === null \|\| $unixtime === false) $unixtime = time();

	switch ($format) {
	case 8:
	//YYYYMMDD
	return date('Ymd', $unixtime);

	case 10:
	//YYYY-MM-DD
	return date('Y-m-d', $unixtime);

	default:
	throw new Exception("format must be 8 (YYYYMMDD) or 10 (YYYY-MM-DD) and not $format.");
	}
	}

	/**
	* Converts a unixtime to the Hypership time format or gets the current hypership time.
	* @link http://en.wikipedia.org/wiki/Unix_time
	* @link http://www.purl.org/NET/Zed/blog/HyperShipTime
	*
	* @param int $unixtime The unixtime to convert to HyperShip time. If omitted, the current unixtime.
	* @return string The HyperShip time
	*/
	function get_hypership_time ($unixtime = null) {
	//If unixtime is not specified, it's now
	if ($unixtime === null) $unixtime = time();

	//Hypership time is a count of days since launch @ 2010-07-03 00:00:00
	//Followed by a fraction of the current day /1000, like the internet time
	//but in UTC timezone and not Switzerland CET/CEST.
	//We don't need to use floor(), as we output the result at int, truncating
	//automatically decimal values instead of round it (like in C).
	$seconds = $unixtime - 1278115200;
	$days = $seconds / 86400;
	$fraction = (abs($seconds) % 86400) / 86.4;
	return sprintf("%d.%03d", $days, $fraction);
	}

	////////////////////////////////////////////////////////////////////////////////
	/// ///
	/// URL helpers functions ///
	/// ///
	////////////////////////////////////////////////////////////////////////////////

	/**
	* Gets the URL matching the specified resource.
	*
	* Example:
	* <code>
	* $url = get_url('ship', $ship);
	* echo $url; //if $ship contains S00001, this should print /ship/S00001
	* </code>
	*
	* @param string $resource,... the resources
	* @return string the URL matching the specified resource
	*/
	function get_url () {
	global $Config;
	if (func_num_args() > 0) {
	$pieces = func_get_args();
	return $Config['BaseURL'] . '/' . implode('/', $pieces);
	} elseif ($Config['BaseURL'] == "" \|\| $Config['BaseURL'] == $_SERVER["PHP_SELF"]) {
	return "/";
	} else {
	return $Config['BaseURL'];
	}
	}

	/**
	* Gets the current page URL
	*
	* @return string the current page URL
	*/
	function get_page_url () {
	$url = $_SERVER['SCRIPT_NAME'] . $_SERVER['PATH_INFO'];
	if (substr($url, -10) == $_SERVER["PHP_SELF"]) {
	return substr($url, 0, -9);
	}
	return $url;
	}

	/**
	* Gets the server URL
	* @todo find a way to detect https:// on non standard port
	*
	* @return string the server URL
	*/
	function get_server_url () {
	switch ($port = $_SERVER['SERVER_PORT']) {
	case '80':
	return "http://$_SERVER[SERVER_NAME]";

	case '443':
	return "https://$_SERVER[SERVER_NAME]";

	default:
	return "http://$_SERVER[SERVER_NAME]:$_SERVER[SERVER_PORT]";
	}
	}

	/**
	* Gets $_SERVER['PATH_INFO'] or computes the equivalent if not defined.
	*
	* This function allows the entry point controllers to get the current URL
	* in a consistent way, for any redirection configuration
	*
	* So with /foo/bar, /index.php/foo/bar, /zed/index.php/foo/bar or /zed/foo/bar
	* get_current_url will return /foo/bar
	*
	* @return string the relevant URL part
	*/
	function get_current_url () {
	global $Config;

	//Gets relevant URL part from relevant $_SERVER variables
	if (array_key_exists('PATH_INFO', $_SERVER)) {
	//Without mod_rewrite, and url like /index.php/controller
	//we use PATH_INFO. It's the easiest case.
	return $_SERVER["PATH_INFO"];
	}

	//In other cases, we'll need to get the relevant part of the URL
	$current_url = get_server_url() . $_SERVER['REQUEST_URI'];

	//Relevant URL part starts after the site URL
	$len = strlen($Config['SiteURL']);

	//We need to assert it's the correct site
	if (substr($current_url, 0, $len) != $Config['SiteURL']) {
	dieprint_r(GENERAL_ERROR, "Edit includes/config.php and specify the correct site URL<br /><strong>Current value:</strong> $Config[SiteURL]<br /><strong>Expected value:</strong> a string starting by " . get_server_url(), "Setup");
	}

	if (array_key_exists('REDIRECT_URL', $_SERVER)) {
	//With mod_rewrite, we can use REDIRECT_URL
	//We takes the end of the URL, ie FROM $len position
	return substr(get_server_url() . $_SERVER["REDIRECT_URL"], $len);
	}

	//Last possibility: use REQUEST_URI, but remove QUERY_STRING
	//If you need to edit here, use $_SERVER['REQUEST_URI']
	//but you need to discard $_SERVER['QUERY_STRING']

	//We takes the end of the URL, ie FROM $len position
	$url = substr(get_server_url() . $_SERVER["REQUEST_URI"], $len);

	//But if there are a query string (?action=... we need to discard it)
	if ($_SERVER['QUERY_STRING']) {
	return substr($url, 0, strlen($url) - strlen($_SERVER['QUERY_STRING']) - 1);
	}

	return $url;
	}

	/**
	* Gets an array of url fragments to be processed by controller
	* @see get_current_url
	*
	* This method is used by the controllers entry points to know the URL and
	* call relevant subcontrollers.
	*
	* @return Array an array of string, one for each URL fragment
	*/
	function get_current_url_fragments () {
	$url_source = get_current_url();
	if ($url_source == $_SERVER["PHP_SELF"]) return array();
	return explode('/', substr($url_source, 1));
	}

	////////////////////////////////////////////////////////////////////////////////
	/// ///
	/// URL xmlHttpRequest helpers functions ///
	/// ///
	////////////////////////////////////////////////////////////////////////////////

	/**
	* Gets an hash value to check the integrity of URLs in /do.php calls
	*
	* @param Array $args the args to compute the hash
	* @return the hash paramater for your xmlHttpRequest url
	*/
	function get_xhr_hash ($args) {
	global $Config;

	array_shift($args);
	return md5($_SESSION['ID'] . $Config['SecretKey'] . implode('', $args));
	}

	/**
	* Gets the URL to call do.php, the xmlHttpRequest controller
	*
	* @return string the xmlHttpRequest url, with an integrity hash
	*/
	function get_xhr_hashed_url () {
	global $Config;

	$args = func_get_args();
	$args[] = get_xhr_hash($args);
	return $Config['DoURL'] . '/' . implode('/', $args);
	}

	/**
	* Gets the URL to call do.php, the xmlHttpRequest controller
	*
	* @return string the xmlHttpRequest url
	*/
	function get_xhr_url () {
	global $Config;

	$args = func_get_args();
	return $Config['DoURL'] . '/' .implode('/', $args);
	}

	?>
	diff --git a/includes/error.php b/includes/error.php
	old mode 100644
	new mode 100755
	diff --git a/includes/geo/body.php b/includes/geo/body.php
	old mode 100644
	new mode 100755
	diff --git a/includes/geo/galaxy.php b/includes/geo/galaxy.php
	old mode 100644
	new mode 100755
	diff --git a/includes/geo/location.php b/includes/geo/location.php
	old mode 100644
	new mode 100755
	diff --git a/includes/geo/octocube.php b/includes/geo/octocube.php
	old mode 100644
	new mode 100755
	--- a/includes/geo/octocube.php
	+++ b/includes/geo/octocube.php
	@@ -1,143 +1,143 @@
	--<?php
	+<?php

	/**
	* Geo octocube class.
	*
	* Zed. The immensity of stars. The HyperShip. The people.
	*
	* (c) 2010, Dereckson, some rights reserved.
	* Released under BSD license.
	*
	* @package Zed
	* @subpackage Geo
	* @author Sébastien Santoro aka Dereckson <dereckson@espace-win.org>
	* @copyright 2010 Sébastien Santoro aka Dereckson
	* @license http://www.opensource.org/licenses/bsd-license.php BSD
	* @version 0.1
	* @link http://scherzo.dereckson.be/doc/zed
	* @link http://zed.dereckson.be/
	* @filesource
	*/

	/**
	* Geo octocube class
	*
	* An octocube is a cube divided in 8 parts (sliced in two in x, y and z)
	*
	* The coordinates (0, 0, 0) represents the octocube center.
	*/
	class GeoOctocube {
	/**
	* Gets the sector from the (x, y, z) specified coordinates
	*
	* Sector will be:
	* <code>
	* // _____ _____
	* // / 5 / 6 /\|
	* // /- - -/- - -/ \|
	* // /_____/____ /\| \|
	* // \| \| \| \|/\|
	* // \| 7 \| 8 \| / \| 2
	* // \|_____\|_____\|/\| \|
	* // \| \| \| \|/
	* // \| 3 \| 4 \| /
	* // \|_____\|_____\|/
	* </code>
	*
	* @param int $x the x coordinate
	* @param int $y the y coordinate
	* @param int $z the z coordinate
	* @return int the number of the sector (0 if x = y = z = 0 ; otherwise, 1 to 8)
	*/
	static function get_sector ($x, $y, $z) {
	//Cube center
	if ($x == 0 && $y == 0 && $z == 0) return 0;

	//One of the 8 cubes
	$sector = 1;
	if ($x >= 0) $sector++; //we're at right
	if ($y < 0) $sector += 2; //we're at bottom
	if ($z >= 0) $sector += 4; //we're on the top layer

	return $sector;
	}

	/**
	* Gets the sector from the (x, y, z) specified coordinates
	* @see get_sector
	*
	* @param mixed $pt a GeoPoint3D object for the x, y, z coordinates or a parsable string
	* @return int the number of the sector (0 if x = y = z 0 ; otherwise, 1 to 8)
	*/
	static function get_sector_from_point3D ($pt) {
	if (is_string($pt)) {
	$pt = GeoPoint3D::fromString($pt);
	}
	return self::get_sector($pt->x, $pt->y, $pt->z);
	}

	/**
	* Gets the base vector for the specified sector
	*
	* Example code:
	*
	* $vector = GeoOctocube::get_base_vector(4);
	* //$vector is a (1, -1, -1) array
	*
	* @param int $sector the sector number (0-8)
	* @return array if the sector is 0, (0, 0, 0) ; otherwise, an array with three signed 1 values.
	*/
	static function get_base_vector ($sector) {
	switch ($sector) {
	case 0: return array(0, 0, 0);
	case 1: return array(-1, 1, -1);
	case 2: return array(1, 1, -1);
	case 3: return array(-1, -1, -1);
	case 4: return array(1, -1, -1);
	case 5: return array(-1, 1, 1);
	case 6: return array(1, 1, 1);
	case 7: return array(-1, -1, 1);
	case 8: return array(1, -1, 1);
	default: message_die(GENERAL_ERROR, "Invalid sector: $sector", "GeoOctocube::get_base_vector");
	}
	}


	/**
	* Gets SQL RLIKE pattern for the specified sector
	*
	* @param int $sector the sector number (0-8)
	* @param int $z if not null, limits the query to the specified z coordinate [optional]
	* @return string a SQL clause like "([0-9]+, -[0,9]+, [0,9]+)"
	*/
	static function get_rlike_pattern_from_sector ($sector, $z = null) {
	if ($sector == 0) return "(0, 0, 0)";

	$vector = self::get_base_vector($sector);

	//x
	if ($vector[0] == 1)
	$query = "([0-9]+, ";
	else
	$query = "(-[0-9]+, ";

	//y
	if ($vector[1] == 1)
	$query .= "[0-9]+, ";
	else
	$query .= "-[0-9]+, ";

	//z
	if ($z !== null) {
	$query .= "$z)";
	} elseif ($vector[2] == "1") {
	$query .= "[0-9]+)";
	} else {
	$query .= "-[0-9]+)";
	}

	return $query;
	}
	}

	?>
	diff --git a/includes/geo/place.php b/includes/geo/place.php
	old mode 100644
	new mode 100755
	diff --git a/includes/geo/point3D.php b/includes/geo/point3D.php
	old mode 100644
	new mode 100755
	diff --git a/includes/geo/pointPolarZ.php b/includes/geo/pointPolarZ.php
	old mode 100644
	new mode 100755
	diff --git a/includes/geo/scene.php b/includes/geo/scene.php
	old mode 100644
	new mode 100755
	diff --git a/includes/geo/sceneindex.php b/includes/geo/sceneindex.php
	old mode 100644
	new mode 100755
	diff --git a/includes/login.php b/includes/login.php
	old mode 100644
	new mode 100755
	diff --git a/includes/mysql.php b/includes/mysql.php
	old mode 100644
	new mode 100755
	diff --git a/includes/objects/application.php b/includes/objects/application.php
	old mode 100644
	new mode 100755
	diff --git a/includes/objects/content.php b/includes/objects/content.php
	old mode 100644
	new mode 100755
	diff --git a/includes/objects/invite.php b/includes/objects/invite.php
	old mode 100644
	new mode 100755
	diff --git a/includes/objects/message.php b/includes/objects/message.php
	old mode 100644
	new mode 100755
	diff --git a/includes/objects/motd.php b/includes/objects/motd.php
	old mode 100644
	new mode 100755
	diff --git a/includes/objects/perso.php b/includes/objects/perso.php
	old mode 100644
	new mode 100755
	diff --git a/includes/objects/port.php b/includes/objects/port.php
	old mode 100644
	new mode 100755
	diff --git a/includes/objects/profile.php b/includes/objects/profile.php
	old mode 100644
	new mode 100755
	diff --git a/includes/objects/profilecomment.php b/includes/objects/profilecomment.php
	old mode 100644
	new mode 100755
	diff --git a/includes/objects/profilephoto.php b/includes/objects/profilephoto.php
	old mode 100644
	new mode 100755
	diff --git a/includes/objects/request.php b/includes/objects/request.php
	old mode 100644
	new mode 100755
	diff --git a/includes/objects/requestreply.php b/includes/objects/requestreply.php
	old mode 100644
	new mode 100755
	diff --git a/includes/objects/ship.php b/includes/objects/ship.php
	old mode 100644
	new mode 100755
	diff --git a/includes/objects/user.php b/includes/objects/user.php
	old mode 100644
	new mode 100755
	diff --git a/includes/sessions.php b/includes/sessions.php
	old mode 100644
	new mode 100755
	diff --git a/includes/settings/page.php b/includes/settings/page.php
	old mode 100644
	new mode 100755
	diff --git a/includes/settings/setting.php b/includes/settings/setting.php
	old mode 100644
	new mode 100755
	diff --git a/includes/settings/settings.php b/includes/settings/settings.php
	old mode 100644
	new mode 100755
	diff --git a/includes/story/choice.php b/includes/story/choice.php
	old mode 100644
	new mode 100755
	diff --git a/includes/story/hook.php b/includes/story/hook.php
	old mode 100644
	new mode 100755
	diff --git a/includes/story/hook_demo.php b/includes/story/hook_demo.php
	old mode 100644
	new mode 100755
	diff --git a/includes/story/hook_spatioport.php b/includes/story/hook_spatioport.php
	old mode 100644
	new mode 100755
	diff --git a/includes/story/section.php b/includes/story/section.php
	old mode 100644
	new mode 100755
	diff --git a/includes/story/story.php b/includes/story/story.php
	old mode 100644
	new mode 100755
	diff --git a/includes/travel/place.php b/includes/travel/place.php
	old mode 100644
	new mode 100755
	diff --git a/includes/travel/travel.php b/includes/travel/travel.php
	old mode 100644
	new mode 100755
	diff --git a/index.php b/index.php
	--- a/index.php
	+++ b/index.php
	@@ -1,231 +1,231 @@
	<?php

	/**
	* Application entry point
	*
	* Zed. The immensity of stars. The HyperShip. The people.
	*
	* (c) 2010, Dereckson, some rights reserved.
	* Released under BSD license.
	*
	* @package Zed
	* @subpackage EntryPoints
	* @author SÃ©bastien Santoro aka Dereckson <dereckson@espace-win.org>
	* @copyright 2010 SÃ©bastien Santoro aka Dereckson
	* @license http://www.opensource.org/licenses/bsd-license.php BSD
	* @version 0.1
	* @link http://scherzo.dereckson.be/doc/zed
	* @link http://zed.dereckson.be/
	* @filesource
	* @todo Consider to split the different tasks (especially
	* perso select/create into several files)
	*/

	////////////////////////////////////////////////////////////////////////////////
	///
	/// Initialization
	///

	//Keruald (formelly Pluton) library
	include('includes/core.php');

	//Session
	$IP = encode_ip($_SERVER["REMOTE_ADDR"]);
	require_once('includes/story/story.php'); //this class can be stored in session
	session_start();
	$_SESSION[ID] = session_id();
	session_update(); //updates or creates the session

	include("includes/login.php"); //login/logout
	$CurrentUser = get_logged_user(); //Gets current user infos

	//Gets current perso
	require_once('includes/objects/perso.php');
	if ($perso_id = $CurrentUser->session['perso_id']) {
	$CurrentPerso = new Perso($perso_id);
	}

	//Skin and accent to load
	define('THEME', $CurrentUser->session['Skin']);
	define('ACCENT', $CurrentUser->session['Skin_accent']);

	//Loads Smarty
	require('includes/Smarty/Smarty.class.php');
	$smarty = new Smarty();
	$current_dir = dirname(__FILE__);
	-$smarty->template_dir = $current_dir . '/skins/' . THEME;
	+$smarty->setTemplateDir($current_dir . '/skins/' . THEME);

	$smarty->compile_dir = CACHE_DIR . '/compiled';
	$smarty->cache_dir = CACHE_DIR;
	$smarty->config_dir = $current_dir;

	$smarty->config_vars['StaticContentURL'] = $Config['StaticContentURL'];

	//Loads language files
	initialize_lang();
	lang_load('core.conf');

	//Gets URL
	$url = get_current_url_fragments();

	//If the user isn't logged in (is anonymous), prints login/invite page & dies.
	if ($CurrentUser->id < 1000) {
	include('controllers/anonymous.php');
	exit;
	}

	////////////////////////////////////////////////////////////////////////////////
	///
	/// Perso selector
	///

	//Handles form
	if ($_POST['form'] == 'perso.create') {
	$perso = new Perso();
	$perso->load_from_form();
	$perso->user_id = $CurrentUser->id;

	//Validates forms
	if (!$perso->name) $errors[] = lang_get("NoFullnameSpecified");
	if (!$perso->race) {
	$errors[] = lang_get("NoRaceSpecified");
	$perso->race = "being";
	}
	if (!$perso->sex) $errors[] = lang_get("NoSexSpecified");
	if (!$perso->nickname) {
	$errors[] = lang_get("NoNicknameSpecified");
	} else if (!Perso::is_available_nickname($perso->nickname)) {
	$errors[] = lang_get("UnavailableNickname");
	}

	//Save or prints again forms
	if (!$errors) {
	//Saves perso, logs in
	$perso->save_to_database();
	$smarty->assign('NOTIFY', lang_get('NewCharacterCreated'));
	$CurrentPerso = $perso;
	set_info('perso_id', $perso->id);
	$CurrentPerso->set_flag("site.lastlogin", $_SERVER['REQUEST_TIME']);

	//Notifies inviter
	require_once('includes/objects/message.php');
	require_once('includes/objects/invite.php');
	$message = new Message();
	$message->from = 0;
	$message->to = invite::who_invited($perso->id);
	$message->text = sprintf(
	lang_get('InvitePersoCreated'),
	$perso->name,
	get_server_url() . get_url('who', $perso->nickname)
	);
	$message->send();
	} else {
	$smarty->assign('WAP', join("<br />", $errors));
	$smarty->assign('perso', $perso);
	}
	}

	if ($_GET['action'] == 'perso.logout' && $CurrentPerso != null) {
	//User wants to change perso
	$CurrentPerso->on_logout();
	$CurrentPerso = null;
	} elseif ($_GET['action'] == 'perso.select') {
	//User have selected a perso
	$CurrentPerso = new Perso($_GET['perso_id']);
	if ($CurrentPerso->user_id != $CurrentUser->id) {
	//Hack
	message_die(HACK_ERROR, "This isn't your perso.");
	}
	$CurrentPerso->on_select();
	}

	if (!$CurrentPerso) {
	switch ($count = Perso::get_persos_count($CurrentUser->id)) {
	case 0:
	//User have to create a perso
	$smarty->display("perso_create.tpl");
	exit;

	case 1:
	//Autoselects only perso
	$CurrentPerso = Perso::get_first_perso($CurrentUser->id);
	$CurrentPerso->on_select();
	break;

	default:
	//User have to pick a perso
	$persos = Perso::get_persos($CurrentUser->id);
	$smarty->assign("PERSOS", $persos);
	$smarty->display("perso_select.tpl");
	$_SESSION['UserWithSeveralPersos'] = true;
	exit;
	}
	}

	//Assigns current perso object as Smarty variable
	$smarty->assign('CurrentPerso', $CurrentPerso);

	////////////////////////////////////////////////////////////////////////////////
	///
	/// Tasks to execute before calling the URL controller:
	/// - assert the perso is somewhere
	/// - executes the smartline
	///

	//If the perso location is unknown, ejects it to an asteroid
	if (!$CurrentPerso->location_global) {
	require_once('includes/geo/place.php');
	$smarty->assign('NOTIFY', lang_get('NewLocationNotify'));
	$CurrentPerso->move_to(GeoPlace::get_start_location());
	}

	//SmartLine
	include("includes/SmartLine/ZedSmartLine.php");

	//Redirects user to user request controller if site.requests flag on
	if (defined('PersoSelected') && array_key_exists('site.requests', $CurrentPerso->flags) && $CurrentPerso->flags['site.requests']) {
	include('controllers/persorequest.php');
	}

	////////////////////////////////////////////////////////////////////////////////
	///
	/// Calls the specific controller to serve the requested page
	///

	switch ($controller = $url[0]) {
	case '':
	include('controllers/home.php');
	break;

	case 'builder':
	case 'explore':
	case 'page':
	case 'request':
	case 'settings':
	case 'ship':
	include("controllers/$controller.php");
	break;

	case 'who':
	include('controllers/profile.php'); //AzhÃ r controller
	break;

	case 'push':
	include('controllers/motd.php'); //AzhÃ r controller
	break;

	case 'quux':
	//It's like a test/debug console/sandbox, you put what you want into
	if (file_exists('dev/quux.php')) {
	include('dev/quux.php');
	} else {
	message_die(GENERAL_ERROR, "Quux lost in Hollywood.", "Nay");
	}
	break;

	default:
	//TODO: returns a 404 error
	dieprint_r($url, 'Unknown URL');
	}

	?>
	diff --git a/lang/en/footer.conf b/lang/en/footer.conf
	--- a/lang/en/footer.conf
	+++ b/lang/en/footer.conf
	@@ -1,11 +1,10 @@
	#Zed language config file - Footer
	#Language: English
	#Code: en
	#Author: Dereckson

	###
	### SmartLine
	###

	-[SmartLine]
	SmartLineHistory = SmartLine History
	\ No newline at end of file
	diff --git a/lang/en/settings.conf b/lang/en/settings.conf
	--- a/lang/en/settings.conf
	+++ b/lang/en/settings.conf
	@@ -1,41 +1,47 @@
	#Zed language config file - Settings
	#Language: English
	#Code: en
	#Author: Dereckson

	###
	### Generalities
	###
	Settings = Settings
	-SaveSettings = "Save settings"
	+SaveSettings = Save settings

	###
	### Account information
	###
	-[account]
	-Account = "Account information"
	-Username = "Login"
	-Email = "Mail"
	-PasswordConfirm = "one more time"
	+
	+Account = Account information
	+Username = Login
	+Email = Mail
	+PasswordConfirm = one more time

	###
	### Perso information
	###
	-[perso]
	+
	Information = "Your information"
	Name = Name
	Nickname = "Username (lowercase)"
	Race = Species
	Sex = Sex
	male = male
	female = female
	neutral = "neutral or asexual"
	both = "hermaphrodite"

	###
	### SmartLine
	###
	-[smartline]
	+
	SmartLine = SmartLine
	SmartlineShow = "Shows the SmartLine at the bottom of the screen"
	-SmartlineMethod = "Sends a HTTP POST request instead a HTTP GET submitting SmartLine form"
	\ No newline at end of file
	+SmartlineMethod = "Sends a HTTP POST request instead a HTTP GET submitting SmartLine form"
	+
	+###
	+### Other settings
	+###
	+
	+EditProfile = Edit my text
	\ No newline at end of file
	diff --git a/lang/en/tutorials.conf b/lang/en/tutorials.conf
	--- a/lang/en/tutorials.conf
	+++ b/lang/en/tutorials.conf
	@@ -1,17 +1,17 @@
	#Zed language config file - Tutorials
	#Language: English
	#Code: en
	#Author: Dereckson

	###
	### Tutorial I - reach the hypership
	###

	[ReachHypership]
	JoinHypership = Join the hypership
	WhereYouAre = You're on %1$s, a desolate %2$s in the galaxy.
	WhereTheHypershipIs = After some investigation, you learn the hypership is in a far galaxy spiral.
	-HowToJoinIt = "To reach it, you can: <ul><li>hitchhike, if there are other people around going to the hypership.</li>
	- <li>try to <a href=/request/B00001/aid.reach>contact the hypership and ask a shuttle</a></li>
	- <li><a href=/explore>explore the place</a> and find a ship to hire</li>
	-</ul>"
	\ No newline at end of file
	+HowToJoinIt = """<p>To reach it, you can:</p><ul><li>hitchhike, if there are other people around going to the hypership.</li>
	+ <li>try to <a href=\"request/B00001/aid.reach\">contact the hypership and ask a shuttle</a></li>
	+ <li><a href=\"/explore\">explore the place</a> and find a ship to hire</li>
	+</ul>"""
	diff --git a/lang/fr/footer.conf b/lang/fr/footer.conf
	--- a/lang/fr/footer.conf
	+++ b/lang/fr/footer.conf
	@@ -1,11 +1,10 @@
	#Zed language config file - Footer
	#Language: English
	#Code: fr
	#Author: Dereckson

	###
	### SmartLine
	###

	-[SmartLine]
	SmartLineHistory = Historique SmartLine
	\ No newline at end of file
	diff --git a/lang/fr/settings.conf b/lang/fr/settings.conf
	--- a/lang/fr/settings.conf
	+++ b/lang/fr/settings.conf
	@@ -1,48 +1,55 @@
	#Zed language config file - Settings
	#Language: English
	#Code: fr
	#Author: Dereckson

	###
	### Generalities
	###
	+
	Settings = PrÃ©fÃ©rences
	SaveSettings = "Enregistrer les prÃ©fÃ©rences"

	###
	### Extra pages not handled by Settings classes
	###

	EditProfile = "Texte"

	###
	### Account information
	###
	-[account]
	+
	Account = "ParamÃ¨tres de votre compte"
	Username = "Login"
	Email = "E-mail"
	Password = "Mot de passe"
	PasswordConfirm = "(rÃ©pÃ©tez)"

	###
	### Perso information
	###
	-[perso]
	+
	Information = "Vos infos"
	Name = Votre nom
	Nickname = "Username en minuscule"
	Race = Race
	Sex = Genre
	male = masculin
	female = fÃ©minin
	neutral = "neutre ou asexuÃ©"
	both = "hermaphrodite"

	###
	### SmartLine
	###
	-[smartline]
	+
	SmartLine = SmartLine
	SmartlineShow = "Afficher la SmartLine. Elle se positionnera en bas de l'Ã©cran."
	-SmartlineMethod = "Utilisez une requÃªte HTTP POST en lieu et place d'une requÃªte HTTP GET.<br />Cela renforce la sÃ©curitÃ©, au dÃ©triment de la facilitÃ© de navigation par l'historique."
	\ No newline at end of file
	+SmartlineMethod = "Utilisez une requÃªte HTTP POST en lieu et place d'une requÃªte HTTP GET.<br />Cela renforce la sÃ©curitÃ©, au dÃ©triment de la facilitÃ© de navigation par l'historique."
	+
	+###
	+### Other settings
	+###
	+
	+EditProfile = Edit my text
	diff --git a/lang/fr/tutorials.conf b/lang/fr/tutorials.conf
	--- a/lang/fr/tutorials.conf
	+++ b/lang/fr/tutorials.conf
	@@ -1,17 +1,17 @@
	#Zed language config file - Tutorials
	#Language: French
	#Code: fr
	#Author: Dereckson

	###
	### Tutorial I - reach the hypership
	###

	[ReachHypership]
	JoinHypership = "Rejoindre l'HyperShip"
	WhereYouAre = "Vous Ãªtes sur %1$s, apparemment un %2$s, un endroit perdu et dÃ©solÃ© dans la galaxie."
	WhereTheHypershipIs = "AprÃ¨s quelques recherches, vous apprenez que l'HyperShip serait dans une spirale relativement Ã©loignÃ©e."
	-HowToJoinIt = "Pour l'atteindre, plusieurs options s'offrent Ã vous : <ul><li>faire du vaisseau-stop, s'il y a autour de vous d'autres Ãªtres voulant rejoindre l'HyperShip.</li>
	- <li>essayer de <a href=/request/B00001/aid.reach>contacter l'HyperShip et demander une navette</a></li>
	- <li><a href=/explore>explorer l'endroit oÃ¹ vous Ãªtes</a> et tenter d'y trouver un vaisseau</li>
	-</ul>"
	\ No newline at end of file
	+HowToJoinIt = """Pour l'atteindre, plusieurs options s'offrent Ã vous : <ul><li>faire du vaisseau-stop, s'il y a autour de vous d'autres Ãªtres voulant rejoindre l'HyperShip.</li>
	+ <li>essayer de <a href=\"/request/B00001/aid.reach\">contacter l'HyperShip et demander une navette</a></li>
	+ <li><a href=\"/explore\">explorer l'endroit oÃ¹ vous Ãªtes</a> et tenter d'y trouver un vaisseau</li>
	+</ul>"""
	diff --git a/skins/zed/error.tpl b/skins/zed/error.tpl
	--- a/skins/zed/error.tpl
	+++ b/skins/zed/error.tpl
	@@ -1,60 +1,60 @@
	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
	<html xmlns="http://www.w3.org/1999/xhtml">
	<head>
	<title>{#SiteTitle#}</title>
	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
	<link rel="stylesheet" type="text/css" href="{#StaticContentURL#}/css/960.css" media="screen" />
	<link rel="stylesheet" href="{#StaticContentURL#}/css/zed/theme.css" />
	</head>
	<body>
	<!-- Header -->
	<div id="header">
	<div id="header_content">
	<div class="container_16">
	<div class="grid_9">
	<div id="HypershipTime">{get_hypership_time()}</div>
	</div>
	<div class="grid_7">
	- <a href="{get_url()}"><img src="{#StaticContentURL#}/img/zed/logo.png" src="Zed logo" border=0 /></a>
	+ <a href="{get_url()}"><img src="{#StaticContentURL#}/img/zed/logo.png" src="Zed logo" border="0" /></a>
	</div>
	</div>
	</div>
	</div>
	<div class="clear"></div>
	<div class="container_16">
	{if $WAP}

	<!-- WAP -->
	<div class="grid_16 alpha omega">
	<div class="wap">{$WAP}</div>
	</div>
	{/if}
	{if $NOTIFY}

	<!-- Notify -->
	<div class="grid_16 alpha omega">
	<div class="notify">{$NOTIFY}</div>
	</div>
	{/if}

	<!-- Error -->
	<div class="content_wrapper">
	<h1>{$TITLE}</h1>
	<div class="content">
	<p>{$ERROR_TEXT}</p>
	<p><a href="{get_url()}">{#BackToHome#}</a></p>
	</div>
	</div>
	<div class="clear"></div>
	<hr />
	<div id="footer">
	<div class="grid_12 alpha">
	<p>[ {#Product#} / {#FatalErrorScreen#} ]</p>
	</div>
	<div class="grid_4 omega">
	<p style="text-align: right">[ <a href="{get_url()}?action=user.logout">{#Logout#}</a> ]</p>
	</div>
	</div>
	</div>
	</body>
	</html>
	\ No newline at end of file
	diff --git a/skins/zed/header.tpl b/skins/zed/header.tpl
	--- a/skins/zed/header.tpl
	+++ b/skins/zed/header.tpl
	@@ -1,69 +1,69 @@
	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
	<html xmlns="http://www.w3.org/1999/xhtml">
	<head>
	<title>{$PAGE_TITLE} - {#SiteTitle#}</title>
	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
	<link rel="stylesheet" type="text/css" href="{#StaticContentURL#}/css/960.css" media="screen" />
	<link rel="stylesheet" href="{#StaticContentURL#}/css/zed/theme.css" />
	<script type="text/javascript" src="{#StaticContentURL#}/js/misc.js"></script>
	{foreach from=$PAGE_CSS item=css}
	<link rel="stylesheet" href="{#StaticContentURL#}/css/{$css}" />
	{/foreach}
	{foreach from=$PAGE_JS item=js}
	<script src="{#StaticContentURL#}/js/{$js}"></script>
	{/foreach}
	{if $DOJO}

	<!-- DOJO -->
	<script type="text/javascript" src="{#StaticContentURL#}/js/dojo/dojo/dojo.js" djConfig="isDebug:false, parseOnLoad: true" ></script>
	{if $DIJIT}
	- <link rel="stylesheet" type="text/css" href="{#StaticContentURL#}/css/zed/forms.css">
	+ <link rel="stylesheet" type="text/css" href="{#StaticContentURL#}/css/zed/forms.css" />
	{/if}
	{/if}
	</head>
	<body{if $DIJIT} class="tundra"{/if}>
	<!-- Header -->
	<div id="header">
	<div id="header_content">
	<div class="container_16">
	<div class="grid_9">
	<div class="wall" id="header_wall">
	{$WALL_TEXT}
	<br />
	<span class="wall_info">- - <a href="{$WALL_USER_URL}">{$WALL_USER}</a></span>
	</div>
	<div class="clear"></div>
	<div id="HypershipTime">{get_hypership_time()}</div>
	</div>
	<div class="grid_7">
	- <a href="{get_url()}"><img src="{#StaticContentURL#}/img/zed/logo.png" src="Zed logo" border=0 /></a>
	+ <a href="{get_url()}"><img src="{#StaticContentURL#}/img/zed/logo.png" alt="Zed logo" border="0" /></a>
	</div>
	<div class="clear"></div>
	</div>
	</div>
	</div>
	<div class="clear"></div>

	<!-- Content -->
	<div class="container_16">
	{if $WAP}

	<!-- WAP -->
	<div class="grid_16 alpha omega">
	<div class="wap">{$WAP}</div>
	</div>
	<div class="clear"></div>
	{/if}
	{if $NOTIFY}

	<!-- Notify -->
	<div class="grid_16 alpha omega">
	<div class="notify">{$NOTIFY}</div>
	</div>
	<div class="clear"></div>
	{/if}

	{if $SmartLine_STDOUT \|\| $SmartLine_STDERR}
	{include file="smartline_results.tpl"}
	{/if}

	diff --git a/skins/zed/login.tpl b/skins/zed/login.tpl
	--- a/skins/zed/login.tpl
	+++ b/skins/zed/login.tpl
	@@ -1,78 +1,78 @@
	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
	<html xmlns="http://www.w3.org/1999/xhtml">
	<head>
	<title>{#SiteTitle#}</title>
	<link rel="Stylesheet" href="{#StaticContentURL#}/css/zed/login.css" type="text/css" />
	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
	- <script src="js/login.js"></script>
	- <script src="js/misc.js"></script>
	- <script src="js/prototype.js"></script>
	- <script src="js/effects.js"></script>
	+ <script type="text/javascript" src="js/login.js"></script>
	+ <script type="text/javascript" src="js/misc.js"></script>
	+ <script type="text/javascript" src="js/prototype.js"></script>
	+ <script type="text/javascript" src="js/effects.js"></script>
	</head>
	<body>

	<!-- Login form -->
	<div id="LoginBox">
	<form method="post" action="{get_url()}">
	<div class="row">
	<label for="username">{#Login#}{#_t#}</label>
	<input type="text" id="username" name="username" value="{$username}" />
	</div>
	<div class="row">
	<label for="password">{#Password#}{#_t#}</label>
	<input type="password" id="password" name="password" />
	</div>
	<div class="row">
	<label for="openid">{#OpenID#}{#_t#}</label>
	<input type="text" id="openid" name="openid" value="{$OpenID}" />
	</div>
	<div class="row">
	- <input type="submit" id="submit" name="LogIn" value="{#OK#}" onClick="return OnLoginSubmit(this);" />
	+ <input type="submit" id="submit" name="LogIn" value="{#OK#}" onclick="return OnLoginSubmit(this);" />
	</div>
	</form>
	{if $LoginError}
	<!-- Ooops, something wrong -->
	<div class=row>
	<p id="error" class="error">    {$LoginError}</p>
	</div>
	{/if}
	</div>

	<!-- Links -->
	<div id="link_tour"><a href="/tour.html"></a></div>
	<div id="link_blog"><a href="/blog"></a></div>

	{$code = generate_random_string('AAA111')}
	<!--

	XXXXXXX XX
	X X X
	X X Invitation code:
	X XXXXX XXXXX {$code}
	X X X X X
	X XXXXXXX X X
	X X X X
	X X X X X X
	XXXXXXX XXXXX XXXXXX

	Welcome to the Zed beta. We're happy you're reading the source :)

	If you want to know what we're building, check http://zed.dereckson.be/tour.html

	If you wish an access, send a mail to zedinvite (alt+64) dereckson.be
	and specify the following code: {$code}

	* * * *

	Bienvenue dans la version bÃªta de Zed. Heureux que vous consultiez la source.

	Un petit aperÃ§u de ce que l'on crÃ©e est sur http://zed.dereckson.be/tour.html

	Pour obtenir un accÃ¨s, envoyez un mail Ã zedinvite (alt+64) dereckson.be
	en spÃ©cifiant le code suivant : {$code}
	-->
	-<script>
	+<script type="text/javascript">
	slide.initialize('LoginBox');
	</script>
	</body>
	</html>
	\ No newline at end of file
	diff --git a/skins/zed/perso_header.tpl b/skins/zed/perso_header.tpl
	--- a/skins/zed/perso_header.tpl
	+++ b/skins/zed/perso_header.tpl
	@@ -1,56 +1,56 @@
	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
	<html xmlns="http://www.w3.org/1999/xhtml">
	<head>
	<title>{#SiteTitle#}</title>
	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
	<link rel="stylesheet" type="text/css" href="{#StaticContentURL#}/css/960.css" media="screen" />
	<link rel="stylesheet" href="{#StaticContentURL#}/css/zed/theme.css" />

	<!-- Calls dojo -->
	<script src="/{#StaticContentURL#}js/dojo/dojo/dojo.js" type="text/javascript"
	djConfig="isDebug: false, parseOnLoad: true"></script>
	<link rel="stylesheet" href="{#StaticContentURL#}/css/zed/forms.css" />
	<script type="text/javascript">
	dojo.require("dijit.form.Form");

	dojo.require("dijit.form.ValidationTextBox");
	dojo.require("dijit.form.TextBox");
	dojo.require("dijit.form.FilteringSelect");
	dojo.require("dijit.form.Button");

	dojo.require("dojox.validate.regexp");
	dojo.require("dojox.form.PasswordValidator");

	dojo.require("dojo.parser");
	</script>
	</head>
	<body class="tundra">
	<!-- Header -->
	<div id="header">
	<div id="header_content">
	<div class="container_16">
	<div class="grid_4 alpha omega suffix_8">
	- <a href="{get_url()}"><img src="{#StaticContentURL#}/img/zed/logo.png" src="Zed logo" border=0 /></a>
	+ <a href="{get_url()}"><img src="{#StaticContentURL#}/img/zed/logo.png" src="Zed logo" border="0" /></a>
	</div>
	<div class="clear"></div>
	</div>
	</div>
	</div>
	<div class="clear"></div>

	<!-- Content -->
	<div class="container_16">
	{if $WAP}

	<!-- WAP -->
	<div class="grid_16 alpha omega">
	<div class="wap">{$WAP}</div>
	</div>
	{/if}
	{if $NOTIFY}

	<!-- Notify -->
	<div class="grid_16 alpha omega">
	<div class="notify">{$NOTIFY}</div>
	</div>
	{/if}
	diff --git a/skins/zed/profile_photo.tpl b/skins/zed/profile_photo.tpl
	--- a/skins/zed/profile_photo.tpl
	+++ b/skins/zed/profile_photo.tpl
	@@ -1,50 +1,50 @@
	ï»¿ <!-- Add a photo -->
	<div class="grid_11 alpha profile">
	<div class="profile_id clearfix">
	<h1 class="profile_nick" id="UserLongname">{$USERNAME}</h1>
	</div>
	<div class="profile_separator"></div>
	<div class="profile_text">
	<h2>{#AddPhotoToProfile#}</h2>
	<form name="PhotoUpload" method="post" enctype="multipart/form-data">
	<p>{#AddPhotoExplanations#}</p>
	- <p><label>Photo{#_t#}</label> <INPUT type="file" name="photo" /></p>
	- <p><label>{#ShortDescription#}{#_t#}</label> <input type="text" maxlength="63" size="32" name="description"></p>
	- <p><INPUT type="checkbox" name="SafeForWork" id="SafeForWork" value="0" /> <label for="SafeForWork">{#SafeForWorkLabel#}</label></p>
	+ <p><label>Photo{#_t#}</label> <input type="file" name="photo" /></p>
	+ <p><label>{#ShortDescription#}{#_t#}</label> <input type="text" maxlength="63" size="32" name="description" /></p>
	+ <p><input type="checkbox" name="SafeForWork" id="SafeForWork" value="0" /> <label for="SafeForWork">{#SafeForWorkLabel#}</label></p>
	<p><input type="submit" value="{#Upload#}" /></p>
	</form>
	</div>
	</div>

	<div class="grid_5 omega">
	<div class="sidebar_border"></div>
	<div id="sidebar" style="min-height: inherit;">
	<div class="border_top"></div>
	<div class="sidebar_content">
	<h2>{#EditMyPage#}</h2>
	<ul>
	<li><a href="{get_url('who')}/edit/profile">{#EditProfile#}</a></li>
	<li><a href="{get_url('settings','perso')}">{#EditAccount#}</a></li>
	- <li>{if $PICS}{#ManagePhotos#}{else}{#AddPhoto#}{/if}</a></li>
	+ <li>{if $PICS}{#ManagePhotos#}{else}{#AddPhoto#}{/if}</li>
	</ul>
	</div>
	<div class="border_bottom"></div>
	</div>
	</div>

	{if $PICS}
	<!-- Manage current photos -->
	<div class="grid_16 alpha omega profile_comments">
	<h2>{#ManageCurrentPhotos#}</h2>
	<div class="photos">
	{foreach from=$PICS item=photo}
	<div class="photo" style="float: left">
	<a rel="lightbox" href="{$URL_PICS}/{$photo->name}" title="{$photo->description}"><img src="{$URL_PICS}/tn/{$photo->name}" alt="{$photo->description}" /></a>
	<br />
	<a href="{get_url('who')}/edit/photos/edit/{$photo->id}" title="{#EditPictureProperties#}"><img src="/skins/VacuumCleanerBridge/images/open.gif" alt="{#PictureProperties#}"></a>
	<a href="{get_url('who')}/edit/photos/delete/{$photo->id}" title="{#DeleteThisPicture#}"><img src="/skins/VacuumCleanerBridge/images/del.gif" alt="{#Delete#}"></a>
	</div>
	{/foreach}
	</div>
	{/if}
	</div>
	\ No newline at end of file
	diff --git a/skins/zed/smartline.tpl b/skins/zed/smartline.tpl
	--- a/skins/zed/smartline.tpl
	+++ b/skins/zed/smartline.tpl
	@@ -1,26 +1,26 @@

	<!-- SmartLine -->
	<div class="grid_16 alpha omega" id="SmartLine">
	<form name="SmartLine" method="{if $SmartLineFormMethod}{$SmartLineFormMethod}{else}post{/if}" action="{get_current_url()}">
	{if $SmartLineHistory}
	<!-- SmartLine history -->
	<div class="grid_4 left alpha">
	- <select id="SmartLineHistory" class="black" onChange=UpdateSmartLine()>
	+ <select id="SmartLineHistory" class="black" onchange="UpdateSmartLine()">
	<option value="">[ {#SmartLineHistory#} ]</option>
	{foreach from=$SmartLineHistory item=command}
	<option value="{$command.text\|escape}">{$command.time} \| {$command.text\|escape}</option>
	{/foreach}
	</select>
	</div>
	<!-- SmartLine line -->
	<div class="grid_12 right omega">
	{else}
	<!-- SmartLine line -->
	<div class="grid_16 alpha omega left" style="width: 100.2%">
	{/if}
	- <input name="C" type="text" id="SmartLineBar" maxlength=255 class="black" style="text-align: left;">
	+ <input name="C" type="text" id="SmartLineBar" maxlength="255" class="black" style="text-align: left;" />
	</div>
	</form>
	</div>

	<div class="clear"></div>
	diff --git a/skins/zed/tutorial/hypership_reach.tpl b/skins/zed/tutorial/hypership_reach.tpl
	--- a/skins/zed/tutorial/hypership_reach.tpl
	+++ b/skins/zed/tutorial/hypership_reach.tpl
	@@ -1,29 +1,29 @@

	<!-- Floating panes -->
	<script type="text/javascript" src="{#StaticContentURL#}/js/dojo/dojox/layout/FloatingPane.js"></script>
	<link rel="stylesheet" type="text/css" href="{#StaticContentURL#}/js/dojo/dojox/layout/resources/FloatingPane.css" />
	<link rel="stylesheet" type="text/css" href="{#StaticContentURL#}/js/dojo/dojox/layout/resources/ResizeHandle.css" />

	<!-- Dock -->
	<style type="text/css">
	@import "{#StaticContentURL#}/js/dojo/dijit/themes/dijit.css";
	</style>


	<!-- Help to reach the hypership -->
	<div dojoType="dojox.layout.FloatingPane" title="{#JoinHypership#}" resizable="true" id="floaterHypershipReach" class="floatingPaneTutorial" duration="300">
	{if $CurrentPerso->location_global[0] == "S"}
	<p>Congratulations! You found a ship.</p>
	<p>You're aboard the {$CurrentPerso->location->ship->name}.</p>
	{if $controller == "ship"}
	<p>In the future, you will able to explore the ship, but this is not yet implemented yet in this alpha preview.</p>
	{if $note == ""}
	<p>Your notes is the only information generally available about ships. For reference, you should note something like "Took the {$CurrentPerso->location->ship->name} at {get_hypership_time()} from ... to the hypership."</p>
	{/if}
	{/if}
	{else}
	<p>{sprintf(#WhereYouAre#, $CurrentPerso->where(), lang_get($CurrentPerso->location->body_kind))}</p>
	<p>{#WhereTheHypershipIs#}</p>
	- <p>{#HowToJoinIt#}</p>
	+ {#HowToJoinIt#}
	{/if}
	</div>
	diff --git a/skins/zed/user_account.tpl b/skins/zed/user_account.tpl
	--- a/skins/zed/user_account.tpl
	+++ b/skins/zed/user_account.tpl
	@@ -1,88 +1,88 @@
	<!-- Calls dojo -->
	<script src="/js/dojo/dojo/dojo.js" type="text/javascript"
	djConfig="isDebug: false, parseOnLoad: true"></script>
	<script type="text/javascript">
	dojo.require("dijit.form.Form");
	dojo.require("dijit.form.ValidationTextBox");
	dojo.require("dijit.form.CheckBox");
	dojo.require("dijit.form.Button");

	function updateMail (mail) {
	document.getElementById('UserEmail').innerHTML =
	'<a href="mailto:' + mail + '">' + mail + '</a>';
	}
	</script>

	<!-- Edit user account form -->
	<div class="grid_11 alpha profile">
	<div class="profile_id clearfix">
	<h1 class="profile_nick" id="UserLongname">{$user->longname}</h1>
	<div class="profile_info">
	<br />
	<img src="/skins/VacuumCleanerBridge/images/mail.png" title="{#Mail#}" alt="{#MailAlt#}" align="top" />        <span id="UserEmail">{mailto address=$user->email}</span>
	</div>
	</div>
	<div class="profile_separator"></div>
	<div class="profile_text">
	<br />
	<form dojoType="dijit.form.Form" name="UserAccount" method="POST">
	<input type="hidden" name="UserAccount" value="1" />
	<div class="row">
	<span class="firstLabel">{#Login#}</span>
	{$user->username}
	</div>
	<div class="row">
	<label class="firstLabel" for="longname">{#LongName#}</label>
	<input type="text" id="longname" name="longname" class="long"
	value="{$user->longname}"
	dojoType="dijit.form.ValidationTextBox"
	required="false"
	- onChange="document.getElementById('UserLongname').innerHTML = document.getElementById('longname').value;";
	+ onchange="document.getElementById('UserLongname').innerHTML = document.getElementById('longname').value;";
	/>
	</div>
	<div class="row">
	<label class="firstLabel" for="realname">{#RealName#}</label>
	<input type="text" id="realname" name="realname" class="long"
	value="{$user->realname}"
	dojoType="dijit.form.ValidationTextBox"
	required="false"
	/>
	<span class="dojotooltip" dojoType="dijit.Tooltip" connectId="realname">{#RealNameToolTip#}</span>
	</div>
	<div class="row">
	<label class="firstLabel" for="email">{#Mail#}</label>
	<input type="text" id="email" name="email" class="long"
	value="{$user->email}"
	dojoType="dijit.form.ValidationTextBox"
	required="false"
	- onChange="javascript:updateMail(arguments[0]);"
	+ onchange="javascript:updateMail(arguments[0]);"
	/>
	</div>
	<div class="row">
	<button dojoType="dijit.form.Button" iconClass="dijitEditorIcon dijitEditorIconSave" type="submit" onclick="document.forms[0].submit()">
	{#UpdateAccountInfo#}
	</button>
	<noscript>
	<input type="submit" value="{#UpdateAccountInfo#} {#JavaScriptSafeMessage#}" />
	</noscript>
	</div>
	</form>
	</div>
	</div>

	<!-- Faerie content -->
	<div class="grid_5 omega">
	<div class="sidebar_border"></div>
	<div id="sidebar">
	<div class="border_top"></div>
	<div class="sidebar_content">
	<h2>{#EditMyPage#}</h2>
	<ul>
	<li><a href="{get_url('who')}/edit/profile">{#EditProfile#}</a></li>
	<li>{#EditAccount#}</li>
	<li><a href="{get_url('who')}/edit/photos">{if $PICS}{#ManagePhotos#}{else}{#AddPhoto#}{/if}</a></li>
	</ul>
	</div>
	<div class="border_bottom"></div>
	</div>
	</div>
	\ No newline at end of file
	diff --git a/tour.html b/tour.html
	--- a/tour.html
	+++ b/tour.html
	@@ -1,46 +1,44 @@
	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
	<html xmlns="http://www.w3.org/1999/xhtml">
	<head>
	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
	<title>Enter</title>
	<link rel="stylesheet" type="text/css" href="css/grid.css" media="screen" />
	- <script src="js/jquery-1.3.2.min.js"></script>
	- <script src="js/dimensions.js"></script>
	- <script src="js/tour.js"></script>
	- <script>
	-
	- </script>
	- <style>
	+ <script type="text/javascript" src="js/jquery-1.3.2.min.js"></script>
	+ <script type="text/javascript" src="js/dimensions.js"></script>
	+ <script type="text/javascript" src="js/tour.js"></script>
	+ <style type="text/css">
	body {
	background-color: #343434;
	+ overflow: hidden;
	}

	H1 {
	font-family: Helvetica, Arial;
	}

	#Tour {
	background-image: url(img/tour/bg.jpg);
	height: 748px;
	width: 748px;
	margin: auto auto auto auto;
	z-index: 20;
	}

	#TourHighlight {
	position: relative;
	z-index: 50;
	}
	</style>
	</head>
	<body>
	<div class="container_16">
	<div class="grid_16">
	<div id="Tour">
	<div id="TourHighlight"></div>
	</div>
	</div>
	<div class="clear"></div>
	</div>
	</body>
	</html>
	\ No newline at end of file

File Metadata

Mime Type: text/x-diff
Expires: Sat, Nov 23, 12:18 (1 d, 2 h ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 21004
Default Alt Text: (83 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions