From: Seb Sauvage <sebsauvage@sebsauvage.net>
Date: Fri, 16 Dec 2011 20:27:16 +0000 (+0100)
Subject: Version 0.0.32 beta:
X-Git-Url: https://git.immae.eu/?p=github%2Fshaarli%2FShaarli.git;a=commitdiff_plain;h=3433e5e8a84e3952502b79296f945e6dde2a7d75

Version 0.0.32 beta:
- Changed: HTML generation moved to RainTPL templates (in the tpl/ directory).
- Added: Better check on URL parameters (patch by gege2061).
- Changed: Better detection of HTTPS (patch by gege2061).
- Changed: In RSS/ATOM feeds, the GUID is now the permalink instead of the final URL (patch by gege2061).
- Changed: Jerrywham CSS patch included.
- Changed: Multiple spaces are now respected in description. Thus you can use Shaarli as a personal pastebin (for posting source code, for example). I also added a max-height and overflow:auto so that content can be scrolled if too large.
- Corrected: Tab order changed in login screen.
- Corrected: Permalinks now work even if additional parameters have been added (eg. /?E8Yj2Q&utm_source=blablabla…)
- Corrected: user.css is included only if the file is present (This prevent a useless CSS include which makes a harmless but useless 404 error.).
- Removed: Page time generation was removed.
---

diff --git a/jquery-ui.custom.min.js b/inc/jquery-ui.custom.min.js
similarity index 100%
rename from jquery-ui.custom.min.js
rename to inc/jquery-ui.custom.min.js
diff --git a/jquery.min.js b/inc/jquery.min.js
similarity index 100%
rename from jquery.min.js
rename to inc/jquery.min.js
diff --git a/inc/rain.tpl.class.php b/inc/rain.tpl.class.php
new file mode 100644
index 00000000..30b6deb8
--- /dev/null
+++ b/inc/rain.tpl.class.php
@@ -0,0 +1,1011 @@
+<?php
+
+/**
+ *  RainTPL
+ *  -------
+ *  Realized by Federico Ulfo & maintained by the Rain Team
+ *  Distributed under GNU/LGPL 3 License
+ *
+ *  @version 2.6.4
+ */
+
+
+class RainTPL{
+
+	// -------------------------
+	// 	CONFIGURATION
+	// -------------------------
+
+		/**
+		 * Template directory
+		 *
+		 * @var string
+		 */
+		static $tpl_dir = "tpl/";
+
+
+		/**
+		 * Cache directory. Is the directory where RainTPL will compile the template and save the cache
+		 *
+		 * @var string
+		 */
+		static $cache_dir = "tmp/";
+
+
+		/**
+		 * Template base URL. RainTPL will add this URL to the relative paths of element selected in $path_replace_list.
+		 *
+		 * @var string
+		 */
+		static $base_url = null;
+
+
+		/**
+		 * Template extension.
+		 *
+		 * @var string
+		 */
+		static $tpl_ext = "html";
+
+
+		/**
+		 * Path replace is a cool features that replace all relative paths of images (<img src="...">), stylesheet (<link href="...">), script (<script src="...">) and link (<a href="...">)
+		 * Set true to enable the path replace.
+		 *
+		 * @var unknown_type
+		 */
+		static $path_replace = true;
+
+
+		/**
+		 * You can set what the path_replace method will replace.
+		 * Avaible options: a, img, link, script, input
+		 *
+		 * @var array
+		 */
+		static $path_replace_list = array( 'a', 'img', 'link', 'script', 'input' );
+
+
+		/**
+		 * You can define in the black list what string are disabled into the template tags
+		 *
+		 * @var unknown_type
+		 */
+		static $black_list = array( '\$this', 'raintpl::', 'self::', '_SESSION', '_SERVER', '_ENV',  'eval', 'exec', 'unlink', 'rmdir' );
+
+
+		/**
+		 * Check template.
+		 * true: checks template update time, if changed it compile them
+		 * false: loads the compiled template. Set false if server doesn't have write permission for cache_directory.
+		 *
+		 */
+		static $check_template_update = true;
+                
+
+		/**
+		 * Debug mode flag.
+		 * True: debug mode is used, syntax errors are displayed directly in template. Execution of script is not terminated.
+		 * False: exception is thrown on found error.
+		 *
+		 * @var bool
+		 */
+		static $debug = false;
+
+	// -------------------------
+
+
+	// -------------------------
+	// 	RAINTPL VARIABLES
+	// -------------------------
+
+		/**
+		 * Is the array where RainTPL keep the variables assigned
+		 *
+		 * @var array
+		 */
+		public $var = array();
+
+		private $tpl = array(),		// variables to keep the template directories and info
+                $cache = false,		// static cache enabled / disabled
+                $cache_id = null;       // identify only one cache
+
+                private static $config_name_sum = null;   // takes all the config to create the md5 of the file
+
+	// -------------------------
+
+
+
+	const CACHE_EXPIRE_TIME = 3600; // default cache expire time = hour
+
+
+
+	/**
+	 * Assign variable
+	 * eg. 	$t->assign('name','mickey');
+	 *
+	 * @param mixed $variable_name Name of template variable or associative array name/value
+	 * @param mixed $value value assigned to this variable. Not set if variable_name is an associative array
+	 */
+
+	function assign( $variable, $value = null ){
+		if( is_array( $variable ) )
+			$this->var += $variable;
+		else
+			$this->var[ $variable ] = $value;
+	}
+
+
+
+	/**
+	 * Draw the template
+	 * eg. 	$html = $tpl->draw( 'demo', TRUE ); // return template in string
+	 * or 	$tpl->draw( $tpl_name ); // echo the template
+	 *
+	 * @param string $tpl_name  template to load
+	 * @param boolean $return_string  true=return a string, false=echo the template
+	 * @return string
+	 */
+
+	function draw( $tpl_name, $return_string = false ){
+
+		try {
+			// compile the template if necessary and set the template filepath
+			$this->check_template( $tpl_name );
+		} catch (RainTpl_Exception $e) {
+			$output = $this->printDebug($e);
+			die($output);
+		}
+
+		// Cache is off and, return_string is false
+        // Rain just echo the template
+
+        if( !$this->cache && !$return_string ){
+            extract( $this->var );
+            include $this->tpl['compiled_filename'];
+            unset( $this->tpl );
+        }
+
+
+		// cache or return_string are enabled
+        // rain get the output buffer to save the output in the cache or to return it as string
+
+        else{
+
+            //----------------------
+            // get the output buffer
+            //----------------------
+                ob_start();
+                extract( $this->var );
+                include $this->tpl['compiled_filename'];
+                $raintpl_contents = ob_get_contents();
+                ob_end_clean();
+            //----------------------
+
+
+            // save the output in the cache
+            if( $this->cache )
+                file_put_contents( $this->tpl['cache_filename'], "<?php if(!class_exists('raintpl')){exit;}?>" . $raintpl_contents );
+
+            // free memory
+            unset( $this->tpl );
+
+            // return or print the template
+            if( $return_string ) return $raintpl_contents; else echo $raintpl_contents;
+
+        }
+
+	}
+
+
+
+
+	/**
+	 * If exists a valid cache for this template it returns the cache
+	 *
+	 * @param string $tpl_name Name of template (set the same of draw)
+	 * @param int $expiration_time Set after how many seconds the cache expire and must be regenerated
+	 * @return string it return the HTML or null if the cache must be recreated
+	 */
+
+	function cache( $tpl_name, $expire_time = self::CACHE_EXPIRE_TIME, $cache_id = null ){
+
+        // set the cache_id
+        $this->cache_id = $cache_id;
+
+		if( !$this->check_template( $tpl_name ) && file_exists( $this->tpl['cache_filename'] ) && ( time() - filemtime( $this->tpl['cache_filename'] ) < $expire_time ) )
+			return substr( file_get_contents( $this->tpl['cache_filename'] ), 43 );
+		else{
+			//delete the cache of the selected template
+            if (file_exists($this->tpl['cache_filename']))
+            unlink($this->tpl['cache_filename'] );
+			$this->cache = true;
+		}
+	}
+
+
+
+	/**
+	 * Configure the settings of RainTPL
+	 *
+	 */
+	static function configure( $setting, $value = null ){
+		if( is_array( $setting ) )
+			foreach( $setting as $key => $value )
+				self::configure( $key, $value );
+		else if( property_exists( __CLASS__, $setting ) ){
+			self::$$setting = $value;
+            self::$config_name_sum .= $value; // take trace of all config
+        }
+	}
+
+
+
+	// check if has to compile the template
+	// return true if the template has changed
+	private function check_template( $tpl_name ){
+
+		if( !isset($this->tpl['checked']) ){
+
+			$tpl_basename                       = basename( $tpl_name );														// template basename
+			$tpl_basedir                        = strpos($tpl_name,"/") ? dirname($tpl_name) . '/' : null;						// template basedirectory
+			$tpl_dir                            = self::$tpl_dir . $tpl_basedir;								// template directory
+			$this->tpl['tpl_filename']          = $tpl_dir . $tpl_basename . '.' . self::$tpl_ext;	// template filename
+			$temp_compiled_filename             = self::$cache_dir . $tpl_basename . "." . md5( $tpl_dir . self::$config_name_sum );
+			$this->tpl['compiled_filename']     = $temp_compiled_filename . '.php';	// cache filename
+			$this->tpl['cache_filename']        = $temp_compiled_filename . '.s_' . $this->cache_id . '.php';	// static cache filename
+
+			// if the template doesn't exsist throw an error
+			if( self::$check_template_update && !file_exists( $this->tpl['tpl_filename'] ) ){
+				$e = new RainTpl_NotFoundException( 'Template '. $tpl_basename .' not found!' );
+				throw $e->setTemplateFile($this->tpl['tpl_filename']);
+			}
+
+			// file doesn't exsist, or the template was updated, Rain will compile the template
+			if( !file_exists( $this->tpl['compiled_filename'] ) || ( self::$check_template_update && filemtime($this->tpl['compiled_filename']) < filemtime( $this->tpl['tpl_filename'] ) ) ){
+				$this->compileFile( $tpl_basename, $tpl_basedir, $this->tpl['tpl_filename'], self::$cache_dir, $this->tpl['compiled_filename'] );
+				return true;
+			}
+			$this->tpl['checked'] = true;
+		}
+	}
+
+
+	/**
+	* execute stripslaches() on the xml block. Invoqued by preg_replace_callback function below
+	* @access private
+	*/
+	private function xml_reSubstitution($capture) {
+    		return "<?php echo '<?xml ".stripslashes($capture[1])." ?>'; ?>";
+	} 
+
+	/**
+	 * Compile and write the compiled template file
+	 * @access private
+	 */
+	private function compileFile( $tpl_basename, $tpl_basedir, $tpl_filename, $cache_dir, $compiled_filename ){
+
+		//read template file
+		$this->tpl['source'] = $template_code = file_get_contents( $tpl_filename );
+
+		//xml substitution
+		$template_code = preg_replace( "/<\?xml(.*?)\?>/s", "##XML\\1XML##", $template_code );
+
+		//disable php tag
+		$template_code = str_replace( array("<?","?>"), array("&lt;?","?&gt;"), $template_code );
+
+		//xml re-substitution
+		$template_code = preg_replace_callback ( "/##XML(.*?)XML##/s", array($this, 'xml_reSubstitution'), $template_code ); 
+
+		//compile template
+		$template_compiled = "<?php if(!class_exists('raintpl')){exit;}?>" . $this->compileTemplate( $template_code, $tpl_basedir );
+		
+
+		// fix the php-eating-newline-after-closing-tag-problem
+		$template_compiled = str_replace( "?>\n", "?>\n\n", $template_compiled );
+
+		// create directories
+		if( !is_dir( $cache_dir ) )
+			mkdir( $cache_dir, 0755, true );
+
+		if( !is_writable( $cache_dir ) )
+			throw new RainTpl_Exception ('Cache directory ' . $cache_dir . 'doesn\'t have write permission. Set write permission or set RAINTPL_CHECK_TEMPLATE_UPDATE to false. More details on http://www.raintpl.com/Documentation/Documentation-for-PHP-developers/Configuration/');
+
+		//write compiled file
+		file_put_contents( $compiled_filename, $template_compiled );
+	}
+
+
+
+	/**
+	 * Compile template
+	 * @access private
+	 */
+	private function compileTemplate( $template_code, $tpl_basedir ){
+
+		//tag list
+		$tag_regexp = array( 	'loop'	 	=> '(\{loop(?: name){0,1}="\${0,1}[^"]*"\})',
+					'loop_close'	=> '(\{\/loop\})',
+					'if'		=> '(\{if(?: condition){0,1}="[^"]*"\})',
+					'elseif'	=> '(\{elseif(?: condition){0,1}="[^"]*"\})',
+					'else'		=> '(\{else\})',
+					'if_close'	=> '(\{\/if\})',
+					'function'	=> '(\{function="[^"]*"\})',
+					'noparse'	=> '(\{noparse\})',
+					'noparse_close' => '(\{\/noparse\})',
+					'ignore'	=> '(\{ignore\})',
+					'ignore_close'	=> '(\{\/ignore\})',
+					'include'	=> '(\{include="[^"]*"(?: cache="[^"]*")?\})',
+					'template_info'	=> '(\{\$template_info\})',
+							);
+
+		$tag_regexp = "/" . join( "|", $tag_regexp ) . "/";
+
+		//split the code with the tags regexp
+		$template_code = preg_split ( $tag_regexp, $template_code, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY );
+
+		//path replace (src of img, background and href of link)
+		$template_code = $this->path_replace( $template_code, $tpl_basedir );
+
+		//compile the code
+		$compiled_code = $this->compileCode( $template_code );
+
+		//return the compiled code
+		return $compiled_code;
+
+	}
+
+
+
+	/**
+	 * Compile the code
+	 * @access private
+	 */
+	private function compileCode( $parsed_code ){
+
+		//variables initialization
+		$compiled_code = $open_if = $comment_is_open = $ignore_is_open = null;
+        $loop_level = 0;
+
+
+	 	//read all parsed code
+	 	while( $html = array_shift( $parsed_code ) ){
+
+	 		//close ignore tag
+			if( !$comment_is_open && strpos( $html, '{/ignore}' ) !== FALSE )
+	 			$ignore_is_open = false;
+
+	 		//code between tag ignore id deleted
+	 		elseif( $ignore_is_open ){
+	 			//ignore the code
+	 		}
+
+	 		//close no parse tag
+			elseif( strpos( $html, '{/noparse}' ) !== FALSE )
+	 			$comment_is_open = false;
+
+	 		//code between tag noparse is not compiled
+	 		elseif( $comment_is_open )
+ 				$compiled_code .= $html;
+
+	 		//ignore
+			elseif( strpos( $html, '{ignore}' ) !== FALSE )
+	 			$ignore_is_open = true;
+
+	 		//noparse
+	 		elseif( strpos( $html, '{noparse}' ) !== FALSE )
+	 			$comment_is_open = true;
+
+			//include tag
+			elseif( preg_match( '/(?:\{include="([^"]*)"(?: cache="([^"]*)"){0,1}\})/', $html, $code ) ){
+
+				//variables substitution
+				$include_var = $this->var_replace( $code[ 1 ], $left_delimiter = null, $right_delimiter = null, $php_left_delimiter = '".' , $php_right_delimiter = '."', $loop_level );
+
+				// if the cache is active
+				if( isset($code[ 2 ]) )
+					//dynamic include
+					$compiled_code .= '<?php $tpl = new RainTPL;' .
+								 'if( $cache = $tpl->cache( $template = basename("'.$include_var.'") ) )' .
+								 '	echo $cache;' .
+								 'else{ ' .
+								 '$tpl_dir_temp = self::$tpl_dir;' .
+								 '$tpl->assign( $this->var );' .
+								 ( !$loop_level ? null : '$tpl->assign( "key", $key'.$loop_level.' ); $tpl->assign( "value", $value'.$loop_level.' );' ).
+								 '$tpl->draw( dirname("'.$include_var.'") . ( substr("'.$include_var.'",-1,1) != "/" ? "/" : "" ) . $template );'.
+								 '}' .
+								 '?>';
+				else
+					//dynamic include
+					$compiled_code .= '<?php $tpl = new RainTPL;' .
+								 '$tpl_dir_temp = self::$tpl_dir;' .
+								 '$tpl->assign( $this->var );' .
+								 ( !$loop_level ? null : '$tpl->assign( "key", $key'.$loop_level.' ); $tpl->assign( "value", $value'.$loop_level.' );' ).
+								 '$tpl->draw( dirname("'.$include_var.'") . ( substr("'.$include_var.'",-1,1) != "/" ? "/" : "" ) . basename("'.$include_var.'") );'.
+								 '?>';
+
+			}
+
+	 		//loop
+			elseif( preg_match( '/\{loop(?: name){0,1}="\${0,1}([^"]*)"\}/', $html, $code ) ){
+
+	 			//increase the loop counter
+	 			$loop_level++;
+
+				//replace the variable in the loop
+				$var = $this->var_replace( '$' . $code[ 1 ], $tag_left_delimiter=null, $tag_right_delimiter=null, $php_left_delimiter=null, $php_right_delimiter=null, $loop_level-1 );
+
+				//loop variables
+				$counter = "\$counter$loop_level";       // count iteration
+				$key = "\$key$loop_level";               // key
+				$value = "\$value$loop_level";           // value
+
+				//loop code
+				$compiled_code .=  "<?php $counter=-1; if( isset($var) && is_array($var) && sizeof($var) ) foreach( $var as $key => $value ){ $counter++; ?>";
+
+			}
+
+			//close loop tag
+			elseif( strpos( $html, '{/loop}' ) !== FALSE ) {
+
+				//iterator
+				$counter = "\$counter$loop_level";
+
+				//decrease the loop counter
+				$loop_level--;
+
+				//close loop code
+				$compiled_code .=  "<?php } ?>";
+
+			}
+
+			//if
+			elseif( preg_match( '/\{if(?: condition){0,1}="([^"]*)"\}/', $html, $code ) ){
+
+				//increase open if counter (for intendation)
+				$open_if++;
+
+				//tag
+				$tag = $code[ 0 ];
+
+				//condition attribute
+				$condition = $code[ 1 ];
+
+				// check if there's any function disabled by black_list
+				$this->function_check( $tag );
+
+				//variable substitution into condition (no delimiter into the condition)
+				$parsed_condition = $this->var_replace( $condition, $tag_left_delimiter = null, $tag_right_delimiter = null, $php_left_delimiter = null, $php_right_delimiter = null, $loop_level );
+
+				//if code
+				$compiled_code .=   "<?php if( $parsed_condition ){ ?>";
+
+			}
+
+			//elseif
+			elseif( preg_match( '/\{elseif(?: condition){0,1}="([^"]*)"\}/', $html, $code ) ){
+
+				//tag
+				$tag = $code[ 0 ];
+
+				//condition attribute
+				$condition = $code[ 1 ];
+
+				//variable substitution into condition (no delimiter into the condition)
+				$parsed_condition = $this->var_replace( $condition, $tag_left_delimiter = null, $tag_right_delimiter = null, $php_left_delimiter = null, $php_right_delimiter = null, $loop_level );
+
+				//elseif code
+				$compiled_code .=   "<?php }elseif( $parsed_condition ){ ?>";
+			}
+
+			//else
+			elseif( strpos( $html, '{else}' ) !== FALSE ) {
+
+				//else code
+				$compiled_code .=   '<?php }else{ ?>';
+
+			}
+
+			//close if tag
+			elseif( strpos( $html, '{/if}' ) !== FALSE ) {
+
+				//decrease if counter
+				$open_if--;
+
+				// close if code
+				$compiled_code .=   '<?php } ?>';
+
+			}
+
+			//function
+			elseif( preg_match( '/\{function="([^(]*)(\([^)]*\)){0,1}"\}/', $html, $code ) ){
+
+				//tag
+				$tag = $code[ 0 ];
+
+				//function
+				$function = $code[ 1 ];
+
+				// check if there's any function disabled by black_list
+				$this->function_check( $tag );
+
+				//parse the parameters
+				$parsed_param = isset( $code[2] ) ? $this->var_replace( $code[2], $tag_left_delimiter = null, $tag_right_delimiter = null, $php_left_delimiter = null, $php_right_delimiter = null, $loop_level ) : '()';
+
+				//if code
+				$compiled_code .=   "<?php echo {$function}{$parsed_param}; ?>";
+			}
+
+			// show all vars
+			elseif ( strpos( $html, '{$template_info}' ) !== FALSE ) {
+
+				//tag
+				$tag  = '{$template_info}';
+
+				//if code
+				$compiled_code .=   '<?php echo "<pre>"; print_r( $this->var ); echo "</pre>"; ?>';
+			}
+
+
+			//all html code
+			else{
+
+				//variables substitution (es. {$title})
+				$html = $this->var_replace( $html, $left_delimiter = '\{', $right_delimiter = '\}', $php_left_delimiter = '<?php ', $php_right_delimiter = ';?>', $loop_level, $echo = true );
+				//const substitution (es. {#CONST#})
+				$html = $this->const_replace( $html, $left_delimiter = '\{', $right_delimiter = '\}', $php_left_delimiter = '<?php ', $php_right_delimiter = ';?>', $loop_level, $echo = true );
+				//functions substitution (es. {"string"|functions})
+				$compiled_code .= $this->func_replace( $html, $left_delimiter = '\{', $right_delimiter = '\}', $php_left_delimiter = '<?php ', $php_right_delimiter = ';?>', $loop_level, $echo = true );
+			}
+		}
+
+		if( $open_if > 0 ) {
+			$e = new RainTpl_SyntaxException('Error! You need to close an {if} tag in ' . $this->tpl['tpl_filename'] . ' template');
+			throw $e->setTemplateFile($this->tpl['tpl_filename']);
+		}
+		return $compiled_code;
+	}
+
+
+
+	/**
+	 * replace the path of image src, link href and a href.
+	 * url => template_dir/url
+	 * url# => url
+	 * http://url => http://url
+	 *
+	 * @param string $html
+	 * @return string html sostituito
+	 */
+	private function path_replace( $html, $tpl_basedir ){
+
+		if( self::$path_replace ){
+
+                        // reduce the path
+                        $path = preg_replace('/\w+\/\.\.\//', '', self::$base_url . self::$tpl_dir . $tpl_basedir );
+
+			$exp = $sub = array();
+
+			if( in_array( "img", self::$path_replace_list ) ){
+				$exp = array( '/<img(.*?)src=(?:")(http|https)\:\/\/([^"]+?)(?:")/i', '/<img(.*?)src=(?:")([^"]+?)#(?:")/i', '/<img(.*?)src="(.*?)"/', '/<img(.*?)src=(?:\@)([^"]+?)(?:\@)/i' );
+				$sub = array( '<img$1src=@$2://$3@', '<img$1src=@$2@', '<img$1src="' . self::$base_url . self::$tpl_dir . $tpl_basedir . '$2"', '<img$1src="$2"' );
+			}
+
+			if( in_array( "script", self::$path_replace_list ) ){
+				$exp = array_merge( $exp , array( '/<script(.*?)src=(?:")(http|https)\:\/\/([^"]+?)(?:")/i', '/<script(.*?)src=(?:")([^"]+?)#(?:")/i', '/<script(.*?)src="(.*?)"/', '/<script(.*?)src=(?:\@)([^"]+?)(?:\@)/i' ) );
+				$sub = array_merge( $sub , array( '<script$1src=@$2://$3@', '<script$1src=@$2@', '<script$1src="' . self::$base_url . self::$tpl_dir . $tpl_basedir . '$2"', '<script$1src="$2"' ) );
+			}
+
+			if( in_array( "link", self::$path_replace_list ) ){
+				$exp = array_merge( $exp , array( '/<link(.*?)href=(?:")(http|https)\:\/\/([^"]+?)(?:")/i', '/<link(.*?)href=(?:")([^"]+?)#(?:")/i', '/<link(.*?)href="(.*?)"/', '/<link(.*?)href=(?:\@)([^"]+?)(?:\@)/i' ) );
+				$sub = array_merge( $sub , array( '<link$1href=@$2://$3@', '<link$1href=@$2@' , '<link$1href="' . self::$base_url . self::$tpl_dir . $tpl_basedir . '$2"', '<link$1href="$2"' ) );
+			}
+
+			if( in_array( "a", self::$path_replace_list ) ){
+				$exp = array_merge( $exp , array( '/<a(.*?)href=(?:")(http|https)\:\/\/([^"]+?)(?:")/i', '/<a(.*?)href="(.*?)"/', '/<a(.*?)href=(?:\@)([^"]+?)(?:\@)/i'  ) );
+				$sub = array_merge( $sub , array( '<a$1href=@$2://$3@', '<a$1href="' . self::$base_url . '$2"', '<a$1href="$2"' ) );
+			}
+
+			if( in_array( "input", self::$path_replace_list ) ){
+				$exp = array_merge( $exp , array( '/<input(.*?)src=(?:")(http|https)\:\/\/([^"]+?)(?:")/i', '/<input(.*?)src=(?:")([^"]+?)#(?:")/i', '/<input(.*?)src="(.*?)"/', '/<input(.*?)src=(?:\@)([^"]+?)(?:\@)/i' ) );
+				$sub = array_merge( $sub , array( '<input$1src=@$2://$3@', '<input$1src=@$2@', '<input$1src="' . self::$base_url . self::$tpl_dir . $tpl_basedir . '$2"', '<input$1src="$2"' ) );
+			}
+
+			return preg_replace( $exp, $sub, $html );
+
+		}
+		else
+			return $html;
+
+	}
+
+
+
+
+
+	// replace const
+	function const_replace( $html, $tag_left_delimiter, $tag_right_delimiter, $php_left_delimiter = null, $php_right_delimiter = null, $loop_level = null, $echo = null ){
+		// const
+		return preg_replace( '/\{\#(\w+)\#{0,1}\}/', $php_left_delimiter . ( $echo ? " echo " : null ) . '\\1' . $php_right_delimiter, $html );
+	}
+
+
+
+	// replace functions/modifiers on constants and strings
+	function func_replace( $html, $tag_left_delimiter, $tag_right_delimiter, $php_left_delimiter = null, $php_right_delimiter = null, $loop_level = null, $echo = null ){
+
+		preg_match_all( '/' . '\{\#{0,1}(\"{0,1}.*?\"{0,1})(\|\w.*?)\#{0,1}\}' . '/', $html, $matches );
+
+		for( $i=0, $n=count($matches[0]); $i<$n; $i++ ){
+
+			//complete tag ex: {$news.title|substr:0,100}
+			$tag = $matches[ 0 ][ $i ];
+
+			//variable name ex: news.title
+			$var = $matches[ 1 ][ $i ];
+
+			//function and parameters associate to the variable ex: substr:0,100
+			$extra_var = $matches[ 2 ][ $i ];
+
+			// check if there's any function disabled by black_list
+			$this->function_check( $tag );
+
+			$extra_var = $this->var_replace( $extra_var, null, null, null, null, $loop_level );
+            
+
+			// check if there's an operator = in the variable tags, if there's this is an initialization so it will not output any value
+			$is_init_variable = preg_match( "/^(\s*?)\=[^=](.*?)$/", $extra_var );
+
+			//function associate to variable
+			$function_var = ( $extra_var and $extra_var[0] == '|') ? substr( $extra_var, 1 ) : null;
+
+			//variable path split array (ex. $news.title o $news[title]) or object (ex. $news->title)
+			$temp = preg_split( "/\.|\[|\-\>/", $var );
+
+			//variable name
+			$var_name = $temp[ 0 ];
+
+			//variable path
+			$variable_path = substr( $var, strlen( $var_name ) );
+
+			//parentesis transform [ e ] in [" e in "]
+			$variable_path = str_replace( '[', '["', $variable_path );
+			$variable_path = str_replace( ']', '"]', $variable_path );
+
+			//transform .$variable in ["$variable"]
+			$variable_path = preg_replace('/\.\$(\w+)/', '["$\\1"]', $variable_path );
+
+			//transform [variable] in ["variable"]
+			$variable_path = preg_replace('/\.(\w+)/', '["\\1"]', $variable_path );
+
+			//if there's a function
+			if( $function_var ){
+                
+                // check if there's a function or a static method and separate, function by parameters
+				$function_var = str_replace("::", "@double_dot@", $function_var );
+
+                // get the position of the first :
+                if( $dot_position = strpos( $function_var, ":" ) ){
+
+                    // get the function and the parameters
+                    $function = substr( $function_var, 0, $dot_position );
+                    $params = substr( $function_var, $dot_position+1 );
+
+                }
+                else{
+
+                    //get the function
+                    $function = str_replace( "@double_dot@", "::", $function_var );
+                    $params = null;
+
+                }
+
+                // replace back the @double_dot@ with ::
+                $function = str_replace( "@double_dot@", "::", $function );
+                $params = str_replace( "@double_dot@", "::", $params );
+
+
+			}
+			else
+				$function = $params = null;
+
+			$php_var = $var_name . $variable_path;
+
+			// compile the variable for php
+			if( isset( $function ) ){
+				if( $php_var )
+					$php_var = $php_left_delimiter . ( !$is_init_variable && $echo ? 'echo ' : null ) . ( $params ? "( $function( $php_var, $params ) )" : "$function( $php_var )" ) . $php_right_delimiter;
+				else
+					$php_var = $php_left_delimiter . ( !$is_init_variable && $echo ? 'echo ' : null ) . ( $params ? "( $function( $params ) )" : "$function()" ) . $php_right_delimiter;
+			}
+			else
+				$php_var = $php_left_delimiter . ( !$is_init_variable && $echo ? 'echo ' : null ) . $php_var . $extra_var . $php_right_delimiter;
+
+			$html = str_replace( $tag, $php_var, $html );
+
+		}
+
+		return $html;
+
+	}
+
+
+
+	function var_replace( $html, $tag_left_delimiter, $tag_right_delimiter, $php_left_delimiter = null, $php_right_delimiter = null, $loop_level = null, $echo = null ){
+
+		//all variables
+		if( preg_match_all( '/' . $tag_left_delimiter . '\$(\w+(?:\.\${0,1}[A-Za-z0-9_]+)*(?:(?:\[\${0,1}[A-Za-z0-9_]+\])|(?:\-\>\${0,1}[A-Za-z0-9_]+))*)(.*?)' . $tag_right_delimiter . '/', $html, $matches ) ){
+
+                    for( $parsed=array(), $i=0, $n=count($matches[0]); $i<$n; $i++ )
+                        $parsed[$matches[0][$i]] = array('var'=>$matches[1][$i],'extra_var'=>$matches[2][$i]);
+
+                    foreach( $parsed as $tag => $array ){
+
+                            //variable name ex: news.title
+                            $var = $array['var'];
+
+                            //function and parameters associate to the variable ex: substr:0,100
+                            $extra_var = $array['extra_var'];
+
+                            // check if there's any function disabled by black_list
+                            $this->function_check( $tag );
+
+                            $extra_var = $this->var_replace( $extra_var, null, null, null, null, $loop_level );
+
+                            // check if there's an operator = in the variable tags, if there's this is an initialization so it will not output any value
+                            $is_init_variable = preg_match( "/^(\s*?)\=[^=](.*?)$/", $extra_var );
+                            
+                            //function associate to variable
+                            $function_var = ( $extra_var and $extra_var[0] == '|') ? substr( $extra_var, 1 ) : null;
+
+                            //variable path split array (ex. $news.title o $news[title]) or object (ex. $news->title)
+                            $temp = preg_split( "/\.|\[|\-\>/", $var );
+
+                            //variable name
+                            $var_name = $temp[ 0 ];
+
+                            //variable path
+                            $variable_path = substr( $var, strlen( $var_name ) );
+
+                            //parentesis transform [ e ] in [" e in "]
+                            $variable_path = str_replace( '[', '["', $variable_path );
+                            $variable_path = str_replace( ']', '"]', $variable_path );
+
+                            //transform .$variable in ["$variable"] and .variable in ["variable"]
+                            $variable_path = preg_replace('/\.(\${0,1}\w+)/', '["\\1"]', $variable_path );
+                            
+                            // if is an assignment also assign the variable to $this->var['value']
+                            if( $is_init_variable )
+                                $extra_var = "=\$this->var['{$var_name}']{$variable_path}" . $extra_var;
+
+                                
+
+                            //if there's a function
+                            if( $function_var ){
+                                
+                                    // check if there's a function or a static method and separate, function by parameters
+                                    $function_var = str_replace("::", "@double_dot@", $function_var );
+
+
+                                    // get the position of the first :
+                                    if( $dot_position = strpos( $function_var, ":" ) ){
+
+                                        // get the function and the parameters
+                                        $function = substr( $function_var, 0, $dot_position );
+                                        $params = substr( $function_var, $dot_position+1 );
+
+                                    }
+                                    else{
+
+                                        //get the function
+                                        $function = str_replace( "@double_dot@", "::", $function_var );
+                                        $params = null;
+
+                                    }
+
+                                    // replace back the @double_dot@ with ::
+                                    $function = str_replace( "@double_dot@", "::", $function );
+                                    $params = str_replace( "@double_dot@", "::", $params );
+                            }
+                            else
+                                    $function = $params = null;
+
+                            //if it is inside a loop
+                            if( $loop_level ){
+                                    //verify the variable name
+                                    if( $var_name == 'key' )
+                                            $php_var = '$key' . $loop_level;
+                                    elseif( $var_name == 'value' )
+                                            $php_var = '$value' . $loop_level . $variable_path;
+                                    elseif( $var_name == 'counter' )
+                                            $php_var = '$counter' . $loop_level;
+                                    else
+                                            $php_var = '$' . $var_name . $variable_path;
+                            }else
+                                    $php_var = '$' . $var_name . $variable_path;
+                            
+                            // compile the variable for php
+                            if( isset( $function ) )
+                                    $php_var = $php_left_delimiter . ( !$is_init_variable && $echo ? 'echo ' : null ) . ( $params ? "( $function( $php_var, $params ) )" : "$function( $php_var )" ) . $php_right_delimiter;
+                            else
+                                    $php_var = $php_left_delimiter . ( !$is_init_variable && $echo ? 'echo ' : null ) . $php_var . $extra_var . $php_right_delimiter;
+                            
+                            $html = str_replace( $tag, $php_var, $html );
+
+
+                    }
+                }
+
+		return $html;
+	}
+
+
+
+	/**
+	 * Check if function is in black list (sandbox)
+	 *
+	 * @param string $code
+	 * @param string $tag
+	 */
+	private function function_check( $code ){
+
+		$preg = '#(\W|\s)' . implode( '(\W|\s)|(\W|\s)', self::$black_list ) . '(\W|\s)#';
+
+		// check if the function is in the black list (or not in white list)
+		if( count(self::$black_list) && preg_match( $preg, $code, $match ) ){
+
+			// find the line of the error
+			$line = 0;
+			$rows=explode("\n",$this->tpl['source']);
+			while( !strpos($rows[$line],$code) )
+				$line++;
+
+			// stop the execution of the script
+			$e = new RainTpl_SyntaxException('Unallowed syntax in ' . $this->tpl['tpl_filename'] . ' template');
+			throw $e->setTemplateFile($this->tpl['tpl_filename'])
+				->setTag($code)
+				->setTemplateLine($line);
+		}
+
+	}
+
+	/**
+	 * Prints debug info about exception or passes it further if debug is disabled.
+	 *
+	 * @param RainTpl_Exception $e
+	 * @return string
+	 */
+	private function printDebug(RainTpl_Exception $e){
+		if (!self::$debug) {
+			throw $e;
+		}
+		$output = sprintf('<h2>Exception: %s</h2><h3>%s</h3><p>template: %s</p>',
+			get_class($e),
+			$e->getMessage(),
+			$e->getTemplateFile()
+		);
+		if ($e instanceof RainTpl_SyntaxException) {
+			if (null != $e->getTemplateLine()) {
+				$output .= '<p>line: ' . $e->getTemplateLine() . '</p>';
+			}
+			if (null != $e->getTag()) {
+				$output .= '<p>in tag: ' . htmlspecialchars($e->getTag()) . '</p>';
+			}
+			if (null != $e->getTemplateLine() && null != $e->getTag()) {
+				$rows=explode("\n",  htmlspecialchars($this->tpl['source']));
+				$rows[$e->getTemplateLine()] = '<font color=red>' . $rows[$e->getTemplateLine()] . '</font>';
+				$output .= '<h3>template code</h3>' . implode('<br />', $rows) . '</pre>';
+			}
+		}
+		$output .= sprintf('<h3>trace</h3><p>In %s on line %d</p><pre>%s</pre>',
+			$e->getFile(), $e->getLine(),
+			nl2br(htmlspecialchars($e->getTraceAsString()))
+		);
+		return $output;
+	}
+}
+
+
+/**
+ * Basic Rain tpl exception.
+ */
+class RainTpl_Exception extends Exception{
+	/**
+	 * Path of template file with error.
+	 */
+	private $templateFile = '';
+
+	/**
+	 * Returns path of template file with error.
+	 *
+	 * @return string
+	 */
+	public function getTemplateFile()
+	{
+		return $this->templateFile;
+	}
+
+	/**
+	 * Sets path of template file with error.
+	 *
+	 * @param string $templateFile
+	 * @return RainTpl_Exception
+	 */
+	public function setTemplateFile($templateFile)
+	{
+		$this->templateFile = (string) $templateFile;
+		return $this;
+	}
+}
+
+/**
+ * Exception thrown when template file does not exists.
+ */
+class RainTpl_NotFoundException extends RainTpl_Exception{
+}
+
+/**
+ * Exception thrown when syntax error occurs.
+ */
+class RainTpl_SyntaxException extends RainTpl_Exception{
+	/**
+	 * Line in template file where error has occured.
+	 *
+	 * @var int | null
+	 */
+	private $templateLine = null;
+
+	/**
+	 * Tag which caused an error.
+	 *
+	 * @var string | null
+	 */
+	private $tag = null;
+
+	/**
+	 * Returns line in template file where error has occured
+	 * or null if line is not defined.
+	 *
+	 * @return int | null
+	 */
+	public function getTemplateLine()
+	{
+		return $this->templateLine;
+	}
+
+	/**
+	 * Sets  line in template file where error has occured.
+	 *
+	 * @param int $templateLine
+	 * @return RainTpl_SyntaxException
+	 */
+	public function setTemplateLine($templateLine)
+	{
+		$this->templateLine = (int) $templateLine;
+		return $this;
+	}
+
+	/**
+	 * Returns tag which caused an error.
+	 *
+	 * @return string
+	 */
+	public function getTag()
+	{
+		return $this->tag;
+	}
+
+	/**
+	 * Sets tag which caused an error.
+	 *
+	 * @param string $tag
+	 * @return RainTpl_SyntaxException
+	 */
+	public function setTag($tag)
+	{
+		$this->tag = (string) $tag;
+		return $this;
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/shaarli.css b/inc/shaarli.css
similarity index 90%
rename from shaarli.css
rename to inc/shaarli.css
index aba488a7..d0614e34 100644
--- a/shaarli.css
+++ b/inc/shaarli.css
@@ -7,9 +7,9 @@ version: 2.8.2r1
 */
 html{color:#000;background:#FFF;}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,button,textarea,p,blockquote,th,td{margin:0;padding:0;}table{border-collapse:collapse;border-spacing:0;}fieldset,img{border:0;}address,caption,cite,code,dfn,em,strong,th,var,optgroup{font-style:inherit;font-weight:inherit;}del,ins{text-decoration:none;}li{list-style:none;}caption,th{text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;}q:before,q:after{content:'';}abbr,acronym{border:0;font-variant:normal;}sup{vertical-align:baseline;}sub{vertical-align:baseline;}legend{color:#000;}input,button,textarea,select,optgroup,option{font-family:inherit;font-size:inherit;font-style:inherit;font-weight:inherit;}input,button,textarea,select{*font-size:100%;}
 
-body { font-family: "Trebuchet MS",Verdana,Arial,Helvetica,sans-serif; font-size:10pt; background-color: #ffffff; } 
+body { font-family: "Trebuchet MS",Verdana,Arial,Helvetica,sans-serif; font-size:10pt; background-color: #ffffff; }
 input, textarea {
-	
+
 	background-color: #dedede;
 	background: -webkit-gradient(linear, 0 0, 0 bottom, from(#dedede), to(#ffffff));
 	background: -webkit-linear-gradient(#dedede, #ffffff);
@@ -22,8 +22,8 @@ input, textarea {
 	border-radius: 5px 5px 5px 5px;
 	border: none;
 	color:#000;
-	
-	} 
+
+	}
 
 h1 { font-size:20pt; font-weight:bold; font-style:italic; margin-bottom:20px; }
 /* I don't give a shit about IE. He can't understand selectors such as input[type='submit']. */
@@ -46,7 +46,7 @@ h1 { font-size:20pt; font-weight:bold; font-style:italic; margin-bottom:20px; }
 	border-style:outset;
 	border-width:1px;
 
-	} 
+	}
 .smallbutton {
 	background: -moz-linear-gradient(#c0c0c0, #ffffff) repeat scroll 0 0 transparent;
 	background: -webkit-gradient(linear, 0 0, 0 bottom, from(#c0c0c0), to(#ffffff));
@@ -67,18 +67,19 @@ h1 { font-size:20pt; font-weight:bold; font-style:italic; margin-bottom:20px; }
 	}
 
 /* Edit/Delete buttons on links */
-.button_edit, .button_delete { border-radius:0; box-shadow:none; border-style:none; border-width:0; padding:0; background:none; } 
+.button_edit, .button_delete { border-radius:0; box-shadow:none; border-style:none; border-width:0; padding:0; background:none; }
 .button_edit { margin-left:10px; }
 
 
 #pageheader #logo{
-background-image: url('./images/logo.png');
+background-image: url('../images/logo.png');
 background-repeat: no-repeat;
 float:left;
 margin:0 10px 0 10px;
 width:105px;
 height:55px;
 cursor:pointer;
+
 }
 
 #pageheader
@@ -90,11 +91,11 @@ cursor:pointer;
 	background: -ms-linear-gradient(#333333, #111111);
 	background: -o-linear-gradient(#333333, #111111);
 	background: linear-gradient(#333333, #111111);
-	
+
     box-shadow: 0 1px 2px rgba(0, 0, 0, 0.5);
-	padding:5px 0 5px 0;
-    width: 100%;
-	margin: auto;
+	width:auto;
+	padding:0 10px 5px 10px;
+	margin: auto; 
 }
 
 #pageheader a
@@ -118,7 +119,7 @@ cursor:pointer;
 	clear:both;
 }
 #toolsdiv a span{
-	color:#ffffff;   
+	color:#ffffff;
 }
 .linksperpage,.tagfilter,.searchform,.addform {
 	background-color: #dedede;
@@ -129,12 +130,12 @@ cursor:pointer;
 	background: -o-linear-gradient(#dedede, #ffffff);
 	background: linear-gradient(#dedede, #ffffff);
 	display:inline;
-	
+
 	box-shadow: 0 1px 2px rgba(0, 0, 0, 0.5);
 	padding:5px;
 	border: none;
 	border-radius: 5px 5px 5px 5px;
-	margin:10px 3px 3px 3px;	
+	margin:10px 3px 3px 3px;
 	color:#cecece;
 }
 
@@ -175,7 +176,7 @@ cursor:pointer;
 
 #pageheader a:visited { color:#98C943; text-decoration:none;}
 #pageheader a:hover { color:#FFFFC9; text-decoration:none;}
-#pageheader a:active { color:#bbb; text-decoration:none;} 
+#pageheader a:active { color:#bbb; text-decoration:none;}
 #searchcriteria { padding: 4 0 5 5; font-weight:bold;}
 .paging { padding:5px;background-color:#777; color:#ccc; text-align:center;  clear:both;}
 .paging a:link { color:#ccc; text-decoration:none;}
@@ -186,8 +187,8 @@ cursor:pointer;
 #toolsdiv { color:#ffffff; padding:5 5 5 5; clear:left; }
 #uploaddiv { color:#ffffff; padding:5 5 5 5; clear:left; }
 #editlinkform { height:100%;color:#ffffff; padding:5 5 5 15px; width:80%; clear:left; }
-#linklist li { 
-	padding:4 10 15 20; border-top: 1px solid #bbb; clear:both; 
+#linklist li {
+	padding:4 10 15 20; border-top: 1px solid #bbb; clear:both;
 	background: -webkit-gradient(linear, 0 0, 0 bottom, from(#F2F2F2), to(#ffffff));
 	background: -webkit-linear-gradient(#F2F2F2, #ffffff);
 	background: -moz-linear-gradient(#F2F2F2, #ffffff);
@@ -197,39 +198,39 @@ cursor:pointer;
 }
 
 
-#linklist li.publicLinkHightLight:hover,#linklist li:hover{ 
+#linklist li.publicLinkHightLight:hover,#linklist li:hover{
 	background: #E9FFCE;
 }
-#linklist li.private { background: url('./images/private.png') no-repeat 10px center; padding-left:60px; }
+#linklist li.private { background: url('../images/private.png') no-repeat 10px center; padding-left:60px; }
 .private  .linktitle a {color:#969696;}
 .linktitle { font-size:14pt; font-weight:bold; }
 .linktitle a { text-decoration: none; color:#80AD48; }
 .linktitle a:hover { color:#F57900; }
 .linkdate { font-size:8pt; color:#888; }
-.linkdate a { background-image:url('./images/calendar.png');padding:2px 0 3px 20px;background-repeat:no-repeat;text-decoration: none; color:#E28E3F;  }
+.linkdate a { background-image:url('../images/calendar.png');padding:2px 0 3px 20px;background-repeat:no-repeat;text-decoration: none; color:#E28E3F;  }
 .linkdate a:hover { color: #F57900 }
 .linkurl { font-size:8pt; color:#4BAA74; }
-.linkdescription { color:#000; margin-top:0; margin-bottom:0; font-weight:normal; }
+.linkdescription { color:#000; margin-top:0; margin-bottom:12px; font-weight:normal; max-height:400px; overflow:auto; }
 .linkdescription a { text-decoration: none; color:#3465A4; }
 .linkdescription a:hover { color:#F57900; }
 .linktaglist { padding-top:10px;}
-.linktag { 
+.linktag {
 
-font-size:9pt; 
+font-size:9pt;
 	background: -webkit-gradient(linear, 0 0, 0 bottom, from(#F2F2F2), to(#ffffff));
 	background: -webkit-linear-gradient(#F2F2F2, #ffffff);
 	background: -moz-linear-gradient(#F2F2F2, #ffffff);
 	background: -ms-linear-gradient(#F2F2F2, #ffffff);
 	background: -o-linear-gradient(#F2F2F2, #ffffff);
 	background: linear-gradient(#F2F2F2, #ffffff);
-	
-	
+
+
     box-shadow: 0 0 2px rgba(0, 0, 0, 0.5);
 	padding:3px 3px 3px 20px;
 	height:20px;
 	border-radius: 3px 3px 3px 3px;
 	cursor:pointer;
-	background-image:url('./images/tag_blue.png');
+	background-image:url('../images/tag_blue.png');
 	background-repeat:no-repeat;
 	background-position:3px center;
 	background-color:#ffffff;
@@ -243,7 +244,7 @@ font-size:9pt;
 #footer { font-size:8pt; text-align:center; border-top:1px solid #ddd; color: #888; clear:both; }
 #footer  a{ color:#486D08;}
 #footer  a:hover{ color:#000000;}
-#newversion { background-color: #FFFFA0; color:#000; position:absolute; top:0;right:0; padding:2 7 2 7;  font-size:9pt;} 
+#newversion { background-color: #FFFFA0; color:#000; position:absolute; top:0;right:0; padding:2 7 2 7;  font-size:9pt;}
 #cloudtag  { padding-left:10%; padding-right:10%; }
 #cloudtag a { color:black; text-decoration:none; }
 #installform td  { font-size: 10pt; padding:10 5 10 5; clear:left; }
@@ -261,8 +262,8 @@ font-size:9pt;
 
 
 /* --- Picture wall CSS --- */
-#picwall_container { color:#fff; background-color:#000; }
-.picwall_pictureframe { z-index:5; position:relative; display:table-cell; vertical-align:middle;width:90px; height:90px; overflow:hidden; text-align:center;  float:left; }
+#picwall_container { color:#fff; background-color:#000; clear:both; }
+.picwall_pictureframe { background-color:#000; z-index:5; position:relative; display:table-cell; vertical-align:middle;width:90px; height:90px; overflow:hidden; text-align:center;  float:left; }
 .picwall_pictureframe img { max-width: 100%;height: auto; } /* Adapt the width of the image */
 .picwall_pictureframe a {text-decoration:none;}
 
@@ -311,4 +312,4 @@ a {color:#000!important;text-decoration:none!important;}
 
 
 
-}
\ No newline at end of file
+}
diff --git a/index.php b/index.php
index 7aec94da..e78733bf 100644
--- a/index.php
+++ b/index.php
@@ -1,5 +1,5 @@
 <?php
-// Shaarli 0.0.31 beta - Shaare your links...
+// Shaarli 0.0.32 beta - Shaare your links...
 // The personal, minimalist, super-fast, no-database delicious clone. By sebsauvage.net
 // http://sebsauvage.net/wiki/doku.php?id=php:shaarli
 // Licence: http://www.opensource.org/licenses/zlib-license.php
@@ -21,7 +21,7 @@ $GLOBALS['config']['ENABLE_THUMBNAILS'] = true; // Enable thumbnails in links.
 $GLOBALS['config']['CACHEDIR'] = 'cache'; // Cache directory for thumbnails for SLOW services (like flickr)
 $GLOBALS['config']['ENABLE_LOCALCACHE'] = true; // Enable Shaarli to store thumbnail in a local cache. Disable to reduce webspace usage.
 $GLOBALS['config']['PUBSUBHUB_URL'] = ''; // PubSubHubbub support. Put an empty string to disable, or put your hub url here to enable.
-                                          // Note: You must have publisher.php in the same directory as Shaarli index.php   
+                                          // Note: You must have publisher.php in the same directory as Shaarli index.php
 // -----------------------------------------------------------------------------------------------
 // Program config (touch at your own risks !)
 $GLOBALS['config']['UPDATECHECK_FILENAME'] = $GLOBALS['config']['DATADIR'].'/lastupdatecheck.txt'; // For updates check of Shaarli.
@@ -32,17 +32,21 @@ ini_set('post_max_size', '16M');
 ini_set('upload_max_filesize', '16M');
 define('PHPPREFIX','<?php /* '); // Prefix to encapsulate data in php code.
 define('PHPSUFFIX',' */ ?>'); // Suffix to encapsulate data in php code.
-$STARTTIME = microtime(true);  // Measure page execution time.
 checkphpversion();
 error_reporting(E_ALL^E_WARNING);  // See all error except warnings.
 //error_reporting(-1); // See all errors (for debugging only)
+
+include "inc/rain.tpl.class.php"; //include Rain TPL
+raintpl::$tpl_dir = "tpl/"; // template directory
+raintpl::$cache_dir = "tmp/"; // cache directory
+
 ob_start();
 
 // Optionnal config file.
 if (is_file($GLOBALS['config']['DATADIR'].'/options.php')) require($GLOBALS['config']['DATADIR'].'/options.php');
 
 // In case stupid admin has left magic_quotes enabled in php.ini:
-if (get_magic_quotes_gpc()) 
+if (get_magic_quotes_gpc())
 {
     function stripslashes_deep($value) { $value = is_array($value) ? array_map('stripslashes_deep', $value) : stripslashes($value); return $value; }
     $_POST = array_map('stripslashes_deep', $_POST);
@@ -54,24 +58,24 @@ header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
 header("Cache-Control: no-store, no-cache, must-revalidate");
 header("Cache-Control: post-check=0, pre-check=0", false);
 header("Pragma: no-cache");
-define('shaarli_version','0.0.31 beta');
+define('shaarli_version','0.0.32 beta');
 if (!is_dir($GLOBALS['config']['DATADIR'])) { mkdir($GLOBALS['config']['DATADIR'],0705); chmod($GLOBALS['config']['DATADIR'],0705); }
-if (!is_file($GLOBALS['config']['DATADIR'].'/.htaccess')) { file_put_contents($GLOBALS['config']['DATADIR'].'/.htaccess',"Allow from none\nDeny from all\n"); } // Protect data files.    
+if (!is_file($GLOBALS['config']['DATADIR'].'/.htaccess')) { file_put_contents($GLOBALS['config']['DATADIR'].'/.htaccess',"Allow from none\nDeny from all\n"); } // Protect data files.
 if ($GLOBALS['config']['ENABLE_LOCALCACHE'])
 {
     if (!is_dir($GLOBALS['config']['CACHEDIR'])) { mkdir($GLOBALS['config']['CACHEDIR'],0705); chmod($GLOBALS['config']['CACHEDIR'],0705); }
-    if (!is_file($GLOBALS['config']['CACHEDIR'].'/.htaccess')) { file_put_contents($GLOBALS['config']['CACHEDIR'].'/.htaccess',"Allow from none\nDeny from all\n"); } // Protect data files.    
+    if (!is_file($GLOBALS['config']['CACHEDIR'].'/.htaccess')) { file_put_contents($GLOBALS['config']['CACHEDIR'].'/.htaccess',"Allow from none\nDeny from all\n"); } // Protect data files.
 }
 if (!is_file($GLOBALS['config']['CONFIG_FILE'])) install();
 require $GLOBALS['config']['CONFIG_FILE'];  // Read login/password hash into $GLOBALS.
 // Small protection against dodgy config files:
-if (empty($GLOBALS['title'])) $GLOBALS['title']='Shared links on '.htmlspecialchars(serverUrl().$_SERVER['SCRIPT_NAME']);
+if (empty($GLOBALS['title'])) $GLOBALS['title']='Shared links on '.htmlspecialchars(indexUrl());
 if (empty($GLOBALS['timezone'])) $GLOBALS['timezone']=date_default_timezone_get();
 autoLocale(); // Sniff browser language and set date format accordingly.
 header('Content-Type: text/html; charset=utf-8'); // We use UTF-8 for proper international characters handling.
 $LINKSDB=false;
 
-// Check php version 
+// Check php version
 function checkphpversion()
 {
     if (version_compare(PHP_VERSION, '5.1.0') < 0)
@@ -79,7 +83,7 @@ function checkphpversion()
         header('Content-Type: text/plain; charset=utf-8');
         echo 'Your server supports php '.PHP_VERSION.'. Shaarli requires at last php 5.1.0, and thus cannot run. Sorry.';
         exit;
-    }        
+    }
 }
 
 // Checks if an update is available for Shaarli.
@@ -89,14 +93,14 @@ function checkphpversion()
 function checkUpdate()
 {
     if (!isLoggedIn()) return ''; // Do not check versions for visitors.
-    
+
     // Get latest version number at most once a day.
     if (!is_file($GLOBALS['config']['UPDATECHECK_FILENAME']) || (filemtime($GLOBALS['config']['UPDATECHECK_FILENAME'])<time()-($GLOBALS['config']['UPDATECHECK_INTERVAL'])))
     {
         $version=shaarli_version;
         list($httpstatus,$headers,$data) = getHTTP('http://sebsauvage.net/files/shaarli_version.txt',2);
         if (strpos($httpstatus,'200 OK')!==false) $version=$data;
-        // If failed, nevermind. We don't want to bother the user with that.  
+        // If failed, nevermind. We don't want to bother the user with that.
         file_put_contents($GLOBALS['config']['UPDATECHECK_FILENAME'],$version); // touch file date
     }
     // Compare versions:
@@ -121,7 +125,7 @@ function logm($message)
      - only use the following characters: a-z A-Z 0-9 - _ @
      - are NOT cryptographically secure (they CAN be forged)
    In Shaarli, they are used as a tinyurl-like link to individual entries.
-*/  
+*/
 function smallHash($text)
 {
     $t = rtrim(base64_encode(hash('crc32',$text,true)),'=');
@@ -137,11 +141,19 @@ function text2clickable($url)
     $redir = empty($GLOBALS['redirector']) ? '' : $GLOBALS['redirector'];
     return preg_replace('!((?:https?|ftp)://\S+[[:alnum:]]/?)!si','<a href="'.$redir.'$1" rel="nofollow">$1</a>',$url);
 }
+
+// This function inserts &nbsp; where relevant so that multiple spaces are properly displayed in HTML
+// even in the absence of <pre>  (This is used in description to keep text formatting)
+function keepMultipleSpaces($text)
+{
+	return str_replace('  ',' &nbsp;',$text);
+	
+}
 // ------------------------------------------------------------------------------------------
 // Sniff browser language to display dates in the right format automatically.
 // (Note that is may not work on your server if the corresponding local is not installed.)
 function autoLocale()
-{     
+{
     $loc='en_US'; // Default if browser does not send HTTP_ACCEPT_LANGUAGE
     if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) // eg. "fr,fr-fr;q=0.8,en;q=0.5,en-us;q=0.3"
     {   // (It's a bit crude, but it works very well. Prefered language is always presented first.)
@@ -160,8 +172,8 @@ function pubsubhub()
     {
        $p = new Publisher($GLOBALS['config']['PUBSUBHUB_URL']);
        $topic_url = array (
-                       serverUrl().$_SERVER['SCRIPT_NAME'].'?do=atom',
-                       serverUrl().$_SERVER['SCRIPT_NAME'].'?do=rss'
+                       indexUrl().'?do=atom',
+                       indexUrl().'?do=rss'
                     );
        $p->publish_update($topic_url);
     }
@@ -187,7 +199,7 @@ function allIPs()
 }
 
 // Check that user/password is correct.
-function check_auth($login,$password) 
+function check_auth($login,$password)
 {
     $hash = sha1($password.$login.$GLOBALS['salt']);
     if ($login==$GLOBALS['login'] && $hash==$GLOBALS['hash'])
@@ -205,9 +217,9 @@ function check_auth($login,$password)
 
 // Returns true if the user is logged in.
 function isLoggedIn()
-{ 
-    if ($GLOBALS['config']['OPEN_SHAARLI']) return true; 
-    
+{
+    if ($GLOBALS['config']['OPEN_SHAARLI']) return true;
+
     // If session does not exist on server side, or IP address has changed, or session has expired, logout.
     if (empty($_SESSION['uid']) || $_SESSION['ip']!=allIPs() || time()>=$_SESSION['expires_on'])
     {
@@ -216,7 +228,7 @@ function isLoggedIn()
     }
     if (!empty($_SESSION['longlastingsession']))  $_SESSION['expires_on']=time()+$_SESSION['longlastingsession']; // In case of "Stay signed in" checked.
     else $_SESSION['expires_on']=time()+INACTIVITY_TIMEOUT; // Standard session expiration date.
-    
+
     return true;
 }
 
@@ -260,7 +272,7 @@ function ban_canLogin()
     if (isset($gb['BANS'][$ip]))
     {
         // User is banned. Check if the ban has expired:
-        if ($gb['BANS'][$ip]<=time())  
+        if ($gb['BANS'][$ip]<=time())
         {   // Ban expired, user can try to login again.
             logm('Ban lifted.');
             unset($gb['FAILURES'][$ip]); unset($gb['BANS'][$ip]);
@@ -279,36 +291,36 @@ if (isset($_POST['login']))
     if (!ban_canLogin()) die('I said: NO. You are banned for the moment. Go away.');
     if (isset($_POST['password']) && tokenOk($_POST['token']) && (check_auth($_POST['login'], $_POST['password'])))
     {   // Login/password is ok.
-        ban_loginOk();  
+        ban_loginOk();
         // If user wants to keep the session cookie even after the browser closes:
         if (!empty($_POST['longlastingsession']))
         {
             $_SESSION['longlastingsession']=31536000;  // (31536000 seconds = 1 year)
             $_SESSION['expires_on']=time()+$_SESSION['longlastingsession'];  // Set session expiration on server-side.
-            session_set_cookie_params($_SESSION['longlastingsession']); // Set session cookie expiration on client side 
+            session_set_cookie_params($_SESSION['longlastingsession']); // Set session cookie expiration on client side
             session_regenerate_id(true);  // Send cookie with new expiration date to browser.
         }
         else // Standard session expiration (=when browser closes)
         {
             session_set_cookie_params(0); // 0 means "When browser closes"
-            session_regenerate_id(true); 
+            session_regenerate_id(true);
         }
         // Optional redirect after login:
         if (isset($_GET['post'])) { header('Location: ?post='.urlencode($_GET['post']).(!empty($_GET['title'])?'&title='.urlencode($_GET['title']):'').(!empty($_GET['source'])?'&source='.urlencode($_GET['source']):'')); exit; }
         if (isset($_POST['returnurl']))
-        { 
+        {
             if (endsWith($_POST['returnurl'],'?do=login')) { header('Location: ?'); exit; } // Prevent loops over login screen.
-            header('Location: '.$_POST['returnurl']); exit; 
+            header('Location: '.$_POST['returnurl']); exit;
         }
         header('Location: ?'); exit;
     }
     else
     {
-        ban_loginFailed(); 
+        ban_loginFailed();
         echo '<script language="JavaScript">alert("Wrong login/password.");document.location=\'?do=login\';</script>'; // Redirect to login screen.
-        exit;   
+        exit;
     }
-} 
+}
 
 // ------------------------------------------------------------------------------------------
 // Misc utility functions:
@@ -318,15 +330,20 @@ if (isset($_POST['login']))
 // You can append $_SERVER['SCRIPT_NAME'] to get the current script URL.
 function serverUrl()
 {
-        $serverport = ($_SERVER["SERVER_PORT"]!='80' ? ':'.$_SERVER["SERVER_PORT"] : ''); 
+        $serverport = ($_SERVER["SERVER_PORT"]=='80' || (!empty($_SERVER['HTTPS']) && $_SERVER["SERVER_PORT"]=='443') ? '' : ':'.$_SERVER["SERVER_PORT"]);
         return 'http'.(!empty($_SERVER['HTTPS'])?'s':'').'://'.$_SERVER["SERVER_NAME"].$serverport;
 }
 
+function indexUrl()
+{
+        return serverUrl() . ($_SERVER["SCRIPT_NAME"] == '/index.php' ? '' : $_SERVER["SCRIPT_NAME"]);
+}
+
 // Convert post_max_size/upload_max_filesize (eg.'16M') parameters to bytes.
-function return_bytes($val) 
+function return_bytes($val)
 {
     $val = trim($val); $last=strtolower($val[strlen($val)-1]);
-    switch($last) 
+    switch($last)
     {
         case 'g': $val *= 1024;
         case 'm': $val *= 1024;
@@ -396,7 +413,7 @@ function linkdate2locale($linkdate)
 }
 
 // Parse HTTP response headers and return an associative array.
-function http_parse_headers_shaarli( $headers ) 
+function http_parse_headers_shaarli( $headers )
 {
     $res=array();
     foreach($headers as $header)
@@ -444,9 +461,9 @@ function getHTTP($url,$timeout=30)
 
 // Extract title from an HTML document.
 // (Returns an empty string if not found.)
-function html_extract_title($html) 
+function html_extract_title($html)
 {
-  return preg_match('!<title>(.*?)</title>!is', $html, $matches) ? trim(str_replace("\n",' ', $matches[1])) : '' ;   
+  return preg_match('!<title>(.*?)</title>!is', $html, $matches) ? trim(str_replace("\n",' ', $matches[1])) : '' ;
 }
 
 // ------------------------------------------------------------------------------------------
@@ -459,11 +476,11 @@ function getToken()
 {
     $rnd = sha1(uniqid('',true).'_'.mt_rand());  // We generate a random string.
     $_SESSION['tokens'][$rnd]=1;  // Store it on the server side.
-    return $rnd;    
+    return $rnd;
 }
 
 // Tells if a token is ok. Using this function will destroy the token.
-// true=token is ok. 
+// true=token is ok.
 function tokenOk($token)
 {
     if (isset($_SESSION['tokens'][$token]))
@@ -474,6 +491,58 @@ function tokenOk($token)
     return false; // Wrong token, or already used.
 }
 
+// ------------------------------------------------------------------------------------------
+/* This class is in charge of building the final page.
+   (This is basically a wrapper around RainTPL which pre-fills some fields.)
+   p = new pageBuilder;
+   p.assign('myfield','myvalue');
+   p.renderPage('mytemplate');
+   
+*/
+class pageBuilder
+{
+    private $tpl; // RainTPL template
+    function __construct()
+    {
+        $this->tpl=false;
+    } 
+
+    private function initialize()
+    {    
+        global $LINKSDB;
+        $this->tpl = new RainTPL;    
+        $this->tpl->assign('newversion',checkUpdate());
+        $this->tpl->assign('linkcount',count($LINKSDB));
+        $this->tpl->assign('feedurl',htmlspecialchars(indexUrl()));
+        $searchcrits=''; // Search criteria
+        if (!empty($_GET['searchtags'])) $searchcrits.='&searchtags='.$_GET['searchtags'];
+        elseif (!empty($_GET['searchterm'])) $searchcrits.='&searchterm='.$_GET['searchterm'];
+        $this->tpl->assign('searchcrits',$searchcrits);
+        $this->tpl->assign('source',indexUrl());
+        $this->tpl->assign('version',shaarli_version);
+        $this->tpl->assign('pagetitle','Shaarli');
+        if (!empty($GLOBALS['title'])) $this->tpl->assign('pagetitle',$GLOBALS['title']);
+        if (!empty($GLOBALS['pagetitle'])) $this->tpl->assign('pagetitle',$GLOBALS['pagetitle']);
+        $this->tpl->assign('shaarlititle',empty($GLOBALS['title']) ? 'Shaarli': $GLOBALS['title'] );
+        return;    
+    }
+    
+    // The following assign() method is basically the same as RainTPL (except that it's lazy)
+    public function assign($what,$where)
+    {
+        if ($this->tpl===false) $this->initialize(); // Lazy initialization
+        $this->tpl->assign($what,$where);
+    }
+    
+    // Render a specific page (using a template).
+    // eg. pb.renderPage('picwall')
+    public function renderPage($page)
+    {
+        if ($this->tpl===false) $this->initialize(); // Lazy initialization
+        $this->tpl->draw($page);
+    }
+}
+
 // ------------------------------------------------------------------------------------------
 /* Data storage for links.
    This object behaves like an associative array.
@@ -482,14 +551,13 @@ function tokenOk($token)
       echo $mylinks['20110826_161819']['title'];
       foreach($mylinks as $link)
          echo $link['title'].' at url '.$link['url'].' ; description:'.$link['description'];
-   
+
    We implement 3 interfaces:
      - ArrayAccess so that this object behaves like an associative array.
      - Iterator so that this object can be used in foreach() loops.
      - Countable interface so that we can do a count() on this object.
 */
 class linkdb implements Iterator, Countable, ArrayAccess
-
 {
     private $links; // List of links (associative array. Key=linkdate (eg. "20110823_124546"), value= associative array (keys:title,description...)
     private $urls;  // List of all recorded URLs (key=url, value=linkdate) for fast reserve search (url-->linkdate)
@@ -504,8 +572,8 @@ class linkdb implements Iterator, Countable, ArrayAccess
         $this->loggedin = $isLoggedIn;
         $this->checkdb(); // Make sure data file exists.
         $this->readdb();  // Then read it.
-    } 
-    
+    }
+
     // ---- Countable interface implementation
     public function count() { return count($this->links); }
 
@@ -516,17 +584,17 @@ class linkdb implements Iterator, Countable, ArrayAccess
         if (empty($value['linkdate']) || empty($value['url'])) die('Internal Error: A link should always have a linkdate and url.');
         if (empty($offset)) die('You must specify a key.');
         $this->links[$offset] = $value;
-        $this->urls[$value['url']]=$offset;    
+        $this->urls[$value['url']]=$offset;
     }
     public function offsetExists($offset) { return array_key_exists($offset,$this->links); }
     public function offsetUnset($offset)
-    { 
+    {
         if (!$this->loggedin) die('You are not authorized to delete a link.');
-        $url = $this->links[$offset]['url']; unset($this->urls[$url]);    
-        unset($this->links[$offset]); 
+        $url = $this->links[$offset]['url']; unset($this->urls[$url]);
+        unset($this->links[$offset]);
     }
     public function offsetGet($offset) { return isset($this->links[$offset]) ? $this->links[$offset] : null; }
-    
+
     // ---- Iterator interface implementation
     function rewind() { $this->keys=array_keys($this->links); rsort($this->keys); $this->position=0; } // Start over for iteration, ordered by date (latest first).
     function key() { return $this->keys[$this->position]; } // current key
@@ -543,18 +611,18 @@ class linkdb implements Iterator, Countable, ArrayAccess
              $link = array('title'=>'Shaarli - sebsauvage.net','url'=>'http://sebsauvage.net/wiki/doku.php?id=php:shaarli','description'=>'Welcome to Shaarli ! This is a bookmark. To edit or delete me, you must first login.','private'=>0,'linkdate'=>'20110914_190000','tags'=>'opensource software');
              $this->links[$link['linkdate']] = $link;
              $link = array('title'=>'My secret stuff... - Pastebin.com','url'=>'http://pastebin.com/smCEEeSn','description'=>'SShhhh!!  I\'m a private link only YOU can see. You can delete me too.','private'=>1,'linkdate'=>'20110914_074522','tags'=>'secretstuff');
-             $this->links[$link['linkdate']] = $link;             
+             $this->links[$link['linkdate']] = $link;
              file_put_contents($GLOBALS['config']['DATASTORE'], PHPPREFIX.base64_encode(gzdeflate(serialize($this->links))).PHPSUFFIX); // Write database to disk
-        }    
+        }
     }
-    
+
     // Read database from disk to memory
-    private function readdb() 
+    private function readdb()
     {
         // Read data
         $this->links=(file_exists($GLOBALS['config']['DATASTORE']) ? unserialize(gzinflate(base64_decode(substr(file_get_contents($GLOBALS['config']['DATASTORE']),strlen(PHPPREFIX),-strlen(PHPSUFFIX))))) : array() );
         // Note that gzinflate is faster than gzuncompress. See: http://www.php.net/manual/en/function.gzdeflate.php#96439
-        
+
         // If user is not logged in, filter private links.
         if (!$this->loggedin)
         {
@@ -562,21 +630,21 @@ class linkdb implements Iterator, Countable, ArrayAccess
             foreach($this->links as $link) { if ($link['private']!=0) $toremove[]=$link['linkdate']; }
             foreach($toremove as $linkdate) { unset($this->links[$linkdate]); }
         }
-        
+
         // Keep the list of the mapping URLs-->linkdate up-to-date.
         $this->urls=array();
         foreach($this->links as $link) { $this->urls[$link['url']]=$link['linkdate']; }
     }
 
-    // Save database from memory to disk.    
-    public function savedb() 
+    // Save database from memory to disk.
+    public function savedb()
     {
         if (!$this->loggedin) die('You are not authorized to change the database.');
         file_put_contents($GLOBALS['config']['DATASTORE'], PHPPREFIX.base64_encode(gzdeflate(serialize($this->links))).PHPSUFFIX);
     }
-    
+
     // Returns the link for a given URL (if it exists). false it does not exist.
-    public function getLinkFromUrl($url) 
+    public function getLinkFromUrl($url)
     {
         if (isset($this->urls[$url])) return $this->links[$this->urls[$url]];
         return false;
@@ -584,14 +652,14 @@ class linkdb implements Iterator, Countable, ArrayAccess
 
     // Case insentitive search among links (in url, title and description). Returns filtered list of links.
     // eg. print_r($mydb->filterFulltext('hollandais'));
-    public function filterFulltext($searchterms)  
+    public function filterFulltext($searchterms)
     {
         // FIXME: explode(' ',$searchterms) and perform a AND search.
         // FIXME: accept double-quotes to search for a string "as is" ?
         $filtered=array();
         $s = strtolower($searchterms);
         foreach($this->links as $l)
-        { 
+        {
             $found=   (strpos(strtolower($l['title']),$s)!==false)
                    || (strpos(strtolower($l['description']),$s)!==false)
                    || (strpos(strtolower($l['url']),$s)!==false)
@@ -601,7 +669,7 @@ class linkdb implements Iterator, Countable, ArrayAccess
         krsort($filtered);
         return $filtered;
     }
-    
+
     // Filter by tag.
     // You can specify one or more tags (tags can be separated by space or comma).
     // eg. print_r($mydb->filterTags('linux programming'));
@@ -611,22 +679,22 @@ class linkdb implements Iterator, Countable, ArrayAccess
         $searchtags=explode(' ',$t);
         $filtered=array();
         foreach($this->links as $l)
-        { 
+        {
             $linktags = explode(' ',($casesensitive?$l['tags']:strtolower($l['tags'])));
             if (count(array_intersect($linktags,$searchtags)) == count($searchtags))
                 $filtered[$l['linkdate']] = $l;
         }
         krsort($filtered);
         return $filtered;
-    }   
-    
+    }
+
     // Filter by smallHash.
     // Only 1 article is returned.
     public function filterSmallHash($smallHash)
     {
         $filtered=array();
         foreach($this->links as $l)
-        { 
+        {
             if ($smallHash==smallHash($l['linkdate'])) // Yes, this is ugly and slow
             {
                 $filtered[$l['linkdate']] = $l;
@@ -634,7 +702,7 @@ class linkdb implements Iterator, Countable, ArrayAccess
             }
         }
         return $filtered;
-    }     
+    }
 
     // Returns the list of all tags
     // Output: associative array key=tags, value=0
@@ -646,7 +714,7 @@ class linkdb implements Iterator, Countable, ArrayAccess
                 if (!empty($tag)) $tags[$tag]=(empty($tags[$tag]) ? 1 : $tags[$tag]+1);
         arsort($tags); // Sort tags by usage (most used tag first)
         return $tags;
-    }  
+    }
 }
 
 // ------------------------------------------------------------------------------------------
@@ -654,15 +722,15 @@ class linkdb implements Iterator, Countable, ArrayAccess
 function showRSS()
 {
     global $LINKSDB;
-    
+
     // Optionnaly filter the results:
     $linksToDisplay=array();
     if (!empty($_GET['searchterm'])) $linksToDisplay = $LINKSDB->filterFulltext($_GET['searchterm']);
     elseif (!empty($_GET['searchtags']))   $linksToDisplay = $LINKSDB->filterTags(trim($_GET['searchtags']));
     else $linksToDisplay = $LINKSDB;
-        
+
     header('Content-Type: application/rss+xml; charset=utf-8');
-    $pageaddr=htmlspecialchars(serverUrl().$_SERVER["SCRIPT_NAME"]);
+    $pageaddr=htmlspecialchars(indexUrl());
     echo '<?xml version="1.0" encoding="UTF-8"?><rss version="2.0" xmlns:content="http://purl.org/rss/1.0/modules/content/">';
     echo '<channel><title>'.htmlspecialchars($GLOBALS['title']).'</title><link>'.$pageaddr.'</link>';
     echo '<description>Shared links</description><language>en-en</language><copyright>'.$pageaddr.'</copyright>'."\n\n";
@@ -678,16 +746,17 @@ function showRSS()
     while ($i<50 && $i<count($keys))
     {
         $link = $linksToDisplay[$keys[$i]];
+        $guid = $pageaddr.'?'.smallHash($link['linkdate']);
         $rfc822date = linkdate2rfc822($link['linkdate']);
         $absurl = htmlspecialchars($link['url']);
         if (startsWith($absurl,'?')) $absurl=$pageaddr.$absurl;  // make permalink URL absolute
-        echo '<item><title>'.htmlspecialchars($link['title']).'</title><guid>'.$absurl.'</guid><link>'.$absurl.'</link>';
+        echo '<item><title>'.htmlspecialchars($link['title']).'</title><guid>'.$guid.'</guid><link>'.$absurl.'</link>';
         if (!$GLOBALS['config']['HIDE_TIMESTAMPS'] || isLoggedIn()) echo '<pubDate>'.htmlspecialchars($rfc822date)."</pubDate>\n";
         if ($link['tags']!='') // Adding tags to each RSS entry (as mentioned in RSS specification)
-        {     
+        {
             foreach(explode(' ',$link['tags']) as $tag) { echo '<category domain="'.htmlspecialchars($pageaddr).'">'.htmlspecialchars($tag).'</category>'."\n"; }
-        }          
-        echo '<description><![CDATA['.nl2br(text2clickable(htmlspecialchars($link['description']))).']]></description>'."\n</item>\n";      
+        }
+        echo '<description><![CDATA['.nl2br(keepMultipleSpaces(text2clickable(htmlspecialchars($link['description'])))).']]></description>'."\n</item>\n";
         $i++;
     }
     echo '</channel></rss>';
@@ -699,15 +768,15 @@ function showRSS()
 function showATOM()
 {
     global $LINKSDB;
-    
+
     // Optionnaly filter the results:
     $linksToDisplay=array();
     if (!empty($_GET['searchterm'])) $linksToDisplay = $LINKSDB->filterFulltext($_GET['searchterm']);
     elseif (!empty($_GET['searchtags']))   $linksToDisplay = $LINKSDB->filterTags(trim($_GET['searchtags']));
     else $linksToDisplay = $LINKSDB;
-    
+
     header('Content-Type: application/atom+xml; charset=utf-8');
-    $pageaddr=htmlspecialchars(serverUrl().$_SERVER["SCRIPT_NAME"]);
+    $pageaddr=htmlspecialchars(indexUrl());
     $latestDate = '';
     $entries='';
     $i=0;
@@ -715,19 +784,20 @@ function showATOM()
     while ($i<50 && $i<count($keys))
     {
         $link = $linksToDisplay[$keys[$i]];
+        $guid = $pageaddr.'?'.smallHash($link['linkdate']);
         $iso8601date = linkdate2iso8601($link['linkdate']);
         $latestDate = max($latestDate,$iso8601date);
         $absurl = htmlspecialchars($link['url']);
-        if (startsWith($absurl,'?')) $absurl=$pageaddr.$absurl;  // make permalink URL absolute        
-        $entries.='<entry><title>'.htmlspecialchars($link['title']).'</title><link href="'.$absurl.'" /><id>'.$absurl.'</id>';
+        if (startsWith($absurl,'?')) $absurl=$pageaddr.$absurl;  // make permalink URL absolute
+        $entries.='<entry><title>'.htmlspecialchars($link['title']).'</title><link href="'.$absurl.'" /><id>'.$guid.'</id>';
         if (!$GLOBALS['config']['HIDE_TIMESTAMPS'] || isLoggedIn()) $entries.='<updated>'.htmlspecialchars($iso8601date).'</updated>';
-        $entries.='<summary>'.nl2br(text2clickable(htmlspecialchars($link['description'])))."</summary>\n";
+        $entries.='<summary>'.nl2br(keepMultipleSpaces(text2clickable(htmlspecialchars($link['description']))))."</summary>\n";
         if ($link['tags']!='') // Adding tags to each ATOM entry (as mentioned in ATOM specification)
-        {     
+        {
             foreach(explode(' ',$link['tags']) as $tag)
                 { $entries.='<category scheme="'.htmlspecialchars($pageaddr,ENT_QUOTES).'" term="'.htmlspecialchars($tag,ENT_QUOTES).'" />'."\n"; }
-        }  
-        $entries.="</entry>\n";      
+        }
+        $entries.="</entry>\n";
         $i++;
     }
     $feed='<?xml version="1.0" encoding="UTF-8"?><feed xmlns="http://www.w3.org/2005/Atom">';
@@ -749,92 +819,79 @@ function showATOM()
 }
 
 // ------------------------------------------------------------------------------------------
-// Render HTML page:
+// Render HTML page (according to URL parameters and user rights)
 function renderPage()
 {
-    global $STARTTIME;
     global $LINKSDB;
-    
-    // Well... rendering the page would be 100x better with the excellent Smarty, but I don't want to tie this minimalist project to 100+ files.
-    // So I use a custom templating system.
-    
+
     // -------- Display login form.
-    if (startswith($_SERVER["QUERY_STRING"],'do=login'))
+    if (isset($_SERVER["QUERY_STRING"]) && startswith($_SERVER["QUERY_STRING"],'do=login'))
     {
         if ($GLOBALS['config']['OPEN_SHAARLI']) { header('Location: ?'); exit; }  // No need to login for open Shaarli
-        if (!ban_canLogin())
-        { 
-            $loginform='<div id="headerform">You have been banned from login after too many failed attempts. Try later.</div>';
-            $data = array('pageheader'=>$loginform,'body'=>'','onload'=>''); 
-            templatePage($data);
-            exit;
-        }
-        $returnurl_html = (isset($_SERVER['HTTP_REFERER']) ? '<input type="hidden" name="returnurl" value="'.htmlspecialchars($_SERVER['HTTP_REFERER']).'">' : '');        
-        $loginform='<div id="headerform"><form method="post" name="loginform">Login: <input type="text" name="login">&nbsp;&nbsp;&nbsp;Password : <input type="password" name="password"> <input type="submit" value="Login" class="bigbutton"><br>';
-        $loginform.='<input style="margin:10 0 0 40;" type="checkbox" name="longlastingsession" id="longlastingsession"><label for="longlastingsession">&nbsp;Stay signed in (Do not check on public computers)</label><input type="hidden" name="token" value="'.getToken().'">'.$returnurl_html.'</form></div>';
-        $onload = 'onload="document.loginform.login.focus();"';
-        $data = array('pageheader'=>$loginform,'body'=>'','onload'=>$onload); 
-        templatePage($data);
+        $token=''; if (ban_canLogin()) $token=getToken(); // Do not waste token generation if not useful.
+        $PAGE = new pageBuilder;
+	    $PAGE->assign('token',$token);
+        $PAGE->assign('returnurl',(isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER']:''));
+        $PAGE->renderPage('loginform');
         exit;
     }
     // -------- User wants to logout.
-    if (startswith($_SERVER["QUERY_STRING"],'do=logout'))
-    { 
-        invalidateCaches(); 
-        logout(); 
-        header('Location: ?'); 
-        exit; 
-    }  
+    if (isset($_SERVER["QUERY_STRING"]) && startswith($_SERVER["QUERY_STRING"],'do=logout'))
+    {
+        invalidateCaches();
+        logout();
+        header('Location: ?');
+        exit;
+    }
 
     // -------- Picture wall
-    if (startswith($_SERVER["QUERY_STRING"],'do=picwall'))
-    { 
+    if (isset($_SERVER["QUERY_STRING"]) && startswith($_SERVER["QUERY_STRING"],'do=picwall'))
+    {
         // Optionnaly filter the results:
-        $linksToDisplay=array();
-        if (!empty($_GET['searchterm'])) $linksToDisplay = $LINKSDB->filterFulltext($_GET['searchterm']);
-        elseif (!empty($_GET['searchtags']))   $linksToDisplay = $LINKSDB->filterTags(trim($_GET['searchtags']));
-        else $linksToDisplay = $LINKSDB;
+        $links=array();
+        if (!empty($_GET['searchterm'])) $links = $LINKSDB->filterFulltext($_GET['searchterm']);
+        elseif (!empty($_GET['searchtags']))   $links = $LINKSDB->filterTags(trim($_GET['searchtags']));
+        else $links = $LINKSDB;
         $body='';
-        
-        foreach($linksToDisplay as $link)
+        $linksToDisplay=array();
+
+        // Get only links which have a thumbnail.
+        foreach($links as $link)
         {
-            $href='?'.htmlspecialchars(smallhash($link['linkdate']),ENT_QUOTES);
-            $thumb=thumbnail($link['url'],$href);
-            if ($thumb!='')
+            $permalink='?'.htmlspecialchars(smallhash($link['linkdate']),ENT_QUOTES);
+            $thumb=thumbnail($link['url'],$permalink);
+            if ($thumb!='') // Only output links which have a thumbnail.
             {
-                $body.='<div class="picwall_pictureframe">'.$thumb.'<a href="'.$href.'"><span class="info">'.htmlspecialchars($link['title']).'</span></a></div>';
-                
+	            $link['thumbnail']=$thumb; // Thumbnail HTML code.
+	            $link['permalink']=$permalink;
+	            $linksToDisplay[]=$link; // Add to array.
             }
         }
-        $body = '<center><div id="picwall_container">'.$body.'<hr style="width:0;height:0;clear:both;"></div></center>';
-        $data = array('pageheader'=>'<br>&nbsp;','body'=>$body,'onload'=>''); 
-        templatePage($data);
-        exit;        
-        
-    }      
+        $PAGE = new pageBuilder;
+	    $PAGE->assign('linksToDisplay',$linksToDisplay);
+	    $PAGE->renderPage('picwall');
+        exit;
+    }
 
     // -------- Tag cloud
-    if (startswith($_SERVER["QUERY_STRING"],'do=tagcloud'))
-    { 
+    if (isset($_SERVER["QUERY_STRING"]) && startswith($_SERVER["QUERY_STRING"],'do=tagcloud'))
+    {
         $tags= $LINKSDB->allTags();
         // We sort tags alphabetically, then choose a font size according to count.
         // First, find max value.
         $maxcount=0; foreach($tags as $key=>$value) $maxcount=max($maxcount,$value);
         ksort($tags);
-        $cloud='';
+        $tagList=array();
         foreach($tags as $key=>$value)
         {
-            $size = max(40*$value/$maxcount,8); // Minimum size 8.
-            $colorvalue = 128-ceil(127*$value/$maxcount);
-            $color='rgb('.$colorvalue.','.$colorvalue.','.$colorvalue.')';
-            $cloud.= '<span style="color:#99f; font-size:9pt; padding-left:5px; padding-right:2px;">'.$value.'</span><a href="?searchtags='.htmlspecialchars($key).'" style="font-size:'.$size.'pt; font-weight:bold; color:'.$color.';">'.htmlspecialchars($key).'</a> ';
+	        $tagList[$key] = array('count'=>$value,'size'=>max(40*$value/$maxcount,8));
         }
-        $cloud='<div id="cloudtag">'.$cloud.'</div>';
-        $data = array('pageheader'=>'','body'=>$cloud,'onload'=>''); 
-        templatePage($data);
-        exit;
-    }     
-    
+        $PAGE = new pageBuilder;
+	    $PAGE->assign('tags',$tagList);
+	    $PAGE->renderPage('tagcloud');
+        exit;	
+    }
+
     // -------- User clicks on a tag in a link: The tag is added to the list of searched tags (searchtags=...)
     if (isset($_GET['addtag']))
     {
@@ -862,8 +919,8 @@ function renderPage()
         }
         header('Location: ?'.http_build_query($params));
         exit;
-    }    
-    
+    }
+
     // -------- User wants to change the number of links per page (linksperpage=...)
     if (isset($_GET['linksperpage']))
     {
@@ -871,57 +928,37 @@ function renderPage()
         header('Location: '.(empty($_SERVER['HTTP_REFERER'])?'?':$_SERVER['HTTP_REFERER']));
         exit;
     }
-    
-    
+
+
     // -------- Handle other actions allowed for non-logged in users:
     if (!isLoggedIn())
     {
         // User tries to post new link but is not loggedin:
         // Show login screen, then redirect to ?post=...
-        if (isset($_GET['post'])) 
+        if (isset($_GET['post']))
         {
             header('Location: ?do=login&post='.urlencode($_GET['post']).(!empty($_GET['title'])?'&title='.urlencode($_GET['title']):'').(!empty($_GET['source'])?'&source='.urlencode($_GET['source']):'')); // Redirect to login page, then back to post link.
             exit;
         }
-        
-        // Show search form and display list of links.
-        $searchform=<<<HTML
-<div id="headerform" style="width:100%; white-space:nowrap;";>
-    <form method="GET" class="searchform" name="searchform" style="display:inline;"><input type="text" name="searchterm" style="width:30%" value=""> <input type="submit" value="Search" class="bigbutton"></form>
-    <form method="GET" class="tagfilter" name="tagfilter" style="display:inline;margin-left:24px;"><input type="text" name="searchtags" id="searchtags" style="width:10%" value=""> <input type="submit" value="Filter by tag" class="bigbutton"></form>
-</div>
-HTML;
-        $data = array('pageheader'=>$searchform,'body'=>templateLinkList(),'onload'=>''); 
-        templatePage($data);
-        exit; // Never remove this one ! All operations below are reserved for logged in user.
+	    $PAGE = new pageBuilder;
+	    buildLinkList($PAGE); // Compute list of links to display
+	    $PAGE->renderPage('linklist');
+	    exit; // Never remove this one ! All operations below are reserved for logged in user.
     }
-    
+
     // -------- All other functions are reserved for the registered user:
-    
+
     // -------- Display the Tools menu if requested (import/export/bookmarklet...)
-    if (startswith($_SERVER["QUERY_STRING"],'do=tools'))
-    {
-        $pageabsaddr=serverUrl().$_SERVER["SCRIPT_NAME"]; // Why doesn't php have a built-in function for that ?
-        // The javascript code for the bookmarklet:
-        $changepwd = ($GLOBALS['config']['OPEN_SHAARLI'] ? '' : '<a href="?do=changepasswd"><b>Change password</b>  <span>: Change your password.</span></a><br><br>' );
-        $toolbar= <<<HTML
-<div id="toolsdiv">
-    {$changepwd}        
-    <a href="?do=configure"><b>Configure your Shaarli</b> <span>:  Change Title, timezone...</span></a><br><br>
-    <a href="?do=changetag"><b>Rename/delete tags</b> <span>:  Rename or delete a tag in all links</span></a><br><br>
-    <a href="?do=import"><b>Import</b> <span>:  Import Netscape html bookmarks (as exported from Firefox, Chrome, Opera, delicious...)</span></a> <br><br>
-    <a href="?do=export"><b>Export</b> <span>:  Export Netscape html bookmarks (which can be imported in Firefox, Chrome, Opera, delicious...)</span></a><br><br>
-<a class="smallbutton" onclick="alert('Drag this link to your bookmarks toolbar, or right-click it and choose Bookmark This Link...');return false;" href="javascript:javascript:(function(){var%20url%20=%20location.href;var%20title%20=%20document.title%20||%20url;window.open('{$pageabsaddr}?post='%20+%20encodeURIComponent(url)+'&amp;title='%20+%20encodeURIComponent(title)+'&amp;source=bookmarklet','_blank','menubar=no,height=390,width=600,toolbar=no,scrollbars=no,status=no');})();"><b>Shaare link</b></a> <a href="#" style="clear:none;"><span>&#x21D0; Drag this link to your bookmarks toolbar (or right-click it and choose Bookmark This Link....). Then click "Shaare link" button in any page you want to share.</span></a><br><br>
-    <div class="clear"></div>
-    </div>
-HTML;
-        $data = array('pageheader'=>$toolbar,'body'=>'','onload'=>''); 
-        templatePage($data);
+    if (isset($_SERVER["QUERY_STRING"]) && startswith($_SERVER["QUERY_STRING"],'do=tools'))
+    {
+	    $PAGE = new pageBuilder;
+	    $PAGE->assign('pageabsaddr',indexUrl());
+	    $PAGE->renderPage('tools');
         exit;
     }
 
     // -------- User wants to change his/her password.
-    if (startswith($_SERVER["QUERY_STRING"],'do=changepasswd'))
+    if (isset($_SERVER["QUERY_STRING"]) && startswith($_SERVER["QUERY_STRING"],'do=changepasswd'))
     {
         if ($GLOBALS['config']['OPEN_SHAARLI']) die('You are not supposed to change a password on an Open Shaarli.');
         if (!empty($_POST['setpassword']) && !empty($_POST['oldpassword']))
@@ -938,32 +975,25 @@ HTML;
             echo '<script language="JavaScript">alert("Your password has been changed.");document.location=\'?do=tools\';</script>';
             exit;
         }
-        else
+        else // show the change password form.
         {
-            $token = getToken();
-            $changepwdform= <<<HTML
-<form method="POST" action="" name="changepasswordform" id="changepasswordform">
-Old password: <input type="password" name="oldpassword">&nbsp; &nbsp;
-New password: <input type="password" name="setpassword">
-<input type="hidden" name="token" value="{$token}">
-<input type="submit" name="Save" value="Save password" class="bigbutton"></form>
-HTML;
-            $data = array('pageheader'=>$changepwdform,'body'=>'','onload'=>'onload="document.changepasswordform.oldpassword.focus();"');
-            templatePage($data);
-            exit;
+		    $PAGE = new pageBuilder;
+		    $PAGE->assign('token',getToken());
+		    $PAGE->renderPage('changepassword');
+	        exit;
         }
     }
-    
+
     // -------- User wants to change configuration
-    if (startswith($_SERVER["QUERY_STRING"],'do=configure'))
+    if (isset($_SERVER["QUERY_STRING"]) && startswith($_SERVER["QUERY_STRING"],'do=configure'))
     {
         if (!empty($_POST['title']) )
         {
-            if (!tokenOk($_POST['token'])) die('Wrong token.'); // Go away !        
+            if (!tokenOk($_POST['token'])) die('Wrong token.'); // Go away !
             $tz = 'UTC';
             if (!empty($_POST['continent']) && !empty($_POST['city']))
                 if (isTZvalid($_POST['continent'],$_POST['city']))
-                    $tz = $_POST['continent'].'/'.$_POST['city'];            
+                    $tz = $_POST['continent'].'/'.$_POST['city'];
             $GLOBALS['timezone'] = $tz;
             $GLOBALS['title']=$_POST['title'];
             $GLOBALS['redirector']=$_POST['redirector'];
@@ -971,49 +1001,33 @@ HTML;
             echo '<script language="JavaScript">alert("Configuration was saved.");document.location=\'?do=tools\';</script>';
             exit;
         }
-        else
+        else // Show the configuration form.
         {
-            $token = getToken();
-            $title = htmlspecialchars( empty($GLOBALS['title']) ? '' : $GLOBALS['title'] , ENT_QUOTES);
-            $redirector = htmlspecialchars( empty($GLOBALS['redirector']) ? '' : $GLOBALS['redirector'] , ENT_QUOTES);
+	        $PAGE = new pageBuilder;
+            $PAGE->assign('token',getToken());
+            $PAGE->assign('title',htmlspecialchars( empty($GLOBALS['title']) ? '' : $GLOBALS['title'] , ENT_QUOTES));
+            $PAGE->assign('redirector',htmlspecialchars( empty($GLOBALS['redirector']) ? '' : $GLOBALS['redirector'] , ENT_QUOTES));
             list($timezone_form,$timezone_js) = templateTZform($GLOBALS['timezone']);
-            $timezone_html=''; if ($timezone_form!='') $timezone_html='<tr><td valign="top"><b>Timezone:</b></td><td>'.$timezone_form.'</td></tr>';
-            $changepwdform= <<<HTML
-${timezone_js}<form method="POST" action="" name="configform" id="configform"><input type="hidden" name="token" value="{$token}">
-<table border="0" cellpadding="20">
-<tr><td><b>Page title:</b></td><td><input type="text" name="title" id="title" size="50" value="{$title}"></td></tr>
-{$timezone_html}
-<tr><td valign="top"><b>Redirector</b></td><td><input type="text" name="redirector" id="redirector" size="50" value="{$redirector}"><br>(e.g. <i>http://anonym.to/?</i> will mask the HTTP_REFERER)</td></tr>
-<tr><td></td><td align="right"><input type="submit" name="Save" value="Save config" class="bigbutton"></td></tr>
-</table>
-</form>
-HTML;
-            $data = array('pageheader'=>$changepwdform,'body'=>'','onload'=>'onload="document.configform.title.focus();"');
-            templatePage($data);
-            exit;
+            $PAGE->assign('timezone_form',$timezone_form); // FIXME: put entire tz form generation in template ?
+            $PAGE->assign('timezone_js',$timezone_js);
+		    $PAGE->renderPage('configure');
+	        exit;
         }
-    }    
-  
+    }
+
     // -------- User wants to rename a tag or delete it
-    if (startswith($_SERVER["QUERY_STRING"],'do=changetag'))
+    if (isset($_SERVER["QUERY_STRING"]) && startswith($_SERVER["QUERY_STRING"],'do=changetag'))
     {
         if (empty($_POST['fromtag']))
         {
-            $token = getToken();
-            $changetagform = <<<HTML
-<form method="POST" action="" name="changetag" id="changetag">
-<input type="hidden" name="token" value="{$token}">
-Tag: <input type="text" name="fromtag" id="fromtag">
-<input type="text" name="totag" style="margin-left:40px;"><input type="submit" name="renametag" value="Rename tag" class="bigbutton">      
-&nbsp;&nbsp;or&nbsp; <input type="submit" name="deletetag" value="Delete tag" class="bigbutton" onClick="return confirmDeleteTag();"><br>(Case sensitive)</form> 
-<script language="JavaScript">function confirmDeleteTag() { var agree=confirm("Are you sure you want to delete this tag from all links ?"); if (agree) return true ; else return false ; }</script>       
-HTML;
-            $data = array('pageheader'=>$changetagform,'body'=>'','onload'=>'onload="document.changetag.fromtag.focus();"');
-            templatePage($data);
-            exit;
+	        $PAGE = new pageBuilder;
+		    $PAGE->assign('token',getToken());
+		    $PAGE->renderPage('changetag');
+	        exit;
         }
         if (!tokenOk($_POST['token'])) die('Wrong token.');
-        
+
+        // Delete a tag:
         if (!empty($_POST['deletetag']) && !empty($_POST['fromtag']))
         {
             $needle=trim($_POST['fromtag']);
@@ -1047,19 +1061,17 @@ HTML;
             invalidateCaches();
             echo '<script language="JavaScript">alert("Tag was renamed in '.count($linksToAlter).' links.");document.location=\'?searchtags='.urlencode($_POST['totag']).'\';</script>';
             exit;
-        }        
+        }
     }
-    
+
     // -------- User wants to add a link without using the bookmarklet: show form.
-    if (startswith($_SERVER["QUERY_STRING"],'do=addlink'))
+    if (isset($_SERVER["QUERY_STRING"]) && startswith($_SERVER["QUERY_STRING"],'do=addlink'))
     {
-        $onload = 'onload="document.addform.post.focus();"';
-        $addform= '<div id="headerform"><form method="GET" action="" name="addform" class="addform"><input type="text" name="post" style="width:50%;"> <input type="submit" value="Add link" class="bigbutton"></div>';
-        $data = array('pageheader'=>$addform,'body'=>'','onload'=>$onload); 
-        templatePage($data);
+	    $PAGE = new pageBuilder;
+	    $PAGE->renderPage('addlink');
         exit;
-    }    
-    
+    }
+
     // -------- User clicked the "Save" button when editing a link: Save link to database.
     if (isset($_POST['save_edit']))
     {
@@ -1067,20 +1079,20 @@ HTML;
         $tags = trim(preg_replace('/\s\s+/',' ', $_POST['lf_tags'])); // Remove multiple spaces.
         $linkdate=$_POST['lf_linkdate'];
         $link = array('title'=>trim($_POST['lf_title']),'url'=>trim($_POST['lf_url']),'description'=>trim($_POST['lf_description']),'private'=>(isset($_POST['lf_private']) ? 1 : 0),
-                      'linkdate'=>$linkdate,'tags'=>str_replace(',',' ',$tags));        
+                      'linkdate'=>$linkdate,'tags'=>str_replace(',',' ',$tags));
         if ($link['title']=='') $link['title']=$link['url']; // If title is empty, use the URL as title.
         $LINKSDB[$linkdate] = $link;
         $LINKSDB->savedb(); // save to disk
         pubsubhub();
         invalidateCaches();
-        
+
         // If we are called from the bookmarklet, we must close the popup:
         if (isset($_GET['source']) && $_GET['source']=='bookmarklet') { echo '<script language="JavaScript">self.close();</script>'; exit; }
         $returnurl = ( isset($_POST['returnurl']) ? $_POST['returnurl'] : '?' );
         header('Location: '.$returnurl); // After saving the link, redirect to the page the user was on.
         exit;
-    } 
-    
+    }
+
     // -------- User clicked the "Cancel" button when editing a link.
     if (isset($_POST['cancel_edit']))
     {
@@ -1088,7 +1100,7 @@ HTML;
         if (isset($_GET['source']) && $_GET['source']=='bookmarklet') { echo '<script language="JavaScript">self.close();</script>'; exit; }
         $returnurl = ( isset($_POST['returnurl']) ? $_POST['returnurl'] : '?' );
         header('Location: '.$returnurl); // After canceling, redirect to the page the user was on.
-        exit;    
+        exit;
     }
 
     // -------- User clicked the "Delete" button when editing a link : Delete link from database.
@@ -1107,19 +1119,22 @@ HTML;
         $returnurl = ( isset($_POST['returnurl']) ? $_POST['returnurl'] : '?' );
         header('Location: '.$returnurl); // After deleting the link, redirect to the page the user was on.
         exit;
-    }    
-    
+    }
+
     // -------- User clicked the "EDIT" button on a link: Display link edit form.
-    if (isset($_GET['edit_link']))  
+    if (isset($_GET['edit_link']))
     {
         $link = $LINKSDB[$_GET['edit_link']];  // Read database
         if (!$link) { header('Location: ?'); exit; } // Link not found in database.
-        list($editform,$onload)=templateEditForm($link);
-        $data = array('pageheader'=>$editform,'body'=>'','onload'=>$onload); 
-        templatePage($data);    
-        exit;       
+	    $PAGE = new pageBuilder;
+	    $PAGE->assign('link',$link);
+	    $PAGE->assign('link_is_new',false);
+	    $PAGE->assign('token',getToken()); // XSRF protection.
+	    $PAGE->assign('http_referer',(isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : ''));
+	    $PAGE->renderPage('editlink');
+        exit;
     }
-    
+
     // -------- User want to post a new link: Display link edit form.
     if (isset($_GET['post']))
     {
@@ -1129,51 +1144,48 @@ HTML;
         $i=strpos($url,'&utm_source='); if ($i!==false) $url=substr($url,0,$i);
         $i=strpos($url,'?utm_source='); if ($i!==false) $url=substr($url,0,$i);
         $i=strpos($url,'#xtor=RSS-'); if ($i!==false) $url=substr($url,0,$i);
-        
+
         $link_is_new = false;
         $link = $LINKSDB->getLinkFromUrl($url); // Check if URL is not already in database (in this case, we will edit the existing link)
-        if (!$link) 
+        if (!$link)
         {
             $link_is_new = true;  // This is a new link
             $linkdate = strval(date('Ymd_His'));
             $title = (empty($_GET['title']) ? '' : $_GET['title'] ); // Get title if it was provided in URL (by the bookmarklet).
             $description=''; $tags=''; $private=0;
-            if (($url!='') && parse_url($url,PHP_URL_SCHEME)=='') $url = 'http://'.$url;                
+            if (($url!='') && parse_url($url,PHP_URL_SCHEME)=='') $url = 'http://'.$url;
             // If this is an HTTP link, we try go get the page to extact the title (otherwise we will to straight to the edit form.)
             if (empty($title) && parse_url($url,PHP_URL_SCHEME)=='http')
             {
                 list($status,$headers,$data) = getHTTP($url,4); // Short timeout to keep the application responsive.
-                // FIXME: Decode charset according to specified in either 1) HTTP response headers or 2) <head> in html 
+                // FIXME: Decode charset according to specified in either 1) HTTP response headers or 2) <head> in html
                 if (strpos($status,'200 OK')!==false) $title=html_entity_decode(html_extract_title($data),ENT_QUOTES,'UTF-8');
             }
             if ($url=='') $url='?'.smallHash($linkdate); // In case of empty URL, this is just a text (with a link that point to itself)
-            $link = array('linkdate'=>$linkdate,'title'=>$title,'url'=>$url,'description'=>$description,'tags'=>$tags,'private'=>0); 
+            $link = array('linkdate'=>$linkdate,'title'=>$title,'url'=>$url,'description'=>$description,'tags'=>$tags,'private'=>0);
         }
-        list($editform,$onload)=templateEditForm($link,$link_is_new); 
-        $data = array('pageheader'=>$editform,'body'=>'','onload'=>$onload); 
-        templatePage($data);    
+
+	    $PAGE = new pageBuilder;
+	    $PAGE->assign('link',$link);
+	    $PAGE->assign('link_is_new',$link_is_new);
+	    $PAGE->assign('token',getToken()); // XSRF protection.
+	    $PAGE->assign('http_referer',(isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : ''));
+	    $PAGE->renderPage('editlink');
         exit;
     }
-    
+
     // -------- Export as Netscape Bookmarks HTML file.
-    if (startswith($_SERVER["QUERY_STRING"],'do=export'))
+    if (isset($_SERVER["QUERY_STRING"]) && startswith($_SERVER["QUERY_STRING"],'do=export'))
     {
         if (empty($_GET['what']))
         {
-            $toolbar= <<<HTML
-<div id="toolsdiv">
-    <a href="?do=export&what=all"><b>Export all</b> <span>: Export all links</span></a><br><br>
-    <a href="?do=export&what=public"><b>Export public</b> <span>: Export public links only</a><br><br>
-    <a href="?do=export&what=private"><b>Export private</b> <span>: Export private links only</a><br><br style="clear:both;">
-</div>
-HTML;
-            $data = array('pageheader'=>$toolbar,'body'=>'','onload'=>''); 
-            templatePage($data);
-            exit;
+		    $PAGE = new pageBuilder;
+		    $PAGE->renderPage('export');
+	        exit;
         }
         $exportWhat=$_GET['what'];
         if (!array_intersect(array('all','public','private'),array($exportWhat))) die('What are you trying to export ???');
-       
+
         header('Content-Type: text/html; charset=utf-8');
         header('Content-disposition: attachment; filename=bookmarks_'.$exportWhat.'_'.strval(date('Ymd_His')).'.html');
         $currentdate=date('Y/m/d H:i:s');
@@ -1182,7 +1194,7 @@ HTML;
 <!-- This is an automatically generated file.
      It will be read and overwritten.
      DO NOT EDIT! -->
-<!-- Shaarli {$exportWhat} bookmarks export on {$currentdate} --> 
+<!-- Shaarli {$exportWhat} bookmarks export on {$currentdate} -->
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
 <TITLE>Bookmarks</TITLE>
 <H1>Bookmarks</H1>
@@ -1200,10 +1212,10 @@ HTML;
             }
         }
                 exit;
-    }            
+    }
 
     // -------- User is uploading a file for import
-    if (startswith($_SERVER["QUERY_STRING"],'do=upload'))
+    if (isset($_SERVER["QUERY_STRING"]) && startswith($_SERVER["QUERY_STRING"],'do=upload'))
     {
         // If file is too big, some form field may be missing.
         if (!isset($_POST['token']) || (!isset($_FILES)) || (isset($_FILES['filetoupload']['size']) && $_FILES['filetoupload']['size']==0))
@@ -1211,47 +1223,28 @@ HTML;
             $returnurl = ( empty($_SERVER['HTTP_REFERER']) ? '?' : $_SERVER['HTTP_REFERER'] );
             echo '<script language="JavaScript">alert("The file you are trying to upload is probably bigger than what this webserver can accept ('.getMaxFileSize().' bytes). Please upload in smaller chunks.");document.location=\''.htmlspecialchars($returnurl).'\';</script>';
             exit;
-        }         
+        }
         if (!tokenOk($_POST['token'])) die('Wrong token.');
         importFile();
         exit;
-    }     
-    
+    }
+
     // -------- Show upload/import dialog:
-    if (startswith($_SERVER["QUERY_STRING"],'do=import'))
-    {    
-        $token = getToken();
-        $maxfilesize=getMaxFileSize();
-        $onload = 'onload="document.uploadform.filetoupload.focus();"';
-        $uploadform=<<<HTML
-<div id="uploaddiv">
-Import Netscape html bookmarks (as exported from Firefox/Chrome/Opera/delicious/diigo...) (Max: {$maxfilesize} bytes).
-<form method="POST" action="?do=upload" enctype="multipart/form-data" name="uploadform" id="uploadform">
-    <input type="hidden" name="token" value="{$token}">
-    <input type="file" name="filetoupload" size="80">
-    <input type="hidden" name="MAX_FILE_SIZE" value="{$maxfilesize}">
-    <input type="submit" name="import_file" value="Import" class="bigbutton"><br>
-    <input type="checkbox" name="private">&nbsp;Import all links as private<br>
-    <input type="checkbox" name="overwrite">&nbsp;Overwrite existing links
-</form>
-</div>
-HTML;
-        $data = array('pageheader'=>$uploadform,'body'=>'','onload'=>$onload  ); 
-        templatePage($data);
+    if (isset($_SERVER["QUERY_STRING"]) && startswith($_SERVER["QUERY_STRING"],'do=import'))
+    {
+	    $PAGE = new pageBuilder;
+        $PAGE->assign('token',getToken());
+        $PAGE->assign('maxfilesize',getMaxFileSize());
+	    $PAGE->renderPage('import');
         exit;
-    }    
+    }
 
     // -------- Otherwise, simply display search form and links:
-    $searchform=<<<HTML
-<div id="headerform" style="width:100%; white-space:nowrap;";>
-    <form method="GET" class="searchform" name="searchform"><input type="text" name="searchterm" style="width:30%" value=""> <input type="submit" value="Search" class="bigbutton"></form>
-    <form method="GET" class="tagfilter" name="tagfilter" style="margin-left:24px;"><input type="text" name="searchtags" id="searchtags" style="width:10%" value=""> <input type="submit" value="Filter by tag" class="bigbutton"></form>
-</div>
-HTML;
-    $data = array('pageheader'=>$searchform,'body'=>templateLinkList(),'onload'=>''); 
-    templatePage($data);
+    $PAGE = new pageBuilder;
+    buildLinkList($PAGE); // Compute list of links to display
+    $PAGE->renderPage('linklist');
     exit;
-}    
+}
 
 // -----------------------------------------------------------------------------------------------
 // Process the import file form.
@@ -1259,7 +1252,7 @@ function importFile()
 {
     global $LINKSDB;
     $filename=$_FILES['filetoupload']['name'];
-    $filesize=$_FILES['filetoupload']['size'];    
+    $filesize=$_FILES['filetoupload']['size'];
     $data=file_get_contents($_FILES['filetoupload']['tmp_name']);
     $private = (empty($_POST['private']) ? 0 : 1); // Should the links be imported as private ?
     $overwrite = !empty($_POST['overwrite']) ; // Should the imported links overwrite existing ones ?
@@ -1268,15 +1261,15 @@ function importFile()
     // Sniff file type:
     $type='unknown';
     if (startsWith($data,'<!DOCTYPE NETSCAPE-Bookmark-file-1>')) $type='netscape'; // Netscape bookmark file (aka Firefox).
-    
+
     // Then import the bookmarks.
     if ($type=='netscape')
     {
         // This is a standard Netscape-style bookmark file.
-        // This format is supported by all browsers (except IE, of course), also delicious, diigo and others.      
+        // This format is supported by all browsers (except IE, of course), also delicious, diigo and others.
         foreach(explode('<DT>',$data) as $html) // explode is very fast
         {
-            $link = array('linkdate'=>'','title'=>'','url'=>'','description'=>'','tags'=>'','private'=>0);  
+            $link = array('linkdate'=>'','title'=>'','url'=>'','description'=>'','tags'=>'','private'=>0);
             $d = explode('<DD>',$html);
             if (startswith($d[0],'<A '))
             {
@@ -1292,7 +1285,7 @@ function importFile()
                     elseif ($attr=='ADD_DATE') $raw_add_date=intval($value);
                     elseif ($attr=='PRIVATE') $link['private']=($value=='0'?0:1);
                     elseif ($attr=='TAGS') $link['tags']=html_entity_decode(str_replace(',',' ',$value),ENT_QUOTES,'UTF-8');
-                }     
+                }
                 if ($link['url']!='')
                 {
                     if ($private==1) $link['private']=1;
@@ -1300,7 +1293,7 @@ function importFile()
                     if ($dblink==false)
                     {  // Link not in database, let's import it...
                        if (empty($raw_add_date)) $raw_add_date=time(); // In case of shitty bookmark file with no ADD_DATE
-                       
+
                        // Make sure date/time is not already used by another link.
                        // (Some bookmark files have several different links with the same ADD_DATE)
                        // We increment date by 1 second until we find a date which is not used in db.
@@ -1321,98 +1314,51 @@ function importFile()
                     }
 
                 }
-            }     
+            }
         }
         $LINKSDB->savedb();
         invalidateCaches();
-        echo '<script language="JavaScript">alert("File '.$filename.' ('.$filesize.' bytes) was successfully processed: '.$import_count.' links imported.");document.location=\'?\';</script>';            
+        echo '<script language="JavaScript">alert("File '.$filename.' ('.$filesize.' bytes) was successfully processed: '.$import_count.' links imported.");document.location=\'?\';</script>';
     }
     else
     {
         echo '<script language="JavaScript">alert("File '.$filename.' ('.$filesize.' bytes) has an unknown file format. Nothing was imported.");document.location=\'?\';</script>';
     }
-}    
+}
 
 // -----------------------------------------------------------------------------------------------
-/* Template for the edit link form
-    Input: $link : link to edit (assocative array item as returned by the LINKDB class)
-Output: An array : (string) : The html code of the edit link form.
-                   (string) : The proper onload to use in body.
-    Example: list($html,$onload)=templateEditForm($mylinkdb['20110805_124532']);
-             echo $html;
-*/
-function templateEditForm($link,$link_is_new=false)
+// Template for the list of links (<div id="linklist">)
+// This function fills all the necessary fields in the $PAGE for the template 'linklist.html'
+function buildLinkList($PAGE)
 {
-    $url=htmlspecialchars($link['url']);
-    $title=htmlspecialchars($link['title']);
-    $tags=htmlspecialchars($link['tags']);
-    $description=htmlspecialchars($link['description']);    
-    $private = ($link['private']==0 ? '' : 'checked="yes"');   
-    
-    // Automatically focus on empty fields:
-    $onload='onload="document.linkform.lf_tags.focus();"';
-    if ($description=='') $onload='onload="document.linkform.lf_description.focus();"';
-    if ($title=='') $onload='onload="document.linkform.lf_title.focus();"';    
-    
-    // Do not show "Delete" button if this is a new link.
-    $delete_button = '<input type="submit" value="Delete" name="delete_link" class="bigbutton" style="margin-left:180px;" onClick="return confirmDeleteLink();">';
-    if ($link_is_new) $delete_button='';
-    
-    $token=getToken(); // XSRF protection. 
-    $returnurl_html = (isset($_SERVER['HTTP_REFERER']) ? '<input type="hidden" name="returnurl" value="'.htmlspecialchars($_SERVER['HTTP_REFERER']).'">' : '');
-    $editlinkform=<<<HTML
-<div id="editlinkform">
-    <form method="post" name="linkform">
-        <input type="hidden" name="lf_linkdate" value="{$link['linkdate']}">
-        <i>URL</i><br><input type="text" name="lf_url" value="{$url}" style="width:100%"><br>
-        <i>Title</i><br><input type="text" name="lf_title" value="{$title}" style="width:100%"><br>
-        <i>Description</i><br><textarea name="lf_description" rows="4" cols="25" style="width:100%">{$description}</textarea><br>
-        <i>Tags</i><br><input type="text" id="lf_tags" name="lf_tags" value="{$tags}" style="width:100%"><br>
-        <input type="checkbox" {$private} style="margin:7 0 10 0;" name="lf_private">&nbsp;<i>Private</i><br>
-        <input type="submit" value="Save" name="save_edit" class="bigbutton" style="margin-left:40px;">
-        <input type="submit" value="Cancel" name="cancel_edit" class="bigbutton" style="margin-left:40px;">
-        {$delete_button}
-        <input type="hidden" name="token" value="{$token}">
-        {$returnurl_html}
-    </form>
-</div>    
-HTML;
-    return array($editlinkform,$onload);
-}        
-
-
-// -----------------------------------------------------------------------------------------------
-// Template for the list of links.
-// Returns html code to show the list of link according to parameters passed in URL (search terms, page...)
-function templateLinkList()
-{     
-    global $LINKSDB;
+    global $LINKSDB;  // Get the links database.
 
-    // Search according to entered search terms:
+    // ---- Filter link database according to parameters
     $linksToDisplay=array();
-    $searched='';
+    $search_type='';
+    $search_crits='';
     if (!empty($_GET['searchterm'])) // Fulltext search
     {
         $linksToDisplay = $LINKSDB->filterFulltext(trim($_GET['searchterm']));
-        $searched=count($linksToDisplay).' results for <i>'.htmlspecialchars(trim($_GET['searchterm'])).'</i>:';
+        $search_crits=htmlspecialchars(trim($_GET['searchterm']));
+        $search_type='fulltext';
     }
     elseif (!empty($_GET['searchtags'])) // Search by tag
     {
         $linksToDisplay = $LINKSDB->filterTags(trim($_GET['searchtags']));
-        $tagshtml=''; foreach(explode(' ',trim($_GET['searchtags'])) as $tag) $tagshtml.='<span class="linktag" title="Remove tag"><a href="?removetag='.htmlspecialchars($tag).'">'.htmlspecialchars($tag).' <span style="border-left:1px solid #aaa; padding-left:5px; color:#6767A7;">x</span></a></span> ';
-        $searched=''.count($linksToDisplay).' results for tags '.$tagshtml.':';    
+        $search_crits=explode(' ',trim($_GET['searchtags']));
+        $search_type='tags';
     }
-    elseif (preg_match('/[a-zA-Z0-9-_@]{6}/',$_SERVER["QUERY_STRING"])) // Detect smallHashes in URL
+    elseif (isset($_SERVER["QUERY_STRING"]) && preg_match('/[a-zA-Z0-9-_@]{6}(&.+?)?/',$_SERVER["QUERY_STRING"])) // Detect smallHashes in URL
     {
-        $linksToDisplay = $LINKSDB->filterSmallHash($_SERVER["QUERY_STRING"]);
+        $linksToDisplay = $LINKSDB->filterSmallHash(substr(trim($_SERVER["QUERY_STRING"], '/'),0,6));
+        $search_type='permalink';
     }
     else
         $linksToDisplay = $LINKSDB;  // otherwise, display without filtering.
-    if ($searched!='') $searched='<div id="searchcriteria">'.$searched.'</div>';
-    $linklist='';
-    $actions='';
-    
-    // Handle paging.
+        
+
+    // ---- Handle paging.
     /* Can someone explain to me why you get the following error when using array_keys() on an object which implements the interface ArrayAccess ???
        "Warning: array_keys() expects parameter 1 to be array, object given in ... "
        If my class implements ArrayAccess, why won't array_keys() accept it ?  ( $keys=array_keys($linksToDisplay); )
@@ -1422,72 +1368,62 @@ function templateLinkList()
     // If there is only a single link, we change on-the-fly the title of the page.
     if (count($linksToDisplay)==1) $GLOBALS['pagetitle'] = $linksToDisplay[$keys[0]]['title'].' - '.$GLOBALS['title'];
 
+    // Select articles according to paging.
     $pagecount = ceil(count($keys)/$_SESSION['LINKS_PER_PAGE']);
     $pagecount = ($pagecount==0 ? 1 : $pagecount);
     $page=( empty($_GET['page']) ? 1 : intval($_GET['page']));
     $page = ( $page<1 ? 1 : $page );
     $page = ( $page>$pagecount ? $pagecount : $page );
     $i = ($page-1)*$_SESSION['LINKS_PER_PAGE']; // Start index.
-    $end = $i+$_SESSION['LINKS_PER_PAGE'];  
-    $redir = empty($GLOBALS['redirector']) ? '' : $GLOBALS['redirector']; // optional redirector URL
-    $token = ''; if (isLoggedIn()) $token=getToken();
-    
+    $end = $i+$_SESSION['LINKS_PER_PAGE'];
+    $linkDisp=array(); // Links to display
     while ($i<$end && $i<count($keys))
-    {  
+    {
         $link = $linksToDisplay[$keys[$i]];
-        $description=text2clickable(htmlspecialchars($link['description']));
+        $link['description']=nl2br(keepMultipleSpaces(text2clickable(htmlspecialchars($link['description']))));
         $title=$link['title'];
-        $classLi =  $i%2!=0 ? '' : 'class="publicLinkHightLight"';
-        $classprivate = ($link['private']==0 ? $classLi : 'class="private"');
-        if (isLoggedIn())
-        {
-            $actions=' <form method="GET" class="buttoneditform"><input type="hidden" name="edit_link" value="'.$link['linkdate'].'"><input type="image" alt="Edit" src="images/edit_icon.png" title="Edit" class="button_edit"></form>';
-            $actions.=' <form method="POST" class="buttoneditform"><input type="hidden" name="lf_linkdate" value="'.$link['linkdate'].'">';
-            $actions.='<input type="hidden" name="token" value="'.$token.'"><input type="hidden" name="delete_link"><input type="image" alt="Delete" src="images/delete_icon.png" title="Delete" class="button_delete" onClick="return confirmDeleteLink();"></form>';
-        }
-        $tags='';
-        if ($link['tags']!='')
-        {
-            foreach(explode(' ',$link['tags']) as $tag) { $tags.='<span class="linktag" title="Add tag"><a href="?addtag='.htmlspecialchars($tag).'">'.htmlspecialchars($tag).'</a></span> '; }
-            $tags='<div class="linktaglist">'.$tags.'</div>';
-        }
-        $linklist.='<li '.$classprivate.'><div class="thumbnail">'.thumbnail($link['url']).'</div>';
-        $linklist.='<div class="linkcontainer"><span class="linktitle"><a href="'.$redir.htmlspecialchars($link['url']).'">'.htmlspecialchars($title).'</a></span>'.$actions.'<br>';
-        if ($description!='') $linklist.='<div class="linkdescription">'.nl2br($description).'</div><br>';
-        if (!$GLOBALS['config']['HIDE_TIMESTAMPS'] || isLoggedIn()) $linklist.='<span class="linkdate" title="Permalink"><a href="?'.smallHash($link['linkdate']).'">'.htmlspecialchars(linkdate2locale($link['linkdate'])).' - permalink</a> - </span>';
-        else $linklist.='<span class="linkdate" title="Short link here"><a href="?'.smallHash($link['linkdate']).'">permalink</a> - </span>';
-        $linklist.='<span class="linkurl" title="Short link">'.htmlspecialchars($link['url']).'</span><br>'.$tags."</div></li>\n";  
+        $classLi =  $i%2!=0 ? '' : 'publicLinkHightLight';
+        $link['class'] = ($link['private']==0 ? $classLi : 'private');
+        $link['localdate']=linkdate2locale($link['linkdate']);
+        $link['taglist']=explode(' ',$link['tags']);
+        $linkDisp[$keys[$i]] = $link;
         $i++;
-    } 
+    }
     
-    // Show paging.
+    // Compute paging navigation
     $searchterm= ( empty($_GET['searchterm']) ? '' : '&searchterm='.$_GET['searchterm'] );
     $searchtags= ( empty($_GET['searchtags']) ? '' : '&searchtags='.$_GET['searchtags'] );
-    $paging=''; 
-    if ($i!=count($keys)) $paging.='<a href="?page='.($page+1).$searchterm.$searchtags.'">&#x25C4;Older</a>';
-    $paging.= '<span style="color:#fff; padding:0 20 0 20;">page '.$page.' / '.$pagecount.'</span>';
-    if ($page>1) $paging.='<a href="?page='.($page-1).$searchterm.$searchtags.'">Newer&#x25BA;</a>';
-    $linksperpage = <<<HTML
-<div style="float:right; padding-right:5px;">
-Links per page: <a href="?linksperpage=20">20</a> <a href="?linksperpage=50">50</a> <a href="?linksperpage=100">100</a>
- <form method="GET" style="display:inline;" class="linksperpage"><input type="text" name="linksperpage" size="2" style="height:15px;"></form></div>
-HTML;
-    $paging = '<div class="paging">'.$linksperpage.$paging.'</div>';
-    $linklist='<div id="linklist">'.$paging.$searched.'<ul>'.$linklist.'</ul>'.$paging.'</div>';
-    return $linklist;
+    $paging='';
+    $previous_page_url=''; if ($i!=count($keys)) $previous_page_url='?page='.($page+1).$searchterm.$searchtags;
+    $next_page_url='';if ($page>1) $next_page_url='?page='.($page-1).$searchterm.$searchtags;
+
+    $token = ''; if (isLoggedIn()) $token=getToken();   
+ 
+    // Fill all template fields.
+    $PAGE->assign('previous_page_url',$previous_page_url);
+    $PAGE->assign('next_page_url',$next_page_url);
+    $PAGE->assign('page_current',$page);
+    $PAGE->assign('page_max',$pagecount);
+    $PAGE->assign('result_count',count($linksToDisplay));
+    $PAGE->assign('search_type',$search_type);
+    $PAGE->assign('search_crits',$search_crits);   
+    $PAGE->assign('redirector',empty($GLOBALS['redirector']) ? '' : $GLOBALS['redirector']); // optional redirector URL
+    $PAGE->assign('token',$token);
+    $PAGE->assign('links',$linkDisp);
+    return;
 }
 
 // Returns the HTML code to display a thumbnail for a link
 // with a link to the original URL.
 // Understands various services (youtube.com...)
 // Input: $url = url for which the thumbnail must be found.
-//        $href = if provided, this URL will be followed instead of $url 
+//        $href = if provided, this URL will be followed instead of $url
 function thumbnail($url,$href=false)
 {
     if (!$GLOBALS['config']['ENABLE_THUMBNAILS']) return '';
-    
+
     if ($href==false) $href=$url;
-    
+
     // For most hosts, the URL of the thumbnail can be easily deduced from the URL of the link.
     // (eg. http://www.youtube.com/watch?v=spVypYk4kto --->  http://img.youtube.com/vi/spVypYk4kto/default.jpg )
     //                                     ^^^^^^^^^^^                                 ^^^^^^^^^^^
@@ -1501,7 +1437,7 @@ function thumbnail($url,$href=false)
     {
         $path = parse_url($url,PHP_URL_PATH);
         return '<a href="'.htmlspecialchars($href).'"><img src="http://img.youtube.com/vi'.htmlspecialchars($path).'/default.jpg" width="120" height="90"></a>';
-    } 
+    }
     if ($domain=='imgur.com')
     {
         $path = parse_url($url,PHP_URL_PATH);
@@ -1514,7 +1450,7 @@ function thumbnail($url,$href=false)
     {
         $pi = pathinfo(parse_url($url,PHP_URL_PATH));
         if (!empty($pi['filename'])) return '<a href="'.htmlspecialchars($href).'"><img src="http://i.imgur.com/'.htmlspecialchars($pi['filename']).'s.jpg" width="90" height="90"></a>';
-    } 
+    }
     if ($domain=='dailymotion.com' || $domain=='www.dailymotion.com')
     {
         if (strpos($url,'dailymotion.com/video/')!==false)
@@ -1522,7 +1458,7 @@ function thumbnail($url,$href=false)
             $thumburl=str_replace('dailymotion.com/video/','dailymotion.com/thumbnail/video/',$url);
             return '<a href="'.htmlspecialchars($href).'"><img src="'.htmlspecialchars($thumburl).'" width="120" style="height:auto;"></a>';
         }
-    } 
+    }
     if (endsWith($domain,'.imageshack.us'))
     {
         $ext=strtolower(pathinfo($url,PATHINFO_EXTENSION));
@@ -1536,9 +1472,9 @@ function thumbnail($url,$href=false)
     // Some other hosts are SLOW AS HELL and usually require an extra HTTP request to get the thumbnail URL.
     // So we deport the thumbnail generation in order not to slow down page generation
     // (and we also cache the thumbnail)
-    
+
     if (!$GLOBALS['config']['ENABLE_LOCALCACHE']) return ''; // If local cache is disabled, no thumbnails for services which require the use a local cache.
-    
+
     if ($domain=='flickr.com' || endsWith($domain,'.flickr.com')
         || $domain=='vimeo.com'
         || $domain=='ted.com' || endsWith($domain,'.ted.com')
@@ -1546,7 +1482,7 @@ function thumbnail($url,$href=false)
     {
         if ($domain=='vimeo.com')
         {   // Make sure this vimeo url points to a video (/xxx... where xxx is numeric)
-            $path = parse_url($url,PHP_URL_PATH); 
+            $path = parse_url($url,PHP_URL_PATH);
             if (!preg_match('!/\d+.+?!',$path)) return ''; // This is not a single video URL.
         }
         if ($domain=='ted.com' || endsWith($domain,'.ted.com'))
@@ -1565,98 +1501,12 @@ function thumbnail($url,$href=false)
     if ($ext=='jpg' || $ext=='jpeg' || $ext=='png' || $ext=='gif')
     {
         $sign = hash_hmac('sha256', $url, $GLOBALS['salt']); // We use the salt to sign data (it's random, secret, and specific to each installation)
-        return '<a href="'.htmlspecialchars($href).'"><img src="?do=genthumbnail&hmac='.htmlspecialchars($sign).'&url='.urlencode($url).'" width="120" style="height:auto;"></a>';        
+        return '<a href="'.htmlspecialchars($href).'"><img src="?do=genthumbnail&hmac='.htmlspecialchars($sign).'&url='.urlencode($url).'" width="120" style="height:auto;"></a>';
     }
     return ''; // No thumbnail.
 
 }
 
-// -----------------------------------------------------------------------------------------------
-// Template for the whole page.
-/* Input: $data (associative array).
-                Keys: 'body' : body of HTML document
-                      'pageheader' : html code to show in page header (top of page)
-                      'onload' : optional onload javascript for the <body>
-*/
-function templatePage($data)
-{
-    global $STARTTIME;
-    global $LINKSDB;
-    $shaarli_version = shaarli_version;
-    
-    $newversion=checkUpdate();
-    if ($newversion!='') $newversion='<div id="newversion"><span style="text-decoration:blink;">&#x25CF;</span> Shaarli '.htmlspecialchars($newversion).' is <a href="http://sebsauvage.net/wiki/doku.php?id=php:shaarli#download">available</a>.</div>';
-    $linkcount = count($LINKSDB);
-
-    $feedurl=htmlspecialchars(serverUrl().$_SERVER['SCRIPT_NAME']); 
-    $searchcrits=''; // Search criteria
-    if (!empty($_GET['searchtags'])) $searchcrits.='&searchtags='.$_GET['searchtags'];
-    elseif (!empty($_GET['searchterm'])) $searchcrits.='&searchterm='.$_GET['searchterm'];
-    $filtered_feed= ($searchcrits=='' ? '' : 'Filtered ');
-
-    $open='';
-    if ($GLOBALS['config']['OPEN_SHAARLI'])
-    {
-        $menu='<a href="?do=tools">Tools</a><a href="?do=addlink"><b>Add link</b></a>';
-        $open='Open ';
-    }
-    else
-        $menu=(isLoggedIn() ? '<a href="?do=logout">Logout</a><a href="?do=tools">Tools</a><a href="?do=addlink"><b>Add link</b></a>' : ' <a href="?do=login">Login</a>');          
-    $menu='<a href="?">Home</a>'.$menu.'<a href="'.$feedurl.'?do=rss'.$searchcrits.'">RSS Feed</a><a href="'.$feedurl.'?do=atom'.$searchcrits.'" style="padding-left:10px;">ATOM Feed</a><a href="?do=tagcloud">Tag cloud</a><a href="?do=picwall'.$searchcrits.'">Picture wall</a>';
-    # If we are in the bookmarklet popup, do not display menu.
-    if (!empty($_GET['source']) && $_GET['source']=='bookmarklet') $menu='';
-
-    foreach(array('pageheader','body','onload') as $k) // make sure all required fields exist (put an empty string if not).
-    {
-        if (!array_key_exists($k,$data)) $data[$k]='';
-    }
-    $jsincludes=''; $jsincludes_bottom = '';
-    if ($GLOBALS['config']['OPEN_SHAARLI'] || isLoggedIn())
-    { 
-        $source = serverUrl().$_SERVER['SCRIPT_NAME'];  
-        $jsincludes='<script language="JavaScript" src="jquery.min.js"></script><script language="JavaScript" src="jquery-ui.custom.min.js"></script>'; 
-        $jsincludes_bottom = <<<JS
-<script language="JavaScript">
-$(document).ready(function() 
-{
-    $('#lf_tags').autocomplete({source:'{$source}?ws=tags',minLength:1});
-    $('#searchtags').autocomplete({source:'{$source}?ws=tags',minLength:1});
-    $('#fromtag').autocomplete({source:'{$source}?ws=singletag',minLength:1});  
-});
-</script>
-JS;
-    }
-
-    $version=shaarli_version;
-
-    $title = htmlspecialchars( $GLOBALS['title'] );
-    $pagetitle = htmlspecialchars( empty($GLOBALS['pagetitle']) ? $title : $GLOBALS['pagetitle'] );
-
-    echo <<<HTML
-<html>
-<head>
-<title>{$pagetitle}</title>
-<link rel="alternate" type="application/rss+xml" href="{$feedurl}?do=rss{$searchcrits}" title="{$filtered_feed}RSS Feed" />
-<link rel="alternate" type="application/atom+xml" href="{$feedurl}?do=atom{$searchcrits}" title="{$filtered_feed}ATOM Feed" />
-<link href="./images/favicon.ico" rel="shortcut icon" type="image/x-icon" />
-<link type="text/css" rel="stylesheet" href="shaarli.css?version={$version}" />
-<link type="text/css" rel="stylesheet" href="user.css?version={$version}" />
-{$jsincludes}
-</head>
-<body {$data['onload']}>{$newversion}
-<div id="pageheader"><div id="logo" title="Share your links !" onclick="document.location='?';"></div><div style="float:right; font-style:italic; color:#bbb; text-align:right; padding:0 5 0 0;">Shaare your links...<br>{$linkcount} links</div>
-    <span id="shaarli_title"><a href="?">{$title}</a></span>{$menu}<div class="clear"></div>
-{$data['pageheader']}
-</div>
-{$data['body']}
-
-HTML;
-    $exectime = round(microtime(true)-$STARTTIME,4);
-    echo '<div id="footer"><b><a href="http://sebsauvage.net/wiki/doku.php?id=php:shaarli">Shaarli '.shaarli_version.'</a></b> - The personal, minimalist, super-fast, no-database delicious clone. By <a href="http://sebsauvage.net" target="_blank">sebsauvage.net</a>. Theme by <a href="http://blog.idleman.fr" target="_blank">idleman.fr</a>.<br>Who gives a shit that this page was generated in '.$exectime.' seconds&nbsp;?</div>';
-    if (isLoggedIn()) echo '<script language="JavaScript">function confirmDeleteLink() { var agree=confirm("Are you sure you want to delete this link ?"); if (agree) return true ; else return false ; }</script>';
-    echo $jsincludes_bottom.'</body></html>';
-}
-
 // -----------------------------------------------------------------------------------------------
 // Installation
 // This function should NEVER be called if the file data/config.php exists.
@@ -1664,41 +1514,32 @@ function install()
 {
     // On free.fr host, make sure the /sessions directory exists, otherwise login will not work.
     if (endsWith($_SERVER['SERVER_NAME'],'.free.fr') && !is_dir($_SERVER['DOCUMENT_ROOT'].'/sessions')) mkdir($_SERVER['DOCUMENT_ROOT'].'/sessions',0705);
-    
+
     if (!empty($_POST['setlogin']) && !empty($_POST['setpassword']))
     {
         $tz = 'UTC';
         if (!empty($_POST['continent']) && !empty($_POST['city']))
             if (isTZvalid($_POST['continent'],$_POST['city']))
                 $tz = $_POST['continent'].'/'.$_POST['city'];
-        $GLOBALS['timezone'] = $tz;        
+        $GLOBALS['timezone'] = $tz;
         // Everything is ok, let's create config file.
         $GLOBALS['login'] = $_POST['setlogin'];
         $GLOBALS['salt'] = sha1(uniqid('',true).'_'.mt_rand()); // Salt renders rainbow-tables attacks useless.
         $GLOBALS['hash'] = sha1($_POST['setpassword'].$GLOBALS['login'].$GLOBALS['salt']);
-        $GLOBALS['title'] = (empty($_POST['title']) ? 'Shared links on '.htmlspecialchars(serverUrl().$_SERVER['SCRIPT_NAME']) : $_POST['title'] );
+        $GLOBALS['title'] = (empty($_POST['title']) ? 'Shared links on '.htmlspecialchars(indexUrl()) : $_POST['title'] );
         writeConfig();
-        echo '<script language="JavaScript">alert("Shaarli is now configured. Please enter your login/password and start shaaring your links !");document.location=\'?do=login\';</script>';        
-        exit;            
+        echo '<script language="JavaScript">alert("Shaarli is now configured. Please enter your login/password and start shaaring your links !");document.location=\'?do=login\';</script>';
+        exit;
     }
-     
-    // Display config form:        
+
+    // Display config form:
     list($timezone_form,$timezone_js) = templateTZform();
     $timezone_html=''; if ($timezone_form!='') $timezone_html='<tr><td valign="top"><b>Timezone:</b></td><td>'.$timezone_form.'</td></tr>';
-    echo <<<HTML
-<html><head><title>Shaarli - Configuration</title><link type="text/css" rel="stylesheet" href="shaarli.css" />${timezone_js}</head>
-<body onload="document.installform.setlogin.focus();" style="padding:20px;"><h1>Shaarli - Shaare your links...</h1>
-It looks like it's the first time you run Shaarli. Please configure it:<br>
-<form method="POST" action="" name="installform" id="installform" style="border:1px solid black; padding:10 10 10 10;">
-<table border="0" cellpadding="20">
-<tr><td><b>Login:</b></td><td><input type="text" name="setlogin" size="30"></td></tr>
-<tr><td><b>Password:</b></td><td><input type="password" name="setpassword" size="30"></td></tr>
-{$timezone_html}
-<tr><td><b>Page title:</b></td><td><input type="text" name="title" size="30"></td></tr>
-<tr><td></td><td align="right"><input type="submit" name="Save" value="Save config" class="bigbutton"></td></tr>
-</table>
-</form></body></html>
-HTML;
+    
+    $PAGE = new pageBuilder;
+    $PAGE->assign('timezone_html',$timezone_html);
+    $PAGE->assign('timezone_js',$timezone_js);
+    $PAGE->renderPage('install');
     exit;
 }
 
@@ -1714,7 +1555,7 @@ function templateTZform($ptz=false)
         // Try to split the provided timezone.
         if ($ptz==false) { $l=timezone_identifiers_list(); $ptz=$l[0]; }
         $spos=strpos($ptz,'/'); $pcontinent=substr($ptz,0,$spos); $pcity=substr($ptz,$spos+1);
-      
+
         // Display config form:
         $timezone_form = '';
         $timezone_js = '';
@@ -1722,7 +1563,7 @@ function templateTZform($ptz=false)
         // We split the list in continents/cities.
         $continents = array();
         $cities = array();
-        foreach(timezone_identifiers_list() as $tz) 
+        foreach(timezone_identifiers_list() as $tz)
         {
             if ($tz=='UTC') $tz='UTC/UTC';
             $spos = strpos($tz,'/');
@@ -1737,12 +1578,12 @@ function templateTZform($ptz=false)
         $continents_html = '';
         $continents = array_keys($continents);
         foreach($continents as $continent)
-            $continents_html.='<option  value="'.$continent.'"'.($pcontinent==$continent?'selected':'').'>'.$continent.'</option>';  
+            $continents_html.='<option  value="'.$continent.'"'.($pcontinent==$continent?'selected':'').'>'.$continent.'</option>';
         $cities_html = $cities[$pcontinent];
         $timezone_form = "Continent: <select name=\"continent\" id=\"continent\" onChange=\"onChangecontinent();\">${continents_html}</select><br /><br />";
-        $timezone_form .= "City: <select name=\"city\" id=\"city\">${cities[$pcontinent]}</select><br /><br />"; 
+        $timezone_form .= "City: <select name=\"city\" id=\"city\">${cities[$pcontinent]}</select><br /><br />";
         $timezone_js = "<script language=\"JavaScript\">";
-        $timezone_js .= "function onChangecontinent(){document.getElementById(\"city\").innerHTML = citiescontinent[document.getElementById(\"continent\").value];}"; 
+        $timezone_js .= "function onChangecontinent(){document.getElementById(\"city\").innerHTML = citiescontinent[document.getElementById(\"continent\").value];}";
         $timezone_js .= "var citiescontinent = ".json_encode($cities).";" ;
         $timezone_js .= "</script>" ;
         return array($timezone_form,$timezone_js);
@@ -1776,32 +1617,32 @@ function processWS()
 
     // Search in tags (case insentitive, cumulative search)
     if ($_GET['ws']=='tags')
-    { 
+    {
         $tags=explode(' ',str_replace(',',' ',$term)); $last = array_pop($tags); // Get the last term ("a b c d" ==> "a b c", "d")
         $addtags=''; if ($tags) $addtags=implode(' ',$tags).' '; // We will pre-pend previous tags
         $suggested=array();
         /* To speed up things, we store list of tags in session */
-        if (empty($_SESSION['tags'])) $_SESSION['tags'] = $LINKSDB->allTags(); 
+        if (empty($_SESSION['tags'])) $_SESSION['tags'] = $LINKSDB->allTags();
         foreach($_SESSION['tags'] as $key=>$value)
         {
             if (startsWith($key,$last,$case=false) && !in_array($key,$tags)) $suggested[$addtags.$key.' ']=0;
-        }      
+        }
         echo json_encode(array_keys($suggested));
         exit;
     }
-    
+
     // Search a single tag (case sentitive, single tag search)
     if ($_GET['ws']=='singletag')
-    { 
+    {
         /* To speed up things, we store list of tags in session */
-        if (empty($_SESSION['tags'])) $_SESSION['tags'] = $LINKSDB->allTags(); 
+        if (empty($_SESSION['tags'])) $_SESSION['tags'] = $LINKSDB->allTags();
         foreach($_SESSION['tags'] as $key=>$value)
         {
             if (startsWith($key,$term,$case=true)) $suggested[$key]=0;
-        }      
+        }
         echo json_encode(array_keys($suggested));
         exit;
-    }    
+    }
 }
 
 // Re-write configuration file according to globals.
@@ -1815,7 +1656,7 @@ function writeConfig()
     $config='<?php $GLOBALS[\'login\']='.var_export($GLOBALS['login'],true).'; $GLOBALS[\'hash\']='.var_export($GLOBALS['hash'],true).'; $GLOBALS[\'salt\']='.var_export($GLOBALS['salt'],true).'; ';
     $config .='$GLOBALS[\'timezone\']='.var_export($GLOBALS['timezone'],true).'; date_default_timezone_set('.var_export($GLOBALS['timezone'],true).'); $GLOBALS[\'title\']='.var_export($GLOBALS['title'],true).';';
     $config .= '$GLOBALS[\'redirector\']='.var_export($GLOBALS['redirector'],true).'; ';
-    $config .= ' ?>';    
+    $config .= ' ?>';
     if (!file_put_contents($GLOBALS['config']['CONFIG_FILE'],$config) || strcmp(file_get_contents($GLOBALS['config']['CONFIG_FILE']),$config)!=0)
     {
         echo '<script language="JavaScript">alert("Shaarli could not create the config file. Please make sure Shaarli has the right to write in the folder is it installed in.");document.location=\'?\';</script>';
@@ -1836,14 +1677,14 @@ function genThumbnail()
 {
     // Make sure the parameters in the URL were generated by us.
     $sign = hash_hmac('sha256', $_GET['url'], $GLOBALS['salt']);
-    if ($sign!=$_GET['hmac']) die('Naughty boy !'); 
-    
+    if ($sign!=$_GET['hmac']) die('Naughty boy !');
+
     // Let's see if we don't already have the image for this URL in the cache.
     $thumbname=hash('sha1',$_GET['url']).'.jpg';
     if (is_file($GLOBALS['config']['CACHEDIR'].'/'.$thumbname))
     {   // We have the thumbnail, just serve it:
         header('Content-Type: image/jpeg');
-        echo file_get_contents($GLOBALS['config']['CACHEDIR'].'/'.$thumbname);  
+        echo file_get_contents($GLOBALS['config']['CACHEDIR'].'/'.$thumbname);
         return;
     }
     // We may also serve a blank image (if service did not respond)
@@ -1851,16 +1692,16 @@ function genThumbnail()
     if (is_file($GLOBALS['config']['CACHEDIR'].'/'.$blankname))
     {
         header('Content-Type: image/gif');
-        echo file_get_contents($GLOBALS['config']['CACHEDIR'].'/'.$blankname);  
+        echo file_get_contents($GLOBALS['config']['CACHEDIR'].'/'.$blankname);
         return;
-    }    
-    
+    }
+
     // Otherwise, generate the thumbnail.
     $url = $_GET['url'];
     $domain = parse_url($url,PHP_URL_HOST);
 
     if ($domain=='flickr.com' || endsWith($domain,'.flickr.com'))
-    {    
+    {
         // WTF ? I need a flickr API key to get a fucking thumbnail ? No way.
         // I'll extract the thumbnail URL myself. First, we have to get the flickr HTML page.
         // All images in Flickr are in the form:
@@ -1875,7 +1716,7 @@ function genThumbnail()
         if (endswith(parse_url($url,PHP_URL_PATH),'.jpg'))
         {  // This is a direct link to an image. eg. http://farm1.static.flickr.com/5/5921913_ac83ed27bd_o.jpg
             preg_match('!(http://farm\d+.static.flickr.com/\d+/\d+_\w+_)\w.jpg!',$url,$matches);
-            if (!empty($matches[1])) $imageurl=$matches[1].'m.jpg';  
+            if (!empty($matches[1])) $imageurl=$matches[1].'m.jpg';
         }
         else // this is a flickr page (html)
         {
@@ -1883,7 +1724,7 @@ function genThumbnail()
             if (strpos($httpstatus,'200 OK')!==false)
             {
                 preg_match('!(http://farm\d+.static.flickr.com/\d+/\d+_\w+_)[^s].jpg!',$data,$matches);
-                if (!empty($matches[1])) $imageurl=$matches[1].'m.jpg';  
+                if (!empty($matches[1])) $imageurl=$matches[1].'m.jpg';
             }
         }
         if ($imageurl!='')
@@ -1896,7 +1737,7 @@ function genThumbnail()
                 echo $data;
                 return;
             }
-        } 
+        }
     }
 
     elseif ($domain=='vimeo.com' )
@@ -1917,8 +1758,8 @@ function genThumbnail()
                 header('Content-Type: image/jpeg');
                 echo $data;
                 return;
-            }           
-        }  
+            }
+        }
     }
 
     elseif ($domain=='ted.com' || endsWith($domain,'.ted.com'))
@@ -1942,14 +1783,14 @@ function genThumbnail()
                     if (resizeImage($filepath))
                     {
                         header('Content-Type: image/jpeg');
-                        echo file_get_contents($filepath);  
+                        echo file_get_contents($filepath);
                         return;
                     }
                 }
             }
         }
     }
-    
+
     else
     {
         // For all other domains, we try to download the image and make a thumbnail.
@@ -1961,7 +1802,7 @@ function genThumbnail()
             if (resizeImage($filepath))
             {
                 header('Content-Type: image/jpeg');
-                echo file_get_contents($filepath);  
+                echo file_get_contents($filepath);
                 return;
             }
         }
@@ -2014,11 +1855,11 @@ function invalidateCaches()
     unset($_SESSION['tags']);
 }
 
-if (startswith($_SERVER["QUERY_STRING"],'do=genthumbnail')) { genThumbnail(); exit; }  // Thumbnail generation/cache does not need the link database.
+if (isset($_SERVER["QUERY_STRING"]) && startswith($_SERVER["QUERY_STRING"],'do=genthumbnail')) { genThumbnail(); exit; }  // Thumbnail generation/cache does not need the link database.
 $LINKSDB=new linkdb(isLoggedIn() || $GLOBALS['config']['OPEN_SHAARLI']);  // Read links from database (and filter private links if used it not logged in).
-if (startswith($_SERVER["QUERY_STRING"],'ws=')) { processWS(); exit; } // Webservices (for jQuery/jQueryUI)
+if (isset($_SERVER["QUERY_STRING"]) && startswith($_SERVER["QUERY_STRING"],'ws=')) { processWS(); exit; } // Webservices (for jQuery/jQueryUI)
 if (!isset($_SESSION['LINKS_PER_PAGE'])) $_SESSION['LINKS_PER_PAGE']=$GLOBALS['config']['LINKS_PER_PAGE'];
-if (startswith($_SERVER["QUERY_STRING"],'do=rss')) { showRSS(); exit; }
-if (startswith($_SERVER["QUERY_STRING"],'do=atom')) { showATOM(); exit; }
+if (isset($_SERVER["QUERY_STRING"]) && startswith($_SERVER["QUERY_STRING"],'do=rss')) { showRSS(); exit; }
+if (isset($_SERVER["QUERY_STRING"]) && startswith($_SERVER["QUERY_STRING"],'do=atom')) { showATOM(); exit; }
 renderPage();
-?>
\ No newline at end of file
+?>
diff --git a/tpl/addlink.html b/tpl/addlink.html
new file mode 100644
index 00000000..7dd767cc
--- /dev/null
+++ b/tpl/addlink.html
@@ -0,0 +1,15 @@
+<html>
+<head>{include="includes"}</head>
+<body onload="document.addform.post.focus();">
+<div id="pageheader">
+	{include="page.header"}
+	<div id="headerform">
+		<form method="GET" action="" name="addform" class="addform">
+			<input type="text" name="post" style="width:50%;"> 
+			<input type="submit" value="Add link" class="bigbutton">
+		</form>
+	</div>
+</div>
+{include="page.footer"}
+</body>
+</html>
\ No newline at end of file
diff --git a/tpl/changepassword.html b/tpl/changepassword.html
new file mode 100644
index 00000000..acd61f55
--- /dev/null
+++ b/tpl/changepassword.html
@@ -0,0 +1,14 @@
+<html>
+<head>{include="includes"}</head>
+<body onload="document.changepasswordform.oldpassword.focus();">
+<div id="pageheader">
+	{include="page.header"}
+	<form method="POST" action="" name="changepasswordform" id="changepasswordform">
+	Old password: <input type="password" name="oldpassword">&nbsp; &nbsp;
+	New password: <input type="password" name="setpassword">
+	<input type="hidden" name="token" value="{$token}">
+	<input type="submit" name="Save" value="Save password" class="bigbutton"></form>
+</div>
+{include="page.footer"}
+</body>
+</html>
\ No newline at end of file
diff --git a/tpl/changetag.html b/tpl/changetag.html
new file mode 100644
index 00000000..a8ecfb4f
--- /dev/null
+++ b/tpl/changetag.html
@@ -0,0 +1,15 @@
+<html>
+<head>{include="includes"}</head>
+<body onload="document.changetag.fromtag.focus();">
+<div id="pageheader">
+	{include="page.header"}
+	<form method="POST" action="" name="changetag" id="changetag">
+	<input type="hidden" name="token" value="{$token}">
+	Tag: <input type="text" name="fromtag" id="fromtag">
+	<input type="text" name="totag" style="margin-left:40px;"><input type="submit" name="renametag" value="Rename tag" class="bigbutton">
+	&nbsp;&nbsp;or&nbsp; <input type="submit" name="deletetag" value="Delete tag" class="bigbutton" onClick="return confirmDeleteTag();"><br>(Case sensitive)</form>
+<script language="JavaScript">function confirmDeleteTag() { var agree=confirm("Are you sure you want to delete this tag from all links ?"); if (agree) return true ; else return false ; }</script>
+</div>
+{include="page.footer"}
+</body>
+</html>
\ No newline at end of file
diff --git a/tpl/configure.html b/tpl/configure.html
new file mode 100644
index 00000000..f13ecb9a
--- /dev/null
+++ b/tpl/configure.html
@@ -0,0 +1,19 @@
+<html>
+<head>{include="includes"}</head>
+<body onload="document.configform.title.focus();">
+<div id="pageheader">
+	{include="page.header"}
+{$timezone_js}
+    <form method="POST" action="" name="configform" id="configform">
+	<input type="hidden" name="token" value="{$token}">
+	<table border="0" cellpadding="20">
+	  <tr><td><b>Page title:</b></td><td><input type="text" name="title" id="title" size="50" value="{$title}"></td></tr>
+	  <tr><td valign="top"><b>Timezone:</b></td><td>{$timezone_form}</td></tr>
+	  <tr><td valign="top"><b>Redirector</b></td><td><input type="text" name="redirector" id="redirector" size="50" value="{$redirector}"><br>(e.g. <i>http://anonym.to/?</i> will mask the HTTP_REFERER)</td></tr>
+	  <tr><td></td><td align="right"><input type="submit" name="Save" value="Save config" class="bigbutton"></td></tr>
+	</table>
+	</form>
+</div>
+{include="page.footer"}
+</body>
+</html>
\ No newline at end of file
diff --git a/tpl/editlink.html b/tpl/editlink.html
new file mode 100644
index 00000000..2225fbab
--- /dev/null
+++ b/tpl/editlink.html
@@ -0,0 +1,27 @@
+<html>
+<head>{include="includes"}</head>
+<body 
+{if condition="$link.title==''"}onload="document.linkform.lf_title.focus();"
+{elseif condition="$link.description==''"}onload="document.linkform.lf_description.focus();"
+{else}onload="document.linkform.lf_tags.focus();"{/if} >
+<div id="pageheader">
+	{include="page.header"}
+	<div id="editlinkform">
+	    <form method="post" name="linkform">
+	        <input type="hidden" name="lf_linkdate" value="{$link.linkdate}">
+	        <i>URL</i><br><input type="text" name="lf_url" value="{$link.url|htmlspecialchars}" style="width:100%"><br>
+	        <i>Title</i><br><input type="text" name="lf_title" value="{$link.title|htmlspecialchars}" style="width:100%"><br>
+	        <i>Description</i><br><textarea name="lf_description" rows="4" cols="25" style="width:100%">{$link.description|htmlspecialchars}</textarea><br>
+	        <i>Tags</i><br><input type="text" id="lf_tags" name="lf_tags" value="{$link.tags|htmlspecialchars}" style="width:100%"><br>
+	        <input type="checkbox" {if condition="$link.private!=0"}checked="yes"{/if} style="margin:7 0 10 0;" name="lf_private">&nbsp;<i>Private</i><br>
+	        <input type="submit" value="Save" name="save_edit" class="bigbutton" style="margin-left:40px;">
+	        <input type="submit" value="Cancel" name="cancel_edit" class="bigbutton" style="margin-left:40px;">
+	        {if condition="!$link_is_new"}<input type="submit" value="Delete" name="delete_link" class="bigbutton" style="margin-left:180px;" onClick="return confirmDeleteLink();">{/if}
+	        <input type="hidden" name="token" value="{$token}">
+	        {if condition="$http_referer"}<input type="hidden" name="returnurl" value="{$http_referer|htmlspecialchars}">{/if}
+	    </form>
+	</div>
+</div>
+{include="page.footer"}
+</body>
+</html>
\ No newline at end of file
diff --git a/tpl/export.html b/tpl/export.html
new file mode 100644
index 00000000..ccfcfcf1
--- /dev/null
+++ b/tpl/export.html
@@ -0,0 +1,14 @@
+<html>
+<head>{include="includes"}</head>
+<body>
+<div id="pageheader">
+	{include="page.header"}
+	<div id="toolsdiv">
+	    <a href="?do=export&what=all"><b>Export all</b> <span>: Export all links</span></a><br><br>
+	    <a href="?do=export&what=public"><b>Export public</b> <span>: Export public links only</a><br><br>
+	    <a href="?do=export&what=private"><b>Export private</b> <span>: Export private links only</a><br><br style="clear:both;">
+	</div>
+</div>
+{include="page.footer"}
+</body>
+</html>
\ No newline at end of file
diff --git a/tpl/import.html b/tpl/import.html
new file mode 100644
index 00000000..95df723e
--- /dev/null
+++ b/tpl/import.html
@@ -0,0 +1,20 @@
+<html>
+<head>{include="includes"}</head>
+<body onload="document.uploadform.filetoupload.focus();">
+<div id="pageheader">
+	{include="page.header"}
+	<div id="uploaddiv">
+	Import Netscape html bookmarks (as exported from Firefox/Chrome/Opera/delicious/diigo...) (Max: {$maxfilesize|htmlspecialchars} bytes).
+	<form method="POST" action="?do=upload" enctype="multipart/form-data" name="uploadform" id="uploadform">
+	    <input type="hidden" name="token" value="{$token}">
+	    <input type="file" name="filetoupload" size="80">
+	    <input type="hidden" name="MAX_FILE_SIZE" value="{$maxfilesize|htmlspecialchars}">
+	    <input type="submit" name="import_file" value="Import" class="bigbutton"><br>
+	    <input type="checkbox" name="private" id="private"><label for="private">&nbsp;Import all links as private</label><br>
+	    <input type="checkbox" name="overwrite" id="overwrite"><label for="overwrite">&nbsp;Overwrite existing links</label>
+	</form>
+	</div>
+</div>
+{include="page.footer"}
+</body>
+</html>
\ No newline at end of file
diff --git a/tpl/includes.html b/tpl/includes.html
new file mode 100644
index 00000000..c70b44e3
--- /dev/null
+++ b/tpl/includes.html
@@ -0,0 +1,7 @@
+<title>{$pagetitle}</title>
+<link rel="alternate" type="application/rss+xml" href="{$feedurl}?do=rss{$searchcrits}#" title="RSS Feed" />
+<link rel="alternate" type="application/atom+xml" href="{$feedurl}?do=atom{$searchcrits}#" title="ATOM Feed" />
+<link href="images/favicon.ico#" rel="shortcut icon" type="image/x-icon" />
+<link type="text/css" rel="stylesheet" href="inc/shaarli.css?version={$version}#" />
+{if condition="is_file('inc/user.css')"}<link type="text/css" rel="stylesheet" href="inc/user.css?version={$version}#" />{/if}
+<script language="JavaScript" src="inc/jquery.min.js#"></script><script language="JavaScript" src="inc/jquery-ui.custom.min.js#"></script>
diff --git a/tpl/install.html b/tpl/install.html
new file mode 100644
index 00000000..1e48a185
--- /dev/null
+++ b/tpl/install.html
@@ -0,0 +1,20 @@
+<html>
+<head>{include="includes"}{$timezone_js}</head>
+<body onload="document.installform.setlogin.focus();">
+<div style="margin-left:20px;">
+<h1>Shaarli</h1>	
+It looks like it's the first time you run Shaarli. Please configure it:<br>
+<div style="color:white !important;">
+<form method="POST" action="" name="installform" id="installform" style="border:1px solid black; padding:10 10 10 10;">
+<table border="0" cellpadding="20">
+<tr><td><b>Login:</b></td><td><input type="text" name="setlogin" size="30"></td></tr>
+<tr><td><b>Password:</b></td><td><input type="password" name="setpassword" size="30"></td></tr>
+{$timezone_html}
+<tr><td><b>Page title:</b></td><td><input type="text" name="title" size="30"></td></tr>
+<tr><td></td><td align="right"><input type="submit" name="Save" value="Save config" class="bigbutton"></td></tr>
+</table>
+</form>
+</div>
+{include="page.footer"}
+</body>
+</html>
\ No newline at end of file
diff --git a/tpl/linklist.html b/tpl/linklist.html
new file mode 100644
index 00000000..c7de5b87
--- /dev/null
+++ b/tpl/linklist.html
@@ -0,0 +1,61 @@
+<html>
+<head>{include="includes"}</head>
+<body>
+<div id="pageheader">
+	{include="page.header"}
+	<div id="headerform" style="width:100%; white-space:nowrap;";>
+	    <form method="GET" class="searchform" name="searchform" style="display:inline;"><input type="text" name="searchterm" style="width:30%" value=""> <input type="submit" value="Search" class="bigbutton"></form>
+	    <form method="GET" class="tagfilter" name="tagfilter" style="display:inline;margin-left:24px;"><input type="text" name="searchtags" id="searchtags" style="width:10%" value=""> <input type="submit" value="Filter by tag" class="bigbutton"></form>
+	</div>
+</div>
+
+<div id="linklist">
+
+    {include="linklist.paging"}
+
+    {if="$search_type=='fulltext'"}
+        <div id="searchcriteria">{$result_count} results for <i>{$search_crits}</i></div>
+    {/if}
+    {if="$search_type=='tags'"}
+        <div id="searchcriteria">{$result_count} results for tags <i>
+        {loop="search_crits"}
+            <span class="linktag" title="Remove tag"><a href="?removetag={$value|htmlspecialchars}">{$value|htmlspecialchars} <span style="border-left:1px solid #aaa; padding-left:5px; color:#6767A7;">x</span></a></span>
+        {/loop}</i></div>
+    {/if}
+
+    <ul>
+        {loop="links"}
+        <li{if="$value.class"} class="{$value.class}"{/if}>
+            <div class="thumbnail">{$value.url|thumbnail}</div>
+            <div class="linkcontainer">
+                <span class="linktitle"><a href="{$redirector}{$value.url|htmlspecialchars}">{$value.title|htmlspecialchars}</a></span>
+                {if="isLoggedIn()"}
+                    <form method="GET" class="buttoneditform"><input type="hidden" name="edit_link" value="{$value.linkdate}"><input type="image" alt="Edit" src="images/edit_icon.png#" title="Edit" class="button_edit"></form>
+                    <form method="POST" class="buttoneditform"><input type="hidden" name="lf_linkdate" value="{$value.linkdate}">
+                    <input type="hidden" name="token" value="{$token}"><input type="hidden" name="delete_link"><input type="image" alt="Delete" src="images/delete_icon.png#" title="Delete" class="button_delete" onClick="return confirmDeleteLink();"></form>
+                {/if}
+                <br>
+                {if="$value.description"}<div class="linkdescription"{if condition="$search_type=='permalink'"} style="max-height:none !important;"{/if}>{$value.description}</div>{/if}
+                {if="!$GLOBALS['config']['HIDE_TIMESTAMPS'] || isLoggedIn()"}
+                    <span class="linkdate" title="Permalink"><a href="?{$value.linkdate|smallHash}">{$value.localdate|htmlspecialchars} - permalink</a> - </span>
+                {else}
+                    <span class="linkdate" title="Short link here"><a href="?{$value.linkdate|smallHash}">permalink</a> - </span>
+                {/if}
+                <span class="linkurl" title="Short link">{$value.url|htmlspecialchars}</span><br>
+                {if="$value.tags"}
+                    <div class="linktaglist">
+                    {loop="value.taglist"}<span class="linktag" title="Add tag"><a href="?addtag={$value|htmlspecialchars}">{$value|htmlspecialchars}</a></span> {/loop}
+                    </div>
+                {/if}
+            </div>
+        </li>
+    {/loop}
+    </ul>
+
+    {include="linklist.paging"}
+
+</div>
+
+    {include="page.footer"}
+</body>
+</html>
\ No newline at end of file
diff --git a/tpl/linklist.paging.html b/tpl/linklist.paging.html
new file mode 100644
index 00000000..27e7440d
--- /dev/null
+++ b/tpl/linklist.paging.html
@@ -0,0 +1,9 @@
+    <div class="paging">
+        <div style="float:right; padding-right:5px;">
+            Links per page: <a href="?linksperpage=20">20</a> <a href="?linksperpage=50">50</a> <a href="?linksperpage=100">100</a>
+            <form method="GET" style="display:inline;" class="linksperpage"><input type="text" name="linksperpage" size="2" style="height:15px;"></form>
+        </div>
+        {if="$previous_page_url"} <a href="{$previous_page_url}">&#x25C4;Older</a> {/if}
+        <span style="color:#fff; padding:0 20 0 20;">page {$page_current} / {$page_max} </span>
+        {if="$next_page_url"} <a href="{$next_page_url}">Newer&#x25BA;</a> {/if}
+    </div>
\ No newline at end of file
diff --git a/tpl/loginform.html b/tpl/loginform.html
new file mode 100644
index 00000000..5a81fde1
--- /dev/null
+++ b/tpl/loginform.html
@@ -0,0 +1,25 @@
+<html>
+<head>{include="includes"}</head>
+<body{if="ban_canLogin()"} onload="document.loginform.login.focus();"{/if}>
+<div id="pageheader">
+	{include="page.header"}
+
+	<div id="headerform">
+{if="!ban_canLogin()"}
+    You have been banned from login after too many failed attempts. Try later.
+{else}
+    <form method="post" name="loginform">
+    Login: <input type="text" name="login" tabindex="1">&nbsp;&nbsp;&nbsp;
+    Password : <input type="password" name="password" tabindex="2">
+    <input type="submit" value="Login" class="bigbutton" tabindex="4"><br>
+    <input style="margin:10 0 0 40;" type="checkbox" name="longlastingsession" id="longlastingsession"  tabindex="3"><label for="longlastingsession">&nbsp;Stay signed in (Do not check on public computers)</label>
+    <input type="hidden" name="token" value="{$token}">
+    {if="$returnurl"}<input type="hidden" name="returnurl" value="{$returnurl|htmlspecialchars}">{/if}
+    </form>
+{/if}
+    </div>
+</div>
+
+{include="page.footer"}
+</body>
+</html>
\ No newline at end of file
diff --git a/tpl/page.footer.html b/tpl/page.footer.html
new file mode 100644
index 00000000..80a000bb
--- /dev/null
+++ b/tpl/page.footer.html
@@ -0,0 +1,20 @@
+<div id="footer">
+    <b><a href="http://sebsauvage.net/wiki/doku.php?id=php:shaarli">Shaarli {$version}</a></b> - The personal, minimalist, super-fast, no-database delicious clone. By <a href="http://sebsauvage.net" target="_blank">sebsauvage.net</a>. Theme by <a href="http://blog.idleman.fr" target="_blank">idleman.fr</a>.
+</div>
+{if="$newversion"}
+    <div id="newversion"><span style="text-decoration:blink;">&#x25CF;</span> Shaarli {$newversion|htmlspecialchars} is <a href="http://sebsauvage.net/wiki/doku.php?id=php:shaarli#download">available</a>.</div>
+{/if}
+{if="isLoggedIn()"}
+<script language="JavaScript">function confirmDeleteLink() { var agree=confirm("Are you sure you want to delete this link ?"); if (agree) return true ; else return false ; }</script>
+{/if}
+
+{if="$GLOBALS['config']['OPEN_SHAARLI'] || isLoggedIn()"}
+<script language="JavaScript">
+$(document).ready(function()
+{
+    $('#lf_tags').autocomplete({source:'{$source}?ws=tags',minLength:1});
+    $('#searchtags').autocomplete({source:'{$source}?ws=tags',minLength:1});
+    $('#fromtag').autocomplete({source:'{$source}?ws=singletag',minLength:1});
+});
+</script>
+{/if}
diff --git a/tpl/page.header.html b/tpl/page.header.html
new file mode 100644
index 00000000..72965a87
--- /dev/null
+++ b/tpl/page.header.html
@@ -0,0 +1,24 @@
+
+    <div id="logo" title="Share your links !" onclick="document.location='?';"></div>
+    <div style="float:right; font-style:italic; color:#bbb; text-align:right; padding:0 5 0 0;">Shaare your links...<br>{$linkcount} links</div>
+    <span id="shaarli_title"><a href="?">{$shaarlititle}</a></span>
+  
+{if="!empty($_GET['source']) && $_GET['source']=='bookmarklet'"}
+    {ignore} When called as a popup from bookmarklet, do not display menu. {/ignore}
+{else}
+    <a href="?">Home</a>
+    {if="isLoggedIn()"}
+        <a href="?do=logout">Logout</a><a href="?do=tools">Tools</a><a href="?do=addlink"><b>Add link</b></a>
+    {elseif="$GLOBALS['config']['OPEN_SHAARLI']"}
+        <a href="?do=tools">Tools</a><a href="?do=addlink"><b>Add link</b></a>
+    {else}
+        <a href="?do=login">Login</a>
+    {/if}
+    <a href="{$feedurl}?do=rss{$searchcrits}">RSS Feed</a>
+    <a href="{$feedurl}?do=atom{$searchcrits}" style="padding-left:10px;">ATOM Feed</a>
+    <a href="?do=tagcloud">Tag cloud</a>
+    <a href="?do=picwall{$searchcrits}">Picture wall</a>
+{/if}
+    <div class="clear"></div>
+
+
diff --git a/tpl/page.html b/tpl/page.html
new file mode 100644
index 00000000..2601169e
--- /dev/null
+++ b/tpl/page.html
@@ -0,0 +1,8 @@
+<html>
+<head>{include="includes"}</head>
+<body>
+	<div id="pageheader">{include="page.header"}</div>
+    You body goes here...
+    {include="page.footer"}
+</body>
+</html>
\ No newline at end of file
diff --git a/tpl/picwall.html b/tpl/picwall.html
new file mode 100644
index 00000000..48a1acf1
--- /dev/null
+++ b/tpl/picwall.html
@@ -0,0 +1,16 @@
+<html>
+<head>{include="includes"}</head>
+<body>
+<div id="pageheader">{include="page.header"}</div>
+<center>
+<div class="picwall_container">
+    {loop="linksToDisplay"}
+    <div class="picwall_pictureframe">
+	    {$value.thumbnail}<a href="{$value.permalink}"><span class="info">{$value.title|htmlspecialchars}</span></a>
+    </div>
+    {/loop}
+</div>
+</center>
+{include="page.footer"}
+</body>
+</html>
\ No newline at end of file
diff --git a/tpl/picwall2.html b/tpl/picwall2.html
new file mode 100644
index 00000000..765cf439
--- /dev/null
+++ b/tpl/picwall2.html
@@ -0,0 +1,18 @@
+<html>
+<head>{include="includes"}</head>
+<body>
+<div id="pageheader">{include="page.header"}</div>
+<div style="background-color:#003;">
+    {loop="linksToDisplay"}
+    <div style="float:left;width:48%;border-right:2px solid white;height:120px;overflow:hide;">
+	    <div style="float:left;width:120px;text-align:center">{$value.thumbnail}</div>
+	    <a href="{$value.permalink}" style="color:yellow;font-weight:bold;text-decoration:none;">{$value.title|htmlspecialchars}</a><br>
+	    <span style="font-size:8pt;color:#eee;">{$value.description|htmlspecialchars}</span>
+	    <div style="clear:both;"></div>
+	</div><br>
+    {/loop}
+</div>
+
+{include="page.footer"}
+</body>
+</html>
\ No newline at end of file
diff --git a/tpl/readme.txt b/tpl/readme.txt
new file mode 100644
index 00000000..d57080ea
--- /dev/null
+++ b/tpl/readme.txt
@@ -0,0 +1,42 @@
+===== Shaarli template organisation =====
+
+Any Shaarli page should conform to this RainTPL template:
+
+-----------------------------------------------------
+<html>
+<head>{include="includes"}</head>
+<body>
+	<div id="pageheader">{include="page.header"}</div>
+    You body goes here...
+    {include="page.footer"}
+</body>
+</html>
+-----------------------------------------------------
+
+If you want to also add something in the page header (in the dark area), do it here:
+
+<div id="pageheader">{include="page.header"}My menu goes here...</div>
+
+
+Example: "Add new link" form:
+-----------------------------------------------------
+<html>
+<head>{include="includes"}</head>
+<body onload="document.addform.post.focus();">
+<div id="pageheader">
+	{include="page.header"}
+	<div id="headerform">
+		<form method="GET" action="" name="addform" class="addform">
+			<input type="text" name="post" style="width:50%;"> 
+			<input type="submit" value="Add link" class="bigbutton">
+		</form>
+	</div>
+</div>
+{include="page.footer"}
+</body>
+</html>
+-----------------------------------------------------
+
+
+
+
diff --git a/tpl/tagcloud.html b/tpl/tagcloud.html
new file mode 100644
index 00000000..4bd78115
--- /dev/null
+++ b/tpl/tagcloud.html
@@ -0,0 +1,14 @@
+<html>
+<head>{include="includes"}</head>
+<body>
+	<div id="pageheader">{include="page.header"}</div>
+<center>
+<div id="cloudtag">
+    {loop="tags"}
+    <span style="color:#99f; font-size:9pt; padding-left:5px; padding-right:2px;">{$value.count}</span><a href="?searchtags={$key|htmlspecialchars}" style="font-size:{$value.size}pt; font-weight:bold; color:black; text-decoration:none">{$key|htmlspecialchars}</a>
+    {/loop}
+</div>
+</center>
+{include="page.footer"}
+</body>
+</html>
\ No newline at end of file
diff --git a/tpl/tools.html b/tpl/tools.html
new file mode 100644
index 00000000..bf70021c
--- /dev/null
+++ b/tpl/tools.html
@@ -0,0 +1,18 @@
+<html>
+<head>{include="includes"}</head>
+<body>
+<div id="pageheader">
+	{include="page.header"}
+	<div id="toolsdiv">
+		{if="!$GLOBALS['config']['OPEN_SHAARLI']"}<a href="?do=changepasswd"><b>Change password</b>  <span>: Change your password.</span></a><br><br>{/if}
+	    <a href="?do=configure"><b>Configure your Shaarli</b> <span>:  Change Title, timezone...</span></a><br><br>
+	    <a href="?do=changetag"><b>Rename/delete tags</b> <span>:  Rename or delete a tag in all links</span></a><br><br>
+	    <a href="?do=import"><b>Import</b> <span>:  Import Netscape html bookmarks (as exported from Firefox, Chrome, Opera, delicious...)</span></a> <br><br>
+	    <a href="?do=export"><b>Export</b> <span>:  Export Netscape html bookmarks (which can be imported in Firefox, Chrome, Opera, delicious...)</span></a><br><br>
+	<a class="smallbutton" onclick="alert('Drag this link to your bookmarks toolbar, or right-click it and choose Bookmark This Link...');return false;" href="javascript:javascript:(function(){var%20url%20=%20location.href;var%20title%20=%20document.title%20||%20url;window.open('{$pageabsaddr}?post='%20+%20encodeURIComponent(url)+'&amp;title='%20+%20encodeURIComponent(title)+'&amp;source=bookmarklet','_blank','menubar=no,height=390,width=600,toolbar=no,scrollbars=no,status=no');})();"><b>Shaare link</b></a> <a href="#" style="clear:none;"><span>&#x21D0; Drag this link to your bookmarks toolbar (or right-click it and choose Bookmark This Link....).<br>&nbsp;&nbsp;&nbsp;&nbsp;Then click "Shaare link" button in any page you want to share.</span></a><br><br>
+	    <div class="clear"></div>
+	</div>
+</div>
+{include="page.footer"}
+</body>
+</html>
\ No newline at end of file