No OneTemporary
Actions

Size

22 KB

Subscribers

None

View Options

	diff --git a/includes/config.php b/includes/config.php
	index dbf36b8..74337f1 100644
	--- a/includes/config.php
	+++ b/includes/config.php
	@@ -1,128 +1,135 @@
	<?php

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

	////////////////////////////////////////////////////////////////////////////////
	/// ///
	/// I. SQL configuration ///
	/// ///
	////////////////////////////////////////////////////////////////////////////////

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

	//SQL tables
	$prefix = '';
	define('TABLE_API_KEYS', $prefix . 'api_keys');
	define('TABLE_COMMENTS', $prefix . 'comments');
	define('TABLE_LOG_SMARTLINE', $prefix . 'log_smartline');
	define('TABLE_MESSAGES', $prefix . 'messages');
	define('TABLE_MOTD', $prefix . 'motd');
	define('TABLE_PAGES', $prefix . 'pages');
	define('TABLE_PAGES_EDITS', $prefix . 'pages_edits');
	define('TABLE_PERSOS', $prefix . 'persos');
	define('TABLE_PERSOS_FLAGS', $prefix . 'persos_flags');
	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');

	//Geo tables
	define('TABLE_BODIES', $prefix . 'geo_bodies');
	define('TABLE_LOCATIONS', $prefix . 'geo_locations'); //Well... it's view
	define('TABLE_PLACES', $prefix . 'geo_places');

	////////////////////////////////////////////////////////////////////////////////
	/// ///
	/// II. Site configuration ///
	/// ///
	////////////////////////////////////////////////////////////////////////////////

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

	//Dates
	date_default_timezone_set("UTC");

	////////////////////////////////////////////////////////////////////////////////
	/// ///
	/// III. Script URLs ///
	/// ///
	////////////////////////////////////////////////////////////////////////////////

	/*
	* Without mod_rewrite:
	*
	* Subdirectory:
	* - $Config['SiteURL'] = 'http://zed.dereckson.be/hypership/index.php';
	* - $Config['BaseURL'] = '/hypership/index.php';
	*
	* Root directory:
	* - $Config['SiteURL'] = 'http://zed.dereckson.be/index.php';
	* - $Config['BaseURL'] = '/index.php';
	*
	* With mod_rewrite:
	*
	* Subdirectory:
	* - $Config['SiteURL'] = 'http://zed.dereckson.be/hypership';
	* - $Config['BaseURL'] = '/hypership';
	*
	* In .htaccess or your vhost definition:
	* RewriteEngine On
	* RewriteBase /hypership/
	* RewriteCond %{REQUEST_FILENAME} !-f
	* RewriteCond %{REQUEST_FILENAME} !-d
	* RewriteRule . /hypership/index.php [L]
	*
	* Root directory:
	* - $Config['SiteURL'] = 'http://zed.dereckson.be';
	* - $Config['BaseURL'] = '';
	*
	+ * In .htaccess or your vhost definition:
	+ * RewriteEngine On
	+ * RewriteBase /
	+ * RewriteCond %{REQUEST_FILENAME} !-f
	+ * RewriteCond %{REQUEST_FILENAME} !-d
	+ * RewriteRule . /index.php [L]
	+ *
	*
	* If you don't want to specify the server domain, you can use get_server_url:
	* $Config['SiteURL'] = get_server_url() . '/hypership';
	* $Config['SiteURL'] = get_server_url();
	*
	* $Config['StaticContentURL'] is used to serve js, css, img and content
	* directories. To improve site performance, you can use a CDN for that.
	*
	* !!! No trailing slash !!!
	*
	*/

	$Config['SiteURL'] = get_server_url();
	$Config['BaseURL'] = '';

	$Config['StaticContentURL'] = $Config['SiteURL'];
	define('SCENE_URL', "$Config[StaticContentURL]/content/scenes");

	////////////////////////////////////////////////////////////////////////////////
	/// ///
	/// IV. Sessions ///
	/// ///
	////////////////////////////////////////////////////////////////////////////////

	//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;

	//PHP variables
	ini_set('session.serialize_handler', 'wddx');
	ini_set('session.save_path', 'cache/sessions');
	ini_set('session.gc_maxlifetime', 345600); //4 days, for week-end story pause and continue url

	?>
	\ No newline at end of file
	diff --git a/includes/core.php b/includes/core.php
	index 0ddabfb..195679c 100644
	--- a/includes/core.php
	+++ b/includes/core.php
	@@ -1,320 +1,366 @@
	<?php
	+
	+/*
	+ * Zed
	+ * (c) 2010, Dereckson, some rights reserved
	+ * Released under BSD license
	+ *
	+ * Core
	+ */
	+
	+////////////////////////////////////////////////////////////////////////////////
	+/// ///
	+/// Configures PHP and loads site-wide used libraries ///
	+/// ///
	+////////////////////////////////////////////////////////////////////////////////
	+
	//No register globals
	ini_set('register_globals', 'off');
	-//error_reporting(E_ALL & ~E_NOTICE);
	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

	-//Helpers
	+////////////////////////////////////////////////////////////////////////////////
	+/// ///
	+/// Information helper methods ///
	+/// ///
	+////////////////////////////////////////////////////////////////////////////////

	//Gets username from specified user_id
	function get_name ($id) {
	global $db;
	$sql = 'SELECT perso_nickname FROM '. TABLE_PERSOS . " WHERE perso_id = '$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 user_id from specified username
	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'];
	}

	-// ------------------------------------------------------------------------- //
	-// Chaîne aléatoire //
	-// ------------------------------------------------------------------------- //
	-// Auteur: Pierre Habart //
	-// Email: p.habart@ifrance.com //
	-// Web: //
	-// ------------------------------------------------------------------------- //
	+////////////////////////////////////////////////////////////////////////////////
	+/// ///
	+/// Misc helper methods ///
	+/// ///
	+////////////////////////////////////////////////////////////////////////////////

	-function genereString($format)
	-{
	+/*
	+ * Generates a random string
	+ * @author Pierre Habart <p.habart@ifrance.com>
	+ *
	+ * @param string $format The format e.g. AAA111
	+ * @return string a random string
	+ */
	+function genereString ($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 (ereg("^[a-zA-Z]",$format[$i]))
	{
	$add=$t_alphabet[mt_rand() % sizeof($t_alphabet)];
	if (ereg("^[a-z]",$format[$i]))
	$add=strtolower($add);
	}
	elseif(ereg("^[0-9]",$format[$i]))
	$add=$t_number[mt_rand() % sizeof($t_number)];
	else $add="?";

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

	function generer_hexa($longueur) {
	mt_srand((double)microtime()*1000000);
	$str_to_return="";
	$t_number=explode(",","1,2,3,4,5,6,7,8,9,0,A,B,C,D,E,F");
	for ($i = 0 ; $i < $longueur ; $i++) {
	$str_to_return .= $t_number[mt_rand() % sizeof($t_number)];
	}
	return $str_to_return;
	}

	//Plural management

	function s ($amount) {
	if ($amount > 1) return "s";
	}

	function x ($amount) {
	if ($amount > 1) return "x";
	}

	//Debug

	function dprint_r ($mixed) {
	echo "<pre>", print_r($mixed, true), "</pre>";
	}

	//GUID

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


	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
	function get_extension ($file) {
	$dotPosition = strrpos($file, ".");
	return substr($file, $dotPosition + 1);
	}

	+////////////////////////////////////////////////////////////////////////////////
	+/// ///
	+/// Localization (l10n) ///
	+/// ///
	+////////////////////////////////////////////////////////////////////////////////
	+
	/*
	* 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);

	//Loads wanted file
	if (LANG != 'en' && file_exists('lang/' . LANG . '/' . $file))
	$smarty->config_load('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
	*/
	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
	*
	* @param int $unixtime the time to convert
	* @param int $format 8 or 10. If 8 (default), will output YYYYMMDD. If 10, YYYY-MM-DD.
	*/
	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.
	*/
	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-01-25 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 - 1264377600;
	$days = $seconds / 86400;
	$fraction = ($seconds % 86400) / 86.4;
	return sprintf("%d.%03d", $days, $fraction);
	}

	+////////////////////////////////////////////////////////////////////////////////
	+/// ///
	+/// URL helpers functions ///
	+/// ///
	+////////////////////////////////////////////////////////////////////////////////
	+
	/*
	* Gets URL
	* @return string URL
	*/
	function get_url () {
	global $Config;
	if (func_num_args() > 0) {
	$pieces = func_get_args();
	return $Config['BaseURL'] . '/' . implode('/', $pieces);
	} elseif ($Config['BaseURL'] == "" \|\| $Config['BaseURL'] == "/index.php") {
	return "/";
	} else {
	return $Config['BaseURL'];
	}
	}

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

	+/*
	+ * Gets 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.
	+ * @return string the relevant URL part
	+ */
	function get_current_url () {
	- return get_server_url() . $_SERVER['REQUEST_URI'];
	-}
	-
	-function get_current_url_fragments () {
	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 easy case.
	- $url_source = $_SERVER["PATH_INFO"];
	- } elseif (array_key_exists('REDIRECT_URL', $_SERVER)) {
	- //With mod_rewrite, we can use REDIRECT_URL
	- $current_url = get_current_url();
	-
	- //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");
	- }
	-
	- //We takes the end of the URL, ie FROM $len position
	- $url_source = substr(get_server_url() . $_SERVER["REDIRECT_URL"], $len);
	- } else {
	- //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']
	- $current_url = get_current_url();
	-
	- //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");
	- }
	-
	- //We takes the end of the URL, ie FROM $len position
	- $url_source = 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']) {
	- $url_source = substr($url_source, 0, strlen($url_source) - strlen($_SERVER['QUERY_STRING']) - 1);
	- }
	+ //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);
	}
	-
	- //$url_source = substr($current_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
	+ */
	+function get_current_url_fragments () {
	+ $url_source = get_current_url();
	if ($url_source == '/index.php') return array();
	return explode('/', substr($url_source, 1));
	}

	?>
	\ No newline at end of file
	diff --git a/skins/zed/smartline.tpl b/skins/zed/smartline.tpl
	index b0037b8..b83badb 100644
	--- a/skins/zed/smartline.tpl
	+++ b/skins/zed/smartline.tpl
	@@ -1,26 +1,26 @@

	<!-- SmartLine -->
	<div class="grid_16 alpha omega" id="SmartLine">
	- <form method="post" name="SmartLine" action="{get_page_url()}">
	+ <form method="post" name="SmartLine" action="{get_current_url()}">
	{if $SmartLineHistory}
	<!-- SmartLine history -->
	<div class="grid_4 left alpha">
	<select name="SmartLineHistory" 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;">
	</div>
	</form>
	</div>

	<div class="clear"></div>

File Metadata

Mime Type: text/x-diff
Expires: Sat, Nov 23, 15:31 (1 d, 18 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 21005
Default Alt Text: (22 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions