No OneTemporary
Actions

Size

12 KB

Subscribers

None

View Options

	diff --git a/includes/config.php b/includes/config.php
	index d451d35..71b6184 100644
	--- a/includes/config.php
	+++ b/includes/config.php
	@@ -1,203 +1,239 @@
	<?php

	/**
	* Autogenerable configuration file
	*
	* 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
	*/

	////////////////////////////////////////////////////////////////////////////////
	/// ///
	/// 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', $prefix . 'log');
	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_PERSOS_NOTES', $prefix . 'persos_notes');
	define('TABLE_PORTS', $prefix . 'ports');
	define('TABLE_PROFILES', $prefix . 'profiles');
	define('TABLE_PROFILES_COMMENTS', $prefix . 'profiles_comments');
	define('TABLE_PROFILES_PHOTOS', $prefix . 'profiles_photos');
	define('TABLE_PROFILES_TAGS', $prefix . 'profiles_tags');
	define('TABLE_REGISTRY', $prefix . 'registry');
	define('TABLE_SESSIONS', $prefix . 'sessions');
	define('TABLE_SHIPS', $prefix . 'ships');
	define('TABLE_USERS', $prefix . 'users');
	define('TABLE_USERS_INVITES', $prefix . 'users_invites');
	define('TABLE_USERS_OPENID', $prefix . 'users_openid');

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

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

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

	//Dates
	date_default_timezone_set("UTC");

	//Secret key, used for some verification hashes in URLs or forms.
	$Config['SecretKey'] = 'Lorem ipsum dolor';

	//When reading files, buffer size
	define('BUFFER_SIZE', 4096);

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

	/*
	- * Without mod_rewrite:
	- *
	+ * Apache httpd, 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:
	- *
	+ * Apache httpd, 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]
	*
	+ * nginx:
	+ *
	+ * Use same config.php settings than Apache httpd, with mod_rewrite.
	+ *
	+ * In your server block:
	+ * location / {
	+ * #Serves static files if they exists, with one month cache
	+ * if (-f $request_filename) {
	+ * expires 30d;
	+ * break;
	+ * }
	+ *
	+ * #Sends all non existing file or directory requests to index.php
	+ * if (!-e request_filename) {
	+ * rewrite ^(.+)$ /index.php last;
	+ * #Or if you use a subdirectory:
	+ * #rewrite ^(.+)$ /hypership/index.php last;
	+ * }
	+ * }
	+ *
	+ * location ~ \.php$ {
	+ * #Your instructions to pass query to your FastCGI process, like:
	+ * fastcgi_pass 127.0.0.1:9000;
	+ * fastcgi_param SCRIPT_FILENAME /var/www/zed$fastcgi_script_name;
	+ * include fastcgi_params;
	+ * }
	+ *
	*
	* 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();
	- *
	+ *
	+ *
	+ *
	* !!! No trailing slash !!!
	- *
	+ *
	*/

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

	//AJAX callbacks URL
	$Config['DoURL'] = $Config['SiteURL'] . "/do.php";

	////////////////////////////////////////////////////////////////////////////////
	/// ///
	/// IV. Static content ///
	/// ///
	////////////////////////////////////////////////////////////////////////////////

	//Where the static content is located?
	//Static content = 4 directories: js, css, img and content
	//On default installation, those directories are at site root.
	//To improve site performance, you can use a CDN for that.
	-//To use
	//
	//Recommanded setting: $Config['StaticContentURL'] = $Config['SiteURL'];
	//Or if Zed is the site root: $Config['StaticContentURL'] = '';
	//With CoralCDN: $Config['StaticContentURL'] = . '.nyud.net';
	//
	$Config['StaticContentURL'] = '';
	//$Config['StaticContentURL'] = get_server_url() . '.nyud.net';

	//Scenes
	define('SCENE_DIR', 'content/scenes');
	define('SCENE_URL', $Config['StaticContentURL'] . '/' . SCENE_DIR);

	//Stories
	define('STORIES_DIR', "content/stories");

	//Profile's photos
	define('PHOTOS_DIR', 'content/users/_photos');
	define('PHOTOS_URL', $Config['StaticContentURL'] . '/' . PHOTOS_DIR);

	//ImageMagick paths
	//Be careful on Windows platform convert could match the NTFS convert command.
	$Config['ImageMagick']['convert'] = 'convert';
	$Config['ImageMagick']['mogrify'] = 'mogrify';
	$Config['ImageMagick']['composite'] = 'composite';
	$Config['ImageMagick']['identify'] = 'identify';


	////////////////////////////////////////////////////////////////////////////////
	/// ///
	/// V. 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


	////////////////////////////////////////////////////////////////////////////////
	/// ///
	/// VI. Caching ///
	/// ///
	////////////////////////////////////////////////////////////////////////////////

	-$Config['cache']['engine'] = 'memcached';
	-$Config['cache']['server'] = 'localhost';
	-$Config['cache']['port'] = 11211;
	+/*
	+ * To use memcached:
	+ * - $Config['cache']['engine'] = 'memcached';
	+ * - $Config['cache']['server'] = 'localhost';
	+ * - $Config['cache']['port'] = 11211;
	+ *
	+ * To disable cache:
	+ * - $Config['cache']['engine'] = 'void';
	+ * (or don't write nothing at all)
	+ */
	+$Config['cache']['engine'] = 'void';

	-?>
	\ No newline at end of file
	+?>
	diff --git a/lang/en/profile.conf b/lang/en/profile.conf
	index 5540881..3b346c4 100644
	--- a/lang/en/profile.conf
	+++ b/lang/en/profile.conf
	@@ -1,103 +1,103 @@
	#Zed language config file - Profiles
	#Language: English
	#Code: en
	#Author: Dereckson

	###
	### profile.tpl - main profile
	###

	#<img src=".../mail.png" title="E-mail" alt="@"... />
	Mail = E-mail
	MailAlt = @
	Online = Online

	###
	### profile.tpl - communication area
	###

	DropMessage = Drop a message
	SendMessage = Send a message to %s
	-AddComment = Add a comment to %s's profile
	+AddComment = "Add a comment to %s's profile"

	Send = Send
	Publish = Publish

	###
	### profile.tpl - sidebar - Edit account preferences and profile content
	###

	EditMyPage = Edit my page
	EditProfile = Edit my text
	EditAccount = Edit my information
	ManagePhotos = Manage photos
	AddPhoto = Add a photo

	###
	### profile_edit.tpl - edit
	###

	ProfileTextTitle = My best words to express myself
	SaveProfile = Save profile
	ProfileFont = Profile fontz
	Calibri = Calibri (regular font)
	FixedSys = FixedSys (fixed width)

	###
	### user_account.tpl - edit my information
	###

	Login = Login
	LongName = Full character name
	UpdateAccountInfo = Update account information

	###
	### profile_photo.tpl - photo manager - add a photo to my profile
	###

	AddPhoto = Add a photo to my profile
	AddPhotoExplanations = You can upload here a personal photo with you as main subject.<br />Note you can also host any kind of pictures in various Zed places, like in the HyperShip's tower.
	ShortDescription = Short description
	SafeForWorkLabel = Check this box if the picture is "<strong>safe for work</strong>", you can view it without problem from any public computer.

	###
	### profile_photo.tpl - photo manager - manage current photos
	###

	ManageCurrentPhotos = Manage current photos
	PictureProperties = Picture properties
	EditPictureProperties = Edit this picture description or safe status
	Delete = Delete
	DeleteThisPicture = Delete this picture

	###
	### profile_photo_edit.tpl - edit individual photo properties
	###

	EditPhoto = Edit photo
	PhotoInfo = Photo information
	Description = Description
	SafeForWork = Safe for work
	UseAsAvatar = Use as avatar
	OtherActions = Other actions
	DeletePicture = Delete this picture
	BackToPhotoManager = Back to photo manager

	###
	### profile.php
	###

	UnknownUser = Unknown being
	Who = Who?
	WhoIsUser = Who is %s?

	MessageSent = Message sent.
	MessageSentSelf = Message sent to yourself.

	CommentPublished = Comment published.

	PhotoUploaded = Photo uploaded.
	NotYourPic = Hey, this photo is not one of yours.
	PictureDeleted = Picture deleted.

	-InactivatedUser = This being's account isn't active yet.
	\ No newline at end of file
	+InactivatedUser = "This being's account isn't active yet."

File Metadata

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

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions