No OneTemporary
Actions

Size

32 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/header.php b/controllers/header.php
	--- a/controllers/header.php
	+++ b/controllers/header.php
	@@ -1,28 +1,28 @@
	<?php

	/*
	* Zed
	* (c) 2010, Dereckson, some rights reserved
	* Released under BSD license
	*
	* Header
	*/

	//
	// Graffiti wall
	//
	//TODO: this is a potentially very intensive SQL query
	$sql = 'SELECT p.perso_nickname as username, m.motd_text FROM ' . TABLE_PERSOS . ' p, ' . TABLE_MOTD . ' m WHERE p.perso_id = m.perso_id ORDER BY rand() LIMIT 1';
	if (!$result = $db->sql_query($sql)) message_die(SQL_ERROR, "Can't query MOTD", '', __LINE__, __FILE__, $sql);
	$row = $db->sql_fetchrow($result);
	$smarty->assign('WALL_TEXT', $row['motd_text']);
	$smarty->assign('WALL_USER', $row['username']);
	$smarty->assign('WALL_USER_URL', get_url('user', $row['username']));

	//
	// HTML output
	//

	$smarty->display('header.tpl');
	-
	+define('HEADER_PRINTED', true);
	?>
	\ No newline at end of file
	diff --git a/css/zed/theme.css b/css/zed/theme.css
	--- a/css/zed/theme.css
	+++ b/css/zed/theme.css
	@@ -1,204 +1,259 @@
	@charset "utf-8";

	/* -------------------------------------------------------------
	Zed
	- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	Author: Dereckson
	Tags: space retro futurist
	Filename: forms.css
	Version: 1.0
	Created: 2010-01-27
	Updated: 2010-01-27
	Licence: Creative Commons BY 3.0
	------------------------------------------------------------- */

	/* -------------------------------------------------------------
	Page settings
	- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */

	body {
	margin: 28px 0 0 0;

	background-color: #343434;
	background-image: url("/img/zed/topborder.png");
	background-position: top;
	background-repeat: repeat-x;

	font-family: "Calibri", "Lucida Sans Unicode", "Trebuchet MS", "Helvetica", "Arial", sans-serif;
	font-size: 80%;
	}


	label, p, table, pre {
	color: white
	}

	pre {
	font-family: FixedSys, monospace;
	}

	/* -------------------------------------------------------------
	Links
	- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */

	a {
	color: #1AC8E8;
	text-decoration: none;
	}

	a:visited {
	color: gray;
	}

	a:hover {
	color: red;
	text-decoration: none;
	}

	/* -------------------------------------------------------------
	Notify messages
	- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */

	.notify {
	padding-top: 25px;
	padding-bottom: 25px;

	margin-bottom: 10px;

	text-align: center;
	background: #eeeeee;
	font-size: 1.5em;

	border: 5px solid #1AC8E8;
	width: 950px;

	}

	.wap {
	padding-top: 50px;
	padding-bottom: 50px;

	margin-bottom: 10px;

	border: 5px solid indianred;
	text-align: center;
	background: #eeeeee;
	font-size: 2em;
	width: 950px;
	}

	/* -------------------------------------------------------------
	Wall
	- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */

	.wall {
	text-align: left;
	float: right;
	}

	.wall_info {
	display: block;
	text-align: right;
	}

	/* -------------------------------------------------------------
	Messages
	- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */

	.message {
	margin-bottom: 17px;
	padding: 8px 9px 8px 9px;
	width: 940px;
	}

	.message.light {
	background-color: #fafafa;
	- border: 1px solid #dedede;
	+ border: 3px solid #dedede;
	+ width: 938px;
	}

	.message.light a {color: #343434;}

	.message.dark {
	background-color: #acc0c3;
	border: solid 3px #4e5758;
	width: 938px;

	}
	.message.dark a {color: #154c4c;}

	.message a:hover {
	font-weight: 900;
	}

	.message_info {
	text-align: right;
	+ margin-bottom: 1em;
	}

	.message_text {
	font-size: 1.25em;
	}

	.message_info {
	color: #343434;
	}

	/* -------------------------------------------------------------
	Color boxes
	- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */

	.plum {
	background-color: plum;
	border: 1px solid #800080;
	color: black;
	}
	.plum a { color: #800080; }

	.green {
	background-color: beige;
	border: 1px solid darkgreen;
	color: black;
	}
	.green a { color: darkgreen; }

	.skyblue {
	background-color: lightskyblue;
	border: 1px solid #6e47fe;
	}
	.skyblue a { color:navy }

	.indigo {
	background-color: #AE97E1;
	border: 1px solid #C97FFF;

	}
	.indigo a {color: #800080;}

	.yellow {
	background-color: #FFFFCC;
	border: 1px solid #C4B963;

	}
	.yellow a {color: navy;}

	.orange {
	background-color: #FDD9AC;
	border: 1px solid #eaaf67;
	}
	.orange a {color: #43392e;}

	.red {
	background-color: #FFE4E1;
	border: solid 1px #DC7777;

	}
	.red a {color: #993333;}

	+.black {
	+ background-color: black;
	+ color: #ccc;
	+ border: solid 2px #555;
	+}
	+
	.plum a:hover,
	.green a:hover,
	.skyblue a:hover,
	.indigo a:hover,
	.yellow a:hover,
	.orange a:hover,
	.red a:hover{
	font-weight: bold;
	+}
	+
	+/* -------------------------------------------------------------
	+ SmartLine
	+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
	+
	+#SmartLine {
	+ width: 100%;
	+}
	+
	+#SmartLine .left {
	+ background-color: green;
	+}
	+
	+#SmartLine .right {
	+ float: right;
	+ text-align: right;
	+ background-color: yellow;
	+}
	+
	+/* TODO: ajouter un sélecteur de SmarLine pour chat/commandes (60px) */
	+/* grid_1 alpha -> sélecteur, grid_3 -> history, grid_12 > bar */
	+
	+#SmartLineHistory {
	+ width: 115%; /* dépasse de sa bordure */
	+}
	+
	+#SmartLineBar{
	+ /* 99.6% for alignment with .message.light */
	+ width: 99.6%;
	+}
	+
	+#SmartLineResults {
	+ font-family: "Fixedsys Excelsior 3.01", FixedSys, Terminal;
	+ font-size: 12pt;
	+}
	+
	+#SmartLineResults .highlight {
	+ color: #16c3cc;
	+}
	+
	+#SmartLineResults .error {
	+ color: red;
	+}
	+
	+#SmartLineResults p {
	+ padding-left: 1em;
	}
	\ No newline at end of file
	diff --git a/includes/config.php b/includes/config.php
	--- a/includes/config.php
	+++ b/includes/config.php
	@@ -1,49 +1,50 @@
	<?php

	/*
	* Zed
	* (c) 2010, Dereckson, some rights reserved
	* Released under BSD license
	*
	* Autogenerable configuration file
	*/

	//SQL configuration
	$Config['sql']['product'] = 'MySQL';
	$Config['sql']['host'] = 'localhost';
	$Config['sql']['username'] = 'zed';
	$Config['sql']['password'] = 'zed';
	$Config['sql']['database'] = 'zed';

	//GRANT ALL PRIVILEGES on zed.* TO 'zed'@'localhost' IDENTIFIED by 'zed';

	//SQL tables
	$prefix = '';
	define('TABLE_BODIES', $prefix . 'geo_bodies');
	define('TABLE_COMMENTS', $prefix . 'comments');
	+define('TABLE_LOG_SMARTLINE', $prefix . 'log_smartline');
	define('TABLE_MESSAGES', $prefix . 'messages');
	define('TABLE_MOTD', $prefix . 'motd');
	define('TABLE_PERSOS', $prefix . 'persos');
	define('TABLE_PLACES', $prefix . 'geo_places');
	define('TABLE_PROFILES', $prefix . 'profiles');
	define('TABLE_PROFILES_COMMENTS', $prefix . 'profiles_comments');
	define('TABLE_PROFILES_PHOTOS', $prefix . 'profiles_photos');
	define('TABLE_SESSIONS', $prefix . 'sessions');
	define('TABLE_USERS', $prefix . 'users');
	define('TABLE_USERS_OPENID', $prefix . 'users_openid');

	//Script URL
	$Config['BaseURL'] = '/index.php';

	//Default theme
	$Config['DefaultTheme'] = "Zed";

	//Dates
	date_default_timezone_set("UTC");

	//Sessions
	//If you want to use a common table of sessions / user handling
	//with several websites, specify a different resource id for each site.
	$Config['ResourceID'] = 21;

	?>
	\ No newline at end of file
	diff --git a/includes/error.php b/includes/error.php
	--- a/includes/error.php
	+++ b/includes/error.php
	@@ -1,163 +1,164 @@
	<?php
	// Gestionnaire d'erreur
	//
	// SQL_ERROR : Erreur de requÃªtes SQL
	// HACK_ERROR : Appel d'une page oÃ¹ l'utilisateur n'a pas accÃ¨s

	//Constantes
	define ("SQL_ERROR", 65);
	define ("HACK_ERROR", 99);
	define ("GENERAL_ERROR", 117);

	function dieprint_r ($var, $title = '') {
	if (!$title) $title = 'Debug';
	message_die(GENERAL_ERROR, '<pre>' . print_r($var, true) .'</pre>', $title);
	}

	function message_die ($msg_code, $msg_text = '', $msg_title = '', $err_line = '', $err_file = '', $sql = '') {
	global $smarty, $db;
	if ($smarty) {
	$debug_text = $msg_text;

	if ($err_line && $err_file)
	$debug_text .= ' — ' . $err_file. ', ' . lang_get('line') . ' ' . $err_line ;

	switch ($msg_code) {
	case HACK_ERROR:
	$smarty->assign('TITLE', lang_get('UnauthorizedAccess'));
	break;

	case SQL_ERROR:
	$smarty->assign('TITLE', lang_get('SQLError'));
	$sql_error = $db->sql_error();
	if ($sql_error['message'] != '') {
	$debug_text .= '<br />' . lang_get('Error') . ' nÂ° ' . $sql_error['code'] . lang_get('_t') .
	' ' .$sql_error['message'];
	}
	$debug_text .= "</p><h2>Query:</h2><p>$sql";
	break;

	default:
	$smarty->assign('WAP', "Message code error.<br />Expected: HACK_ERROR, SQL_ERROR, GENERAL_ERROR");
	//Falls to GENERAL_ERROR

	case GENERAL_ERROR:
	if ($msg_title)
	$smarty->assign('TITLE', $msg_title);
	else
	$smarty->assign('TITLE', lang_get('GeneralError'));
	break;
	}


	$smarty->assign('ERROR_TEXT', $debug_text);
	- $smarty->display("error.tpl");
	+ $template = defined(HEADER_PRINTED) && HEADER_PRINTED ? "error_block.tpl" : "error.tpl";
	+ $smarty->display($template);
	exit;
	} else {
	old_message_die($msg_code, $msg_text, $msg_title, $err_line, $err_file, $sql);
	}
	}

	function old_message_die($msg_code, $msg_text = '', $msg_title = '', $err_line = '', $err_file = '', $sql = '')
	{
	global $db, $Utilisateur;
	$sql_store = $sql;

	if ($msg_code == HACK_ERROR && $Utilisateur[user_id] < 1000) {
	global $LoginResult;
	foreach ($_POST as $name => $value) {
	$champs .= "<input type=hidden name=$name value=\"$value\" />";
	}
	$titre = "Qui Ãªtes-vous ?";
	$debug_text = "Vous devez Ãªtre authentifiÃ© pour accÃ©der Ã cette page.";
	$debug_text .= "
	<FORM method='post'>
	$champs
	<table border='0'>
	<tr>
	<td><STRONG>Login</STRONG></td>
	<td><input name='Login' type='text' id='Login' value='$_POST[Login]' size='10' /></td>
	<td><STRONG>Mot de passe</STRONG></td>
	<td>
	<input name='MotDePasse' type='password' id='MotDePasse' size='10' />
	<input type='submit' name='LoginBox' value='Connexion' />
	</td>
	</tr>
	<tr>
	<td align=center COLSPAN=4><a href='/?Topic=My&Article=Enregistrer'>Je désire ouvrir un compte</a></td>
	</tr>
	</TABLE><span class=error>$LoginResult</span>
	</FORM>
	";
	} elseif ($msg_code == HACK_ERROR) {
	$titre = "AccÃ¨s non autorisÃ©";
	$debug_text = $msg_text;
	} elseif ($msg_code == SQL_ERROR) {
	$titre = "Erreur dans la requÃªte SQL";
	$sql_error = $db->sql_error();
	$debug_text = $msg_text;
	if ( $err_line != '' && $err_file != '') $debug_text .= ' dans ' . $err_file. ', ligne ' . $err_line ;
	if ( $sql_error['message'] != '' ) $debug_text .= '<br />Erreur nÂ° ' . $sql_error['code'] . ' : ' . $sql_error['message'];
	if ( $sql_store != '' ) $debug_text .= "<br /><strong>$sql_store</strong>";
	} elseif ($msg_code == GENERAL_ERROR) {
	$titre = $msg_title;
	$debug_text = $msg_text;
	if ($err_line && $err_file) {
	$debug_text .= "<BR />$err_file, ligne $err_line";
	}
	}

	echo "
	<TABLE height='100%' cellSpacing=0 cellPadding=0 width='100%' border=0>
	<TBODY>
	<TR>
	<TD vAlign=top align=middle>
	<TABLE cellSpacing=0 cellPadding=0 border=0>
	<TBODY>
	<TR>
	<TD vAlign=top rowSpan=5><IMG height=177 alt=''
	src='/_pict/error/notfound.jpg' width=163 border=0></TD>
	<TD colSpan=4><IMG height=2 alt='' src='/_pict/error/mrblue.gif'
	width=500 border=0></TD>
	<TD><IMG height=2 alt='' src='/_pict/error/undercover.gif' width=1
	border=0></TD></TR>
	<TR>
	<TD vAlign=bottom rowSpan=4 bgcolor='#FFFFFF'><IMG height=43 alt=''
	src='/_pict/error/ecke.gif' width=14 border=0></TD>
	<TD vAlign=center align=middle rowSpan=2 bgcolor='#FFFFFF'>
	<TABLE cellSpacing=1 cellPadding=0 width=470 border=0>
	<TBODY>
	<TR>
	<TD><FONT face='Verdana, Helvetica, sans-serif' color=red
	size=4><B>$titre</B></FONT><BR>
	<IMG height=5 alt=''
	src='/_pict/error/undercover.gif' width=14 border=0><BR></TD></TR>
	<TR>
	<TD><FONT face='Verdana, Helvetica, sans-serif' color=black
	size=2>$debug_text</FONT></TD></TR></TBODY></TABLE></TD>
	<TD align=right width=2 rowSpan=2 bgcolor='#FFFFFF'><IMG height=146 alt=''
	src='/_pict/error/mrblue.gif' width=2 border=0></TD>
	<TD bgcolor='#FFFFFF'><IMG height=132 alt='' src='/_pict/error/undercover.gif' width=1
	border=0></TD>
	</TR>
	<TR>
	<TD><IMG height=14 alt='' src='/_pict/error/undercover.gif' width=1
	border=0></TD></TR>
	<TR>
	<TD colSpan=2><IMG height=2 alt='' src='/_pict/error/mrblue.gif'
	width=486 border=0></TD>
	<TD><IMG height=2 alt='' src='/_pict/error/undercover.gif' width=1
	border=0></TD></TR>
	<TR>
	<TD colSpan=2><IMG height=27 alt='' src='/_pict/error/undercover.gif'
	width=486 border=0></TD>
	<TD><IMG height=27 alt='' src='/_pict/error/undercover.gif' width=1
	border=0></TD></TR></TBODY></TABLE>
	<P> </P>
	</TD></TR></TBODY></TABLE>
	";

	exit;
	}

	?>
	\ No newline at end of file
	diff --git a/index.php b/index.php
	--- a/index.php
	+++ b/index.php
	@@ -1,143 +1,160 @@
	<?php

	/*
	* Zed
	* (c) 2010, Dereckson, some rights reserved
	* Released under BSD license
	*
	* Application entry point
	*/

	+////////////////////////////////////////////////////////////////////////////////
	+///
	+/// Initialization
	+///
	+
	//Pluton library
	include('includes/core.php');

	//Session
	$IP = encode_ip($_SERVER["REMOTE_ADDR"]);
	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->compile_dir = $current_dir . '/cache/compiled';
	$smarty->cache_dir = $current_dir . '/cache';
	$smarty->config_dir = $current_dir;

	//Loads language files
	define('LANG', 'fr');
	lang_load('core.conf');

	if ($CurrentUser->id < 1000) {
	//Anonymous user, proceed to login
	$smarty->assign('LoginError', $LoginError);
	$smarty->display('login.tpl');
	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) {
	$perso->save_to_database();
	$smarty->assign('NOTIFY', lang_get('NewCharacterCreated'));
	$CurrentPerso = $perso;
	set_info('perso_id', $perso->id);
	} else {
	$smarty->assign('WAP', join("<br />", $errors));
	$smarty->assign('perso', $perso);
	}
	}

	if (!$CurrentPerso) {
	if ($_GET['action'] == 'perso.select') {
	//Users have selected a perso
	$CurrentPerso = new Perso($_GET['perso_id']);
	set_info('perso_id', $CurrentPerso->id);
	if ($CurrentPerso->user_id != $CurrentUser->id) {
	//Hack
	message_die(HACK_ERROR, "This isn't your perso.");
	}
	}

	switch ($count = Perso::get_persos_count($CurrentUser->id)) {
	case 0:
	//Create a perso
	$smarty->display("perso_create.tpl");
	exit;

	case 1:
	//Autoselect
	$CurrentPerso = Perso::get_first_perso($CurrentUser->id);
	set_info('perso_id', $CurrentPerso->id);
	break;

	default:
	//Pick a perso
	$smarty->display("perso_select.tpl");
	exit;
	}
	}

	-////////////////////////////////////////////////////////////////////////////////
	-
	-//Assigns current user and perso objects as Smarty variables
	-$smarty->assign('CurrentUser', $CurrentUser);
	+//Assigns current perso object as Smarty variable
	$smarty->assign('CurrentPerso', $CurrentPerso);

	-//If the perso location is unknown, eject it to an asteroid
	+////////////////////////////////////////////////////////////////////////////////
	+///
	+/// 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/objects/place.php');
	$smarty->assign('NOTIFY', lang_get('NewLocationNotify'));
	$CurrentPerso->location_global = GeoPlace::get_start_location();
	$CurrentPerso->save_field('location_global');
	}

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

	-//Calls the specific controller to serve the requested page
	+////////////////////////////////////////////////////////////////////////////////
	+///
	+/// Calls the specific controller to serve the requested page
	+///
	+
	$url = explode('/', substr($_SERVER['PATH_INFO'], 1));

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

	default:
	//TODO: returns a 404 error
	dieprint_r($url, 'Unknown URL');
	}
	?>
	\ No newline at end of file
	diff --git a/js/misc.js b/js/misc.js
	--- a/js/misc.js
	+++ b/js/misc.js
	@@ -1,100 +1,107 @@
	+/* SmartLine */
	+
	+function UpdateSmartLine() {
	+ document.forms.SmartLine.C.value = document.forms.SmartLine.SmartLineHistory.value;
	+ document.forms.SmartLine.C.focus();
	+}
	+
	/* Dumps a variable */

	function dump(arr,level) {
	var dumped_text = "";
	if(!level) level = 0;

	//The padding given at the beginning of the line.
	var level_padding = "";
	for(var j=0;j<level+1;j++) level_padding += " ";

	if(typeof(arr) == 'object') { //Array/Hashes/Objects
	for(var item in arr) {
	var value = arr[item];

	if(typeof(value) == 'object') { //If it is an array,
	dumped_text += level_padding + "'" + item + "' ...\n";
	//dumped_text += dump(value,level+1);
	} else {
	dumped_text += level_padding + "'" + item + "' => \"" + value + "\"\n";
	}
	}
	} else { //Stings/Chars/Numbers etc.
	dumped_text = "===>"+arr+"<===("+typeof(arr)+")";
	}
	return dumped_text;
	}

	/* A code for an hidden function */

	var ar2215 = {
	input: "",
	pattern: "38384040373937396665",
	clear: setTimeout('ar2215.clear_input()', 2000),
	- load: function (link) {
	+ load: function () {
	window.document.onkeydown = function (e) {
	ar2215.input += e ? e.keyCode : event.keyCode;
	if (ar2215.input == ar2215.pattern) {
	- ar2215.code(link);
	+ ar2215.code("/index.php/push");
	clearTimeout(ar2215.clear);
	return;
	}
	clearTimeout(ar2215.clear);
	ar2215.clear = setTimeout("ar2215.clear_input()", 2000);
	}
	- this.iphone.load(link)
	+ this.iphone.load("/index.php/push");
	},
	code: function (link) {
	window.location = link;
	},
	clear_input: function () {
	ar2215.input = "";
	clearTimeout(ar2215.clear);
	},
	iphone:{
	start_x: 0,
	start_y: 0,
	stop_x: 0,
	stop_y: 0,
	tap: false,
	capture: false,
	keys: ["UP","UP","DOWN","DOWN","LEFT","RIGHT","LEFT","RIGHT","TAP","TAP"],
	code: function (link) { window.location = link },
	load: function (link) {
	document.ontouchmove = function (e) {
	if (e.touches.length == 1 && ar2215.iphone.capture == true) {
	var touch = e.touches[0];
	ar2215.iphone.stop_x = touch.pageX;
	ar2215.iphone.stop_y = touch.pageY;
	ar2215.iphone.tap = false;
	ar2215.iphone.capture = false;
	ar2215.iphone.check_direction();
	}
	}
	document.ontouchend = function (evt) {
	if (ar2215.iphone.tap == true)
	ar2215.iphone.check_direction();
	}
	document.ontouchstart = function(evt) {
	ar2215.iphone.start_x = evt.changedTouches[0].pageX;
	ar2215.iphone.start_y = evt.changedTouches[0].pageY;
	ar2215.iphone.tap = true;
	ar2215.iphone.capture = true;
	}
	},
	check_direction: function () {
	x_magnitude = Math.abs(this.start_x - this.stop_x);
	y_magnitude = Math.abs(this.start_y - this.stop_y);
	x = ((this.start_x - this.stop_x) < 0) ? "RIGHT": "LEFT";
	y = ((this.start_y - this.stop_y) < 0) ? "DOWN" : "UP";
	result = (x_magnitude > y_magnitude) ? x : y;
	result = (this.tap == true) ? "TAP" : result;
	if (result == this.keys[0])
	this.keys = this.keys.slice(1, this.keys.length);
	if (this.keys.length == 0)
	this.code(this.link)
	}
	}
	}

	-ar2215.load("http://photos.folleterre.org");
	\ No newline at end of file
	+ar2215.load();
	\ No newline at end of file
	diff --git a/lang/en/core.conf b/lang/en/core.conf
	--- a/lang/en/core.conf
	+++ b/lang/en/core.conf
	@@ -1,92 +1,93 @@
	#Zed language config file
	#Language: English
	#Code: fr
	#Author: Dereckson

	###
	### General stuff
	###

	SiteTitle = Zed
	Product = "<strong>Zed 0.1</strong>, alpha technical preview"

	###
	### General stuff
	###

	_t = ":"

	###
	### Login
	###

	Login = Login
	Password = Password
	OK = OK

	LoginNotFound = Login not found.
	IncorrectPassword = Incorrect password.

	JaMata = Ja mata!
	WelcomeBack = Welcome back.

	OpenID = OpenID

	Logout = Logout

	###
	### Errors
	###

	UnauthorizedAccess = "Unauthorized access"
	SQLError = "SQL Error"
	line = line
	Error = Error
	BackToHome = "Back to homepage"
	FatalErrorScreen = Fatal error screen
	+FatalErrorInterrupt = Fatal error breaking screen
	GeneralError = General error

	###
	### Homepage
	###

	Welcome = Welcome

	###
	### Homepage - messages
	###

	#messages.tpl, Reply
	Reply = Reply

	#messages.tpl, the X link title
	DeleteThisMessage = Delete this message

	#home.php, messages error
	MessageDeleted = Message deleted.
	NotYourMessage = This message is not one of yours.
	MessageAlreadyDeleted = Message already deleted.

	###
	### Perso create/select
	###

	NewCharacterCreated = New character created
	CreateCharacter = Create a character
	EditCharacter = Edit %s information

	NoSexSpecified = "Pick a sex, or '<em>Neutral</em>' if you don't want to tell it."
	NoNicknameSpecified = "You must pick a nickname, it's like your login to identify your character."
	NoFullnameSpecified = "All beings must have a name."
	NoRaceSpecified = "You've to specify a race: '<em>humanoid</em>' for human and co.<br />If you don't want to specify a race, use the generic '<em>being</em>'."
	NicknameUnavailable = "This nickname is already used.<br />Choose a more original one."

	NewLocationNotify = "You're slowly awaking in a place you don't recognize."

	###
	### Places
	###

	UnknownBody = "Unknown asteroid"
	UnknownPlace = "Unknown place"
	WherePlace = "%s @ %s"
	\ No newline at end of file
	diff --git a/lang/fr/core.conf b/lang/fr/core.conf
	--- a/lang/fr/core.conf
	+++ b/lang/fr/core.conf
	@@ -1,89 +1,91 @@
	#Zed language config file
	#Language: English
	#Code: fr
	#Author: Dereckson

	###
	### Site configuration
	###

	SiteTitle = Zed
	Product = "<strong>Zed 0.1</strong>, alpha technical preview"

	###
	### General stuff
	###

	_t = " :"

	###
	### Login
	###

	Login = Login
	Password = Password
	OK = OK

	LoginNotFound = Login introuvable.
	IncorrectPassword = Mot de passe incorrect.

	JaMata = Ja mata!
	WelcomeBack = Welcome back.

	OpenID = OpenID

	Logout = DÃ©connexion

	###
	### Homepage
	###

	Welcome = Bienvenue

	###
	### Homepage - Messages
	###

	#messages.tpl, Reply
	Reply = RÃ©pondre

	#messages.tpl, the X link title
	DeleteThisMessage = Effacer ce message

	#home.php, messages error
	MessageDeleted = Message effacÃ©.
	NotYourMessage = Hey, ce message appartient Ã autrui !
	MessageAlreadyDeleted = Message dÃ©jÃ effacÃ©

	###
	### Errors
	###

	UnauthorizedAccess = "AccÃ¨s non autorisÃ©"
	SQLError = "Erreur dans la requÃªte SQL"
	line = ligne
	Error = Erreur
	BackToHome = "Retour Ã la page d'accueil"
	+FatalErrorScreen = Fatal error screen
	+FatalErrorInterrupt = Fatal error screen (interruption)
	GeneralError = "Erreur"

	###
	### Perso create/select
	###

	NewCharacterCreated = Nouveau perso crÃ©Ã©.
	CreateCharacter = Nouveau perso
	EditCharacter = Ãditer les infos de %s

	NoSexSpecified = "Pick a sex, or '<em>Neutral</em>' if you don't want to tell it."
	NoNicknameSpecified = "You must pick a nickname, it's like your login to identify your character."
	NoFullnameSpecified = "All beings must have a name."
	NoRaceSpecified = "You've to specify a race: '<em>humanoid</em>' for human and co.<br />If you don't want to specify a race, use the generic '<em>being</em>'."
	NicknameUnavailable = "This nickname is already used.<br />Choose a more original one."

	###
	### Places
	###

	UnknownBody = "AstÃ©roÃ¯de inconnu"
	UnknownPlace = "Endroit inconnu"
	WherePlace = "%2$s, %1$s."
	\ No newline at end of file
	diff --git a/skins/zed/debug.tpl b/skins/zed/debug.tpl
	deleted file mode 100644
	--- a/skins/zed/debug.tpl
	+++ /dev/null
	@@ -1,136 +0,0 @@
	-{capture 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 - Total Time {$execution_time\|string_format:"%.5f"}</h1>
	-
	-<h2>included templates & 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>
	-
	-<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">
	-{literal} if ( self.name == '' ) {
	- var title = 'Console';
	- }
	- else {
	- var title = 'Console_' + self.name;
	- }{/literal}
	- _smarty_console = window.open("",title.value,"width=680,height=600,resizable,scrollbars=yes");
	- _smarty_console.document.write("{$debug_output\|escape:'javascript'}");
	- _smarty_console.document.close();
	-</script>
	diff --git a/skins/zed/footer.tpl b/skins/zed/footer.tpl
	--- a/skins/zed/footer.tpl
	+++ b/skins/zed/footer.tpl
	@@ -1,11 +1,12 @@
	<div class="clear"></div>
	+{include file="smartline.tpl"}
	<hr />
	<div class="grid_12 alpha">
	<p>[ {#Product#} / {$CurrentPerso->location_global} / {if $screen}{$screen}{else}Untitled screen{/if} ]</p>
	</div>
	<div class="grid_4 omega" style="float: right">
	<p style="text-align: right">[ <a href="/?action=user.logout">{#Logout#}</a> ]</p>
	</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,34 +1,38 @@
	<!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="/css/960.css" media="screen" />
	<link rel="stylesheet" href="/css/zed/theme.css" />
	+ <script src="/js/misc.js"></script>
	</head>
	<body>
	<div class="container_16">
	<!-- Header -->
	<div class="grid_16">
	<div class="wall">
	<p>
	{$WALL_TEXT}
	<br /><span class="wall_info">-- <a href="{$WALL_USER_URL}">{$WALL_USER}</a></span>
	</p>
	</div>
	</div>
	<div class="clear"></div>
	{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}
	+{if $SmartLine_STDOUT \|\| $SmartLine_STDERR}
	+{include file="smartline_results.tpl"}
	{/if}
	\ No newline at end of file

File Metadata

Mime Type: text/x-diff
Expires: Sun, Jul 27, 10:14 (38 m, 21 s ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 21003
Default Alt Text: (32 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions