make the application work again

git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@388 b3834d28-1941-0410-a4f8-b48e95affb8f

16 files changed, 855 insertions, 268 deletions

diff --git a/src/SemanticScuttle/Service.php b/src/SemanticScuttle/Service.php
new file mode 100644
index 0000000..a537262
--- /dev/null
+++ b/src/SemanticScuttle/Service.php
@@ -0,0 +1,35 @@
+<?php
+class SemanticScuttle_Service
+{
+    /**
+     * SQL database object
+     *
+     * @var sql_db
+     */
+    protected $db;
+
+
+
+    /**
+     * Returns the single service instance
+     *
+     * @internal
+     * This function can be used once PHP 5.3 is minimum, because only
+     * 5.3 supports late static binding. For all lower php versions,
+     * we still need a copy of this method in each service class.
+     *
+     * @param DB $db Database object
+     *
+     * @return SemanticScuttle_Service
+     */
+	public static function getInstance($db)
+    {
+		static $instance;
+		if (!isset($instance)) {
+            $instance = new self($db);
+        }
+		return $instance;
+	}
+
+}
+?>
\ No newline at end of file
diff --git a/src/SemanticScuttle/Service/Bookmark.php b/src/SemanticScuttle/Service/Bookmark.php
index f119593..6075a0d 100644
--- a/src/SemanticScuttle/Service/Bookmark.php
+++ b/src/SemanticScuttle/Service/Bookmark.php
@@ -1,23 +1,33 @@
 <?php
-class BookmarkService {
-	var $db;
+class SemanticScuttle_Service_Bookmark extends SemanticScuttle_Service
+{
 	var $tablename;
 
-	function & getInstance(& $db) {
+    /**
+     * Returns the single service instance
+     *
+     * @param DB $db Database object
+     *
+     * @return SemanticScuttle_Service
+     */
+	public static function getInstance($db)
+    {
 		static $instance;
-		if (!isset ($instance))
-		$instance = & new BookmarkService($db);
+		if (!isset($instance)) {
+            $instance = new self($db);
+        }
 		return $instance;
 	}
 
-	function BookmarkService(& $db) {
-		$this->db = & $db;
+	public function __construct($db)
+    {
+		$this->db = $db;
 		$this->tablename = $GLOBALS['tableprefix'] .'bookmarks';
 	}
 
 	function _getbookmark($fieldname, $value, $all = false) {
 		if (!$all) {
-			$userservice = & ServiceFactory :: getServiceInstance('UserService');
+			$userservice = SemanticScuttle_Service_Factory :: getServiceInstance('User');
 			$sId = $userservice->getCurrentUserId();
 			$range = ' AND uId = '. $sId;
 		} else {
@@ -51,7 +61,7 @@ class BookmarkService {
 
 		if ($row = & $this->db->sql_fetchrow($dbresult)) {
 			if ($include_tags) {
-				$b2tservice = & ServiceFactory :: getServiceInstance('Bookmark2TagService');
+				$b2tservice = SemanticScuttle_Service_Factory :: getServiceInstance('Bookmark2Tag');
 				$row['tags'] = $b2tservice->getTagsForBookmark($bid);
 			}
 			$output = $row;			
@@ -118,7 +128,7 @@ class BookmarkService {
 			return false;
 		}
 
-		$userservice = & ServiceFactory::getServiceInstance('UserService');
+		$userservice = SemanticScuttle_Service_Factory::getServiceInstance('User');
 		$user = $userservice->getCurrentUser();
 
 		//user has to be either admin, or owner
@@ -160,7 +170,7 @@ class BookmarkService {
 	// Note that date is expected to be a string that's interpretable by strtotime().
 	function addBookmark($address, $title, $description, $privateNote, $status, $categories, $date = NULL, $fromApi = false, $fromImport = false, $sId = -1) {
 		if($sId == -1) {
-			$userservice = & ServiceFactory :: getServiceInstance('UserService');
+			$userservice = SemanticScuttle_Service_Factory :: getServiceInstance('User');
 			$sId = $userservice->getCurrentUserId();
 		}
 
@@ -204,7 +214,7 @@ class BookmarkService {
 		$extension = end($uriparts);
 		unset($uriparts);
 
-		$b2tservice = & ServiceFactory :: getServiceInstance('Bookmark2TagService');
+		$b2tservice = SemanticScuttle_Service_Factory :: getServiceInstance('Bookmark2Tag');
 		if (!$b2tservice->attachTags($bId, $categories, $fromApi, $extension, false, $fromImport)) {
 			$this->db->sql_transaction('rollback');
 			message_die(GENERAL_ERROR, 'Could not insert bookmark', '', __LINE__, __FILE__, $sql, $this->db);
@@ -260,7 +270,7 @@ class BookmarkService {
 		$extension = end($uriparts);
 		unset($uriparts);
 
-		$b2tservice = & ServiceFactory :: getServiceInstance('Bookmark2TagService');
+		$b2tservice = SemanticScuttle_Service_Factory :: getServiceInstance('Bookmark2Tag');
 		if (!$b2tservice->attachTags($bId, $categories, $fromApi, $extension)) {
 			$this->db->sql_transaction('rollback');
 			message_die(GENERAL_ERROR, 'Could not update bookmark', '', __LINE__, __FILE__, $sql, $this->db);
@@ -282,9 +292,9 @@ class BookmarkService {
 		//    bookmarks; otherwise, just get the public bookmarks.
 		//  - if the $user is set and IS the logged-in user, then get all bookmarks.
 
-		$userservice =& ServiceFactory::getServiceInstance('UserService');
-		$b2tservice =& ServiceFactory::getServiceInstance('Bookmark2TagService');
-		$tag2tagservice =& ServiceFactory::getServiceInstance('Tag2TagService');
+		$userservice =SemanticScuttle_Service_Factory::getServiceInstance('User');
+		$b2tservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark2Tag');
+		$tag2tagservice =SemanticScuttle_Service_Factory::getServiceInstance('Tag2Tag');
 		$sId = $userservice->getCurrentUserId();
 
 		if ($userservice->isLoggedOn()) {
@@ -480,15 +490,15 @@ class BookmarkService {
 		return true;
 	}
 
-	function deleteBookmarksForUser($uId) {

-		$query = 'DELETE FROM '. $GLOBALS['tableprefix'] .'bookmarks WHERE uId = '. intval($uId);

-

-		if (!($dbresult = & $this->db->sql_query($query))) {

-			message_die(GENERAL_ERROR, 'Could not delete bookmarks', '', __LINE__, __FILE__, $query, $this->db);

-			return false;

-		}

-

-		return true;

+	function deleteBookmarksForUser($uId) {
+		$query = 'DELETE FROM '. $GLOBALS['tableprefix'] .'bookmarks WHERE uId = '. intval($uId);
+
+		if (!($dbresult = & $this->db->sql_query($query))) {
+			message_die(GENERAL_ERROR, 'Could not delete bookmarks', '', __LINE__, __FILE__, $query, $this->db);
+			return false;
+		}
+
+		return true;
 	}
 
 	function countOthers($address) {
@@ -496,7 +506,7 @@ class BookmarkService {
 			return false;
 		}
 
-		$userservice = & ServiceFactory :: getServiceInstance('UserService');
+		$userservice = SemanticScuttle_Service_Factory :: getServiceInstance('User');
 		$sId = $userservice->getCurrentUserId();
 
 		if ($userservice->isLoggedOn()) {
diff --git a/src/SemanticScuttle/Service/Bookmark2tag.php b/src/SemanticScuttle/Service/Bookmark2Tag.php
index 918fb5b..bd3f3af 100644
--- a/src/SemanticScuttle/Service/Bookmark2tag.php
+++ b/src/SemanticScuttle/Service/Bookmark2Tag.php
@@ -1,17 +1,28 @@
 <?php
-class Bookmark2TagService {
-	var $db;
+class SemanticScuttle_Service_Bookmark2Tag extends SemanticScuttle_Service
+{
 	var $tablename;
 
-	function &getInstance(&$db) {
+
+    /**
+     * Returns the single service instance
+     *
+     * @param DB $db Database object
+     *
+     * @return SemanticScuttle_Service
+     */
+	public static function getInstance($db)
+    {
 		static $instance;
-		if (!isset($instance))
-		$instance =& new Bookmark2TagService($db);
+		if (!isset($instance)) {
+            $instance = new self($db);
+        }
 		return $instance;
 	}
 
-	function Bookmark2TagService(&$db) {
-		$this->db =& $db;
+	public function __construct($db)
+    {
+		$this->db = $db;
 		$this->tablename = $GLOBALS['tableprefix'] .'bookmarks2tags';
 	}
 
@@ -42,7 +53,7 @@ class Bookmark2TagService {
 			}
 		}
 
-		$tagservice =& ServiceFactory::getServiceInstance('TagService');
+		$tagservice =SemanticScuttle_Service_Factory::getServiceInstance('Tag');
 		$tags = $tagservice->normalize($tags);
 
 
@@ -51,7 +62,7 @@ class Bookmark2TagService {
 		for ($i = 0; $i < $tags_count; $i++) {
 			$tags[$i] = trim(strtolower($tags[$i]));
 			if ($fromApi) {
-				include_once(dirname(__FILE__) .'/../functions.inc.php');
+				include_once 'SemanticScuttle/functions.php';
 				$tags[$i] = convertTag($tags[$i], 'in');
 			}
 		}
@@ -70,7 +81,7 @@ class Bookmark2TagService {
 
 		// Media and file types
 		if (!is_null($extension)) {
-			include_once(dirname(__FILE__) .'/../functions.inc.php');
+			include_once 'SemanticScuttle/functions.php';
 			
 			if ($keys = multi_array_search($extension, $GLOBALS['filetypes'])) {
 				$tags[] = 'system:filetype:'. $extension;
@@ -93,8 +104,8 @@ class Bookmark2TagService {
 			}
 		}
 
-		$bs =& ServiceFactory::getServiceInstance('BookmarkService');
-		$tts =& ServiceFactory::getServiceInstance('Tag2TagService');
+		$bs =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
+		$tts =SemanticScuttle_Service_Factory::getServiceInstance('Tag2Tag');
 
 		// Create links between tags
 		foreach($tags as $key => $tag) {
@@ -150,7 +161,7 @@ class Bookmark2TagService {
 	}
 
 	function deleteTag($uId, $tag) {
-		$bs =& ServiceFactory::getServiceInstance('BookmarkService');
+		$bs =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
 
 		$query = 'DELETE FROM '. $this->getTableName();
 		$query.= ' USING '. $this->getTableName() .', '. $bs->getTableName();
@@ -183,23 +194,23 @@ class Bookmark2TagService {
 	}
 
 	/* Allow deletion in admin page */
-	function deleteTagsForUser($uId) {

-		$qmask = 'DELETE FROM %s USING %s, %s WHERE %s.bId = %s.bId AND %s.uId = %d';

-		$query = sprintf($qmask,

-		$this->getTableName(),

-		$this->getTableName(),

-		$GLOBALS['tableprefix'].'bookmarks',

-		$this->getTableName(),

-		$GLOBALS['tableprefix'].'bookmarks',

-		$GLOBALS['tableprefix'].'bookmarks',

-		$uId);

-

-		if (!($dbresult =& $this->db->sql_query($query))) {

-			message_die(GENERAL_ERROR, 'Could not delete tags', '', __LINE__, __FILE__, $query, $this->db);

-			return false;

-		}

-

-		return true;

+	function deleteTagsForUser($uId) {
+		$qmask = 'DELETE FROM %s USING %s, %s WHERE %s.bId = %s.bId AND %s.uId = %d';
+		$query = sprintf($qmask,
+		$this->getTableName(),
+		$this->getTableName(),
+		$GLOBALS['tableprefix'].'bookmarks',
+		$this->getTableName(),
+		$GLOBALS['tableprefix'].'bookmarks',
+		$GLOBALS['tableprefix'].'bookmarks',
+		$uId);
+
+		if (!($dbresult =& $this->db->sql_query($query))) {
+			message_die(GENERAL_ERROR, 'Could not delete tags', '', __LINE__, __FILE__, $query, $this->db);
+			return false;
+		}
+
+		return true;
 	}
 
 	function &getTagsForBookmark($bookmarkid) {
@@ -224,7 +235,7 @@ class Bookmark2TagService {
 	}
 
 	function &getTags($userid = NULL) {
-		$userservice =& ServiceFactory::getServiceInstance('UserService');
+		$userservice =SemanticScuttle_Service_Factory::getServiceInstance('User');
 		$logged_on_user = $userservice->getCurrentUserId();
 
 		$query = 'SELECT T.tag, COUNT(B.bId) AS bCount FROM '. $GLOBALS['tableprefix'] .'bookmarks AS B INNER JOIN '. $userservice->getTableName() .' AS U ON B.uId = U.'. $userservice->getFieldName('primary') .' INNER JOIN '. $GLOBALS['tableprefix'] .'bookmarks2tags AS T ON B.bId = T.bId';
@@ -299,7 +310,7 @@ class Bookmark2TagService {
 
 	// Returns the most popular tags used for a particular bookmark hash
 	function &getRelatedTagsByHash($hash, $limit = 20) {
-		$userservice = & ServiceFactory :: getServiceInstance('UserService');
+		$userservice = SemanticScuttle_Service_Factory :: getServiceInstance('User');
 		$sId = $userservice->getCurrentUserId();
 		// Logged in
 		if ($userservice->isLoggedOn()) {
@@ -329,7 +340,7 @@ class Bookmark2TagService {
 	
 	function &getAdminTags($limit = 30, $logged_on_user = NULL, $days = NULL) {
 		// look for admin ids
-		$userservice = & ServiceFactory :: getServiceInstance('UserService');
+		$userservice = SemanticScuttle_Service_Factory :: getServiceInstance('User');
 		$adminIds = $userservice->getAdminIds();
 		
 		// ask for their tags
@@ -338,7 +349,7 @@ class Bookmark2TagService {
 	
 	function &getContactTags($user, $limit = 30, $logged_on_user = NULL, $days = NULL) {
 		// look for contact ids
-		$userservice = & ServiceFactory :: getServiceInstance('UserService');
+		$userservice = SemanticScuttle_Service_Factory :: getServiceInstance('User');
 		$contacts = $userservice->getWatchlist($user);
 		
 		// add the user (to show him/her also his/her tags)
@@ -406,8 +417,8 @@ class Bookmark2TagService {
 	}
 
 	function renameTag($userid, $old, $new, $fromApi = false) {
-		$bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService');
-		$tagservice =& ServiceFactory::getServiceInstance('TagService');
+		$bookmarkservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
+		$tagservice =SemanticScuttle_Service_Factory::getServiceInstance('Tag');
 
 		if (is_null($userid) || is_null($old) || is_null($new))
 		return false;
diff --git a/src/SemanticScuttle/Service/Cache.php b/src/SemanticScuttle/Service/Cache.php
index fe66d38..5ca2843 100644
--- a/src/SemanticScuttle/Service/Cache.php
+++ b/src/SemanticScuttle/Service/Cache.php
@@ -1,18 +1,27 @@
 <?php
-class CacheService {
+class SemanticScuttle_Service_Cache extends SemanticScuttle_Service
+{
     var $basedir;
     var $fileextension = '.cache';
 
-    function &getInstance() {
-        static $instance;
-        
-        if (!isset($instance))
-            $instance =& new CacheService();
-
-        return $instance;
-    }
+    /**
+     * Returns the single service instance
+     *
+     * @param DB $db Database object
+     *
+     * @return SemanticScuttle_Service
+     */
+	public static function getInstance($db)
+    {
+		static $instance;
+		if (!isset($instance)) {
+            $instance = new self($db);
+        }
+		return $instance;
+	}
 
-    function CacheService() {
+    protected function __construct()
+    {
         $this->basedir = $GLOBALS['dir_cache'];    
     }
 
diff --git a/src/SemanticScuttle/Service/CommonDescription.php b/src/SemanticScuttle/Service/CommonDescription.php
index 86e0c0f..ed1ffdd 100644
--- a/src/SemanticScuttle/Service/CommonDescription.php
+++ b/src/SemanticScuttle/Service/CommonDescription.php
@@ -1,17 +1,27 @@
 <?php
-class CommonDescriptionService {
-	var $db;
+class SemanticScuttle_Service_CommonDescription extends SemanticScuttle_Service
+{
 	var $tablename;
 
-	function &getInstance(&$db) {
+    /**
+     * Returns the single service instance
+     *
+     * @param DB $db Database object
+     *
+     * @return SemanticScuttle_Service
+     */
+	public static function getInstance($db)
+    {
 		static $instance;
-		if (!isset($instance))
-		$instance =& new CommonDescriptionService($db);
+		if (!isset($instance)) {
+            $instance = new self($db);
+        }
 		return $instance;
 	}
 
-	function CommonDescriptionService(&$db) {
-		$this->db =& $db;
+	public function __construct($db)
+    {
+		$this->db = $db;
 		$this->tablename = $GLOBALS['tableprefix'] .'commondescription';
 	}
 
diff --git a/src/SemanticScuttle/Service/Factory.php b/src/SemanticScuttle/Service/Factory.php
index b5215e3..b4ba28e 100644
--- a/src/SemanticScuttle/Service/Factory.php
+++ b/src/SemanticScuttle/Service/Factory.php
@@ -1,16 +1,19 @@
 <?php
 /* Connect to the database and build services */
 
-class ServiceFactory {
-	function ServiceFactory(&$db, $serviceoverrules = array()) {
+class SemanticScuttle_Service_Factory
+{
+	public function __construct($db, $serviceoverrules = array())
+    {
 	}
 
-	function &getServiceInstance($name, $servicedir = NULL) {
+	public function getServiceInstance($name, $servicedir = null)
+    {
 		global $dbhost, $dbuser, $dbpass, $dbname, $dbport, $dbpersist, $dbtype;
 		static $instances = array();
 		static $db;
 		if (!isset($db)) {
-			require_once(dirname(__FILE__) .'/../includes/db/'. $dbtype .'.php');
+			require_once 'SemanticScuttle/db/'. $dbtype .'.php';
 			$db = new sql_db();
 			$db->sql_connect($dbhost, $dbuser, $dbpass, $dbname, $dbport, $dbpersist);
 			if(!$db->db_connect_id) {
@@ -25,12 +28,15 @@ class ServiceFactory {
 			}
 			if (!class_exists($name)) {
 				if (!isset($servicedir)) {
-					$servicedir = dirname(__FILE__) .'/';
+					$servicedir = 'SemanticScuttle/Service/';
 				}
 								
-				require_once($servicedir . strtolower($name) . '.php');
+				require_once $servicedir . $name . '.php';
 			}
-			$instances[$name] = call_user_func(array($name, 'getInstance'), $db);
+			$instances[$name] = call_user_func(
+                array('SemanticScuttle_Service_' . $name, 'getInstance'),
+                $db
+            );
 		}
 		return $instances[$name];
 	}
diff --git a/src/SemanticScuttle/Service/SearchHistory.php b/src/SemanticScuttle/Service/SearchHistory.php
index 91457e8..7cffa83 100644
--- a/src/SemanticScuttle/Service/SearchHistory.php
+++ b/src/SemanticScuttle/Service/SearchHistory.php
@@ -1,18 +1,28 @@
 <?php
-class SearchHistoryService {
-	var $db;
+class SemanticScuttle_Service_SearchHistory extends SemanticScuttle_Service
+{
 	var $tablename;
 	var $sizeSearchHistory;
 
-	function &getInstance(&$db) {
+    /**
+     * Returns the single service instance
+     *
+     * @param DB $db Database object
+     *
+     * @return SemanticScuttle_Service
+     */
+	public static function getInstance($db)
+    {
 		static $instance;
-		if (!isset($instance))
-		$instance =& new SearchHistoryService($db);
+		if (!isset($instance)) {
+            $instance = new self($db);
+        }
 		return $instance;
 	}
 
-	function SearchHistoryService(& $db) {
-		$this->db =& $db;
+	public function __construct($db)
+    {
+		$this->db = $db;
 		$this->tablename = $GLOBALS['tableprefix'] .'searchhistory';
 		if(isset($GLOBALS['sizeSearchHistory'])) {
 			$this->sizeSearchHistory = $GLOBALS['sizeSearchHistory'];
diff --git a/src/SemanticScuttle/Service/Tag.php b/src/SemanticScuttle/Service/Tag.php
index fc44a99..2a70948 100644
--- a/src/SemanticScuttle/Service/Tag.php
+++ b/src/SemanticScuttle/Service/Tag.php
@@ -1,17 +1,27 @@
 <?php
-class TagService {
-	var $db;
+class SemanticScuttle_Service_Tag extends SemanticScuttle_Service
+{
 	var $tablename;
 
-	function &getInstance(&$db) {
+    /**
+     * Returns the single service instance
+     *
+     * @param DB $db Database object
+     *
+     * @return SemanticScuttle_Service
+     */
+	public static function getInstance($db)
+    {
 		static $instance;
-		if (!isset($instance))
-		$instance =& new TagService($db);
+		if (!isset($instance)) {
+            $instance = new self($db);
+        }
 		return $instance;
 	}
 
-	function TagService(&$db) {
-		$this->db =& $db;
+	public function __construct($db)
+    {
+		$this->db = $db;
 		$this->tablename = $GLOBALS['tableprefix'] .'tags';
 	}
 
diff --git a/src/SemanticScuttle/Service/Tag2tag.php b/src/SemanticScuttle/Service/Tag2Tag.php
index 956fd49..b209d60 100644
--- a/src/SemanticScuttle/Service/Tag2tag.php
+++ b/src/SemanticScuttle/Service/Tag2Tag.php
@@ -1,22 +1,33 @@
 <?php
-class Tag2TagService {
-	var $db;
-	var $tablename;
-
-	function &getInstance(&$db) {
+class SemanticScuttle_Service_Tag2Tag extends SemanticScuttle_Service
+{
+	protected $tablename;
+
+    /**
+     * Returns the single service instance
+     *
+     * @param DB $db Database object
+     *
+     * @return SemanticScuttle_Service
+     */
+	public static function getInstance($db)
+    {
 		static $instance;
-		if (!isset($instance))
-		$instance =& new Tag2TagService($db);
+		if (!isset($instance)) {
+            $instance = new self($db);
+        }
 		return $instance;
 	}
 
-	function Tag2TagService(&$db) {
+
+	function __construct(&$db)
+    {
 		$this->db =& $db;
 		$this->tablename = $GLOBALS['tableprefix'] .'tags2tags';
 	}
 
 	function addLinkedTags($tag1, $tag2, $relationType, $uId) {
-		$tagservice =& ServiceFactory::getServiceInstance('TagService');
+		$tagservice =SemanticScuttle_Service_Factory::getServiceInstance('Tag');
 		$tag1 = $tagservice->normalize($tag1);
 		$tag2 = $tagservice->normalize($tag2);
 
@@ -46,7 +57,7 @@ class Tag2TagService {
 	// Return linked tags just for admin users
 	function getAdminLinkedTags($tag, $relationType, $inverseRelation = false, $stopList = array()) {
 		// look for admin ids
-		$userservice = & ServiceFactory :: getServiceInstance('UserService');
+		$userservice = SemanticScuttle_Service_Factory :: getServiceInstance('User');
 		$adminIds = $userservice->getAdminIds();
 		
 		//ask for their linked tags
@@ -119,7 +130,7 @@ class Tag2TagService {
 		}
 
 		// try to find data in cache
-		$tcs = & ServiceFactory::getServiceInstance('TagCacheService');
+		$tcs = SemanticScuttle_Service_Factory::getServiceInstance('TagCache');
 		if(count($stopList) == 0) {
 			$activatedCache = true;
 		} else {
@@ -177,7 +188,7 @@ class Tag2TagService {
 		$query = "SELECT DISTINCT tts.tag1 as tag";
 		$query.= " FROM `". $this->getTableName() ."` tts";
 		if($orderBy != null) {
-			$tsts =& ServiceFactory::getServiceInstance('TagStatService');
+			$tsts =SemanticScuttle_Service_Factory::getServiceInstance('TagStat');
 			$query.= ", ".$tsts->getTableName() ." tsts";
 		}
 		$query.= " WHERE tts.tag1 <> ALL";
@@ -328,7 +339,7 @@ class Tag2TagService {
 	}	
 
 	function renameTag($uId, $oldName, $newName) {
-		$tagservice =& ServiceFactory::getServiceInstance('TagService');
+		$tagservice =SemanticScuttle_Service_Factory::getServiceInstance('Tag');
 		$newName = $tagservice->normalize($newName);
 
 		$query = 'UPDATE `'. $this->getTableName() .'`';
@@ -355,10 +366,10 @@ class Tag2TagService {
 	}
 
 	function update($tag1, $tag2, $relationType, $uId) {
-		$tsts =& ServiceFactory::getServiceInstance('TagStatService');
+		$tsts =SemanticScuttle_Service_Factory::getServiceInstance('TagStat');
 		$tsts->updateStat($tag1, $relationType, $uId);
 
-		$tcs = & ServiceFactory::getServiceInstance('TagCacheService');
+		$tcs = SemanticScuttle_Service_Factory::getServiceInstance('TagCache');
 		$tcs->deleteByUser($uId);
 	}
 
@@ -366,7 +377,7 @@ class Tag2TagService {
 		$query = 'TRUNCATE TABLE `'. $this->getTableName() .'`';
 		$this->db->sql_query($query);
 
-		$tsts =& ServiceFactory::getServiceInstance('TagStatService');
+		$tsts =SemanticScuttle_Service_Factory::getServiceInstance('TagStat');
 		$tsts->deleteAll();
 	}
 
diff --git a/src/SemanticScuttle/Service/TagCache.php b/src/SemanticScuttle/Service/TagCache.php
index ed2eefc..30f9ebd 100644
--- a/src/SemanticScuttle/Service/TagCache.php
+++ b/src/SemanticScuttle/Service/TagCache.php
@@ -1,31 +1,43 @@
 <?php
-
-/*
- * This class infers on relation between tags by storing all the including tags or synonymous tag.
- * For example, if the user creates: tag1>tag2>tag3, the system can infer that tag is included into tag1.
- * Instead of computing this relation several times, it is saved into this current table.
+/**
+ * This class infers on relation between tags by storing all
+ * the including tags or synonymous tag.
+ * For example, if the user creates: tag1>tag2>tag3, the system
+ * can infer that tag is included into tag1.
+ * Instead of computing this relation several times, it is saved
+ * into this current table.
  * For synonymy, this table stores also the group of synonymous tags.
- * The table must be updated for each modification of the relations between tags.
+ * The table must be updated for each modification of
+ * the relations between tags.
  */
-
-class TagCacheService {
-	var $db;
+class SemanticScuttle_Service_TagCache extends SemanticScuttle_Service
+{
 	var $tablename;
 
-	function &getInstance(&$db) {
+    /**
+     * Returns the single service instance
+     *
+     * @param DB $db Database object
+     *
+     * @return SemanticScuttle_Service
+     */
+	public static function getInstance($db)
+    {
 		static $instance;
-		if (!isset($instance))
-		$instance =& new TagCacheService($db);
+		if (!isset($instance)) {
+            $instance = new self($db);
+        }
 		return $instance;
 	}
 
-	function TagCacheService(&$db) {
-		$this->db =& $db;
+	protected function __construct($db)
+    {
+		$this->db =$db;
 		$this->tablename = $GLOBALS['tableprefix'] .'tagscache';
 	}
 
 	function getChildren($tag1, $uId) {
-		$tagservice =& ServiceFactory::getServiceInstance('TagService');
+		$tagservice =SemanticScuttle_Service_Factory::getServiceInstance('Tag');
 		$tag1 = $tagservice->normalize($tag1);
 
 		if($tag1 == '') return false;
@@ -54,7 +66,7 @@ class TagCacheService {
 	}
 
 	function addChild($tag1, $tag2, $uId) {
-		$tagservice =& ServiceFactory::getServiceInstance('TagService');
+		$tagservice =SemanticScuttle_Service_Factory::getServiceInstance('Tag');
 		$tag1 = $tagservice->normalize($tag1);
 		$tag2 = $tagservice->normalize($tag2);
 
@@ -98,7 +110,7 @@ class TagCacheService {
 	}
 
 	function existsChild($tag1, $tag2, $uId) {
-		$tagservice =& ServiceFactory::getServiceInstance('TagService');
+		$tagservice =SemanticScuttle_Service_Factory::getServiceInstance('Tag');
 		$tag1 = $tagservice->normalize($tag1);
 		$tag2 = $tagservice->normalize($tag2);
 
@@ -202,7 +214,7 @@ class TagCacheService {
 	}
 
 	function _isSynonymKey($tag1, $uId) {
-		$tagservice =& ServiceFactory::getServiceInstance('TagService');
+		$tagservice =SemanticScuttle_Service_Factory::getServiceInstance('Tag');
 		$tag1 = $tagservice->normalize($tag1);
 
 		$query = "SELECT tag1 FROM `". $this->getTableName() ."`";
@@ -214,7 +226,7 @@ class TagCacheService {
 	}
 
 	function _isSynonymValue($tag2, $uId) {
-		$tagservice =& ServiceFactory::getServiceInstance('TagService');
+		$tagservice =SemanticScuttle_Service_Factory::getServiceInstance('Tag');
 		$tag2 = $tagservice->normalize($tag2);
 
 		$query = "SELECT tag2 FROM `". $this->getTableName() ."`";
@@ -238,7 +250,7 @@ class TagCacheService {
 	}
 
 	function _getSynonymKey($tag2, $uId) {
-		$tagservice =& ServiceFactory::getServiceInstance('TagService');
+		$tagservice =SemanticScuttle_Service_Factory::getServiceInstance('Tag');
 		$tag2 = $tagservice->normalize($tag2);
 
 		if($this->_isSynonymKey($tag2)) return $tag2;
@@ -267,7 +279,7 @@ class TagCacheService {
 	 * $tagExcepted allows to hide a value.
 	 */
 	function _getSynonymValues($tag1, $uId, $tagExcepted = NULL) {
-		$tagservice =& ServiceFactory::getServiceInstance('TagService');
+		$tagservice =SemanticScuttle_Service_Factory::getServiceInstance('Tag');
 		$tag1 = $tagservice->normalize($tag1);
 		$tagExcepted = $tagservice->normalize($tagExcepted);
 
diff --git a/src/SemanticScuttle/Service/TagStat.php b/src/SemanticScuttle/Service/TagStat.php
index 9d3ca5d..c54dcb7 100644
--- a/src/SemanticScuttle/Service/TagStat.php
+++ b/src/SemanticScuttle/Service/TagStat.php
@@ -1,22 +1,33 @@
 <?php
-class TagStatService {
-	var $db;
+class SemanticScuttle_Service_TagStat extends SemanticScuttle_Service
+{
+
 	var $tablename;
 
-	function &getInstance(&$db) {
+    /**
+     * Returns the single service instance
+     *
+     * @param DB $db Database object
+     *
+     * @return SemanticScuttle_Service
+     */
+	public static function getInstance($db)
+    {
 		static $instance;
-		if (!isset($instance))
-		$instance =& new TagStatService($db);
+		if (!isset($instance)) {
+            $instance = new self($db);
+        }
 		return $instance;
 	}
 
-	function TagStatService(&$db) {
-		$this->db =& $db;
+	protected function __construct($db)
+    {
+		$this->db = $db;
 		$this->tablename = $GLOBALS['tableprefix'] .'tagsstats';
 	}
 
 	function getNbChildren($tag1, $relationType, $uId) {
-		$tts =& ServiceFactory::getServiceInstance('Tag2TagService');
+		$tts =SemanticScuttle_Service_Factory::getServiceInstance('Tag2Tag');
 		$query = "SELECT tag1, relationType, uId FROM `". $tts->getTableName() ."`";
 		$query.= " WHERE tag1 = '" .$tag1 ."'";
 		$query.= " AND relationType = '". $relationType ."'";
@@ -91,7 +102,7 @@ class TagStatService {
 			return false;
 		}
 
-		$tts =& ServiceFactory::getServiceInstance('Tag2TagService');
+		$tts =SemanticScuttle_Service_Factory::getServiceInstance('Tag2Tag');
 		$linkedTags = $tts->getLinkedTags($tag1, $relationType, $uId);
 		$nbDescendants = 0;
 		$maxDepth = 0;
@@ -112,7 +123,7 @@ class TagStatService {
 	}
 
 	function updateAllStat() {
-		$tts =& ServiceFactory::getServiceInstance('Tag2TagService');
+		$tts =SemanticScuttle_Service_Factory::getServiceInstance('Tag2Tag');
 
 		$query = "SELECT tag1, uId FROM `". $tts->getTableName() ."`";
 		$query.= " WHERE relationType = '>'";
diff --git a/src/SemanticScuttle/Service/Template.php b/src/SemanticScuttle/Service/Template.php
index 05e494c..dbe5670 100644
--- a/src/SemanticScuttle/Service/Template.php
+++ b/src/SemanticScuttle/Service/Template.php
@@ -1,15 +1,26 @@
 <?php
-class TemplateService {
-	var $basedir;
+class SemanticScuttle_Service_Template extends SemanticScuttle_Service
+{
+	protected $basedir;
 
-	function &getInstance() {
+    /**
+     * Returns the single service instance
+     *
+     * @param DB $db Database object
+     *
+     * @return SemanticScuttle_Service
+     */
+	public static function getInstance($db)
+    {
 		static $instance;
-		if (!isset($instance))
-		$instance =& new TemplateService();
+		if (!isset($instance)) {
+            $instance = new self($db);
+        }
 		return $instance;
 	}
 
-	function TemplateService() {
+	public function __construct()
+    {
 		$this->basedir = $GLOBALS['TEMPLATES_DIR'];
 	}
 
diff --git a/src/SemanticScuttle/Service/User.php b/src/SemanticScuttle/Service/User.php
index 407632b..bc88c0b 100644
--- a/src/SemanticScuttle/Service/User.php
+++ b/src/SemanticScuttle/Service/User.php
@@ -1,28 +1,39 @@
 <?php
-class UserService {
-	var $db;
-	var $fields = array(
+class SemanticScuttle_Service_User extends SemanticScuttle_Service
+{
+	protected $db;
+	protected $fields = array(
         'primary'   =>  'uId',
         'username'  =>  'username',
         'password'  =>  'password');
-	var $profileurl;
-	var $tablename;
-	var $sessionkey;
-	var $cookiekey;
-	var $cookietime = 1209600; // 2 weeks
-
-	function &getInstance(&$db) {
+	protected $profileurl;
+	protected $tablename;
+	protected $sessionkey;
+	protected $cookiekey;
+	protected $cookietime = 1209600; // 2 weeks
+
+    /**
+     * Returns the single service instance
+     *
+     * @param DB $db Database object
+     *
+     * @return SemanticScuttle_Service
+     */
+	public static function getInstance($db)
+    {
 		static $instance;
-		if (!isset($instance))
-		$instance =& new UserService($db);
+		if (!isset($instance)) {
+            $instance = new self($db);
+        }
 		return $instance;
 	}
 
-	function UserService(& $db) {
-		$this->db =& $db;
-		$this->tablename = $GLOBALS['tableprefix'] .'users';
+	protected function __construct($db)
+    {
+		$this->db = $db;
+		$this->tablename  = $GLOBALS['tableprefix'] .'users';
 		$this->sessionkey = INSTALLATION_ID.'-currentuserid';
-		$this->cookiekey = INSTALLATION_ID.'-login';
+		$this->cookiekey  = INSTALLATION_ID.'-login';
 		$this->profileurl = createURL('profile', '%2$s');
 		$this->updateSessionStability();
 	}
@@ -436,21 +447,21 @@ class UserService {
 		return true;
 	}
 
-	function getAllUsers ( ) {

-		$query = 'SELECT * FROM '. $this->getTableName();

-

-		if (! ($dbresult =& $this->db->sql_query($query)) ) {

-			message_die(GENERAL_ERROR, 'Could not get users', '', __LINE__, __FILE__, $query, $this->db);

-			return false;

-		}

-

-		$rows = array();

-

-		while ( $row = $this->db->sql_fetchrow($dbresult) ) {

-			$rows[] = $row;

-		}

-		$this->db->sql_freeresult($dbresult);

-		return $rows;

+	function getAllUsers ( ) {
+		$query = 'SELECT * FROM '. $this->getTableName();
+
+		if (! ($dbresult =& $this->db->sql_query($query)) ) {
+			message_die(GENERAL_ERROR, 'Could not get users', '', __LINE__, __FILE__, $query, $this->db);
+			return false;
+		}
+
+		$rows = array();
+
+		while ( $row = $this->db->sql_fetchrow($dbresult) ) {
+			$rows[] = $row;
+		}
+		$this->db->sql_freeresult($dbresult);
+		return $rows;
 	}
 	
 	// Returns an array with admin uIds
@@ -461,18 +472,18 @@ class UserService {
 			$admins[] = $this->getIdFromUser($adminName); 
 		}
 		return $admins;
-	}

-

-	function deleteUser($uId) {

-		$query = 'DELETE FROM '. $this->getTableName() .' WHERE uId = '. intval($uId);

-

-		if (!($dbresult = & $this->db->sql_query($query))) {

-			message_die(GENERAL_ERROR, 'Could not delete user', '', __LINE__, __FILE__, $query, $this->db);

-			return false;

-		}

-

-		return true;

-	}

+	}
+
+	function deleteUser($uId) {
+		$query = 'DELETE FROM '. $this->getTableName() .' WHERE uId = '. intval($uId);
+
+		if (!($dbresult = & $this->db->sql_query($query))) {
+			message_die(GENERAL_ERROR, 'Could not delete user', '', __LINE__, __FILE__, $query, $this->db);
+			return false;
+		}
+
+		return true;
+	}
 
 
 	function sanitisePassword($password) {
@@ -601,7 +612,7 @@ class User {
 	function getName() {
 		// Look for value only if not already set
 		if(!isset($this->name)) {
-			$userservice =& ServiceFactory::getServiceInstance('UserService');
+			$userservice =SemanticScuttle_Service_Factory::getServiceInstance('User');
 			$user = $userservice->getUser($this->id);
 			$this->name = $user['name'];
 		}
@@ -611,7 +622,7 @@ class User {
 	function getEmail() {
 		// Look for value only if not already set
 		if(!isset($this->email)) {
-			$userservice =& ServiceFactory::getServiceInstance('UserService');
+			$userservice =SemanticScuttle_Service_Factory::getServiceInstance('User');
 			$user = $userservice->getUser($this->id);
 			$this->email = $user['email'];
 		}
@@ -621,7 +632,7 @@ class User {
 	function getHomepage() {
 		// Look for value only if not already set
 		if(!isset($this->homepage)) {
-			$userservice =& ServiceFactory::getServiceInstance('UserService');
+			$userservice =SemanticScuttle_Service_Factory::getServiceInstance('User');
 			$user = $userservice->getUser($this->id);
 			$this->homepage = $user['homepage'];
 		}
@@ -631,7 +642,7 @@ class User {
 	function getContent() {
 		// Look for value only if not already set
 		if(!isset($this->content)) {
-			$userservice =& ServiceFactory::getServiceInstance('UserService');
+			$userservice =SemanticScuttle_Service_Factory::getServiceInstance('User');
 			$user = $userservice->getUser($this->id);
 			$this->content = $user['uContent'];
 		}
@@ -641,7 +652,7 @@ class User {
 	function getDatetime() {
 		// Look for value only if not already set
 		if(!isset($this->content)) {
-			$userservice =& ServiceFactory::getServiceInstance('UserService');
+			$userservice =SemanticScuttle_Service_Factory::getServiceInstance('User');
 			$user = $userservice->getUser($this->id);
 			$this->datetime = $user['uDatetime'];
 		}
@@ -651,14 +662,14 @@ class User {
 	function isAdmin() {
 		// Look for value only if not already set
 		if(!isset($this->isAdmin)) {
-			$userservice =& ServiceFactory::getServiceInstance('UserService');
+			$userservice =SemanticScuttle_Service_Factory::getServiceInstance('User');
 			$this->isAdmin = $userservice->isAdmin($this->id);
 		}
 		return $this->isAdmin;
 	}
 	
 	function getNbBookmarks($range = 'public') {
-		$bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService');
+		$bookmarkservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
 		return $bookmarkservice->countBookmarks($this->getId(), $range);
 	}
 }
diff --git a/src/SemanticScuttle/header.php b/src/SemanticScuttle/header.php
index 024cb06..b01679c 100644
--- a/src/SemanticScuttle/header.php
+++ b/src/SemanticScuttle/header.php
@@ -1,12 +1,17 @@
 <?php
-if(!file_exists(dirname(__FILE__) .'/config.inc.php')) {
-	die('Please copy "config.inc.php.dist" to "config.inc.php"');
+if(!file_exists(dirname(__FILE__) .'/../../data/config.php')) {
+	die('Please copy "config.php.dist" to "config.php"');
 }
+set_include_path(
+    get_include_path() . PATH_SEPARATOR
+    . dirname(__FILE__) . '/../'
+);
 
 // 1 // First requirements part (before debug management)
-require_once(dirname(__FILE__) .'/config.default.inc.php');
-require_once(dirname(__FILE__) .'/config.inc.php');
-require_once(dirname(__FILE__) .'/constants.inc.php'); // some constants are based on variables from config file
+$datadir = dirname(__FILE__) . '/../../data/';
+require_once($datadir . '/config.default.php');
+require_once($datadir . '/config.php');
+require_once 'SemanticScuttle/constants.php'; // some constants are based on variables from config file
 
 
 // Debug Management using constants
@@ -21,17 +26,18 @@ if(DEBUG_MODE) {
 }
 
 // 2 // Second requirements part which could display bugs (must come after debug management)
-require_once(dirname(__FILE__) .'/services/servicefactory.php');
-require_once(dirname(__FILE__) .'/functions.inc.php');
+require_once 'SemanticScuttle/Service.php';
+require_once 'SemanticScuttle/Service/Factory.php';
+require_once 'SemanticScuttle/functions.php';
 
 
 // 3 // Third requirements part which import functions from includes/ directory
 
 // UTF-8 functions
-require_once(dirname(__FILE__) .'/includes/utf8.php');
+require_once 'SemanticScuttle/utf8.php';
 
 // Translation
-require_once(dirname(__FILE__) .'/includes/php-gettext/gettext.inc');
+require_once 'php-gettext/gettext.inc';
 $domain = 'messages';
 T_setlocale(LC_MESSAGES, $locale);
 T_bindtextdomain($domain, dirname(__FILE__) .'/locales');
@@ -42,10 +48,10 @@ T_textdomain($domain);
 session_start();
 
 // 5 // Create mandatory services and objects
-$userservice =& ServiceFactory::getServiceInstance('UserService');
+$userservice =SemanticScuttle_Service_Factory::getServiceInstance('User');
 $currentUser = $userservice->getCurrentObjectUser();
 
-$templateservice =& ServiceFactory::getServiceInstance('TemplateService');
+$templateservice =SemanticScuttle_Service_Factory::getServiceInstance('Template');
 $tplVars = array();
 $tplVars['currentUser'] = $currentUser;
 $tplVars['userservice'] = $userservice;
diff --git a/src/SemanticScuttle/search.php b/src/SemanticScuttle/search.php
deleted file mode 100644
index ce57aea..0000000
--- a/src/SemanticScuttle/search.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-
-/* Managing all possible inputs */
-$select_watchlist = isset($select_watchlist)?$select_watchlist:'';
-$select_all = isset($select_all)?$select_all:'';
-
-$selected = ' selected="selected"';
-?>
-
-
-<form id="search" action="<?php echo createURL('search'); ?>" method="post">
-    <table>
-    <tr>
-        <?php
-        $currentUser = $currentUsername = null;
-        if ($userservice->isLoggedOn()) {
-            $currentUser = $userservice->getCurrentObjectUser();
-            $currentUsername = $currentUser->getUsername();
-        }
-        if ($userservice->isLoggedOn() || isset($user)) {
-        ?>
-        
-        <td><input type="text" name="terms" size="30" value="<?php $terms=!isset($terms)?T_('Search...'):$terms; echo filter($terms); ?>" onfocus="if (this.value == '<?php echo T_('Search...') ?>') this.value = '';" onblur="if (this.value == '') this.value = '<?php echo T_('Search...') ?>';"/></td>
-        <td><?php echo T_('in') ?></td>
-        <td>
-            <select name="range">                      
-                <?php
-                if ($range == 'user' && $user!=$currentUsername) {
-                ?>
-                <option value="<?php echo $user ?>"><?php echo T_("this user's bookmarks"); ?></option>
-                <?php
-                }
-                if ($userservice->isLoggedOn()) {
-                ?>
-                <option value="<?php echo $currentUsername; ?>"><?php echo T_('my bookmarks'); ?></option>
-                <option value="watchlist" <?php echo ($range == 'watchlist')?$selected:''?> ><?php echo T_('my watchlist'); ?></option>
-                <?php
-                }
-                ?>
-                <option value="all" <?php echo ($range == 'all' || $range == '')?$selected:'' ?> ><?php echo T_('all bookmarks'); ?></option>
-            </select>
-        </td>        
-        <?php
-        } else {
-        ?>
-        <td><input type="hidden" name="range" value="all" /></td>
-        <?php
-        }
-        ?>        
-        <td><input type="submit" value="<?php echo T_('Search' /* Submit button */); ?>" /></td>
-    </tr>
-    </table>
-</form>
diff --git a/src/SemanticScuttle/utf8.php b/src/SemanticScuttle/utf8.php
new file mode 100644
index 0000000..9ef8113
--- /dev/null
+++ b/src/SemanticScuttle/utf8.php
@@ -0,0 +1,478 @@
+<?php
+/**
+ * UTF8 helper functions
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Andreas Gohr <andi@splitbrain.org>
+ */
+
+/**
+ * URL-Encode a filename to allow unicodecharacters
+ *
+ * Slashes are not encoded
+ *
+ * When the second parameter is true the string will
+ * be encoded only if non ASCII characters are detected -
+ * This makes it safe to run it multiple times on the
+ * same string (default is true)
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @see    urlencode
+ */
+function utf8_encodeFN($file,$safe=true){
+  if($safe && preg_match('#^[a-zA-Z0-9/_\-.%]+$#',$file)){
+    return $file;
+  }
+  $file = urlencode($file);
+  $file = str_replace('%2F','/',$file);
+  return $file;
+}
+
+/**
+ * URL-Decode a filename
+ *
+ * This is just a wrapper around urldecode
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @see    urldecode
+ */
+function utf8_decodeFN($file){
+  $file = urldecode($file);
+  return $file;
+}
+
+/**
+ * Checks if a string contains 7bit ASCII only
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function utf8_isASCII($str){
+  for($i=0; $i<strlen($str); $i++){
+    if(ord($str{$i}) >127) return false;
+  }
+  return true;
+}
+
+/**
+ * Tries to detect if a string is in Unicode encoding
+ *
+ * @author <bmorel@ssi.fr>
+ * @link   http://www.php.net/manual/en/function.utf8-encode.php
+ */
+function utf8_check($Str) {
+ for ($i=0; $i<strlen($Str); $i++) {
+  if (ord($Str[$i]) < 0x80) continue; # 0bbbbbbb
+  elseif ((ord($Str[$i]) & 0xE0) == 0xC0) $n=1; # 110bbbbb
+  elseif ((ord($Str[$i]) & 0xF0) == 0xE0) $n=2; # 1110bbbb
+  elseif ((ord($Str[$i]) & 0xF8) == 0xF0) $n=3; # 11110bbb
+  elseif ((ord($Str[$i]) & 0xFC) == 0xF8) $n=4; # 111110bb
+  elseif ((ord($Str[$i]) & 0xFE) == 0xFC) $n=5; # 1111110b
+  else return false; # Does not match any model
+  for ($j=0; $j<$n; $j++) { # n bytes matching 10bbbbbb follow ?
+   if ((++$i == strlen($Str)) || ((ord($Str[$i]) & 0xC0) != 0x80))
+   return false;
+  }
+ }
+ return true;
+}
+
+/**
+ * This is a unicode aware replacement for strlen()
+ *
+ * Uses mb_string extension if available
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @see    strlen()
+ */
+function utf8_strlen($string){
+  if(!defined('UTF8_NOMBSTRING') && function_exists('mb_strlen'))
+    return mb_strlen($string,'utf-8');
+
+  $uni = utf8_to_unicode($string);
+  return count($uni);
+}
+
+/**
+ * This is a unicode aware replacement for substr()
+ *
+ * Uses mb_string extension if available
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @see    substr()
+ */
+function utf8_substr($str, $start, $length=null){
+  if(!defined('UTF8_NOMBSTRING') && function_exists('mb_substr'))
+    return mb_substr($str,$start,$length,'utf-8');
+
+  $uni = utf8_to_unicode($str);
+  return unicode_to_utf8(array_slice($uni,$start,$length));
+}
+
+/**
+ * This is a unicode aware replacement for strtolower()
+ *
+ * Uses mb_string extension if available
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @see    strtolower()
+ * @see    utf8_strtoupper()
+ */
+function utf8_strtolower($string){
+  if(!defined('UTF8_NOMBSTRING') && function_exists('mb_strtolower'))
+    return mb_strtolower($string,'utf-8');
+
+  global $UTF8_UPPER_TO_LOWER;
+  $uni = utf8_to_unicode($string); 
+  for ($i=0; $i < count($uni); $i++){
+    if($UTF8_UPPER_TO_LOWER[$uni[$i]]){
+      $uni[$i] = $UTF8_UPPER_TO_LOWER[$uni[$i]];
+    }
+  }
+  return unicode_to_utf8($uni);
+}
+
+/**
+ * This is a unicode aware replacement for strtoupper()
+ *
+ * Uses mb_string extension if available
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @see    strtoupper()
+ * @see    utf8_strtoupper()
+ */
+function utf8_strtoupper($string){
+  if(!defined('UTF8_NOMBSTRING') && function_exists('mb_strtolower'))
+    return mb_strtolower($string,'utf-8');
+
+  global $UTF8_LOWER_TO_UPPER;
+  $uni = utf8_to_unicode($string);
+  for ($i=0; $i < count($uni); $i++){
+    if($UTF8_LOWER_TO_UPPER[$uni[$i]]){
+      $uni[$i] = $UTF8_LOWER_TO_UPPER[$uni[$i]];
+    }
+  }
+  return unicode_to_utf8($uni);
+}
+
+/**
+ * Replace accented UTF-8 characters by unaccented ASCII-7 equivalents
+ *
+ * Use the optional parameter to just deaccent lower ($case = -1) or upper ($case = 1)
+ * letters. Default is to deaccent both cases ($case = 0)
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function utf8_deaccent($string,$case=0){
+  if($case <= 0){
+    global $UTF8_LOWER_ACCENTS;
+    $string = str_replace(array_keys($UTF8_LOWER_ACCENTS),array_values($UTF8_LOWER_ACCENTS),$string);
+  }
+  if($case >= 0){
+    global $UTF8_UPPER_ACCENTS;
+    $string = str_replace(array_keys($UTF8_UPPER_ACCENTS),array_values($UTF8_UPPER_ACCENTS),$string);
+  }
+  return $string;
+}
+
+/**
+ * Removes special characters (nonalphanumeric) from a UTF-8 string
+ *
+ * Be sure to specify all specialchars you give in $repl in $keep, too
+ * or it won't work.
+ *
+ * This function adds the controlchars 0x00 to 0x19 to the array of
+ * stripped chars (they are not included in $UTF8_SPECIAL_CHARS)
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @param  string $string The UTF8 string to strip of special chars
+ * @param  string $repl   Replace special with this string
+ * @param  string $keep   Special chars to keep (in UTF8)
+ */
+function utf8_stripspecials($string,$repl='',$keep=''){
+  global $UTF8_SPECIAL_CHARS;
+  if($keep != ''){
+    $specials = array_diff($UTF8_SPECIAL_CHARS, utf8_to_unicode($keep));
+  }else{
+    $specials = $UTF8_SPECIAL_CHARS;
+  }
+
+  $specials = unicode_to_utf8($specials);
+  $specials = preg_quote($specials, '/');
+  
+  return preg_replace('/[\x00-\x19'.$specials.']/u',$repl,$string);
+}
+
+/**
+ * This is an Unicode aware replacement for strpos
+ *
+ * Uses mb_string extension if available
+ *
+ * @author Scott Michael Reynen <scott@randomchaos.com>
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @link   http://www.randomchaos.com/document.php?source=php_and_unicode
+ * @see    strpos()
+ */
+function utf8_strpos($haystack, $needle,$offset=0) {
+  if(!defined('UTF8_NOMBSTRING') && function_exists('mb_strpos'))
+    return mb_strpos($haystack,$needle,$offset,'utf-8');
+
+  $haystack = utf8_to_unicode($haystack);
+  $needle   = utf8_to_unicode($needle);
+  $position = $offset;
+  $found = false;
+  
+  while( (! $found ) && ( $position < count( $haystack ) ) ) {
+    if ( $needle[0] == $haystack[$position] ) {
+      for ($i = 1; $i < count( $needle ); $i++ ) {
+        if ( $needle[$i] != $haystack[ $position + $i ] ) break;
+      }
+      if ( $i == count( $needle ) ) {
+        $found = true;
+        $position--;
+      }
+    }
+    $position++;
+  }
+  return ( $found == true ) ? $position : false;
+}
+
+/**
+ * This function will any UTF-8 encoded text and return it as
+ * a list of Unicode values:
+ *
+ * @author Scott Michael Reynen <scott@randomchaos.com>
+ * @link   http://www.randomchaos.com/document.php?source=php_and_unicode
+ * @see    unicode_to_utf8()
+ */
+function utf8_to_unicode( $str ) {
+  $unicode = array();  
+  $values = array();
+  $lookingFor = 1;
+  
+  for ($i = 0; $i < strlen( $str ); $i++ ) {
+    $thisValue = ord( $str[ $i ] );
+    if ( $thisValue < 128 ) $unicode[] = $thisValue;
+    else {
+      if ( count( $values ) == 0 ) $lookingFor = ( $thisValue < 224 ) ? 2 : 3;
+      $values[] = $thisValue;
+      if ( count( $values ) == $lookingFor ) {
+  $number = ( $lookingFor == 3 ) ?
+    ( ( $values[0] % 16 ) * 4096 ) + ( ( $values[1] % 64 ) * 64 ) + ( $values[2] % 64 ):
+  	( ( $values[0] % 32 ) * 64 ) + ( $values[1] % 64 );
+  $unicode[] = $number;
+  $values = array();
+  $lookingFor = 1;
+      }
+    }
+  }
+  return $unicode;
+}
+
+/**
+ * This function will convert a Unicode array back to its UTF-8 representation
+ *
+ * @author Scott Michael Reynen <scott@randomchaos.com>
+ * @link   http://www.randomchaos.com/document.php?source=php_and_unicode
+ * @see    utf8_to_unicode()
+ */
+function unicode_to_utf8( $str ) {
+  $utf8 = '';
+  foreach( $str as $unicode ) {
+    if ( $unicode < 128 ) {
+      $utf8.= chr( $unicode );
+    } elseif ( $unicode < 2048 ) {
+      $utf8.= chr( 192 +  ( ( $unicode - ( $unicode % 64 ) ) / 64 ) );
+      $utf8.= chr( 128 + ( $unicode % 64 ) );
+    } else {
+      $utf8.= chr( 224 + ( ( $unicode - ( $unicode % 4096 ) ) / 4096 ) );
+      $utf8.= chr( 128 + ( ( ( $unicode % 4096 ) - ( $unicode % 64 ) ) / 64 ) );
+      $utf8.= chr( 128 + ( $unicode % 64 ) );
+    }
+  }
+  return $utf8;
+}
+
+/**
+ * UTF-8 Case lookup table
+ *
+ * This lookuptable defines the upper case letters to their correspponding
+ * lower case letter in UTF-8
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+$UTF8_LOWER_TO_UPPER = array(
+  0x0061=>0x0041, 0x03C6=>0x03A6, 0x0163=>0x0162, 0x00E5=>0x00C5, 0x0062=>0x0042,
+  0x013A=>0x0139, 0x00E1=>0x00C1, 0x0142=>0x0141, 0x03CD=>0x038E, 0x0101=>0x0100,
+  0x0491=>0x0490, 0x03B4=>0x0394, 0x015B=>0x015A, 0x0064=>0x0044, 0x03B3=>0x0393,
+  0x00F4=>0x00D4, 0x044A=>0x042A, 0x0439=>0x0419, 0x0113=>0x0112, 0x043C=>0x041C,
+  0x015F=>0x015E, 0x0144=>0x0143, 0x00EE=>0x00CE, 0x045E=>0x040E, 0x044F=>0x042F,
+  0x03BA=>0x039A, 0x0155=>0x0154, 0x0069=>0x0049, 0x0073=>0x0053, 0x1E1F=>0x1E1E,
+  0x0135=>0x0134, 0x0447=>0x0427, 0x03C0=>0x03A0, 0x0438=>0x0418, 0x00F3=>0x00D3,
+  0x0440=>0x0420, 0x0454=>0x0404, 0x0435=>0x0415, 0x0449=>0x0429, 0x014B=>0x014A,
+  0x0431=>0x0411, 0x0459=>0x0409, 0x1E03=>0x1E02, 0x00F6=>0x00D6, 0x00F9=>0x00D9,
+  0x006E=>0x004E, 0x0451=>0x0401, 0x03C4=>0x03A4, 0x0443=>0x0423, 0x015D=>0x015C,
+  0x0453=>0x0403, 0x03C8=>0x03A8, 0x0159=>0x0158, 0x0067=>0x0047, 0x00E4=>0x00C4,
+  0x03AC=>0x0386, 0x03AE=>0x0389, 0x0167=>0x0166, 0x03BE=>0x039E, 0x0165=>0x0164,
+  0x0117=>0x0116, 0x0109=>0x0108, 0x0076=>0x0056, 0x00FE=>0x00DE, 0x0157=>0x0156,
+  0x00FA=>0x00DA, 0x1E61=>0x1E60, 0x1E83=>0x1E82, 0x00E2=>0x00C2, 0x0119=>0x0118,
+  0x0146=>0x0145, 0x0070=>0x0050, 0x0151=>0x0150, 0x044E=>0x042E, 0x0129=>0x0128,
+  0x03C7=>0x03A7, 0x013E=>0x013D, 0x0442=>0x0422, 0x007A=>0x005A, 0x0448=>0x0428,
+  0x03C1=>0x03A1, 0x1E81=>0x1E80, 0x016D=>0x016C, 0x00F5=>0x00D5, 0x0075=>0x0055,
+  0x0177=>0x0176, 0x00FC=>0x00DC, 0x1E57=>0x1E56, 0x03C3=>0x03A3, 0x043A=>0x041A,
+  0x006D=>0x004D, 0x016B=>0x016A, 0x0171=>0x0170, 0x0444=>0x0424, 0x00EC=>0x00CC,
+  0x0169=>0x0168, 0x03BF=>0x039F, 0x006B=>0x004B, 0x00F2=>0x00D2, 0x00E0=>0x00C0,
+  0x0434=>0x0414, 0x03C9=>0x03A9, 0x1E6B=>0x1E6A, 0x00E3=>0x00C3, 0x044D=>0x042D,
+  0x0436=>0x0416, 0x01A1=>0x01A0, 0x010D=>0x010C, 0x011D=>0x011C, 0x00F0=>0x00D0,
+  0x013C=>0x013B, 0x045F=>0x040F, 0x045A=>0x040A, 0x00E8=>0x00C8, 0x03C5=>0x03A5,
+  0x0066=>0x0046, 0x00FD=>0x00DD, 0x0063=>0x0043, 0x021B=>0x021A, 0x00EA=>0x00CA,
+  0x03B9=>0x0399, 0x017A=>0x0179, 0x00EF=>0x00CF, 0x01B0=>0x01AF, 0x0065=>0x0045,
+  0x03BB=>0x039B, 0x03B8=>0x0398, 0x03BC=>0x039C, 0x045C=>0x040C, 0x043F=>0x041F,
+  0x044C=>0x042C, 0x00FE=>0x00DE, 0x00F0=>0x00D0, 0x1EF3=>0x1EF2, 0x0068=>0x0048,
+  0x00EB=>0x00CB, 0x0111=>0x0110, 0x0433=>0x0413, 0x012F=>0x012E, 0x00E6=>0x00C6,
+  0x0078=>0x0058, 0x0161=>0x0160, 0x016F=>0x016E, 0x03B1=>0x0391, 0x0457=>0x0407,
+  0x0173=>0x0172, 0x00FF=>0x0178, 0x006F=>0x004F, 0x043B=>0x041B, 0x03B5=>0x0395,
+  0x0445=>0x0425, 0x0121=>0x0120, 0x017E=>0x017D, 0x017C=>0x017B, 0x03B6=>0x0396,
+  0x03B2=>0x0392, 0x03AD=>0x0388, 0x1E85=>0x1E84, 0x0175=>0x0174, 0x0071=>0x0051,
+  0x0437=>0x0417, 0x1E0B=>0x1E0A, 0x0148=>0x0147, 0x0105=>0x0104, 0x0458=>0x0408,
+  0x014D=>0x014C, 0x00ED=>0x00CD, 0x0079=>0x0059, 0x010B=>0x010A, 0x03CE=>0x038F,
+  0x0072=>0x0052, 0x0430=>0x0410, 0x0455=>0x0405, 0x0452=>0x0402, 0x0127=>0x0126,
+  0x0137=>0x0136, 0x012B=>0x012A, 0x03AF=>0x038A, 0x044B=>0x042B, 0x006C=>0x004C,
+  0x03B7=>0x0397, 0x0125=>0x0124, 0x0219=>0x0218, 0x00FB=>0x00DB, 0x011F=>0x011E,
+  0x043E=>0x041E, 0x1E41=>0x1E40, 0x03BD=>0x039D, 0x0107=>0x0106, 0x03CB=>0x03AB,
+  0x0446=>0x0426, 0x00FE=>0x00DE, 0x00E7=>0x00C7, 0x03CA=>0x03AA, 0x0441=>0x0421,
+  0x0432=>0x0412, 0x010F=>0x010E, 0x00F8=>0x00D8, 0x0077=>0x0057, 0x011B=>0x011A,
+  0x0074=>0x0054, 0x006A=>0x004A, 0x045B=>0x040B, 0x0456=>0x0406, 0x0103=>0x0102,
+  0x03BB=>0x039B, 0x00F1=>0x00D1, 0x043D=>0x041D, 0x03CC=>0x038C, 0x00E9=>0x00C9,
+  0x00F0=>0x00D0, 0x0457=>0x0407, 0x0123=>0x0122,
+); 
+
+/**
+ * UTF-8 Case lookup table
+ *
+ * This lookuptable defines the lower case letters to their correspponding
+ * upper case letter in UTF-8 (it does so by flipping $UTF8_LOWER_TO_UPPER)
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+$UTF8_UPPER_TO_LOWER = @array_flip($UTF8_LOWER_TO_UPPER);
+
+/**
+ * UTF-8 lookup table for lower case accented letters
+ *
+ * This lookuptable defines replacements for accented characters from the ASCII-7
+ * range. This are lower case letters only.
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @see    utf8_deaccent()
+ */
+$UTF8_LOWER_ACCENTS = array(
+  '� ' => 'a', 'ô' => 'o', 'ď' => 'd', 'ḟ' => 'f', 'ë' => 'e', 'š' => 's', 'ơ' => 'o', 
+  'ß' => 'ss', 'ă' => 'a', 'ř' => 'r', 'ț' => 't', 'ň' => 'n', 'ā' => 'a', 'ķ' => 'k', 
+  'ŝ' => 's', 'ỳ' => 'y', 'ņ' => 'n', 'ĺ' => 'l', 'ħ' => 'h', 'ṗ' => 'p', 'ó' => 'o', 
+  'ú' => 'u', 'ě' => 'e', 'é' => 'e', 'ç' => 'c', 'ẁ' => 'w', 'ċ' => 'c', 'õ' => 'o', 
+  'ṡ' => 's', 'ø' => 'o', 'ģ' => 'g', 'ŧ' => 't', 'ș' => 's', 'ė' => 'e', 'ĉ' => 'c', 
+  'ś' => 's', 'î' => 'i', 'ű' => 'u', 'ć' => 'c', 'ę' => 'e', 'ŵ' => 'w', 'ṫ' => 't', 
+  'ū' => 'u', 'č' => 'c', 'ö' => 'oe', 'è' => 'e', 'ŷ' => 'y', 'ą' => 'a', 'ł' => 'l', 
+  'ų' => 'u', 'ů' => 'u', 'ş' => 's', 'ğ' => 'g', 'ļ' => 'l', 'ƒ' => 'f', 'ž' => 'z', 
+  'ẃ' => 'w', 'ḃ' => 'b', 'å' => 'a', 'ì' => 'i', 'ï' => 'i', 'ḋ' => 'd', 'ť' => 't', 
+  'ŗ' => 'r', 'ä' => 'ae', 'í' => 'i', 'ŕ' => 'r', 'ê' => 'e', 'ü' => 'ue', 'ò' => 'o', 
+  'ē' => 'e', 'ñ' => 'n', 'ń' => 'n', 'ĥ' => 'h', 'ĝ' => 'g', 'đ' => 'd', 'ĵ' => 'j', 
+  'ÿ' => 'y', 'ũ' => 'u', 'ŭ' => 'u', 'ư' => 'u', 'ţ' => 't', 'ý' => 'y', 'ő' => 'o', 
+  'â' => 'a', 'ľ' => 'l', 'ẅ' => 'w', 'ż' => 'z', 'ī' => 'i', 'ã' => 'a', 'ġ' => 'g', 
+  'ṁ' => 'm', 'ō' => 'o', 'ĩ' => 'i', 'ù' => 'u', 'į' => 'i', 'ź' => 'z', 'á' => 'a', 
+  'û' => 'u', 'þ' => 'th', 'ð' => 'dh', 'æ' => 'ae', 'µ' => 'u',
+);
+
+/**
+ * UTF-8 lookup table for upper case accented letters
+ *
+ * This lookuptable defines replacements for accented characters from the ASCII-7
+ * range. This are upper case letters only.
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @see    utf8_deaccent()
+ */
+$UTF8_UPPER_ACCENTS = array(
+  '� ' => 'A', 'ô' => 'O', 'ď' => 'D', 'ḟ' => 'F', 'ë' => 'E', 'š' => 'S', 'ơ' => 'O', 
+  'ß' => 'Ss', 'ă' => 'A', 'ř' => 'R', 'ț' => 'T', 'ň' => 'N', 'ā' => 'A', 'ķ' => 'K', 
+  'ŝ' => 'S', 'ỳ' => 'Y', 'ņ' => 'N', 'ĺ' => 'L', 'ħ' => 'H', 'ṗ' => 'P', 'ó' => 'O', 
+  'ú' => 'U', 'ě' => 'E', 'é' => 'E', 'ç' => 'C', 'ẁ' => 'W', 'ċ' => 'C', 'õ' => 'O', 
+  'ṡ' => 'S', 'ø' => 'O', 'ģ' => 'G', 'ŧ' => 'T', 'ș' => 'S', 'ė' => 'E', 'ĉ' => 'C', 
+  'ś' => 'S', 'î' => 'I', 'ű' => 'U', 'ć' => 'C', 'ę' => 'E', 'ŵ' => 'W', 'ṫ' => 'T', 
+  'ū' => 'U', 'č' => 'C', 'ö' => 'Oe', 'è' => 'E', 'ŷ' => 'Y', 'ą' => 'A', 'ł' => 'L', 
+  'ų' => 'U', 'ů' => 'U', 'ş' => 'S', 'ğ' => 'G', 'ļ' => 'L', 'ƒ' => 'F', 'ž' => 'Z', 
+  'ẃ' => 'W', 'ḃ' => 'B', 'å' => 'A', 'ì' => 'I', 'ï' => 'I', 'ḋ' => 'D', 'ť' => 'T', 
+  'ŗ' => 'R', 'ä' => 'Ae', 'í' => 'I', 'ŕ' => 'R', 'ê' => 'E', 'ü' => 'Ue', 'ò' => 'O', 
+  'ē' => 'E', 'ñ' => 'N', 'ń' => 'N', 'ĥ' => 'H', 'ĝ' => 'G', 'đ' => 'D', 'ĵ' => 'J', 
+  'ÿ' => 'Y', 'ũ' => 'U', 'ŭ' => 'U', 'ư' => 'U', 'ţ' => 'T', 'ý' => 'Y', 'ő' => 'O', 
+  'â' => 'A', 'ľ' => 'L', 'ẅ' => 'W', 'ż' => 'Z', 'ī' => 'I', 'ã' => 'A', 'ġ' => 'G', 
+  'ṁ' => 'M', 'ō' => 'O', 'ĩ' => 'I', 'ù' => 'U', 'į' => 'I', 'ź' => 'Z', 'á' => 'A', 
+  'û' => 'U', 'Þ' => 'Th', 'Ð' => 'Dh', 'Æ' => 'Ae',
+);
+
+/**
+ * UTF-8 array of common special characters
+ *
+ * This array should contain all special characters (not a letter or digit)
+ * defined in the various local charsets - it's not a complete list of non-alphanum
+ * characters in UTF-8. It's not perfect but should match most cases of special
+ * chars.
+ *
+ * The controlchars 0x00 to 0x19 are _not_ included in this array. The space 0x20 is!
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @see    utf8_stripspecials()
+ */
+$UTF8_SPECIAL_CHARS = array(
+  0x001a, 0x001b, 0x001c, 0x001d, 0x001e, 0x001f, 0x0020, 0x0021, 0x0022, 0x0023,
+  0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002a, 0x002b, 0x002c, 0x002d,
+  0x002e, 0x002f, 0x003a, 0x003b, 0x003c, 0x003d, 0x003e, 0x003f, 0x0040, 0x005b,
+  0x005c, 0x005d, 0x005e, 0x005f, 0x0060, 0x0142, 0x007b, 0x007c, 0x007d, 0x007e,
+  0x007f, 0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, 0x0088,
+  0x0089, 0x008a, 0x008b, 0x008c, 0x008d, 0x008e, 0x008f, 0x0090, 0x0091, 0x0092,
+	0x0093, 0x0094, 0x0095, 0x0096, 0x0097, 0x0098, 0x0099, 0x009a, 0x009b, 0x009c,
+	0x009d, 0x009e, 0x009f, 0x00a0, 0x00a1, 0x00a2, 0x00a3, 0x00a4, 0x00a5, 0x00a6,
+	0x00a7, 0x00a8, 0x00a9, 0x00aa, 0x00ab, 0x00ac, 0x00ad, 0x00ae, 0x00af, 0x00b0,
+	0x00b1, 0x00b2, 0x00b3, 0x00b4, 0x00b5, 0x00b6, 0x00b7, 0x00b8, 0x00b9, 0x00ba,
+	0x00bb, 0x00bc, 0x00bd, 0x00be, 0x00bf, 0x00d7, 0x00f7, 0x02c7, 0x02d8, 0x02d9,
+	0x02da, 0x02db, 0x02dc, 0x02dd, 0x0300, 0x0301, 0x0303, 0x0309, 0x0323, 0x0384,
+	0x0385, 0x0387, 0x03b2, 0x03c6, 0x03d1, 0x03d2, 0x03d5, 0x03d6, 0x05b0, 0x05b1,
+	0x05b2, 0x05b3, 0x05b4, 0x05b5, 0x05b6, 0x05b7, 0x05b8, 0x05b9, 0x05bb, 0x05bc,
+	0x05bd, 0x05be, 0x05bf, 0x05c0, 0x05c1, 0x05c2, 0x05c3, 0x05f3, 0x05f4, 0x060c,
+	0x061b, 0x061f, 0x0640, 0x064b, 0x064c, 0x064d, 0x064e, 0x064f, 0x0650, 0x0651,
+	0x0652, 0x066a, 0x0e3f, 0x200c, 0x200d, 0x200e, 0x200f, 0x2013, 0x2014, 0x2015,
+	0x2017, 0x2018, 0x2019, 0x201a, 0x201c, 0x201d, 0x201e, 0x2020, 0x2021, 0x2022,
+	0x2026, 0x2030, 0x2032, 0x2033, 0x2039, 0x203a, 0x2044, 0x20a7, 0x20aa, 0x20ab,
+	0x20ac, 0x2116, 0x2118, 0x2122, 0x2126, 0x2135, 0x2190, 0x2191, 0x2192, 0x2193,
+	0x2194, 0x2195, 0x21b5, 0x21d0, 0x21d1, 0x21d2, 0x21d3, 0x21d4, 0x2200, 0x2202,
+	0x2203, 0x2205, 0x2206, 0x2207, 0x2208, 0x2209, 0x220b, 0x220f, 0x2211, 0x2212,
+	0x2215, 0x2217, 0x2219, 0x221a, 0x221d, 0x221e, 0x2220, 0x2227, 0x2228, 0x2229,
+	0x222a, 0x222b, 0x2234, 0x223c, 0x2245, 0x2248, 0x2260, 0x2261, 0x2264, 0x2265,
+	0x2282, 0x2283, 0x2284, 0x2286, 0x2287, 0x2295, 0x2297, 0x22a5, 0x22c5, 0x2310,
+	0x2320, 0x2321, 0x2329, 0x232a, 0x2469, 0x2500, 0x2502, 0x250c, 0x2510, 0x2514,
+	0x2518, 0x251c, 0x2524, 0x252c, 0x2534, 0x253c, 0x2550, 0x2551, 0x2552, 0x2553,
+	0x2554, 0x2555, 0x2556, 0x2557, 0x2558, 0x2559, 0x255a, 0x255b, 0x255c, 0x255d,
+	0x255e, 0x255f, 0x2560, 0x2561, 0x2562, 0x2563, 0x2564, 0x2565, 0x2566, 0x2567,
+	0x2568, 0x2569, 0x256a, 0x256b, 0x256c, 0x2580, 0x2584, 0x2588, 0x258c, 0x2590,
+	0x2591, 0x2592, 0x2593, 0x25a0, 0x25b2, 0x25bc, 0x25c6, 0x25ca, 0x25cf, 0x25d7,
+	0x2605, 0x260e, 0x261b, 0x261e, 0x2660, 0x2663, 0x2665, 0x2666, 0x2701, 0x2702,
+	0x2703, 0x2704, 0x2706, 0x2707, 0x2708, 0x2709, 0x270c, 0x270d, 0x270e, 0x270f,
+	0x2710, 0x2711, 0x2712, 0x2713, 0x2714, 0x2715, 0x2716, 0x2717, 0x2718, 0x2719,
+	0x271a, 0x271b, 0x271c, 0x271d, 0x271e, 0x271f, 0x2720, 0x2721, 0x2722, 0x2723,
+	0x2724, 0x2725, 0x2726, 0x2727, 0x2729, 0x272a, 0x272b, 0x272c, 0x272d, 0x272e,
+	0x272f, 0x2730, 0x2731, 0x2732, 0x2733, 0x2734, 0x2735, 0x2736, 0x2737, 0x2738,
+	0x2739, 0x273a, 0x273b, 0x273c, 0x273d, 0x273e, 0x273f, 0x2740, 0x2741, 0x2742,
+	0x2743, 0x2744, 0x2745, 0x2746, 0x2747, 0x2748, 0x2749, 0x274a, 0x274b, 0x274d,
+	0x274f, 0x2750, 0x2751, 0x2752, 0x2756, 0x2758, 0x2759, 0x275a, 0x275b, 0x275c,
+	0x275d, 0x275e, 0x2761, 0x2762, 0x2763, 0x2764, 0x2765, 0x2766, 0x2767, 0x277f,
+	0x2789, 0x2793, 0x2794, 0x2798, 0x2799, 0x279a, 0x279b, 0x279c, 0x279d, 0x279e,
+	0x279f, 0x27a0, 0x27a1, 0x27a2, 0x27a3, 0x27a4, 0x27a5, 0x27a6, 0x27a7, 0x27a8,
+	0x27a9, 0x27aa, 0x27ab, 0x27ac, 0x27ad, 0x27ae, 0x27af, 0x27b1, 0x27b2, 0x27b3,
+	0x27b4, 0x27b5, 0x27b6, 0x27b7, 0x27b8, 0x27b9, 0x27ba, 0x27bb, 0x27bc, 0x27bd,
+	0x27be, 0xf6d9, 0xf6da, 0xf6db, 0xf8d7, 0xf8d8, 0xf8d9, 0xf8da, 0xf8db, 0xf8dc,
+	0xf8dd, 0xf8de, 0xf8df, 0xf8e0, 0xf8e1, 0xf8e2, 0xf8e3, 0xf8e4, 0xf8e5, 0xf8e6,
+	0xf8e7, 0xf8e8, 0xf8e9, 0xf8ea, 0xf8eb, 0xf8ec, 0xf8ed, 0xf8ee, 0xf8ef, 0xf8f0,
+	0xf8f1, 0xf8f2, 0xf8f3, 0xf8f4, 0xf8f5, 0xf8f6, 0xf8f7, 0xf8f8, 0xf8f9, 0xf8fa,
+	0xf8fb, 0xf8fc, 0xf8fd, 0xf8fe, 0xfe7c, 0xfe7d,
+);
+?>